ci: Validate并行化-拆分为CodeQuality/TypeCheck/Migration三个并行job

Co-authored-by: xiaoxia <dev@xiaoxiajianji.com>
Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>

.ci-retrigger

@@ -0,0 +1 @@
+re-trigger

.ci-trigger

@@ -1 +1,2 @@
-# CI trigger Fri Jun 26 09:53:28 PM CST 2026
+CI trigger file - safe to delete
+updated!

.env.example

@@ -3,6 +3,7 @@
 # ==================== 应用配置 ====================
 APP_NAME=小虾 SaaS
 APP_BASE_URL=http://localhost:3000
+APP_ENV=development
 
 # ==================== 数据库配置 ====================
 DATABASE_URL=postgresql://xiaoxia_user:your_password@localhost:5432/xiaoxia_saas
@@ -35,7 +36,8 @@ ENVIRONMENT=development
 DEBUG=true
 
 # ==================== CORS 配置 ====================
-CORS_ORIGINS=["http://localhost:3000","http://localhost:5173"]
+# 逗号分隔的域名列表（Settings 读取 CORS_ORIGINS_RAW）
+CORS_ORIGINS_RAW=http://localhost:3000,http://localhost:5173
 
 # ==================== 阿里云 OSS 配置 ====================
 OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
@@ -44,9 +46,15 @@ OSS_ACCESS_KEY_SECRET=your-access-key-secret
 OSS_BUCKET_NAME=xiaoxia-autocut
 
 # ==================== CosyVoice 语音合成配置 ====================
+# 注意：base_url 只需写到 /api/v1，具体路径由代码拼接
+# 模型: cosyvoice-v3-flash (推荐，支持系统音色，性价比高)
+#       cosyvoice-v3-plus (高质量，系统音色少)
+#       cosyvoice-v3.5-flash / cosyvoice-v3.5-plus (仅支持克隆/设计音色，无系统音色)
+# 音色: v3系列系统音色带 _v3 后缀，如 longxiaochun_v3, longxiaoxia_v3, longanyang (无后缀)
+# 注意：COSYVOICE_* 变量由 packages/shared/config.py 的 SharedSettings 读取
 COSYVOICE_API_KEY=your-cosyvoice-api-key
-COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1/services/aigc/text2audio
-COSYVOICE_MODEL=cosyvoice-v1
-COSYVOICE_VOICE=longxiaochun
+COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
+COSYVOICE_MODEL=cosyvoice-v3-flash
+COSYVOICE_VOICE=longxiaochun_v3
 COSYVOICE_SAMPLE_RATE=22050
 COSYVOICE_FORMAT=mp3

.env.production.example

@@ -5,7 +5,6 @@ APP_ENV=production
 ENVIRONMENT=production
 DEBUG=false
 USE_IN_MEMORY_DB=false
-LOG_LEVEL=WARNING
 
 # ==================== 数据库（必须修改）====================
 DATABASE_URL=postgresql://prod_user:CHANGE_THIS_PASSWORD@db-prod:5432/xiaoxia_prod
@@ -42,10 +41,15 @@ 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/services/aigc/text2audio
-COSYVOICE_MODEL=cosyvoice-v1
-COSYVOICE_VOICE=longxiaochun
+COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
+COSYVOICE_MODEL=cosyvoice-v3-flash
+COSYVOICE_VOICE=longxiaochun_v3
 COSYVOICE_SAMPLE_RATE=22050
 COSYVOICE_FORMAT=mp3
 

.flake8

@@ -1,13 +0,0 @@
-[flake8]
-max-line-length = 120
-exclude =
-    .git,
-    __pycache__,
-    .venv,
-    venv,
-    node_modules,
-    alembic
-
-per-file-ignores =
-    tests/integration/*:F821
-    tests/unit/*:F821

.gitea/workflows/auto-merge.yml

@@ -1,21 +0,0 @@
-name: Auto Merge PRs
-
-on:
-  schedule:
-    - cron: '0 */6 * * *'
-  workflow_dispatch:
-
-jobs:
-  auto-merge:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      
-      - name: Auto merge develop PRs
-        run: |
-          bash scripts/auto_merge_prs.sh develop
-      
-      - name: Auto merge main PRs (release only)
-        run: |
-          bash scripts/auto_merge_prs.sh main

.gitea/workflows/ci-cd.yml

@@ -1,178 +0,0 @@
-name: CI/CD Pipeline
-
-on:
-  push:
-    branches:
-      - main
-      - develop
-      - 'feature/**'
-      - 'bugfix/**'
-      - 'hotfix/**'
-      - 'release/**'
-  pull_request:
-    branches:
-      - main
-      - develop
-
-jobs:
-  validate:
-    name: Validate Code Quality And Tests
-    runs-on: ubuntu-22.04
-
-
-    steps:
-      - name: Checkout code
-        shell: sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          set -eu
-          python3 - <<'PY'
-          import io, os, tarfile, urllib.request
-          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']}"})
-          with urllib.request.urlopen(request, timeout=120) as response:
-              archive = response.read()
-          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: Verify CI environment
-        shell: sh
-        run: |
-          set -eu
-          python --version
-          python3 -m pip --version
-          python3 -m black --version
-          python3 -m isort --version-number
-          python3 -m flake8 --version
-          bandit --version
-          pytest --version
-          echo "CI environment is ready"
-
-      - name: Run code quality checks
-        shell: sh
-        run: |
-          set -eu
-          python3 -m compileall -q alembic apps packages tests scripts
-          python3 -m black --check alembic apps packages tests scripts
-          python3 -m isort --check-only alembic apps packages tests scripts
-          python3 -m flake8 apps packages tests --count --statistics
-
-      - name: Run security scan
-        shell: sh
-        run: |
-          set -eu
-          bandit -r apps packages -q -ll
-
-      - name: Validate release scripts syntax
-        shell: sh
-        run: |
-          set -eu
-          bash -n scripts/backup_postgres.sh
-          bash -n scripts/restore_postgres_plan.sh
-          bash -n scripts/init_production_env.sh
-
-      - name: Validate Alembic migrations
-        shell: sh
-        run: |
-          set -eu
-          DATABASE_URL=postgresql+psycopg://postgres:postgres@localhost:5432/xiaoxia_saas \
-            python3 -m alembic upgrade head --sql > /tmp/alembic-upgrade.sql
-          test -s /tmp/alembic-upgrade.sql
-          grep -q "Running upgrade" /tmp/alembic-upgrade.sql
-          python3 scripts/check_schema_metadata.py
-
-      - name: Run tests
-        shell: sh
-        run: |
-          set -eu
-          PYTHONPATH="$PWD/apps/api:$PWD" python3 -m pytest tests/unit -q
-
-      - name: Build summary
-        if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main'
-        shell: sh
-        run: |
-          set -eu
-          echo "Build completed successfully!"
-          echo "Branch: ${GITHUB_REF_NAME}"
-          echo "Commit: ${GITHUB_SHA}"
-
-  frontend-lint:
-    name: Frontend Lint
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout code
-        shell: sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          set -eu
-          archive_url="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/archive/${GITHUB_SHA}.tar.gz"
-          wget --header="Authorization: token ${GITHUB_TOKEN}" -O /tmp/repo.tar.gz "$archive_url"
-          tar -xzf /tmp/repo.tar.gz --strip-components=1 -C .
-          rm -f /tmp/repo.tar.gz
-
-      - name: Install dependencies
-        shell: sh
-        run: |
-          set -eu
-          docker run --rm \
-            --pull=never \
-            -v "$PWD:/workspace" \
-            -w /workspace/apps/web \
-            docker.m.daocloud.io/library/node:20 \
-            sh -lc 'npm ci'
-
-      - name: Run ESLint
-        shell: sh
-        run: |
-          set -eu
-          docker run --rm \
-            --pull=never \
-            -v "$PWD:/workspace" \
-            -w /workspace/apps/web \
-            docker.m.daocloud.io/library/node:20 \
-            sh -lc 'npx eslint src --ext .ts,.tsx --max-warnings 50'
-
-      - name: Run TypeScript type check
-        shell: sh
-        run: |
-          set -eu
-          docker run --rm \
-            --pull=never \
-            -v "$PWD:/workspace" \
-            -w /workspace/apps/web \
-            docker.m.daocloud.io/library/node:20 \
-            sh -lc 'npx tsc --noEmit'
-
-      - name: Run Prettier check
-        shell: sh
-        run: |
-          set -eu
-          docker run --rm \
-            --pull=never \
-            -v "$PWD:/workspace" \
-            -w /workspace/apps/web \
-            docker.m.daocloud.io/library/node:20 \
-            sh -lc 'npx prettier --check "src/**/*.{ts,tsx,css,md}"'
-
-      - name: Run Vitest tests
-        shell: sh
-        run: |
-          set -eu
-          docker run --rm \
-            --pull=never \
-            -v "$PWD:/workspace" \
-            -w /workspace/apps/web \
-            docker.m.daocloud.io/library/node:20 \
-            sh -lc 'npx vitest run src/test'

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

@@ -0,0 +1,81 @@
+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: saas
+    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: 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: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        # 网络波动自动重试2次
+        retry:
+          max_attempts: 2
+          retry_on: error
+      
+      - 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: ubuntu-latest
+    # 跳过草稿 PR
+    if: ${{ !gitea.event.pull_request.draft }}
+
+    steps:
+      # actions/checkout 由 runner 在宿主机层面处理，不受容器网络影响
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+        # 网络波动自动重试2次
+        retry:
+          max_attempts: 2
+          retry_on: error
+
+      - 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 }}
+          # 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
+        # 审查脚本异常不影响 CI 通过
+        continue-on-error: true
+
+      - 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

@@ -0,0 +1,718 @@
+name: Daily Health Check
+
+on:
+  schedule:
+    - cron: '0 19 * * *'  # UTC 19:00 = 北京时间凌晨 3:00
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  # ── 1. 生产环境冒烟测试 ─────────────────────────────────────────────
+  production-smoke:
+    name: Production Smoke Test
+    runs-on: saas
+    timeout-minutes: 8
+    outputs:
+      report: ${{ steps.smoke.outputs.report }}
+
+    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: Production health check & smoke test
+        id: smoke
+        shell: sh
+        env:
+          SMOKE_ENV: production
+          EXISTING_TOKEN: ${{ secrets.PROD_E2E_TOKEN }}
+          MODULES: health,assets,generation,subscription,nginx
+        run: |
+          set +e
+          START_TIME=$(date +%s)
+          chmod +x tests/e2e/api_smoke_test.sh
+          BASE_URL="https://api.xiaoxiajianji.com" \
+          WEB_URL="https://saas.xiaoxiajianji.com" \
+          SMOKE_ENV="${SMOKE_ENV}" \
+          EXISTING_TOKEN="${EXISTING_TOKEN}" \
+          MODULES="${MODULES}" \
+          CLEANUP_ENABLED=0 \
+          PERF_CHECK_ENABLED=1 \
+          PERF_WARN_THRESHOLD_MS=500 \
+          PERF_FAIL_THRESHOLD_MS=5000 \
+          bash tests/e2e/api_smoke_test.sh 2>&1 | tee /tmp/prod-smoke.log
+          SMOKE_EXIT=${PIPESTATUS[0]}
+          END_TIME=$(date +%s)
+          ELAPSED=$((END_TIME - START_TIME))
+
+          echo ""
+          echo "========== 生产冒烟测试报告 =========="
+          echo "环境: https://api.xiaoxiajianji.com"
+          echo "耗时: ${ELAPSED}s"
+          # 提取通过/失败数
+          grep "测试完成:" /tmp/prod-smoke.log || true
+          if [ "$SMOKE_EXIT" -eq 0 ]; then
+            echo "结果: PASS"
+            echo "report=PASS" >> "${GITHUB_OUTPUT}"
+          else
+            echo "结果: FAIL"
+            grep "失败用例:" /tmp/prod-smoke.log || true
+            echo "report=FAIL" >> "${GITHUB_OUTPUT}"
+          fi
+          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
+    timeout-minutes: 10
+    outputs:
+      report: ${{ steps.smoke.outputs.report }}
+
+    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: Run API smoke test on staging
+        id: smoke
+        shell: sh
+        run: |
+          set +e
+          START_TIME=$(date +%s)
+          chmod +x tests/e2e/api_smoke_test.sh
+          docker run --rm \
+            -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 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
+          SMOKE_EXIT=${PIPESTATUS[0]}
+          END_TIME=$(date +%s)
+          ELAPSED=$((END_TIME - START_TIME))
+
+          echo ""
+          echo "========== Staging API 冒烟测试报告 =========="
+          echo "环境: https://staging-api.xiaoxiajianji.com"
+          echo "耗时: ${ELAPSED}s"
+          grep "测试完成:" /tmp/staging-api-smoke.log || true
+          if [ "$SMOKE_EXIT" -eq 0 ]; then
+            echo "结果: PASS"
+            echo "api_report=PASS" >> "${GITHUB_OUTPUT}"
+          else
+            echo "结果: FAIL"
+            grep "失败用例:" /tmp/staging-api-smoke.log || true
+            echo "api_report=FAIL" >> "${GITHUB_OUTPUT}"
+          fi
+          echo "=============================================="
+          exit $SMOKE_EXIT
+
+      - name: Run Staging API Integration Tests (Playwright)
+        id: e2e_api
+        shell: sh
+        run: |
+          set +e
+          START_TIME=$(date +%s)
+          docker run --rm \
+            -e E2E_BASE_URL=https://staging.xiaoxiajianji.com \
+            -e E2E_API_BASE=https://staging-api.xiaoxiajianji.com/api/v1 \
+            -v "$PWD:/workspace" \
+            -w /workspace/apps/web \
+            git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
+            sh -lc "npm ci && npx playwright test --reporter=line e2e/test_auth.spec.ts e2e/test_asset.spec.ts e2e/test_project.spec.ts" 2>&1 | tee /tmp/staging-api-e2e.log
+          EXIT_CODE=${PIPESTATUS[0]}
+          END_TIME=$(date +%s)
+          ELAPSED=$((END_TIME - START_TIME))
+
+          echo ""
+          echo "========== Staging API 集成测试报告 =========="
+          echo "环境: https://staging-api.xiaoxiajianji.com"
+          echo "耗时: ${ELAPSED}s"
+          grep -E "passed|failed|timed out" /tmp/staging-api-e2e.log || true
+          if [ "$EXIT_CODE" -eq 0 ]; then
+            echo "结果: PASS"
+            echo "int_report=PASS" >> "${GITHUB_OUTPUT}"
+          else
+            echo "结果: FAIL"
+            echo "int_report=FAIL" >> "${GITHUB_OUTPUT}"
+          fi
+          echo "=============================================="
+          exit $EXIT_CODE
+
+      - name: Set report output
+        id: report
+        shell: sh
+        run: |
+          if [ "${{ steps.smoke.outputs.api_report }}" = "PASS" ] && [ "${{ steps.e2e_api.outputs.int_report }}" = "PASS" ]; then
+            echo "report=PASS" >> "${GITHUB_OUTPUT}"
+          else
+            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
+    timeout-minutes: 15
+    outputs:
+      report: ${{ steps.smoke.outputs.report }}
+
+    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: Run Playwright E2E on staging
+        id: e2e
+        shell: sh
+        run: |
+          set +e
+          START_TIME=$(date +%s)
+          docker run --rm --ipc=host \
+            -e E2E_BASE_URL=https://staging.xiaoxiajianji.com \
+            -e E2E_API_BASE=https://staging-api.xiaoxiajianji.com/api/v1 \
+            -e E2E_BROWSER_CHANNEL=chromium \
+            -e PLAYWRIGHT_HEADLESS=1 \
+            -v "$PWD:/workspace" \
+            -w /workspace/apps/web \
+            git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
+            sh -lc 'npm ci && npx playwright test --reporter=line --project=chromium e2e/auth.spec.ts e2e/auth-guard.spec.ts e2e/core-upload.spec.ts e2e/core-generation.spec.ts e2e/core-titles.spec.ts' 2>&1 | tee /tmp/staging-e2e.log
+          EXIT_CODE=${PIPESTATUS[0]}
+          END_TIME=$(date +%s)
+          ELAPSED=$((END_TIME - START_TIME))
+
+          echo ""
+          echo "========== Staging E2E 测试报告 =========="
+          echo "环境: https://staging.xiaoxiajianji.com"
+          echo "耗时: ${ELAPSED}s"
+          grep -E "passed|failed|timed out" /tmp/staging-e2e.log || true
+          if [ "$EXIT_CODE" -eq 0 ]; then
+            echo "结果: PASS"
+            echo "report=PASS" >> "${GITHUB_OUTPUT}"
+          else
+            echo "结果: FAIL"
+            echo "report=FAIL" >> "${GITHUB_OUTPUT}"
+          fi
+          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
+    timeout-minutes: 8
+    outputs:
+      report: ${{ steps.report.outputs.report }}
+
+    steps:
+      - name: Run performance baseline checks
+        id: perf
+        shell: sh
+        run: |
+          set +e
+          START_TIME=$(date +%s)
+          echo "=========================================="
+          echo "  性能基线巡检 - Staging API"
+          echo "  目标: https://staging-api.xiaoxiajianji.com"
+          echo "=========================================="
+          echo ""
+
+          TOTAL=0
+          PASS=0
+          FAIL=0
+          WARN=0
+          WARN_LIST=""
+          FAIL_LIST=""
+
+          # 核心接口配置: 名称|路径|方法|阈值(ms)|失败阈值(ms)
+          # 核心接口(core): 500ms
+          # 普通接口(normal): 1000ms
+          # 重操作接口(heavy): 3000ms
+          ENDPOINTS="
+          登录|/api/v1/auth/login|POST|500|3000
+          获取当前用户|/api/v1/auth/me|GET|500|3000
+          项目列表|/api/v1/projects|GET|500|3000
+          素材列表|/api/v1/assets|GET|500|3000
+          模板列表|/api/v1/templates|GET|500|3000
+          剪辑计划列表|/api/v1/edit-plans|GET|500|3000
+          生成任务列表|/api/v1/generation/tasks|GET|500|3000
+          订阅信息|/api/v1/subscription/current|GET|500|3000
+          音色列表|/api/v1/voices|GET|1000|5000
+          健康检查|/health|GET|200|1000
+          "
+
+          # 先登录获取 token
+          echo "--- 准备: 获取测试 Token ---"
+          AUTH_RESP=$(curl -s -w "\n%{http_code}" -X POST \
+            -H "Content-Type: application/json" \
+            -d '{"email":"18314979086@163.com","password":"Ying1234"}' \
+            "https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
+            --max-time 10 2>&1)
+          AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
+          AUTH_BODY=$(echo "$AUTH_RESP" | sed '$d')
+
+          if [ "$AUTH_CODE" = "200" ]; then
+            TOKEN=$(echo "$AUTH_BODY" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('access_token',''))" 2>/dev/null)
+            if [ -n "$TOKEN" ]; then
+              echo "Token 获取成功"
+            else
+              echo "Token 解析失败，部分接口可能无法测试"
+              TOKEN=""
+            fi
+          else
+            echo "登录失败 (HTTP $AUTH_CODE)，部分接口将跳过鉴权测试"
+            TOKEN=""
+          fi
+
+          echo ""
+          echo "--- 开始性能测试 ---"
+          echo ""
+
+          echo "$ENDPOINTS" | while IFS='|' read -r name path method warn_ms fail_ms; do
+            [ -z "$name" ] && continue
+            TOTAL=$((TOTAL + 1))
+
+            # 构建 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\"}'"
+            fi
+            if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
+              CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
+            fi
+
+            # 执行请求
+            RESP=$(eval curl $CURL_ARGS "https://staging-api.xiaoxiajianji.com${path}" 2>&1)
+            HTTP_CODE=$(echo "$RESP" | awk '{print $1}')
+            TIME_TOTAL=$(echo "$RESP" | awk '{print $2}')
+            ELAPSED_MS=$(python3 -c "print(int(float('${TIME_TOTAL:-0}') * 1000))" 2>/dev/null || echo "0")
+
+            if [ "$HTTP_CODE" -ge 500 ] 2>/dev/null; then
+              FAIL=$((FAIL + 1))
+              FAIL_LIST="$FAIL_LIST\n  ❌ $name - HTTP $HTTP_CODE (${ELAPSED_MS}ms)"
+              echo "❌ $name - HTTP $HTTP_CODE - ${ELAPSED_MS}ms (FAIL)"
+            elif [ "$ELAPSED_MS" -ge "$fail_ms" ] 2>/dev/null; then
+              FAIL=$((FAIL + 1))
+              FAIL_LIST="$FAIL_LIST\n  ❌ $name - ${ELAPSED_MS}ms > ${fail_ms}ms"
+              echo "❌ $name - ${ELAPSED_MS}ms > ${fail_ms}ms (FAIL)"
+            elif [ "$ELAPSED_MS" -ge "$warn_ms" ] 2>/dev/null; then
+              WARN=$((WARN + 1))
+              WARN_LIST="$WARN_LIST\n  ⚠️  $name - ${ELAPSED_MS}ms > ${warn_ms}ms"
+              echo "⚠️  $name - ${ELAPSED_MS}ms (WARN, threshold: ${warn_ms}ms)"
+              PASS=$((PASS + 1))
+            else
+              PASS=$((PASS + 1))
+              echo "✅ $name - ${ELAPSED_MS}ms (OK, threshold: ${warn_ms}ms)"
+            fi
+          done
+
+          # 由于 while 在子 shell 中执行，用文件传递结果
+          # 重新跑一次用文件计数方式
+          echo ""
+          echo "--- 汇总性能数据 ---"
+
+          END_TIME=$(date +%s)
+          ELAPSED=$((END_TIME - START_TIME))
+
+          echo ""
+          echo "========== 性能基线巡检报告 =========="
+          echo "环境: https://staging-api.xiaoxiajianji.com"
+          echo "耗时: ${ELAPSED}s"
+          echo "======================================"
+
+      - name: Generate performance report
+        id: report
+        shell: sh
+        run: |
+          set +e
+          echo ""
+          echo "=========================================="
+          echo "  性能基线巡检 - 详细报告"
+          echo "=========================================="
+
+          TOTAL=0
+          PASS=0
+          FAIL=0
+          WARN=0
+          RESULTS=""
+          START_TIME=$(date +%s)
+
+          # 先登录获取 token
+          AUTH_RESP=$(curl -s -w "\n%{http_code}" -X POST \
+            -H "Content-Type: application/json" \
+            -d '{"email":"18314979086@163.com","password":"Ying1234"}' \
+            "https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
+            --max-time 10 2>&1)
+          AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
+          AUTH_BODY=$(echo "$AUTH_RESP" | sed '$d')
+          TOKEN=""
+          if [ "$AUTH_CODE" = "200" ]; then
+            TOKEN=$(echo "$AUTH_BODY" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('access_token',''))" 2>/dev/null || echo "")
+          fi
+
+          run_perf_test() {
+            local name="$1" path="$2" method="$3" warn_ms="$4" fail_ms="$5"
+            TOTAL=$((TOTAL + 1))
+
+            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\"}'"
+            fi
+            if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
+              CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
+            fi
+
+            local RESP=$(eval curl $CURL_ARGS "https://staging-api.xiaoxiajianji.com${path}" 2>&1)
+            local HTTP_CODE=$(echo "$RESP" | awk '{print $1}')
+            local TIME_TOTAL=$(echo "$RESP" | awk '{print $2}')
+            local ELAPSED_MS=$(python3 -c "print(int(float('${TIME_TOTAL:-0}') * 1000))" 2>/dev/null || echo "0")
+
+            if echo "$HTTP_CODE" | grep -q "^[5]"; then
+              FAIL=$((FAIL + 1))
+              RESULTS="$RESULTS\n  ❌ $name - HTTP $HTTP_CODE (${ELAPSED_MS}ms)"
+              echo "❌ $name - HTTP $HTTP_CODE - ${ELAPSED_MS}ms [FAIL]"
+              return 1
+            elif [ "$ELAPSED_MS" -ge "$fail_ms" ] 2>/dev/null; then
+              FAIL=$((FAIL + 1))
+              RESULTS="$RESULTS\n  ❌ $name - ${ELAPSED_MS}ms > ${fail_ms}ms [FAIL]"
+              echo "❌ $name - ${ELAPSED_MS}ms > ${fail_ms}ms [FAIL]"
+              return 1
+            elif [ "$ELAPSED_MS" -ge "$warn_ms" ] 2>/dev/null; then
+              WARN=$((WARN + 1))
+              PASS=$((PASS + 1))
+              RESULTS="$RESULTS\n  ⚠️  $name - ${ELAPSED_MS}ms (阈值: ${warn_ms}ms) [WARN]"
+              echo "⚠️  $name - ${ELAPSED_MS}ms > 阈值 ${warn_ms}ms [WARN]"
+              return 0
+            else
+              PASS=$((PASS + 1))
+              RESULTS="$RESULTS\n  ✅ $name - ${ELAPSED_MS}ms (阈值: ${warn_ms}ms) [OK]"
+              echo "✅ $name - ${ELAPSED_MS}ms (阈值: ${warn_ms}ms) [OK]"
+              return 0
+            fi
+          }
+
+          echo ""
+          echo "=== 核心接口 (阈值: 500ms / 3000ms) ==="
+          run_perf_test "登录" "/api/v1/auth/login" "POST" 500 3000 || true
+          run_perf_test "获取当前用户" "/api/v1/auth/me" "GET" 500 3000 || true
+          run_perf_test "项目列表" "/api/v1/projects" "GET" 500 3000 || true
+          run_perf_test "素材列表" "/api/v1/assets" "GET" 500 3000 || true
+          run_perf_test "模板列表" "/api/v1/templates" "GET" 500 3000 || true
+          run_perf_test "剪辑计划列表" "/api/v1/edit-plans" "GET" 500 3000 || true
+          run_perf_test "生成任务列表" "/api/v1/generation/tasks" "GET" 500 3000 || true
+          run_perf_test "订阅信息" "/api/v1/subscription/current" "GET" 500 3000 || true
+
+          echo ""
+          echo "=== 普通接口 (阈值: 1000ms / 5000ms) ==="
+          run_perf_test "音色列表" "/api/v1/voices" "GET" 1000 5000 || true
+
+          echo ""
+          echo "=== 基础接口 (阈值: 200ms / 1000ms) ==="
+          run_perf_test "健康检查" "/health" "GET" 200 1000 || true
+
+          END_TIME=$(date +%s)
+          ELAPSED=$((END_TIME - START_TIME))
+
+          echo ""
+          echo "========== 性能基线巡检报告 =========="
+          echo "环境: https://staging-api.xiaoxiajianji.com"
+          echo "总接口: ${TOTAL}"
+          echo "通过: ${PASS}"
+          echo "失败: ${FAIL}"
+          echo "警告: ${WARN}"
+          echo "耗时: ${ELAPSED}s"
+          echo "======================================"
+
+          # 写入结果文件供 report job 使用
+          echo "${TOTAL}" > /tmp/perf_total
+          echo "${PASS}" > /tmp/perf_pass
+          echo "${FAIL}" > /tmp/perf_fail
+          echo "${WARN}" > /tmp/perf_warn
+          echo "${ELAPSED}" > /tmp/perf_elapsed
+
+          if [ "$FAIL" -gt 0 ]; then
+            echo "report=FAIL" >> "${GITHUB_OUTPUT}"
+            echo "perf_detail=fail:${FAIL}:warn:${WARN}" >> "${GITHUB_OUTPUT}"
+            exit 1
+          else
+            echo "report=PASS" >> "${GITHUB_OUTPUT}"
+            if [ "$WARN" -gt 0 ]; then
+              echo "perf_detail=pass:warn:${WARN}" >> "${GITHUB_OUTPUT}"
+            else
+              echo "perf_detail=pass" >> "${GITHUB_OUTPUT}"
+            fi
+            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
+    timeout-minutes: 2
+    if: always()
+    needs:
+      - production-smoke
+      - staging-api-tests
+      - staging-e2e
+      - performance-check
+
+    steps:
+      - name: Print summary report
+        shell: sh
+        run: |
+          echo ""
+          echo "╔══════════════════════════════════════════════════════╗"
+          echo "║              每日巡检报告                             ║"
+          echo "╠══════════════════════════════════════════════════════╣"
+
+          # 获取各 job 状态
+          PROD_STATUS="${{ needs.production-smoke.result }}"
+          STAGING_API_STATUS="${{ needs.staging-api-tests.result }}"
+          STAGING_E2E_STATUS="${{ needs.staging-e2e.result }}"
+          PERF_STATUS="${{ needs.performance-check.result }}"
+
+          format_result() {
+            if [ "$1" = "success" ]; then
+              echo "✅ PASS"
+            elif [ "$1" = "failure" ]; then
+              echo "❌ FAIL"
+            elif [ "$1" = "skipped" ]; then
+              echo "⏭️  SKIP"
+            else
+              echo "❓ UNKNOWN ($1)"
+            fi
+          }
+
+          echo "║"
+          echo "║  生产冒烟测试:   $(format_result "$PROD_STATUS")"
+          echo "║  Staging API:    $(format_result "$STAGING_API_STATUS")"
+          echo "║  Staging E2E:    $(format_result "$STAGING_E2E_STATUS")"
+          echo "║  性能基线巡检:   $(format_result "$PERF_STATUS")"
+          echo "║"
+          echo "║  巡检时间: $(date '+%Y-%m-%d %H:%M:%S UTC')"
+          echo "║"
+
+          # 判断整体状态
+          ALL_PASS=true
+          FAILED_ITEMS=""
+          for status_name in "$PROD_STATUS:生产冒烟" "$STAGING_API_STATUS:Staging API" "$STAGING_E2E_STATUS:Staging E2E" "$PERF_STATUS:性能基线"; do
+            STATUS=$(echo "$status_name" | cut -d: -f1)
+            NAME=$(echo "$status_name" | cut -d: -f2)
+            if [ "$STATUS" != "success" ] && [ "$STATUS" != "skipped" ]; then
+              ALL_PASS=false
+              FAILED_ITEMS="$FAILED_ITEMS $NAME"
+            fi
+          done
+
+          echo "╠══════════════════════════════════════════════════════╣"
+          if [ "$ALL_PASS" = "true" ]; then
+            echo "║  整体状态: ✅ 全部通过                                 ║"
+          else
+            echo "║  整体状态: ❌ 存在失败                                 ║"
+            echo "║  失败项: ${FAILED_ITEMS}                              ║"
+          fi
+          echo "╚══════════════════════════════════════════════════════╝"
+          echo ""
+
+          # 如果有失败项，以非零退出码结束（方便 Gitea 标记流水线失败）
+          if [ "$ALL_PASS" = "false" ]; then
+            echo "⚠️  部分巡检项失败，请检查上方日志获取详细信息。"
+            # 不 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/deploy.yml

@@ -1,333 +0,0 @@
-name: Deploy
-
-on:
-  push:
-    branches: [ main, develop, "feature/**" ]
-    tags:
-      - 'v*'
-
-jobs:
-  deploy-staging:
-    name: Deploy Staging
-    runs-on: saas
-    if: github.ref_name == 'main' || github.ref_name == 'develop' || startsWith(github.ref_name, 'feature/')
-
-    steps:
-    - name: Checkout code
-      shell: sh
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        set -eu
-        python3 - <<'PY'
-        import io, os, tarfile, urllib.request
-        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']}"})
-        with urllib.request.urlopen(request, timeout=120) as response:
-            archive = response.read()
-        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: Install SSH client
-      shell: sh
-      run: |
-        set -eu
-        apt-get update -qq && apt-get install -y -qq openssh-client >/dev/null 2>&1
-        echo "openssh-client installed"
-
-    - name: Build staging web artifact
-      shell: sh
-      run: |
-        set -eu
-        docker run --rm \
-          --pull=never \
-          -v "$PWD:/workspace" \
-          -w /workspace/apps/web \
-          docker.m.daocloud.io/library/node:20 \
-          sh -lc 'npm ci && npm run build'
-        docker build --pull=false \
-          -f infra/docker/web-artifact.Dockerfile \
-          -t "xiaoxia-saas-web:staging-${GITHUB_SHA}" \
-          .
-        test -f apps/web/dist/index.html
-
-
-    - name: Build and push staging API/Worker images
-      shell: sh
-      run: |
-        set -eu
-        REGISTRY="172.30.18.198:5000"
-        docker build --pull=false \
-          -f infra/docker/api.Dockerfile \
-          -t "${REGISTRY}/xiaoxia-saas-api:dev" \
-          .
-        docker build --pull=false \
-          -f infra/docker/worker.Dockerfile \
-          -t "${REGISTRY}/xiaoxia-saas-worker:dev" \
-          .
-        docker push "${REGISTRY}/xiaoxia-saas-api:dev"
-        docker push "${REGISTRY}/xiaoxia-saas-worker:dev"
-
-    - name: Package staging release artifact
-      shell: sh
-      run: |
-        set -eu
-        rm -rf dist/staging-artifacts
-        mkdir -p dist/staging-artifacts
-        tar --exclude=.git --exclude=apps/web/node_modules --exclude=./dist \
-          -czf dist/staging-artifacts/xiaoxia-staging-${GITHUB_SHA}.tar.gz .
-        docker save -o "dist/staging-artifacts/xiaoxia-web-staging-${GITHUB_SHA}.tar" "xiaoxia-saas-web:staging-${GITHUB_SHA}"
-
-    - name: Upload staging artifact to business host
-      shell: sh
-      env:
-        STAGING_SSH_HOST: ${{ secrets.STAGING_SSH_HOST }}
-        STAGING_SSH_USER: ${{ secrets.STAGING_SSH_USER }}
-        STAGING_SSH_KEY: ${{ secrets.STAGING_SSH_KEY }}
-      run: |
-        set -eu
-        staging_host="${STAGING_SSH_HOST:-47.98.113.167}"
-        staging_user="${STAGING_SSH_USER:-root}"
-        mkdir -p ~/.ssh
-        # Prefer host key if available (more reliable), fallback to secrets
-        if [ -f /root/.ssh/xiaoxia_runtime_builder ]; then
-          key_path="/root/.ssh/xiaoxia_runtime_builder"
-          echo "Using host SSH key: $key_path"
-        elif [ -n "${STAGING_SSH_KEY:-}" ]; then
-          key_path="$HOME/.ssh/id_ed25519"
-          printf '%s\n' "$STAGING_SSH_KEY" > "$key_path"
-          chmod 600 "$key_path"
-          echo "Using secret SSH key: $key_path"
-        else
-          echo "ERROR: No SSH key available"
-          exit 1
-        fi
-        ssh-keyscan -H "$staging_host" >> ~/.ssh/known_hosts
-        ssh -i "$key_path" "$staging_user@$staging_host" "mkdir -p /var/lib/xiaoxia-saas-staging/artifacts"
-        scp -i "$key_path" "dist/staging-artifacts/xiaoxia-staging-${GITHUB_SHA}.tar.gz" \
-          "$staging_user@$staging_host:/var/lib/xiaoxia-saas-staging/artifacts/xiaoxia-staging-${GITHUB_SHA}.tar.gz"
-        scp -i "$key_path" "dist/staging-artifacts/xiaoxia-web-staging-${GITHUB_SHA}.tar" \
-          "$staging_user@$staging_host:/var/lib/xiaoxia-saas-staging/artifacts/xiaoxia-web-staging-${GITHUB_SHA}.tar"
-
-    - name: Deploy staging stack on business host
-      shell: sh
-      env:
-        STAGING_SSH_HOST: ${{ secrets.STAGING_SSH_HOST }}
-        STAGING_SSH_USER: ${{ secrets.STAGING_SSH_USER }}
-        STAGING_SSH_KEY: ${{ secrets.STAGING_SSH_KEY }}
-      run: |
-        set -eu
-        staging_host="${STAGING_SSH_HOST:-47.98.113.167}"
-        staging_user="${STAGING_SSH_USER:-root}"
-        if [ -f /root/.ssh/xiaoxia_runtime_builder ]; then
-          key_path="/root/.ssh/xiaoxia_runtime_builder"
-        elif [ -n "${STAGING_SSH_KEY:-}" ]; then
-          key_path="$HOME/.ssh/id_ed25519"
-        else
-          echo "ERROR: No SSH key available"
-          exit 1
-        fi
-        echo 'c2V0IC1ldQphcnRpZmFjdD0iL3Zhci9saWIveGlhb3hpYS1zYWFzLXN0YWdpbmcvYXJ0aWZhY3RzL3hpYW94aWEtc3RhZ2luZy0ke0dJVEhVQl9TSEF9LnRhci5neiIKaW1hZ2VfdGFyPSIvdmFyL2xpYi94aWFveGlhLXNhYXMtc3RhZ2luZy9hcnRpZmFjdHMveGlhb3hpYS13ZWItc3RhZ2luZy0ke0dJVEhVQl9TSEF9LnRhciIKdGVzdCAtZiAiJGFydGlmYWN0Igp0ZXN0IC1mICIkaW1hZ2VfdGFyIgp0ZXN0IC1mIC92YXIvbGliL3hpYW94aWEtc2Fhcy1zdGFnaW5nLy5lbnYKZG9ja2VyIGxvYWQgLWkgIiRpbWFnZV90YXIiCnJtIC1yZiAvdmFyL2xpYi94aWFveGlhLXNhYXMtc3RhZ2luZy9yZXBvCm1rZGlyIC1wIC92YXIvbGliL3hpYW94aWEtc2Fhcy1zdGFnaW5nL3JlcG8KdGFyIC14emYgIiRhcnRpZmFjdCIgLUMgL3Zhci9saWIveGlhb3hpYS1zYWFzLXN0YWdpbmcvcmVwbwp0ZXN0IC1mIC92YXIvbGliL3hpYW94aWEtc2Fhcy1zdGFnaW5nL3JlcG8vYXBwcy93ZWIvZGlzdC9pbmRleC5odG1sCmNwIC92YXIvbGliL3hpYW94aWEtc2Fhcy1zdGFnaW5nLy5lbnYgL3Zhci9saWIveGlhb3hpYS1zYWFzLXN0YWdpbmcvcmVwby8uZW52CmNobW9kICt4IC92YXIvbGliL3hpYW94aWEtc2Fhcy1zdGFnaW5nL3JlcG8vaW5mcmEvZG9ja2VyL2RlcGxveS1zdGFnaW5nLnNoClJFR0lTVFJZPSIxNzIuMzAuMTguMTk4OjUwMDAiIEFQSV9JTUFHRT0iJHtSRUdJU1RSWX0veGlhb3hpYS1zYWFzLWFwaTpkZXYiIFdPUktFUl9JTUFHRT0iJHtSRUdJU1RSWX0veGlhb3hpYS1zYWFzLXdvcmtlcjpkZXYiIFdFQl9JTUFHRT0ieGlhb3hpYS1zYWFzLXdlYjpzdGFnaW5nLSR7R0lUSFVCX1NIQX0iIEhPU1RfUFJFRklYPSBXRUJfUE9SVD0zMDAxIFJFQlVJTERfQkFDS0VORD0wIEJVSUxEX1dFQj0wIFJVTl9NSUdSQVRJT05TPTAgL3Zhci9saWIveGlhb3hpYS1zYWFzLXN0YWdpbmcvcmVwby9pbmZyYS9kb2NrZXIvZGVwbG95LXN0YWdpbmcuc2gKaT0wCndoaWxlIFsgIiRpIiAtbHQgMzAgXTsgZG8KICBpZiB3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo4MDAwL2hlYWx0aDsgdGhlbgogICAgZXhpdCAwCiAgZmkKICBpPSQoKGkgKyAxKSkKICBzbGVlcCAyCmRvbmUKZXhpdCAxCg==' | base64 -d | ssh -i "$key_path" "$staging_user@$staging_host" "GITHUB_SHA='${GITHUB_SHA}' sh"
-
-  build-production-runtime-images:
-    name: Build Production Runtime Images
-    runs-on: saas
-    if: startsWith(github.ref, 'refs/tags/v')
-
-    steps:
-    - name: Checkout code
-      shell: sh
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        set -eu
-        python3 - <<'PY'
-        import io, os, tarfile, urllib.request
-        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']}"})
-        with urllib.request.urlopen(request, timeout=120) as response:
-            archive = response.read()
-        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: Build runtime image artifact
-      shell: sh
-      run: |
-        set -eu
-        chmod +x scripts/build_release_images.sh
-        scripts/build_release_images.sh "${GITHUB_REF_NAME}"
-
-    - name: Build production web artifact
-      shell: sh
-      run: |
-        set -eu
-        docker run --rm \
-          --pull=never \
-          -v "$PWD:/workspace" \
-          -w /workspace/apps/web \
-          docker.m.daocloud.io/library/node:20 \
-          sh -lc 'npm ci && npm run build'
-        docker build --pull=false \
-          -f infra/docker/web-artifact.Dockerfile \
-          -t "xiaoxia-saas-web:${GITHUB_REF_NAME}" \
-          .
-        test -f apps/web/dist/index.html
-
-    - name: Package release source artifact
-      shell: sh
-      run: |
-        set -eu
-        mkdir -p dist/release-artifacts
-        tar --exclude=.git --exclude=apps/web/node_modules --exclude=./dist \
-          -czf "dist/release-artifacts/xiaoxia-release-${GITHUB_REF_NAME}.tar.gz" .
-        docker save -o "dist/release-artifacts/xiaoxia-web-${GITHUB_REF_NAME}.tar" "xiaoxia-saas-web:${GITHUB_REF_NAME}"
-
-    - name: Upload runtime image and release artifacts
-      shell: sh
-      env:
-        PRODUCTION_SSH_HOST: ${{ secrets.PRODUCTION_SSH_HOST }}
-        PRODUCTION_SSH_USER: ${{ secrets.PRODUCTION_SSH_USER }}
-        PRODUCTION_SSH_KEY: ${{ secrets.PRODUCTION_SSH_KEY }}
-      run: |
-        set -eu
-        production_host="${PRODUCTION_SSH_HOST:-47.98.113.167}"
-        production_user="${PRODUCTION_SSH_USER:-root}"
-        mkdir -p ~/.ssh
-        # Prefer host key if available (more reliable), fallback to secrets
-        if [ -f /root/.ssh/xiaoxia_runtime_builder ]; then
-          key_path="/root/.ssh/xiaoxia_runtime_builder"
-          echo "Using host SSH key: $key_path"
-        elif [ -n "${PRODUCTION_SSH_KEY:-}" ]; then
-          key_path="$HOME/.ssh/id_ed25519"
-          printf '%s\n' "$PRODUCTION_SSH_KEY" > "$key_path"
-          chmod 600 "$key_path"
-          echo "Using secret SSH key: $key_path"
-        else
-          echo "ERROR: No SSH key available"
-          exit 1
-        fi
-        ssh-keyscan -H "$production_host" >> ~/.ssh/known_hosts
-        scp -i "$key_path" "dist/release-images/xiaoxia-runtime-images-${GITHUB_REF_NAME}.tar" \
-          "$production_user@$production_host:/var/lib/xiaoxia-saas-production/runtime-images-${GITHUB_REF_NAME}.tar"
-        scp -i "$key_path" "dist/release-artifacts/xiaoxia-release-${GITHUB_REF_NAME}.tar.gz" \
-          "$production_user@$production_host:/var/lib/xiaoxia-saas-production/release-${GITHUB_REF_NAME}.tar.gz"
-        scp -i "$key_path" "dist/release-artifacts/xiaoxia-web-${GITHUB_REF_NAME}.tar" \
-          "$production_user@$production_host:/var/lib/xiaoxia-saas-production/web-${GITHUB_REF_NAME}.tar"
-
-    - name: Cleanup old Docker images
-      if: always()
-      shell: sh
-      run: |
-        set -eu
-        if [ -f scripts/cleanup_old_images.sh ]; then
-          chmod +x scripts/cleanup_old_images.sh
-          scripts/cleanup_old_images.sh
-        else
-          echo "Cleanup script not found, doing basic prune..."
-          docker image prune -f 2>/dev/null || true
-        fi
-        echo "Disk usage after cleanup:"
-        df -h / | tail -1
-
-  deploy-production:
-    name: Deploy Production
-    runs-on: saas
-    if: startsWith(github.ref, 'refs/tags/v')
-    needs: build-production-runtime-images
-
-    steps:
-    - name: Install SSH client
-      shell: sh
-      run: |
-        set -eu
-        apt-get update -qq && apt-get install -y -qq openssh-client >/dev/null 2>&1
-        echo "openssh-client installed"
-
-    - name: Deploy production over SSH
-      shell: sh
-      env:
-        PRODUCTION_SSH_HOST: ${{ secrets.PRODUCTION_SSH_HOST }}
-        PRODUCTION_SSH_USER: ${{ secrets.PRODUCTION_SSH_USER }}
-        PRODUCTION_SSH_KEY: ${{ secrets.PRODUCTION_SSH_KEY }}
-      run: |
-        set -eu
-        production_host="${PRODUCTION_SSH_HOST:-47.98.113.167}"
-        production_user="${PRODUCTION_SSH_USER:-root}"
-        mkdir -p ~/.ssh
-        # Prefer host key if available (more reliable), fallback to secrets
-        if [ -f /root/.ssh/xiaoxia_runtime_builder ]; then
-          key_path="/root/.ssh/xiaoxia_runtime_builder"
-          echo "Using host SSH key: $key_path"
-        elif [ -n "${PRODUCTION_SSH_KEY:-}" ]; then
-          key_path="$HOME/.ssh/id_ed25519"
-          printf '%s\n' "$PRODUCTION_SSH_KEY" > "$key_path"
-          chmod 600 "$key_path"
-          echo "Using secret SSH key: $key_path"
-        else
-          echo "ERROR: No SSH key available"
-          exit 1
-        fi
-        ssh-keyscan -H "$production_host" >> ~/.ssh/known_hosts
-          echo 'c2V0IC1ldQpyZWxlYXNlX3Rhcj0iL3Zhci9saWIveGlhb3hpYS1zYWFzLXByb2R1Y3Rpb24vcmVsZWFzZS0ke1JFTEVBU0VfVkVSU0lPTn0udGFyLmd6Igp0ZXN0IC1mICIkcmVsZWFzZV90YXIiCnRlc3QgLWYgIi92YXIvbGliL3hpYW94aWEtc2Fhcy1wcm9kdWN0aW9uL3J1bnRpbWUtaW1hZ2VzLSR7UkVMRUFTRV9WRVJTSU9OfS50YXIiCnRlc3QgLWYgIi92YXIvbGliL3hpYW94aWEtc2Fhcy1wcm9kdWN0aW9uL3dlYi0ke1JFTEVBU0VfVkVSU0lPTn0udGFyIgpta2RpciAtcCAvdmFyL2xpYi94aWFveGlhLXNhYXMtcHJvZHVjdGlvbgpvbGRfYXNzZXRzX2Rpcj0iL3RtcC94aWFveGlhLXByZXZpb3VzLXdlYi1hc3NldHMtJHtSRUxFQVNFX1ZFUlNJT059IgpybSAtcmYgIiRvbGRfYXNzZXRzX2RpciIKbWtkaXIgLXAgIiRvbGRfYXNzZXRzX2RpciIKaWYgZG9ja2VyIGluc3BlY3QgeGlhb3hpYS13ZWItcHJvZHVjdGlvbiA+L2Rldi9udWxsIDI+JjE7IHRoZW4KICBkb2NrZXIgY3AgeGlhb3hpYS13ZWItcHJvZHVjdGlvbjovdXNyL3NoYXJlL25naW54L2h0bWwvYXNzZXRzLy4gIiRvbGRfYXNzZXRzX2RpciIvIDI+L2Rldi9udWxsIHx8IHRydWUKZmkKaWYgWyAtZCAvdmFyL2xpYi94aWFveGlhLXNhYXMtcHJvZHVjdGlvbi9yZXBvL2FwcHMvd2ViL2Rpc3QvYXNzZXRzIF07IHRoZW4KICBjcCAtYSAvdmFyL2xpYi94aWFveGlhLXNhYXMtcHJvZHVjdGlvbi9yZXBvL2FwcHMvd2ViL2Rpc3QvYXNzZXRzLy4gIiRvbGRfYXNzZXRzX2RpciIvCmZpCnJtIC1yZiAvdmFyL2xpYi94aWFveGlhLXNhYXMtcHJvZHVjdGlvbi9yZXBvCm1rZGlyIC1wIC92YXIvbGliL3hpYW94aWEtc2Fhcy1wcm9kdWN0aW9uL3JlcG8KdGFyIC14emYgIiRyZWxlYXNlX3RhciIgLUMgL3Zhci9saWIveGlhb3hpYS1zYWFzLXByb2R1Y3Rpb24vcmVwbwp0ZXN0IC1mIC92YXIvbGliL3hpYW94aWEtc2Fhcy1wcm9kdWN0aW9uL3JlcG8vYXBwcy93ZWIvZGlzdC9pbmRleC5odG1sCmlmIFsgLWQgIiRvbGRfYXNzZXRzX2RpciIgXTsgdGhlbgogIG1rZGlyIC1wIC92YXIvbGliL3hpYW94aWEtc2Fhcy1wcm9kdWN0aW9uL3JlcG8vYXBwcy93ZWIvZGlzdC9hc3NldHMKICBmb3IgYXNzZXQgaW4gIiRvbGRfYXNzZXRzX2RpciIvKjsgZG8KICAgIFsgLWUgIiRhc3NldCIgXSB8fCBjb250aW51ZQogICAgbmFtZT0iJChiYXNlbmFtZSAiJGFzc2V0IikiCiAgICBpZiBbICEgLWUgIi92YXIvbGliL3hpYW94aWEtc2Fhcy1wcm9kdWN0aW9uL3JlcG8vYXBwcy93ZWIvZGlzdC9hc3NldHMvJG5hbWUiIF07IHRoZW4KICAgICAgY3AgLWEgIiRhc3NldCIgIi92YXIvbGliL3hpYW94aWEtc2Fhcy1wcm9kdWN0aW9uL3JlcG8vYXBwcy93ZWIvZGlzdC9hc3NldHMvJG5hbWUiCiAgICBmaQogIGRvbmUKICBybSAtcmYgIiRvbGRfYXNzZXRzX2RpciIKZmkKdGVzdCAtZiAvdmFyL2xpYi94aWFveGlhLXNhYXMtcHJvZHVjdGlvbi8uZW52CmNwIC92YXIvbGliL3hpYW94aWEtc2Fhcy1wcm9kdWN0aW9uLy5lbnYgL3Zhci9saWIveGlhb3hpYS1zYWFzLXByb2R1Y3Rpb24vcmVwby8uZW52CkhPU1RfUFJFRklYPSBXRUJfSU1BR0U9InhpYW94aWEtc2Fhcy13ZWI6JHtSRUxFQVNFX1ZFUlNJT059IiBXRUJfSU1BR0VfVEFSPSIvdmFyL2xpYi94aWFveGlhLXNhYXMtcHJvZHVjdGlvbi93ZWItJHtSRUxFQVNFX1ZFUlNJT059LnRhciIgc2ggL3Zhci9saWIveGlhb3hpYS1zYWFzLXByb2R1Y3Rpb24vcmVwby9pbmZyYS9kb2NrZXIvZGVwbG95LXByb2R1Y3Rpb24uc2gKaT0wCndoaWxlIFsgIiRpIiAtbHQgMzAgXTsgZG8KICBpZiB3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo4MDAxL2hlYWx0aDsgdGhlbgogICAgZXhpdCAwCiAgZmkKICBpPSQoKGkgKyAxKSkKICBzbGVlcCAyCmRvbmUKZXhpdCAxCg==' | base64 -d | ssh -i "$key_path" "$production_user@$production_host" "RELEASE_VERSION='${GITHUB_REF_NAME}' sh"
-
-  production-e2e:
-    name: Production Browser E2E
-    runs-on: saas
-    if: startsWith(github.ref, 'refs/tags/v')
-    needs: deploy-production
-
-    steps:
-    - name: Checkout code
-      shell: sh
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        set -eu
-        python3 - <<'PY'
-        import io, os, tarfile, urllib.request
-        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']}"})
-        with urllib.request.urlopen(request, timeout=120) as response:
-            archive = response.read()
-        with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
-            root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
-            for member in tar.getmembers():
-                name = member.name
-                if name == root_prefix[:-1]:
-                    continue
-                if name.startswith(root_prefix):
-                    member.name = name[len(root_prefix):]
-                if member.name:
-                    tar.extract(member, '.')
-        PY
-
-    - name: Run production browser E2E
-      shell: sh
-      run: |
-        set -eu
-        docker run --rm \
-          -e E2E_BASE_URL=https://saas.xiaoxiajianji.com \
-          -e E2E_API_BASE=https://api.xiaoxiajianji.com/api/v1 \
-          -e E2E_BROWSER_CHANNEL=chromium \
-          -v "$PWD:/workspace" \
-          -w /workspace/apps/web \
-          mcr.microsoft.com/playwright:v1.45.0-jammy \
-          sh -lc 'npm ci && npx playwright test --reporter=line --project=chromium e2e/core-upload.spec.ts e2e/core-generation.spec.ts e2e/core-titles.spec.ts'

.gitea/workflows/pr-automation.yml

@@ -0,0 +1,368 @@
+name: PR Automation
+
+on:
+  pull_request:
+    types: [synchronize, opened, ready_for_review, review_requested]
+
+permissions:
+  contents: read
+
+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: 20
+    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: 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: |
+          set -eu
+
+          echo "PR #${PR_NUMBER} - 检查CI状态并自动审批"
+
+          # 检查是否纯前端改动
+          API_URL="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?limit=300"
+          FILES=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" "$API_URL" | python3 -c "import sys,json; [print(f['filename']) for f in json.load(sys.stdin)]")
+          FRONTEND_COUNT=$(echo "$FILES" | grep -c '^apps/web/' || true)
+          BACKEND_COUNT=$(echo "$FILES" | grep -cv '^apps/web/' || true)
+          TOTAL=$(echo "$FILES" | grep -cv '^$' || true)
+          echo "变更文件: ${TOTAL} 个 (前端: ${FRONTEND_COUNT}, 后端/公共: ${BACKEND_COUNT})"
+
+          if [ "$BACKEND_COUNT" = "0" ] && [ "$FRONTEND_COUNT" -gt "0" ]; then
+            SKIP_BACKEND=true
+            echo "✅ 纯前端改动，只检查Frontend Lint"
+          else
+            SKIP_BACKEND=false
+            echo "🔧 包含后端/公共变更，检查全部CI"
+          fi
+
+          # 定义需要检查的context
+          if [ "$SKIP_BACKEND" = "true" ]; then
+            CONTEXTS=("CI/CD Pipeline / Frontend Lint (pull_request)")
+          else
+            CONTEXTS=(
+              "CI/CD Pipeline / Validate Code Quality And Tests (pull_request)"
+              "CI/CD Pipeline / Frontend Lint (pull_request)"
+            )
+          fi
+
+          echo "需要通过的CI检查: ${#CONTEXTS[@]} 项（与分支保护required门禁一致）"
+          for ctx in "${CONTEXTS[@]}"; do
+            echo "  - $ctx"
+          done
+          echo
+
+          # 初始等待30秒，给CI启动写status的时间
+          echo "等待30秒让CI启动..."
+          sleep 30
+
+          # 轮询等待，最多20分钟（120次x10秒）
+          for attempt in $(seq 1 120); do
+            ALL_SUCCESS=true
+            ANY_FAILED=false
+            ANY_PENDING=false
+
+            echo "--- 第${attempt}次检查 ($(date '+%H:%M:%S')) ---"
+
+            # 调用辅助脚本检查每个context状态
+            for ctx in "${CONTEXTS[@]}"; do
+              STATE=$(python3 scripts/check_ci_status.py "$GITHUB_TOKEN" "$GITHUB_REPOSITORY" "$PR_HEAD_SHA" "$ctx")
+              echo "  $ctx: $STATE"
+
+              if [ "$STATE" != "success" ]; then
+                ALL_SUCCESS=false
+              fi
+              if [ "$STATE" = "failure" ] || [ "$STATE" = "error" ]; then
+                ANY_FAILED=true
+              fi
+              if [ "$STATE" = "pending" ] || [ "$STATE" = "null" ]; then
+                ANY_PENDING=true
+              fi
+            done
+
+            if [ "$ALL_SUCCESS" = "true" ]; then
+              echo
+              echo "✅ 所有CI检查通过，自动审批 PR #${PR_NUMBER}"
+
+              # 检查是否已有审批
+              EXISTING=$(curl -s -H "Authorization: token ${REVIEW_TOKEN}" \
+                "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews" \
+                | python3 -c "import sys,json; reviews=json.load(sys.stdin); print('yes' if any(r.get('state')=='APPROVED' for r in reviews) else 'no')")
+
+              if [ "$EXISTING" = "yes" ]; then
+                echo "ℹ️  PR #${PR_NUMBER} 已有审批，跳过"
+                exit 0
+              fi
+
+              # 第一步：创建PENDING review
+              echo "创建review..."
+              REVIEW_CREATE=$(curl -s -X POST \
+                -H "Authorization: token ${REVIEW_TOKEN}" \
+                -H "Content-Type: application/json" \
+                -d '{"event": "PENDING", "body": "CI全绿，自动审批通过。"}' \
+                "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews")
+              
+              REVIEW_ID=$(echo "$REVIEW_CREATE" | python3 -c "import sys,json; print(json.load(sys.stdin).get('id',''))")
+              REVIEW_STATE=$(echo "$REVIEW_CREATE" | python3 -c "import sys,json; print(json.load(sys.stdin).get('state',''))")
+              echo "创建结果: id=$REVIEW_ID state=$REVIEW_STATE"
+
+              if [ -z "$REVIEW_ID" ]; then
+                echo "❌ 创建review失败"
+                echo "$REVIEW_CREATE"
+                exit 1
+              fi
+
+              if [ "$REVIEW_STATE" = "APPROVED" ]; then
+                echo "✅ 自动审批成功（直接创建为APPROVED）"
+                exit 0
+              fi
+
+              # 第二步：submit review为APPROVED
+              echo "提交review审批..."
+              SUBMIT_CODE=$(curl -s -o /tmp/submit_resp.json -w "%{http_code}" \
+                -X POST \
+                -H "Authorization: token ${REVIEW_TOKEN}" \
+                -H "Content-Type: application/json" \
+                -d '{"event": "APPROVED", "body": "CI全绿，自动审批通过。"}' \
+                "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews/${REVIEW_ID}")
+              
+              echo "提交API HTTP状态: $SUBMIT_CODE"
+              cat /tmp/submit_resp.json 2>/dev/null || true
+              echo
+
+              if [ "$SUBMIT_CODE" = "200" ] || [ "$SUBMIT_CODE" = "201" ]; then
+                FINAL_STATE=$(python3 -c "import json; print(json.load(open('/tmp/submit_resp.json')).get('state',''))" 2>/dev/null || echo "?")
+                echo "✅ 自动审批成功 (state: $FINAL_STATE)"
+                exit 0
+              else
+                echo "❌ 提交审批失败"
+                exit 1
+              fi
+            fi
+
+            # 还有CI在跑 → 继续等
+            if [ "$ANY_PENDING" = "true" ]; then
+              echo "⏳ CI仍在运行中，继续等待（第${attempt}/120次轮询）..."
+              sleep 10
+              continue
+            fi
+
+            # 所有CI都跑完了但有失败 → 退出
+            if [ "$ANY_FAILED" = "true" ]; then
+              echo
+              echo "❌ CI检查有失败项，不自动审批"
+              exit 0
+            fi
+
+            sleep 10
+          done
+
+          echo
+          echo "⏰ 等待超时（20分钟），CI尚未全部完成"
+          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
+
+  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: 30
+    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: 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: |
+          set -eu
+
+          echo "PR #${PR_NUMBER} - 检查CI状态+审批并自动合并到${BASE_REF}"
+          echo
+
+          # 只合develop分支
+          if [ "$BASE_REF" != "develop" ]; then
+            echo "Skip: 目标分支不是develop"
+            exit 0
+          fi
+
+          # 判断是否纯前端改动
+          FILES=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
+            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?limit=300" \
+            | python3 -c "import sys,json; [print(f['filename']) for f in json.load(sys.stdin)]")
+          TOTAL=$(echo "$FILES" | grep -cv '^$' || true)
+          FRONTEND_COUNT=$(echo "$FILES" | grep -c '^apps/web/' || true)
+          BACKEND_COUNT=$((TOTAL - FRONTEND_COUNT))
+          echo "变更文件: ${TOTAL} 个 (前端: ${FRONTEND_COUNT}, 后端/公共: ${BACKEND_COUNT})"
+
+          if [ "$BACKEND_COUNT" = "0" ] && [ "$FRONTEND_COUNT" -gt "0" ]; then
+            CONTEXTS=("CI/CD Pipeline / Frontend Lint (pull_request)")
+            echo "纯前端改动，只检查Frontend Lint"
+          else
+            CONTEXTS=(
+              "CI/CD Pipeline / Validate Code Quality And Tests (pull_request)"
+              "CI/CD Pipeline / Frontend Lint (pull_request)"
+              "CI/CD Pipeline / PR Build API Image (pull_request)"
+              "CI/CD Pipeline / PR Build Worker Image (pull_request)"
+              "CI/CD Pipeline / PR Build Web Image (pull_request)"
+            )
+            echo "检查required门禁（与分支保护一致）"
+          fi
+          echo
+
+          # 初始等待30秒，给CI启动写status的时间
+          echo "等待30秒让CI启动..."
+          sleep 30
+
+          # 405连续计数器
+          MERGE_405_COUNT=0
+          MAX_405_RETRIES=10
+
+          # 轮询等待，最多30分钟（180次x10秒）
+          for attempt in $(seq 1 180); do
+            ALL_SUCCESS=true
+            ANY_FAILED=false
+            ANY_PENDING=false
+
+            echo "--- 第${attempt}次检查 ($(date '+%H:%M:%S')) ---"
+
+            # 检查CI状态
+            for ctx in "${CONTEXTS[@]}"; do
+              STATE=$(python3 scripts/check_ci_status.py "$GITHUB_TOKEN" "$GITHUB_REPOSITORY" "$PR_HEAD_SHA" "$ctx")
+              echo "  CI: ${ctx##*/}: $STATE"
+              if [ "$STATE" != "success" ]; then
+                ALL_SUCCESS=false
+              fi
+              if [ "$STATE" = "failure" ] || [ "$STATE" = "error" ]; then
+                ANY_FAILED=true
+              fi
+              if [ "$STATE" = "pending" ]; then
+                ANY_PENDING=true
+              fi
+            done
+
+            # 检查审批状态
+            APPROVAL_RESULT=$(python3 scripts/check_pr_approval.py "$MERGE_TOKEN" "$GITHUB_REPOSITORY" "$PR_NUMBER" 1)
+            echo "  审批: $APPROVAL_RESULT"
+            HAS_APPROVAL=false
+            if echo "$APPROVAL_RESULT" | grep -q '^approved'; then
+              HAS_APPROVAL=true
+            fi
+
+            # 全部满足 → 合并
+            if [ "$ALL_SUCCESS" = "true" ] && [ "$HAS_APPROVAL" = "true" ]; then
+              echo
+              echo "CI全绿 + 审批通过，执行自动合并"
+              echo "等待60秒冷却，给Gitea内部状态同步时间..."
+              sleep 60
+
+              # 幂等检查：PR是否还是open
+              PR_STATE=$(curl -s -H "Authorization: token ${MERGE_TOKEN}" \
+                "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}" \
+                | python3 -c "import sys,json; print(json.load(sys.stdin).get('state',''))")
+
+              if [ "$PR_STATE" != "open" ]; then
+                echo "PR状态为 ${PR_STATE}，无需合并"
+                exit 0
+              fi
+
+              # 执行squash merge
+              HTTP_CODE=$(curl -s -o /tmp/merge_resp.json -w "%{http_code}" \
+                -X POST \
+                -H "Authorization: token ${MERGE_TOKEN}" \
+                -H "Content-Type: application/json" \
+                -d '{"do":"squash","merge_title_field":"","merge_message_field":"","delete_branch_after_merge":true,"force_merge":false}' \
+                "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/merge")
+
+              echo "合并API HTTP状态: $HTTP_CODE"
+
+              if [ "$HTTP_CODE" = "200" ]; then
+                echo "自动合并成功"
+                exit 0
+              elif [ "$HTTP_CODE" = "405" ]; then
+                MERGE_405_COUNT=$((MERGE_405_COUNT + 1))
+                echo "⚠️  合并返回405（第${MERGE_405_COUNT}次），可能CI状态尚未同步或有未解决的门禁，继续等待重试..."
+                cat /tmp/merge_resp.json 2>/dev/null || true
+                echo
+                if [ "$MERGE_405_COUNT" -ge "$MAX_405_RETRIES" ]; then
+                  echo "⚠️  连续${MAX_405_RETRIES}次合并返回405，放弃自动合并（需人工确认，非代码问题）"
+                  curl -s -X POST \
+                    -H "Authorization: token ${MERGE_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    -d '{"body": "Auto merge skipped after multiple 405 errors: PR may have conflicts or unresolved checks. Please review manually. This is not a CI failure."}' \
+                    "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments" > /dev/null 2>&1 || true
+                  exit 0
+                fi
+                sleep 30
+                continue
+              else
+                echo "自动合并失败 (HTTP $HTTP_CODE)"
+                cat /tmp/merge_resp.json 2>/dev/null || true
+                curl -s -X POST \
+                  -H "Authorization: token ${MERGE_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -d "{\"body\": \"Auto merge failed (HTTP ${HTTP_CODE}), please check manually.\"}" \
+                  "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments" > /dev/null 2>&1 || true
+                exit 1
+              fi
+            else
+              # 本轮不满足合并条件，重置405计数器
+              MERGE_405_COUNT=0
+            fi
+
+            if [ "$ANY_FAILED" = "true" ]; then
+              echo
+              echo "CI有失败项，不自动合并"
+              exit 0
+            fi
+
+            sleep 10
+          done
+
+          echo
+          echo "等待超时（30分钟）"
+          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/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:-172.30.18.197}"
+        preview_user="${PREVIEW_SSH_USER:-deploy}"
+        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 ci"
+            fi
+            if [ "$CACHE_VALID" = "false" ]; then
+              echo "Cache miss or invalid: running npm ci..."
+              if ! npm ci --include=dev; then
+                echo "npm ci failed, cleaning node_modules and retrying..."
+                rm -rf node_modules
+                mkdir -p node_modules
+                npm ci --include=dev
+              fi
+              echo "$PACKAGE_LOCK_HASH" > "$CACHE_HASH_FILE"
+              echo "Dependencies installed, cache updated"
+            fi
+            echo "Running TypeScript check..."
+            npx --no-install tsc
+            echo "Running Vite build..."
+            npx --no-install vite build
+            echo "Build completed successfully"
+            ls -la dist/
+          '
+
+    - name: Install SSH client and rsync
+      shell: sh
+      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/test-ssh-secret.yml

@@ -1,69 +0,0 @@
-name: Test SSH Secret
-on:
-  push:
-    branches: [develop]
-    paths:
-      - '.gitea/workflows/test-ssh-secret.yml'
-
-jobs:
-  test-ssh:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Install SSH client
-        run: |
-          which ssh || (apt-get update && apt-get install -y openssh-client)
-          ssh -V
-
-      - name: Debug environment
-        run: |
-          echo "=== Environment ==="
-          echo "Runner hostname: $(hostname)"
-          echo "Runner IP: $(hostname -i || echo 'unknown')"
-          echo "Current user: $(whoami)"
-          echo "=== Secrets check ==="
-          if [ -n "$STAGING_SSH_HOST" ]; then
-            echo "STAGING_SSH_HOST: [SET] value_length=${#STAGING_SSH_HOST}"
-          else
-            echo "STAGING_SSH_HOST: [EMPTY]"
-          fi
-          if [ -n "$STAGING_SSH_USER" ]; then
-            echo "STAGING_SSH_USER: [SET] value_length=${#STAGING_SSH_USER}"
-          else
-            echo "STAGING_SSH_USER: [EMPTY]"
-          fi
-          if [ -n "$STAGING_SSH_KEY" ]; then
-            echo "STAGING_SSH_KEY: [SET] value_length=${#STAGING_SSH_KEY}"
-          else
-            echo "STAGING_SSH_KEY: [EMPTY]"
-          fi
-        env:
-          STAGING_SSH_HOST: ${{ secrets.STAGING_SSH_HOST }}
-          STAGING_SSH_USER: ${{ secrets.STAGING_SSH_USER }}
-          STAGING_SSH_KEY: ${{ secrets.STAGING_SSH_KEY }}
-
-      - name: Setup SSH key
-        run: |
-          mkdir -p ~/.ssh
-          chmod 700 ~/.ssh
-          echo "$STAGING_SSH_KEY" > ~/.ssh/id_ed25519
-          chmod 600 ~/.ssh/id_ed25519
-          ssh-keygen -y -f ~/.ssh/id_ed25519 > ~/.ssh/id_ed25519.pub 2>/dev/null || echo "No public key generated"
-          echo "=== SSH Key fingerprint ==="
-          ssh-keygen -lf ~/.ssh/id_ed25519 || echo "Key fingerprint failed"
-        env:
-          STAGING_SSH_KEY: ${{ secrets.STAGING_SSH_KEY }}
-
-      - name: Test SSH connection
-        run: |
-          echo "Attempting SSH connection to $STAGING_SSH_HOST..."
-          ssh -i ~/.ssh/id_ed25519 \
-            -o StrictHostKeyChecking=no \
-            -o UserKnownHostsFile=/dev/null \
-            -o ConnectTimeout=10 \
-            -o BatchMode=yes \
-            -v \
-            $STAGING_SSH_USER@$STAGING_SSH_HOST "echo 'SSH_CONNECTION_SUCCESS' && hostname && whoami"
-          echo "=== SSH Test Complete ==="
-        env:
-          STAGING_SSH_HOST: ${{ secrets.STAGING_SSH_HOST }}
-          STAGING_SSH_USER: ${{ secrets.STAGING_SSH_USER }}

.gitea/workflows/tests.yml

@@ -1,107 +0,0 @@
-name: Tests
-
-on:
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  test:
-    runs-on: runtime-builder
-
-    steps:
-    - name: Checkout code
-      shell: sh
-      run: |
-        set -eu
-        python - <<'PY'
-        import io
-        import os
-        import tarfile
-        import urllib.request
-
-        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']}"})
-        with urllib.request.urlopen(request, timeout=120) as response:
-            archive = response.read()
-
-        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: Show Python version
-      shell: sh
-      run: |
-        set -eu
-        python --version
-        python -m pip --version
-
-    - name: Install dependencies
-      shell: sh
-      run: |
-        set -eu
-        python -m pip install --upgrade pip -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
-        python -m pip install -r requirements.txt -r requirements-dev.txt -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
-
-    - name: Run tests
-      shell: sh
-      run: |
-        set -eu
-        PYTHONPATH="$PWD/apps/api:$PWD" python -m pytest tests/unit -q
-
-  lint:
-    runs-on: runtime-builder
-
-    steps:
-    - name: Checkout code
-      shell: sh
-      run: |
-        set -eu
-        python - <<'PY'
-        import io
-        import os
-        import tarfile
-        import urllib.request
-
-        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']}"})
-        with urllib.request.urlopen(request, timeout=120) as response:
-            archive = response.read()
-
-        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: Install dependencies
-      shell: sh
-      run: |
-        set -eu
-        python -m pip install --upgrade pip -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
-        python -m pip install -r requirements.txt -r requirements-dev.txt -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
-
-    - name: Run Black (check only)
-      shell: sh
-      run: |
-        set -eu
-        python -m black --check alembic apps packages tests scripts
-
-    - name: Run Flake8
-      shell: sh
-      run: |
-        set -eu
-        python -m flake8 apps packages tests --count --statistics

.gitignore

@@ -6,6 +6,7 @@ dist/
 coverage/
 
 # Python / backend
+.cache/
 .venv/
 venv/
 .venv-ci-root/
@@ -47,3 +48,9 @@ build/
 # Tracker temp files
 tracker_tasks.json
 
+frontend-v21-ui-prototype-final.html
+
+!.vscode/
+!.vscode/settings.json
+.vscode/extensions.json
+.coverage

.pre-commit-config.yaml

@@ -0,0 +1,29 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 26.5.1
+    hooks:
+      - id: black
+        language_version: python3.12
+
+  - repo: https://github.com/pycqa/isort
+    rev: 8.0.1
+    hooks:
+      - id: isort
+        args: ["--profile", "black"]
+        language_version: python3.12
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.14.0
+    hooks:
+      - id: ruff
+        args: [--fix]
+        language_version: python3.12
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.11
+    hooks:
+      - id: prettier
+        name: prettier (frontend)
+        files: ^apps/web/.*\.(ts|tsx|js|jsx|css|scss|less|json|html|md|yaml|yml)$
+        additional_dependencies:
+          - prettier@3.4.2

.vscode/settings.json

@@ -0,0 +1,49 @@
+{
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit"
+    }
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[css]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[scss]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[html]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[markdown]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "prettier.requireConfig": true,
+  "isort.args": ["--profile", "black"],
+  "python.linting.ruffEnabled": true,
+  "python.analysis.typeCheckingMode": "basic"
+}

CHANGELOG.md

@@ -1,3 +1,61 @@
+## [v0.1.110] - 2026-07-03
+
+### 🔒 安全修复
+
+- 注册登录接口添加 RateLimitMiddleware 防止暴力破解
+- JWT logout 黑名单机制，防止令牌重放攻击
+- 生产环境禁用 Swagger 文档防止信息泄露
+- `/metrics` 端点添加 Bearer Token 认证
+- 禁用 SVG 上传防止 XSS 风险
+- 删除 `decode_token_unsafe()` 方法，消除不安全的 JWT 解码
+- 移除遗留 `tasks.py` 消除 Celery 任务名冲突
+- 清理全局 `except:pass`（22处）改为 `logger.warning` 记录异常
+
+### ✨ 功能
+
+- 添加剪辑计划时间线场景 API (`GET /edit-plans/{id}/timeline`)
+- 前端对接真实 API 替换 mock 数据
+
+### 🐛 Bug 修复
+
+- **[P1]** 修复登录故障 — `password_hasher` 导入错误
+- 订阅续费事务修复 — 支付回调在数据库事务中更新订阅状态
+- 账单返回空数组修复 — 从数据库查询账单记录
+- 修复 `Image.open()` 资源泄漏
+- 清理已移除 workspace 概念的残留引用
+- 修复 AssetLibrary/TemplateLibrary 类型错误
+- 修复前端 workspace 残留导致项目创建失败
+- 永久修复 nginx `proxy_pass` 配置
+- 添加 Docker DNS resolver 防止 API 容器重启后 502
+- 修复 worker healthcheck YAML 语法
+- 修复 204 响应体断言崩溃
+- 修复 Alembic 元数据漂移检测
+- 修复 migration 009 DEFAULT 表达式 PostgreSQL 兼容性
+
+### 🔄 重构与清理
+
+- 后端代码清理 — 移除死代码和无用文件
+- 前端代码清理 — 移除无用代码和遗留 demo
+- 代码精简优化 — 移除无用代码和重复定义
+- 后端代码 black/isort 格式化
+
+### 🧪 测试
+
+- 完善 E2E 错误场景测试，Playwright 接入 CI
+- API 集成测试补充（145 项通过）
+- 添加核心流程 E2E 测试
+
+### 🚀 CI/CD & 基础设施
+
+- Validate 阶段添加 PostgreSQL 服务支持
+- 所有 workflow checkout 添加 5 次指数退避重试
+- 启用 BuildKit 分布式缓存 + Gitea Registry 优化构建速度
+- Deploy 阶段全面修复（E2E 服务器/Worker venv/Registry 登录）
+- Docker 网络隔离 staging/production 环境
+- 修复 CI 代码质量检查（black/flake8/bandit）
+
+---
+
 ## [v0.1.88] - 2026-06-29
 
 ### Phase 2 前端优化 - 完成 ✅

alembic/versions/009_remove_workspace_concept.py

@@ -30,11 +30,11 @@ def upgrade() -> None:
     # Step 1: Add subscription/quota fields to users table
     conn.execute(text("""
         ALTER TABLE users
-        ADD COLUMN IF NOT EXISTS subscription_plan VARCHAR(20) NOT NULL DEFAULT free
+        ADD COLUMN IF NOT EXISTS subscription_plan VARCHAR(20) NOT NULL DEFAULT 'free'
     """))
     conn.execute(text("""
         ALTER TABLE users
-        ADD COLUMN IF NOT EXISTS subscription_status VARCHAR(20) NOT NULL DEFAULT active
+        ADD COLUMN IF NOT EXISTS subscription_status VARCHAR(20) NOT NULL DEFAULT 'active'
     """))
     conn.execute(text("""
         ALTER TABLE users
@@ -138,8 +138,8 @@ def downgrade() -> None:
             id VARCHAR(36) PRIMARY KEY,
             name VARCHAR(100) NOT NULL,
             owner_user_id VARCHAR(36) NOT NULL,
-            subscription_plan VARCHAR(20) NOT NULL DEFAULT free,
-            subscription_status VARCHAR(20) NOT NULL DEFAULT active,
+            subscription_plan VARCHAR(20) NOT NULL DEFAULT 'free',
+            subscription_status VARCHAR(20) NOT NULL DEFAULT 'active',
             subscription_expires_at TIMESTAMP,
             max_projects FLOAT NOT NULL DEFAULT 3,
             max_storage_gb FLOAT NOT NULL DEFAULT 10,
@@ -168,7 +168,7 @@ def downgrade() -> None:
             invitee_email VARCHAR(255) NOT NULL,
             role VARCHAR(20) NOT NULL,
             invitation_token VARCHAR(255) NOT NULL UNIQUE,
-            status VARCHAR(20) NOT NULL DEFAULT pending,
+            status VARCHAR(20) NOT NULL DEFAULT 'pending',
             expires_at TIMESTAMP,
             accepted_at TIMESTAMP,
             created_at TIMESTAMP NOT NULL DEFAULT NOW()

alembic/versions/016_phase8_edit_template_plan.py

@@ -6,6 +6,7 @@ Create Date: 2026-07-01
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
 revision = "016"

alembic/versions/017_phase8_clip_config_plan_clip.py

@@ -9,9 +9,10 @@ Create Date: 2026-07-01
 - edit_plan_clips: 剪辑计划片段（剪辑计划中的具体片段实例）
 """
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
+
 revision = "017"
 down_revision = "016"
 branch_labels = None

alembic/versions/018_add_jobs_table.py

@@ -7,9 +7,10 @@ Create Date: 2026-07-01
 新增 jobs 表，用于统一管理异步任务（视频合成、渲染等）的生命周期。
 """
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
+
 revision = "018"
 down_revision = "017"
 branch_labels = None

alembic/versions/019_add_voice_clone_profiles_table.py

@@ -7,9 +7,10 @@ Create Date: 2026-07-02
 新增 voice_clone_profiles 表，用于存储音色克隆档案。
 """
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
+
 revision = "019"
 down_revision = "018"
 branch_labels = None

alembic/versions/020_add_tts_jobs_table.py

@@ -7,9 +7,10 @@ Create Date: 2026-07-02
 新增 tts_jobs 表，用于存储 TTS 合成任务。
 """
 
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
+
 revision = "020"
 down_revision = "019"
 branch_labels = None

alembic/versions/021_add_billing_records_table.py

@@ -0,0 +1,43 @@
+"""Task 3.09: Create billing_records table
+
+Revision ID: 021
+Revises: 020
+Create Date: 2026-07-03
+
+新增 billing_records 表，用于存储账单记录。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "021"
+down_revision = "020"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "billing_records",
+        sa.Column("id", sa.String(36), primary_key=True),
+        sa.Column("user_id", sa.String(36), nullable=False, index=True),
+        sa.Column("plan_name", sa.String(50), nullable=False),
+        sa.Column("amount", sa.Float, nullable=False),
+        sa.Column("billing_cycle", sa.String(20), nullable=False),
+        sa.Column("status", sa.String(20), nullable=False, server_default="pending"),
+        sa.Column("payment_method", sa.String(50), nullable=True),
+        sa.Column("payment_id", sa.String(100), nullable=True),
+        sa.Column("invoice_url", sa.String(500), nullable=True),
+        sa.Column(
+            "created_at",
+            sa.DateTime(),
+            nullable=False,
+            server_default=sa.func.now(),
+        ),
+        sa.Column("paid_at", sa.DateTime(), nullable=True),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("billing_records")

alembic/versions/022_add_source_edit_plan_id.py

@@ -0,0 +1,56 @@
+"""Task: Add source_edit_plan_id to edit_plans and generation_tasks
+
+Revision ID: 022
+Revises: 021
+Create Date: 2026-07-04
+
+新增 source_edit_plan_id 字段到 edit_plans 和 generation_tasks 表，
+用于关联生成记录到其来源的剪辑计划。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "022"
+down_revision = "021"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "edit_plans",
+        sa.Column("source_edit_plan_id", sa.String(32), nullable=True),
+    )
+    op.create_index(
+        op.f("ix_edit_plans_source_edit_plan_id"),
+        "edit_plans",
+        ["source_edit_plan_id"],
+        unique=False,
+    )
+
+    op.add_column(
+        "generation_tasks",
+        sa.Column("source_edit_plan_id", sa.String(32), nullable=True),
+    )
+    op.create_index(
+        op.f("ix_generation_tasks_source_edit_plan_id"),
+        "generation_tasks",
+        ["source_edit_plan_id"],
+        unique=False,
+    )
+
+
+def downgrade() -> None:
+    op.drop_index(
+        op.f("ix_generation_tasks_source_edit_plan_id"),
+        table_name="generation_tasks",
+    )
+    op.drop_column("generation_tasks", "source_edit_plan_id")
+
+    op.drop_index(
+        op.f("ix_edit_plans_source_edit_plan_id"),
+        table_name="edit_plans",
+    )
+    op.drop_column("edit_plans", "source_edit_plan_id")

alembic/versions/023_add_edit_plan_project_and_user.py

@@ -0,0 +1,56 @@
+"""Task: Add project_id and created_by_user_id to edit_plans
+
+Revision ID: 023
+Revises: 022
+Create Date: 2026-07-05
+
+新增 project_id 和 created_by_user_id 字段到 edit_plans 表，
+用于项目归属鉴权和用户归属追踪，修复审计发现的 P1 越权漏洞。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "023"
+down_revision = "022"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "edit_plans",
+        sa.Column("project_id", sa.String(32), nullable=False, server_default=""),
+    )
+    op.create_index(
+        op.f("ix_edit_plans_project_id"),
+        "edit_plans",
+        ["project_id"],
+        unique=False,
+    )
+
+    op.add_column(
+        "edit_plans",
+        sa.Column("created_by_user_id", sa.String(32), nullable=False, server_default=""),
+    )
+    op.create_index(
+        op.f("ix_edit_plans_created_by_user_id"),
+        "edit_plans",
+        ["created_by_user_id"],
+        unique=False,
+    )
+
+
+def downgrade() -> None:
+    op.drop_index(
+        op.f("ix_edit_plans_created_by_user_id"),
+        table_name="edit_plans",
+    )
+    op.drop_column("edit_plans", "created_by_user_id")
+
+    op.drop_index(
+        op.f("ix_edit_plans_project_id"),
+        table_name="edit_plans",
+    )
+    op.drop_column("edit_plans", "project_id")

alembic/versions/024_add_user_is_admin.py

@@ -0,0 +1,28 @@
+"""Task: Add is_admin to users
+
+Revision ID: 024
+Revises: 023
+Create Date: 2026-07-05
+
+新增 is_admin 字段到 users 表，用于模板管理等管理员权限校验。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "024"
+down_revision = "023"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "users",
+        sa.Column("is_admin", sa.Boolean(), nullable=False, server_default=sa.text("false")),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("users", "is_admin")

alembic/versions/025_add_user_wechat_fields.py

@@ -0,0 +1,79 @@
+"""Task: Add wechat_openid / wechat_unionid to users
+
+Revision ID: 025
+Revises: 024
+Create Date: 2026-07-05
+
+补录微信小程序登录所需的 wechat 字段。
+生产数据库已手动添加过这些字段和索引，因此 upgrade 做幂等检查，
+避免在已有字段的库上执行报错。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "025"
+down_revision = "024"
+branch_labels = None
+depends_on = None
+
+
+def _column_exists(table: str, column: str) -> bool:
+    """检查列是否已存在。离线模式下返回 False。"""
+    conn = op.get_bind()
+    try:
+        result = conn.execute(
+            sa.text("SELECT 1 FROM information_schema.columns " "WHERE table_name = :table AND column_name = :column"),
+            {"table": table, "column": column},
+        )
+        if result is None:
+            return False
+        return result.scalar() is not None
+    except Exception:
+        return False
+
+
+def _index_exists(index: str) -> bool:
+    """检查索引是否已存在。离线模式下返回 False。"""
+    conn = op.get_bind()
+    try:
+        result = conn.execute(
+            sa.text("SELECT 1 FROM pg_indexes WHERE indexname = :index"),
+            {"index": index},
+        )
+        if result is None:
+            return False
+        return result.scalar() is not None
+    except Exception:
+        return False
+
+
+def upgrade() -> None:
+    # wechat_openid
+    if not _column_exists("users", "wechat_openid"):
+        op.add_column(
+            "users",
+            sa.Column("wechat_openid", sa.String(length=128), nullable=True),
+        )
+
+    # wechat_unionid
+    if not _column_exists("users", "wechat_unionid"):
+        op.add_column(
+            "users",
+            sa.Column("wechat_unionid", sa.String(length=128), nullable=True),
+        )
+
+    # 唯一索引
+    if not _index_exists("ix_users_wechat_openid"):
+        op.create_index("ix_users_wechat_openid", "users", ["wechat_openid"], unique=True)
+
+    if not _index_exists("ix_users_wechat_unionid"):
+        op.create_index("ix_users_wechat_unionid", "users", ["wechat_unionid"], unique=True)
+
+
+def downgrade() -> None:
+    op.drop_index("ix_users_wechat_unionid", table_name="users")
+    op.drop_index("ix_users_wechat_openid", table_name="users")
+    op.drop_column("users", "wechat_unionid")
+    op.drop_column("users", "wechat_openid")

alembic/versions/026_add_user_profile_fields.py

@@ -0,0 +1,56 @@
+"""Add user profile fields (name, avatar, updated_at)
+
+Revision ID: 026
+Revises: 025
+Create Date: 2026-07-05
+
+补录用户资料字段。生产数据库已手动添加过这些字段，
+因此 upgrade 做幂等检查，避免在已有字段的库上执行报错。
+"""
+
+import sqlalchemy as sa
+
+from alembic import context, op
+
+revision = "026"
+down_revision = "025"
+branch_labels = None
+depends_on = None
+
+
+def _column_exists(table: str, column: str) -> bool:
+    if context.is_offline_mode():
+        return False
+    conn = op.get_bind()
+    result = conn.execute(
+        sa.text(
+            "SELECT COUNT(*) FROM information_schema.columns " "WHERE table_name = :table AND column_name = :column"
+        ),
+        {"table": table, "column": column},
+    )
+    return result.scalar() > 0
+
+
+def upgrade() -> None:
+    if not _column_exists("users", "name"):
+        op.add_column("users", sa.Column("name", sa.String(100), nullable=True))
+
+    if not _column_exists("users", "avatar"):
+        op.add_column("users", sa.Column("avatar", sa.String(500), nullable=True))
+
+    if not _column_exists("users", "updated_at"):
+        op.add_column(
+            "users",
+            sa.Column(
+                "updated_at",
+                sa.DateTime(),
+                nullable=True,
+                server_default=sa.func.now(),
+            ),
+        )
+
+
+def downgrade() -> None:
+    op.drop_column("users", "updated_at")
+    op.drop_column("users", "avatar")
+    op.drop_column("users", "name")

alembic/versions/027_add_user_ban_fields.py

@@ -0,0 +1,44 @@
+"""Add user ban fields (ban_reason, ban_at)
+
+Revision ID: 027
+Revises: 026
+Create Date: 2026-07-05
+
+补录用户封禁字段。生产数据库已手动添加过这些字段，
+因此 upgrade 做幂等检查。
+"""
+
+import sqlalchemy as sa
+
+from alembic import context, op
+
+revision = "027"
+down_revision = "026"
+branch_labels = None
+depends_on = None
+
+
+def _column_exists(table: str, column: str) -> bool:
+    if context.is_offline_mode():
+        return False
+    conn = op.get_bind()
+    result = conn.execute(
+        sa.text(
+            "SELECT COUNT(*) FROM information_schema.columns " "WHERE table_name = :table AND column_name = :column"
+        ),
+        {"table": table, "column": column},
+    )
+    return result.scalar() > 0
+
+
+def upgrade() -> None:
+    if not _column_exists("users", "ban_reason"):
+        op.add_column("users", sa.Column("ban_reason", sa.Text(), nullable=True))
+
+    if not _column_exists("users", "ban_at"):
+        op.add_column("users", sa.Column("ban_at", sa.DateTime(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("users", "ban_at")
+    op.drop_column("users", "ban_reason")

alembic/versions/028_add_user_admin_fields.py

@@ -0,0 +1,44 @@
+"""Add user admin fields (admin_status, admin_remarks)
+
+Revision ID: 028
+Revises: 027
+Create Date: 2026-07-05
+
+补录管理员备注字段。生产数据库已手动添加过这些字段，
+因此 upgrade 做幂等检查。
+"""
+
+import sqlalchemy as sa
+
+from alembic import context, op
+
+revision = "028"
+down_revision = "027"
+branch_labels = None
+depends_on = None
+
+
+def _column_exists(table: str, column: str) -> bool:
+    if context.is_offline_mode():
+        return False
+    conn = op.get_bind()
+    result = conn.execute(
+        sa.text(
+            "SELECT COUNT(*) FROM information_schema.columns " "WHERE table_name = :table AND column_name = :column"
+        ),
+        {"table": table, "column": column},
+    )
+    return result.scalar() > 0
+
+
+def upgrade() -> None:
+    if not _column_exists("users", "admin_status"):
+        op.add_column("users", sa.Column("admin_status", sa.String(50), nullable=True))
+
+    if not _column_exists("users", "admin_remarks"):
+        op.add_column("users", sa.Column("admin_remarks", sa.Text(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("users", "admin_remarks")
+    op.drop_column("users", "admin_status")

alembic/versions/029_add_user_phone.py

@@ -0,0 +1,40 @@
+"""Add user phone field
+
+Revision ID: 029
+Revises: 028
+Create Date: 2026-07-05
+
+补录用户手机号字段。生产数据库已手动添加过该字段，
+因此 upgrade 做幂等检查。
+"""
+
+import sqlalchemy as sa
+
+from alembic import context, op
+
+revision = "029"
+down_revision = "028"
+branch_labels = None
+depends_on = None
+
+
+def _column_exists(table: str, column: str) -> bool:
+    if context.is_offline_mode():
+        return False
+    conn = op.get_bind()
+    result = conn.execute(
+        sa.text(
+            "SELECT COUNT(*) FROM information_schema.columns " "WHERE table_name = :table AND column_name = :column"
+        ),
+        {"table": table, "column": column},
+    )
+    return result.scalar() > 0
+
+
+def upgrade() -> None:
+    if not _column_exists("users", "phone"):
+        op.add_column("users", sa.Column("phone", sa.String(20), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("users", "phone")

alembic/versions/030_add_tags_and_asset_tags.py

@@ -0,0 +1,68 @@
+"""Add tags and asset_tags tables
+
+Revision ID: 030
+Revises: 029
+Create Date: 2026-07-07
+
+新增标签表和素材-标签关联表，支持规范化多对多标签管理。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "030"
+down_revision = "029"
+branch_labels = None
+depends_on = None
+
+
+def _table_exists(table: str) -> bool:
+    ctx = op.get_context()
+    if ctx.as_sql:
+        return False
+    conn = op.get_bind()
+    result = conn.execute(
+        sa.text("SELECT COUNT(*) FROM information_schema.tables WHERE table_name = :table"),
+        {"table": table},
+    )
+    return (result.scalar() or 0) > 0
+
+
+def upgrade() -> None:
+    if not _table_exists("tags"):
+        op.create_table(
+            "tags",
+            sa.Column("id", sa.String(36), primary_key=True),
+            sa.Column("user_id", sa.String(36), nullable=False),
+            sa.Column("name", sa.String(100), nullable=False),
+            sa.Column(
+                "created_at",
+                sa.DateTime(),
+                nullable=False,
+                server_default=sa.func.now(),
+            ),
+            sa.UniqueConstraint("user_id", "name", name="uq_tags_user_name"),
+        )
+        op.create_index("ix_tags_user_id", "tags", ["user_id"])
+
+    if not _table_exists("asset_tags"):
+        op.create_table(
+            "asset_tags",
+            sa.Column("asset_id", sa.String(36), primary_key=True),
+            sa.Column("tag_id", sa.String(36), primary_key=True),
+            sa.Column(
+                "created_at",
+                sa.DateTime(),
+                nullable=False,
+                server_default=sa.func.now(),
+            ),
+        )
+        op.create_index("ix_asset_tags_tag_id", "asset_tags", ["tag_id"])
+
+
+def downgrade() -> None:
+    op.drop_index("ix_asset_tags_tag_id", table_name="asset_tags")
+    op.drop_table("asset_tags")
+    op.drop_index("ix_tags_user_id", table_name="tags")
+    op.drop_table("tags")

alembic/versions/031_add_file_hash_to_assets_and_ing_jobs.py

@@ -0,0 +1,33 @@
+"""Add file_hash to assets and ingest_jobs
+
+Revision ID: 031
+Revises: 030
+Create Date: 2026-07-07
+
+为素材去重检测功能添加 file_hash 字段。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "031"
+down_revision = "030"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("assets", sa.Column("file_hash", sa.String(64), nullable=True))
+    op.create_index(op.f("ix_assets_file_hash"), "assets", ["file_hash"])
+
+    op.add_column("ingest_jobs", sa.Column("file_hash", sa.String(64), nullable=True))
+    op.create_index(op.f("ix_ingest_jobs_file_hash"), "ingest_jobs", ["file_hash"])
+
+
+def downgrade() -> None:
+    op.drop_index(op.f("ix_ingest_jobs_file_hash"), table_name="ingest_jobs")
+    op.drop_column("ingest_jobs", "file_hash")
+
+    op.drop_index(op.f("ix_assets_file_hash"), table_name="assets")
+    op.drop_column("assets", "file_hash")

alembic/versions/032_add_asset_select_mode_to_generation_tasks.py

@@ -0,0 +1,28 @@
+"""Add asset_select_mode to generation_tasks
+
+Revision ID: 032
+Revises: 031
+Create Date: 2026-07-07
+
+素材库自动匹配功能：为 generation_tasks 表添加 asset_select_mode 字段。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "032"
+down_revision = "031"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "generation_tasks",
+        sa.Column("asset_select_mode", sa.String(20), nullable=False, server_default=""),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("generation_tasks", "asset_select_mode")

alembic/versions/033_add_batch_id_to_generation_tasks.py

@@ -0,0 +1,31 @@
+"""Add batch_id to generation_tasks
+
+Revision ID: 033
+Revises: 032
+Create Date: 2026-07-07
+
+视频查重功能：为 generation_tasks 表添加 batch_id 字段，
+用于关联同一次批量生成请求中的多个任务。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "033"
+down_revision = "032"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "generation_tasks",
+        sa.Column("batch_id", sa.String(32), nullable=False, server_default=""),
+    )
+    op.create_index(op.f("ix_generation_tasks_batch_id"), "generation_tasks", ["batch_id"])
+
+
+def downgrade() -> None:
+    op.drop_index(op.f("ix_generation_tasks_batch_id"), table_name="generation_tasks")
+    op.drop_column("generation_tasks", "batch_id")

alembic/versions/034_cms_enhance_placeholder.py

@@ -0,0 +1,28 @@
+"""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

@@ -0,0 +1,26 @@
+"""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

@@ -0,0 +1,68 @@
+"""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

@@ -0,0 +1,26 @@
+"""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")

alembic/versions/038_add_error_info_and_retry_to_generation_tasks.py

@@ -0,0 +1,47 @@
+"""add error_info and retry fields to generation_tasks
+
+Revision ID: 038_error_retry
+Revises: 037_generation_logs
+Create Date: 2026-07-13 22:15:00.000000
+"""
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.mysql import JSON as MySQLJSON
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "038_error_retry"
+down_revision = "037_generation_logs"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # error_info: 结构化错误信息（error_type, message, stack_trace, failed_at, stage等）
+    op.add_column(
+        "generation_tasks",
+        sa.Column("error_info", sa.JSON(), nullable=True),
+    )
+    # retry_count: 重试次数
+    op.add_column(
+        "generation_tasks",
+        sa.Column("retry_count", sa.Integer(), nullable=False, server_default="0"),
+    )
+    # auto_retry_enabled: 是否开启自动重试
+    op.add_column(
+        "generation_tasks",
+        sa.Column("auto_retry_enabled", sa.Boolean(), nullable=False, server_default=sa.text("false")),
+    )
+    # auto_retry_max: 最大自动重试次数
+    op.add_column(
+        "generation_tasks",
+        sa.Column("auto_retry_max", sa.Integer(), nullable=False, server_default="0"),
+    )
+
+
+def downgrade():
+    op.drop_column("generation_tasks", "auto_retry_max")
+    op.drop_column("generation_tasks", "auto_retry_enabled")
+    op.drop_column("generation_tasks", "retry_count")
+    op.drop_column("generation_tasks", "error_info")

alembic/versions/039_add_transition_duration.py

@@ -0,0 +1,34 @@
+"""add transition_duration to edit_plan_clips
+
+Revision ID: 039_transition_duration
+Revises: 038_error_retry
+Create Date: 2026-07-14 09:00:00.000000
+"""
+
+from __future__ import annotations
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "039_transition_duration"
+down_revision = "038_error_retry"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "edit_plan_clips",
+        sa.Column(
+            "transition_duration",
+            sa.Float(),
+            nullable=False,
+            server_default="0.0",
+        ),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("edit_plan_clips", "transition_duration")

alembic/versions/040_add_playback_speed_to_edit_plan_clips.py

@@ -0,0 +1,29 @@
+"""add playback_speed to edit_plan_clips
+
+Revision ID: 040_playback_speed
+Revises: 039_transition_duration
+Create Date: 2026-07-14 10:00:00.000000
+"""
+
+from __future__ import annotations
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "040_playback_speed"
+down_revision = "039_transition_duration"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "edit_plan_clips",
+        sa.Column("playback_speed", sa.Float(), nullable=False, server_default="1.0"),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("edit_plan_clips", "playback_speed")

alembic/versions/041_add_result_count_to_edit_plans.py

@@ -0,0 +1,29 @@
+"""add result_count to edit_plans
+
+Revision ID: 041_result_count
+Revises: 040_playback_speed
+Create Date: 2026-07-15 14:05:00.000000
+"""
+
+from __future__ import annotations
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "041_result_count"
+down_revision = "040_playback_speed"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "edit_plans",
+        sa.Column("result_count", sa.Integer(), nullable=False, server_default="0"),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("edit_plans", "result_count")

alembic/versions/042_add_storage_key_to_assets.py

@@ -0,0 +1,29 @@
+"""add storage_key to assets
+
+Revision ID: 042_storage_key
+Revises: 041_result_count
+Create Date: 2026-07-17 18:10:00.000000
+"""
+
+from __future__ import annotations
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "042_storage_key"
+down_revision = "041_result_count"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "assets",
+        sa.Column("storage_key", sa.String(500), nullable=False, server_default=""),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("assets", "storage_key")

alembic/versions/043_add_updated_at_to_generation_tasks.py

@@ -0,0 +1,33 @@
+"""add updated_at to generation_tasks
+
+Revision ID: 043_updated_at_generation_tasks
+Revises: 042_storage_key
+Create Date: 2026-07-18 19:30:00.000000
+
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "043_updated_at_generation_tasks"
+down_revision = "042_storage_key"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "generation_tasks",
+        sa.Column(
+            "updated_at",
+            sa.DateTime,
+            nullable=False,
+            server_default=sa.func.now(),
+        ),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("generation_tasks", "updated_at")

alembic/versions/044_add_user_id_to_generated_videos.py

@@ -0,0 +1,34 @@
+"""add user_id to generated_videos
+
+Revision ID: 044_user_id_generated_videos
+Revises: 043_updated_at_generation_tasks
+Create Date: 2026-07-19 08:00:00.000000
+
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "044_user_id_generated_videos"
+down_revision = "043_updated_at_generation_tasks"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "generated_videos",
+        sa.Column(
+            "user_id",
+            sa.String(36),
+            nullable=False,
+            server_default="",
+            index=True,
+        ),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("generated_videos", "user_id")

alembic/versions/045_backfill_user_id.py

@@ -0,0 +1,36 @@
+"""backfill user_id for generated_videos from generation_tasks
+
+Revision ID: 045_backfill_user_id_generated_videos
+Revises: 044_user_id_generated_videos
+Create Date: 2026-07-19 10:50:00.000000
+
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "045_backfill_user_id"
+down_revision = "044_user_id_generated_videos"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # 回填 generated_videos.user_id：通过 generation_task_id 关联 generation_tasks 表
+    # 取 generation_tasks.created_by_user_id 作为 user_id
+    # 回填不到的（无关联task的兜底记录）保持空字符串
+    op.execute("""
+        UPDATE generated_videos gv
+        SET user_id = gt.created_by_user_id
+        FROM generation_tasks gt
+        WHERE gv.generation_task_id = gt.id
+          AND gv.user_id = ''
+          AND gt.created_by_user_id != ''
+        """)
+
+
+def downgrade() -> None:
+    # 降级不做处理（无法精确区分哪些是回填的）
+    pass

alembic/versions/046_task_title.py

@@ -0,0 +1,33 @@
+"""add video_title to generation_tasks
+
+Revision ID: 046_add_video_title_to_generation_tasks
+Revises: 045_backfill_user_id_generated_videos
+Create Date: 2026-07-19 11:20:00.000000
+
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "046_task_title"
+down_revision = "045_backfill_user_id"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "generation_tasks",
+        sa.Column(
+            "video_title",
+            sa.String(255),
+            nullable=False,
+            server_default="",
+        ),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("generation_tasks", "video_title")

alembic/versions/047_template_versioning.py

@@ -0,0 +1,64 @@
+"""Phase 2 - 模板发布版本化：version字段 + 发布历史表
+
+Revision ID: 047
+Revises: 046
+Create Date: 2026-07-20
+
+Changes:
+1. edit_templates 加 version 字段（INT，默认1，每次发布+1）
+2. 新建 edit_template_versions 表存发布历史快照，支持回滚
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "047_template_versioning"
+down_revision = "046_task_title"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+
+    # 1. edit_templates 加 version 字段
+    op.add_column(
+        "edit_templates",
+        sa.Column("version", sa.Integer, nullable=False, server_default="1"),
+    )
+
+    # 2. 新建 edit_template_versions 发布历史表
+    conn.execute(sa.text("""
+        CREATE TABLE IF NOT EXISTS edit_template_versions (
+            id VARCHAR(36) PRIMARY KEY,
+            template_id VARCHAR(32) NOT NULL,
+            version INTEGER NOT NULL,
+            name VARCHAR(200) NOT NULL DEFAULT '',
+            editing_mode VARCHAR(30) NOT NULL DEFAULT 'one_take',
+            config JSONB NOT NULL DEFAULT '{}',
+            clip_configs JSONB NOT NULL DEFAULT '[]',
+            change_note VARCHAR(500) NOT NULL DEFAULT '',
+            published_by VARCHAR(36) NOT NULL DEFAULT '',
+            created_at TIMESTAMP NOT NULL DEFAULT NOW()
+        )
+    """))
+
+    conn.execute(
+        sa.text(
+            "CREATE INDEX IF NOT EXISTS ix_edit_template_versions_template_id " "ON edit_template_versions(template_id)"
+        )
+    )
+    conn.execute(
+        sa.text(
+            "CREATE UNIQUE INDEX IF NOT EXISTS ix_edit_template_versions_template_version "
+            "ON edit_template_versions(template_id, version)"
+        )
+    )
+
+
+def downgrade() -> None:
+    conn = op.get_bind()
+
+    conn.execute(sa.text("DROP TABLE IF EXISTS edit_template_versions"))
+    op.drop_column("edit_templates", "version")

alembic/versions/048_cleanup_result_count.py

@@ -0,0 +1,37 @@
+"""Phase 3 - 清理 EditPlan 表冗余字段
+
+Revision ID: 048
+Revises: 047
+Create Date: 2026-07-21
+
+Changes:
+1. 删除 edit_plans.result_count 字段（剪辑计划独立功能遗留，模板草稿不用，
+   生成结果数由 generation_tasks.result_count 承载）
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "048_cleanup_result_count"
+down_revision = "047_template_versioning"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # 删除 result_count 字段（剪辑计划独立功能遗留字段）
+    op.drop_column("edit_plans", "result_count")
+
+
+def downgrade() -> None:
+    # 回滚：恢复 result_count 字段，默认值 0
+    op.add_column(
+        "edit_plans",
+        sa.Column(
+            "result_count",
+            sa.Integer,
+            nullable=False,
+            server_default="0",
+        ),
+    )

alembic/versions/049_wechat_login_phone.py

@@ -0,0 +1,97 @@
+"""#558 - 微信登录：手机号绑定字段 + 验证码表
+
+Revision ID: 049
+Revises: 048
+Create Date: 2026-07-21
+
+Changes:
+1. users 表新增 phone_verified / binding_completed_at 字段（phone 字段已在 029 中添加）
+2. users 表 phone 字段添加唯一索引（幂等）
+3. 新建 verification_codes 表（统一管理邮箱+手机验证码）
+"""
+
+import sqlalchemy as sa
+
+from alembic import context, op
+
+revision = "049_wechat_login_phone"
+down_revision = "048_cleanup_result_count"
+branch_labels = None
+depends_on = None
+
+
+def _column_exists(table: str, column: str) -> bool:
+    """检查列是否已存在。离线模式下返回 False。"""
+    if context.is_offline_mode():
+        return False
+    conn = op.get_bind()
+    result = conn.execute(
+        sa.text("SELECT 1 FROM information_schema.columns " "WHERE table_name = :table AND column_name = :column"),
+        {"table": table, "column": column},
+    )
+    return result.first() is not None
+
+
+def _index_exists(index_name: str) -> bool:
+    """检查索引是否已存在。离线模式下返回 False。"""
+    if context.is_offline_mode():
+        return False
+    conn = op.get_bind()
+    result = conn.execute(
+        sa.text("SELECT 1 FROM pg_indexes WHERE indexname = :index_name"),
+        {"index_name": index_name},
+    )
+    return result.first() is not None
+
+
+def upgrade() -> None:
+    # 1. users 表新增手机号验证状态字段（幂等）
+    if not _column_exists("users", "phone_verified"):
+        op.add_column(
+            "users",
+            sa.Column(
+                "phone_verified",
+                sa.Boolean,
+                nullable=False,
+                server_default=sa.text("false"),
+            ),
+        )
+
+    if not _column_exists("users", "binding_completed_at"):
+        op.add_column(
+            "users",
+            sa.Column("binding_completed_at", sa.DateTime, nullable=True),
+        )
+
+    # 2. phone 字段唯一索引（幂等 - 029 加了字段但没加索引）
+    if not _index_exists("ix_users_phone"):
+        op.create_index("ix_users_phone", "users", ["phone"], unique=True)
+
+    # 3. verification_codes 表
+    op.create_table(
+        "verification_codes",
+        sa.Column("id", sa.String(36), primary_key=True),
+        sa.Column("recipient", sa.String(255), nullable=False, index=True),
+        sa.Column("code", sa.String(10), nullable=False),
+        sa.Column("code_type", sa.String(32), nullable=False, index=True),
+        sa.Column("expires_at", sa.DateTime, nullable=False),
+        sa.Column("used_at", sa.DateTime, nullable=True),
+        sa.Column("attempts", sa.Integer, nullable=False, server_default="0"),
+        sa.Column("created_at", sa.DateTime, nullable=False),
+        sa.Index(
+            "ix_verification_recipient_type",
+            "recipient",
+            "code_type",
+            "created_at",
+        ),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("verification_codes")
+    if _index_exists("ix_users_phone"):
+        op.drop_index("ix_users_phone", table_name="users")
+    if _column_exists("users", "binding_completed_at"):
+        op.drop_column("users", "binding_completed_at")
+    if _column_exists("users", "phone_verified"):
+        op.drop_column("users", "phone_verified")

apps/api/app/__init__.py

@@ -1 +0,0 @@
-"""API application package."""

apps/api/app/api/__init__.py

@@ -1 +0,0 @@
-"""API package."""

apps/api/app/api/router.py

@@ -4,23 +4,22 @@ from app.api.routes.assets import router as assets_router
 from app.api.routes.auth import router as auth_router
 from app.api.routes.chunked_upload import router as chunked_upload_router
 from app.api.routes.classification_jobs import router as classification_jobs_router
-from app.api.routes.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.generated_videos import router as generated_videos_router
+from app.api.routes.feature_flags import router as feature_flags_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.jobs import router as jobs_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.projects import router as projects_router
-from app.api.routes.recipes import router as recipes_router
 from app.api.routes.subscription import router as subscription_router
+from app.api.routes.tags import router as tags_router
 from app.api.routes.task_center import router as task_center_router
 from app.api.routes.templates import router as templates_router
+from app.api.routes.templates_editor import router as templates_editor_router
 from app.api.routes.titles import router as titles_router
-from app.api.routes.upload import router as upload_router
 from app.api.routes.tts import router as tts_router
+from app.api.routes.upload import router as upload_router
+from app.api.routes.videos import router as videos_router
 from app.api.routes.voice_clones import router as voice_clones_router
 from app.api.routes.voices import router as voices_router
 from fastapi import APIRouter
@@ -38,6 +37,11 @@ api_router.include_router(
     prefix="/projects",
     tags=["Project"],
 )
+api_router.include_router(
+    tags_router,
+    prefix="/tags",
+    tags=["Tag"],
+)
 api_router.include_router(
     task_center_router,
     tags=["TaskCenter"],
@@ -81,15 +85,6 @@ api_router.include_router(
     prefix="/generation",
     tags=["Generation"],
 )
-api_router.include_router(
-    jobs_router,
-    tags=["Job"],
-)
-api_router.include_router(
-    generated_videos_router,
-    prefix="/generated-videos",
-    tags=["GeneratedVideo"],
-)
 api_router.include_router(
     titles_router,
     prefix="/titles",
@@ -105,6 +100,10 @@ api_router.include_router(
     prefix="/voice-clones",
     tags=["VoiceClone"],
 )
+api_router.include_router(
+    videos_router,
+    tags=["VideoCenter"],
+)
 api_router.include_router(
     duplication_router,
     prefix="/duplication",
@@ -115,33 +114,26 @@ api_router.include_router(
     prefix="/subscription",
     tags=["Subscription"],
 )
-api_router.include_router(
-    recipes_router,
-    prefix="/recipes",
-    tags=["Recipe"],
-)
 api_router.include_router(
     templates_router,
     prefix="/templates",
     tags=["Template"],
 )
 api_router.include_router(
-    dashboard_router,
-    prefix="/dashboard",
-    tags=["Dashboard"],
-)
-api_router.include_router(
-    edit_templates_router,
-    prefix="/edit-templates",
-    tags=["EditTemplate"],
-)
-api_router.include_router(
-    edit_plans_router,
-    prefix="/edit-plans",
-    tags=["EditPlan"],
+    templates_editor_router,
+    prefix="/templates/{template_id}/editor",
+    tags=["TemplateEditor"],
 )
 api_router.include_router(
     tts_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/_helpers.py

@@ -0,0 +1,141 @@
+"""路由层共享辅助函数 — 消除跨文件重复定义。"""
+
+from datetime import datetime, timezone
+from typing import Any
+
+from fastapi import HTTPException, status
+
+from packages.application import GetProjectUseCase
+from packages.ports.user_repository import UserRepository
+
+
+def check_project_access(project_id: str, user_id: str, project_repository) -> None:
+    """检查用户是否有项目访问权限。
+
+    合并自 asset_libraries.py / edit_plans.py 的同名函数。
+    - 空 project_id 直接放行（兼容 edit_plans 中 project_id 可选的场景）
+    - 错误信息使用中文，与项目其他路由保持一致
+    """
+    if not project_id or not project_id.strip():
+        return
+    project = project_repository.find_by_id(project_id)
+    if project is None:
+        raise HTTPException(status_code=404, detail="项目不存在")
+    if not project.can_access(user_id):
+        raise HTTPException(status_code=403, detail="无权访问该项目")
+
+
+def get_user_plan(user_id: str, user_repository: UserRepository) -> str:
+    """获取用户的订阅计划名称。"""
+    user = user_repository.find_by_id(user_id)
+    if user is None:
+        return "free"
+    return getattr(user, "subscription_plan", "free") or "free"
+
+
+def require_project_and_library(
+    project_id: str,
+    library_id: str,
+    project_repository: Any,
+    asset_library_repository: Any,
+) -> None:
+    """Verify project and asset library exist."""
+    project = GetProjectUseCase(project_repository).execute(project_id)
+    if project is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
+
+    libraries = asset_library_repository.find_by_project(project_id)
+    if not any(item.id == library_id for item in libraries):
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found")
+
+
+def auto_select_video_assets(
+    *,
+    project_id: str,
+    asset_library_repo: Any,
+    asset_repo: Any,
+    logger=None,
+) -> list[str]:
+    """从项目视频素材库自动选取 ready 状态的视频素材。
+
+    Args:
+        project_id: 项目 ID
+        asset_library_repo: 素材库仓储
+        asset_repo: 素材仓储
+        logger: 可选的 logger 实例，用于记录警告
+
+    Returns:
+        选中的素材 ID 列表，无可用素材时返回空列表
+    """
+    if not project_id:
+        return []
+
+    # 找到项目的视频素材库
+    libs = asset_library_repo.find_by_project(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 not video_lib:
+        if logger:
+            logger.warning("自动选素材: 项目 %s 无视频素材库", project_id)
+        return []
+
+    # 从素材库中选取 ready 状态的视频素材
+    assets = asset_repo.find_by_library(video_lib.id)
+    ready_videos = [
+        a
+        for a in assets
+        if (a.status.value if hasattr(a.status, "value") else a.status) == "ready"
+        and a.mime_type
+        and a.mime_type.startswith("video")
+    ]
+
+    # 过滤横屏素材（只保留竖屏/正方形）
+    # 移动端短视频场景默认竖屏，横屏素材裁剪后画面不可用
+    # 注意：这只是选素材优化，渲染引擎本身支持任何分辨率的素材
+    filtered_videos = []
+    skipped_landscape = 0
+    for a in ready_videos:
+        width = a.width if hasattr(a, "width") and a.width else 0
+        height = a.height if hasattr(a, "height") and a.height else 0
+        if not width or not height:
+            # 从 metadata 兜底
+            if a.metadata and isinstance(a.metadata, dict):
+                width = int(a.metadata.get("width", 0) or 0)
+                height = int(a.metadata.get("height", 0) or 0)
+        if width and height and width > height:
+            skipped_landscape += 1
+            continue
+        filtered_videos.append(a)
+
+    if skipped_landscape and logger:
+        logger.warning("自动选素材: 跳过 %d 个横屏素材", skipped_landscape)
+
+    if not filtered_videos:
+        if logger:
+            logger.warning("自动选素材: 素材库 %s 无可用视频素材", video_lib.name)
+        return []
+
+    # 按创建时间降序（新素材在前）
+    filtered_videos.sort(key=lambda a: a.created_at, reverse=True)
+    return [a.id for a in filtered_videos]
+
+
+def format_utc_datetime(dt: datetime | None) -> str:
+    """将数据库读出的 UTC naive datetime 格式化为带时区的 ISO 8601 字符串。
+
+    数据库 DateTime 列不带时区信息，但存的是 UTC 时间。
+    直接 .isoformat() 输出无时区标识，前端会按本地时间解析，导致差 8 小时。
+    输出带 Z 后缀，前端 new Date() 自动转本地时间。
+    """
+    if dt is None:
+        return ""
+    if isinstance(dt, str):
+        return dt
+    if dt.tzinfo is None:
+        return dt.isoformat() + "Z"
+    return dt.astimezone(timezone.utc).isoformat().replace("+00:00", "Z")

apps/api/app/api/routes/asset_diagnosis.py

@@ -1,4 +1,5 @@
-from typing import Any
+import logging
+from typing import Any, Optional
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import (
@@ -7,10 +8,12 @@ from app.dependencies import (
     get_project_repository,
 )
 from app.schemas.asset_diagnosis import AssetGapItem, AssetSmartViewItem, ProjectAssetDiagnosisResponse
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, Query
 
 from packages.domain import Asset, AssetLibraryKind, AssetStatus
 
+logger = logging.getLogger(__name__)
+
 router = APIRouter()
 
 
@@ -190,21 +193,152 @@ def _build_diagnosis(project_id: str, assets: list[Asset]) -> ProjectAssetDiagno
     )
 
 
+def _build_single_asset_diagnosis(project_id: str, asset: Asset) -> ProjectAssetDiagnosisResponse:
+    """为单个素材构建诊断结果"""
+    kind = _asset_kind(asset)
+    is_ready = asset.status == AssetStatus.READY
+    is_problem = asset.status in {AssetStatus.ERROR, AssetStatus.UPLOADING, AssetStatus.PROCESSING}
+    is_risky = is_ready and (
+        (asset.quality_score is not None and asset.quality_score < 60)
+        or asset.metadata.get("review_status") == "rejected"
+        or asset.status == AssetStatus.ERROR
+    )
+    is_unclassified = is_ready and asset.classification_status.value in {"pending", "failed"}
+
+    # 单素材评分
+    score = 0
+    if is_ready:
+        score = 60
+        if kind == "video":
+            score += 20
+        if asset.duration and asset.duration >= 5:
+            score += 10
+        if asset.quality_score and asset.quality_score >= 60:
+            score += 10
+    if is_problem:
+        score = max(score - 30, 0)
+    if is_risky:
+        score = max(score - 20, 0)
+    score = max(0, min(100, score))
+
+    gaps: list[AssetGapItem] = []
+    if not is_ready:
+        gaps.append(
+            AssetGapItem(
+                key="asset_not_ready",
+                severity="critical",
+                message=f"素材状态为 {asset.status.value}，尚未就绪",
+                recommendation="等待素材导入完成后再使用。",
+            )
+        )
+    if is_risky:
+        gaps.append(
+            AssetGapItem(
+                key="asset_low_quality",
+                severity="warning",
+                message="素材质量分偏低或已被拒绝",
+                recommendation="建议使用更清晰、稳定的素材替代。",
+            )
+        )
+    if is_unclassified:
+        gaps.append(
+            AssetGapItem(
+                key="asset_unclassified",
+                severity="info",
+                message="素材尚未完成分类",
+                recommendation="等待分类完成或手动检查素材类型。",
+            )
+        )
+    if kind == "video" and (asset.duration is None or asset.duration < 5):
+        gaps.append(
+            AssetGapItem(
+                key="short_video",
+                severity="warning",
+                message="视频时长偏短",
+                recommendation="建议使用时长 5 秒以上的视频素材。",
+            )
+        )
+
+    used_count = int(asset.metadata.get("generation_use_count") or 0)
+    smart_views = [
+        AssetSmartViewItem(
+            key="asset_info",
+            label="素材信息",
+            count=1,
+            description=f"类型: {kind}，状态: {asset.status.value}",
+        ),
+        AssetSmartViewItem(
+            key="asset_quality",
+            label="质量评分",
+            count=int(asset.quality_score or 0),
+            description=f"质量分: {asset.quality_score or '未评分'}",
+        ),
+        AssetSmartViewItem(
+            key="asset_usage",
+            label="使用次数",
+            count=used_count,
+            description=f"参与生成 {used_count} 次",
+        ),
+    ]
+
+    video_count = 1 if kind == "video" and is_ready else 0
+    image_count = 1 if kind == "image" and is_ready else 0
+    voice_count = 1 if kind == "voice" and is_ready else 0
+    total_duration = round(float(asset.duration or 0), 2) if kind == "video" else 0.0
+
+    return ProjectAssetDiagnosisResponse(
+        project_id=project_id,
+        readiness_score=score,
+        readiness_label=_readiness_label(score),
+        total_assets=1,
+        ready_assets=1 if is_ready else 0,
+        video_assets=video_count,
+        image_assets=image_count,
+        voice_assets=voice_count,
+        total_duration_seconds=total_duration,
+        estimated_video_count=1 if video_count and total_duration >= 5 else 0,
+        used_assets=1 if used_count > 0 else 0,
+        unused_assets=1 if used_count == 0 and is_ready else 0,
+        pending_review_assets=1 if asset.metadata.get("review_status") == "pending_review" else 0,
+        smart_views=smart_views,
+        gaps=gaps,
+    )
+
+
 @router.get("/projects/{project_id}/asset-diagnosis", response_model=ProjectAssetDiagnosisResponse)
 def get_project_asset_diagnosis(
     project_id: str,
+    asset_id: Optional[str] = Query(None),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     project_repository: Any = Depends(get_project_repository),
     asset_library_repository: Any = Depends(get_asset_library_repository),
     asset_repository: Any = Depends(get_asset_repository),
 ) -> ProjectAssetDiagnosisResponse:
-    project = project_repository.find_by_id(project_id)
-    if project is None:
-        raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
+    try:
+        project = project_repository.find_by_id(project_id)
+        if project is None:
+            raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
+        if not project.can_access(authenticated_user.user.id):
+            raise HTTPException(status_code=403, detail="Access denied to project")
 
-    libraries = asset_library_repository.find_by_project(project_id)
-    assets: list[Asset] = []
-    for library in libraries:
-        assets.extend(asset_repository.list_by_library(library.id))
+        # 单素材诊断模式
+        if asset_id:
+            asset = asset_repository.get(asset_id)
+            if asset is None:
+                raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
+            if asset.project_id != project_id:
+                raise HTTPException(status_code=403, detail="Asset does not belong to this project")
+            return _build_single_asset_diagnosis(project_id, asset)
+
+        libraries = asset_library_repository.find_by_project(project_id)
+        assets: list[Asset] = []
+        for library in libraries:
+            assets.extend(asset_repository.list_by_library(library.id))
+    except HTTPException:
+        raise
+    except Exception:
+        logger.exception("素材诊断查询失败: project_id=%s", project_id)
+        # 返回空诊断结果，避免 500
+        return _build_diagnosis(project_id, [])
 
     return _build_diagnosis(project_id, assets)

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

@@ -1,13 +1,18 @@
 from typing import Any
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_asset_library_repository, get_project_repository
+from app.dependencies import (
+    get_asset_library_repository,
+    get_asset_repository,
+    get_project_repository,
+)
 from app.schemas.asset_library import (
     AssetLibraryResponse,
     CreateAssetLibraryRequest,
+    EnsureDefaultLibraryRequest,
     ListAssetLibrariesResponse,
 )
-from fastapi import APIRouter, Depends, HTTPException, Query, status
+from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
 
 from packages.application import (
     CreateAssetLibraryCommand,
@@ -15,20 +20,13 @@ from packages.application import (
     GetProjectUseCase,
     ListAssetLibrariesUseCase,
 )
-from packages.domain import AssetLibraryKind
+from packages.domain import AssetLibrary, AssetLibraryKind
+
+from ._helpers import check_project_access
 
 router = APIRouter()
 
 
-def _check_project_access(project_id: str, user_id: str, project_repository) -> None:
-    """检查用户是否有项目访问权限"""
-    project = project_repository.find_by_id(project_id)
-    if project is None:
-        raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
-    if not project.can_access(user_id):
-        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Access denied to project")
-
-
 def _to_asset_library_response(item) -> AssetLibraryResponse:
     return AssetLibraryResponse(
         id=item.id,
@@ -43,6 +41,7 @@ def _to_asset_library_response(item) -> AssetLibraryResponse:
 @router.get("", response_model=ListAssetLibrariesResponse)
 def list_asset_libraries(
     project_id: str | None = Query(None),
+    kind: str | None = Query(None, pattern="^(video|voice|image)$"),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     asset_library_repository: Any = Depends(get_asset_library_repository),
     project_repository: Any = Depends(get_project_repository),
@@ -66,6 +65,11 @@ def list_asset_libraries(
             all_items.extend(use_case.execute(proj.id))
         items = all_items
 
+    # 按 kind 过滤（可选）
+    if kind:
+        kind_enum = AssetLibraryKind(kind)
+        items = [item for item in items if item.kind == kind_enum]
+
     return ListAssetLibrariesResponse(items=[_to_asset_library_response(item) for item in items])
 
 
@@ -90,3 +94,79 @@ def create_asset_library(
         )
     )
     return _to_asset_library_response(item)
+
+
+# 默认素材库名称映射
+_DEFAULT_LIBRARY_NAMES = {
+    "video": "视频素材库",
+    "voice": "配音素材库",
+    "image": "图片素材库",
+}
+
+
+@router.post("/ensure-default", response_model=AssetLibraryResponse)
+def ensure_default_library(
+    request: EnsureDefaultLibraryRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_library_repository: Any = Depends(get_asset_library_repository),
+    project_repository: Any = Depends(get_project_repository),
+) -> AssetLibraryResponse:
+    """确保项目下指定 kind 的默认素材库存在，已存在则直接返回，不存在则自动创建。"""
+    project = project_repository.find_by_id(request.project_id)
+    if project is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
+    if not project.can_access(authenticated_user.user.id):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Access denied to project")
+
+    kind = AssetLibraryKind(request.kind)
+
+    # 查找该项目下同 kind 的素材库，返回第一个
+    existing = asset_library_repository.find_by_project(request.project_id)
+    for lib in existing:
+        if lib.kind == kind:
+            return _to_asset_library_response(lib)
+
+    # 不存在 → 自动创建
+    import uuid
+    from datetime import datetime, timezone
+
+    now = datetime.now(timezone.utc)
+    default_name = _DEFAULT_LIBRARY_NAMES.get(request.kind, f"{request.kind}素材库")
+    library = AssetLibrary(
+        id=str(uuid.uuid4()),
+        project_id=request.project_id,
+        name=default_name,
+        kind=kind,
+        asset_count=0,
+        total_size=0,
+        created_at=now,
+        updated_at=now,
+    )
+    created = asset_library_repository.create(library)
+    return _to_asset_library_response(created)
+
+
+@router.delete("/{library_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
+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)
+
+    # 删除库内所有素材（硬删除，素材库已删除，无需保留软删除状态）
+    assets_in_library = asset_repository.find_by_library(library_id)
+    for asset in assets_in_library:
+        asset_repository.delete(asset.id)
+
+    # 删除素材库本身
+    asset_library_repository.delete(library_id)

apps/api/app/api/routes/assets.py

@@ -1,25 +1,57 @@
-from typing import Any
+import logging
+from typing import Any, Optional
 
+from app.api.routes._helpers import check_project_access, format_utc_datetime
 from app.auth import AuthenticatedUser, get_current_user
+from app.core.storage import get_storage_service
 from app.dependencies import (
     get_asset_library_repository,
     get_asset_repository,
     get_project_repository,
+    get_tag_repository,
 )
-from app.schemas.asset import AssetResponse, CreateAssetRequest, ListAssetsResponse, UpdateAssetReviewRequest
-from fastapi import APIRouter, Depends, HTTPException
+from app.schemas.asset import (
+    AssetResponse,
+    BatchClassifyRequest,
+    BatchDeleteRequest,
+    BatchMarkRequest,
+    BatchOperationResponse,
+    BatchTagRequest,
+    CreateAssetRequest,
+    ListAssetsResponse,
+    UpdateAssetRequest,
+    UpdateAssetReviewRequest,
+)
+from app.schemas.tag import TagAssetsRequest
+from fastapi import APIRouter, Depends, HTTPException, Query, Response
 
 from packages.application import (
     CreateAssetCommand,
     CreateAssetUseCase,
-    ListAssetsUseCase,
 )
 from packages.domain import AssetStatus, ClassificationStatus
 
+logger = logging.getLogger(__name__)
+
 router = APIRouter()
 
 
-def _to_asset_response(item) -> AssetResponse:
+def _to_asset_response(item, storage_service=None) -> AssetResponse:
+    # 生成签名文件 URL（用于视频播放 / 文件下载）
+    file_url = None
+    if item.storage_key:
+        try:
+            svc = storage_service or get_storage_service()
+            file_url = svc.get_download_url(item.storage_key)
+        except Exception:
+            logger.warning("生成签名URL失败: storage_key=%s", item.storage_key, exc_info=True)
+            file_url = None
+
+    # 缩略图：优先用已有 thumbnail_url，否则对视频素材复用文件签名 URL
+    thumbnail_url = item.thumbnail_url
+    if not thumbnail_url and item.mime_type and item.mime_type.startswith("video") and file_url:
+        thumbnail_url = file_url
+
     return AssetResponse(
         id=item.id,
         project_id=item.project_id,
@@ -29,7 +61,8 @@ def _to_asset_response(item) -> AssetResponse:
         mime_type=item.mime_type,
         metadata=item.metadata,
         file_size=item.file_size,
-        thumbnail_url=item.thumbnail_url,
+        file_url=file_url,
+        thumbnail_url=thumbnail_url,
         duration=item.duration,
         width=item.width,
         height=item.height,
@@ -38,34 +71,274 @@ def _to_asset_response(item) -> AssetResponse:
         status=item.status.value,
         classification_status=item.classification_status.value,
         quality_score=item.quality_score,
+        created_at=format_utc_datetime(item.created_at),
         uploaded_by_user_id=item.uploaded_by_user_id,
+        tag_ids=getattr(item, "tag_ids", []),
     )
 
 
-def _check_project_access(project_id: str, user_id: str, project_repository) -> None:
-    """检查用户是否有项目访问权限"""
-    project = project_repository.find_by_id(project_id)
-    if project is None:
-        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="Access denied to project")
-
-
 @router.get("", response_model=ListAssetsResponse)
 def list_assets(
-    library_id: str,
+    library_id: Optional[str] = Query(None),
+    project_id: Optional[str] = Query(None),
+    kind: Optional[str] = Query(None, pattern="^(video|voice|image)$"),
+    keyword: Optional[str] = Query(None, description="按名称模糊匹配"),
+    gender: Optional[str] = Query(None, description="按 metadata.gender 筛选"),
+    style: Optional[str] = Query(None, description="按 metadata.style 筛选"),
+    tag_ids: Optional[str] = Query(None, description="按标签 ID 筛选（逗号分隔，取交集）"),
+    smart_view: Optional[str] = Query(
+        None,
+        description="智能视图筛选：recommended=推荐(质量分≥80)、cautious=慎用(60-79)、risky=高风险(<60或已驳回)、unused=未使用、used=已使用、pending_review=待复核",
+        pattern="^(recommended|cautious|risky|unused|used|pending_review)$",
+    ),
+    classification: Optional[str] = Query(
+        None,
+        description="按内容分类筛选：scenic=风景、product=产品、person=人物、animal=动物、food=美食、tech=科技、sport=运动、music=音乐、other=其他",
+    ),
+    status: Optional[str] = Query(
+        "default",
+        description="按状态筛选，逗号分隔多值；默认返回除deleted外的所有状态；传deleted查看回收站；传all返回所有状态",
+    ),
+    page: Optional[int] = Query(None, ge=1, description="页码，从1开始；与 page_size 配对使用，优先于 skip/limit"),
+    page_size: Optional[int] = Query(None, ge=1, le=500, description="每页数量；与 page 配对使用"),
+    skip: int = Query(0, ge=0),
+    limit: int = Query(100, ge=1, le=500),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     asset_repository: Any = Depends(get_asset_repository),
     asset_library_repository: Any = Depends(get_asset_library_repository),
     project_repository: Any = Depends(get_project_repository),
 ) -> ListAssetsResponse:
-    library = asset_library_repository.get(library_id)
-    if library is None:
-        raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
-    _check_project_access(library.project_id, authenticated_user.user.id, project_repository)
-    use_case = ListAssetsUseCase(asset_repository)
-    items = use_case.execute(library_id)
-    return ListAssetsResponse(items=[_to_asset_response(item) for item in items])
+    user_id = authenticated_user.user.id
+
+    # ── 分页：page/page_size 优先于 skip/limit
+    if page is not None and page_size is not None:
+        skip = (page - 1) * page_size
+        limit = page_size
+
+    # ── 解析 status 过滤
+    status_list: list[str] | None
+    if status and status.lower() == "all":
+        status_list = None  # None = 不过滤，返回所有状态
+    elif status and status.lower() == "deleted":
+        status_list = ["deleted"]  # 仅查回收站
+    elif status and status.lower() == "default":
+        status_list = ["ready", "uploading", "processing", "error"]  # 默认排除deleted
+    elif status:
+        status_list = [s.strip() for s in status.split(",") if s.strip()]
+        if not status_list:
+            status_list = ["ready", "uploading", "processing", "error"]
+    else:
+        status_list = ["ready", "uploading", "processing", "error"]
+
+    # kind → file_type 映射（voice 对应 audio）
+    kind_to_file_type = {"video": "video", "voice": "audio", "image": "image"}
+
+    # 解析 tag_ids 参数（逗号分隔）
+    filter_tag_ids: list[str] | None = None
+    if tag_ids:
+        filter_tag_ids = [t.strip() for t in tag_ids.split(",") if t.strip()]
+        if not filter_tag_ids:
+            filter_tag_ids = None
+
+    # 需要内存过滤的标志（keyword/gender/style/tag_ids/smart_view/classification 无法在 DB 层过滤）
+    needs_memory_filter = bool(keyword or gender or style or filter_tag_ids or smart_view or classification)
+
+    def _apply_memory_filters(items):
+        """应用 keyword / gender / style / tag_ids / smart_view / classification 内存过滤。"""
+        result = items
+        if keyword:
+            kw = keyword.lower()
+            result = [i for i in result if kw in (i.name or "").lower()]
+        if gender:
+            result = [i for i in result if (i.metadata or {}).get("gender") == gender]
+        if style:
+            result = [i for i in result if (i.metadata or {}).get("style") == style]
+        if classification:
+            result = [i for i in result if (i.metadata or {}).get("classification") == classification]
+        if filter_tag_ids:
+            tag_set = set(filter_tag_ids)
+            result = [i for i in result if tag_set.issubset(set(getattr(i, "tag_ids", [])))]
+        if smart_view:
+
+            def __meta(a):
+                return a.metadata or {}
+
+            def __use_count(a):
+                return int(__meta(a).get("generation_use_count") or 0)
+
+            def __review_status(a):
+                return __meta(a).get("review_status", "")
+
+            if smart_view == "recommended":
+                result = [i for i in result if i.quality_score is not None and i.quality_score >= 80]
+            elif smart_view == "cautious":
+                result = [i for i in result if i.quality_score is not None and 60 <= i.quality_score < 80]
+            elif smart_view == "risky":
+                result = [
+                    i
+                    for i in result
+                    if (i.quality_score is not None and i.quality_score < 60) or __review_status(i) == "rejected"
+                ]
+            elif smart_view == "unused":
+                result = [i for i in result if __use_count(i) == 0]
+            elif smart_view == "used":
+                result = [i for i in result if __use_count(i) > 0]
+            elif smart_view == "pending_review":
+                result = [i for i in result if __review_status(i) == "pending_review"]
+        return result
+
+    # ── 优化路径：无内存过滤时，使用 DB 级分页 ──
+    if not needs_memory_filter:
+        ft = kind_to_file_type.get(kind) if kind else None
+
+        # 模式1：指定 library_id
+        if library_id:
+            library = asset_library_repository.get(library_id)
+            if library is None:
+                raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
+            check_project_access(library.project_id, user_id, project_repository)
+            if ft:
+                items = asset_repository.find_by_library_and_file_type(
+                    library_id, ft, skip=skip, limit=limit, status=status_list
+                )
+                total = asset_repository.count_by_library_and_file_type(library_id, ft, status=status_list)
+            else:
+                items = asset_repository.find_by_library(library_id, skip=skip, limit=limit, status=status_list)
+                total = asset_repository.count_by_project(library.project_id, status=status_list)
+            return ListAssetsResponse(
+                items=[_to_asset_response(item) for item in items],
+                total=total,
+                skip=skip,
+                limit=limit,
+            )
+
+        # 模式2：指定 project_id
+        if project_id:
+            check_project_access(project_id, user_id, project_repository)
+            if ft:
+                items = asset_repository.find_by_project_and_file_type(
+                    project_id, ft, skip=skip, limit=limit, status=status_list
+                )
+                total = asset_repository.count_by_project_and_file_type(project_id, ft, status=status_list)
+                paged = items
+            else:
+                items = asset_repository.find_by_project(project_id, skip=skip, limit=limit, status=status_list)
+                total = asset_repository.count_by_project(project_id, status=status_list)
+                paged = items
+            return ListAssetsResponse(
+                items=[_to_asset_response(item) for item in paged],
+                total=total,
+                skip=skip,
+                limit=limit,
+            )
+
+        # 模式3：跨项目（无 library_id/project_id）
+        try:
+            projects = project_repository.find_accessible_projects(user_id)
+        except Exception:
+            logger.exception("查询用户可访问项目失败: user_id=%s", user_id)
+            return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
+
+        project_ids = [p.id for p in projects]
+        if not project_ids:
+            return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
+
+        if ft:
+            # 有 kind 过滤：逐项目查 file_type，凑够一页
+            total = 0
+            paged_items: list = []
+            offset = skip
+            remaining = limit
+            for pid in project_ids:
+                proj_total = asset_repository.count_by_project_and_file_type(pid, ft, status=status_list)
+                total += proj_total
+                if offset >= proj_total:
+                    offset -= proj_total
+                    continue
+                proj_items = asset_repository.find_by_project_and_file_type(
+                    pid, ft, skip=offset, limit=remaining, status=status_list
+                )
+                paged_items.extend(proj_items)
+                remaining -= len(proj_items)
+                offset = 0
+                if remaining <= 0:
+                    break
+        else:
+            total = asset_repository.count_by_project_ids(project_ids, status=status_list)
+            # 跨项目分页：逐项目累积直到凑够一页
+            paged_items: list = []
+            offset = skip
+            remaining = limit
+            for pid in project_ids:
+                proj_total = asset_repository.count_by_project(pid, status=status_list)
+                if offset >= proj_total:
+                    offset -= proj_total
+                    continue
+                proj_items = asset_repository.find_by_project(pid, skip=offset, limit=remaining, status=status_list)
+                paged_items.extend(proj_items)
+                remaining -= len(proj_items)
+                offset = 0
+                if remaining <= 0:
+                    break
+
+        return ListAssetsResponse(
+            items=[_to_asset_response(item) for item in paged_items],
+            total=total,
+            skip=skip,
+            limit=limit,
+        )
+
+    # ── 内存过滤路径：有 keyword/gender/style 时，加载全量后内存过滤 ──
+    if library_id:
+        library = asset_library_repository.get(library_id)
+        if library is None:
+            raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
+        check_project_access(library.project_id, user_id, project_repository)
+        if kind:
+            all_items = asset_repository.find_by_library_and_file_type(
+                library_id, kind_to_file_type[kind], status=status_list
+            )
+        else:
+            all_items = asset_repository.find_by_library(library_id, status=status_list)
+    elif project_id:
+        check_project_access(project_id, user_id, project_repository)
+        if kind:
+            ft = kind_to_file_type.get(kind)
+            if ft:
+                all_items = asset_repository.find_by_project_and_file_type(project_id, ft, status=status_list)
+            else:
+                all_items = asset_repository.find_by_project(project_id, status=status_list)
+        else:
+            all_items = asset_repository.find_by_project(project_id, status=status_list)
+    else:
+        try:
+            projects = project_repository.find_accessible_projects(user_id)
+        except Exception:
+            logger.exception("查询用户可访问项目失败: user_id=%s", user_id)
+            return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
+        all_items = []
+        for proj in projects:
+            if kind and kind_to_file_type.get(kind):
+                all_items.extend(
+                    asset_repository.find_by_project_and_file_type(proj.id, kind_to_file_type[kind], status=status_list)
+                )
+            else:
+                all_items.extend(asset_repository.find_by_project(proj.id, status=status_list))
+
+    # 应用 kind 过滤（如果有）+ keyword/gender/style
+    if kind:
+        ft = kind_to_file_type.get(kind)
+        if ft:
+            all_items = [i for i in all_items if i.file_type == ft]
+    filtered = _apply_memory_filters(all_items)
+    total = len(filtered)
+    paged = filtered[skip : skip + limit]
+    return ListAssetsResponse(
+        items=[_to_asset_response(item) for item in paged],
+        total=total,
+        skip=skip,
+        limit=limit,
+    )
 
 
 def _apply_asset_review_status(item, review_status: str):
@@ -87,12 +360,260 @@ def update_asset_review_status(
     item = asset_repository.get(asset_id)
     if item is None:
         raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
-    _check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
     _apply_asset_review_status(item, request.review_status)
     updated = asset_repository.update(item)
     return _to_asset_response(updated)
 
 
+@router.post("/batch-delete", response_model=BatchOperationResponse)
+def batch_delete_assets(
+    request: BatchDeleteRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    project_repository: Any = Depends(get_project_repository),
+) -> BatchOperationResponse:
+    """批量删除素材（软删除，标记 status=deleted），需逐项校验项目权限。"""
+    user_id = authenticated_user.user.id
+    success_ids: list[str] = []
+    failed_details: dict[str, str] = {}
+
+    for asset_id in request.asset_ids:
+        item = asset_repository.find_by_id(asset_id)
+        if item is None:
+            failed_details[asset_id] = "not_found"
+            continue
+        try:
+            check_project_access(item.project_id, user_id, project_repository)
+            success_ids.append(asset_id)
+        except HTTPException:
+            failed_details[asset_id] = "access_denied"
+
+    if success_ids:
+        asset_repository.batch_delete(success_ids)
+
+    return BatchOperationResponse(
+        success_count=len(success_ids),
+        failed_ids=list(failed_details.keys()),
+        failed_details=failed_details,
+    )
+
+
+@router.post("/batch-tag", response_model=BatchOperationResponse)
+def batch_tag_assets(
+    request: BatchTagRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    project_repository: Any = Depends(get_project_repository),
+    tag_repository: Any = Depends(get_tag_repository),
+) -> BatchOperationResponse:
+    """批量打标签（添加或替换模式），需逐项校验项目权限和标签权限。"""
+    user_id = authenticated_user.user.id
+    success_ids: list[str] = []
+    failed_details: dict[str, str] = {}
+
+    # 校验标签存在且属于当前用户
+    for tag_id in request.tag_ids:
+        tag = tag_repository.get(tag_id)
+        if tag is None:
+            return BatchOperationResponse(
+                success_count=0,
+                failed_ids=list(request.asset_ids),
+                failed_details={aid: f"tag_not_found:{tag_id}" for aid in request.asset_ids},
+            )
+        if tag.user_id != user_id:
+            return BatchOperationResponse(
+                success_count=0,
+                failed_ids=list(request.asset_ids),
+                failed_details={aid: f"tag_access_denied:{tag_id}" for aid in request.asset_ids},
+            )
+
+    # 校验素材权限
+    for asset_id in request.asset_ids:
+        item = asset_repository.find_by_id(asset_id)
+        if item is None:
+            failed_details[asset_id] = "not_found"
+            continue
+        try:
+            check_project_access(item.project_id, user_id, project_repository)
+            success_ids.append(asset_id)
+        except HTTPException:
+            failed_details[asset_id] = "access_denied"
+
+    if success_ids:
+        if request.mode == "replace":
+            asset_repository.batch_replace_tags(success_ids, request.tag_ids)
+        else:
+            asset_repository.batch_add_tags(success_ids, request.tag_ids)
+
+    return BatchOperationResponse(
+        success_count=len(success_ids),
+        failed_ids=list(failed_details.keys()),
+        failed_details=failed_details,
+    )
+
+
+@router.post("/batch-classify", response_model=BatchOperationResponse)
+def batch_classify_assets(
+    request: BatchClassifyRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    project_repository: Any = Depends(get_project_repository),
+) -> BatchOperationResponse:
+    """批量修改素材内容分类（person/scenic/product等），存在metadata.category中。"""
+    user_id = authenticated_user.user.id
+    success_ids: list[str] = []
+    failed_details: dict[str, str] = {}
+
+    for asset_id in request.asset_ids:
+        item = asset_repository.find_by_id(asset_id)
+        if item is None:
+            failed_details[asset_id] = "not_found"
+            continue
+        try:
+            check_project_access(item.project_id, user_id, project_repository)
+            success_ids.append(asset_id)
+        except HTTPException:
+            failed_details[asset_id] = "access_denied"
+
+    if success_ids:
+        asset_repository.batch_update_metadata(success_ids, {"category": request.category})
+
+    return BatchOperationResponse(
+        success_count=len(success_ids),
+        failed_ids=list(failed_details.keys()),
+        failed_details=failed_details,
+    )
+
+
+@router.post("/batch-mark", response_model=BatchOperationResponse)
+def batch_mark_assets(
+    request: BatchMarkRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    project_repository: Any = Depends(get_project_repository),
+) -> BatchOperationResponse:
+    """批量设置智能视图标记（recommended/caution/high_risk），存在metadata.smart_view中。"""
+    user_id = authenticated_user.user.id
+    success_ids: list[str] = []
+    failed_details: dict[str, str] = {}
+
+    for asset_id in request.asset_ids:
+        item = asset_repository.find_by_id(asset_id)
+        if item is None:
+            failed_details[asset_id] = "not_found"
+            continue
+        try:
+            check_project_access(item.project_id, user_id, project_repository)
+            success_ids.append(asset_id)
+        except HTTPException:
+            failed_details[asset_id] = "access_denied"
+
+    if success_ids:
+        asset_repository.batch_update_metadata(success_ids, {"smart_view": request.smart_view})
+
+    return BatchOperationResponse(
+        success_count=len(success_ids),
+        failed_ids=list(failed_details.keys()),
+        failed_details=failed_details,
+    )
+
+
+@router.get("/{asset_id}", response_model=AssetResponse)
+def get_asset(
+    asset_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    project_repository: Any = Depends(get_project_repository),
+) -> AssetResponse:
+    item = asset_repository.find_by_id(asset_id)
+    if item is None:
+        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    return _to_asset_response(item)
+
+
+@router.put("/{asset_id}", response_model=AssetResponse)
+def update_asset(
+    asset_id: str,
+    request: UpdateAssetRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    project_repository: Any = Depends(get_project_repository),
+) -> AssetResponse:
+    item = asset_repository.find_by_id(asset_id)
+    if item is None:
+        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+
+    # 合并可修改字段
+    if request.name is not None:
+        item.name = request.name
+    if request.metadata is not None:
+        item.metadata = {**item.metadata, **request.metadata}
+    if request.tags is not None:
+        item.metadata = {**item.metadata, "tags": request.tags}
+
+    updated = asset_repository.update(item)
+    return _to_asset_response(updated)
+
+
+@router.delete("/{asset_id}", status_code=204, response_class=Response)
+def delete_asset(
+    asset_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    project_repository: Any = Depends(get_project_repository),
+) -> None:
+    item = asset_repository.find_by_id(asset_id)
+    if item is None:
+        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    asset_repository.delete(asset_id)
+
+
+@router.post("/{asset_id}/tags", response_model=AssetResponse)
+def tag_asset(
+    asset_id: str,
+    request: TagAssetsRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    project_repository: Any = Depends(get_project_repository),
+    tag_repository: Any = Depends(get_tag_repository),
+) -> AssetResponse:
+    """给素材打标签。"""
+    item = asset_repository.find_by_id(asset_id)
+    if item is None:
+        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    for tag_id in request.tag_ids:
+        tag = tag_repository.get(tag_id)
+        if tag is None:
+            raise HTTPException(status_code=404, detail=f"Tag {tag_id} not found")
+        if tag.user_id != authenticated_user.user.id:
+            raise HTTPException(status_code=403, detail=f"无权使用标签 {tag_id}")
+        item.add_tag(tag_id)
+    updated = asset_repository.update(item)
+    return _to_asset_response(updated)
+
+
+@router.delete("/{asset_id}/tags/{tag_id}", status_code=204, response_class=Response)
+def untag_asset(
+    asset_id: str,
+    tag_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    project_repository: Any = Depends(get_project_repository),
+) -> None:
+    """取消素材的标签。"""
+    item = asset_repository.find_by_id(asset_id)
+    if item is None:
+        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    item.remove_tag(tag_id)
+    asset_repository.update(item)
+
+
 @router.post("", response_model=AssetResponse)
 def create_asset(
     request: CreateAssetRequest,

apps/api/app/api/routes/auth.py

@@ -5,12 +5,16 @@ The route layer is intentionally thin: repository construction lives in
 app.dependencies and authentication behavior lives in application use cases.
 """
 
+import logging
+import os
 from typing import Optional
 
-from app.auth import AuthenticatedUser, get_current_user
+import jwt
+from app.auth import AuthenticatedUser, blacklist_token, get_current_user
 from app.config import settings
 from app.dependencies import get_auth_email_service, get_auth_session_store, get_user_repository
-from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi import APIRouter, Depends, Header, HTTPException, status
+from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from pydantic import BaseModel, EmailStr
 
 from packages.adapters.redis import NoopSessionStore
@@ -29,6 +33,10 @@ from packages.application.auth.register_user_use_case import RegisterUserRequest
 from packages.application.auth.register_user_use_case import RegisterUserUseCase, VerifyEmailRequest, VerifyEmailUseCase
 from packages.ports.user_repository import UserRepository
 
+logger = logging.getLogger(__name__)
+
+bearer_scheme = HTTPBearer(auto_error=False)
+
 router = APIRouter(prefix="/auth", tags=["认证"])
 
 
@@ -73,6 +81,9 @@ class CurrentUserResponse(BaseModel):
     username: str
     display_name: str
     email_verified: bool
+    phone: str = ""
+    phone_verified: bool = False
+    binding_complete: bool = False
 
 
 class PasswordResetRequestModel(BaseModel):
@@ -97,7 +108,7 @@ async def register(
     request: RegisterRequest,
     user_repository: UserRepository = Depends(get_user_repository),
     email_service=Depends(get_auth_email_service),
-):
+) -> RegisterResponse:
     use_case = RegisterUserUseCase(
         user_repository=user_repository,
         base_url=settings.APP_BASE_URL,
@@ -128,7 +139,7 @@ async def login(
     request: LoginRequest,
     user_repository: UserRepository = Depends(get_user_repository),
     session_store=Depends(get_auth_session_store),
-):
+) -> LoginResponse:
     use_case = LoginUseCase(
         user_repository=user_repository,
         session_store=session_store,
@@ -154,7 +165,7 @@ async def refresh(
     request: RefreshRequest,
     user_repository: UserRepository = Depends(get_user_repository),
     session_store=Depends(get_auth_session_store),
-):
+) -> LoginResponse:
     use_case = RefreshTokenUseCase(
         user_repository=user_repository,
         session_store=session_store,
@@ -186,7 +197,7 @@ def _verify_email_token(token: str, user_repository: UserRepository) -> MessageR
 async def verify_email(
     token: str,
     user_repository: UserRepository = Depends(get_user_repository),
-):
+) -> MessageResponse:
     return _verify_email_token(token, user_repository)
 
 
@@ -194,16 +205,16 @@ async def verify_email(
 async def verify_email_post(
     request: VerifyEmailRequestModel,
     user_repository: UserRepository = Depends(get_user_repository),
-):
+) -> MessageResponse:
     return _verify_email_token(request.token, user_repository)
 
 
-@router.post("/password/forgot", response_model=MessageResponse, status_code=status.HTTP_202_ACCEPTED)
+@router.post("/forgot-password", response_model=MessageResponse, status_code=status.HTTP_202_ACCEPTED)
 async def forgot_password(
     request: PasswordResetRequestModel,
     user_repository: UserRepository = Depends(get_user_repository),
     email_service=Depends(get_auth_email_service),
-):
+) -> MessageResponse:
     success, error = RequestPasswordResetUseCase(
         user_repository=user_repository,
         base_url=settings.APP_BASE_URL,
@@ -215,11 +226,11 @@ async def forgot_password(
     return MessageResponse(message="如果账户存在，密码重置邮件已发送")
 
 
-@router.post("/password/reset", response_model=MessageResponse)
+@router.post("/reset-password", response_model=MessageResponse)
 async def reset_password(
     request: ResetPasswordModel,
     user_repository: UserRepository = Depends(get_user_repository),
-):
+) -> MessageResponse:
     success, error = ResetPasswordUseCase(user_repository=user_repository).execute(
         ResetPasswordRequest(token=request.token, new_password=request.new_password)
     )
@@ -229,17 +240,38 @@ async def reset_password(
     return MessageResponse(message="密码重置成功")
 
 
+@router.post("/logout")
+async def logout(
+    credentials: HTTPAuthorizationCredentials | None = Depends(bearer_scheme),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+) -> MessageResponse:
+    """登出 - 将当前 token 加入黑名单"""
+
+    if credentials:
+        try:
+            payload = jwt.decode(credentials.credentials, settings.JWT_SECRET_KEY, algorithms=["HS256"])
+            exp = payload.get("exp", 0)
+            blacklist_token(credentials.credentials, exp)
+        except Exception as e:
+            logger.warning(f"Operation failed in apps/api/app/api/routes/auth.py: {e}", exc_info=True)
+    return MessageResponse(message="已登出")
+
+
 @router.get("/me", response_model=CurrentUserResponse)
 async def get_current_user_info(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
-):
+) -> CurrentUserResponse:
     user = authenticated_user.user
+    binding_complete = user.phone_verified and user.email_verified and user.email and "@wechat.local" not in user.email
     return CurrentUserResponse(
         user_id=user.id,
         email=user.email,
         username=user.username,
         display_name=user.display_name,
         email_verified=user.email_verified,
+        phone=user.phone or "",
+        phone_verified=user.phone_verified,
+        binding_complete=binding_complete,
     )
 
 
@@ -259,3 +291,298 @@ def _translate_auth_error(error: str | None) -> str:
         "Display name is required": "显示名称不能为空",
     }
     return translations.get(error or "", error or "注册失败")
+
+
+class WechatSyncRequest(BaseModel):
+    openid: str
+    unionid: Optional[str] = None
+    nickname: Optional[str] = None
+    avatar_url: Optional[str] = None
+    source: str = "miniapp"
+
+
+class WechatSyncResponse(BaseModel):
+    access_token: str
+    token: str
+    refresh_token: str
+    user_id: str
+    user: dict
+    user_info: dict
+    is_new_user: bool
+    expires_in: int
+
+
+def _get_internal_api_keys() -> list[str]:
+    """获取内部 API Key 列表
+
+    优先级:
+    1. INTERNAL_API_KEYS 环境变量
+    2. /app/generated/internal_api_keys.txt 文件 (volume 持久化)
+    """
+    env_keys = os.environ.get("INTERNAL_API_KEYS", "")
+    if env_keys:
+        return [k.strip() for k in env_keys.split(",") if k.strip()]
+
+    # 从持久化文件读取
+    try:
+        with open("/app/generated/internal_api_keys.txt", "r") as f:
+            content = f.read().strip()
+            if content:
+                return [k.strip() for k in content.split(",") if k.strip()]
+    except Exception:
+        logger.warning("无法读取内部 API 密钥文件，仅依赖环境变量配置", exc_info=True)
+
+    return []
+
+
+def _verify_internal_api_key(x_api_key: str | None = Header(None)) -> bool:
+    """验证内部 API Key
+
+    - 已配置时：必须匹配 INTERNAL_API_KEYS 中的 key
+    - 未配置且非生产环境：放行（方便开发）
+    - 未配置且生产环境：拒绝
+    """
+    env = os.environ.get("APP_ENV", os.environ.get("ENV", "development")).lower()
+    key_list = _get_internal_api_keys()
+
+    if not key_list:
+        if env in ("production", "prod"):
+            raise HTTPException(status_code=401, detail="内部接口未配置 API Key")
+        return True
+
+    if x_api_key and x_api_key.strip() in key_list:
+        return True
+
+    raise HTTPException(status_code=401, detail="无效的 API Key")
+
+
+@router.post("/wechat-sync", response_model=WechatSyncResponse, include_in_schema=False)
+async def wechat_sync(
+    request: WechatSyncRequest,
+    user_repository: UserRepository = Depends(get_user_repository),
+    _: bool = Depends(_verify_internal_api_key),
+) -> WechatSyncResponse:
+    """
+    微信同步登录/注册（系统级内部接口）
+
+    由 BFF 层通过 API Key 调用，不直接面向终端用户。
+    根据 openid 查找或创建用户，返回 SaaS token。
+    """
+    from packages.application.auth.wechat_sync_use_case import WechatSyncRequest as UseCaseRequest
+    from packages.application.auth.wechat_sync_use_case import (
+        WechatSyncUseCase,
+    )
+
+    use_case = WechatSyncUseCase(user_repository=user_repository)
+    use_case_request = UseCaseRequest(
+        openid=request.openid,
+        unionid=request.unionid,
+        nickname=request.nickname,
+        avatar_url=request.avatar_url,
+        source=request.source,
+    )
+
+    response, error = use_case.execute(use_case_request)
+    if error:
+        raise HTTPException(status_code=400, detail=error)
+
+    return WechatSyncResponse(**response.to_dict())
+
+
+# ==================== 微信网页登录（OAuth） ====================
+
+
+class WechatAuthUrlResponse(BaseModel):
+    auth_url: str
+    state: str
+
+
+class WechatCallbackRequest(BaseModel):
+    code: str
+    state: str = ""
+
+
+class WechatLoginResponse(BaseModel):
+    access_token: str
+    refresh_token: str
+    user_id: str
+    display_name: str
+    avatar_url: str = ""
+    is_new_user: bool
+    binding_complete: bool
+    expires_in: int
+
+
+@router.get("/wechat/url", response_model=WechatAuthUrlResponse)
+async def get_wechat_auth_url() -> WechatAuthUrlResponse:
+    """获取微信扫码登录授权链接"""
+    from packages.application.auth.wechat_oauth_service import get_wechat_oauth_service
+
+    oauth_service = get_wechat_oauth_service()
+    auth_url, state = oauth_service.generate_auth_url()
+    return WechatAuthUrlResponse(auth_url=auth_url, state=state)
+
+
+@router.post("/wechat/callback", response_model=WechatLoginResponse)
+async def wechat_callback(
+    request: WechatCallbackRequest,
+    user_repository: UserRepository = Depends(get_user_repository),
+) -> WechatLoginResponse:
+    """微信登录回调处理"""
+    from packages.application.auth.wechat_oauth_service import get_wechat_oauth_service
+    from packages.application.auth.wechat_sync_use_case import WechatSyncRequest as SyncRequest
+    from packages.application.auth.wechat_sync_use_case import WechatSyncUseCase
+
+    # 1. 用 code 换微信用户信息
+    oauth_service = get_wechat_oauth_service()
+    wechat_user, err = oauth_service.handle_callback(request.code, request.state)
+    if err:
+        raise HTTPException(status_code=400, detail=err)
+
+    # 2. 同步登录/注册（复用 wechat-sync 逻辑）
+    use_case = WechatSyncUseCase(user_repository=user_repository)
+    sync_request = SyncRequest(
+        openid=wechat_user.openid,
+        unionid=wechat_user.unionid,
+        nickname=wechat_user.nickname,
+        avatar_url=wechat_user.avatar_url,
+        source="web",
+    )
+    response, err = use_case.execute(sync_request)
+    if err:
+        raise HTTPException(status_code=400, detail=err)
+
+    # 3. 判断绑定状态
+    user = user_repository.find_by_id(response.user_id)
+    binding_complete = False
+    if user:
+        binding_complete = (
+            user.phone_verified and user.email_verified and user.email and "@wechat.local" not in user.email
+        )
+
+    return WechatLoginResponse(
+        access_token=response.access_token,
+        refresh_token=response.refresh_token,
+        user_id=response.user_id,
+        display_name=response.nickname,
+        avatar_url=response.avatar_url or wechat_user.avatar_url,
+        is_new_user=response.is_new_user,
+        binding_complete=binding_complete,
+        expires_in=response.expires_in,
+    )
+
+
+# ==================== 验证码 & 绑定 ====================
+
+
+class SendVerificationCodeRequest(BaseModel):
+    target: str  # phone / email
+    value: str
+    purpose: str  # bind / login / reset_password
+
+
+class SendVerificationCodeResponse(BaseModel):
+    expires_in: int
+    resend_after: int
+
+
+class BindContactRequest(BaseModel):
+    phone: str = ""
+    phone_code: str = ""
+    email: str = ""
+    email_code: str = ""
+
+
+class BindContactResponse(BaseModel):
+    success: bool
+    user: dict
+
+
+@router.post("/send-verification-code", response_model=SendVerificationCodeResponse)
+async def send_verification_code(
+    request: SendVerificationCodeRequest,
+) -> SendVerificationCodeResponse:
+    """发送验证码（手机或邮箱）"""
+    from app.dependencies import get_db_session
+
+    from packages.adapters.sms.sms_service import get_sms_service
+    from packages.adapters.smtp import get_email_service
+    from packages.adapters.sqlalchemy_impl.verification_code_repository import (
+        SQLAlchemyVerificationCodeRepository,
+    )
+    from packages.application.auth.bind_contact_use_case import SendVerificationCodeRequest as UseCaseRequest
+    from packages.application.auth.bind_contact_use_case import (
+        SendVerificationCodeUseCase,
+    )
+    from packages.application.auth.verification_code_service import VerificationCodeService
+
+    db = next(get_db_session())
+    repo = SQLAlchemyVerificationCodeRepository(db)
+    vc_service = VerificationCodeService(repo=repo)
+    sms_service = get_sms_service()
+    email_service = get_email_service()
+
+    use_case = SendVerificationCodeUseCase(
+        verification_code_service=vc_service,
+        sms_service=sms_service,
+        email_service=email_service,
+    )
+    uc_request = UseCaseRequest(
+        target=request.target,
+        value=request.value,
+        purpose=request.purpose,
+    )
+    response, err = use_case.execute(uc_request)
+    if err:
+        raise HTTPException(status_code=400, detail=err)
+
+    return SendVerificationCodeResponse(
+        expires_in=response.expires_in,
+        resend_after=response.resend_after,
+    )
+
+
+@router.post("/bind-contact", response_model=BindContactResponse)
+async def bind_contact(
+    request: BindContactRequest,
+    current_user: AuthenticatedUser = Depends(get_current_user),
+    user_repository: UserRepository = Depends(get_user_repository),
+) -> BindContactResponse:
+    """绑定手机号和/或邮箱（需登录态）"""
+    from app.dependencies import get_db_session
+
+    from packages.adapters.sqlalchemy_impl.verification_code_repository import (
+        SQLAlchemyVerificationCodeRepository,
+    )
+    from packages.application.auth.bind_contact_use_case import BindContactRequest as UseCaseRequest
+    from packages.application.auth.bind_contact_use_case import (
+        BindContactUseCase,
+    )
+    from packages.application.auth.verification_code_service import VerificationCodeService
+
+    db = next(get_db_session())
+    vc_repo = SQLAlchemyVerificationCodeRepository(db)
+    vc_service = VerificationCodeService(repo=vc_repo)
+
+    use_case = BindContactUseCase(
+        user_repository=user_repository,
+        verification_code_service=vc_service,
+    )
+    uc_request = UseCaseRequest(
+        user_id=current_user.user.id,
+        phone=request.phone,
+        phone_code=request.phone_code,
+        email=request.email,
+        email_code=request.email_code,
+    )
+    response, err = use_case.execute(uc_request)
+    if err:
+        raise HTTPException(status_code=400, detail=err)
+
+    return BindContactResponse(success=True, user=response.to_dict()["user"])
+
+
+# ==================== 当前用户信息扩展 ====================
+
+# 扩展 CurrentUserResponse 增加绑定状态字段（在原响应基础上补充）
+# 通过给 get_current_user_info 返回值补充字段实现

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

@@ -6,7 +6,6 @@ Supports chunked upload, resume, and automatic cleanup of expired uploads.
 import fcntl
 import json
 import logging
-import os
 import shutil
 import tempfile
 from datetime import datetime, timedelta, timezone
@@ -14,12 +13,13 @@ from pathlib import Path
 from typing import Any
 from uuid import uuid4
 
+from app.api.routes._helpers import require_project_and_library
 from app.auth import AuthenticatedUser, get_current_user
-from app.config import get_settings
 from app.core.celery_app import celery_app
 from app.core.storage import OSSStorageService, get_storage_service
 from app.dependencies import (
     get_asset_library_repository,
+    get_asset_repository,
     get_ingest_job_repository,
     get_project_repository,
 )
@@ -43,20 +43,33 @@ DEFAULT_CHUNK_SIZE = 5 * 1024 * 1024  # 5MB
 MAX_FILE_SIZE = 2 * 1024 * 1024 * 1024  # 2GB
 CHUNK_EXPIRY_HOURS = 24
 
-# Allowed file types (consistent with existing upload.py)
+# Allowed file types — must stay in sync with upload.py ALLOWED_MIME_TYPES
 ALLOWED_MIME_TYPES = {
+    # Images
     "image/jpeg",
     "image/png",
     "image/gif",
     "image/webp",
+    "image/bmp",
+    "image/tiff",
+    "image/svg+xml",
+    # Video
     "video/mp4",
     "video/quicktime",
+    "video/mpeg",
     "video/x-msvideo",
     "video/webm",
+    "video/x-matroska",
+    "video/3gpp",
+    # Audio
     "audio/mpeg",
     "audio/wav",
     "audio/ogg",
     "audio/mp3",
+    "audio/flac",
+    "audio/aac",
+    "audio/x-m4a",
+    "audio/webm",
 }
 
 # Chunk storage root directory
@@ -100,22 +113,6 @@ def _atomic_check_and_record(upload_id: str, chunk_index: int) -> bool:
             fcntl.flock(f.fileno(), fcntl.LOCK_UN)
 
 
-def _require_project_and_library(
-    project_id: str,
-    library_id: str,
-    project_repository: Any,
-    asset_library_repository: Any,
-) -> None:
-    """Verify project and asset library exist"""
-    project = GetProjectUseCase(project_repository).execute(project_id)
-    if project is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
-
-    libraries = asset_library_repository.find_by_project(project_id)
-    if not any(item.id == library_id for item in libraries):
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found")
-
-
 def _load_upload_meta(upload_id: str) -> dict[str, Any]:
     """Load upload metadata"""
     meta_path = _get_upload_meta_path(upload_id)
@@ -193,7 +190,6 @@ async def init_chunked_upload(
     asset_library_repository: Any = Depends(get_asset_library_repository),
 ) -> ChunkedUploadInitResponse:
     """Initialize chunked upload"""
-    settings = get_settings()
 
     # Validate file size
     if request.file_size > MAX_FILE_SIZE:
@@ -208,7 +204,7 @@ async def init_chunked_upload(
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
 
     # Verify asset library
-    _require_project_and_library(
+    require_project_and_library(
         request.project_id,
         request.library_id,
         project_repository,
@@ -261,6 +257,154 @@ async def init_chunked_upload(
     )
 
 
+@router.get("/{upload_id}/status", response_model=ChunkedUploadStatusResponse)
+async def get_upload_status(
+    upload_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+) -> ChunkedUploadStatusResponse:
+    """Get upload status (for resume)"""
+    meta = _load_upload_meta(upload_id)
+
+    return ChunkedUploadStatusResponse(
+        upload_id=upload_id,
+        filename=meta["filename"],
+        file_size=meta["file_size"],
+        total_chunks=meta["total_chunks"],
+        uploaded_chunks=sorted(meta["uploaded_chunks"]),
+        status=meta["status"],
+        created_at=datetime.fromisoformat(meta["created_at"]),
+        expires_at=datetime.fromisoformat(meta["expires_at"]),
+    )
+
+
+@router.post("/{upload_id}/complete", response_model=ChunkedUploadCompleteResponse)
+async def complete_chunked_upload(
+    upload_id: str,
+    request: ChunkedUploadCompleteRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    project_repository: Any = Depends(get_project_repository),
+    asset_library_repository: Any = Depends(get_asset_library_repository),
+    asset_repository: Any = Depends(get_asset_repository),
+    ingest_job_repository: Any = Depends(get_ingest_job_repository),
+    storage_service: OSSStorageService = Depends(get_storage_service),
+) -> ChunkedUploadCompleteResponse:
+    """Complete chunked upload, merge chunks"""
+    # Load metadata
+    meta = _load_upload_meta(upload_id)
+
+    # Verify project ID and library ID
+    if request.project_id != meta["project_id"] or request.library_id != meta["library_id"]:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Project or library ID mismatch")
+
+    # Verify all chunks are uploaded
+    expected_chunks = set(range(meta["total_chunks"]))
+    uploaded_chunks = set(meta["uploaded_chunks"])
+    missing_chunks = expected_chunks - uploaded_chunks
+
+    if missing_chunks:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f"Missing chunks: {sorted(missing_chunks)}. Please upload remaining chunks first.",
+        )
+
+    # Validate file type
+    chunk_dir = _get_chunk_dir(upload_id)
+    sample_chunk_path = chunk_dir / "chunk_000000"
+    if sample_chunk_path.exists():
+        with open(sample_chunk_path, "rb") as f:
+            sample_data = f.read(8192)  # Read first 8KB for type detection
+        detected_mime = _validate_file_type(sample_data, meta["filename"])
+        if detected_mime not in ALLOWED_MIME_TYPES:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=f"Unsupported file type: {detected_mime}",
+            )
+
+    # Merge chunks to temp file
+    temp_file_path = CHUNK_STORAGE_ROOT / f"{upload_id}_complete.tmp"
+    try:
+        with open(temp_file_path, "wb") as out_file:
+            for i in range(meta["total_chunks"]):
+                chunk_path = chunk_dir / f"chunk_{i:06d}"
+                with open(chunk_path, "rb") as in_file:
+                    shutil.copyfileobj(in_file, out_file)
+
+        # Verify file size
+        actual_size = temp_file_path.stat().st_size
+        if actual_size != meta["file_size"]:
+            raise HTTPException(
+                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                detail=f"File size mismatch. Expected {meta['file_size']}, got {actual_size}",
+            )
+
+        # Upload to OSS
+        file_id = uuid4().hex[:8]
+        safe_filename = meta["filename"]
+        storage_key = f"uploads/{file_id}/{safe_filename}"
+
+        file_url = storage_service.upload_file(
+            str(temp_file_path),
+            storage_key,
+            content_type=meta["content_type"],
+        )
+
+        # ── 素材去重检测：同素材库 + 同 file_hash 视为重复 ──
+        if request.file_hash:
+            existing = asset_repository.find_by_library_and_file_hash(
+                library_id=request.library_id,
+                file_hash=request.file_hash,
+            )
+            if existing is not None:
+                logger.info(
+                    "素材去重命中(chunked): library=%s hash=%s existing_asset=%s",
+                    request.library_id,
+                    request.file_hash,
+                    existing.id,
+                )
+                meta["status"] = "completed"
+                _save_upload_meta(upload_id, meta)
+                return ChunkedUploadCompleteResponse(
+                    storage_key=storage_key,
+                    ingest_job_id="",
+                    url=file_url,
+                    duplicated=True,
+                    asset_id=existing.id,
+                )
+
+        # Create ingest job
+        use_case = SubmitIngestJobUseCase(ingest_job_repository)
+        job = use_case.execute(
+            SubmitIngestJobCommand(
+                project_id=meta["project_id"],
+                library_id=meta["library_id"],
+                storage_key=storage_key,
+                file_hash=request.file_hash,
+            )
+        )
+        celery_app.send_task("worker.ingest_asset", args=[job.id])
+
+        # Update metadata status
+        meta["status"] = "completed"
+        _save_upload_meta(upload_id, meta)
+
+        return ChunkedUploadCompleteResponse(
+            storage_key=storage_key,
+            ingest_job_id=job.id,
+            url=file_url,
+        )
+
+    finally:
+        # Cleanup temp file and chunks
+        if temp_file_path.exists():
+            temp_file_path.unlink()
+        if chunk_dir.exists():
+            shutil.rmtree(chunk_dir)
+        # Delete metadata file
+        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,
@@ -332,126 +476,3 @@ async def upload_chunk(
         "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,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-) -> ChunkedUploadStatusResponse:
-    """Get upload status (for resume)"""
-    meta = _load_upload_meta(upload_id)
-
-    return ChunkedUploadStatusResponse(
-        upload_id=upload_id,
-        filename=meta["filename"],
-        file_size=meta["file_size"],
-        total_chunks=meta["total_chunks"],
-        uploaded_chunks=sorted(meta["uploaded_chunks"]),
-        status=meta["status"],
-        created_at=datetime.fromisoformat(meta["created_at"]),
-        expires_at=datetime.fromisoformat(meta["expires_at"]),
-    )
-
-
-@router.post("/{upload_id}/complete", response_model=ChunkedUploadCompleteResponse)
-async def complete_chunked_upload(
-    upload_id: str,
-    request: ChunkedUploadCompleteRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    project_repository: Any = Depends(get_project_repository),
-    asset_library_repository: Any = Depends(get_asset_library_repository),
-    ingest_job_repository: Any = Depends(get_ingest_job_repository),
-    storage_service: OSSStorageService = Depends(get_storage_service),
-) -> ChunkedUploadCompleteResponse:
-    """Complete chunked upload, merge chunks"""
-    # Load metadata
-    meta = _load_upload_meta(upload_id)
-
-    # Verify project ID and library ID
-    if request.project_id != meta["project_id"] or request.library_id != meta["library_id"]:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Project or library ID mismatch")
-
-    # Verify all chunks are uploaded
-    expected_chunks = set(range(meta["total_chunks"]))
-    uploaded_chunks = set(meta["uploaded_chunks"])
-    missing_chunks = expected_chunks - uploaded_chunks
-
-    if missing_chunks:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"Missing chunks: {sorted(missing_chunks)}. Please upload remaining chunks first.",
-        )
-
-    # Validate file type
-    chunk_dir = _get_chunk_dir(upload_id)
-    sample_chunk_path = chunk_dir / "chunk_000000"
-    if sample_chunk_path.exists():
-        with open(sample_chunk_path, "rb") as f:
-            sample_data = f.read(8192)  # Read first 8KB for type detection
-        detected_mime = _validate_file_type(sample_data, meta["filename"])
-        if detected_mime not in ALLOWED_MIME_TYPES:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail=f"Unsupported file type: {detected_mime}",
-            )
-
-    # Merge chunks to temp file
-    temp_file_path = CHUNK_STORAGE_ROOT / f"{upload_id}_complete.tmp"
-    try:
-        with open(temp_file_path, "wb") as out_file:
-            for i in range(meta["total_chunks"]):
-                chunk_path = chunk_dir / f"chunk_{i:06d}"
-                with open(chunk_path, "rb") as in_file:
-                    shutil.copyfileobj(in_file, out_file)
-
-        # Verify file size
-        actual_size = temp_file_path.stat().st_size
-        if actual_size != meta["file_size"]:
-            raise HTTPException(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                detail=f"File size mismatch. Expected {meta['file_size']}, got {actual_size}",
-            )
-
-        # Upload to OSS
-        file_id = uuid4().hex[:8]
-        safe_filename = meta["filename"]
-        storage_key = f"uploads/{file_id}/{safe_filename}"
-
-        file_url = storage_service.upload_file(
-            str(temp_file_path),
-            storage_key,
-            content_type=meta["content_type"],
-        )
-
-        # Create ingest job
-        use_case = SubmitIngestJobUseCase(ingest_job_repository)
-        job = use_case.execute(
-            SubmitIngestJobCommand(
-                project_id=meta["project_id"],
-                library_id=meta["library_id"],
-                storage_key=storage_key,
-            )
-        )
-        celery_app.send_task("worker.ingest_asset", args=[job.id])
-
-        # Update metadata status
-        meta["status"] = "completed"
-        _save_upload_meta(upload_id, meta)
-
-        return ChunkedUploadCompleteResponse(
-            storage_key=storage_key,
-            ingest_job_id=job.id,
-            url=file_url,
-        )
-
-    finally:
-        # Cleanup temp file and chunks
-        if temp_file_path.exists():
-            temp_file_path.unlink()
-        if chunk_dir.exists():
-            shutil.rmtree(chunk_dir)
-        # Delete metadata file
-        meta_path = _get_upload_meta_path(upload_id)
-        if meta_path.exists():
-            meta_path.unlink()

apps/api/app/api/routes/classification_jobs.py

@@ -1,4 +1,3 @@
-from datetime import datetime, timezone
 from typing import Any
 
 from app.core.celery_app import celery_app

apps/api/app/api/routes/dashboard.py

@@ -1,92 +0,0 @@
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import (
-    get_asset_repository,
-    get_generation_task_repository,
-    get_project_repository,
-    get_title_library_repository,
-    get_voice_library_repository,
-)
-from app.schemas.dashboard import DashboardOverviewResponse, RecentTaskItem, SubscriptionInfo
-from fastapi import APIRouter, Depends
-
-router = APIRouter()
-
-
-def _status_value(status) -> str:
-    return status.value if hasattr(status, "value") else str(status)
-
-
-def _generation_step(status: str) -> str:
-    if status == "pending":
-        return "等待 Worker 执行"
-    if status == "running":
-        return "正在生成成片"
-    if status == "completed":
-        return "生成完成"
-    if status == "failed":
-        return "生成失败"
-    return status
-
-
-@router.get("/overview", response_model=DashboardOverviewResponse)
-def get_dashboard_overview(
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    project_repository: Any = Depends(get_project_repository),
-    asset_repository: Any = Depends(get_asset_repository),
-    generation_task_repository: Any = Depends(get_generation_task_repository),
-    title_library_repository: Any = Depends(get_title_library_repository),
-    voice_library_repository: Any = Depends(get_voice_library_repository),
-) -> DashboardOverviewResponse:
-    """Dashboard 概览：用户级汇总数据。"""
-    user_id = authenticated_user.user.id
-
-    # 获取用户可访问的所有 project
-    projects = project_repository.find_accessible_projects(user_id)
-    project_ids = [p.id for p in projects]
-
-    # 素材统计
-    total_assets = asset_repository.count_by_project_ids(project_ids)
-    used_storage_bytes = asset_repository.sum_storage_by_project_ids(project_ids)
-
-    # 标题库 / 配音库统计
-    total_titles = title_library_repository.count_by_user(user_id)
-    total_voices = voice_library_repository.count_by_user(user_id)
-
-    # 生成任务统计
-    total_tasks = generation_task_repository.count_by_user(user_id)
-
-    # 最近任务（SQL 层 LIMIT 5）
-    recent = generation_task_repository.list_recent_by_user(user_id, limit=5)
-    recent_tasks = []
-    for task in recent:
-        s = _status_value(task.status)
-        recent_tasks.append(
-            RecentTaskItem(
-                id=task.id,
-                task_type="generation",
-                status=s,
-                current_step=_generation_step(s),
-                error_message=task.error_message or "",
-                updated_at=task.completed_at or task.started_at or task.created_at,
-            )
-        )
-
-    # 订阅信息
-    user = authenticated_user.user
-    subscription = SubscriptionInfo(
-        plan=getattr(user, "subscription_plan", "free") or "free",
-        is_active=getattr(user, "subscription_status", "") == "active",
-    )
-
-    return DashboardOverviewResponse(
-        total_assets=total_assets,
-        used_storage_bytes=used_storage_bytes,
-        total_titles=total_titles,
-        total_voices=total_voices,
-        total_tasks=total_tasks,
-        total_products=len(projects),
-        subscription=subscription,
-        recent_tasks=recent_tasks,
-    )

apps/api/app/api/routes/duplication.py

@@ -239,7 +239,9 @@ def get_duplication_detail(
     return _to_detail_response(record)
 
 
-@router.delete("/records/{record_id}", status_code=status.HTTP_204_NO_CONTENT)
+@router.delete(
+    "/records/{record_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response
+)
 def delete_duplication_record(
     record_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -257,7 +259,7 @@ def delete_duplication_record(
 
     use_case = DeleteDuplicationRecordUseCase(duplication_repository)
     use_case.execute(record_id)
-    return Response(status_code=204)
+    return
 
 
 @router.post("/records/{record_id}/retry", response_model=DuplicationUploadResponse)
@@ -287,7 +289,7 @@ def retry_duplication(
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
             detail=str(e),
-        )
+        ) from e
     if updated is None:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,

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

@@ -1,414 +0,0 @@
-"""剪辑计划管理 API — Phase 8 模板编排引擎.
-
-RESTful CRUD for EditPlan:
-- GET    /api/v1/edit-plans            列表（分页 + 状态/模板筛选）
-- GET    /api/v1/edit-plans/{id}       详情
-- POST   /api/v1/edit-plans            创建
-- PUT    /api/v1/edit-plans/{id}       更新（含状态机流转）
-- DELETE /api/v1/edit-plans/{id}       删除
-- POST   /api/v1/edit-plans/{id}/generate          触发剪辑渲染生成（任务 2.05）
-- GET    /api/v1/edit-plans/{id}/generation-status  查询生成进度（任务 2.05）
-
-业务逻辑委托给 EditPlanService 服务层。
-"""
-
-from __future__ import annotations
-
-import logging
-from datetime import datetime
-from typing import Any, List, Optional
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.core.celery_app import celery_app
-from app.dependencies import get_db_session
-from app.services import EditPlanService
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-from fastapi.responses import Response
-from pydantic import BaseModel, Field
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.generation_task_repository import (
-    SQLAlchemyGenerationTaskRepository,
-)
-from packages.application.generation_tasks import (
-    CreateGenerationTaskCommand,
-    CreateGenerationTaskUseCase,
-)
-from packages.domain.edit_plan import EditPlan, EditPlanStatus
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter()
-
-
-# ── Pydantic Schemas ─────────────────────────────────────────────────────────
-
-
-class EditPlanCreateRequest(BaseModel):
-    """创建剪辑计划请求体"""
-
-    template_id: str = Field(..., min_length=1, max_length=32, description="关联模板 ID")
-    name: str = Field(..., min_length=1, max_length=200, description="计划名称")
-    config: dict[str, Any] = Field(default_factory=dict, description="计划配置 (JSON)")
-    total_duration: float = Field(default=0.0, ge=0.0, description="总时长 (秒)")
-
-
-class EditPlanUpdateRequest(BaseModel):
-    """更新剪辑计划请求体"""
-
-    name: Optional[str] = Field(default=None, min_length=1, max_length=200, description="计划名称")
-    config: Optional[dict[str, Any]] = Field(default=None, description="计划配置 (JSON)")
-    total_duration: Optional[float] = Field(default=None, ge=0.0, description="总时长 (秒)")
-    status: Optional[str] = Field(
-        default=None,
-        description="目标状态 (通过状态机流转): editing / rendering / completed / failed / draft",
-    )
-
-
-class EditPlanResponse(BaseModel):
-    """剪辑计划响应体"""
-
-    id: str
-    template_id: str
-    name: str
-    status: str
-    total_duration: float
-    config: dict[str, Any]
-    created_at: datetime
-    updated_at: datetime
-
-    model_config = {"from_attributes": True}
-
-
-class EditPlanListResponse(BaseModel):
-    """剪辑计划列表响应体"""
-
-    items: List[EditPlanResponse]
-    total: int
-    page: int
-    page_size: int
-
-
-class ClipStatusItem(BaseModel):
-    """片段生成状态"""
-
-    clip_id: str
-    clip_type: str
-    order: int
-    status: str
-    asset_id: str
-    text_content: str
-    duration: float
-
-
-class EditPlanGenerationStatusResponse(BaseModel):
-    """剪辑计划生成进度响应体"""
-
-    plan_id: str
-    plan_status: str
-    generation_task_id: Optional[str] = None
-    clips: List[ClipStatusItem]
-
-
-class EditPlanGenerateResponse(BaseModel):
-    """剪辑计划触发生成响应体"""
-
-    plan_id: str
-    plan_status: str
-    generation_task_id: str
-    clip_count: int
-
-
-# ── Helpers ───────────────────────────────────────────────────────────────────
-
-
-def _to_response(p: EditPlan) -> EditPlanResponse:
-    return EditPlanResponse(
-        id=p.id,
-        template_id=p.template_id,
-        name=p.name,
-        status=p.status.value if hasattr(p.status, "value") else p.status,
-        total_duration=p.total_duration,
-        config=p.config,
-        created_at=p.created_at,
-        updated_at=p.updated_at,
-    )
-
-
-# ── Routes ────────────────────────────────────────────────────────────────────
-
-
-@router.get("", response_model=EditPlanListResponse)
-def list_plans(
-    page: int = Query(default=1, ge=1, description="页码"),
-    page_size: int = Query(default=20, ge=1, le=100, description="每页数量"),
-    template_id: Optional[str] = Query(default=None, description="按模板 ID 筛选"),
-    status_filter: Optional[str] = Query(
-        default=None,
-        alias="status",
-        description="按状态筛选: draft / editing / rendering / completed / failed",
-    ),
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanListResponse:
-    """获取剪辑计划列表（支持分页、按模板/状态筛选）"""
-    svc = EditPlanService(db)
-
-    # 解析状态筛选
-    status_enum: Optional[EditPlanStatus] = None
-    if status_filter:
-        try:
-            status_enum = EditPlanStatus(status_filter)
-        except ValueError:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail=(
-                    f"无效的状态值: {status_filter}，"
-                    f"可选值: draft, editing, rendering, completed, failed"
-                ),
-            )
-
-    skip = (page - 1) * page_size
-    plans = svc.list_plans(
-        template_id=template_id,
-        status=status_enum,
-        skip=skip,
-        limit=page_size,
-    )
-    total = svc.count_plans(
-        template_id=template_id,
-        status=status_enum,
-    )
-
-    return EditPlanListResponse(
-        items=[_to_response(p) for p in plans],
-        total=total,
-        page=page,
-        page_size=page_size,
-    )
-
-
-@router.get("/{plan_id}", response_model=EditPlanResponse)
-def get_plan(
-    plan_id: str,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanResponse:
-    """获取单个剪辑计划详情"""
-    svc = EditPlanService(db)
-    try:
-        plan = svc.get_plan_or_raise(plan_id)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=str(exc),
-        )
-    return _to_response(plan)
-
-
-@router.post("", response_model=EditPlanResponse, status_code=status.HTTP_201_CREATED)
-def create_plan(
-    body: EditPlanCreateRequest,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanResponse:
-    """创建剪辑计划"""
-    svc = EditPlanService(db)
-    try:
-        created = svc.create_plan(
-            template_id=body.template_id,
-            name=body.name,
-            config=body.config,
-            total_duration=body.total_duration,
-        )
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=str(exc),
-        )
-    logger.info(
-        "创建剪辑计划: id=%s name=%s by user=%s",
-        created.id,
-        created.name,
-        current_user.user.id,
-    )
-    return _to_response(created)
-
-
-@router.put("/{plan_id}", response_model=EditPlanResponse)
-def update_plan(
-    plan_id: str,
-    body: EditPlanUpdateRequest,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanResponse:
-    """更新剪辑计划（支持状态机流转）"""
-    svc = EditPlanService(db)
-
-    # 基础字段更新
-    try:
-        if body.name is not None or body.config is not None or body.total_duration is not None:
-            svc.update_plan(
-                plan_id,
-                name=body.name,
-                config=body.config,
-                total_duration=body.total_duration,
-            )
-
-        # 状态机流转
-        if body.status is not None:
-            try:
-                target_status = EditPlanStatus(body.status)
-            except ValueError:
-                raise HTTPException(
-                    status_code=status.HTTP_400_BAD_REQUEST,
-                    detail=(
-                        f"无效的状态值: {body.status}，"
-                        f"可选值: draft, editing, rendering, completed, failed"
-                    ),
-                )
-            svc.transition_status(plan_id, target_status)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=str(exc),
-        )
-
-    # 返回最新状态
-    result = svc.get_plan_or_raise(plan_id)
-    logger.info("更新剪辑计划: id=%s by user=%s", plan_id, current_user.user.id)
-    return _to_response(result)
-
-
-@router.delete("/{plan_id}", status_code=status.HTTP_204_NO_CONTENT)
-def delete_plan(
-    plan_id: str,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> Response:
-    """删除剪辑计划"""
-    svc = EditPlanService(db)
-    deleted = svc.delete_plan(plan_id)
-    if not deleted:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=f"剪辑计划不存在: {plan_id}",
-        )
-    logger.info(
-        "删除剪辑计划: id=%s by user=%s",
-        plan_id,
-        current_user.user.id,
-    )
-    return Response(status_code=204)
-
-
-# ── 生成相关端点（任务 2.05） ─────────────────────────────────────────────────
-
-
-@router.post("/{plan_id}/generate", response_model=EditPlanGenerateResponse)
-def generate_plan(
-    plan_id: str,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanGenerateResponse:
-    """触发剪辑计划渲染生成
-
-    前置条件：计划状态必须为 editing，且至少有一个片段。
-    流程：
-    1. 验证计划状态为 editing
-    2. 将 pending 片段标记为 ready
-    3. 创建 GenerationTask
-    4. 调度 Celery 任务 worker.render_edit_plan
-    5. 将计划状态流转为 rendering
-    """
-    svc = EditPlanService(db)
-
-    # 检查是否可生成
-    can_gen, reason = svc.can_generate(plan_id)
-    if not can_gen:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=reason,
-        )
-
-    # 将 pending 片段标记为 ready
-    clip_count = svc.mark_clips_ready(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,
-        )
-    )
-
-    # 将 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)
-
-    # 调度 Celery 任务
-    celery_app.send_task("worker.render_edit_plan", args=[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,
-    )
-
-    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(
-    "/{plan_id}/generation-status",
-    response_model=EditPlanGenerationStatusResponse,
-)
-def get_generation_status(
-    plan_id: str,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanGenerationStatusResponse:
-    """查询剪辑计划生成进度
-
-    返回计划状态、关联的 GenerationTask ID、以及每个片段的状态。
-    """
-    svc = EditPlanService(db)
-    gen_status = svc.get_generation_status(plan_id)
-
-    plan = gen_status["plan"]
-    clips = gen_status["clips"]
-
-    clip_items = [
-        ClipStatusItem(
-            clip_id=c.id,
-            clip_type=c.clip_type,
-            order=c.order,
-            status=c.status.value if hasattr(c.status, "value") else c.status,
-            asset_id=c.asset_id or "",
-            text_content=c.text_content or "",
-            duration=c.duration,
-        )
-        for c in clips
-    ]
-
-    return EditPlanGenerationStatusResponse(
-        plan_id=plan_id,
-        plan_status=plan.status.value if hasattr(plan.status, "value") else plan.status,
-        generation_task_id=gen_status["generation_task_id"],
-        clips=clip_items,
-    )

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

@@ -1,255 +0,0 @@
-"""模板管理 API — Phase 8 模板编排引擎.
-
-RESTful CRUD for EditTemplate:
-- GET  /api/v1/edit-templates      列表（分页 + 类型筛选）
-- GET  /api/v1/edit-templates/{id} 详情
-- POST /api/v1/edit-templates      创建（管理员）
-- PUT  /api/v1/edit-templates/{id} 更新
-- DELETE /api/v1/edit-templates/{id} 删除（软删除 → inactive）
-
-业务逻辑委托给 EditTemplateService 服务层。
-"""
-
-from __future__ import annotations
-
-import logging
-from datetime import datetime
-from typing import Any, List, Optional
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session
-from app.services import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-from fastapi.responses import Response
-from pydantic import BaseModel, Field
-from sqlalchemy.orm import Session
-
-from packages.domain.edit_template import EditTemplate, EditTemplateStatus
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter()
-
-
-# ── Pydantic Schemas ─────────────────────────────────────────────────────────
-
-
-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="模板类型")
-    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="排序权重")
-
-
-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="模板类型")
-    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="排序权重")
-    status: Optional[str] = Field(default=None, description="状态: active / inactive")
-
-
-class EditTemplateResponse(BaseModel):
-    """模板响应体"""
-
-    id: str
-    name: str
-    description: str
-    template_type: str
-    config: dict[str, Any]
-    preview_url: str
-    sort_weight: int
-    status: str
-    created_at: datetime
-    updated_at: datetime
-
-    model_config = {"from_attributes": True}
-
-
-class EditTemplateListResponse(BaseModel):
-    """模板列表响应体"""
-
-    items: List[EditTemplateResponse]
-    total: int
-    page: int
-    page_size: int
-
-
-# ── Helpers ───────────────────────────────────────────────────────────────────
-
-
-def _to_response(t: EditTemplate) -> EditTemplateResponse:
-    return EditTemplateResponse(
-        id=t.id,
-        name=t.name,
-        description=t.description,
-        template_type=t.template_type,
-        config=t.config,
-        preview_url=t.preview_url,
-        sort_weight=t.sort_weight,
-        status=t.status.value if hasattr(t.status, "value") else t.status,
-        created_at=t.created_at,
-        updated_at=t.updated_at,
-    )
-
-
-# ── Routes ────────────────────────────────────────────────────────────────────
-
-
-@router.get("", response_model=EditTemplateListResponse)
-def list_templates(
-    page: int = Query(default=1, ge=1, description="页码"),
-    page_size: int = Query(default=20, ge=1, le=100, description="每页数量"),
-    template_type: Optional[str] = Query(default=None, description="按类型筛选"),
-    status_filter: Optional[str] = Query(
-        default=None,
-        alias="status",
-        description="按状态筛选: active / inactive",
-    ),
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditTemplateListResponse:
-    """获取模板列表（支持分页、按类型/状态筛选）"""
-    svc = EditTemplateService(db)
-
-    # 解析状态筛选
-    status_enum: Optional[EditTemplateStatus] = None
-    if status_filter:
-        try:
-            status_enum = EditTemplateStatus(status_filter)
-        except ValueError:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail=f"无效的状态值: {status_filter}，可选值: active, inactive",
-            )
-
-    skip = (page - 1) * page_size
-    templates = svc.list_templates(
-        template_type=template_type,
-        status=status_enum,
-        skip=skip,
-        limit=page_size,
-    )
-    total = svc.count_templates(
-        template_type=template_type,
-        status=status_enum,
-    )
-
-    return EditTemplateListResponse(
-        items=[_to_response(t) for t in templates],
-        total=total,
-        page=page,
-        page_size=page_size,
-    )
-
-
-@router.get("/{template_id}", response_model=EditTemplateResponse)
-def get_template(
-    template_id: str,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditTemplateResponse:
-    """获取单个模板详情"""
-    svc = EditTemplateService(db)
-    try:
-        template = svc.get_template_or_raise(template_id)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=str(exc),
-        )
-    return _to_response(template)
-
-
-@router.post("", response_model=EditTemplateResponse, status_code=status.HTTP_201_CREATED)
-def create_template(
-    body: EditTemplateCreateRequest,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditTemplateResponse:
-    """创建模板（管理员）"""
-    svc = EditTemplateService(db)
-    try:
-        created = svc.create_template(
-            name=body.name,
-            description=body.description,
-            template_type=body.template_type,
-            config=body.config,
-            preview_url=body.preview_url,
-            sort_weight=body.sort_weight,
-        )
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=str(exc),
-        )
-    logger.info("创建模板: id=%s name=%s by user=%s", created.id, created.name, current_user.user.id)
-    return _to_response(created)
-
-
-@router.put("/{template_id}", response_model=EditTemplateResponse)
-def update_template(
-    template_id: str,
-    body: EditTemplateUpdateRequest,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> EditTemplateResponse:
-    """更新模板"""
-    svc = EditTemplateService(db)
-
-    # 解析状态
-    status_enum: Optional[EditTemplateStatus] = None
-    if body.status is not None:
-        try:
-            status_enum = EditTemplateStatus(body.status)
-        except ValueError:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail=f"无效的状态值: {body.status}，可选值: active, inactive",
-            )
-
-    try:
-        result = svc.update_template(
-            template_id,
-            name=body.name,
-            description=body.description,
-            template_type=body.template_type,
-            config=body.config,
-            preview_url=body.preview_url,
-            sort_weight=body.sort_weight,
-            status=status_enum,
-        )
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=str(exc),
-        )
-    logger.info("更新模板: id=%s by user=%s", template_id, current_user.user.id)
-    return _to_response(result)
-
-
-@router.delete("/{template_id}", status_code=status.HTTP_204_NO_CONTENT)
-def delete_template(
-    template_id: str,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> Response:
-    """删除模板（软删除 → 设为 inactive）"""
-    svc = EditTemplateService(db)
-    try:
-        svc.deactivate_template(template_id)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=str(exc),
-        )
-    logger.info("删除模板(软删除): id=%s by user=%s", template_id, current_user.user.id)
-    return Response(status_code=204)

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

@@ -0,0 +1,192 @@
+"""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, Response, status
+from pydantic import BaseModel, Field
+
+from packages.adapters.redis.feature_flag_store import (
+    FeatureFlagConfig,
+    RedisFeatureFlagStore,
+)
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/internal/feature-flags", tags=["Internal"])
+
+# 允许管理的 flag 白名单（防止误操作其他系统 flag）
+ALLOWED_FLAGS: set[str] = set()
+
+
+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),
+) -> list[FeatureFlagResponse]:
+    """列出所有 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}") from 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),
+) -> FeatureFlagResponse:
+    """获取单个 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}") from 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),
+) -> FeatureFlagCheckResponse:
+    """检查某个标识符是否命中 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}") from 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),
+) -> FeatureFlagResponse:
+    """更新 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}") from exc
+
+
+@router.delete("/{name}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
+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)
+        pass
+    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}") from exc

apps/api/app/api/routes/generated_videos.py

@@ -1,123 +0,0 @@
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.core.storage import OSSStorageService, get_storage_service
-from app.dependencies import get_generated_video_repository, get_project_repository
-from app.schemas.generated_video import (
-    GeneratedVideoDownloadUrlResponse,
-    GeneratedVideoResponse,
-    ListGeneratedVideosResponse,
-    UpdateGeneratedVideoReviewRequest,
-)
-from fastapi import APIRouter, Depends, HTTPException, Query
-
-from packages.application import (
-    GetGeneratedVideoDownloadUrlUseCase,
-    GetGeneratedVideoUseCase,
-    ListGeneratedVideosUseCase,
-)
-
-router = APIRouter()
-
-
-def _to_generated_video_response(item, download_url: str | None = None) -> GeneratedVideoResponse:
-    return GeneratedVideoResponse(
-        id=item.id,
-        project_id=item.project_id,
-        generation_task_id=item.generation_task_id,
-        name=item.name,
-        file_url=item.file_url,
-        file_size=item.file_size,
-        duration=item.duration,
-        thumbnail_url=item.thumbnail_url,
-        width=item.width,
-        height=item.height,
-        fps=item.fps,
-        status=item.status,
-        review_status=item.review_status,
-        generation_params=item.generation_params,
-        download_url=download_url,
-    )
-
-
-@router.get("", response_model=ListGeneratedVideosResponse)
-def list_generated_videos(
-    project_id: str | None = Query(None),
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    generated_video_repository: Any = Depends(get_generated_video_repository),
-    project_repository: Any = Depends(get_project_repository),
-    storage_service: OSSStorageService = Depends(get_storage_service),
-) -> ListGeneratedVideosResponse:
-    user_id = authenticated_user.user.id
-    use_case = ListGeneratedVideosUseCase(generated_video_repository)
-
-    if project_id:
-        # If project_id provided, check access and filter by project
-        project = project_repository.find_by_id(project_id)
-        if project is None:
-            raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
-        items = use_case.execute(project_id)
-    else:
-        # If no project_id, list all videos from accessible projects
-        accessible_projects = project_repository.find_accessible_projects(user_id)
-        all_items = []
-        for proj in accessible_projects:
-            all_items.extend(use_case.execute(proj.id))
-        items = all_items
-
-    # Generate download URLs for each video
-    responses = []
-    for item in items:
-        download_url = storage_service.get_download_url(item.file_url)
-        responses.append(_to_generated_video_response(item, download_url=download_url))
-    return ListGeneratedVideosResponse(items=responses)
-
-
-@router.get("/{video_id}", response_model=GeneratedVideoResponse)
-def get_generated_video(
-    video_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    generated_video_repository: Any = Depends(get_generated_video_repository),
-    storage_service: OSSStorageService = Depends(get_storage_service),
-) -> GeneratedVideoResponse:
-    use_case = GetGeneratedVideoUseCase(generated_video_repository)
-    item = use_case.execute(video_id)
-    if item is None:
-        raise HTTPException(status_code=404, detail=f"GeneratedVideo {video_id} not found")
-    download_url = storage_service.get_download_url(item.file_url)
-    return _to_generated_video_response(item, download_url=download_url)
-
-
-@router.patch("/{video_id}/review", response_model=GeneratedVideoResponse)
-def update_generated_video_review_status(
-    video_id: str,
-    request: UpdateGeneratedVideoReviewRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    generated_video_repository: Any = Depends(get_generated_video_repository),
-    storage_service: OSSStorageService = Depends(get_storage_service),
-) -> GeneratedVideoResponse:
-    video = generated_video_repository.get(video_id)
-    if video is None:
-        raise HTTPException(status_code=404, detail=f"GeneratedVideo {video_id} not found")
-    video.review_status = request.review_status
-    updated = generated_video_repository.update(video)
-    download_url = storage_service.get_download_url(updated.file_url)
-    return _to_generated_video_response(updated, download_url=download_url)
-
-
-@router.get("/{video_id}/download-url", response_model=GeneratedVideoDownloadUrlResponse)
-def get_generated_video_download_url(
-    video_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    generated_video_repository: Any = Depends(get_generated_video_repository),
-    storage_service: OSSStorageService = Depends(get_storage_service),
-) -> GeneratedVideoDownloadUrlResponse:
-    video = generated_video_repository.get(video_id)
-    if video is None:
-        raise HTTPException(status_code=404, detail=f"GeneratedVideo {video_id} not found")
-    use_case = GetGeneratedVideoDownloadUrlUseCase(generated_video_repository)
-    file_url = use_case.execute(video_id)
-    if file_url is None:
-        raise HTTPException(status_code=404, detail=f"GeneratedVideo {video_id} not found")
-    download_url = storage_service.get_download_url(file_url)
-    return GeneratedVideoDownloadUrlResponse(video_id=video_id, download_url=download_url)

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

@@ -1,7 +1,18 @@
+import logging
+import random
+import uuid
 from typing import Any
 
+from app.api.routes._helpers import check_project_access
 from app.auth import AuthenticatedUser, get_current_user
-from app.core.celery_app import celery_app
+from app.core.storage import OSSStorageService, get_storage_service
+from app.core.task_enqueue import (
+    GLOBAL_PENDING_LIMIT,
+    USER_PENDING_LIMIT,
+    GlobalQueueFull,
+    UserPendingLimitExceeded,
+    safe_enqueue_generation_task,
+)
 from app.dependencies import (
     get_asset_library_repository,
     get_asset_repository,
@@ -14,6 +25,7 @@ from app.schemas.generated_video import (
     ListGeneratedVideosResponse,
 )
 from app.schemas.generation_task import (
+    BatchGenerationTaskResponse,
     CreateGenerationTaskRequest,
     GenerationTaskResponse,
     ListGenerationTasksResponse,
@@ -27,18 +39,11 @@ 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)
-    if project is None:
-        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="Access denied to project")
-
-
 def _to_generation_task_response(task) -> GenerationTaskResponse:
     return GenerationTaskResponse(
         id=task.id,
@@ -50,6 +55,11 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
         asset_ids=task.asset_ids,
         title_ids=task.title_ids,
         voice_ids=task.voice_ids,
+        source_edit_plan_id=task.source_edit_plan_id or "",
+        asset_select_mode=getattr(task, "asset_select_mode", ""),
+        batch_id=getattr(task, "batch_id", ""),
+        video_title=getattr(task, "video_title", ""),
+        logs=getattr(task, "logs", "[]"),
         status=task.status,
         progress=task.progress,
         result_count=task.result_count,
@@ -57,7 +67,7 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
     )
 
 
-def _to_generated_video_response(item) -> GeneratedVideoResponse:
+def _to_generated_video_response(item, download_url: str | None = None) -> GeneratedVideoResponse:
     return GeneratedVideoResponse(
         id=item.id,
         project_id=item.project_id,
@@ -70,6 +80,7 @@ def _to_generated_video_response(item) -> GeneratedVideoResponse:
         width=item.width,
         height=item.height,
         fps=item.fps,
+        download_url=download_url,
     )
 
 
@@ -84,6 +95,49 @@ def _ensure_library_has_ready_video_assets(assets) -> None:
         )
 
 
+def _select_assets_from_library(
+    assets: list,
+    mode: str,
+    count: int,
+) -> list[str]:
+    """根据选取模式从素材库中选取 ready 状态的视频素材 ID。
+
+    Args:
+        assets: 素材库中所有素材（Asset 实体列表）
+        mode: 选取模式 — all=全部, random=随机, smart=按质量评分
+        count: 选取数量，0 表示全部（仅 random/smart 模式有效）
+
+    Returns:
+        选中的素材 ID 列表
+    """
+    ready_video_assets = [a for a in assets if a.status.value == "ready" and a.mime_type.startswith("video")]
+
+    if not ready_video_assets:
+        return []
+
+    if mode == "random":
+        selected = (
+            ready_video_assets if count <= 0 else random.sample(ready_video_assets, min(count, len(ready_video_assets)))
+        )
+        return [a.id for a in selected]
+
+    if mode == "smart":
+        # 按质量分降序排列（质量分高的优先），质量分相同时按时长降序
+        sorted_assets = sorted(
+            ready_video_assets,
+            key=lambda a: (
+                a.quality_score if a.quality_score is not None else 0.0,
+                a.duration if a.duration is not None else 0.0,
+            ),
+            reverse=True,
+        )
+        selected = sorted_assets if count <= 0 else sorted_assets[:count]
+        return [a.id for a in selected]
+
+    # 默认 all 模式：返回全部 ready 视频素材
+    return [a.id for a in ready_video_assets]
+
+
 def _resolve_project_and_library(
     request: CreateGenerationTaskRequest,
     project_repository: Any,
@@ -121,7 +175,7 @@ def _resolve_project_and_library(
     return project_id, asset_library_id
 
 
-@router.post("/tasks", response_model=GenerationTaskResponse)
+@router.post("/tasks", response_model=BatchGenerationTaskResponse)
 def create_generation_task(
     request: CreateGenerationTaskRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -129,36 +183,133 @@ def create_generation_task(
     project_repository: Any = Depends(get_project_repository),
     asset_library_repository: Any = Depends(get_asset_library_repository),
     asset_repository: Any = Depends(get_asset_repository),
-) -> GenerationTaskResponse:
-    project_id, asset_library_id = _resolve_project_and_library(
-        request, project_repository, asset_library_repository, asset_repository, authenticated_user
+) -> 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,
     )
 
+    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)
-        _ensure_library_has_ready_video_assets(assets)
+        try:
+            _ensure_library_has_ready_video_assets(assets)
+        except HTTPException as e:
+            logger.warning("[生成任务] 素材校验失败: %s", e.detail)
+            raise
+
+        # 素材库自动匹配：当未显式指定 asset_ids 时，按模式自动选取
+        if not resolved_asset_ids:
+            resolved_asset_ids = _select_assets_from_library(
+                assets,
+                mode=request.asset_select_mode,
+                count=request.asset_select_count,
+            )
 
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
-    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=request.asset_ids,
-            title_ids=request.title_ids,
-            voice_ids=request.voice_ids,
-            created_by_user_id=authenticated_user.user.id,
-        )
-    )
-    celery_app.send_task("worker.generate_video", args=[task.id])
-    return _to_generation_task_response(task)
+    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
+            )
+        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
+
+    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,
+                    video_title=request.video_title,
+                    auto_retry_enabled=request.auto_retry_enabled,
+                    auto_retry_max=request.auto_retry_max,
+                )
+            )
+            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 as _e:
+                # 兜底：如果预检查后又并发提交了，在这里也拦住
+                failed_tasks.append(task)
+                if not created_tasks:
+                    raise HTTPException(
+                        status_code=429,
+                        detail="您的待处理任务过多，请等待完成后再提交",
+                    ) from _e
+                break
+            except GlobalQueueFull as _e:
+                failed_tasks.append(task)
+                if not created_tasks:
+                    raise HTTPException(
+                        status_code=503,
+                        detail="系统繁忙，请稍后再试",
+                    ) from _e
+                break
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error("[生成任务] 创建失败: %s", e, exc_info=True)
+        raise HTTPException(status_code=500, detail="创建生成任务失败，请稍后重试或查看任务日志") from e
+
+    items = [_to_generation_task_response(t) for t in created_tasks + failed_tasks]
+    return BatchGenerationTaskResponse(items=items, total=len(items))
 
 
 @router.get("/tasks", response_model=ListGenerationTasksResponse)
@@ -184,7 +335,7 @@ def get_generation_task(
     if task is None:
         raise HTTPException(status_code=404, detail=f"GenerationTask {task_id} not found")
     if task.project_id:
-        _check_project_access(task.project_id, authenticated_user.user.id, project_repository)
+        check_project_access(task.project_id, authenticated_user.user.id, project_repository)
     return _to_generation_task_response(task)
 
 
@@ -195,15 +346,20 @@ 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:
         raise HTTPException(status_code=404, detail=f"GenerationTask {task_id} not found")
     if task.project_id:
-        _check_project_access(task.project_id, authenticated_user.user.id, project_repository)
+        check_project_access(task.project_id, authenticated_user.user.id, project_repository)
     use_case = ListGeneratedVideosByTaskUseCase(generated_video_repository)
     items = use_case.execute(task_id)
-    return ListGeneratedVideosResponse(items=[_to_generated_video_response(item) for item in items])
+    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)
 
 
 @router.post("/tasks/{task_id}/retry", response_model=GenerationTaskResponse)
@@ -222,6 +378,21 @@ 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(
@@ -233,8 +404,79 @@ def retry_generation_task(
             asset_ids=task.asset_ids,
             title_ids=task.title_ids,
             voice_ids=task.voice_ids,
-            created_by_user_id=authenticated_user.user.id,
+            created_by_user_id=user_id,
+            source_edit_plan_id=task.source_edit_plan_id or "",
+            asset_select_mode=getattr(task, "asset_select_mode", ""),
+            video_title=getattr(task, "video_title", ""),
         )
     )
-    celery_app.send_task("worker.generate_video", args=[retried.id])
+    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
     return _to_generation_task_response(retried)
+
+
+@router.post("/tasks/{task_id}/cancel", response_model=GenerationTaskResponse)
+def cancel_generation_task(
+    task_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    generation_task_repository: Any = Depends(get_generation_task_repository),
+) -> GenerationTaskResponse:
+    """取消生成任务。
+
+    仅 pending / running 状态的任务可取消；取消后状态变为 cancelled。
+    对于已在运行的 Celery 任务，标记为 cancelled 后，worker 在下次检查点会中止执行。
+    """
+    task = generation_task_repository.get(task_id)
+    if task is None:
+        raise HTTPException(status_code=404, detail="Generation task not found")
+
+    # 权限校验
+    if task.created_by_user_id and task.created_by_user_id != authenticated_user.user.id:
+        raise HTTPException(status_code=403, detail="Access denied to this task")
+
+    status_val = task.status.value if hasattr(task.status, "value") else str(task.status)
+
+    # 终态不可取消
+    if status_val in ("completed", "failed", "cancelled"):
+        raise HTTPException(
+            status_code=409,
+            detail=f"Cannot cancel task in {status_val} status",
+        )
+
+    # 执行取消
+    try:
+        task.mark_cancelled()
+        task.append_log(
+            stage="cancelled",
+            message="用户主动取消任务",
+            level="INFO",
+            cancelled_by=authenticated_user.user.id,
+        )
+        generation_task_repository.update(task)
+        logger.info(
+            "生成任务已取消: task_id=%s user_id=%s previous_status=%s",
+            task_id,
+            authenticated_user.user.id,
+            status_val,
+        )
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e)) from e
+
+    return _to_generation_task_response(task)

apps/api/app/api/routes/health.py

@@ -5,7 +5,6 @@ import redis
 from app.config import settings
 from fastapi import APIRouter, status
 from fastapi.responses import JSONResponse
-from pydantic import BaseModel
 
 router = APIRouter(tags=["Health"])
 
@@ -21,20 +20,8 @@ async def health_check():
 
 @router.get("/ready", status_code=status.HTTP_200_OK)
 async def readiness_check():
-    checks = {
-        "database": await _check_database(),
-        "redis": await _check_redis(),
-        "oss": _check_oss(),
-    }
-    all_healthy = all(check["status"] == "healthy" for check in checks.values())
-    response = {
-        "status": "ready" if all_healthy else "not_ready",
-        "timestamp": datetime.utcnow().isoformat(),
-        "checks": checks,
-    }
-    if not all_healthy:
-        return JSONResponse(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, content=response)
-    return response
+    """简单的就绪检查，仅返回状态。详细健康检查请使用 /health 端点。"""
+    return {"status": "ready"}
 
 
 @router.get("/startup", status_code=status.HTTP_200_OK)

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

@@ -0,0 +1,120 @@
+"""渲染结果内部下载接口。
+
+通过内部 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/jobs.py

@@ -1,334 +0,0 @@
-"""Job API 路由 — Phase 8 任务 2.10.
-
-提供统一异步任务管理 RESTful 接口：
-- POST   /api/v1/jobs                        创建任务
-- GET    /api/v1/jobs/{job_id}                任务详情
-- GET    /api/v1/projects/{project_id}/jobs   项目任务列表
-- GET    /api/v1/projects/{project_id}/jobs/stats  任务统计
-- PUT    /api/v1/jobs/{job_id}/progress       更新进度
-- POST   /api/v1/jobs/{job_id}/complete       标记完成
-- POST   /api/v1/jobs/{job_id}/fail           标记失败
-- POST   /api/v1/jobs/{job_id}/retry          重试任务
-- POST   /api/v1/jobs/{job_id}/cancel         取消任务
-- POST   /api/v1/jobs/{job_id}/submit         提交执行
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.core.celery_app import celery_app
-from app.dependencies import get_db_session, get_job_repository, get_project_repository
-from app.schemas.job import (
-    CompleteJobRequest,
-    CreateJobRequest,
-    FailJobRequest,
-    JobResponse,
-    JobStatisticsResponse,
-    ListJobsResponse,
-    UpdateProgressRequest,
-    job_to_response,
-)
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-from sqlalchemy.orm import Session
-
-from packages.application.jobs import (
-    CancelJobUseCase,
-    CompleteJobCommand,
-    CompleteJobUseCase,
-    CreateJobCommand,
-    CreateJobUseCase,
-    FailJobCommand,
-    FailJobUseCase,
-    GetJobStatisticsUseCase,
-    GetJobUseCase,
-    ListJobsUseCase,
-    RetryJobUseCase,
-    SubmitJobUseCase,
-    UpdateJobProgressCommand,
-    UpdateJobProgressUseCase,
-)
-from packages.domain.job import JobType
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter()
-
-# 任务类型 → Celery task name 映射
-_JOB_TYPE_TO_CELERY_TASK: dict[str, str] = {
-    JobType.VIDEO_COMPOSE: "worker.compose_video",
-    JobType.RENDER_EDIT_PLAN: "worker.render_edit_plan",
-    JobType.ASSET_INGEST: "worker.ingest_asset",
-    JobType.CLASSIFICATION: "worker.classify_asset",
-    JobType.VOICE_EXTRACTION: "worker.extract_voice",
-    JobType.GENERATION: "worker.generate_video",
-}
-
-
-def _check_project_access(project_id: str, user_id: str, project_repository) -> None:
-    """检查用户是否有项目访问权限。"""
-    project = project_repository.find_by_id(project_id)
-    if project is None:
-        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="Access denied to project")
-
-
-# ── 创建任务 ──────────────────────────────────────────────────────────────────
-
-
-@router.post("/jobs", response_model=JobResponse, status_code=status.HTTP_201_CREATED)
-def create_job(
-    request: CreateJobRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-    project_repository: Any = Depends(get_project_repository),
-) -> JobResponse:
-    """创建异步任务。
-
-    创建后任务处于 pending 状态，需要调用 /submit 提交执行。
-    """
-    _check_project_access(request.project_id, authenticated_user.user.id, project_repository)
-
-    # 校验 job_type
-    try:
-        JobType(request.job_type)
-    except ValueError:
-        raise HTTPException(
-            status_code=400,
-            detail=f"不支持的任务类型: {request.job_type}，"
-                   f"可选值: {[t.value for t in JobType]}",
-        )
-
-    use_case = CreateJobUseCase(job_repo)
-    job = use_case.execute(
-        CreateJobCommand(
-            project_id=request.project_id,
-            job_type=request.job_type,
-            payload=request.payload,
-            source_id=request.source_id,
-            created_by_user_id=authenticated_user.user.id,
-            max_retries=request.max_retries,
-        )
-    )
-
-    return job_to_response(job)
-
-
-# ── 提交执行 ──────────────────────────────────────────────────────────────────
-
-
-@router.post("/jobs/{job_id}/submit", response_model=JobResponse)
-def submit_job(
-    job_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-) -> JobResponse:
-    """提交任务执行。
-
-    将任务状态从 pending 切换为 running，并 dispatch Celery 异步任务。
-    """
-    # 权限检查：先获取任务并验证权限，再执行状态变更
-    job = job_repo.get(job_id)
-    if job is None:
-        raise HTTPException(status_code=404, detail=f"Job {job_id} not found")
-    if job.created_by_user_id and job.created_by_user_id != authenticated_user.user.id:
-        raise HTTPException(status_code=403, detail="Access denied to this job")
-
-    use_case = SubmitJobUseCase(job_repo)
-
-    try:
-        job = use_case.execute(job_id)
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e))
-
-    # Dispatch Celery 任务
-    celery_task_name = _JOB_TYPE_TO_CELERY_TASK.get(job.job_type.value)
-    if celery_task_name:
-        result = celery_app.send_task(celery_task_name, args=[job.id], kwargs=job.payload)
-        job.celery_task_id = result.id
-        job_repo.update(job)
-        logger.info("已提交 Celery 任务: job_id=%s celery_task_id=%s", job.id, result.id)
-
-    return job_to_response(job)
-
-
-# ── 查询接口 ──────────────────────────────────────────────────────────────────
-
-
-@router.get("/jobs/{job_id}", response_model=JobResponse)
-def get_job(
-    job_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-) -> JobResponse:
-    """获取任务详情。"""
-    use_case = GetJobUseCase(job_repo)
-    job = use_case.execute(job_id)
-    if job is None:
-        raise HTTPException(status_code=404, detail=f"Job {job_id} not found")
-    return job_to_response(job)
-
-
-@router.get("/projects/{project_id}/jobs", response_model=ListJobsResponse)
-def list_project_jobs(
-    project_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-    project_repository: Any = Depends(get_project_repository),
-    job_type: str | None = Query(default=None, description="按任务类型过滤"),
-    status_filter: str | None = Query(default=None, alias="status", description="按状态过滤"),
-    limit: int = Query(default=50, ge=1, le=200),
-    offset: int = Query(default=0, ge=0),
-) -> ListJobsResponse:
-    """获取项目下的任务列表。"""
-    _check_project_access(project_id, authenticated_user.user.id, project_repository)
-
-    use_case = ListJobsUseCase(job_repo)
-    jobs = use_case.execute(
-        project_id=project_id,
-        job_type=job_type,
-        status=status_filter,
-        limit=limit,
-        offset=offset,
-    )
-    items = [job_to_response(j) for j in jobs]
-    return ListJobsResponse(items=items, total=len(items))
-
-
-@router.get("/projects/{project_id}/jobs/stats", response_model=JobStatisticsResponse)
-def get_job_statistics(
-    project_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-    project_repository: Any = Depends(get_project_repository),
-) -> JobStatisticsResponse:
-    """获取项目任务统计摘要。"""
-    _check_project_access(project_id, authenticated_user.user.id, project_repository)
-
-    use_case = GetJobStatisticsUseCase(job_repo)
-    stats = use_case.execute(project_id)
-    return JobStatisticsResponse(**stats)
-
-
-# ── 进度更新 ──────────────────────────────────────────────────────────────────
-
-
-@router.put("/jobs/{job_id}/progress", response_model=JobResponse)
-def update_job_progress(
-    job_id: str,
-    request: UpdateProgressRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-) -> JobResponse:
-    """更新任务进度。"""
-    use_case = UpdateJobProgressUseCase(job_repo)
-
-    try:
-        job = use_case.execute(
-            UpdateJobProgressCommand(
-                job_id=job_id,
-                progress=request.progress,
-                current_stage=request.current_stage,
-            )
-        )
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e))
-
-    return job_to_response(job)
-
-
-# ── 完成 / 失败 ────────────────────────────────────────────────────────────────
-
-
-@router.post("/jobs/{job_id}/complete", response_model=JobResponse)
-def complete_job(
-    job_id: str,
-    request: CompleteJobRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-) -> JobResponse:
-    """标记任务完成。"""
-    use_case = CompleteJobUseCase(job_repo)
-
-    try:
-        job = use_case.execute(CompleteJobCommand(job_id=job_id, result=request.result))
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e))
-
-    return job_to_response(job)
-
-
-@router.post("/jobs/{job_id}/fail", response_model=JobResponse)
-def fail_job(
-    job_id: str,
-    request: FailJobRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-) -> JobResponse:
-    """标记任务失败。"""
-    use_case = FailJobUseCase(job_repo)
-
-    try:
-        job = use_case.execute(FailJobCommand(job_id=job_id, error_message=request.error_message))
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e))
-
-    return job_to_response(job)
-
-
-# ── 重试 / 取消 ────────────────────────────────────────────────────────────────
-
-
-@router.post("/jobs/{job_id}/retry", response_model=JobResponse)
-def retry_job(
-    job_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-) -> JobResponse:
-    """重试失败任务。
-
-    将任务重置为 pending，retry_count + 1，但不自动 dispatch。
-    需要再次调用 /submit 提交执行。
-    """
-    # 权限检查：先获取任务并验证权限，再执行状态变更
-    job = job_repo.get(job_id)
-    if job is None:
-        raise HTTPException(status_code=404, detail=f"Job {job_id} not found")
-    if job.created_by_user_id and job.created_by_user_id != authenticated_user.user.id:
-        raise HTTPException(status_code=403, detail="Access denied to this job")
-
-    use_case = RetryJobUseCase(job_repo)
-
-    try:
-        job = use_case.execute(job_id)
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e))
-
-    return job_to_response(job)
-
-
-@router.post("/jobs/{job_id}/cancel", response_model=JobResponse)
-def cancel_job(
-    job_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    job_repo: Any = Depends(get_job_repository),
-) -> JobResponse:
-    """取消任务。"""
-    # 权限检查：先获取任务并验证权限，再执行状态变更
-    job = job_repo.get(job_id)
-    if job is None:
-        raise HTTPException(status_code=404, detail=f"Job {job_id} not found")
-    if job.created_by_user_id and job.created_by_user_id != authenticated_user.user.id:
-        raise HTTPException(status_code=403, detail="Access denied to this job")
-
-    use_case = CancelJobUseCase(job_repo)
-
-    try:
-        job = use_case.execute(job_id)
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e))
-
-    return job_to_response(job)

apps/api/app/api/routes/permissions.py

@@ -1,2 +0,0 @@
-# Compatibility module - workspace concept has been removed.
-# All permission checks are handled at the project level (see packages.domain.permissions).

apps/api/app/api/routes/projects.py

@@ -7,11 +7,12 @@ from app.schemas.project import (
     ListProjectsResponse,
     ProjectResponse,
 )
-from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi import APIRouter, Depends, HTTPException, Response, status
 
 from packages.application import (
     CreateProjectCommand,
     CreateProjectUseCase,
+    DeleteProjectUseCase,
     GetProjectUseCase,
     ListProjectsUseCase,
 )
@@ -39,6 +40,8 @@ def get_project(
     project = use_case.execute(project_id)
     if project is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
+    if not project.can_access(authenticated_user.user.id):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Access denied to project")
     return _to_project_response(project)
 
 
@@ -67,3 +70,22 @@ def create_project(
         owner_user_id=authenticated_user.user.id,
     )
     return _to_project_response(project)
+
+
+@router.delete("/{project_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
+def delete_project(
+    project_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    project_repository: Any = Depends(get_project_repository),
+) -> dict:
+    use_case = DeleteProjectUseCase(project_repository)
+    try:
+        deleted = use_case.execute(project_id, authenticated_user.user.id)
+    except PermissionError as _e:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail="Only the project owner can delete this project",
+        ) from _e
+    if not deleted:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
+    return  # type: ignore[return-value]

apps/api/app/api/routes/recipes.py

@@ -1,214 +0,0 @@
-"""Recipe CRUD + use routes."""
-
-from __future__ import annotations
-
-from typing import List
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session, get_user_repository
-from app.schemas.recipe import (
-    CreateRecipeRequest,
-    ListRecipesResponse,
-    RecipeItemResponse,
-    RecipeResponse,
-    UpdateRecipeRequest,
-    UseRecipeResponse,
-)
-from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.recipe_repository import SQLAlchemyRecipeRepository
-from packages.application.recipe.commands import (
-    CreateRecipeCommand,
-    RecipeItemCommand,
-    UpdateRecipeCommand,
-)
-from packages.application.recipe.use_cases import (
-    CreateRecipeUseCase,
-    DeleteRecipeUseCase,
-    FeatureDisabledError,
-    GetRecipeUseCase,
-    ListRecipesUseCase,
-    NotFoundError,
-    UpdateRecipeUseCase,
-    UseRecipeUseCase,
-)
-from packages.ports.user_repository import UserRepository
-
-router = APIRouter()
-
-
-def _get_recipe_repository(session: Session = Depends(get_db_session)) -> SQLAlchemyRecipeRepository:
-    return SQLAlchemyRecipeRepository(session)
-
-
-def _get_user_plan(user_id: str, user_repository: UserRepository) -> str:
-    user = user_repository.find_by_id(user_id)
-    if user is None:
-        return "free"
-    return getattr(user, "subscription_plan", "free") or "free"
-
-
-def _item_to_response(item) -> RecipeItemResponse:
-    return RecipeItemResponse(
-        id=item.id,
-        recipe_id=item.recipe_id,
-        item_type=item.item_type,
-        item_id=item.item_id,
-        position=item.position,
-        metadata=item.metadata_,
-    )
-
-
-def _to_response(recipe) -> RecipeResponse:
-    return RecipeResponse(
-        id=recipe.id,
-        user_id=recipe.user_id,
-        name=recipe.name,
-        description=recipe.description,
-        template_id=recipe.template_id,
-        generation_params=recipe.generation_params,
-        items=[_item_to_response(i) for i in getattr(recipe, "items", [])],
-        is_active=recipe.is_active,
-        metadata=recipe.metadata_,
-        created_at=recipe.created_at,
-        updated_at=recipe.updated_at,
-    )
-
-
-@router.get("", response_model=ListRecipesResponse)
-def list_recipes(
-    skip: int = Query(0, ge=0),
-    limit: int = Query(50, ge=1, le=200),
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    recipe_repository: SQLAlchemyRecipeRepository = Depends(_get_recipe_repository),
-) -> ListRecipesResponse:
-    user_id = authenticated_user.user.id
-    use_case = ListRecipesUseCase(recipe_repository)
-    recipes = use_case.execute(user_id, skip=skip, limit=limit)
-    total = recipe_repository.count_by_user(user_id)
-    return ListRecipesResponse(
-        items=[_to_response(r) for r in recipes],
-        total=total,
-    )
-
-
-@router.get("/{recipe_id}", response_model=RecipeResponse)
-def get_recipe(
-    recipe_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    recipe_repository: SQLAlchemyRecipeRepository = Depends(_get_recipe_repository),
-) -> RecipeResponse:
-    user_id = authenticated_user.user.id
-    use_case = GetRecipeUseCase(recipe_repository)
-    recipe = use_case.execute(recipe_id, user_id)
-    if recipe is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Recipe not found")
-    return _to_response(recipe)
-
-
-@router.post("", response_model=RecipeResponse, status_code=status.HTTP_201_CREATED)
-def create_recipe(
-    request: CreateRecipeRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    recipe_repository: SQLAlchemyRecipeRepository = Depends(_get_recipe_repository),
-) -> RecipeResponse:
-    user_id = authenticated_user.user.id
-    command = CreateRecipeCommand(
-        user_id=user_id,
-        name=request.name,
-        description=request.description,
-        template_id=request.template_id,
-        generation_params=request.generation_params,
-        items=[
-            RecipeItemCommand(
-                item_type=ic.item_type,
-                item_id=ic.item_id,
-                position=ic.position,
-                metadata_=ic.metadata_,
-            )
-            for ic in request.items
-        ],
-        metadata_=request.metadata_,
-    )
-    use_case = CreateRecipeUseCase(recipe_repository)
-    recipe = use_case.execute(command)
-    return _to_response(recipe)
-
-
-@router.patch("/{recipe_id}", response_model=RecipeResponse)
-def update_recipe(
-    recipe_id: str,
-    request: UpdateRecipeRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    recipe_repository: SQLAlchemyRecipeRepository = Depends(_get_recipe_repository),
-) -> RecipeResponse:
-    user_id = authenticated_user.user.id
-    command = UpdateRecipeCommand(
-        recipe_id=recipe_id,
-        user_id=user_id,
-        name=request.name,
-        description=request.description,
-        template_id=request.template_id,
-        generation_params=request.generation_params,
-        items=(
-            [
-                RecipeItemCommand(
-                    item_type=ic.item_type,
-                    item_id=ic.item_id,
-                    position=ic.position,
-                    metadata_=ic.metadata_,
-                )
-                for ic in request.items
-            ]
-            if request.items is not None
-            else None
-        ),
-        metadata_=request.metadata_,
-    )
-    use_case = UpdateRecipeUseCase(recipe_repository)
-    try:
-        recipe = use_case.execute(command)
-    except NotFoundError:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Recipe not found")
-    return _to_response(recipe)
-
-
-@router.delete("/{recipe_id}", status_code=status.HTTP_204_NO_CONTENT)
-def delete_recipe(
-    recipe_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    recipe_repository: SQLAlchemyRecipeRepository = Depends(_get_recipe_repository),
-) -> Response:
-    user_id = authenticated_user.user.id
-    use_case = DeleteRecipeUseCase(recipe_repository)
-    deleted = use_case.execute(recipe_id, user_id)
-    if not deleted:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Recipe not found")
-    return Response(status_code=204)
-
-
-@router.post("/{recipe_id}/use", response_model=UseRecipeResponse)
-def use_recipe(
-    recipe_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    recipe_repository: SQLAlchemyRecipeRepository = Depends(_get_recipe_repository),
-    user_repository: UserRepository = Depends(get_user_repository),
-) -> UseRecipeResponse:
-    user_id = authenticated_user.user.id
-    plan_name = _get_user_plan(user_id, user_repository)
-    use_case = UseRecipeUseCase(recipe_repository)
-    try:
-        result = use_case.execute(recipe_id, user_id, user_plan=plan_name)
-    except FeatureDisabledError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail=str(exc),
-        )
-    except NotFoundError:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Recipe not found")
-
-    return UseRecipeResponse(
-        recipe=_to_response(result.recipe),
-        warnings=[{"item_type": w.item_type, "item_id": w.item_id, "position": w.position} for w in result.warnings],
-    )

apps/api/app/api/routes/subscription.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from dataclasses import replace
 from datetime import datetime, timezone
 from typing import List
@@ -20,6 +21,8 @@ from fastapi import APIRouter, Depends, HTTPException, status
 
 from packages.ports.user_repository import UserRepository
 
+logger = logging.getLogger(__name__)
+
 router = APIRouter()
 
 
@@ -92,7 +95,7 @@ def _build_subscription_info(user: AuthenticatedUser) -> SubscriptionInfo:
 @router.get("/current", response_model=SubscriptionInfo)
 async def get_current_subscription(
     current_user: AuthenticatedUser = Depends(get_current_user),
-):
+) -> SubscriptionInfo:
     """获取当前订阅信息"""
     return _build_subscription_info(current_user)
 
@@ -100,10 +103,33 @@ async def get_current_subscription(
 @router.get("/billing-records", response_model=List[BillingRecord])
 async def get_billing_records(
     current_user: AuthenticatedUser = Depends(get_current_user),
-):
+) -> List[BillingRecord]:
     """获取账单记录列表"""
-    # TODO: 从数据库查询账单记录
-    return []
+    from packages.adapters.sqlalchemy_impl.billing_repository import SQLAlchemyBillingRepository
+    from packages.adapters.sqlalchemy_impl.session import SessionLocal
+
+    if SessionLocal is None:
+        return []
+
+    session = SessionLocal()
+    try:
+        repo = SQLAlchemyBillingRepository(session)
+        records = repo.find_by_user(current_user.user.id)
+        return [
+            BillingRecord(
+                id=r.id,
+                plan_name=r.plan_name,
+                amount=r.amount,
+                billing_cycle=r.billing_cycle,
+                status=r.status,
+                payment_method=r.payment_method or "未支付",
+                created_at=r.created_at.isoformat() if r.created_at else "",
+                invoice_url=r.invoice_url,
+            )
+            for r in records
+        ]
+    finally:
+        session.close()
 
 
 @router.post("/change-plan", response_model=ChangePlanResponse)
@@ -111,7 +137,7 @@ async def change_plan(
     request: ChangePlanRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),
     user_repository: UserRepository = Depends(get_user_repository),
-):
+) -> ChangePlanResponse:
     """变更订阅套餐（升级/降级）"""
     # TODO: 接入支付验证（支付宝/微信支付）
     valid_plans = {"free", "standard", "pro", "enterprise"}
@@ -163,7 +189,7 @@ async def change_plan(
 async def cancel_subscription(
     current_user: AuthenticatedUser = Depends(get_current_user),
     user_repository: UserRepository = Depends(get_user_repository),
-):
+) -> SimpleResponse:
     """取消订阅"""
     user = current_user.user
     if user.subscription_plan == "free":
@@ -181,11 +207,68 @@ async def cancel_subscription(
     )
 
 
+@router.post("/payment-callback")
+async def payment_callback(
+    user_id: str,
+    plan: str,
+    billing_cycle: str,
+    amount: float,
+    payment_method: str = "alipay",
+    payment_id: str = "",
+) -> dict:
+    """支付回调 - 在事务中更新账单和订阅状态
+
+    注意：生产环境需要验证支付签名
+    """
+    import uuid
+    from datetime import timedelta
+
+    from packages.adapters.sqlalchemy_impl.billing_repository import SQLAlchemyBillingRepository
+    from packages.adapters.sqlalchemy_impl.session import SessionLocal
+
+    if SessionLocal is None:
+        raise HTTPException(status_code=500, detail="Database not available")
+
+    session = SessionLocal()
+    try:
+        repo = SQLAlchemyBillingRepository(session)
+
+        # 创建账单记录
+        record_id = uuid.uuid4().hex
+        repo.create(
+            {
+                "id": record_id,
+                "user_id": user_id,
+                "plan_name": _get_plan_name(plan),
+                "amount": amount,
+                "billing_cycle": billing_cycle,
+                "status": "pending",
+            }
+        )
+
+        # 在事务中标记支付成功并更新订阅
+        repo.mark_paid(record_id, payment_method, payment_id)
+
+        # 计算到期时间
+        days = 365 if billing_cycle == "yearly" else 30
+        expires_at = datetime.now(timezone.utc) + timedelta(days=days)
+        repo.update_subscription_on_payment(user_id, plan, expires_at)
+
+        return {"success": True, "message": "支付成功", "record_id": record_id}
+    except Exception as e:
+        session.rollback()
+        logger.error(f"支付回调处理失败: user_id={user_id}, plan={plan}, error={e}")
+        # 不返回原始异常信息，避免泄漏内部实现细节
+        raise HTTPException(status_code=500, detail="支付处理失败，请稍后重试") from e
+    finally:
+        session.close()
+
+
 @router.post("/toggle-auto-renew", response_model=SimpleResponse)
 async def toggle_auto_renew(
     request: ToggleAutoRenewRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),
-):
+) -> SimpleResponse:
     """切换自动续费"""
     # TODO: 实际需要在数据库中存储 auto_renew 字段
     status_text = "已开启自动续费" if request.enabled else "已关闭自动续费"

apps/api/app/api/routes/tags.py

@@ -0,0 +1,67 @@
+"""标签 CRUD 路由。"""
+
+import logging
+from typing import Any
+
+from app.auth import AuthenticatedUser, get_current_user
+from app.dependencies import get_tag_repository
+from app.schemas.tag import (
+    CreateTagRequest,
+    ListTagsResponse,
+    TagResponse,
+)
+from fastapi import APIRouter, Depends, HTTPException, Response
+
+from packages.domain import Tag
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter()
+
+
+@router.get("", response_model=ListTagsResponse)
+def list_tags(
+    skip: int = 0,
+    limit: int = 100,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    tag_repository: Any = Depends(get_tag_repository),
+) -> ListTagsResponse:
+    """列出当前用户的标签。"""
+    user_id = authenticated_user.user.id
+    items = tag_repository.list_by_user(user_id, skip=skip, limit=limit)
+    total = tag_repository.count_by_user(user_id)
+    return ListTagsResponse(
+        items=[TagResponse(id=t.id, name=t.name, created_at=t.created_at) for t in items],
+        total=total,
+    )
+
+
+@router.post("", response_model=TagResponse, status_code=201)
+def create_tag(
+    request: CreateTagRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    tag_repository: Any = Depends(get_tag_repository),
+) -> TagResponse:
+    """创建标签（同用户同名去重，返回 409）。"""
+    user_id = authenticated_user.user.id
+    existing = tag_repository.find_by_name(user_id, request.name)
+    if existing:
+        raise HTTPException(status_code=409, detail="标签名称已存在")
+    tag = Tag.create(user_id=user_id, name=request.name)
+    created = tag_repository.create(tag)
+    return TagResponse(id=created.id, name=created.name, created_at=created.created_at)
+
+
+@router.delete("/{tag_id}", status_code=204, response_class=Response)
+def delete_tag(
+    tag_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    tag_repository: Any = Depends(get_tag_repository),
+) -> None:
+    """删除标签（同时清理素材关联）。"""
+    tag = tag_repository.get(tag_id)
+    if tag is None:
+        raise HTTPException(status_code=404, detail="标签不存在")
+    if tag.user_id != authenticated_user.user.id:
+        raise HTTPException(status_code=403, detail="无权删除该标签")
+    tag_repository.delete(tag_id)

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

@@ -1,7 +1,16 @@
+import logging
 from typing import Any
 
+from app.api.routes._helpers import format_utc_datetime
 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,
@@ -13,17 +22,21 @@ from app.schemas.task_center import (
     ProjectTaskResponse,
     UserTaskResponse,
 )
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, Query
 
 from packages.application import (
-    CreateGenerationTaskCommand,
-    CreateGenerationTaskUseCase,
+    RetryGenerationTaskUseCase,
     SubmitIngestJobCommand,
     SubmitIngestJobUseCase,
 )
 
+logger = logging.getLogger(__name__)
+
 router = APIRouter()
 
+DEFAULT_PAGE_SIZE = 50
+MAX_PAGE_SIZE = 200
+
 
 def _humanize_task_error(error_message: str) -> str:
     raw = (error_message or "").strip()
@@ -54,6 +67,8 @@ def _generation_step(task) -> str:
         return "生成完成"
     if s == "failed":
         return "生成失败"
+    if s == "cancelled":
+        return "已取消"
     return s
 
 
@@ -70,6 +85,26 @@ def _ingest_step(job) -> str:
     return s
 
 
+def _generation_task_to_user_response(task) -> UserTaskResponse:
+    return UserTaskResponse(
+        id=f"generation:{task.id}",
+        task_type="generation",
+        project_id=task.project_id,
+        template_id=task.template_id,
+        status=_status_value(task.status),
+        progress=task.progress,
+        current_step=_generation_step(task),
+        error_message=task.error_message,
+        error_info=task.error_info or {},
+        user_message=_humanize_task_error(task.error_message),
+        retryable=_status_value(task.status) == "failed",
+        retry_count=task.retry_count or 0,
+        source_id=task.id,
+        created_at=format_utc_datetime(task.created_at),
+        updated_at=format_utc_datetime(task.completed_at or task.started_at or task.created_at),
+    )
+
+
 def _generation_task_to_project_response(task) -> ProjectTaskResponse:
     return ProjectTaskResponse(
         id=f"generation:{task.id}",
@@ -79,49 +114,77 @@ def _generation_task_to_project_response(task) -> ProjectTaskResponse:
         progress=task.progress,
         current_step=_generation_step(task),
         error_message=task.error_message,
+        error_info=task.error_info or {},
         user_message=_humanize_task_error(task.error_message),
         retryable=_status_value(task.status) == "failed",
+        retry_count=task.retry_count or 0,
         source_id=task.id,
         template_id=task.template_id,
-        created_at=task.created_at,
-        updated_at=task.completed_at or task.started_at or task.created_at,
+        created_at=format_utc_datetime(task.created_at),
+        updated_at=format_utc_datetime(task.completed_at or task.started_at or task.created_at),
     )
 
 
+def _validate_status(status: str | None) -> str | None:
+    """校验状态值合法性。"""
+    if status is None:
+        return None
+    valid = {"pending", "running", "completed", "failed", "cancelled"}
+    if status not in valid:
+        raise HTTPException(
+            status_code=400,
+            detail=f"无效的状态筛选值: {status}，允许值: {', '.join(sorted(valid))}",
+        )
+    return status
+
+
+def _clamp_page_size(page_size: int) -> int:
+    if page_size <= 0:
+        return DEFAULT_PAGE_SIZE
+    if page_size > MAX_PAGE_SIZE:
+        return MAX_PAGE_SIZE
+    return page_size
+
+
 # ── 用户级端点（放在项目级端点之前，避免路由冲突） ──
 
 
 @router.get("/tasks", response_model=ListTasksResponse)
 def list_user_tasks(
+    status: str | None = Query(None, description="按状态筛选：pending/running/completed/failed/cancelled"),
+    task_type: str | None = Query(None, description="按任务类型筛选：generation/ingest"),
+    page: int = Query(1, ge=1, description="页码，从1开始"),
+    page_size: int = Query(DEFAULT_PAGE_SIZE, ge=1, le=MAX_PAGE_SIZE, description="每页数量"),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     ingest_job_repository: Any = Depends(get_ingest_job_repository),
     generation_task_repository: Any = Depends(get_generation_task_repository),
 ) -> ListTasksResponse:
-    """用户级任务列表（跨 project），合并 ingest + generation 任务。"""
+    """用户级任务列表（跨 project），支持状态/类型筛选和分页。"""
+    status = _validate_status(status)
+    page_size = _clamp_page_size(page_size)
     user_id = authenticated_user.user.id
+    offset = (page - 1) * page_size
+
     items: list[UserTaskResponse] = []
 
-    for task in generation_task_repository.list_by_user(user_id):
-        items.append(
-            UserTaskResponse(
-                id=f"generation:{task.id}",
-                task_type="generation",
-                project_id=task.project_id,
-                template_id=task.template_id,
-                status=_status_value(task.status),
-                progress=task.progress,
-                current_step=_generation_step(task),
-                error_message=task.error_message,
-                user_message=_humanize_task_error(task.error_message),
-                retryable=_status_value(task.status) == "failed",
-                source_id=task.id,
-                created_at=task.created_at,
-                updated_at=task.completed_at or task.started_at or task.created_at,
-            )
+    # 生成任务
+    if task_type is None or task_type == "generation":
+        gen_result = generation_task_repository.list_by_user_filtered(
+            user_id,
+            status=status,
+            limit=page_size + 1,  # 多取一条判断是否还有下一页（简单起见这里用offset）
+            offset=offset,
         )
+        for task in gen_result:
+            items.append(_generation_task_to_user_response(task))
 
+    # 按时间倒序
     items.sort(key=lambda item: item.updated_at or item.created_at or "", reverse=True)
-    return ListTasksResponse(items=items)
+
+    # 总数（仅generation，ingest暂不计入总数以保持简单）
+    total = generation_task_repository.count_by_user_filtered(user_id, status=status)
+
+    return ListTasksResponse(items=items[:page_size], total=total)
 
 
 @router.post("/tasks/{task_id}/retry", response_model=UserTaskResponse)
@@ -130,7 +193,7 @@ def retry_task_by_id(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     generation_task_repository: Any = Depends(get_generation_task_repository),
 ) -> UserTaskResponse:
-    """简化重试：通过 task_id 直接重试失败的生成任务。"""
+    """原地重试失败的生成任务（复用同一个task_id，retry_count+1）。"""
     task = generation_task_repository.get(task_id)
     if task is None:
         raise HTTPException(status_code=404, detail="Generation task not found")
@@ -139,33 +202,44 @@ def retry_task_by_id(
     if _status_value(task.status) != "failed":
         raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
 
-    use_case = CreateGenerationTaskUseCase(generation_task_repository)
-    retried = use_case.execute(
-        CreateGenerationTaskCommand(
-            project_id=task.project_id,
-            asset_library_id=task.asset_library_id,
-            strategy_id=task.strategy_id,
-            voice_library_id=task.voice_library_id,
-            template_id=task.template_id,
-            asset_ids=task.asset_ids,
-            title_ids=task.title_ids,
-            voice_ids=task.voice_ids,
-            created_by_user_id=authenticated_user.user.id,
+    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}），请等待完成后再提交",
         )
-    )
-    celery_app.send_task("worker.generate_video", args=[retried.id])
-    return UserTaskResponse(
-        id=f"generation:{retried.id}",
-        task_type="generation",
-        project_id=retried.project_id,
-        template_id=retried.template_id,
-        status=_status_value(retried.status),
-        progress=retried.progress,
-        current_step=_generation_step(retried),
-        source_id=retried.id,
-        created_at=retried.created_at,
-        updated_at=retried.created_at,
-    )
+    if global_pending >= GLOBAL_PENDING_LIMIT:
+        raise HTTPException(
+            status_code=503,
+            detail="系统繁忙，请稍后再试",
+        )
+
+    # 原地重试
+    use_case = RetryGenerationTaskUseCase(generation_task_repository)
+    retried = use_case.execute(task_id)
+
+    # 重新入队
+    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
+
+    return _generation_task_to_user_response(retried)
 
 
 # ── 项目级端点 ──
@@ -174,37 +248,64 @@ def retry_task_by_id(
 @router.get("/projects/{project_id}/tasks", response_model=ListProjectTasksResponse)
 def list_project_tasks(
     project_id: str,
+    status: str | None = Query(None, description="按状态筛选：pending/running/completed/failed/cancelled"),
+    task_type: str | None = Query(None, description="按任务类型筛选：generation/ingest"),
+    page: int = Query(1, ge=1, description="页码，从1开始"),
+    page_size: int = Query(DEFAULT_PAGE_SIZE, ge=1, le=MAX_PAGE_SIZE, description="每页数量"),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     project_repository: Any = Depends(get_project_repository),
     ingest_job_repository: Any = Depends(get_ingest_job_repository),
     generation_task_repository: Any = Depends(get_generation_task_repository),
 ) -> ListProjectTasksResponse:
+    """项目级任务列表，支持状态/类型筛选和分页。"""
     project = project_repository.find_by_id(project_id)
     if project is None:
         raise HTTPException(status_code=404, detail="Project not found")
 
+    status = _validate_status(status)
+    page_size = _clamp_page_size(page_size)
+    offset = (page - 1) * page_size
+
     items: list[ProjectTaskResponse] = []
-    for job in ingest_job_repository.list_by_project(project_id):
-        items.append(
-            ProjectTaskResponse(
-                id=f"ingest:{job.id}",
-                task_type="ingest",
-                project_id=job.project_id,
-                status=_status_value(job.status),
-                progress=100.0 if _status_value(job.status) == "completed" else 0.0,
-                current_step=_ingest_step(job),
-                error_message=job.error_message,
-                user_message=_humanize_task_error(job.error_message),
-                retryable=_status_value(job.status) == "failed",
-                source_id=job.id,
-                created_at=job.created_at,
-                updated_at=job.updated_at,
+
+    # 导入任务
+    if task_type is None or task_type == "ingest":
+        for job in ingest_job_repository.list_by_project(project_id):
+            if status and _status_value(job.status) != status:
+                continue
+            items.append(
+                ProjectTaskResponse(
+                    id=f"ingest:{job.id}",
+                    task_type="ingest",
+                    project_id=job.project_id,
+                    status=_status_value(job.status),
+                    progress=100.0 if _status_value(job.status) == "completed" else 0.0,
+                    current_step=_ingest_step(job),
+                    error_message=job.error_message,
+                    user_message=_humanize_task_error(job.error_message),
+                    retryable=_status_value(job.status) == "failed",
+                    source_id=job.id,
+                    created_at=format_utc_datetime(job.created_at),
+                    updated_at=format_utc_datetime(job.updated_at),
+                )
             )
+
+    # 生成任务
+    if task_type is None or task_type == "generation":
+        gen_items = generation_task_repository.list_by_project_filtered(
+            project_id,
+            status=status,
+            limit=page_size + 1,
+            offset=offset,
         )
-    for task in generation_task_repository.list_by_project(project_id):
-        items.append(_generation_task_to_project_response(task))
+        for task in gen_items:
+            items.append(_generation_task_to_project_response(task))
+
     items.sort(key=lambda item: item.updated_at or item.created_at or "", reverse=True)
-    return ListProjectTasksResponse(items=items)
+
+    total = generation_task_repository.count_by_project_filtered(project_id, status=status)
+
+    return ListProjectTasksResponse(items=items[:page_size], total=total)
 
 
 @router.post("/tasks/{task_type}/{source_id}/retry", response_model=ProjectTaskResponse)
@@ -215,37 +316,60 @@ def retry_project_task(
     ingest_job_repository: Any = Depends(get_ingest_job_repository),
     generation_task_repository: Any = Depends(get_generation_task_repository),
 ) -> ProjectTaskResponse:
+    """项目级任务重试。"""
     if task_type == "generation":
         task = generation_task_repository.get(source_id)
         if task is None:
             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")
-        use_case = CreateGenerationTaskUseCase(generation_task_repository)
-        retried = use_case.execute(
-            CreateGenerationTaskCommand(
-                project_id=task.project_id,
-                asset_library_id=task.asset_library_id,
-                strategy_id=task.strategy_id,
-                voice_library_id=task.voice_library_id,
-                template_id=task.template_id,
-                asset_ids=task.asset_ids,
-                title_ids=task.title_ids,
-                voice_ids=task.voice_ids,
-                created_by_user_id=authenticated_user.user.id,
+
+        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}），请等待完成后再提交",
             )
-        )
-        celery_app.send_task("worker.generate_video", args=[retried.id])
+        if global_pending >= GLOBAL_PENDING_LIMIT:
+            raise HTTPException(
+                status_code=503,
+                detail="系统繁忙，请稍后再试",
+            )
+
+        # 原地重试
+        use_case = RetryGenerationTaskUseCase(generation_task_repository)
+        retried = use_case.execute(source_id)
+
+        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
         return _generation_task_to_project_response(retried)
+
     if task_type == "ingest":
         job = ingest_job_repository.get(source_id)
         if job is None:
             raise HTTPException(status_code=404, detail="Ingest job not found")
         if _status_value(job.status) != "failed":
             raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
-        use_case = SubmitIngestJobUseCase(ingest_job_repository)
+        use_case = SubmitIngestJobUseCase(ingest_job_repository)  # type: ignore[assignment]
         retried = use_case.execute(
-            SubmitIngestJobCommand(
+            SubmitIngestJobCommand(  # type: ignore[arg-type]
                 project_id=job.project_id,
                 library_id=job.library_id,
                 storage_key=job.storage_key,
@@ -260,7 +384,7 @@ def retry_project_task(
             progress=0,
             current_step=_ingest_step(retried),
             source_id=retried.id,
-            created_at=retried.created_at,
-            updated_at=retried.updated_at,
+            created_at=format_utc_datetime(retried.created_at),
+            updated_at=format_utc_datetime(retried.updated_at),  # type: ignore[attr-defined]
         )
     raise HTTPException(status_code=400, detail="Unsupported task type")

apps/api/app/api/routes/templates.py

@@ -2,19 +2,23 @@
 
 from __future__ import annotations
 
-from typing import List
+import logging
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import get_db_session
 from app.schemas.template import (
     CategoryResponse,
+    CopyTemplateRequest,
     CreateCategoryRequest,
     CreateTemplateRequest,
     GenerateWarningResponse,
     ListCategoriesResponse,
+    ListTagsResponse,
     ListTemplatesResponse,
     SegmentResponse,
     TemplateResponse,
+    TemplateUsageResponse,
+    ToggleFavoriteResponse,
     UpdateTemplateRequest,
     ValidateTemplateRequest,
     ValidateTemplateResponse,
@@ -22,21 +26,28 @@ from app.schemas.template import (
 from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
 from sqlalchemy.orm import Session
 
+logger = logging.getLogger(__name__)
+
 from packages.adapters.sqlalchemy_impl.template_repository import SQLAlchemyTemplateRepository
 from packages.application.template.commands import (
+    CopyTemplateCommand,
     CreateCategoryCommand,
     CreateTemplateCommand,
+    ListTemplatesFilter,
     SegmentCommand,
     UpdateTemplateCommand,
     ValidateTemplateCommand,
 )
 from packages.application.template.use_cases import (
+    CopyTemplateUseCase,
+    CountTemplatesUseCase,
     CreateCategoryUseCase,
     CreateTemplateUseCase,
     DeleteCategoryUseCase,
     DeleteTemplateUseCase,
     GetTemplateUseCase,
     ListCategoriesUseCase,
+    ListTagsUseCase,
     ListTemplatesUseCase,
     NotFoundError,
     UpdateTemplateUseCase,
@@ -64,7 +75,7 @@ def _segment_to_response(seg) -> SegmentResponse:
     )
 
 
-def _to_response(template) -> TemplateResponse:
+def _to_response(template, usage_count: int = 0) -> TemplateResponse:
     return TemplateResponse(
         id=template.id,
         user_id=template.user_id,
@@ -78,6 +89,7 @@ def _to_response(template) -> TemplateResponse:
         estimated_duration=template.estimated_duration,
         segments=[_segment_to_response(s) for s in getattr(template, "segments", [])],
         is_active=template.is_active,
+        usage_count=usage_count,
         created_at=template.created_at,
         updated_at=template.updated_at,
     )
@@ -90,15 +102,36 @@ def _to_response(template) -> TemplateResponse:
 def list_templates(
     skip: int = Query(0, ge=0),
     limit: int = Query(50, ge=1, le=200),
+    category: str | None = Query(None, description="按分类筛选"),
+    tag: str | None = Query(None, description="按标签筛选"),
+    keyword: str | None = Query(None, description="按名称关键词搜索"),
+    mode: str | None = Query(None, description="按剪辑模式筛选"),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
 ) -> ListTemplatesResponse:
     user_id = authenticated_user.user.id
-    use_case = ListTemplatesUseCase(template_repository)
-    templates = use_case.execute(user_id, skip=skip, limit=limit)
-    total = template_repository.count_by_user(user_id)
+    try:
+        tpl_filter = ListTemplatesFilter(
+            category=category,
+            tag=tag,
+            keyword=keyword,
+            mode=mode,
+        )
+        use_case = ListTemplatesUseCase(template_repository)
+        templates = use_case.execute(user_id, skip=skip, limit=limit, filter=tpl_filter)
+        count_use_case = CountTemplatesUseCase(template_repository)
+        total = count_use_case.execute(user_id, filter=tpl_filter)
+
+        # 批量查询使用次数
+        items = []
+        for t in templates:
+            usage = template_repository.get_usage_count(t.id)
+            items.append(_to_response(t, usage_count=usage))
+    except Exception:
+        logger.exception("list_templates 查询失败: user_id=%s", user_id)
+        return ListTemplatesResponse(items=[], total=0)
     return ListTemplatesResponse(
-        items=[_to_response(t) for t in templates],
+        items=items,
         total=total,
     )
 
@@ -110,11 +143,16 @@ def get_template(
     template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
 ) -> TemplateResponse:
     user_id = authenticated_user.user.id
-    use_case = GetTemplateUseCase(template_repository)
-    template = use_case.execute(template_id, user_id)
+    try:
+        use_case = GetTemplateUseCase(template_repository)
+        template = use_case.execute(template_id, user_id)
+        usage = template_repository.get_usage_count(template_id)
+    except Exception as _e:
+        logger.exception("get_template 查询失败: template_id=%s", template_id)
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="模板查询失败") from _e
     if template is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
-    return _to_response(template)
+    return _to_response(template, usage_count=usage)
 
 
 @router.post("", response_model=TemplateResponse, status_code=status.HTTP_201_CREATED)
@@ -148,7 +186,7 @@ def create_template(
     try:
         template = use_case.execute(command)
     except ValidationError as exc:
-        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
     return _to_response(template)
 
 
@@ -188,14 +226,14 @@ def update_template(
     use_case = UpdateTemplateUseCase(template_repository)
     try:
         template = use_case.execute(command)
-    except NotFoundError:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
+    except NotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
     except ValidationError as exc:
-        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
     return _to_response(template)
 
 
-@router.delete("/{template_id}", status_code=status.HTTP_204_NO_CONTENT)
+@router.delete("/{template_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
 def delete_template(
     template_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -206,7 +244,67 @@ def delete_template(
     deleted = use_case.execute(template_id, user_id)
     if not deleted:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
-    return Response(status_code=204)
+    return
+
+
+@router.post("/{template_id}/copy", response_model=TemplateResponse, status_code=status.HTTP_201_CREATED)
+def copy_template(
+    template_id: str,
+    request: CopyTemplateRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> TemplateResponse:
+    """复制模板（含所有片段配置）"""
+    user_id = authenticated_user.user.id
+    command = CopyTemplateCommand(
+        template_id=template_id,
+        user_id=user_id,
+        new_name=request.new_name,
+    )
+    use_case = CopyTemplateUseCase(template_repository)
+    try:
+        template = use_case.execute(command)
+    except NotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
+    except ValidationError as exc:
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
+    return _to_response(template)
+
+
+@router.get("/{template_id}/usage", response_model=TemplateUsageResponse)
+def get_template_usage(
+    template_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> TemplateUsageResponse:
+    """获取模板使用次数（关联的剪辑计划数量）"""
+    user_id = authenticated_user.user.id
+    # 鉴权：确保模板存在且属于当前用户
+    use_case = GetTemplateUseCase(template_repository)
+    template = use_case.execute(template_id, user_id)
+    if template is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
+    usage = template_repository.get_usage_count(template_id)
+    return TemplateUsageResponse(template_id=template_id, usage_count=usage)
+
+
+@router.post("/{template_id}/toggle-favorite", response_model=ToggleFavoriteResponse)
+def toggle_favorite(
+    template_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> ToggleFavoriteResponse:
+    """切换模板收藏状态（当前为兼容端点，始终返回 false）"""
+    user_id = authenticated_user.user.id
+    use_case = GetTemplateUseCase(template_repository)
+    try:
+        template = use_case.execute(template_id, user_id)
+    except Exception as _e:
+        logger.exception("toggle_favorite 查询失败: template_id=%s", template_id)
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
+    if template is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
+    return ToggleFavoriteResponse(id=template_id, is_favorite=False)
 
 
 # ── Validate template ──
@@ -228,10 +326,10 @@ def validate_template(
     use_case = ValidateTemplateUseCase(template_repository)
     try:
         result = use_case.execute(command)
-    except NotFoundError:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
+    except NotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
     except ValidationError as exc:
-        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
 
     return ValidateTemplateResponse(
         template=_to_response(result.template),
@@ -248,8 +346,12 @@ def list_categories(
     template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
 ) -> ListCategoriesResponse:
     user_id = authenticated_user.user.id
-    use_case = ListCategoriesUseCase(template_repository)
-    categories = use_case.execute(user_id)
+    try:
+        use_case = ListCategoriesUseCase(template_repository)
+        categories = use_case.execute(user_id)
+    except Exception:
+        logger.exception("list_categories 查询失败: user_id=%s", user_id)
+        return ListCategoriesResponse(items=[])
     return ListCategoriesResponse(
         items=[CategoryResponse(id=c.id, user_id=c.user_id, name=c.name, created_at=c.created_at) for c in categories],
     )
@@ -273,7 +375,9 @@ def create_category(
     )
 
 
-@router.delete("/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT)
+@router.delete(
+    "/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response
+)
 def delete_category(
     category_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -285,3 +389,22 @@ def delete_category(
     if not deleted:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Category not found")
     return Response(status_code=204)
+
+
+# ── Tags ──
+
+
+@router.get("/tags/list", response_model=ListTagsResponse)
+def list_tags(
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> ListTagsResponse:
+    """获取用户所有模板标签（去重排序）"""
+    user_id = authenticated_user.user.id
+    try:
+        use_case = ListTagsUseCase(template_repository)
+        tags = use_case.execute(user_id)
+    except Exception:
+        logger.exception("list_tags 查询失败: user_id=%s", user_id)
+        return ListTagsResponse(items=[])
+    return ListTagsResponse(items=tags)

apps/api/app/api/routes/titles.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from typing import Optional
 
+from app.api.routes._helpers import get_user_plan
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import get_db_session, get_user_repository
 from app.schemas.title_library import (
@@ -16,13 +17,18 @@ from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
 from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl.title_library_repository import SQLAlchemyTitleLibraryRepository
-from packages.application.title_library.commands import CreateTitleLibraryCommand, UpdateTitleLibraryCommand
+from packages.application.title_library.commands import (
+    CreateTitleLibraryCommand,
+    PickTitleCommand,
+    UpdateTitleLibraryCommand,
+)
 from packages.application.title_library.use_cases import (
     CreateTitleLibraryUseCase,
     DeleteTitleLibraryUseCase,
     GetTitleLibraryUseCase,
     ListTitleLibraryUseCase,
     NotFoundError,
+    PickTitleUseCase,
     QuotaExceededError,
     UpdateTitleLibraryUseCase,
 )
@@ -51,13 +57,6 @@ def _to_response(item) -> TitleLibraryItemResponse:
     )
 
 
-def _get_user_plan(user_id: str, user_repository: UserRepository) -> str:
-    user = user_repository.find_by_id(user_id)
-    if user is None:
-        return "free"
-    return getattr(user, "subscription_plan", "free") or "free"
-
-
 @router.get("", response_model=ListTitleLibraryResponse)
 def list_titles(
     category: Optional[str] = Query(None),
@@ -76,6 +75,41 @@ def list_titles(
     )
 
 
+@router.post("/pick", response_model=TitleLibraryItemResponse)
+def pick_title(
+    category: Optional[str] = Query(None, description="按分类筛选，不填则从全部标题中选"),
+    exclude_ids: Optional[str] = Query(
+        None,
+        description="排除的标题ID（逗号分隔），用于批量生成时避免重复",
+    ),
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
+) -> TitleLibraryItemResponse:
+    """智能选择一个标题。
+
+    策略：优先使用次数少的，从最少的前5个中随机选一个，兼顾公平和多样性。
+    """
+    user_id = authenticated_user.user.id
+    exclude_list: list[str] = []
+    if exclude_ids:
+        exclude_list = [t.strip() for t in exclude_ids.split(",") if t.strip()]
+
+    use_case = PickTitleUseCase(title_repository)
+    item = use_case.execute(
+        PickTitleCommand(
+            user_id=user_id,
+            category=category,
+            exclude_ids=exclude_list,
+        )
+    )
+    if item is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="标题库为空，请先添加标题",
+        )
+    return _to_response(item)
+
+
 @router.get("/{title_id}", response_model=TitleLibraryItemResponse)
 def get_title(
     title_id: str,
@@ -98,7 +132,7 @@ def create_title(
     user_repository: UserRepository = Depends(get_user_repository),
 ) -> TitleLibraryItemResponse:
     user_id = authenticated_user.user.id
-    plan_name = _get_user_plan(user_id, user_repository)
+    plan_name = get_user_plan(user_id, user_repository)
     command = CreateTitleLibraryCommand(
         user_id=user_id,
         name=request.name,
@@ -114,7 +148,7 @@ def create_title(
         raise HTTPException(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=f"标题库配额已满（{exc.used}/{exc.limit}），请升级套餐",
-        )
+        ) from exc
     return _to_response(item)
 
 
@@ -138,12 +172,12 @@ def update_title(
     use_case = UpdateTitleLibraryUseCase(title_repository)
     try:
         item = use_case.execute(command)
-    except NotFoundError:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Title not found")
+    except NotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Title not found") from _e
     return _to_response(item)
 
 
-@router.delete("/{title_id}", status_code=status.HTTP_204_NO_CONTENT)
+@router.delete("/{title_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
 def delete_title(
     title_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -154,4 +188,4 @@ def delete_title(
     deleted = use_case.execute(title_id, user_id)
     if not deleted:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Title not found")
-    return Response(status_code=204)
+    return

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

@@ -2,24 +2,36 @@
 
 from __future__ import annotations
 
+import logging
 from typing import Optional
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_cosyvoice_service, get_db_session
+from app.dependencies import (
+    get_audio_url_signer,
+    get_cosyvoice_service,
+    get_db_session,
+    get_user_repository,
+    get_voice_clone_profile_repository,
+    get_voice_library_repository,
+)
 from app.schemas.tts import (
     ListTTSJobResponse,
-    TTSSynthesizeRequest,
-    TTSSynthesizeResponse,
+    SaveToLibraryRequest,
+    SaveToLibraryResponse,
     TTSJobResponse,
     TTSStatusResponse,
+    TTSSynthesizeRequest,
+    TTSSynthesizeResponse,
 )
-from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
+from fastapi import APIRouter, Depends, HTTPException, Query, Response, WebSocket, WebSocketDisconnect, status
 from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl.tts_job_repository import (
     SQLAlchemyTTSJobRepository,
 )
+from packages.adapters.sqlalchemy_impl.voice_library_repository import SQLAlchemyVoiceLibraryRepository
 from packages.application.cosyvoice_service import CosyVoiceService
+from packages.application.tts_job.streaming_service import TTSStreamingService
 from packages.application.tts_job.use_cases import (
     CreateTTSJobUseCase,
     DeleteTTSJobUseCase,
@@ -29,15 +41,55 @@ from packages.application.tts_job.use_cases import (
     TTSJobNotFoundError,
 )
 from packages.application.tts_job.workflow import TTSWorkflowService
+from packages.application.voice_library.commands import CreateVoiceLibraryCommand
+from packages.application.voice_library.use_cases import (
+    CreateVoiceLibraryUseCase,
+    QuotaExceededError,
+)
+from packages.domain.voice_presets import list_voices
+from packages.ports.user_repository import UserRepository
+
+logger = logging.getLogger(__name__)
 
 router = APIRouter()
 
 
+@router.get("/presets", summary="获取预设音色列表")
+def list_preset_voices(
+    gender: Optional[str] = Query(None, description="按性别筛选: male/female/child"),
+    style: Optional[str] = Query(None, description="按风格筛选: stable/lively/customer_service/narration/news/story"),
+    keyword: Optional[str] = Query(None, description="按关键词搜索"),
+    _user: AuthenticatedUser = Depends(get_current_user),
+) -> list[dict]:
+    """获取可用的预设音色列表。
+
+    用于配音功能的音色选择。
+    """
+    voices = list_voices(gender=gender, style=style, keyword=keyword)
+    return [
+        {
+            "voice_id": v.voice_id,
+            "name": v.name,
+            "gender": v.gender.value,
+            "style": v.style.value,
+            "description": v.description,
+            "default_speed": v.default_speed,
+            "default_pitch": v.default_pitch,
+            "sample_rate": v.sample_rate,
+            "language": v.language,
+        }
+        for v in voices
+    ]
+
+
 def _get_repository(session: Session = Depends(get_db_session)) -> SQLAlchemyTTSJobRepository:
     return SQLAlchemyTTSJobRepository(session)
 
 
-def _to_response(job) -> TTSJobResponse:
+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)
     return TTSJobResponse(
         id=job.id,
         user_id=job.user_id,
@@ -47,7 +99,7 @@ def _to_response(job) -> TTSJobResponse:
         project_id=job.project_id,
         voice_clone_profile_id=job.voice_clone_profile_id,
         status=job.status,
-        output_audio_url=job.output_audio_url,
+        output_audio_url=output_url,
         output_audio_key=job.output_audio_key,
         duration=job.duration,
         file_size=job.file_size,
@@ -70,12 +122,29 @@ def synthesize(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     repository: SQLAlchemyTTSJobRepository = Depends(_get_repository),
     cosyvoice_service: CosyVoiceService = Depends(get_cosyvoice_service),
+    voice_clone_repo=Depends(get_voice_clone_profile_repository),
 ) -> TTSSynthesizeResponse:
     """发起 TTS 合成任务。
 
     创建 TTS 任务 → 提交 CosyVoice 合成 → 触发 Celery 异步轮询。
+    与音色克隆接口保持一致：CosyVoice 失败时不抛 500，而是返回 201 + failed 状态任务记录。
     """
     user_id = authenticated_user.user.id
+
+    # 校验 voice_clone_profile_id 归属（防止越权使用他人克隆音色）
+    if request.voice_clone_profile_id:
+        profile = voice_clone_repo.get(request.voice_clone_profile_id)
+        if profile is None:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Voice clone profile not found",
+            )
+        if profile.user_id != user_id:
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail="Access denied to voice clone profile",
+            )
+
     use_case = CreateTTSJobUseCase(repository)
     job = use_case.execute(
         user_id=user_id,
@@ -88,22 +157,43 @@ def synthesize(
 
     # 提交 CosyVoice 合成任务
     workflow = TTSWorkflowService(
-        repository=repository, cosyvoice_service=cosyvoice_service,
+        repository=repository,
+        cosyvoice_service=cosyvoice_service,
     )
-    job = workflow.start_synthesis(job.id)
+
+    try:
+        job = workflow.start_synthesis(job.id)
+    except Exception as e:
+        # 兜底：workflow 内部已捕获 CosyVoiceError / ValueError，
+        # 但 DB 异常、网络异常等意外错误可能逃逸。
+        # 与音色克隆接口保持一致：标记 failed，返回 201，不抛 500。
+        logger.error(f"TTS 合成异常: job_id={job.id}, error={e}", exc_info=True)
+        try:
+            job = workflow.process_synthesis_failure(job.id, str(e))
+        except Exception as inner_e:
+            logger.error(f"标记 TTS job 失败时出错: job_id={job.id}, error={inner_e}")
 
     # 若任务处于 processing 状态（异步模式），触发 Celery 后台轮询
     if job.status.value == "processing":
-        task_id = (job.metadata or {}).get("cosyvoice_task_id", "")
-        if task_id:
-            try:
+        # 分段合成任务 vs 普通单段任务
+        segment_task_ids = (job.metadata or {}).get("segment_task_ids", [])
+        is_segment = len(segment_task_ids) > 0
+
+        try:
+            if is_segment:
+                from worker_app.tasks import process_tts_segment_synthesis
+
+                process_tts_segment_synthesis.delay(job.id)
+            else:
                 from worker_app.tasks import process_tts_synthesis
+
                 process_tts_synthesis.delay(job.id)
-            except Exception as e:
-                # Celery 调度失败，标记 job 为 failed
-                workflow.process_synthesis_failure(
-                    job.id, f"Celery 任务调度失败: {e}"
-                )
+        except Exception as e:
+            # Celery 调度失败，标记 job 为 failed
+            try:
+                workflow.process_synthesis_failure(job.id, f"Celery 任务调度失败: {e}")
+            except Exception as inner_e:
+                logger.error(f"Celery 调度后标记失败时出错: job_id={job.id}, error={inner_e}")
 
     return TTSSynthesizeResponse(
         job_id=job.id,
@@ -119,16 +209,15 @@ 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
     use_case = ListTTSJobsUseCase(repository)
     skip = (page - 1) * page_size
-    items, total = use_case.execute(
-        user_id, status=status_filter, skip=skip, limit=page_size
-    )
+    items, total = use_case.execute(user_id, status=status_filter, skip=skip, limit=page_size)
     return ListTTSJobResponse(
-        items=[_to_response(j) for j in items],
+        items=[_to_response(j, sign_url) for j in items],
         total=total,
         page=page,
         page_size=page_size,
@@ -140,15 +229,16 @@ 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
     use_case = GetTTSJobUseCase(repository)
     try:
         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)
+    except TTSJobNotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found") from _e
+    return _to_response(job, sign_url)
 
 
 @router.get("/jobs/{job_id}/status", response_model=TTSStatusResponse)
@@ -156,18 +246,22 @@ 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
     use_case = GetTTSJobStatusUseCase(repository)
     try:
         job = use_case.execute(job_id, user_id)
-    except TTSJobNotFoundError:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found")
+    except TTSJobNotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found") from _e
+    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=job.output_audio_url,
+        output_audio_url=output_url,
         error_message=job.error_message,
         duration=job.duration,
         retry_count=job.retry_count,
@@ -176,7 +270,7 @@ def get_tts_job_status(
     )
 
 
-@router.delete("/jobs/{job_id}", status_code=status.HTTP_204_NO_CONTENT)
+@router.delete("/jobs/{job_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
 def delete_tts_job(
     job_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -188,4 +282,129 @@ def delete_tts_job(
     deleted = use_case.execute(job_id, user_id)
     if not deleted:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found")
-    return Response(status_code=204)
+    return
+
+
+@router.post(
+    "/jobs/{job_id}/save-to-library",
+    response_model=SaveToLibraryResponse,
+    status_code=status.HTTP_201_CREATED,
+)
+def save_tts_job_to_library(
+    job_id: str,
+    request: SaveToLibraryRequest = SaveToLibraryRequest(),
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    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 合成结果保存到配音库。
+
+    自动携带音色名、时长、语速等元信息。
+    """
+    user_id = authenticated_user.user.id
+
+    # 获取 TTS job
+    get_use_case = GetTTSJobUseCase(tts_repository)
+    try:
+        job = get_use_case.execute(job_id, user_id)
+    except TTSJobNotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found") from _e
+
+    # 校验已完成
+    if not job.is_completed:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="TTS job is not completed yet",
+        )
+
+    # 构建配音素材名称
+    name = request.name or f"TTS-{job.id[:8]}"
+
+    # 构建元信息
+    metadata_ = {
+        "source": "tts_job",
+        "tts_job_id": job.id,
+        "format": job.format,
+        "sample_rate": job.sample_rate,
+    }
+    if job.metadata:
+        # 保留原始 job 的有用元信息
+        for key in ("speed", "language"):
+            if key in job.metadata:
+                metadata_[key] = job.metadata[key]
+
+    # 获取用户套餐（用于配额检查）
+    user = user_repository.find_by_id(user_id)
+    plan_name = getattr(user, "subscription_plan", "free") if user else "free"
+
+    # 构建命令并执行
+    command = CreateVoiceLibraryCommand(
+        user_id=user_id,
+        name=name,
+        text=job.input_text,
+        voice_provider="cosyvoice",
+        voice_id=job.voice_id,
+        voice_name=job.voice_model or "",
+        audio_url=job.output_audio_url,
+        duration=job.duration,
+        file_size=job.file_size,
+        status="completed",
+        project_id=job.project_id or "",
+        tags=[],
+        metadata_=metadata_,
+    )
+
+    use_case = CreateVoiceLibraryUseCase(voice_library_repository)
+    try:
+        item = use_case.execute(command, plan_name=plan_name or "free")
+    except QuotaExceededError as exc:
+        raise HTTPException(
+            status_code=status.HTTP_429_TOO_MANY_REQUESTS,
+            detail=f"配音库配额已满（{exc.used}/{exc.limit}），请升级套餐",
+        ) from exc
+
+    return SaveToLibraryResponse(
+        id=item.id,
+        name=item.name,
+        audio_url=sign_url(item.audio_url) if item.audio_url else "",
+        duration=item.duration,
+        voice_id=item.voice_id,
+        voice_name=item.voice_name,
+        status=item.status,
+    )
+
+
+@router.websocket("/ws/tts/stream")
+async def tts_websocket_stream(
+    websocket: WebSocket,
+    cosyvoice_service: CosyVoiceService = Depends(get_cosyvoice_service),
+) -> None:
+    """WebSocket 流式 TTS 合成。
+
+    协议：
+    1. 客户端发送 JSON 文本帧: {"text": "...", "voice_id": "...", ...}
+    2. 服务端发送 JSON 状态帧 + 二进制音频帧
+    3. 完成时发送 JSON 结束帧
+    """
+    await websocket.accept()
+    try:
+        message = await websocket.receive_json()
+        params = {
+            "text": message.get("text", ""),
+            "voice_id": message.get("voice_id", ""),
+            "sample_rate": message.get("sample_rate", 0),
+            "format": message.get("format", "mp3"),
+            "speed": message.get("speed", 1.0),
+        }
+        streaming_service = TTSStreamingService(cosyvoice_service)
+        await streaming_service.synthesize_and_stream(websocket, params)
+    except WebSocketDisconnect:
+        logger.info("WebSocket 客户端主动断开连接")
+    except Exception as e:
+        logger.error(f"WebSocket 流式合成异常: {e}", exc_info=True)
+        try:
+            await websocket.send_json({"type": "error", "message": f"服务异常: {e}"})
+        except Exception as send_err:
+            logger.warning("WebSocket 错误消息发送失败（连接可能已断开）: %s", send_err)

apps/api/app/api/routes/upload.py

@@ -1,13 +1,15 @@
 import logging
-from typing import Annotated, Any
+from typing import Any
 from uuid import uuid4
 
+from app.api.routes._helpers import require_project_and_library
 from app.auth import AuthenticatedUser, get_current_user
 from app.config import get_settings
 from app.core.celery_app import celery_app
 from app.core.storage import OSSStorageService, get_storage_service
 from app.dependencies import (
     get_asset_library_repository,
+    get_asset_repository,
     get_ingest_job_repository,
     get_project_repository,
 )
@@ -16,12 +18,11 @@ from app.schemas.upload import (
     DirectUploadCompleteResponse,
     DirectUploadPrepareRequest,
     DirectUploadPrepareResponse,
-    UploadAssetRequest,
     UploadAssetResponse,
 )
 from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, status
 
-from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase
+from packages.application import SubmitIngestJobCommand, SubmitIngestJobUseCase
 
 logger = logging.getLogger(__name__)
 
@@ -53,8 +54,8 @@ ALLOWED_MIME_TYPES = frozenset(
         "image/gif",
         "image/webp",
         "image/bmp",
-        "image/svg+xml",
         "image/tiff",
+        "image/svg+xml",
     }
 )
 
@@ -79,26 +80,12 @@ def _validate_mime_type(content_type: str | None) -> str:
     return base_type
 
 
-def _require_project_and_library(
-    project_id: str,
-    library_id: str,
-    project_repository: Any,
-    asset_library_repository: Any,
-) -> None:
-    project = GetProjectUseCase(project_repository).execute(project_id)
-    if project is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
-
-    libraries = asset_library_repository.find_by_project(project_id)
-    if not any(item.id == library_id for item in libraries):
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found")
-
-
 def _submit_ingest_job(
     project_id: str,
     library_id: str,
     storage_key: str,
     ingest_job_repository: Any,
+    file_hash: str = "",
 ) -> Any:
     use_case = SubmitIngestJobUseCase(ingest_job_repository)
     job = use_case.execute(
@@ -106,6 +93,7 @@ def _submit_ingest_job(
             project_id=project_id,
             library_id=library_id,
             storage_key=storage_key,
+            file_hash=file_hash,
         )
     )
     celery_app.send_task("worker.ingest_asset", args=[job.id])
@@ -132,7 +120,7 @@ async def prepare_direct_upload(
     # P2-5: 服务端验证 MIME 类型
     validated_content_type = _validate_mime_type(request.content_type)
 
-    _require_project_and_library(
+    require_project_and_library(
         request.project_id,
         request.library_id,
         project_repository,
@@ -176,10 +164,11 @@ async def complete_direct_upload(
     ingest_job_repository: Any = Depends(get_ingest_job_repository),
     project_repository: Any = Depends(get_project_repository),
     asset_library_repository: Any = Depends(get_asset_library_repository),
+    asset_repository: Any = Depends(get_asset_repository),
     storage_service: OSSStorageService = Depends(get_storage_service),
 ) -> DirectUploadCompleteResponse:
     """确认浏览器直传完成并创建导入任务。"""
-    _require_project_and_library(
+    require_project_and_library(
         request.project_id,
         request.library_id,
         project_repository,
@@ -199,11 +188,32 @@ async def complete_direct_upload(
     if not file_exists:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Uploaded file not found")
 
+    # ── 素材去重检测：同素材库 + 同 file_hash 视为重复 ──
+    if request.file_hash:
+        existing = asset_repository.find_by_library_and_file_hash(
+            library_id=request.library_id,
+            file_hash=request.file_hash,
+        )
+        if existing is not None:
+            logger.info(
+                "素材去重命中: library=%s hash=%s existing_asset=%s",
+                request.library_id,
+                request.file_hash,
+                existing.id,
+            )
+            return DirectUploadCompleteResponse(
+                storage_key=normalized_key,
+                ingest_job_id="",
+                duplicated=True,
+                asset_id=existing.id,
+            )
+
     job = _submit_ingest_job(
         project_id=request.project_id,
         library_id=request.library_id,
         storage_key=normalized_key,
         ingest_job_repository=ingest_job_repository,
+        file_hash=request.file_hash,
     )
     return DirectUploadCompleteResponse(storage_key=normalized_key, ingest_job_id=job.id)
 
@@ -218,14 +228,37 @@ async def upload_asset(
     project_id: str = Form(..., min_length=1, description="项目 ID"),
     library_id: str = Form(..., min_length=1, description="素材库 ID"),
     file: UploadFile = File(..., description="要上传的文件（视频、音频、图片等）"),
+    file_hash: str = Form(default="", description="文件 MD5 哈希，用于去重检测"),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     ingest_job_repository: Any = Depends(get_ingest_job_repository),
     project_repository: Any = Depends(get_project_repository),
     asset_library_repository: Any = Depends(get_asset_library_repository),
+    asset_repository: Any = Depends(get_asset_repository),
     storage_service: OSSStorageService = Depends(get_storage_service),
 ) -> UploadAssetResponse:
     """上传素材文件并触发导入流水线。"""
-    _require_project_and_library(project_id, library_id, project_repository, asset_library_repository)
+    require_project_and_library(project_id, library_id, project_repository, asset_library_repository)
+
+    # ── 素材去重检测：上传前检查同素材库 + 同 file_hash ──
+    if file_hash:
+        existing = asset_repository.find_by_library_and_file_hash(
+            library_id=library_id,
+            file_hash=file_hash,
+        )
+        if existing is not None:
+            logger.info(
+                "素材去重命中(multipart): library=%s hash=%s existing_asset=%s",
+                library_id,
+                file_hash,
+                existing.id,
+            )
+            return UploadAssetResponse(
+                storage_key=existing.storage_key,
+                ingest_job_id="",
+                url="",
+                duplicated=True,
+                asset_id=existing.id,
+            )
 
     # P2-5: 服务端验证 MIME 类型
     validated_content_type = _validate_mime_type(file.content_type)
@@ -255,6 +288,7 @@ async def upload_asset(
         library_id=library_id,
         storage_key=storage_key,
         ingest_job_repository=ingest_job_repository,
+        file_hash=file_hash,
     )
 
     return UploadAssetResponse(

apps/api/app/api/routes/videos.py

@@ -0,0 +1,238 @@
+import logging
+
+from app.api.routes._helpers import format_utc_datetime
+from app.auth import AuthenticatedUser, get_current_user
+from app.core.celery_app import celery_app
+from app.core.storage import OSSStorageService, get_storage_service
+from app.dependencies import get_generated_video_repository
+from app.schemas.video_center import (
+    BatchDeleteRequest,
+    BatchDownloadRequest,
+    BatchDownloadResponse,
+    BatchOperationResponse,
+    ListVideosResponse,
+    UpdateVideoReviewRequest,
+    VideoItemResponse,
+)
+from fastapi import APIRouter, Depends, HTTPException, Query, Response
+
+from packages.application import (
+    GetGeneratedVideoUseCase,
+    GetVideosByIdsUseCase,
+    ListGeneratedVideosPaginatedUseCase,
+    UpdateVideoReviewStatusUseCase,
+)
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter()
+
+
+def _to_video_response(item, storage: OSSStorageService | None = None) -> VideoItemResponse:
+    download_url = None
+    if storage and item.file_url:
+        try:
+            download_url = storage.get_download_url(item.file_url)
+        except Exception:
+            download_url = item.file_url
+    return VideoItemResponse(
+        id=item.id,
+        project_id=item.project_id,
+        generation_task_id=item.generation_task_id,
+        name=item.name,
+        file_url=item.file_url,
+        file_size=item.file_size,
+        duration=item.duration,
+        thumbnail_url=item.thumbnail_url,
+        width=item.width,
+        height=item.height,
+        fps=item.fps,
+        status=item.status,
+        review_status=item.review_status,
+        generation_params=item.generation_params,
+        download_url=download_url,
+        generated_at=format_utc_datetime(item.generated_at) if hasattr(item, "generated_at") else "",
+    )
+
+
+@router.get("/videos", response_model=ListVideosResponse)
+def list_videos(
+    project_id: str | None = Query(None, description="项目ID，可选过滤"),
+    status: str | None = Query(None, description="按状态筛选"),
+    review_status: str | None = Query(None, description="按复核状态筛选"),
+    page: int = Query(1, ge=1, description="页码"),
+    page_size: int = Query(20, ge=1, le=100, description="每页数量"),
+    repo=Depends(get_generated_video_repository),
+    storage: OSSStorageService = Depends(get_storage_service),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+):
+    """成片列表，默认返回当前用户的所有成片，支持按项目/状态/复核状态筛选。"""
+    use_case = ListGeneratedVideosPaginatedUseCase(repo)
+    items, total = use_case.execute(
+        user_id=current_user.user.id,
+        project_id=project_id,
+        status=status,
+        review_status=review_status,
+        page=page,
+        page_size=page_size,
+    )
+    return ListVideosResponse(
+        items=[_to_video_response(item, storage) for item in items],
+        total=total,
+        page=page,
+        page_size=page_size,
+    )
+
+
+@router.get("/videos/{video_id}", response_model=VideoItemResponse)
+def get_video(
+    video_id: str,
+    repo=Depends(get_generated_video_repository),
+    storage: OSSStorageService = Depends(get_storage_service),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+):
+    """获取单个成片详情。"""
+    use_case = GetGeneratedVideoUseCase(repo)
+    item = use_case.execute(video_id)
+    if item is None:
+        raise HTTPException(status_code=404, detail="Video not found")
+    return _to_video_response(item, storage)
+
+
+@router.patch("/videos/{video_id}/review", response_model=VideoItemResponse)
+def update_video_review_status(
+    video_id: str,
+    request: UpdateVideoReviewRequest,
+    repo=Depends(get_generated_video_repository),
+    storage: OSSStorageService = Depends(get_storage_service),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+):
+    """更新成片复核状态：pending_review / approved / rejected。"""
+    use_case = UpdateVideoReviewStatusUseCase(repo)
+    item = use_case.execute(video_id, request.review_status)
+    if item is None:
+        raise HTTPException(status_code=404, detail="Video not found")
+    logger.info(
+        "Video %s review status updated to %s by user %s", video_id, request.review_status, current_user.user.id
+    )
+    return _to_video_response(item, storage)
+
+
+@router.delete("/videos/{video_id}", status_code=204, response_class=Response)
+def delete_video(
+    video_id: str,
+    repo=Depends(get_generated_video_repository),
+    storage: OSSStorageService = Depends(get_storage_service),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+):
+    """删除单个成片（硬删除）。"""
+    use_case = GetGeneratedVideoUseCase(repo)
+    item = use_case.execute(video_id)
+    if item is None:
+        raise HTTPException(status_code=404, detail="Video not found")
+
+    # 尝试删除 OSS 文件，失败不影响数据库删除
+    if item.file_url:
+        try:
+            key = storage._normalize_storage_key(item.file_url)
+            storage.delete_file(key)
+        except Exception:
+            logger.warning("删除 OSS 视频文件失败，跳过: video_id=%s", video_id)
+
+    repo.delete(video_id)
+    return Response(status_code=204)
+
+
+@router.post("/videos/batch-delete", response_model=BatchOperationResponse)
+def batch_delete_videos(
+    request: BatchDeleteRequest,
+    repo=Depends(get_generated_video_repository),
+    storage: OSSStorageService = Depends(get_storage_service),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+):
+    """批量删除成片。"""
+    videos = repo.get_by_ids(request.video_ids)
+    existing_ids = {v.id for v in videos}
+    failed_ids = [vid for vid in request.video_ids if vid not in existing_ids]
+    failed_details = {vid: "Video not found" for vid in failed_ids}
+
+    # 尝试删除 OSS 文件
+    for video in videos:
+        if video.file_url:
+            try:
+                key = storage._normalize_storage_key(video.file_url)
+                storage.delete_file(key)
+            except Exception:
+                logger.warning("批量删除 OSS 视频文件失败，跳过: video_id=%s", video.id)
+
+    success_count = repo.batch_delete(list(existing_ids))
+    return BatchOperationResponse(
+        success_count=success_count,
+        failed_ids=failed_ids,
+        failed_details=failed_details,
+    )
+
+
+@router.post("/videos/batch-download", response_model=BatchDownloadResponse)
+def batch_download_videos(
+    request: BatchDownloadRequest,
+    repo=Depends(get_generated_video_repository),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+):
+    """批量下载成片，异步打包 zip。
+
+    传入 video_ids 列表，创建一个批量下载任务，任务完成后返回 zip 下载链接。
+    """
+    if not request.video_ids:
+        raise HTTPException(status_code=400, detail="video_ids cannot be empty")
+    if len(request.video_ids) > 50:
+        raise HTTPException(status_code=400, detail="Maximum 50 videos per batch download")
+
+    # 校验视频都存在
+    use_case = GetVideosByIdsUseCase(repo)
+    videos = use_case.execute(request.video_ids)
+    if len(videos) != len(request.video_ids):
+        raise HTTPException(status_code=404, detail="Some videos not found")
+
+    # 发送 celery 任务
+    task = celery_app.send_task(
+        "worker.batch_download_videos",
+        args=[request.video_ids, current_user.user.id],
+    )
+
+    logger.info("Batch download job created: %s, videos=%d", task.id, len(request.video_ids))
+    return BatchDownloadResponse(job_id=task.id, status="pending")
+
+
+@router.get("/videos/batch-download/{job_id}", response_model=BatchDownloadResponse)
+def get_batch_download_status(
+    job_id: str,
+    current_user: AuthenticatedUser = Depends(get_current_user),
+):
+    """查询批量下载任务状态。"""
+    from celery.result import AsyncResult
+
+    task = AsyncResult(job_id, app=celery_app)
+
+    status_map = {
+        "PENDING": "pending",
+        "STARTED": "running",
+        "SUCCESS": "success",
+        "FAILURE": "failed",
+        "RETRY": "pending",
+        "REVOKED": "cancelled",
+    }
+    api_status = status_map.get(task.state, "pending")
+
+    download_url = None
+    if task.state == "SUCCESS" and task.result:
+        if isinstance(task.result, dict):
+            download_url = task.result.get("download_url")
+        elif isinstance(task.result, str):
+            download_url = task.result
+
+    return BatchDownloadResponse(
+        job_id=job_id,
+        status=api_status,
+        download_url=download_url,
+    )

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

@@ -28,7 +28,6 @@ from packages.application.voice_clone.use_cases import (
     VoiceCloneNotRetryableError,
 )
 from packages.application.voice_clone.workflow import (
-    VoiceCloneWorkflowError,
     VoiceCloneWorkflowService,
 )
 
@@ -38,6 +37,7 @@ router = APIRouter()
 
 
 def _to_response(profile) -> VoiceCloneProfileResponse:
+    # source_audio_url 是用户传入的原始 URL（可能是外部地址），不做预签名转换
     return VoiceCloneProfileResponse(
         id=profile.id,
         user_id=profile.user_id,
@@ -59,14 +59,10 @@ def _to_response(profile) -> VoiceCloneProfileResponse:
 
 
 def _get_workflow_service(
-    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(
-        get_voice_clone_profile_repository
-    ),
+    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(get_voice_clone_profile_repository),
     cosyvoice_service: CosyVoiceService = Depends(get_cosyvoice_service),
 ) -> VoiceCloneWorkflowService:
-    return VoiceCloneWorkflowService(
-        repository=repository, cosyvoice_service=cosyvoice_service
-    )
+    return VoiceCloneWorkflowService(repository=repository, cosyvoice_service=cosyvoice_service)
 
 
 @router.post(
@@ -109,13 +105,9 @@ def create_voice_clone(
             logger.error(f"Failed to dispatch Celery task: {e}")
             # P2-3: Celery 调度失败时标记 profile 为 failed，避免永久卡在 processing
             try:
-                workflow.process_clone_failure(
-                    profile.id, f"Celery 任务调度失败: {e}"
-                )
+                workflow.process_clone_failure(profile.id, f"Celery 任务调度失败: {e}")
             except Exception as inner_e:
-                logger.error(
-                    f"Failed to mark profile as failed after dispatch error: {inner_e}"
-                )
+                logger.error(f"Failed to mark profile as failed after dispatch error: {inner_e}")
 
     return _to_response(profile)
 
@@ -126,16 +118,12 @@ def list_voice_clones(
     skip: int = Query(0, ge=0),
     limit: int = Query(50, ge=1, le=200),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(
-        get_voice_clone_profile_repository
-    ),
+    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(get_voice_clone_profile_repository),
 ) -> ListVoiceCloneResponse:
     """获取用户的音色克隆列表。"""
     user_id = authenticated_user.user.id
     use_case = ListVoiceClonesUseCase(repository)
-    items, total = use_case.execute(
-        user_id, status=status_filter, skip=skip, limit=limit
-    )
+    items, total = use_case.execute(user_id, status=status_filter, skip=skip, limit=limit)
     return ListVoiceCloneResponse(
         items=[_to_response(p) for p in items],
         total=total,
@@ -146,19 +134,15 @@ def list_voice_clones(
 def get_voice_clone(
     clone_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(
-        get_voice_clone_profile_repository
-    ),
+    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(get_voice_clone_profile_repository),
 ) -> VoiceCloneProfileResponse:
     """获取音色克隆详情。"""
     user_id = authenticated_user.user.id
     use_case = GetVoiceCloneUseCase(repository)
     try:
         profile = use_case.execute(clone_id, user_id)
-    except VoiceCloneNotFoundError:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found"
-        )
+    except VoiceCloneNotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found") from _e
     return _to_response(profile)
 
 
@@ -166,19 +150,15 @@ def get_voice_clone(
 def get_voice_clone_status(
     clone_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(
-        get_voice_clone_profile_repository
-    ),
+    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(get_voice_clone_profile_repository),
 ) -> VoiceCloneStatusResponse:
     """查询音色克隆状态（用于前端轮询）。"""
     user_id = authenticated_user.user.id
     use_case = GetVoiceCloneStatusUseCase(repository)
     try:
         profile = use_case.execute(clone_id, user_id)
-    except VoiceCloneNotFoundError:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found"
-        )
+    except VoiceCloneNotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found") from _e
     return VoiceCloneStatusResponse(
         id=profile.id,
         status=profile.status,
@@ -191,23 +171,21 @@ def get_voice_clone_status(
 @router.delete(
     "/{clone_id}",
     status_code=status.HTTP_204_NO_CONTENT,
+    response_model=None,
+    response_class=Response,
 )
 def delete_voice_clone(
     clone_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(
-        get_voice_clone_profile_repository
-    ),
+    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(get_voice_clone_profile_repository),
 ) -> Response:
     """删除音色克隆档案。"""
     user_id = authenticated_user.user.id
     use_case = DeleteVoiceCloneUseCase(repository)
     deleted = use_case.execute(clone_id, user_id)
     if not deleted:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found"
-        )
-    return Response(status_code=204)
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found")
+    return
 
 
 @router.post("/{clone_id}/retry", response_model=VoiceCloneProfileResponse)
@@ -223,15 +201,13 @@ def retry_voice_clone(
     user_id = authenticated_user.user.id
     try:
         profile = workflow.retry_clone(clone_id, user_id)
-    except VoiceCloneNotFoundError:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found"
-        )
-    except VoiceCloneNotRetryableError:
+    except VoiceCloneNotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found") from _e
+    except VoiceCloneNotRetryableError as _e:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
             detail="Voice clone is not retryable (only failed clones can be retried)",
-        )
+        ) from _e
 
     # 如果 profile 处于 processing 且有 task_id，触发 Celery 异步轮询
     task_id = (profile.metadata or {}).get("cosyvoice_task_id", "")
@@ -245,12 +221,8 @@ def retry_voice_clone(
             logger.error(f"Failed to dispatch Celery task: {e}")
             # P2-3: Celery 调度失败时标记 profile 为 failed，避免永久卡在 processing
             try:
-                workflow.process_clone_failure(
-                    profile.id, f"Celery 任务调度失败: {e}"
-                )
+                workflow.process_clone_failure(profile.id, f"Celery 任务调度失败: {e}")
             except Exception as inner_e:
-                logger.error(
-                    f"Failed to mark profile as failed after dispatch error: {inner_e}"
-                )
+                logger.error(f"Failed to mark profile as failed after dispatch error: {inner_e}")
 
     return _to_response(profile)

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

@@ -7,8 +7,9 @@ from __future__ import annotations
 
 from typing import Literal, Optional
 
+from app.api.routes._helpers import get_user_plan
 from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session, get_user_repository
+from app.dependencies import get_audio_url_signer, get_cosyvoice_service, get_db_session, get_user_repository
 from app.schemas.voice import (
     PresetVoiceItemResponse,
     PresetVoiceListResponse,
@@ -26,6 +27,7 @@ from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl.voice_clone_profile_repository import SQLAlchemyVoiceCloneProfileRepository
 from packages.adapters.sqlalchemy_impl.voice_library_repository import SQLAlchemyVoiceLibraryRepository
+from packages.application.cosyvoice_service import CosyVoiceError, CosyVoiceService
 from packages.application.voice_library.commands import CreateVoiceLibraryCommand, UpdateVoiceLibraryCommand
 from packages.application.voice_library.use_cases import (
     CreateVoiceLibraryUseCase,
@@ -36,11 +38,18 @@ from packages.application.voice_library.use_cases import (
     QuotaExceededError,
     UpdateVoiceLibraryUseCase,
 )
-from packages.domain.preset_voices import PRESET_VOICES
+from packages.domain.preset_voices import PRESET_VOICES, get_preset_voice_by_id
 from packages.ports.user_repository import UserRepository
 
 router = APIRouter()
 
+# 预置音色试听音频缓存（内存缓存，减少重复TTS调用）
+# key: voice_id, value: (audio_url, timestamp)
+_preset_preview_cache: dict[str, tuple[str, float]] = {}
+PREVIEW_CACHE_TTL = 7 * 24 * 3600  # 7天TTL
+# 每个预置音色的默认试听文本
+PREVIEW_TEMPLATE = "你好，我是{name}，很高兴认识你。"
+
 
 def _get_voice_repository(session: Session = Depends(get_db_session)) -> SQLAlchemyVoiceLibraryRepository:
     return SQLAlchemyVoiceLibraryRepository(session)
@@ -50,7 +59,10 @@ def _get_clone_profile_repository(session: Session = Depends(get_db_session)) ->
     return SQLAlchemyVoiceCloneProfileRepository(session)
 
 
-def _to_response(item) -> VoiceLibraryItemResponse:
+def _to_response(item, sign_url=None) -> VoiceLibraryItemResponse:
+    audio = item.audio_url
+    if sign_url and audio:
+        audio = sign_url(audio)
     return VoiceLibraryItemResponse(
         id=item.id,
         user_id=item.user_id,
@@ -59,7 +71,7 @@ def _to_response(item) -> VoiceLibraryItemResponse:
         voice_provider=item.voice_provider,
         voice_id=item.voice_id,
         voice_name=item.voice_name,
-        audio_url=item.audio_url,
+        audio_url=audio,
         duration=item.duration,
         file_size=item.file_size,
         status=item.status,
@@ -70,16 +82,20 @@ def _to_response(item) -> VoiceLibraryItemResponse:
     )
 
 
-def _to_unified_response(item, profile_id_map: dict | None = None) -> UnifiedVoiceItemResponse:
+def _to_unified_response(item, profile_id_map: dict | None = None, sign_url=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",
@@ -89,7 +105,7 @@ def _to_unified_response(item, profile_id_map: dict | None = None) -> UnifiedVoi
         language="zh-CN",
         voice_id=item.voice_id,
         voice_provider=item.voice_provider or "cosyvoice",
-        audio_url=item.audio_url,
+        audio_url=audio,
         duration=item.duration,
         file_size=item.file_size,
         status=item.status,
@@ -118,13 +134,6 @@ def _preset_to_unified_response(preset) -> UnifiedVoiceItemResponse:
     )
 
 
-def _get_user_plan(user_id: str, user_repository: UserRepository) -> str:
-    user = user_repository.find_by_id(user_id)
-    if user is None:
-        return "free"
-    return getattr(user, "subscription_plan", "free") or "free"
-
-
 # ==================== 统一配音列表（预置 + 克隆）====================
 
 
@@ -140,6 +149,7 @@ 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:
     """获取配音列表（预置音色 + 用户克隆音色）。
 
@@ -167,7 +177,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) for i in clone_items_raw]
+        clone_items = [_to_unified_response(i, profile_id_map, sign_url) for i in clone_items_raw]
 
     # 组装结果
     if type == "preset":
@@ -214,6 +224,58 @@ def list_preset_voices() -> PresetVoiceListResponse:
     return PresetVoiceListResponse(items=items, total=len(items))
 
 
+@router.get("/presets/{voice_id}/preview")
+def get_preset_voice_preview(
+    voice_id: str,
+    text: str = Query("", description="自定义试听文本，为空则使用默认示例"),
+    cosyvoice: CosyVoiceService = Depends(get_cosyvoice_service),
+) -> dict:
+    """获取预置音色试听音频（实时 TTS 合成）。
+
+    - 首次调用会合成并缓存7天
+    - 相同 voice_id 重复调用直接返回缓存的音频URL
+    - 可传入自定义 text 参数试听不同文本
+    """
+    import time
+
+    preset = get_preset_voice_by_id(voice_id)
+    if preset is None:
+        raise HTTPException(status_code=404, detail=f"预置音色不存在: {voice_id}")
+
+    # 有自定义文本时不缓存
+    use_cache = not text.strip()
+
+    if use_cache and voice_id in _preset_preview_cache:
+        audio_url, cached_at = _preset_preview_cache[voice_id]
+        if time.time() - cached_at < PREVIEW_CACHE_TTL:
+            return {"voice_id": voice_id, "audio_url": audio_url, "cached": True}
+
+    # 合成试听音频
+    preview_text = text.strip() or PREVIEW_TEMPLATE.format(name=preset.name)
+    try:
+        result = cosyvoice.synthesize_speech(
+            text=preview_text,
+            voice_id=preset.voice_id,
+            format="mp3",
+            speed=1.0,
+        )
+    except CosyVoiceError as e:
+        raise HTTPException(status_code=502, detail=f"TTS 合成失败: {e}") from e
+
+    audio_url = result.audio_url
+
+    # 缓存（仅默认试听文本）
+    if use_cache:
+        _preset_preview_cache[voice_id] = (audio_url, time.time())
+
+    return {
+        "voice_id": voice_id,
+        "audio_url": audio_url,
+        "text": preview_text,
+        "cached": False,
+    }
+
+
 # ==================== 原有 CRUD 端点（保持向后兼容）====================
 
 
@@ -224,6 +286,7 @@ 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:
     """原有配音列表接口（仅返回用户克隆音色）。
 
@@ -233,7 +296,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) for i in items],
+        items=[_to_response(i, sign_url) for i in items],
         total=total,
     )
 
@@ -243,13 +306,14 @@ 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)
+    return _to_response(item, sign_url)
 
 
 @router.post("", response_model=VoiceLibraryItemResponse, status_code=status.HTTP_201_CREATED)
@@ -258,9 +322,10 @@ 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)
+    plan_name = get_user_plan(user_id, user_repository)
     command = CreateVoiceLibraryCommand(
         user_id=user_id,
         name=request.name,
@@ -282,8 +347,8 @@ def create_voice(
         raise HTTPException(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=f"配音库配额已满（{exc.used}/{exc.limit}），请升级套餐",
-        )
-    return _to_response(item)
+        ) from exc
+    return _to_response(item, sign_url)
 
 
 @router.put("/{voice_id}", response_model=VoiceLibraryItemResponse)
@@ -292,6 +357,7 @@ 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(
@@ -311,12 +377,12 @@ def update_voice(
     use_case = UpdateVoiceLibraryUseCase(voice_repository)
     try:
         item = use_case.execute(command)
-    except NotFoundError:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice not found")
-    return _to_response(item)
+    except NotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice not found") from _e
+    return _to_response(item, sign_url)
 
 
-@router.delete("/{voice_id}", status_code=status.HTTP_204_NO_CONTENT)
+@router.delete("/{voice_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
 def delete_voice(
     voice_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -327,4 +393,4 @@ def delete_voice(
     deleted = use_case.execute(voice_id, user_id)
     if not deleted:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice not found")
-    return Response(status_code=204)
+    return

apps/api/app/auth.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import hashlib
 from dataclasses import dataclass
 
 import jwt
@@ -23,6 +24,35 @@ class AuthenticatedUser:
     token_type: str | None = None
 
 
+def _get_redis_client():
+    """获取 Redis 客户端用于 JWT 黑名单"""
+    import redis as redis_lib
+
+    return redis_lib.from_url(settings.REDIS_URL, decode_responses=True)
+
+
+def _token_fingerprint(token: str) -> str:
+    """计算 token 的哈希指纹"""
+    return hashlib.sha256(token.encode()).hexdigest()
+
+
+def blacklist_token(token: str, exp: int) -> None:
+    """将 token 加入黑名单，TTL 为 token 剩余有效期"""
+    import time
+
+    redis_client = _get_redis_client()
+    key = f"jwt:blacklist:{_token_fingerprint(token)}"
+    ttl = max(exp - int(time.time()), 1)
+    redis_client.setex(key, ttl, "revoked")
+
+
+def is_token_blacklisted(token: str) -> bool:
+    """检查 token 是否在黑名单中"""
+    redis_client = _get_redis_client()
+    key = f"jwt:blacklist:{_token_fingerprint(token)}"
+    return redis_client.exists(key) > 0
+
+
 async def get_current_user(
     credentials: HTTPAuthorizationCredentials | None = Depends(bearer_scheme),
     user_repository: UserRepository = Depends(get_user_repository),
@@ -56,6 +86,11 @@ def _decode_user_token(token: str) -> dict:
 
     if payload.get("type") not in {"user_auth", "access"}:
         raise _unauthorized("Invalid token type")
+
+    # 检查 token 是否在黑名单中
+    if is_token_blacklisted(token):
+        raise _unauthorized("Token has been revoked")
+
     return payload
 
 

apps/api/app/config.py

@@ -19,27 +19,25 @@ class Settings(BaseSettings):
     # Container bind address; external expose is controlled by Docker/Nginx.
     API_HOST: str = "0.0.0.0"  # nosec: B104
     API_PORT: int = 8000
-    API_PREFIX: str = "/api/v1"
 
     DATABASE_URL: str = "postgresql+psycopg://postgres:postgres@localhost:5432/xiaoxia_saas"
     DATABASE_POOL_SIZE: int = 20
     DATABASE_MAX_OVERFLOW: int = 10  # 调整为合理值：pool_size(20) + max_overflow(10) = 最大30连接
     DATABASE_POOL_TIMEOUT: int = 30
-    DATABASE_POOL_RECYLE: int = 3600
+    DATABASE_POOL_RECYCLE: int = 3600
     USE_IN_MEMORY_DB: bool = False
     AUTO_CREATE_SCHEMA: bool = False
 
     REDIS_URL: str = "redis://localhost:6379/0"
-    REDIS_MAX_CONNECTION: int = 50
     ENABLE_REDIS_SESSIONS: bool = False
 
     # JWT secret key - MUST be set via environment variable, no default allowed
     JWT_SECRET_KEY: Optional[str] = None
-    # 旧的 JWT secret key（用于密钥轮换期间验证旧 token）
-    # 在密钥轮换时，先设置新密钥，旧密钥保留在此处直到所有旧 token 过期
-    JWT_SECRET_KEY_OLD: Optional[str] = None
-    # 密钥轮换天数（到达此天数后建议更换密钥）
-    SECRET_ROTATION_DAYS: int = 90
+
+    # JWT 算法与过期时间（与 .env.example 对齐）
+    JWT_ALGORITHM: str = "HS256"
+    JWT_ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
+    JWT_REFRESH_TOKEN_EXPIRE_DAYS: int = 30
 
     @field_validator("JWT_SECRET_KEY", mode="before")
     @classmethod
@@ -75,19 +73,42 @@ class Settings(BaseSettings):
     CELERY_RESULT_BACKEND: str = "redis://localhost:6379/1"
 
     # OSS 七牛云相关
-    OSS_ENDPOINT: str = "oss-cn-hangzhou.aliiyuncs.com"
+    OSS_ENDPOINT: str = "oss-cn-hangzhou.aliyuncs.com"
     OSS_ACCESS_KEY_ID: str = ""
     OSS_ACCESS_KEY_SECRET: str = ""
     OSS_BUCKET_NAME: str = "xiaoxia-autocut"
+
+    @field_validator("OSS_ACCESS_KEY_ID", mode="before")
+    @classmethod
+    def validate_oss_access_key_id(cls, v):
+        if (v is None or v == "") and os.getenv("APP_ENV", "development") != "development":
+            raise ValueError(
+                "OSS_ACCESS_KEY_ID must be set via environment variable in non-development environments. "
+                "Check the server .env file (e.g. /var/lib/xiaoxia-saas-staging/.env)."
+            )
+        return v or ""
+
+    @field_validator("OSS_ACCESS_KEY_SECRET", mode="before")
+    @classmethod
+    def validate_oss_access_key_secret(cls, v):
+        if (v is None or v == "") and os.getenv("APP_ENV", "development") != "development":
+            raise ValueError(
+                "OSS_ACCESS_KEY_SECRET must be set via environment variable in non-development environments. "
+                "Check the server .env file (e.g. /var/lib/xiaoxia-saas-staging/.env)."
+            )
+        return v or ""
+
     OSS_DIRECT_UPLOAD_MAX_MB: int = Field(
         default=2000,
         validation_alias=AliasChoices("OSS_DIRECT_UPLOAD_MAX_MB", "MAX_UPLOAD_SIZE_MB"),
     )
     OSS_DIRECT_UPLOAD_EXPIRE_SECONDS: int = 900
 
-    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/__init__.py

@@ -1 +0,0 @@
-"""Core configuration package."""

apps/api/app/core/database.py

@@ -1,49 +0,0 @@
-"""Database session management and engine configuration.
-
-统一使用 app.config 中的数据库配置，移除重复的 DatabaseSettings。
-"""
-
-from contextlib import contextmanager
-from typing import Generator
-
-from app.config import settings
-from sqlalchemy import create_engine
-from sqlalchemy.orm import Session, sessionmaker
-
-engine = create_engine(
-    settings.database_url,
-    pool_size=settings.DATABASE_POOL_SIZE,
-    max_overflow=settings.DATABASE_MAX_OVERFLOW,
-    pool_timeout=settings.DATABASE_POOL_TIMEOUT,
-    pool_recycle=settings.DATABASE_POOL_RECYCLE,
-)
-
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-
-
-def get_db() -> Generator[Session, None, None]:
-    """Dependency for getting database sessions."""
-    db = SessionLocal()
-    try:
-        yield db
-    finally:
-        db.close()
-
-
-@contextmanager
-def get_db_context() -> Generator[Session, None, None]:
-    """Context manager for database sessions.
-
-    Usage:
-        with get_db_context() as db:
-            db.query(Model).all()
-    """
-    db = SessionLocal()
-    try:
-        yield db
-        db.commit()
-    except Exception:
-        db.rollback()
-        raise
-    finally:
-        db.close()

apps/api/app/core/storage.py

@@ -1,243 +1,14 @@
-"""阿里云 OSS 存储服务"""
+"""Backward-compatible re-export from shared storage.
 
-import base64
-import datetime as dt
-import hashlib
-import hmac
-import json
-import logging
-import os
-from urllib.parse import urlparse
+All storage logic now lives in ``packages.shared.storage``.
+This module keeps old import paths working so existing code
+does not need to change.
+"""
 
-try:
-    import oss2
-except ImportError:  # pragma: no cover - exercised in minimal local/test environments
-    oss2 = None
-from app.config import get_settings
+from packages.shared.storage import SharedStorageService as OSSStorageService
+from packages.shared.storage import (
+    get_shared_storage_service,
+    get_storage_service,
+)
 
-logger = logging.getLogger(__name__)
-
-
-class OSSStorageService:
-    """阿里云 OSS 存储服务"""
-
-    def __init__(self):
-        settings = get_settings()
-        self.bucket_name = settings.OSS_BUCKET_NAME
-        self.public_url = f"https://{settings.OSS_BUCKET_NAME}.{settings.OSS_ENDPOINT}"
-        self.local_url_prefix = os.getenv("GENERATED_FILES_URL_PREFIX", "/generated-files")
-        self.bucket = None
-
-        has_key_id = bool(settings.OSS_ACCESS_KEY_ID)
-        has_key_secret = bool(settings.OSS_ACCESS_KEY_SECRET)
-
-        if has_key_id and has_key_secret:
-            if oss2 is not None:
-                try:
-                    auth = oss2.Auth(
-                        settings.OSS_ACCESS_KEY_ID,
-                        settings.OSS_ACCESS_KEY_SECRET,
-                    )
-                    self.bucket = oss2.Bucket(
-                        auth,
-                        settings.OSS_ENDPOINT,
-                        settings.OSS_BUCKET_NAME,
-                    )
-                    logger.info(
-                        "OSS initialized: endpoint=%s bucket=%s",
-                        settings.OSS_ENDPOINT,
-                        settings.OSS_BUCKET_NAME,
-                    )
-                except Exception as error:
-                    logger.error("Failed to initialize OSS bucket client: %s", error)
-            else:
-                logger.error("oss2 SDK is not installed — OSS operations will fail")
-        else:
-            missing = []
-            if not has_key_id:
-                missing.append("OSS_ACCESS_KEY_ID")
-            if not has_key_secret:
-                missing.append("OSS_ACCESS_KEY_SECRET")
-            logger.error("OSS credentials not configured — missing: %s", ", ".join(missing))
-
-        self.access_key_id = settings.OSS_ACCESS_KEY_ID
-        self.access_key_secret = settings.OSS_ACCESS_KEY_SECRET
-        self.endpoint = settings.OSS_ENDPOINT
-
-    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
-        return path.startswith(f"{self.local_url_prefix}/")
-
-    def create_direct_upload_post(
-        self,
-        storage_key: str,
-        content_type: str,
-        max_size_bytes: int,
-        expires_seconds: int,
-    ) -> dict[str, object]:
-        """创建浏览器直传 OSS 的 PostObject 表单。"""
-        if not self.access_key_id or not self.access_key_secret:
-            raise RuntimeError("OSS storage is not configured")
-        normalized_key = self._normalize_storage_key(storage_key)
-        if not normalized_key.startswith("uploads/"):
-            raise ValueError("direct upload key must be under uploads/")
-
-        expiration = (dt.datetime.now(dt.timezone.utc) + dt.timedelta(seconds=expires_seconds)).strftime(
-            "%Y-%m-%dT%H:%M:%S.000Z"
-        )
-        policy = {
-            "expiration": expiration,
-            "conditions": [
-                {"bucket": self.bucket_name},
-                {"key": normalized_key},
-                ["content-length-range", 1, max_size_bytes],
-                ["starts-with", "$Content-Type", content_type.split("/", 1)[0] + "/" if "/" in content_type else ""],
-            ],
-        }
-        encoded_policy = base64.b64encode(json.dumps(policy, separators=(",", ":")).encode("utf-8")).decode("ascii")
-        signature = base64.b64encode(
-            hmac.new(self.access_key_secret.encode("utf-8"), encoded_policy.encode("utf-8"), hashlib.sha1).digest()
-        ).decode("ascii")
-
-        return {
-            "url": self.public_url,
-            "method": "POST",
-            "storage_key": normalized_key,
-            "expires_at": expiration,
-            "fields": {
-                "key": normalized_key,
-                "OSSAccessKeyId": self.access_key_id,
-                "policy": encoded_policy,
-                "Signature": signature,
-                "success_action_status": "201",
-                "Content-Type": content_type,
-            },
-        }
-
-    def upload_file(
-        self,
-        file_or_path,
-        storage_key: str,
-        content_type: str = "application/octet-stream",
-    ) -> str:
-        """
-        上传文件到 OSS
-
-        Args:
-            file_or_path: 文件对象或本地文件路径
-            storage_key: 存储键（文件路径）
-            content_type: 内容类型
-
-        Returns:
-            文件公网 URL
-        """
-        if self.bucket is None:
-            raise RuntimeError("OSS storage is not configured")
-
-        try:
-            # 如果是字符串路径，从本地文件上传
-            if isinstance(file_or_path, str):
-                self.bucket.put_object_from_file(storage_key, file_or_path, headers={"Content-Type": content_type})
-            else:
-                # 文件对象
-                file_or_path.seek(0)
-                self.bucket.put_object(storage_key, file_or_path, headers={"Content-Type": content_type})
-
-            return f"{self.public_url}/{storage_key}"
-        except Exception as e:
-            raise Exception(f"Failed to upload file to OSS: {e}")
-
-    def get_url(self, storage_key: str) -> str:
-        """获取文件公网 URL"""
-        return f"{self.public_url}/{storage_key}"
-
-    def get_download_url(self, storage_key_or_url: str, expires_seconds: int = 3600) -> str:
-        """
-        获取文件下载签名 URL（用于私有文件）
-
-        Args:
-            storage_key_or_url: 存储键或完整 URL
-            expires_seconds: 过期时间（秒）
-
-        Returns:
-            签名 URL
-        """
-        if self.bucket is None:
-            if self._is_local_generated_url(storage_key_or_url):
-                return storage_key_or_url
-            return self.get_url(self._normalize_storage_key(storage_key_or_url))
-
-        storage_key = self._normalize_storage_key(storage_key_or_url)
-        try:
-            return self.bucket.sign_url("GET", storage_key, expires_seconds)
-        except Exception:
-            return self.get_url(storage_key)
-
-    def _normalize_storage_key(self, storage_key_or_url: str) -> str:
-        """从 URL 中提取存储键"""
-        if storage_key_or_url.startswith("http://") or storage_key_or_url.startswith("https://"):
-            parsed = urlparse(storage_key_or_url)
-            # 移除开头的 /
-            return parsed.path.lstrip("/")
-        return storage_key_or_url.lstrip("/")
-
-    def download_file(self, storage_key: str, local_path: str):
-        """
-        从 OSS 下载文件到本地
-
-        Args:
-            storage_key: 存储键
-            local_path: 本地文件路径
-        """
-        if self.bucket is None:
-            raise RuntimeError("OSS storage is not configured")
-
-        try:
-            os.makedirs(os.path.dirname(local_path), exist_ok=True)
-            self.bucket.get_object_to_file(storage_key, local_path)
-        except Exception as e:
-            raise Exception(f"Failed to download file from OSS: {e}")
-
-    def delete_file(self, storage_key: str):
-        """
-        删除 OSS 文件
-
-        Args:
-            storage_key: 存储键
-        """
-        if self.bucket is None:
-            return
-
-        try:
-            self.bucket.delete_object(storage_key)
-        except Exception as error:
-            logger.warning(
-                "Failed to delete file from OSS",
-                extra={"storage_key": storage_key, "error": str(error)},
-            )
-
-    def file_exists(self, storage_key: str) -> bool:
-        """
-        检查文件是否存在
-
-        Args:
-            storage_key: 存储键
-
-        Returns:
-            是否存在
-        """
-        if self.bucket is None:
-            return False
-        return self.bucket.object_exists(storage_key)
-
-
-_storage_service = None
-
-
-def get_storage_service() -> OSSStorageService:
-    """获取存储服务实例（全局单例）"""
-    global _storage_service
-    if _storage_service is None:
-        _storage_service = OSSStorageService()
-    return _storage_service
+__all__ = ["OSSStorageService", "get_storage_service", "get_shared_storage_service"]

apps/api/app/core/task_enqueue.py

@@ -0,0 +1,221 @@
+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: Exception = 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 = 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/db.py

@@ -1,7 +1,4 @@
-from collections.abc import Generator
-
 from app.config import settings
-from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl import (
     build_session_factory,
@@ -21,11 +18,3 @@ engine, SessionLocal = build_session_factory(
 assert_auto_create_schema_allowed(settings.ENVIRONMENT, settings.AUTO_CREATE_SCHEMA)
 if settings.AUTO_CREATE_SCHEMA:
     initialize_database(engine)
-
-
-def get_db() -> Generator[Session, None, None]:
-    db = SessionLocal()
-    try:
-        yield db
-    finally:
-        db.close()

apps/api/app/dependencies.py

@@ -39,6 +39,7 @@ from packages.adapters.sqlalchemy_impl.project_repository import (
     SQLAlchemyProjectRepository,
 )
 from packages.adapters.sqlalchemy_impl.session import build_session_factory
+from packages.adapters.sqlalchemy_impl.tag_repository import SQLAlchemyTagRepository
 from packages.adapters.sqlalchemy_impl.title_library_repository import (
     SQLAlchemyTitleLibraryRepository,
 )
@@ -49,19 +50,8 @@ from packages.adapters.sqlalchemy_impl.voice_clone_profile_repository import (
 from packages.adapters.sqlalchemy_impl.voice_library_repository import (
     SQLAlchemyVoiceLibraryRepository,
 )
-from packages.ports.asset_library_repository import AssetLibraryRepository
-from packages.ports.asset_repository import AssetRepository
-from packages.ports.classification_job_repository import ClassificationJobRepository
-from packages.ports.duplication_repository import DuplicationRecordRepository
-from packages.ports.generated_video_repository import GeneratedVideoRepository
-from packages.ports.generation_task_repository import GenerationTaskRepository
-from packages.ports.ingest_job_repository import IngestJobRepository
-from packages.ports.job_repository import JobRepository
-from packages.ports.project_repository import ProjectRepository
-from packages.ports.title_library_repository import TitleLibraryRepository
+from packages.ports.tag_repository import TagRepository
 from packages.ports.user_repository import UserRepository
-from packages.ports.voice_clone_profile_repository import VoiceCloneProfileRepository
-from packages.ports.voice_library_repository import VoiceLibraryRepository
 
 _engine, _SessionLocal = build_session_factory(settings.DATABASE_URL)
 
@@ -138,6 +128,13 @@ def get_project_repository(
     return SQLAlchemyProjectRepository(session)
 
 
+def get_tag_repository(
+    session: Session = Depends(get_db_session),
+) -> TagRepository:
+    """Provide the SQLAlchemy tag repository implementation."""
+    return SQLAlchemyTagRepository(session)  # type: ignore[return-value]
+
+
 def get_user_repository(
     session: Session = Depends(get_db_session),
 ) -> UserRepository:
@@ -191,8 +188,38 @@ def get_voice_clone_profile_repository(
     return SQLAlchemyVoiceCloneProfileRepository(session)
 
 
-def get_cosyvoice_service() -> "CosyVoiceService":
-    """Provide the CosyVoice service instance."""
+def get_cosyvoice_service():
+    """Provide the CosyVoice service instance.
+
+    注入 OSS 音频URL预签名函数，确保私有bucket下的参考音频
+    能被 CosyVoice 服务器下载。
+    """
+    from app.core.storage import get_storage_service
+
     from packages.application.cosyvoice_service import CosyVoiceService
 
-    return 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

apps/api/app/middleware/auth.py

@@ -1,18 +1,22 @@
 """
 Authentication dependency compatibility layer.
 
-Canonical bearer-token parsing lives in app.auth. This module remains only so
-legacy imports have a safe target while workspace dependencies are rebuilt.
+Canonical bearer-token parsing lives in app.auth. This module re-exports
+common auth dependencies for backward compatibility.
 """
 
 from __future__ import annotations
 
+import logging
+
 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
 
+logger = logging.getLogger(__name__)
+
 from packages.domain.entities import User
 from packages.ports.user_repository import UserRepository
 
@@ -33,6 +37,10 @@ async def get_current_user_optional(
         return None
     try:
         authenticated_user = await get_authenticated_user(credentials, user_repository)
-    except HTTPException:
+    except HTTPException as exc:
+        if exc.status_code >= 500:
+            # 服务端错误不应被静默吞掉，记录日志
+            logger.error("可选认证遇到服务端错误，status=%s", exc.status_code, exc_info=True)
+        # 4xx 认证失败（如 token 无效、用户不存在）属于正常流程，返回 None
         return None
     return authenticated_user.user