fix(ci): P0系统性修复 - concurrency/UnitTests/门禁同步\n\n- 任务1: develop push事件关闭cancel-in-progress，PR事件保留\n- 任务2: Unit Tests修复 - PYTHONPATH加packages目录+numpy双保险\n- 任务4: auto_approve/auto_merge同步新增5个required checks\n\n任务3（分支保护门禁）已通过Gitea API直接修改

#751引入SmartAssetSelector后破坏了_select_assets_from_library的smart模式原有行为：
- 新增最低质量分过滤（旧逻辑只排序不过滤）
- null quality_score处理逻辑变化（旧逻辑当0分，新逻辑当0.5分）
- 时长tiebreaker变化（旧逻辑时长越长越靠前，新逻辑有最优区间）

修复：_select_assets_from_library恢复quality_score+时长的简单排序，
保持API层smart模式的向后兼容。SmartAssetSelector作为独立服务
继续存在，供AI推荐、自动剪辑等需要4维评分的高级场景使用。

修复tests/unit/test_asset_select_mode.py中5个失败的单测。

.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
@@ -49,6 +51,7 @@ OSS_BUCKET_NAME=xiaoxia-autocut
 #       cosyvoice-v3-plus (高质量，系统音色少)
 #       cosyvoice-v3.5-flash / cosyvoice-v3.5-plus (仅支持克隆/设计音色，无系统音色)
 # 音色: v3系列系统音色带 _v3 后缀，如 longxiaochun_v3, longxiaoxia_v3, longanyang (无后缀)
+# 注意：COSYVOICE_* 变量由 packages/shared/config.py 的 SharedSettings 读取
 COSYVOICE_API_KEY=your-cosyvoice-api-key
 COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
 COSYVOICE_MODEL=cosyvoice-v3-flash

.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

.flake8

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

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

@@ -0,0 +1,78 @@
+name: CI Failure Monitor
+
+on:
+  schedule:
+    - cron: '0 */6 * * *'  # 每6小时检查一次
+  workflow_dispatch:
+    inputs:
+      days:
+        description: '统计最近N天的失败'
+        required: false
+        default: '7'
+      fail_threshold:
+        description: '失败次数阈值'
+        required: false
+        default: '3'
+      fail_rate_threshold:
+        description: '失败率阈值(%)'
+        required: false
+        default: '30'
+
+permissions:
+  contents: read
+
+jobs:
+  monitor:
+    name: CI重复失败检测
+    runs-on: ci-l2
+    timeout-minutes: 10
+
+    steps:
+    - name: Checkout code
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        curl -sH "Authorization: token $GITHUB_TOKEN" \
+          "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
+          | bash
+
+    - name: Record job start time
+      shell: sh
+      run: bash scripts/ci/step_timer_start.sh
+
+    - name: Run failure detection
+      shell: sh
+      env:
+        GITEA_API_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
+        GITEA_URL: https://git.xiaoxiajianji.com
+        GITEA_REPO: xiaoxia/xiaoxia-saas
+        CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
+        FAIL_CHECK_DAYS: ${{ inputs.days || 7 }}
+        FAIL_THRESHOLD: ${{ inputs.fail_threshold || 3 }}
+        FAIL_RATE_THRESHOLD: ${{ inputs.fail_rate_threshold || 30 }}
+      run: |
+        set +e
+        python3 scripts/ci/ci_repeated_failure_detector.py
+        EXIT_CODE=$?
+        echo "检测完成，退出码: $EXIT_CODE"
+        # 0=无异常, 1=有警告, 2=有严重问题
+        # 监控脚本永远不fail，避免告警风暴
+        exit 0
+
+    - name: Job duration summary
+      if: always()
+      shell: sh
+      run: bash scripts/ci/step_timer_end.sh
+
+    - name: Report CI trace
+      if: always()
+      shell: sh
+      env:
+        AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
+      run: |
+        STATUS="ok"
+        [ ${{ job.status }} = "success" ] || STATUS="error"
+        START_TIME=""
+        [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
+        python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true

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

@@ -0,0 +1,103 @@
+name: CI Health Daily Report
+on:
+  schedule:
+    - cron: '0 1 * * *'  # UTC 01:00 = 北京时间 09:00
+  workflow_dispatch:
+permissions:
+  contents: read
+jobs:
+  ci-health-report:
+    name: CI健康度每日巡检
+    runs-on: saas
+    timeout-minutes: 15
+    steps:
+    - name: Checkout code
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        set -eu
+        python3 - <<'PY'
+        import io, os, tarfile, time, urllib.request, urllib.error
+        url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
+        request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
+        last_err = None
+        for attempt in range(5):
+            try:
+                with urllib.request.urlopen(request, timeout=120) as response:
+                    archive = response.read()
+                break
+            except urllib.error.HTTPError as e:
+                last_err = e
+                if e.code >= 500 and attempt < 4:
+                    wait = 2 ** attempt
+                    print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                    time.sleep(wait)
+                    continue
+                raise
+            except Exception as e:
+                last_err = e
+                if attempt < 4:
+                    wait = 2 ** attempt
+                    print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                    time.sleep(wait)
+                    continue
+                raise
+        else:
+            raise last_err
+        with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
+            root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
+            for member in tar.getmembers():
+                name = member.name
+                if name == root_prefix[:-1]:
+                    continue
+                if name.startswith(root_prefix):
+                    member.name = name[len(root_prefix):]
+                if member.name:
+                    tar.extract(member, '.')
+        PY
+
+    - name: Generate CI Dashboard HTML
+      shell: sh
+      env:
+        GITEA_TOKEN: ${{ github.token }}
+      run: |
+        set +e
+        echo "=== 生成 CI 健康度 HTML 看板 ==="
+        echo "时间: $(date '+%Y-%m-%d %H:%M:%S')"
+        echo ""
+        python3 scripts/ci/ci_dashboard.py --days 7 --html --html-output ci_dashboard.html
+        EXIT_CODE=$?
+        if [ $EXIT_CODE -eq 0 ] && [ -f ci_dashboard.html ]; then
+            HTML_SIZE=$(wc -c < ci_dashboard.html)
+            echo ""
+            echo "✅ HTML 看板生成成功 (${HTML_SIZE} bytes)"
+            echo "路径: $(pwd)/ci_dashboard.html"
+            # 输出文件内容前几行，方便在 Actions 日志中确认
+            echo ""
+            echo "--- 看板预览 (前 5 行) ---"
+            head -5 ci_dashboard.html
+            echo "...（完整内容见产物文件）"
+        else
+            echo "❌ HTML 看板生成失败 (exit code: $EXIT_CODE)"
+        fi
+        echo ""
+        # 永远成功，看板生成失败不影响主流程
+        exit 0
+
+    - name: Run CI health check and report
+      shell: sh
+      env:
+        GITEA_TOKEN: ${{ github.token }}
+        CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
+      run: |
+        set +e
+        echo "=== CI健康度每日巡检 ==="
+        echo "时间: $(date '+%Y-%m-%d %H:%M:%S')"
+        echo ""
+        python3 scripts/ci/ci_health_report.py --limit 30
+        EXIT_CODE=$?
+        echo ""
+        echo "巡检完成 (exit code: $EXIT_CODE)"
+        # 永远成功，不影响CI状态（通知失败不应该标红）
+        exit 0

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

@@ -0,0 +1,52 @@
+name: CI Trigger Monitor
+
+on:
+  schedule:
+    - cron: '*/5 * * * *'  # 每5分钟检查一次
+  workflow_dispatch:
+    inputs:
+      stale_threshold:
+        description: 'CI未触发告警阈值（分钟）'
+        required: false
+        default: '5'
+
+permissions:
+  contents: read
+
+jobs:
+  monitor:
+    name: Monitor CI Trigger Reliability
+    runs-on: 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

@@ -106,6 +106,18 @@ jobs:
           echo "======================================"
           exit $SMOKE_EXIT
 
+      - name: Report CI trace
+        if: always()
+        shell: sh
+        env:
+          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
+        run: |
+          STATUS="ok"
+          [ ${{ job.status }} = "success" ] || STATUS="error"
+          START_TIME=""
+          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
+          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
+
   # ── 2. Staging API 集成测试 ─────────────────────────────────────────
   staging-api-tests:
     name: Staging API Integration Tests
@@ -243,6 +255,18 @@ jobs:
             echo "report=FAIL" >> "${GITHUB_OUTPUT}"
           fi
 
+      - name: Report CI trace
+        if: always()
+        shell: sh
+        env:
+          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
+        run: |
+          STATUS="ok"
+          [ ${{ job.status }} = "success" ] || STATUS="error"
+          START_TIME=""
+          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
+          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
+
   # ── 3. Staging 浏览器 E2E ──────────────────────────────────────────
   staging-e2e:
     name: Staging Browser E2E
@@ -332,6 +356,18 @@ jobs:
           echo "=========================================="
           exit $EXIT_CODE
 
+      - name: Report CI trace
+        if: always()
+        shell: sh
+        env:
+          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
+        run: |
+          STATUS="ok"
+          [ ${{ job.status }} = "success" ] || STATUS="error"
+          START_TIME=""
+          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
+          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
+
   # ── 4. 性能基线巡检 ────────────────────────────────────────────────
   performance-check:
     name: Performance Baseline Check
@@ -580,6 +616,18 @@ jobs:
             exit 0
           fi
 
+      - name: Report CI trace
+        if: always()
+        shell: sh
+        env:
+          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
+        run: |
+          STATUS="ok"
+          [ ${{ job.status }} = "success" ] || STATUS="error"
+          START_TIME=""
+          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
+          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
+
   # ── 5. 每日巡检汇总报告 ────────────────────────────────────────────
   daily-report:
     name: Daily Check Report
@@ -656,3 +704,15 @@ jobs:
             # 不 exit 1，因为我们用了 always()，保持 report job 成功，
             # 但其他失败的 job 已经让整体流水线标记为失败
           fi
+      - name: Report CI trace
+        if: always()
+        shell: sh
+        env:
+          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
+        run: |
+          STATUS="ok"
+          [ ${{ job.status }} = "success" ] || STATUS="error"
+          START_TIME=""
+          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
+          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
+

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

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

.gitea/workflows/pr-automation.yml

@@ -0,0 +1,113 @@
+name: PR Automation
+
+on:
+  pull_request:
+    types: [synchronize, opened, ready_for_review, review_requested]
+  workflow_dispatch:
+
+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: 3  # 长等待模式：等CI全绿后自动合并，不遗漏任何PR
+    steps:
+      - name: Checkout code
+        shell: sh
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          curl -sH "Authorization: token $GITHUB_TOKEN"             "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"             | bash
+
+      - name: "🔍 脚本语法自检"
+        shell: bash
+        run: |
+          ERROR=0
+          for f in scripts/ci/*.sh; do [ -f "$f" ] && bash -n "$f" 2>&1 || ERROR=$((ERROR+1)); done
+          for f in scripts/ci/*.py; do [ -f "$f" ] && python3 -m py_compile "$f" 2>&1 || ERROR=$((ERROR+1)); done
+          if [ "$ERROR" -ne 0 ]; then echo "❌ 语法自检失败 ($ERROR个)"; exit 1; fi
+          echo "✅ 脚本语法自检通过"
+
+      - name: Auto approve when CI passes
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          REVIEW_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        run: |
+          bash scripts/ci/auto_approve.sh
+      - name: Report CI trace
+        if: always()
+        shell: sh
+        env:
+          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
+        run: |
+          STATUS="ok"
+          [ ${{ job.status }} = "success" ] || STATUS="error"
+          START_TIME=""
+          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
+          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
+
+  auto-merge:
+    name: Auto Merge on CI Green + Approved
+    runs-on: ci-check
+    if: github.event_name == 'pull_request' && !github.event.pull_request.draft && github.event.pull_request.base.ref == 'develop'
+    timeout-minutes: 45  # 长等待模式：等CI全绿后自动合并，不遗漏任何PR
+    steps:
+      - name: Checkout code
+        shell: sh
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          curl -sH "Authorization: token $GITHUB_TOKEN"             "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"             | bash
+
+      - name: "🔍 脚本语法自检（防止脚本bug导致所有PR挂掉）"
+        shell: bash
+        run: |
+          echo "=== CI脚本语法自检 ==="
+          ERROR=0
+          for f in scripts/ci/*.sh; do
+            [ -f "$f" ] || continue
+            if ! bash -n "$f" 2>&1; then
+              echo "FAIL: $f"
+              ERROR=1
+            fi
+          done
+          for f in scripts/ci/*.py; do
+            [ -f "$f" ] || continue
+            if ! python3 -m py_compile "$f" 2>&1; then
+              echo "FAIL: $f"
+              ERROR=1
+            fi
+          done
+          if [ "$ERROR" -ne 0 ]; then
+            echo "❌ 脚本语法自检失败"
+            exit 1
+          fi
+          echo "✅ 所有CI脚本语法自检通过"
+
+      - name: Auto merge when CI passes and approved
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          MERGE_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+        run: |
+          bash scripts/ci/auto_merge.sh
+      - name: Report CI trace
+        if: always()
+        shell: sh
+        env:
+          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
+        run: |
+          STATUS="ok"
+          [ ${{ job.status }} = "success" ] || STATUS="error"
+          START_TIME=""
+          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
+          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true

.gitea/workflows/preview-cleanup.yml

@@ -0,0 +1,207 @@
+name: Preview Cleanup
+on:
+  pull_request:
+    types:
+    - closed
+    branches:
+    - main
+    - develop
+permissions:
+  contents: read
+  pull-requests: write
+jobs:
+  cleanup-preview:
+    name: Cleanup Preview Environment
+    runs-on: runtime-builder
+    timeout-minutes: 10
+    steps:
+    - name: Checkout code
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        set -eu
+        python3 - <<'PY'
+        import io, os, tarfile, time, urllib.request, urllib.error
+        url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
+        request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
+        last_err = None
+        for attempt in range(5):
+            try:
+                with urllib.request.urlopen(request, timeout=120) as response:
+                    archive = response.read()
+                break
+            except urllib.error.HTTPError as e:
+                last_err = e
+                if e.code >= 500 and attempt < 4:
+                    wait = 2 ** attempt
+                    print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                    time.sleep(wait)
+                    continue
+                raise
+            except Exception as e:
+                last_err = e
+                if attempt < 4:
+                    wait = 2 ** attempt
+                    print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                    time.sleep(wait)
+                    continue
+                raise
+        else:
+            raise last_err
+        with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
+            root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
+            for member in tar.getmembers():
+                name = member.name
+                if name == root_prefix[:-1]:
+                    continue
+                if name.startswith(root_prefix):
+                    member.name = name[len(root_prefix):]
+                if member.name:
+                    tar.extract(member, '.')
+        PY
+
+    - name: Extract PR number
+      shell: sh
+      run: |
+        set -eu
+        # 优先从event payload中读取（兼容所有PR事件类型）
+        if [ -n "${GITHUB_EVENT_PATH:-}" ] && [ -f "$GITHUB_EVENT_PATH" ]; then
+          PR_NUMBER=$(python3 -c "import json,sys; print(json.load(sys.stdin).get('number',''))" < "$GITHUB_EVENT_PATH")
+        fi
+        # fallback: 从GITHUB_REF中提取
+        if [ -z "${PR_NUMBER:-}" ]; then
+          PR_NUMBER=$(echo "$GITHUB_REF" | sed -n 's|refs/pull/\([0-9]*\)/.*|\1|p')
+        fi
+        # 再fallback: 兼容纯数字ref
+        if [ -z "${PR_NUMBER:-}" ] || ! echo "$PR_NUMBER" | grep -qE '^[0-9]+$'; then
+          echo "WARNING: Could not extract PR number cleanly, using raw ref suffix"
+          PR_NUMBER=$(echo "$GITHUB_REF" | sed 's|refs/pull/||; s|/.*||')
+        fi
+        echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
+        echo "PR number: $PR_NUMBER"
+        echo "Preview dir: /var/www/preview/pr-${PR_NUMBER}"
+
+    - name: Install SSH client
+      shell: sh
+      run: |
+        set -eu
+        # 先检查是否已存在ssh
+        if command -v ssh >/dev/null 2>&1 && command -v ssh-keyscan >/dev/null 2>&1; then
+          echo "SSH client already available: $(ssh -V 2>&1)"
+          exit 0
+        fi
+        # 尝试多种包管理器安装
+        if command -v apk >/dev/null 2>&1; then
+          apk add --no-cache openssh-client >/dev/null 2>&1
+          echo "openssh-client installed via apk"
+        elif command -v apt-get >/dev/null 2>&1; then
+          apt-get update -qq && apt-get install -y -qq openssh-client >/dev/null 2>&1
+          echo "openssh-client installed via apt-get"
+        elif command -v yum >/dev/null 2>&1; then
+          yum install -y openssh-clients >/dev/null 2>&1
+          echo "openssh-client installed via yum"
+        elif command -v dnf >/dev/null 2>&1; then
+          dnf install -y openssh-clients >/dev/null 2>&1
+          echo "openssh-client installed via dnf"
+        else
+          echo "ERROR: No package manager found and ssh not pre-installed"
+          which ssh 2>/dev/null || echo "  ssh: not found"
+          which ssh-keyscan 2>/dev/null || echo "  ssh-keyscan: not found"
+          exit 1
+        fi
+
+    - name: Remove preview directory from server
+      shell: sh
+      env:
+        PREVIEW_SSH_HOST: ${{ secrets.PREVIEW_SSH_HOST }}
+        PREVIEW_SSH_USER: ${{ secrets.PREVIEW_SSH_USER }}
+        PREVIEW_SSH_PORT: ${{ secrets.PREVIEW_SSH_PORT }}
+        PREVIEW_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
+      run: |
+        set -eux
+        preview_host="${PREVIEW_SSH_HOST:-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/worker-base-image.yml

@@ -0,0 +1,103 @@
+name: Worker Base Image Build
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+    paths:
+      - 'requirements-base.txt'
+      - 'requirements-worker.txt'
+      - 'infra/docker/worker-base-builder.Dockerfile'
+      - 'infra/docker/worker-base-runtime.Dockerfile'
+  workflow_dispatch:  # 支持手动触发
+
+jobs:
+  build-worker-base:
+    name: Build Worker Base Images
+    runs-on: runtime-builder
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - name: builder
+          dockerfile: infra/docker/worker-base-builder.Dockerfile
+          image_name: worker-base-builder
+          cache_name: worker-base-builder-cache
+        - name: runtime
+          dockerfile: infra/docker/worker-base-runtime.Dockerfile
+          image_name: worker-base-runtime
+          cache_name: worker-base-runtime-cache
+    steps:
+    - name: Checkout code
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
+
+    - name: Docker login to Registry
+      shell: sh
+      env:
+        ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
+        ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
+        GITEA_REGISTRY_USER: xiaoxia
+        GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+      run: |
+        set -eu
+        for i in 1 2 3; do
+          echo "=== Docker login 尝试 $i/3 ==="
+          if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin              && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
+            echo "✅ Docker login successful"
+            break
+          fi
+          echo "❌ Docker login 失败（尝试 $i/3），5s 后重试..."
+          sleep 5
+        done
+
+    - name: Setup buildx builder
+      shell: sh
+      run: |
+        set -eu
+        BUILDER_NAME="ci-builder-${GITHUB_RUN_ID}-${{ matrix.name }}"
+        if ! docker buildx inspect "$BUILDER_NAME" > /dev/null 2>&1; then
+          docker buildx create --use --name "$BUILDER_NAME" --driver docker-container
+          echo "Created $BUILDER_NAME"
+        else
+          docker buildx use "$BUILDER_NAME"
+          echo "Using existing $BUILDER_NAME"
+        fi
+        docker buildx inspect --bootstrap
+
+    - name: Build and push base image
+      shell: sh
+      run: |
+        set -eu
+        REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
+        IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:latest"
+        SAFE_REF_NAME=$(echo "${GITHUB_REF_NAME}" | tr '/' '-')
+        CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:${SAFE_REF_NAME}"
+        
+        echo "=== Building ${{ matrix.name }} base image ==="
+        echo "Image: ${IMAGE_TAG}"
+        echo "Cache: ${CACHE_REF}"
+        
+        # 用通用构建脚本
+        bash scripts/ci/docker_build_push.sh           ${{ matrix.dockerfile }}           "${IMAGE_TAG}"           "${CACHE_REF}"
+        
+        # 同时推送到 Gitea Packages 作为备份（可选）
+        GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia-saas/${{ matrix.image_name }}:latest"
+        docker tag "${IMAGE_TAG}" "${GITEA_IMAGE}"
+        docker push "${GITEA_IMAGE}" || echo "Gitea Packages push failed (non-fatal)"
+        
+        echo ""
+        echo "✅ ${{ matrix.name }} base image built and pushed"
+
+    - name: Cleanup buildx builder
+      if: always()
+      shell: sh
+      run: |
+        docker buildx rm "ci-builder-${GITHUB_RUN_ID}-${{ matrix.name }}" 2>/dev/null || true
+        docker buildx prune -f 2>/dev/null || true
+        echo "Builder cleanup done"

.gitignore

@@ -49,3 +49,8 @@ build/
 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"
+}

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")

alembic/versions/050_video_shares.py

@@ -0,0 +1,48 @@
+"""#P3-2 - 视频分享表 video_shares
+
+Revision ID: 050
+Revises: 049
+Create Date: 2026-07-22
+
+Changes:
+1. 新建 video_shares 表，支持视频匿名分享链接
+2. share_token 唯一索引，用于公开分享URL
+3. 支持密码保护、有效期、浏览/下载计数
+"""
+
+import sqlalchemy as sa
+
+from alembic import context, op
+
+revision = "050_video_shares"
+down_revision = "049_wechat_login_phone"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    if context.get_context().dialect.name == "postgresql":
+        # 检查表是否已存在（幂等）
+        result = conn.execute(sa.text("SELECT to_regclass('public.video_shares')"))
+        if result.scalar() is not None:
+            return
+
+    op.create_table(
+        "video_shares",
+        sa.Column("id", sa.String(32), primary_key=True),
+        sa.Column("video_id", sa.String(32), nullable=False, index=True),
+        sa.Column("user_id", sa.String(32), nullable=False, index=True),
+        sa.Column("share_token", sa.String(16), nullable=False, unique=True),
+        sa.Column("password_hash", sa.String(255), nullable=True),
+        sa.Column("expires_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("view_count", sa.Integer, nullable=False, server_default="0"),
+        sa.Column("download_count", sa.Integer, nullable=False, server_default="0"),
+        sa.Column("is_active", sa.Boolean, nullable=False, server_default=sa.true()),
+        sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+        sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("video_shares")

alembic/versions/051_generation_task_resolution.py

@@ -0,0 +1,53 @@
+"""#632 - 一键生成输出分辨率可配置
+
+Revision ID: 051
+Revises: 050
+Create Date: 2026-07-23
+
+Changes:
+1. generation_tasks 表新增 resolution 字段，存储用户指定的输出分辨率（如 "1280x720"）
+2. 为空时使用默认值（1280x720）
+"""
+
+import sqlalchemy as sa
+
+from alembic import context, op
+
+revision = "051_generation_task_resolution"
+down_revision = "050_video_shares"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    if context.get_context().dialect.name == "postgresql":
+        # 检查列是否已存在（幂等）
+        result = conn.execute(
+            sa.text(
+                "SELECT column_name FROM information_schema.columns "
+                "WHERE table_name = 'generation_tasks' AND column_name = 'resolution'"
+            )
+        )
+        if result.scalar() is not None:
+            return
+
+    op.add_column(
+        "generation_tasks",
+        sa.Column("resolution", sa.String(20), nullable=False, server_default=""),
+    )
+
+
+def downgrade() -> None:
+    conn = op.get_bind()
+    if context.get_context().dialect.name == "postgresql":
+        result = conn.execute(
+            sa.text(
+                "SELECT column_name FROM information_schema.columns "
+                "WHERE table_name = 'generation_tasks' AND column_name = 'resolution'"
+            )
+        )
+        if result.scalar() is None:
+            return
+
+    op.drop_column("generation_tasks", "resolution")

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,25 +4,24 @@ 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.feature_flags import router as feature_flags_router
-from app.api.routes.generated_videos import router as generated_videos_router
 from app.api.routes.generation_tasks import router as generation_tasks_router
 from app.api.routes.health import router as health_check_router
 from app.api.routes.ingest_jobs import router as ingest_jobs_router
-from app.api.routes.jobs import router as jobs_router
+from app.api.routes.ai import router as ai_router
+from app.api.routes.internal_render import router as internal_render_router
 from app.api.routes.projects import router as projects_router
-from app.api.routes.recipes import router as recipes_router
+from app.api.routes.share import router as share_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.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
@@ -88,15 +87,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",
@@ -112,6 +102,14 @@ api_router.include_router(
     prefix="/voice-clones",
     tags=["VoiceClone"],
 )
+api_router.include_router(
+    videos_router,
+    tags=["VideoCenter"],
+)
+api_router.include_router(
+    share_router,
+    tags=["Share"],
+)
 api_router.include_router(
     duplication_router,
     prefix="/duplication",
@@ -122,37 +120,31 @@ 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(
+    ai_router,
+    prefix="/ai",
+    tags=["AI"],
+)
 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/ai.py

@@ -0,0 +1,136 @@
+"""AI 相关接口 — 智能标题、智能素材匹配等.
+
+基于豆包大模型的 AI 能力接口，未配置 API Key 时自动降级为本地模拟。
+"""
+
+from __future__ import annotations
+
+from typing import List, Literal, Optional
+
+from app.services.ai_service import TITLE_STYLES, generate_smart_titles, semantic_match_assets
+from fastapi import APIRouter
+from pydantic import BaseModel, Field
+
+router = APIRouter()
+
+
+# ── 请求/响应模型 ────────────────────────────────────────────────────────────
+
+
+class GenerateTitlesRequest(BaseModel):
+    """智能标题生成请求."""
+
+    description: str = Field(..., min_length=1, max_length=500, description="视频内容描述")
+    style: Literal["viral", "emotional", "informative"] = Field(
+        default="viral",
+        description="标题风格：viral爆款 / emotional情感 / informative信息",
+    )
+    count: int = Field(default=5, ge=3, le=10, description="生成数量，3-10个")
+
+
+class GenerateTitlesResponse(BaseModel):
+    """智能标题生成响应."""
+
+    titles: List[str] = Field(..., description="生成的标题列表")
+    style: str = Field(..., description="实际使用的风格")
+    source: str = Field(..., description="来源：doubao 或 fallback")
+    description: str = Field(..., description="原始描述")
+
+
+class TitleStyleInfo(BaseModel):
+    """标题风格信息."""
+
+    key: str
+    name: str
+    description: str
+
+
+# ── 素材语义匹配 ────────────────────────────────────────────────────────────
+
+
+class AssetMatchItem(BaseModel):
+    """待匹配素材项."""
+
+    id: str = Field(..., description="素材ID")
+    name: str = Field(default="", description="素材名称")
+    tags: List[str] = Field(default_factory=list, description="标签列表")
+    description: str = Field(default="", description="素材描述")
+
+
+class SemanticMatchRequest(BaseModel):
+    """语义匹配请求."""
+
+    description: str = Field(..., min_length=1, max_length=500, description="目标视频内容描述")
+    assets: List[AssetMatchItem] = Field(..., min_length=1, max_length=100, description="待匹配素材列表")
+    top_k: int = Field(default=0, ge=0, le=100, description="返回前K个，0返回全部")
+
+
+class SemanticMatchResultItem(AssetMatchItem):
+    """匹配结果项."""
+
+    match_score: float = Field(..., description="匹配度评分 0-1")
+    match_reason: str = Field(..., description="匹配方式：doubao_semantic / fallback_keyword / fallback_default")
+
+
+class SemanticMatchResponse(BaseModel):
+    """语义匹配响应."""
+
+    matches: List[SemanticMatchResultItem] = Field(..., description="按匹配度降序排列的素材列表")
+    source: str = Field(..., description="来源：doubao / fallback")
+    description: str = Field(..., description="原始描述")
+    total: int = Field(..., description="输入素材总数")
+
+
+# ── 路由 ────────────────────────────────────────────────────────────────────
+
+
+@router.post("/titles/generate", response_model=GenerateTitlesResponse)
+def generate_titles(request: GenerateTitlesRequest):
+    """生成智能标题.
+
+    根据视频描述生成指定风格的标题，支持爆款、情感、信息三种风格。
+    未配置豆包 API Key 时自动降级为本地规则生成。
+    """
+    result = generate_smart_titles(
+        description=request.description,
+        style=request.style,
+        count=request.count,
+    )
+    return GenerateTitlesResponse(**result)
+
+
+@router.get("/titles/styles", response_model=List[TitleStyleInfo])
+def list_title_styles():
+    """获取支持的标题风格列表."""
+    return [
+        TitleStyleInfo(key=key, name=info["name"], description=info["description"])
+        for key, info in TITLE_STYLES.items()
+    ]
+
+
+@router.post("/assets/match", response_model=SemanticMatchResponse)
+def match_assets(request: SemanticMatchRequest):
+    """智能素材语义匹配.
+
+    根据用户描述，对素材列表做语义匹配并按匹配度排序。
+    未配置豆包 API Key 时自动降级为关键词匹配。
+
+    - 支持最多 100 个素材同时匹配
+    - 返回 match_score (0-1)，按降序排列
+    - top_k 可限制返回数量
+    """
+    # 转为 dict 传给服务层
+    assets_dict = [asset.model_dump() for asset in request.assets]
+
+    result = semantic_match_assets(
+        description=request.description,
+        assets=assets_dict,
+        top_k=request.top_k,
+    )
+
+    return SemanticMatchResponse(
+        matches=[SemanticMatchResultItem(**m) for m in result["matches"]],
+        source=result["source"],
+        description=result["description"],
+        total=result["total"],
+    )

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

@@ -12,7 +12,7 @@ from app.schemas.asset_library import (
     EnsureDefaultLibraryRequest,
     ListAssetLibrariesResponse,
 )
-from fastapi import APIRouter, Depends, HTTPException, Query, status
+from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
 
 from packages.application import (
     CreateAssetLibraryCommand,
@@ -22,18 +22,11 @@ from packages.application import (
 )
 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,
@@ -153,7 +146,7 @@ def ensure_default_library(
     return _to_asset_library_response(created)
 
 
-@router.delete("/{library_id}", status_code=status.HTTP_204_NO_CONTENT)
+@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),
@@ -168,13 +161,12 @@ def delete_asset_library(
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="素材库不存在")
 
     # 权限校验：检查用户是否有项目访问权限
-    _check_project_access(library.project_id, authenticated_user.user.id, project_repository)
+    check_project_access(library.project_id, authenticated_user.user.id, project_repository)
 
-    # 删除库内所有素材（无 FK 级联，需手动清理）
+    # 删除库内所有素材（硬删除，素材库已删除，无需保留软删除状态）
     assets_in_library = asset_repository.find_by_library(library_id)
-    if assets_in_library:
-        asset_ids_to_delete = [a.id for a in assets_in_library]
-        asset_repository.batch_delete(asset_ids_to_delete)
+    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,6 +1,7 @@
 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 (
@@ -11,15 +12,18 @@ from app.dependencies import (
 )
 from app.schemas.asset import (
     AssetResponse,
+    BatchClassifyRequest,
     BatchDeleteRequest,
-    BatchDeleteResponse,
+    BatchMarkRequest,
+    BatchOperationResponse,
+    BatchTagRequest,
     CreateAssetRequest,
     ListAssetsResponse,
     UpdateAssetRequest,
     UpdateAssetReviewRequest,
 )
 from app.schemas.tag import TagAssetsRequest
-from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi import APIRouter, Depends, HTTPException, Query, Response
 
 from packages.application import (
     CreateAssetCommand,
@@ -67,20 +71,12 @@ def _to_asset_response(item, storage_service=None) -> 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: Optional[str] = Query(None),
@@ -90,6 +86,21 @@ def list_assets(
     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),
@@ -99,6 +110,26 @@ def list_assets(
 ) -> ListAssetsResponse:
     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"}
 
@@ -109,11 +140,11 @@ def list_assets(
         if not filter_tag_ids:
             filter_tag_ids = None
 
-    # 需要内存过滤的标志（keyword/gender/style/tag_ids 无法在 DB 层过滤）
-    needs_memory_filter = bool(keyword or gender or style or filter_tag_ids)
+    # 需要内存过滤的标志（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 内存过滤。"""
+        """应用 keyword / gender / style / tag_ids / smart_view / classification 内存过滤。"""
         result = items
         if keyword:
             kw = keyword.lower()
@@ -122,9 +153,38 @@ def list_assets(
             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 级分页 ──
@@ -136,13 +196,15 @@ def list_assets(
             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)
+            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)
-                total = asset_repository.count_by_project(library.project_id) if not kind else len(items)
+                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)
-                total = asset_repository.count_by_project(library.project_id)
+                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,
@@ -152,16 +214,16 @@ def list_assets(
 
         # 模式2：指定 project_id
         if project_id:
-            _check_project_access(project_id, user_id, project_repository)
+            check_project_access(project_id, user_id, project_repository)
             if ft:
-                # 无直接方法，加载后按 file_type 过滤（仍比全量加载好）
-                all_items = asset_repository.find_by_project(project_id)
-                items = [i for i in all_items if i.mime_type and i.mime_type.startswith(ft)]
-                total = len(items)
-                paged = items[skip : skip + limit]
+                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)
-                total = asset_repository.count_by_project(project_id)
+                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],
@@ -181,22 +243,43 @@ def list_assets(
         if not project_ids:
             return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
 
-        total = asset_repository.count_by_project_ids(project_ids)
-        # 跨项目分页：逐项目累积直到凑够一页
-        paged_items: list = []
-        offset = skip
-        remaining = limit
-        for pid in project_ids:
-            proj_total = asset_repository.count_by_project(pid)
-            if offset >= proj_total:
-                offset -= proj_total
-                continue
-            proj_items = asset_repository.find_by_project(pid, skip=offset, limit=remaining)
-            paged_items.extend(proj_items)
-            remaining -= len(proj_items)
-            offset = 0
-            if remaining <= 0:
-                break
+        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],
@@ -210,14 +293,23 @@ def list_assets(
         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)
+        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])
+            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)
+            all_items = asset_repository.find_by_library(library_id, status=status_list)
     elif project_id:
-        _check_project_access(project_id, user_id, project_repository)
-        all_items = asset_repository.find_by_project(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)
@@ -226,12 +318,18 @@ def list_assets(
             return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
         all_items = []
         for proj in projects:
-            all_items.extend(asset_repository.find_by_project(proj.id))
+            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)
-        all_items = [i for i in all_items if i.mime_type and i.mime_type.startswith(ft or "")]
+        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]
@@ -262,39 +360,163 @@ 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=BatchDeleteResponse)
+@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),
-) -> BatchDeleteResponse:
-    """批量删除素材（配音素材等），需逐项校验项目权限。"""
+) -> BatchOperationResponse:
+    """批量删除素材（软删除，标记 status=deleted），需逐项校验项目权限。"""
     user_id = authenticated_user.user.id
-    deleted_ids: list[str] = []
-    failed_ids: list[str] = []
+    success_ids: list[str] = []
+    failed_details: dict[str, str] = {}
 
-    for asset_id in request.ids:
+    for asset_id in request.asset_ids:
         item = asset_repository.find_by_id(asset_id)
         if item is None:
-            failed_ids.append(asset_id)
+            failed_details[asset_id] = "not_found"
             continue
         try:
-            _check_project_access(item.project_id, user_id, project_repository)
-            deleted_ids.append(asset_id)
+            check_project_access(item.project_id, user_id, project_repository)
+            success_ids.append(asset_id)
         except HTTPException:
-            failed_ids.append(asset_id)
+            failed_details[asset_id] = "access_denied"
 
-    if deleted_ids:
-        asset_repository.batch_delete(deleted_ids)
+    if success_ids:
+        asset_repository.batch_delete(success_ids)
 
-    return BatchDeleteResponse(deleted_count=len(deleted_ids), failed_ids=failed_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)
@@ -307,7 +529,7 @@ def get_asset(
     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)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
     return _to_asset_response(item)
 
 
@@ -322,7 +544,7 @@ def update_asset(
     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)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
 
     # 合并可修改字段
     if request.name is not None:
@@ -336,7 +558,7 @@ def update_asset(
     return _to_asset_response(updated)
 
 
-@router.delete("/{asset_id}", status_code=204)
+@router.delete("/{asset_id}", status_code=204, response_class=Response)
 def delete_asset(
     asset_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -346,7 +568,7 @@ def delete_asset(
     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)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
     asset_repository.delete(asset_id)
 
 
@@ -363,7 +585,7 @@ def tag_asset(
     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)
+    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:
@@ -375,7 +597,7 @@ def tag_asset(
     return _to_asset_response(updated)
 
 
-@router.delete("/{asset_id}/tags/{tag_id}", status_code=204)
+@router.delete("/{asset_id}/tags/{tag_id}", status_code=204, response_class=Response)
 def untag_asset(
     asset_id: str,
     tag_id: str,
@@ -387,7 +609,7 @@ def untag_asset(
     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)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
     item.remove_tag(tag_id)
     asset_repository.update(item)
 

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

@@ -81,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):
@@ -105,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,
@@ -136,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,
@@ -162,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,
@@ -194,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)
 
 
@@ -202,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,
@@ -223,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)
     )
@@ -241,9 +244,8 @@ async def reset_password(
 async def logout(
     credentials: HTTPAuthorizationCredentials | None = Depends(bearer_scheme),
     current_user: AuthenticatedUser = Depends(get_current_user),
-):
+) -> MessageResponse:
     """登出 - 将当前 token 加入黑名单"""
-    from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
     if credentials:
         try:
@@ -258,14 +260,18 @@ async def logout(
 @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,
     )
 
 
@@ -324,7 +330,7 @@ def _get_internal_api_keys() -> list[str]:
             if content:
                 return [k.strip() for k in content.split(",") if k.strip()]
     except Exception:
-        logger.debug("Failed to read internal API keys from file", exc_info=True)
+        logger.warning("无法读取内部 API 密钥文件，仅依赖环境变量配置", exc_info=True)
 
     return []
 
@@ -355,7 +361,7 @@ async def wechat_sync(
     request: WechatSyncRequest,
     user_repository: UserRepository = Depends(get_user_repository),
     _: bool = Depends(_verify_internal_api_key),
-):
+) -> WechatSyncResponse:
     """
     微信同步登录/注册（系统级内部接口）
 
@@ -381,3 +387,202 @@ async def wechat_sync(
         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

@@ -13,8 +13,8 @@ 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 (
@@ -113,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)
@@ -206,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:
@@ -221,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,

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, response_model=None)
+@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_templates.py

@@ -1,289 +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.config_schemas import normalize_template_config
-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="模板类型")
-    editing_mode: str = Field(
-        default="one_take", max_length=20, description="剪辑模式: one_take/pip/voice_over/voice_pip"
-    )
-    config: dict[str, Any] = Field(default_factory=dict, description="模板配置 (JSON)")
-    preview_url: str = Field(default="", max_length=500, description="预览地址")
-    sort_weight: int = Field(default=0, ge=0, le=9999, description="排序权重")
-
-
-class EditTemplateUpdateRequest(BaseModel):
-    """更新模板请求体"""
-
-    name: Optional[str] = Field(default=None, min_length=1, max_length=200, description="模板名称")
-    description: Optional[str] = Field(default=None, max_length=2000, description="模板描述")
-    template_type: Optional[str] = Field(default=None, max_length=50, description="模板类型")
-    editing_mode: Optional[str] = Field(
-        default=None, max_length=20, description="剪辑模式: one_take/pip/voice_over/voice_pip"
-    )
-    config: Optional[dict[str, Any]] = Field(default=None, description="模板配置 (JSON)")
-    preview_url: Optional[str] = Field(default=None, max_length=500, description="预览地址")
-    sort_weight: Optional[int] = Field(default=None, ge=0, le=9999, description="排序权重")
-    status: Optional[str] = Field(default=None, description="状态: active / inactive")
-
-
-class EditTemplateResponse(BaseModel):
-    """模板响应体"""
-
-    id: str
-    name: str
-    description: str
-    template_type: str
-    editing_mode: 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 _require_admin(current_user: AuthenticatedUser) -> None:
-    """校验当前用户是否为管理员，非管理员返回 403"""
-    if not getattr(current_user.user, "is_admin", False):
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="仅管理员可执行此操作",
-        )
-
-
-def _to_response(t: EditTemplate) -> EditTemplateResponse:
-    return EditTemplateResponse(
-        id=t.id,
-        name=t.name,
-        description=t.description,
-        template_type=t.template_type,
-        editing_mode=t.editing_mode,
-        config=t.config,
-        preview_url=t.preview_url,
-        sort_weight=t.sort_weight,
-        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:
-    """创建模板（管理员）"""
-    _require_admin(current_user)
-    svc = EditTemplateService(db)
-    # 标准化 config，填充 cover/title/subtitle/bgm 默认值
-    normalized_config = normalize_template_config(body.config)
-    try:
-        created = svc.create_template(
-            name=body.name,
-            description=body.description,
-            template_type=body.template_type,
-            editing_mode=body.editing_mode,
-            config=normalized_config,
-            preview_url=body.preview_url,
-            sort_weight=body.sort_weight,
-        )
-    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:
-    """更新模板"""
-    _require_admin(current_user)
-    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",
-            )
-
-    # 标准化 config（如果提供了）
-    config_to_update = normalize_template_config(body.config) if body.config is not None else None
-
-    try:
-        result = svc.update_template(
-            template_id,
-            name=body.name,
-            description=body.description,
-            template_type=body.template_type,
-            editing_mode=body.editing_mode,
-            config=config_to_update,
-            preview_url=body.preview_url,
-            sort_weight=body.sort_weight,
-            status=status_enum,
-        )
-    except ValueError as exc:
-        err_msg = str(exc)
-        if "不存在" in err_msg:
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND,
-                detail=err_msg,
-            )
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=err_msg,
-        )
-    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, response_model=None)
-def delete_template(
-    template_id: str,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> Response:
-    """删除模板（软删除 → 设为 inactive）"""
-    _require_admin(current_user)
-    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

@@ -19,11 +19,10 @@ from typing import Optional
 
 from app.api.routes.auth import _verify_internal_api_key
 from app.config import settings
-from fastapi import APIRouter, Depends, HTTPException, Query, status
+from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
 from pydantic import BaseModel, Field
 
 from packages.adapters.redis.feature_flag_store import (
-    FEATURE_FLAG_REDIS_PREFIX,
     FeatureFlagConfig,
     RedisFeatureFlagStore,
 )
@@ -33,9 +32,7 @@ logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/internal/feature-flags", tags=["Internal"])
 
 # 允许管理的 flag 白名单（防止误操作其他系统 flag）
-ALLOWED_FLAGS = {
-    "render_engine",
-}
+ALLOWED_FLAGS: set[str] = set()
 
 
 def _get_feature_flag_store() -> RedisFeatureFlagStore:
@@ -90,7 +87,7 @@ def _validate_flag_name(name: str) -> None:
 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()
@@ -106,7 +103,7 @@ async def list_feature_flags(
         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}")
+        raise HTTPException(status_code=500, detail=f"Failed to list flags: {exc}") from exc
 
 
 @router.get("/{name}", response_model=FeatureFlagResponse)
@@ -114,14 +111,14 @@ 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}")
+        raise HTTPException(status_code=500, detail=f"Failed to get flag: {exc}") from exc
 
 
 @router.get("/{name}/check", response_model=FeatureFlagCheckResponse)
@@ -130,14 +127,14 @@ async def check_feature_flag(
     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}")
+        raise HTTPException(status_code=500, detail=f"Failed to check flag: {exc}") from exc
 
 
 @router.put("/{name}", response_model=FeatureFlagResponse)
@@ -146,7 +143,7 @@ async def update_feature_flag(
     request: FeatureFlagUpdateRequest,
     _: bool = Depends(_verify_internal_api_key),
     store: RedisFeatureFlagStore = Depends(_get_feature_flag_store),
-):
+) -> FeatureFlagResponse:
     """更新 Feature Flag 配置。
 
     只允许修改 ALLOWED_FLAGS 列表中的 flag。
@@ -171,10 +168,10 @@ async def update_feature_flag(
         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}")
+        raise HTTPException(status_code=500, detail=f"Failed to update flag: {exc}") from exc
 
 
-@router.delete("/{name}", status_code=status.HTTP_204_NO_CONTENT)
+@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),
@@ -189,7 +186,7 @@ async def delete_feature_flag(
     try:
         deleted = store.delete(name)
         logger.info("Feature flag deleted: name=%s deleted=%s", name, deleted)
-        return None
+        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}")
+        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

@@ -3,6 +3,7 @@ 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.storage import OSSStorageService, get_storage_service
 from app.core.task_enqueue import (
@@ -10,7 +11,6 @@ from app.core.task_enqueue import (
     USER_PENDING_LIMIT,
     GlobalQueueFull,
     UserPendingLimitExceeded,
-    check_queue_limits,
     safe_enqueue_generation_task,
 )
 from app.dependencies import (
@@ -30,6 +30,7 @@ from app.schemas.generation_task import (
     GenerationTaskResponse,
     ListGenerationTasksResponse,
 )
+from app.services.smart_asset_selector import SmartAssetSelector
 from fastapi import APIRouter, Depends, HTTPException
 
 from packages.application import (
@@ -43,14 +44,6 @@ 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(
@@ -66,6 +59,8 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
         source_edit_plan_id=task.source_edit_plan_id or "",
         asset_select_mode=getattr(task, "asset_select_mode", ""),
         batch_id=getattr(task, "batch_id", ""),
+        video_title=getattr(task, "video_title", ""),
+        resolution=getattr(task, "resolution", ""),
         logs=getattr(task, "logs", "[]"),
         status=task.status,
         progress=task.progress,
@@ -111,7 +106,7 @@ def _select_assets_from_library(
 
     Args:
         assets: 素材库中所有素材（Asset 实体列表）
-        mode: 选取模式 — all=全部, random=随机, smart=按质量评分
+        mode: 选取模式 — all=全部, random=随机, smart=智能匹配（多维度评分+多样性）
         count: 选取数量，0 表示全部（仅 random/smart 模式有效）
 
     Returns:
@@ -129,17 +124,19 @@ def _select_assets_from_library(
         return [a.id for a in selected]
 
     if mode == "smart":
-        # 按质量分降序排列（质量分高的优先），质量分相同时按时长降序
-        sorted_assets = sorted(
+        # 智能匹配：按质量分降序 + 时长降序作为tiebreaker
+        # 注意：这里使用简单的 quality_score 排序保持向后兼容
+        # 更复杂的4维评分+多样性策略由 SmartAssetSelector 服务提供（用于 AI 精选等场景）
+        scored_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,
+                -(a.quality_score if a.quality_score is not None else 0.0),
+                -(getattr(a, "duration", 0.0) or 0.0),
             ),
-            reverse=True,
         )
-        selected = sorted_assets if count <= 0 else sorted_assets[:count]
-        return [a.id for a in selected]
+        if count > 0:
+            scored_assets = scored_assets[:count]
+        return [a.id for a in scored_assets]
 
     # 默认 all 模式：返回全部 ready 视频素材
     return [a.id for a in ready_video_assets]
@@ -230,6 +227,20 @@ def create_generation_task(
                 mode=request.asset_select_mode,
                 count=request.asset_select_count,
             )
+    elif project_id and not resolved_asset_ids and request.asset_select_mode in ("random", "smart"):
+        # 项目级模式：未指定 asset_ids 且选择了 random/smart 模式时，也自动选取
+        assets = asset_repository.find_by_project(project_id)
+        if assets:
+            resolved_asset_ids = _select_assets_from_library(
+                assets,
+                mode=request.asset_select_mode,
+                count=request.asset_select_count,
+            )
+            if not resolved_asset_ids:
+                raise HTTPException(
+                    status_code=422,
+                    detail="当前项目没有符合条件的视频素材，请先上传并等待导入完成后再生成。",
+                )
 
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
     count = request.count
@@ -276,6 +287,10 @@ def create_generation_task(
                     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,
+                    resolution=request.resolution,
+                    auto_retry_enabled=request.auto_retry_enabled,
+                    auto_retry_max=request.auto_retry_max,
                 )
             )
             try:
@@ -289,28 +304,28 @@ def create_generation_task(
                     created_tasks.append(task)
                 else:
                     failed_tasks.append(task)
-            except UserPendingLimitExceeded:
+            except UserPendingLimitExceeded as _e:
                 # 兜底：如果预检查后又并发提交了，在这里也拦住
                 failed_tasks.append(task)
                 if not created_tasks:
                     raise HTTPException(
                         status_code=429,
                         detail="您的待处理任务过多，请等待完成后再提交",
-                    )
+                    ) from _e
                 break
-            except GlobalQueueFull:
+            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="创建生成任务失败，请稍后重试或查看任务日志")
+        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))
@@ -339,7 +354,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)
 
 
@@ -356,7 +371,7 @@ def list_generation_results(
     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)
     responses = []
@@ -411,6 +426,8 @@ def retry_generation_task(
             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", ""),
+            resolution=getattr(task, "resolution", ""),
         )
     )
     try:
@@ -433,3 +450,53 @@ def retry_generation_task(
             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/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,332 +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 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/projects.py

@@ -7,7 +7,7 @@ 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,
@@ -72,20 +72,20 @@ def create_project(
     return _to_project_response(project)
 
 
-@router.delete("/{project_id}")
+@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:
+    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 {"message": "Project deleted successfully"}
+    return  # type: ignore[return-value]

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

@@ -1,212 +0,0 @@
-"""Recipe CRUD + use routes."""
-
-from __future__ import annotations
-
-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, response_model=None)
-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/share.py

@@ -0,0 +1,298 @@
+"""视频分享 API 路由."""
+
+from __future__ import annotations
+
+import logging
+from typing import Optional
+
+from app.api.routes._helpers import format_utc_datetime
+from app.auth import AuthenticatedUser, get_current_user
+from app.core.storage import OSSStorageService, get_storage_service
+from app.dependencies import get_db_session, get_generated_video_repository
+from app.schemas.video_share import (
+    CreateShareRequest,
+    ShareAccessResponse,
+    ShareListResponse,
+    ShareMetaResponse,
+    ShareResponse,
+    UpdateShareRequest,
+    VerifySharePasswordRequest,
+)
+from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
+from sqlalchemy.orm import Session
+
+from packages.adapters.sqlalchemy_impl.video_share_repository import (
+    SQLAlchemyVideoShareRepository,
+)
+from packages.application.video_share.commands import (
+    CreateShareCommand,
+    UpdateShareCommand,
+)
+from packages.application.video_share.use_cases import (
+    AccessShareUseCase,
+    CreateShareUseCase,
+    GetShareByTokenUseCase,
+    InvalidPasswordError,
+    ListSharesByUserUseCase,
+    ListSharesByVideoUseCase,
+    NotFoundError,
+    PasswordRequiredError,
+    RecordShareDownloadUseCase,
+    RevokeShareUseCase,
+    ShareExpiredError,
+    UpdateShareUseCase,
+    VideoNotFoundError,
+)
+from packages.ports.generated_video_repository import GeneratedVideoRepository
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter()
+
+
+def _get_share_repository(
+    session: Session = Depends(get_db_session),
+) -> SQLAlchemyVideoShareRepository:
+    return SQLAlchemyVideoShareRepository(session)
+
+
+def _to_share_response(share) -> ShareResponse:
+    return ShareResponse(
+        id=share.id,
+        video_id=share.video_id,
+        share_token=share.share_token,
+        has_password=share.has_password,
+        expires_at=share.expires_at,
+        view_count=share.view_count,
+        download_count=share.download_count,
+        is_active=share.is_active,
+        created_at=format_utc_datetime(share.created_at),
+        updated_at=format_utc_datetime(share.updated_at),
+    )
+
+
+# ── 用户侧：创建/管理分享 ──────────────────────────────────
+
+
+@router.post("/videos/{video_id}/share", response_model=ShareResponse)
+def create_share(
+    video_id: str,
+    request: CreateShareRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
+    video_repo: GeneratedVideoRepository = Depends(get_generated_video_repository),
+) -> ShareResponse:
+    """为视频创建分享链接."""
+    use_case = CreateShareUseCase(share_repo, video_repo)
+    try:
+        share = use_case.execute(
+            CreateShareCommand(
+                video_id=video_id,
+                user_id=authenticated_user.user.id,
+                password=request.password,
+                expires_at=request.expires_at,
+            )
+        )
+    except VideoNotFoundError as e:
+        raise HTTPException(status_code=404, detail=str(e)) from e
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e)) from e
+
+    logger.info(
+        "Share created: video_id=%s share_id=%s token=%s user=%s",
+        video_id,
+        share.id,
+        share.share_token,
+        authenticated_user.user.id,
+    )
+    return _to_share_response(share)
+
+
+@router.get("/videos/{video_id}/shares", response_model=ShareListResponse)
+def list_video_shares(
+    video_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
+) -> ShareListResponse:
+    """获取某个视频的所有分享记录."""
+    use_case = ListSharesByVideoUseCase(share_repo)
+    items = use_case.execute(video_id, authenticated_user.user.id)
+    return ShareListResponse(
+        items=[_to_share_response(s) for s in items],
+        total=len(items),
+        skip=0,
+        limit=len(items),
+    )
+
+
+@router.get("/shares", response_model=ShareListResponse)
+def list_user_shares(
+    skip: int = Query(0, ge=0),
+    limit: int = Query(20, ge=1, le=100),
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
+) -> ShareListResponse:
+    """获取用户创建的所有分享记录."""
+    use_case = ListSharesByUserUseCase(share_repo)
+    items, total = use_case.execute(authenticated_user.user.id, skip=skip, limit=limit)
+    return ShareListResponse(
+        items=[_to_share_response(s) for s in items],
+        total=total,
+        skip=skip,
+        limit=limit,
+    )
+
+
+@router.patch("/shares/{share_id}", response_model=ShareResponse)
+def update_share(
+    share_id: str,
+    request: UpdateShareRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
+) -> ShareResponse:
+    """更新分享配置（密码、有效期等）."""
+    use_case = UpdateShareUseCase(share_repo)
+    try:
+        share = use_case.execute(
+            UpdateShareCommand(
+                share_id=share_id,
+                user_id=authenticated_user.user.id,
+                password=request.password,
+                expires_at=request.expires_at,
+            )
+        )
+    except NotFoundError as e:
+        raise HTTPException(status_code=404, detail=str(e)) from e
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e)) from e
+    return _to_share_response(share)
+
+
+@router.delete(
+    "/shares/{share_id}",
+    status_code=status.HTTP_204_NO_CONTENT,
+    response_model=None,
+    response_class=Response,
+)
+def revoke_share(
+    share_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
+) -> Response:
+    """撤销/删除分享链接."""
+    use_case = RevokeShareUseCase(share_repo)
+    try:
+        use_case.execute(share_id, authenticated_user.user.id)
+    except NotFoundError as e:
+        raise HTTPException(status_code=404, detail=str(e)) from e
+    return Response(status_code=status.HTTP_204_NO_CONTENT)
+
+
+# ── 公开侧：访问分享内容（无需登录） ──────────────────────
+
+
+@router.get("/share/{token}/meta", response_model=ShareMetaResponse)
+def get_share_meta(
+    token: str,
+    share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
+    video_repo: GeneratedVideoRepository = Depends(get_generated_video_repository),
+    storage: OSSStorageService = Depends(get_storage_service),
+) -> ShareMetaResponse:
+    """获取分享元信息（不需要密码，用于分享页加载前判断）。"""
+    use_case = GetShareByTokenUseCase(share_repo)
+    try:
+        share = use_case.execute(token)
+    except (NotFoundError, ShareExpiredError) as e:
+        raise HTTPException(status_code=404, detail="分享链接不存在或已失效") from e
+
+    video = video_repo.get(share.video_id)
+    video_name = video.name if video else ""
+    video_duration = video.duration if video else 0.0
+    thumbnail_url = None
+    if video and video.thumbnail_url:
+        try:
+            thumbnail_url = storage.get_download_url(video.thumbnail_url)
+        except Exception:
+            thumbnail_url = video.thumbnail_url
+
+    return ShareMetaResponse(
+        share_token=share.share_token,
+        has_password=share.has_password,
+        is_expired=share.is_expired,
+        is_active=share.is_active,
+        video_name=video_name,
+        video_duration=video_duration,
+        thumbnail_url=thumbnail_url,
+        created_at=format_utc_datetime(share.created_at),
+    )
+
+
+@router.post("/share/{token}/access", response_model=ShareAccessResponse)
+def access_share(
+    token: str,
+    request: Optional[VerifySharePasswordRequest] = None,
+    share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
+    video_repo: GeneratedVideoRepository = Depends(get_generated_video_repository),
+    storage: OSSStorageService = Depends(get_storage_service),
+) -> ShareAccessResponse:
+    """访问分享内容（验证密码后返回视频信息+播放/下载地址）。"""
+    use_case = AccessShareUseCase(share_repo, video_repo)
+    password = request.password if request else None
+    try:
+        result = use_case.execute(token, password=password)
+    except NotFoundError as e:
+        raise HTTPException(status_code=404, detail="分享链接不存在或已失效") from e
+    except ShareExpiredError as e:
+        raise HTTPException(status_code=410, detail="分享链接已过期或已撤销") from e
+    except PasswordRequiredError as e:
+        raise HTTPException(status_code=403, detail="需要访问密码") from e
+    except InvalidPasswordError as e:
+        raise HTTPException(status_code=403, detail="密码错误") from e
+    except VideoNotFoundError as e:
+        raise HTTPException(status_code=404, detail="视频不存在") from e
+
+    # 生成下载URL
+    download_url = None
+    if result.video.file_url:
+        try:
+            download_url = storage.get_download_url(result.video.file_url)
+        except Exception:
+            download_url = result.video.file_url
+
+    # 缩略图URL
+    thumbnail_url = None
+    if result.video.thumbnail_url:
+        try:
+            thumbnail_url = storage.get_download_url(result.video.thumbnail_url)
+        except Exception:
+            thumbnail_url = result.video.thumbnail_url
+
+    return ShareAccessResponse(
+        share=_to_share_response(result.share),
+        video_name=result.video.name,
+        video_duration=result.video.duration,
+        video_size=result.video.file_size,
+        thumbnail_url=thumbnail_url,
+        download_url=download_url,
+        password_verified=result.password_verified,
+    )
+
+
+@router.post("/share/{token}/download")
+def record_share_download(
+    token: str,
+    request: Optional[VerifySharePasswordRequest] = None,
+    share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
+) -> dict:
+    """记录分享下载（下载计数+1）。"""
+    use_case = RecordShareDownloadUseCase(share_repo)
+    password = request.password if request else None
+    try:
+        use_case.execute(token, password=password)
+    except NotFoundError as e:
+        raise HTTPException(status_code=404, detail="分享链接不存在或已失效") from e
+    except ShareExpiredError as e:
+        raise HTTPException(status_code=410, detail="分享链接已过期或已撤销") from e
+    except InvalidPasswordError as e:
+        raise HTTPException(status_code=403, detail="密码错误") from e
+    return {"success": True}

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,7 +103,7 @@ 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]:
     """获取账单记录列表"""
     from packages.adapters.sqlalchemy_impl.billing_repository import SQLAlchemyBillingRepository
     from packages.adapters.sqlalchemy_impl.session import SessionLocal
@@ -134,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"}
@@ -186,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":
@@ -212,7 +215,7 @@ async def payment_callback(
     amount: float,
     payment_method: str = "alipay",
     payment_id: str = "",
-):
+) -> dict:
     """支付回调 - 在事务中更新账单和订阅状态
 
     注意：生产环境需要验证支付签名
@@ -232,7 +235,7 @@ async def payment_callback(
 
         # 创建账单记录
         record_id = uuid.uuid4().hex
-        record = repo.create(
+        repo.create(
             {
                 "id": record_id,
                 "user_id": user_id,
@@ -254,7 +257,9 @@ async def payment_callback(
         return {"success": True, "message": "支付成功", "record_id": record_id}
     except Exception as e:
         session.rollback()
-        raise HTTPException(status_code=500, detail=f"支付处理失败: {str(e)}")
+        logger.error(f"支付回调处理失败: user_id={user_id}, plan={plan}, error={e}")
+        # 不返回原始异常信息，避免泄漏内部实现细节
+        raise HTTPException(status_code=500, detail="支付处理失败，请稍后重试") from e
     finally:
         session.close()
 
@@ -263,7 +268,7 @@ async def payment_callback(
 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

@@ -10,7 +10,7 @@ from app.schemas.tag import (
     ListTagsResponse,
     TagResponse,
 )
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, Response
 
 from packages.domain import Tag
 
@@ -52,7 +52,7 @@ def create_tag(
     return TagResponse(id=created.id, name=created.name, created_at=created.created_at)
 
 
-@router.delete("/{tag_id}", status_code=204)
+@router.delete("/{tag_id}", status_code=204, response_class=Response)
 def delete_tag(
     tag_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),

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

@@ -1,6 +1,7 @@
 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 (
@@ -21,11 +22,10 @@ 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,
 )
@@ -34,6 +34,10 @@ 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()
     if not raw:
@@ -63,6 +67,8 @@ def _generation_step(task) -> str:
         return "生成完成"
     if s == "failed":
         return "生成失败"
+    if s == "cancelled":
+        return "已取消"
     return s
 
 
@@ -79,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}",
@@ -88,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)
@@ -139,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")
@@ -149,6 +203,7 @@ def retry_task_by_id(
         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()
@@ -163,20 +218,11 @@ def retry_task_by_id(
             detail="系统繁忙，请稍后再试",
         )
 
-    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=user_id,
-        )
-    )
+    # 原地重试
+    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="[任务中心]"
@@ -192,18 +238,8 @@ def retry_task_by_id(
             status_code=503,
             detail="系统繁忙，请稍后再试",
         ) from None
-    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,
-    )
+
+    return _generation_task_to_user_response(retried)
 
 
 # ── 项目级端点 ──
@@ -212,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)
@@ -253,6 +316,7 @@ 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:
@@ -261,6 +325,7 @@ def retry_project_task(
             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()
@@ -275,20 +340,10 @@ def retry_project_task(
                 detail="系统繁忙，请稍后再试",
             )
 
-        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=user_id,
-            )
-        )
+        # 原地重试
+        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="[任务中心]"
@@ -305,15 +360,16 @@ def retry_project_task(
                 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,
@@ -328,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

@@ -8,13 +8,16 @@ 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,
@@ -27,19 +30,24 @@ 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,
@@ -67,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,
@@ -81,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,
     )
@@ -93,19 +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
     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)
-        total = template_repository.count_by_user(user_id)
+        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,
     )
 
@@ -120,12 +146,13 @@ def get_template(
     try:
         use_case = GetTemplateUseCase(template_repository)
         template = use_case.execute(template_id, user_id)
-    except Exception:
+        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="模板查询失败")
+        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)
@@ -159,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)
 
 
@@ -199,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, response_model=None)
+@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),
@@ -217,7 +244,48 @@ 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)
@@ -231,9 +299,9 @@ def toggle_favorite(
     use_case = GetTemplateUseCase(template_repository)
     try:
         template = use_case.execute(template_id, user_id)
-    except Exception:
+    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")
+        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)
@@ -258,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),
@@ -307,7 +375,9 @@ def create_category(
     )
 
 
-@router.delete("/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None)
+@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),
@@ -319,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, response_model=None)
+@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

@@ -46,6 +46,7 @@ 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__)
@@ -53,6 +54,34 @@ 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)
 
@@ -207,8 +236,8 @@ def get_tts_job(
     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")
+    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)
 
 
@@ -224,8 +253,8 @@ def get_tts_job_status(
     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)
@@ -241,7 +270,7 @@ def get_tts_job_status(
     )
 
 
-@router.delete("/jobs/{job_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None)
+@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),
@@ -253,7 +282,7 @@ 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(
@@ -280,8 +309,8 @@ def save_tts_job_to_library(
     get_use_case = GetTTSJobUseCase(tts_repository)
     try:
         job = get_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
 
     # 校验已完成
     if not job.is_completed:
@@ -334,7 +363,7 @@ def save_tts_job_to_library(
         raise HTTPException(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=f"配音库配额已满（{exc.used}/{exc.limit}），请升级套餐",
-        )
+        ) from exc
 
     return SaveToLibraryResponse(
         id=item.id,
@@ -372,10 +401,10 @@ async def tts_websocket_stream(
         streaming_service = TTSStreamingService(cosyvoice_service)
         await streaming_service.synthesize_and_stream(websocket, params)
     except WebSocketDisconnect:
-        logger.info("WebSocket 客户端断开连接")
+        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:
-            pass
+        except Exception as send_err:
+            logger.warning("WebSocket 错误消息发送失败（连接可能已断开）: %s", send_err)

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

@@ -1,7 +1,8 @@
 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
@@ -17,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__)
 
@@ -80,21 +80,6 @@ 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,
@@ -135,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,
@@ -183,7 +168,7 @@ async def complete_direct_upload(
     storage_service: OSSStorageService = Depends(get_storage_service),
 ) -> DirectUploadCompleteResponse:
     """确认浏览器直传完成并创建导入任务。"""
-    _require_project_and_library(
+    require_project_and_library(
         request.project_id,
         request.library_id,
         project_repository,
@@ -252,7 +237,7 @@ async def upload_asset(
     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:

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,
 )
 
@@ -142,8 +141,8 @@ def get_voice_clone(
     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)
 
 
@@ -158,8 +157,8 @@ def get_voice_clone_status(
     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,
@@ -173,6 +172,7 @@ def get_voice_clone_status(
     "/{clone_id}",
     status_code=status.HTTP_204_NO_CONTENT,
     response_model=None,
+    response_class=Response,
 )
 def delete_voice_clone(
     clone_id: str,
@@ -185,7 +185,7 @@ def delete_voice_clone(
     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)
+    return
 
 
 @router.post("/{clone_id}/retry", response_model=VoiceCloneProfileResponse)
@@ -201,13 +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", "")

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_audio_url_signer, 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)
@@ -125,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"
-
-
 # ==================== 统一配音列表（预置 + 克隆）====================
 
 
@@ -222,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 端点（保持向后兼容）====================
 
 
@@ -271,7 +325,7 @@ def create_voice(
     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,
@@ -293,7 +347,7 @@ def create_voice(
         raise HTTPException(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=f"配音库配额已满（{exc.used}/{exc.limit}），请升级套餐",
-        )
+        ) from exc
     return _to_response(item, sign_url)
 
 
@@ -323,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")
+    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, response_model=None)
+@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),
@@ -339,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/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,7 +73,7 @@ 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"
@@ -106,7 +104,6 @@ class Settings(BaseSettings):
     )
     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

apps/api/app/core/__init__.py

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

apps/api/app/core/storage.py

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

apps/api/app/core/task_enqueue.py

@@ -141,7 +141,7 @@ def safe_enqueue_generation_task(
             global_pending_limit,
             user_id or "unknown",
         )
-        exc = GlobalQueueFull(pending_count=global_pending, limit=global_pending_limit)
+        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
 
@@ -194,7 +194,7 @@ def safe_enqueue_generation_task(
     if global_over or user_over:
         if global_over:
             reason = f"全局 pending 超限(入队后): {global_after}/{global_pending_limit}"
-            exc: Exception = GlobalQueueFull(pending_count=global_after, limit=global_pending_limit)
+            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)

apps/api/app/dependencies.py

@@ -50,20 +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.tag_repository import TagRepository
-from packages.ports.title_library_repository import TitleLibraryRepository
 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)
 
@@ -144,7 +132,7 @@ def get_tag_repository(
     session: Session = Depends(get_db_session),
 ) -> TagRepository:
     """Provide the SQLAlchemy tag repository implementation."""
-    return SQLAlchemyTagRepository(session)
+    return SQLAlchemyTagRepository(session)  # type: ignore[return-value]
 
 
 def get_user_repository(

apps/api/app/middleware/auth.py

@@ -7,12 +7,16 @@ 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

apps/api/app/middleware/logging.py

@@ -105,7 +105,7 @@ class RateLimitMiddleware(BaseHTTPMiddleware):
         self.max_requests = max_requests
         self.window_seconds = window_seconds
         self.paths = set(paths) if paths else None
-        self.requests = {}  # {ip: [timestamps]}
+        self.requests: dict[str, list[float]] = {}
 
     async def dispatch(self, request: Request, call_next):
         # 如果配置了路径过滤，只对指定路径限流

apps/api/app/middleware/monitoring.py

@@ -6,7 +6,7 @@ import logging
 import time
 from typing import Callable
 
-from fastapi import Request, Response
+from fastapi import Request
 from starlette.middleware.base import BaseHTTPMiddleware
 
 logger = logging.getLogger(__name__)

apps/api/app/middleware/versioning.py

@@ -61,7 +61,7 @@ class APIVersionMiddleware(BaseHTTPMiddleware):
 class VersionNotFoundMiddleware(BaseHTTPMiddleware):
     """处理已下线的 API 版本"""
 
-    SUNSET_VERSIONS = []  # 已下线的版本列表
+    SUNSET_VERSIONS: list[str] = []  # 已下线的版本列表
 
     async def dispatch(self, request: Request, call_next):
         version = self._extract_version(request.url.path)

apps/api/app/schemas/asset.py

@@ -50,21 +50,50 @@ class AssetResponse(BaseModel):
     status: str
     classification_status: str
     quality_score: float | None = None
+    created_at: str
     uploaded_by_user_id: str
     tag_ids: list[str] = Field(default_factory=list)
 
 
+MAX_BATCH_SIZE = 200
+
+
 class BatchDeleteRequest(BaseModel):
-    """批量删除请求。"""
+    """批量删除请求（软删除）。"""
 
-    ids: list[str] = Field(..., min_length=1, max_length=100, description="要删除的素材 ID 列表")
+    asset_ids: list[str] = Field(..., min_length=1, max_length=MAX_BATCH_SIZE, description="要删除的素材 ID 列表")
 
 
-class BatchDeleteResponse(BaseModel):
-    """批量删除响应。"""
+class BatchOperationResponse(BaseModel):
+    """批量操作通用响应。"""
 
-    deleted_count: int = Field(..., ge=0, description="实际删除数量")
-    failed_ids: list[str] = Field(default_factory=list, description="删除失败的 ID 列表")
+    success_count: int = Field(..., ge=0, description="成功数量")
+    failed_ids: list[str] = Field(default_factory=list, description="失败的 ID 列表")
+    failed_details: dict[str, str] = Field(default_factory=dict, description="失败详情 {asset_id: reason}")
+
+
+class BatchTagRequest(BaseModel):
+    """批量打标签请求。"""
+
+    asset_ids: list[str] = Field(..., min_length=1, max_length=MAX_BATCH_SIZE, description="素材 ID 列表")
+    tag_ids: list[str] = Field(..., min_length=1, max_length=50, description="标签 ID 列表")
+    mode: str = Field(default="add", pattern="^(add|replace)$", description="add=添加合并，replace=全量替换")
+
+
+class BatchClassifyRequest(BaseModel):
+    """批量修改分类请求。"""
+
+    asset_ids: list[str] = Field(..., min_length=1, max_length=MAX_BATCH_SIZE, description="素材 ID 列表")
+    category: str = Field(..., min_length=1, max_length=50, description="内容分类，如 person/scenic/product")
+
+
+class BatchMarkRequest(BaseModel):
+    """批量设置智能视图标记请求。"""
+
+    asset_ids: list[str] = Field(..., min_length=1, max_length=MAX_BATCH_SIZE, description="素材 ID 列表")
+    smart_view: str = Field(
+        ..., pattern="^(recommended|caution|high_risk)$", description="智能视图标记：recommended/caution/high_risk"
+    )
 
 
 class ListAssetsResponse(BaseModel):

apps/api/app/schemas/dashboard.py

@@ -1,32 +0,0 @@
-from datetime import datetime
-
-from pydantic import BaseModel, Field
-
-
-class RecentTaskItem(BaseModel):
-    id: str
-    task_type: str = "generation"
-    status: str
-    current_step: str = ""
-    error_message: str = ""
-    updated_at: datetime | None = None
-
-
-class SubscriptionInfo(BaseModel):
-    """用户订阅信息。"""
-
-    plan: str = "free"
-    is_active: bool = False
-
-
-class DashboardOverviewResponse(BaseModel):
-    """Dashboard 概览数据。"""
-
-    total_assets: int = 0
-    used_storage_bytes: int = 0
-    total_titles: int = 0
-    total_voices: int = 0
-    total_tasks: int = 0
-    total_products: int = 0
-    subscription: SubscriptionInfo = Field(default_factory=SubscriptionInfo)
-    recent_tasks: list[RecentTaskItem] = Field(default_factory=list)

apps/api/app/schemas/generation_task.py

@@ -23,6 +23,8 @@ class CreateGenerationTaskRequest(BaseModel):
     voice_ids: list[str] = Field(default_factory=list)
     # ── 来源剪辑计划 ──
     source_edit_plan_id: str = ""
+    # ── 视频标题 ──
+    video_title: str = Field(default="", description="生成视频的标题/名称，为空则使用默认命名")
     # ── 批量生成 ──
     count: int = Field(default=1, ge=1, le=50, description="批量生成数量，默认1，最大50")
     # ── 素材库自动匹配 ──
@@ -33,6 +35,22 @@ class CreateGenerationTaskRequest(BaseModel):
     asset_select_count: int = Field(
         default=0, ge=0, le=100, description="选取数量，0表示全部（仅 random/smart 模式有效）"
     )
+    # ── 自动重试 ──
+    auto_retry_enabled: bool = Field(
+        default=False,
+        description="是否开启失败自动重试，默认关闭",
+    )
+    auto_retry_max: int = Field(
+        default=0,
+        ge=0,
+        le=5,
+        description="最大自动重试次数，0表示不自动重试，最大5次",
+    )
+    # ── 输出分辨率 ──
+    resolution: str = Field(
+        default="",
+        description="输出分辨率，格式为 WIDTHxHEIGHT，如 1280x720、1080x1920。为空使用默认 1280x720",
+    )
 
     @model_validator(mode="after")
     def _check_at_least_one_mode(self) -> "CreateGenerationTaskRequest":
@@ -60,10 +78,16 @@ class GenerationTaskResponse(BaseModel):
     source_edit_plan_id: str = ""
     asset_select_mode: str = ""
     batch_id: str = ""
+    video_title: str = ""
+    resolution: str = ""
     status: str
     progress: float
     result_count: int
     error_message: str
+    error_info: dict = Field(default_factory=dict)
+    retry_count: int = 0
+    auto_retry_enabled: bool = False
+    auto_retry_max: int = 0
     logs: list[dict] = Field(default_factory=list)
 
     @field_validator("logs", mode="before")

apps/api/app/schemas/job.py

@@ -1,109 +0,0 @@
-"""Job API schemas — Phase 8 任务 2.10."""
-
-from __future__ import annotations
-
-from datetime import datetime
-from typing import Any, Optional
-
-from pydantic import BaseModel, Field
-
-
-class CreateJobRequest(BaseModel):
-    """创建任务请求体。"""
-
-    project_id: str = Field(..., min_length=1, description="项目 ID")
-    job_type: str = Field(
-        ...,
-        description="任务类型: video_compose / render_edit_plan / asset_ingest / classification / voice_extraction / generation",
-    )
-    payload: dict[str, Any] = Field(default_factory=dict, description="任务输入参数")
-    source_id: str = Field(default="", description="关联的业务实体 ID（如 edit_plan_id）")
-    max_retries: int = Field(default=3, ge=0, le=10, description="最大重试次数")
-
-
-class UpdateProgressRequest(BaseModel):
-    """更新任务进度请求体。"""
-
-    progress: float = Field(..., ge=0.0, le=100.0, description="进度百分比")
-    current_stage: str = Field(default="", description="当前阶段描述")
-
-
-class CompleteJobRequest(BaseModel):
-    """完成任务请求体。"""
-
-    result: dict[str, Any] = Field(default_factory=dict, description="任务结果")
-
-
-class FailJobRequest(BaseModel):
-    """标记任务失败请求体。"""
-
-    error_message: str = Field(..., min_length=1, description="错误信息")
-
-
-class JobResponse(BaseModel):
-    """任务响应体。"""
-
-    id: str
-    project_id: str
-    job_type: str
-    status: str
-    progress: float
-    current_stage: str
-    payload: dict[str, Any]
-    result: dict[str, Any]
-    error_message: str
-    retry_count: int
-    max_retries: int
-    celery_task_id: str
-    source_id: str
-    created_by_user_id: str
-    is_retryable: bool
-    started_at: Optional[datetime] = None
-    completed_at: Optional[datetime] = None
-    created_at: datetime
-    updated_at: datetime
-
-    model_config = {"from_attributes": True}
-
-
-class ListJobsResponse(BaseModel):
-    """任务列表响应体。"""
-
-    items: list[JobResponse]
-    total: int
-
-
-class JobStatisticsResponse(BaseModel):
-    """任务统计响应体。"""
-
-    project_id: str
-    total: int
-    pending: int
-    running: int
-    success: int
-    failed: int
-
-
-def job_to_response(job) -> JobResponse:
-    """将 Job 领域对象转换为 API 响应。"""
-    return JobResponse(
-        id=job.id,
-        project_id=job.project_id,
-        job_type=job.job_type.value if hasattr(job.job_type, "value") else str(job.job_type),
-        status=job.status.value if hasattr(job.status, "value") else str(job.status),
-        progress=job.progress,
-        current_stage=job.current_stage,
-        payload=job.payload,
-        result=job.result,
-        error_message=job.error_message,
-        retry_count=job.retry_count,
-        max_retries=job.max_retries,
-        celery_task_id=job.celery_task_id,
-        source_id=job.source_id,
-        created_by_user_id=job.created_by_user_id,
-        is_retryable=job.is_retryable,
-        started_at=job.started_at,
-        completed_at=job.completed_at,
-        created_at=job.created_at,
-        updated_at=job.updated_at,
-    )

apps/api/app/schemas/recipe.py

@@ -1,86 +0,0 @@
-"""Recipe API schemas."""
-
-from __future__ import annotations
-
-from datetime import datetime
-from typing import Any, Dict, List, Optional
-
-from pydantic import BaseModel, Field
-
-# ── Response ──
-
-
-class RecipeItemResponse(BaseModel):
-    id: str
-    recipe_id: str
-    item_type: str
-    item_id: str
-    position: int
-    metadata_: Dict[str, Any] = Field(default_factory=dict, alias="metadata")
-
-    class Config:
-        populate_by_name = True
-
-
-class RecipeResponse(BaseModel):
-    id: str
-    user_id: str
-    name: str
-    description: str = ""
-    template_id: str = ""
-    generation_params: Dict[str, Any] = Field(default_factory=dict)
-    items: List[RecipeItemResponse] = Field(default_factory=list)
-    is_active: bool = True
-    metadata_: Dict[str, Any] = Field(default_factory=dict, alias="metadata")
-    created_at: datetime
-    updated_at: datetime
-
-    class Config:
-        populate_by_name = True
-
-
-class ListRecipesResponse(BaseModel):
-    items: List[RecipeResponse]
-    total: int = 0
-
-
-class UseRecipeResponse(BaseModel):
-    recipe: RecipeResponse
-    warnings: List[Dict[str, Any]] = Field(default_factory=list)
-
-
-# ── Request ──
-
-
-class RecipeItemRequest(BaseModel):
-    item_type: str
-    item_id: str
-    position: int = 0
-    metadata_: Dict[str, Any] = Field(default_factory=dict, alias="metadata")
-
-    class Config:
-        populate_by_name = True
-
-
-class CreateRecipeRequest(BaseModel):
-    name: str
-    description: str = ""
-    template_id: str = ""
-    generation_params: Dict[str, Any] = Field(default_factory=dict)
-    items: List[RecipeItemRequest] = Field(default_factory=list)
-    metadata_: Dict[str, Any] = Field(default_factory=dict, alias="metadata")
-
-    class Config:
-        populate_by_name = True
-
-
-class UpdateRecipeRequest(BaseModel):
-    name: Optional[str] = None
-    description: Optional[str] = None
-    template_id: Optional[str] = None
-    generation_params: Optional[Dict[str, Any]] = None
-    items: Optional[List[RecipeItemRequest]] = None
-    metadata_: Optional[Dict[str, Any]] = Field(default=None, alias="metadata")
-
-    class Config:
-        populate_by_name = True

apps/api/app/schemas/subscription.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Optional
+from typing import Optional
 
 from pydantic import BaseModel, Field
 

apps/api/app/schemas/task_center.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from pydantic import BaseModel, Field
 
 
@@ -11,16 +9,19 @@ class ProjectTaskResponse(BaseModel):
     progress: float
     current_step: str
     error_message: str = ""
+    error_info: dict = Field(default_factory=dict)
     user_message: str = ""
     retryable: bool = False
+    retry_count: int = 0
     source_id: str = ""
     template_id: str = ""
-    created_at: datetime | None = None
-    updated_at: datetime | None = None
+    created_at: str = ""
+    updated_at: str = ""
 
 
 class ListProjectTasksResponse(BaseModel):
     items: list[ProjectTaskResponse] = Field(default_factory=list)
+    total: int = 0
 
 
 class UserTaskResponse(BaseModel):
@@ -34,14 +35,17 @@ class UserTaskResponse(BaseModel):
     progress: float
     current_step: str
     error_message: str = ""
+    error_info: dict = Field(default_factory=dict)
     user_message: str = ""
     retryable: bool = False
+    retry_count: int = 0
     source_id: str = ""
-    created_at: datetime | None = None
-    updated_at: datetime | None = None
+    created_at: str = ""
+    updated_at: str = ""
 
 
 class ListTasksResponse(BaseModel):
     """用户级任务列表响应（GET /api/v1/tasks）。"""
 
     items: list[UserTaskResponse] = Field(default_factory=list)
+    total: int = 0

apps/api/app/schemas/template.py

@@ -45,6 +45,7 @@ class TemplateResponse(BaseModel):
     segments: List[SegmentResponse] = Field(default_factory=list)
     is_active: bool = True
     is_favorite: bool = False
+    usage_count: int = 0
     created_at: datetime
     updated_at: datetime
 
@@ -120,3 +121,25 @@ class CreateCategoryRequest(BaseModel):
 
 class ListCategoriesResponse(BaseModel):
     items: List[CategoryResponse]
+
+
+# ── Copy Template ──
+
+
+class CopyTemplateRequest(BaseModel):
+    new_name: str
+
+
+# ── Tags ──
+
+
+class ListTagsResponse(BaseModel):
+    items: List[str]
+
+
+# ── Usage Stats ──
+
+
+class TemplateUsageResponse(BaseModel):
+    template_id: str
+    usage_count: int

apps/api/app/schemas/video_center.py

@@ -0,0 +1,58 @@
+from typing import Literal
+
+from pydantic import BaseModel, Field
+
+VideoReviewStatus = Literal["pending_review", "approved", "rejected"]
+
+
+class VideoItemResponse(BaseModel):
+    id: str
+    project_id: str
+    generation_task_id: str
+    name: str
+    file_url: str
+    file_size: int
+    duration: float
+    thumbnail_url: str | None = None
+    width: int
+    height: int
+    fps: float
+    status: str = "completed"
+    review_status: str = "pending_review"
+    generation_params: dict = Field(default_factory=dict)
+    download_url: str | None = None
+    generated_at: str = ""
+
+
+class ListVideosResponse(BaseModel):
+    items: list[VideoItemResponse]
+    total: int
+    page: int
+    page_size: int
+
+
+class UpdateVideoReviewRequest(BaseModel):
+    review_status: VideoReviewStatus
+
+
+MAX_BATCH_DELETE_SIZE = 200
+
+
+class BatchDeleteRequest(BaseModel):
+    video_ids: list[str] = Field(..., min_length=1, max_length=MAX_BATCH_DELETE_SIZE, description="要删除的成片ID列表")
+
+
+class BatchOperationResponse(BaseModel):
+    success_count: int = Field(..., ge=0, description="成功删除数量")
+    failed_ids: list[str] = Field(default_factory=list, description="失败的ID列表")
+    failed_details: dict[str, str] = Field(default_factory=dict, description="失败详情")
+
+
+class BatchDownloadRequest(BaseModel):
+    video_ids: list[str]
+
+
+class BatchDownloadResponse(BaseModel):
+    job_id: str
+    status: str = "pending"
+    download_url: str | None = None

apps/api/app/schemas/video_share.py

@@ -0,0 +1,92 @@
+"""视频分享相关 schemas."""
+
+from __future__ import annotations
+
+from datetime import datetime
+from typing import List, Optional
+
+from pydantic import BaseModel, Field
+
+
+class CreateShareRequest(BaseModel):
+    """创建分享请求."""
+
+    password: Optional[str] = Field(
+        None,
+        description="访问密码（可选，不设置则无需密码）",
+        min_length=0,
+        max_length=50,
+    )
+    expires_at: Optional[datetime] = Field(
+        None,
+        description="过期时间（可选，不设置则永久有效）",
+    )
+
+
+class UpdateShareRequest(BaseModel):
+    """更新分享配置请求."""
+
+    password: Optional[str] = Field(
+        None,
+        description="新密码（传空字符串清除密码，不传则不修改）",
+        max_length=50,
+    )
+    expires_at: Optional[datetime] = Field(
+        None,
+        description="新的过期时间（不传则不修改）",
+    )
+
+
+class VerifySharePasswordRequest(BaseModel):
+    """验证分享密码请求."""
+
+    password: str = Field(..., description="访问密码")
+
+
+class ShareResponse(BaseModel):
+    """分享记录响应."""
+
+    id: str
+    video_id: str
+    share_token: str
+    has_password: bool = False
+    expires_at: Optional[datetime] = None
+    view_count: int = 0
+    download_count: int = 0
+    is_active: bool = True
+    created_at: Optional[datetime] = None
+    updated_at: Optional[datetime] = None
+
+
+class ShareListResponse(BaseModel):
+    """分享列表响应."""
+
+    items: List[ShareResponse]
+    total: int = 0
+    skip: int = 0
+    limit: int = 20
+
+
+class ShareAccessResponse(BaseModel):
+    """分享访问成功响应（含视频信息）."""
+
+    share: ShareResponse
+    video_name: str
+    video_duration: float = 0.0
+    video_size: int = 0
+    thumbnail_url: Optional[str] = None
+    download_url: Optional[str] = None
+    password_verified: bool = True
+
+
+class ShareMetaResponse(BaseModel):
+    """分享元信息响应（访问前获取，用于判断是否需要密码）。"""
+
+    share_token: str
+    has_password: bool = False
+    is_expired: bool = False
+    is_active: bool = True
+    video_name: str = ""
+    video_duration: float = 0.0
+    thumbnail_url: Optional[str] = None
+    created_at: Optional[datetime] = None

apps/api/app/services/ai_service.py

@@ -0,0 +1,535 @@
+"""统一 AI 服务层 — 豆包大模型接入.
+
+提供基于字节跳动豆包大模型的 AI 能力：
+- 智能标题生成（爆款/情感/信息三种风格）
+- 后续扩展：智能素材匹配、AI 推荐片段编排等
+
+设计原则：
+1. 无 API Key 或调用失败时自动降级为本地模拟，不阻塞主流程
+2. 统一的客户端封装，新增能力只需加方法
+3. 所有模型相关配置集中在 Settings
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+import math
+import random
+from typing import Any, Dict, List, Optional
+
+from packages.shared.ai_client import get_doubao_client
+
+logger = logging.getLogger(__name__)
+
+
+# ── 智能标题风格定义 ─────────────────────────────────────────────────────────
+
+TITLE_STYLES = {
+    "viral": {
+        "name": "爆款",
+        "description": "吸引点击、引发好奇的爆款标题，带有数字、疑问或反差感",
+        "examples": [
+            "3个方法让你效率翻倍，第2个最绝",
+            "为什么越努力越穷？真相扎心了",
+            "看完这个，我删掉了手机里一半的APP",
+        ],
+    },
+    "emotional": {
+        "name": "情感",
+        "description": "触动人心、引发共鸣的情感向标题",
+        "examples": [
+            "那些年我们一起追过的梦想",
+            "生活不易，但请相信光",
+            "致每一个在城市里打拼的你",
+        ],
+    },
+    "informative": {
+        "name": "信息",
+        "description": "清晰直白、传递核心信息的干货标题",
+        "examples": [
+            "2026年最新个税政策解读，一文讲透",
+            "新手剪辑入门：从0到1完整指南",
+            "产品对比：10款热门手机深度评测",
+        ],
+    },
+}
+
+
+# ── 智能标题生成 ─────────────────────────────────────────────────────────────
+
+
+def _generate_titles_fallback(
+    description: str,
+    style: str = "viral",
+    count: int = 5,
+) -> List[str]:
+    """本地降级：基于模板规则生成标题.
+
+    当豆包 API 不可用或调用失败时使用，保证接口始终有返回。
+    """
+    style_info = TITLE_STYLES.get(style, TITLE_STYLES["viral"])
+    examples = style_info["examples"]
+
+    # 从描述中提取关键词（取前几个词）
+    keywords = [w for w in description.strip().split() if len(w) > 1][:3]
+    keyword = keywords[0] if keywords else "精彩内容"
+
+    # 基于模板生成
+    templates = [
+        f"「{keyword}」{examples[0][:10]}...",
+        f"{keyword}：{examples[1]}",
+        f"关于{keyword}，你不知道的3件事",
+        f"{keyword}入门指南，新手必看",
+        f"深度解析：{keyword}背后的秘密",
+        f"{keyword}怎么做？手把手教你",
+        f"干货分享 | {keyword}全攻略",
+        f"建议收藏：{keyword}实用技巧",
+        f"{keyword}避坑指南，别再踩雷了",
+        f"一分钟搞懂{keyword}",
+    ]
+
+    random.shuffle(templates)
+    return templates[: min(count, len(templates))]
+
+
+def _parse_titles_from_response(content: str) -> List[str]:
+    """从模型返回中解析标题列表.
+
+    支持多种返回格式：
+    - JSON 数组: ["标题1", "标题2"]
+    - 编号列表: 1. 标题1 / 2. 标题2
+    - 换行分隔: 标题1\n标题2
+    - 带破折号: - 标题1
+    """
+    if not content:
+        return []
+
+    # 尝试解析 JSON
+    try:
+        # 清理可能的 markdown 代码块标记
+        cleaned = content.strip()
+        if cleaned.startswith("```"):
+            cleaned = cleaned.strip("`")
+            if cleaned.lower().startswith("json"):
+                cleaned = cleaned[4:]
+            cleaned = cleaned.strip()
+
+        data = json.loads(cleaned)
+        if isinstance(data, list):
+            return [str(item).strip() for item in data if str(item).strip()]
+        if isinstance(data, dict) and "titles" in data:
+            titles = data["titles"]
+            if isinstance(titles, list):
+                return [str(t).strip() for t in titles if str(t).strip()]
+    except (json.JSONDecodeError, ValueError):
+        pass
+
+    # 尝试按行解析
+    titles: List[str] = []
+    for line in content.strip().split("\n"):
+        line = line.strip()
+        if not line:
+            continue
+        # 去掉编号前缀 "1. " "1、" "（1）"
+        import re
+
+        line = re.sub(r"^[\d]+[\.、\)）]\s*", "", line)
+        # 去掉破折号前缀 "- " "• "
+        line = re.sub(r"^[-•·]\s*", "", line)
+        # 去掉引号
+        line = line.strip('"').strip("'").strip("「」")
+        if line and len(line) < 100:  # 过滤过长的行
+            titles.append(line)
+
+    return titles
+
+
+def generate_smart_titles(
+    description: str,
+    style: str = "viral",
+    count: int = 5,
+) -> Dict[str, Any]:
+    """生成智能标题.
+
+    Args:
+        description: 视频内容描述
+        style: 标题风格 viral/emotional/informative
+        count: 生成数量（5-10）
+
+    Returns:
+        {
+            "titles": [...],
+            "style": "viral",
+            "source": "doubao" | "fallback",  # 实际来源
+            "description": "...",
+        }
+    """
+    # 参数校验与边界处理
+    if style not in TITLE_STYLES:
+        style = "viral"
+    count = max(3, min(10, count))  # 3-10 个
+    description = (description or "").strip()
+
+    client = get_doubao_client()
+    if not client.is_available:
+        logger.info("豆包API未配置，使用本地降级生成标题")
+        titles = _generate_titles_fallback(description, style, count)
+        return {
+            "titles": titles,
+            "style": style,
+            "source": "fallback",
+            "description": description,
+        }
+
+    style_info = TITLE_STYLES[style]
+    system_prompt = (
+        f"你是一个专业的短视频标题创作专家，擅长根据视频内容生成吸引人的标题。\n"
+        f"请根据以下视频描述，生成{count}个{style_info['name']}风格的标题。\n"
+        f"风格说明：{style_info['description']}\n"
+        f"要求：\n"
+        f"1. 每个标题控制在8-25字之间\n"
+        f"2. 直接返回JSON数组格式，不要其他文字\n"
+        f"3. 标题要贴合内容，有吸引力"
+    )
+
+    user_prompt = f"视频描述：{description}\n\n请生成标题："
+
+    messages = [
+        {"role": "system", "content": system_prompt},
+        {"role": "user", "content": user_prompt},
+    ]
+
+    result = client.chat_completion(
+        messages=messages,
+        temperature=0.8,
+        max_tokens=512,
+    )
+
+    if result:
+        titles = _parse_titles_from_response(result)
+        if len(titles) >= 2:  # 至少解析出2个才算成功
+            titles = titles[:count]
+            logger.info(
+                "豆包智能标题生成成功: style=%s count=%d description=%s...",
+                style,
+                len(titles),
+                description[:20],
+            )
+            return {
+                "titles": titles,
+                "style": style,
+                "source": "doubao",
+                "description": description,
+            }
+        logger.warning("豆包返回内容解析失败，降级到本地生成: %s", result[:100])
+
+    # 降级到本地生成
+    titles = _generate_titles_fallback(description, style, count)
+    return {
+        "titles": titles,
+        "style": style,
+        "source": "fallback",
+        "description": description,
+    }
+
+
+# ── 智能素材语义匹配 ───────────────────────────────────────────────────────────
+
+
+def _semantic_match_fallback(
+    description: str,
+    assets: List[Dict[str, Any]],
+) -> List[Dict[str, Any]]:
+    """本地降级：基于关键词的简单匹配.
+
+    计算描述中的关键词与素材名称/标签/描述的重叠度，
+    作为匹配度评分。0-1分。
+    """
+    import re
+
+    # 提取关键词（中文按2字以上片段，英文按单词）
+    desc = description.lower()
+    # 简单分词：提取2字以上的中文字符串和英文单词
+    keywords = set()
+    # 英文单词
+    for word in re.findall(r"[a-zA-Z]{3,}", desc):
+        keywords.add(word)
+    # 中文2-4字片段
+    for i in range(len(desc)):
+        for j in range(i + 2, min(i + 5, len(desc) + 1)):
+            fragment = desc[i:j]
+            if all("\u4e00" <= c <= "\u9fff" for c in fragment):
+                keywords.add(fragment)
+
+    if not keywords:
+        # 没有关键词时给所有素材中等分数
+        for asset in assets:
+            asset["match_score"] = 0.5
+            asset["match_reason"] = "fallback_default"
+        return assets
+
+    results = []
+    for asset in assets:
+        # 组合素材的文本信息：名称 + 标签 + 描述
+        asset_text_parts = [
+            str(asset.get("name", "")).lower(),
+            " ".join(str(t) for t in asset.get("tags", [])).lower(),
+            str(asset.get("description", "")).lower(),
+        ]
+        asset_text = " | ".join(asset_text_parts)
+
+        # 计算匹配度：命中关键词占比 + 稀有关键词加权
+        hit_count = 0
+        hit_keywords = []
+        for kw in keywords:
+            if kw in asset_text:
+                hit_count += 1
+                hit_keywords.append(kw)
+
+        # 基础匹配度 = 命中关键词数 / 总关键词数（开根号平滑）
+        base_score = math.sqrt(hit_count / len(keywords)) if keywords else 0.5
+
+        # 名称命中加分（名称匹配更重要）
+        name = str(asset.get("name", "")).lower()
+        name_hits = sum(1 for kw in hit_keywords if kw in name)
+        name_bonus = min(0.2, name_hits * 0.05)
+
+        score = min(1.0, base_score * 0.8 + name_bonus)
+        score = round(score, 3)
+
+        results.append({
+            **asset,
+            "match_score": score,
+            "match_reason": "fallback_keyword",
+        })
+
+    # 按匹配度降序
+    results.sort(key=lambda x: x["match_score"], reverse=True)
+    return results
+
+
+def _parse_semantic_match_response(
+    content: str,
+    asset_ids: List[str],
+) -> Optional[Dict[str, float]]:
+    """从模型返回中解析素材匹配度.
+
+    期望格式：JSON 对象 {asset_id: score} 或 {"matches": [{asset_id, score}]}
+    score 范围 0-1。
+    """
+    if not content:
+        return None
+
+    # 尝试解析 JSON
+    try:
+        cleaned = content.strip()
+        if cleaned.startswith("```"):
+            cleaned = cleaned.strip("`")
+            if cleaned.lower().startswith("json"):
+                cleaned = cleaned[4:]
+            cleaned = cleaned.strip()
+
+        data = json.loads(cleaned)
+
+        result: Dict[str, float] = {}
+
+        # 格式1: {"asset_id1": 0.8, "asset_id2": 0.6}
+        if isinstance(data, dict):
+            if "matches" in data and isinstance(data["matches"], list):
+                # 格式2: {"matches": [{"asset_id": "...", "score": 0.8}]}
+                for item in data["matches"]:
+                    if isinstance(item, dict):
+                        aid = item.get("asset_id") or item.get("id")
+                        score = item.get("score", 0)
+                        if aid and isinstance(score, (int, float)):
+                            result[str(aid)] = max(0.0, min(1.0, float(score)))
+            else:
+                for key, value in data.items():
+                    if isinstance(value, (int, float)):
+                        result[str(key)] = max(0.0, min(1.0, float(value)))
+
+        # 格式3: [{"asset_id": "...", "score": 0.8}]
+        elif isinstance(data, list):
+            for item in data:
+                if isinstance(item, dict):
+                    aid = item.get("asset_id") or item.get("id")
+                    score = item.get("score", 0)
+                    if aid and isinstance(score, (int, float)):
+                        result[str(aid)] = max(0.0, min(1.0, float(score)))
+
+        if len(result) >= max(1, len(asset_ids) // 2):  # 至少一半素材有评分才算成功
+            return result
+
+    except (json.JSONDecodeError, ValueError):
+        pass
+
+    return None
+
+
+def semantic_match_assets(
+    description: str,
+    assets: List[Dict[str, Any]],
+    top_k: int = 0,
+) -> Dict[str, Any]:
+    """智能素材语义匹配.
+
+    根据用户描述，评估每个素材的语义匹配度并排序。
+
+    Args:
+        description: 用户描述的目标视频内容
+        assets: 素材列表，每个素材需含 id/name/tags/description 等字段
+        top_k: 返回前K个，0表示返回全部
+
+    Returns:
+        {
+            "matches": [{"asset_id": ..., "match_score": ..., ...}],
+            "source": "doubao" | "fallback",
+            "description": "...",
+            "total": 总数,
+        }
+    """
+    description = (description or "").strip()
+    if not assets:
+        return {"matches": [], "source": "fallback", "description": description, "total": 0}
+
+    client = get_doubao_client()
+    if not client.is_available:
+        logger.info("豆包API未配置，使用本地降级做素材语义匹配")
+        matched = _semantic_match_fallback(description, assets)
+        if top_k > 0:
+            matched = matched[:top_k]
+        return {
+            "matches": matched,
+            "source": "fallback",
+            "description": description,
+            "total": len(assets),
+        }
+
+    # 构建素材信息（控制 token 数量）
+    asset_summaries = []
+    for asset in assets[:50]:  # 最多传50个素材给模型
+        aid = asset.get("id", "")
+        name = asset.get("name", "")[:50]
+        tags = asset.get("tags", [])
+        tags_str = ",".join(str(t) for t in tags[:5])
+        desc = str(asset.get("description", ""))[:80]
+        asset_summaries.append(
+            f"ID:{aid} | 名称:{name} | 标签:[{tags_str}] | 描述:{desc}"
+        )
+
+    asset_ids = [str(a.get("id", "")) for a in assets[:50]]
+
+    system_prompt = (
+        "你是一个专业的视频素材匹配助手。"
+        "根据用户的视频目标描述，评估每个素材的匹配程度。\n"
+        "评分规则：\n"
+        "- 0.0-0.3: 完全不相关\n"
+        "- 0.3-0.6: 有一定关联但不够匹配\n"
+        "- 0.6-0.8: 比较匹配，适合使用\n"
+        "- 0.8-1.0: 高度匹配，非常适合\n"
+        "只返回JSON对象，key为素材ID，value为匹配分数（0-1之间的小数）。"
+        "不要其他文字说明。"
+    )
+
+    user_prompt = (
+        f"目标视频描述：{description}\n\n"
+        f"素材列表：\n" + "\n".join(asset_summaries) +
+        f"\n\n请返回每个素材的匹配分数JSON："
+    )
+
+    messages = [
+        {"role": "system", "content": system_prompt},
+        {"role": "user", "content": user_prompt},
+    ]
+
+    result = client.chat_completion(
+        messages=messages,
+        temperature=0.3,
+        max_tokens=1024,
+    )
+
+    if result:
+        scores = _parse_semantic_match_response(result, asset_ids)
+        if scores:
+            # 把评分填回素材
+            matched = []
+            for asset in assets:
+                aid = str(asset.get("id", ""))
+                score = scores.get(aid, 0.3)  # 没评分的给默认偏低分
+                matched.append({
+                    **asset,
+                    "match_score": round(score, 3),
+                    "match_reason": "doubao_semantic",
+                })
+            matched.sort(key=lambda x: x["match_score"], reverse=True)
+
+            logger.info(
+                "豆包语义匹配完成: assets=%d top_score=%.2f description=%s...",
+                len(matched),
+                matched[0]["match_score"] if matched else 0,
+                description[:20],
+            )
+
+            if top_k > 0:
+                matched = matched[:top_k]
+
+            return {
+                "matches": matched,
+                "source": "doubao",
+                "description": description,
+                "total": len(assets),
+            }
+        logger.warning("豆包语义匹配返回解析失败，降级到本地: %s", result[:100])
+
+    # 降级
+    matched = _semantic_match_fallback(description, assets)
+    if top_k > 0:
+        matched = matched[:top_k]
+    return {
+        "matches": matched,
+        "source": "fallback",
+        "description": description,
+        "total": len(assets),
+    }
+
+
+# ── 单例入口 ─────────────────────────────────────────────────────────────────
+
+
+def get_ai_service() -> "AIService":
+    """获取 AI 服务单例."""
+    global _ai_service
+    if _ai_service is None:
+        _ai_service = AIService()
+    return _ai_service
+
+
+_ai_service: Optional["AIService"] = None
+
+
+class AIService:
+    """AI 服务统一入口，便于后续扩展更多能力."""
+
+    def __init__(self) -> None:
+        self._client = get_doubao_client()
+
+    @property
+    def is_available(self) -> bool:
+        return self._client.is_available
+
+    def generate_titles(
+        self,
+        description: str,
+        style: str = "viral",
+        count: int = 5,
+    ) -> Dict[str, Any]:
+        return generate_smart_titles(description, style, count)
+
+    def semantic_match(
+        self,
+        description: str,
+        assets: List[Dict[str, Any]],
+        top_k: int = 0,
+    ) -> Dict[str, Any]:
+        return semantic_match_assets(description, assets, top_k)

apps/api/app/services/auto_clip_service.py

@@ -12,6 +12,7 @@
 from __future__ import annotations
 
 import logging
+from collections.abc import Mapping
 from dataclasses import dataclass
 
 from sqlalchemy.orm import Session
@@ -24,7 +25,7 @@ from packages.adapters.sqlalchemy_impl import (
 )
 from packages.domain.asset import AssetType
 from packages.domain.classification import AssetClassification
-from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
+from packages.domain.edit_plan_clip import EditPlanClip
 
 logger = logging.getLogger(__name__)
 
@@ -155,7 +156,7 @@ class AutoClipService:
         self,
         clip: EditPlanClip,
         project_id: str,
-        config_map: dict[str, object],
+        config_map: Mapping[str, object],
     ) -> ClipAssignDetail:
         """为单个片段分配素材。"""
         config = config_map.get(clip.template_clip_config_id) if clip.template_clip_config_id else None

apps/api/app/services/cover_service.py

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

apps/api/app/services/edit_plan_service.py

@@ -18,7 +18,6 @@ from packages.adapters.sqlalchemy_impl import (
 )
 from packages.domain.edit_plan import EditPlan, EditPlanStatus
 from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
-from packages.domain.generation_task import GenerationTaskStatus
 
 logger = logging.getLogger(__name__)
 
@@ -40,70 +39,6 @@ class EditPlanService:
 
     # ── 剪辑计划 CRUD ──────────────────────────────────────────────────────
 
-    def list_plans(
-        self,
-        *,
-        template_id: Optional[str] = None,
-        project_id: Optional[str] = None,
-        status: Optional[EditPlanStatus] = None,
-        skip: int = 0,
-        limit: int = 50,
-    ) -> List[EditPlan]:
-        """列出剪辑计划
-
-        Args:
-            template_id: 按模板 ID 筛选
-            project_id: 按项目 ID 筛选
-            status: 按状态筛选
-            skip: 分页偏移
-            limit: 每页数量
-        """
-        if project_id:
-            return self._plan_repo.list_by_project(
-                project_id,
-                status=status,
-                skip=skip,
-                limit=limit,
-            )
-        if template_id:
-            return self._plan_repo.list_by_template(
-                template_id,
-                status=status,
-                skip=skip,
-                limit=limit,
-            )
-        return self._plan_repo.list_all(status=status, skip=skip, limit=limit)
-
-    def count_plans(
-        self,
-        *,
-        template_id: Optional[str] = None,
-        project_id: Optional[str] = None,
-        status: Optional[EditPlanStatus] = None,
-    ) -> int:
-        """统计计划数量
-
-        Note:
-            当指定 template_id/project_id 时，通过全量查询计算 total（repo 限制）。
-        """
-        if project_id:
-            all_matching = self._plan_repo.list_by_project(
-                project_id,
-                status=status,
-                skip=0,
-                limit=10000,
-            )
-            return len(all_matching)
-        if template_id:
-            all_matching = self._plan_repo.list_by_template(
-                template_id,
-                status=status,
-                skip=0,
-                limit=10000,
-            )
-            return len(all_matching)
-        return self._plan_repo.count(status=status)
-
     def get_plan(self, plan_id: str) -> Optional[EditPlan]:
         """获取计划详情"""
         return self._plan_repo.get(plan_id)
@@ -125,7 +60,7 @@ class EditPlanService:
         project_id: str = "",
         created_by_user_id: str = "",
     ) -> EditPlan:
-        """创建剪辑计划
+        """创建剪辑计划（基础 CRUD，供内部测试与脚本使用）
 
         Raises:
             ValueError: 参数校验失败
@@ -142,6 +77,19 @@ class EditPlanService:
         logger.info("创建剪辑计划: id=%s name=%s", created.id, created.name)
         return created
 
+    def _auto_resume_editing(self, plan_id: str) -> None:
+        """如果计划处于 completed/failed 状态，自动切回 editing（编辑操作前置）"""
+        plan = self._plan_repo.get(plan_id)
+        if plan is None:
+            return
+        if plan.status in (EditPlanStatus.COMPLETED, EditPlanStatus.FAILED):
+            try:
+                plan.resume_editing()
+                self._plan_repo.update(plan)
+                logger.info("自动重新编辑: plan_id=%s", plan_id)
+            except ValueError:
+                pass
+
     def update_plan(
         self,
         plan_id: str,
@@ -157,6 +105,10 @@ class EditPlanService:
         """
         existing = self.get_plan_or_raise(plan_id)
 
+        # 自动从 completed/failed 切回 editing
+        self._auto_resume_editing(plan_id)
+        existing = self.get_plan_or_raise(plan_id)
+
         updated = EditPlan(
             id=existing.id,
             template_id=existing.template_id,
@@ -174,23 +126,6 @@ class EditPlanService:
         logger.info("更新剪辑计划: id=%s", plan_id)
         return result
 
-    def delete_plan(self, plan_id: str) -> bool:
-        """删除剪辑计划及其所有片段
-
-        Returns:
-            bool: 是否删除成功
-        """
-        existing = self._plan_repo.get(plan_id)
-        if existing is None:
-            return False
-
-        # 先删除所有片段
-        self._clip_repo.delete_by_plan(plan_id)
-        # 再删除计划
-        self._plan_repo.delete(plan_id)
-        logger.info("删除剪辑计划: id=%s", plan_id)
-        return True
-
     # ── 状态机流转 ──────────────────────────────────────────────────────────
 
     def transition_status(self, plan_id: str, target_status: EditPlanStatus) -> EditPlan:
@@ -213,8 +148,24 @@ class EditPlanService:
             return plan
 
         # 根据目标状态调用对应的状态机方法
+        # EDITING 支持从 draft / completed / failed 进入
+        if target_status == EditPlanStatus.EDITING:
+            if plan.status == EditPlanStatus.DRAFT:
+                plan.start_editing()
+            elif plan.status in (EditPlanStatus.COMPLETED, EditPlanStatus.FAILED):
+                plan.resume_editing()
+            else:
+                raise ValueError(f"无法从 {plan.status} 切换到 {target_status}")
+            result = self._plan_repo.update(plan)
+            logger.info(
+                "状态流转: plan_id=%s %s → %s",
+                plan_id,
+                plan.status,
+                target_status,
+            )
+            return result
+
         transition_map = {
-            EditPlanStatus.EDITING: plan.start_editing,
             EditPlanStatus.RENDERING: plan.start_rendering,
             EditPlanStatus.COMPLETED: plan.mark_completed,
             EditPlanStatus.FAILED: plan.mark_failed,
@@ -282,6 +233,8 @@ class EditPlanService:
         start_time: float = 0.0,
         duration: float = 0.0,
         transition_effect: str = "cut",
+        transition_duration: float = 0.0,
+        playback_speed: float = 1.0,
         config: Optional[dict[str, Any]] = None,
     ) -> EditPlanClip:
         """创建片段
@@ -291,6 +244,8 @@ class EditPlanService:
         """
         # 确保计划存在
         self.get_plan_or_raise(plan_id)
+        # 自动从 completed/failed 切回 editing
+        self._auto_resume_editing(plan_id)
 
         clip = EditPlanClip.create(
             plan_id=plan_id,
@@ -302,6 +257,8 @@ class EditPlanService:
             start_time=start_time,
             duration=duration,
             transition_effect=transition_effect,
+            transition_duration=transition_duration,
+            playback_speed=playback_speed,
             config=config,
         )
         created = self._clip_repo.create(clip)
@@ -325,6 +282,8 @@ class EditPlanService:
         start_time: Optional[float] = None,
         duration: Optional[float] = None,
         transition_effect: Optional[str] = None,
+        transition_duration: Optional[float] = None,
+        playback_speed: Optional[float] = None,
         config: Optional[dict[str, Any]] = None,
     ) -> EditPlanClip:
         """更新片段
@@ -334,6 +293,18 @@ class EditPlanService:
         """
         existing = self.get_clip_or_raise(clip_id)
 
+        # 自动从 completed/failed 切回 editing
+        self._auto_resume_editing(existing.plan_id)
+
+        # 速度边界钳制
+        if playback_speed is not None:
+            if playback_speed <= 0:
+                playback_speed = 1.0
+            elif playback_speed < 0.25:
+                playback_speed = 0.25
+            elif playback_speed > 4.0:
+                playback_speed = 4.0
+
         updated = EditPlanClip(
             id=existing.id,
             plan_id=existing.plan_id,
@@ -347,6 +318,10 @@ class EditPlanService:
             transition_effect=(
                 transition_effect.strip() if transition_effect is not None else existing.transition_effect
             ),
+            transition_duration=(
+                transition_duration if transition_duration is not None else existing.transition_duration
+            ),
+            playback_speed=playback_speed if playback_speed is not None else existing.playback_speed,
             status=existing.status,
             config=config if config is not None else existing.config,
             created_at=existing.created_at,
@@ -363,6 +338,8 @@ class EditPlanService:
             ValueError: 片段不存在或 asset_id 为空
         """
         clip = self.get_clip_or_raise(clip_id)
+        # 自动从 completed/failed 切回 editing
+        self._auto_resume_editing(clip.plan_id)
         clip.assign_asset(asset_id)
         result = self._clip_repo.update(clip)
         logger.info("分配素材: clip_id=%s asset_id=%s", clip_id, asset_id)
@@ -389,21 +366,178 @@ class EditPlanService:
         logger.info("删除所有片段: plan_id=%s count=%d", plan_id, count)
         return count
 
-    # ── 渲染生成流程 ────────────────────────────────────────────────────────
+    # ── 片段分割与合并 ──────────────────────────────────────────────────────
 
-    def get_plan_with_clips(self, plan_id: str) -> Dict[str, Any]:
-        """获取计划及其所有片段
+    def split_clip(self, clip_id: str, split_time: float) -> Dict[str, Any]:
+        """将一个片段从指定位置分割为两个片段
+
+        Args:
+            clip_id: 要分割的片段 ID
+            split_time: 分割点（相对于片段起始的秒数），必须在 (0, duration) 范围内
 
         Returns:
-            dict: {"plan": EditPlan, "clips": List[EditPlanClip]}
+            dict: {"left_clip": EditPlanClip, "right_clip": EditPlanClip}
+
+        Raises:
+            ValueError: 片段不存在、分割时间越界
         """
-        plan = self.get_plan_or_raise(plan_id)
-        clips = self._clip_repo.list_by_plan(plan_id)
+        clip = self.get_clip_or_raise(clip_id)
+        plan_id = clip.plan_id
+
+        if split_time <= 0 or split_time >= clip.duration:
+            raise ValueError(f"分割时间必须在 (0, {clip.duration:.3f}) 范围内，当前: {split_time}")
+
+        self._auto_resume_editing(plan_id)
+
+        original_duration = clip.duration
+        left_duration = round(split_time, 3)
+        right_duration = round(original_duration - split_time, 3)
+        original_order = clip.order
+
+        # 更新左半部分（原片段）
+        clip.duration = left_duration
+        left_clip = self._clip_repo.update(clip)
+
+        # 后面片段的 order 全部 +1（给右半部分腾位置）
+        all_clips = self._clip_repo.list_by_plan(plan_id)
+        for c in all_clips:
+            if c.order > original_order and c.id != clip_id:
+                c.order += 1
+                self._clip_repo.update(c)
+
+        # 创建右半部分新片段（继承原片段的大部分属性）
+        right_config = dict(clip.config) if clip.config else {}
+        # 素材裁剪信息
+        if clip.asset_id:
+            # 右半部分从 split_time 开始播放
+            right_config["trim_start"] = left_duration
+            # 左半部分在 split_time 处结束
+            left_config = dict(left_clip.config) if left_clip.config else {}
+            left_config["trim_end"] = right_duration
+            left_clip.config = left_config
+            left_clip = self._clip_repo.update(left_clip)
+
+        right_clip = EditPlanClip.create(
+            plan_id=plan_id,
+            clip_type=clip.clip_type,
+            order=original_order + 1,
+            template_clip_config_id=clip.template_clip_config_id,
+            asset_id=clip.asset_id,
+            text_content=clip.text_content,
+            start_time=clip.start_time + left_duration,
+            duration=right_duration,
+            transition_effect=clip.transition_effect,
+            transition_duration=clip.transition_duration,
+            playback_speed=clip.playback_speed,
+            config=right_config,
+        )
+        created_right = self._clip_repo.create(right_clip)
+
+        logger.info(
+            "分割片段: clip_id=%s plan_id=%s split_time=%.3fs left_dur=%.3fs right_dur=%.3fs",
+            clip_id,
+            plan_id,
+            split_time,
+            left_duration,
+            right_duration,
+        )
+
         return {
-            "plan": plan,
-            "clips": clips,
+            "left_clip": left_clip,
+            "right_clip": created_right,
         }
 
+    def merge_clips(self, clip_ids: List[str]) -> EditPlanClip:
+        """合并多个连续片段为一个片段
+
+        Args:
+            clip_ids: 要合并的片段 ID 列表（至少2个），必须属于同一个计划且 order 连续
+
+        Returns:
+            EditPlanClip: 合并后的新片段
+
+        Raises:
+            ValueError: 数量不足、不属于同一计划、不连续、类型不一致
+        """
+        if len(clip_ids) < 2:
+            raise ValueError("至少需要 2 个片段才能合并")
+
+        # 读取所有片段
+        clips = []
+        for cid in clip_ids:
+            clip = self.get_clip_or_raise(cid)
+            clips.append(clip)
+
+        # 校验：同一计划
+        plan_id = clips[0].plan_id
+        for c in clips[1:]:
+            if c.plan_id != plan_id:
+                raise ValueError("只能合并同一计划下的片段")
+
+        # 按 order 排序
+        clips.sort(key=lambda c: c.order)
+
+        # 校验：order 连续
+        for i in range(1, len(clips)):
+            if clips[i].order != clips[i - 1].order + 1:
+                raise ValueError(f"片段不连续：order {clips[i-1].order} → {clips[i].order}")
+
+        # 校验：类型一致
+        clip_type = clips[0].clip_type
+        for c in clips[1:]:
+            if c.clip_type != clip_type:
+                raise ValueError("只能合并相同类型的片段")
+
+        self._auto_resume_editing(plan_id)
+
+        # 计算合并后的属性
+        first_clip = clips[0]
+        total_duration = round(sum(c.duration for c in clips), 3)
+        first_order = first_clip.order
+
+        # 合并文案（用换行连接）
+        merged_text = "\n".join(c.text_content for c in clips if c.text_content.strip())
+
+        # 合并 config（后面的覆盖前面的）
+        merged_config: Dict[str, Any] = {}
+        for c in clips:
+            if c.config:
+                merged_config.update(c.config)
+        # 清理 trim 相关字段（合并后就是完整片段了）
+        merged_config.pop("trim_start", None)
+        merged_config.pop("trim_end", None)
+
+        # 更新第一个片段（保留它作为合并结果）
+        first_clip.duration = total_duration
+        first_clip.text_content = merged_text
+        first_clip.config = merged_config
+        # 转场保留第一个的（合并后的入点转场）
+        # playback_speed 取第一个的
+        merged_clip = self._clip_repo.update(first_clip)
+
+        # 删除其余片段
+        for c in clips[1:]:
+            self._clip_repo.delete(c.id)
+
+        # 后面的片段 order 前移 (len - 1) 位
+        shift = len(clips) - 1
+        all_clips = self._clip_repo.list_by_plan(plan_id)
+        for c in all_clips:
+            if c.order > first_order and c.id != merged_clip.id:
+                c.order -= shift
+                self._clip_repo.update(c)
+
+        logger.info(
+            "合并片段: plan_id=%s count=%d total_duration=%.3fs",
+            plan_id,
+            len(clips),
+            total_duration,
+        )
+
+        return merged_clip
+
+    # ── 渲染生成流程 ────────────────────────────────────────────────────────
+
     def get_generation_status(self, plan_id: str) -> Dict[str, Any]:
         """获取渲染进度状态
 
@@ -413,6 +547,8 @@ class EditPlanService:
                 "clips": List[EditPlanClip],
                 "generation_task_id": Optional[str],
                 "generation_task_status": Optional[str],
+                "progress": float,
+                "error_message": str,
             }
 
         Raises:
@@ -424,17 +560,23 @@ class EditPlanService:
         # 从 plan.config 中获取 generation_task_id
         generation_task_id = plan.config.get("generation_task_id")
         generation_task_status = None
+        progress = 0.0
+        error_message = ""
 
         if generation_task_id:
             task = self._generation_task_repo.get(generation_task_id)
             if task:
                 generation_task_status = task.status.value if hasattr(task.status, "value") else task.status
+                progress = getattr(task, "progress", 0.0) or 0.0
+                error_message = getattr(task, "error_message", "") or ""
 
         return {
             "plan": plan,
             "clips": clips,
             "generation_task_id": generation_task_id,
             "generation_task_status": generation_task_status,
+            "progress": progress,
+            "error_message": error_message,
         }
 
     def can_generate(self, plan_id: str) -> tuple[bool, str]:
@@ -485,6 +627,9 @@ class EditPlanService:
             更新后的计划
         """
         plan = self.get_plan_or_raise(plan_id)
+        # 自动从 completed/failed 切回 editing
+        self._auto_resume_editing(plan_id)
+        plan = self.get_plan_or_raise(plan_id)
         new_config = {**plan.config, **config_updates}
 
         updated = EditPlan(

apps/api/app/services/edit_template_service.py

@@ -12,6 +12,8 @@ from typing import Any, List, Optional
 from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl import (
+    SQLAlchemyEditPlanClipRepository,
+    SQLAlchemyEditPlanRepository,
     SQLAlchemyEditTemplateRepository,
     SQLAlchemyTemplateClipConfigRepository,
 )
@@ -37,6 +39,14 @@ class EditTemplateService:
     def __init__(self, db: Session) -> None:
         self._template_repo = SQLAlchemyEditTemplateRepository(db)
         self._clip_config_repo = SQLAlchemyTemplateClipConfigRepository(db)
+        self._plan_repo = SQLAlchemyEditPlanRepository(db)
+        self._plan_clip_repo = SQLAlchemyEditPlanClipRepository(db)
+        from packages.adapters.sqlalchemy_impl.template_version_repository import (
+            SQLAlchemyTemplateVersionRepository,
+        )
+
+        self._version_repo = SQLAlchemyTemplateVersionRepository(db)
+        self._db = db
 
     # ── 模板 CRUD ──────────────────────────────────────────────────────────
 
@@ -394,3 +404,556 @@ class EditTemplateService:
             "template": template,
             "clip_configs": clip_configs,
         }
+
+    # ── 从剪辑计划保存为模板 ──────────────────────────────────────────────
+
+    def save_plan_as_template(
+        self,
+        plan_id: str,
+        name: str,
+        *,
+        description: str = "",
+        template_type: str = "custom",
+        preview_url: str = "",
+    ) -> dict[str, Any]:
+        """将剪辑计划保存为模板
+
+        将指定剪辑计划的配置和片段结构另存为一个新模板，
+        方便后续基于该模板快速创建新的剪辑计划。
+
+        转换规则:
+        - 计划名称 → 模板名称（调用方传入，支持自定义）
+        - 计划 config → 模板 config（整体迁移）
+        - 计划 editing_mode 从 config 中提取，默认 one_take
+        - 每个片段转换为模板片段配置:
+          - clip_type 直接映射
+          - order 保持不变
+          - duration → min_duration = max_duration = duration（固定时长）
+          - text_content → text_template
+          - transition_effect 直接映射
+          - playback_speed 等播放参数存入 config
+          - 不保留 asset_id（模板不绑定具体素材）
+
+        Args:
+            plan_id: 源剪辑计划 ID
+            name: 新模板名称
+            description: 模板描述
+            template_type: 模板类型，默认 custom（用户自定义）
+            preview_url: 预览图 URL
+
+        Returns:
+            dict: {"template": EditTemplate, "clip_configs": List[TemplateClipConfig]}
+
+        Raises:
+            ValueError: 计划不存在或名称为空/重复
+        """
+        # 1. 读取源计划
+        plan = self._plan_repo.get(plan_id)
+        if plan is None:
+            raise ValueError(f"剪辑计划不存在: {plan_id}")
+
+        # 2. 读取所有片段（按 order 排序）
+        clips = self._plan_clip_repo.list_by_plan(plan_id)
+        clips.sort(key=lambda c: c.order)
+
+        # 3. 提取 editing_mode
+        editing_mode = plan.config.get("editing_mode", "one_take") if plan.config else "one_take"
+
+        # 4. 创建模板（复用 create_template 的校验逻辑，但手动构建避免重复查询）
+        clean_name = name.strip()
+        if not clean_name:
+            raise ValueError("模板名称不能为空")
+
+        # 名称重复检查
+        existing = self._template_repo.list_all(skip=0, limit=1000)
+        for t in existing:
+            if t.name == clean_name and t.status == EditTemplateStatus.ACTIVE:
+                raise ValueError(f"模板名称已存在: {clean_name}")
+
+        # 从计划 config 中提取模板级配置，去掉运行时/素材相关字段
+        plan_config = plan.config or {}
+        template_config: dict[str, Any] = {}
+        for key, value in plan_config.items():
+            # 跳过明显的运行时/实例字段，保留风格/模式类配置
+            if key not in {"asset_ids", "source_edit_plan_id", "generation_task_id"}:
+                template_config[key] = value
+
+        template = EditTemplate.create(
+            name=clean_name,
+            description=description,
+            template_type=template_type,
+            editing_mode=editing_mode,
+            config=template_config,
+            preview_url=preview_url,
+        )
+        created_template = self._template_repo.create(template)
+        logger.info(
+            "从剪辑计划创建模板: plan_id=%s template_id=%s name=%s clip_count=%d",
+            plan_id,
+            created_template.id,
+            clean_name,
+            len(clips),
+        )
+
+        # 5. 转换每个片段为模板片段配置
+        created_configs: List[TemplateClipConfig] = []
+        for clip in clips:
+            clip_config: dict[str, Any] = {}
+            # 播放速度存入 config
+            if clip.playback_speed and clip.playback_speed != 1.0:
+                clip_config["playback_speed"] = clip.playback_speed
+            # 片段自有 config 合并（优先级：clip.config 覆盖上面的）
+            if clip.config:
+                clip_config.update(clip.config)
+            # 去掉素材相关字段
+            clip_config.pop("asset_info", None)
+            clip_config.pop("source_asset_id", None)
+
+            # 转场效果兼容校验
+            try:
+                transition = TransitionEffect(clip.transition_effect)
+            except ValueError:
+                transition = TransitionEffect.CUT
+
+            # 片段类型兼容校验
+            try:
+                clip_type = ClipType(clip.clip_type)
+            except ValueError:
+                clip_type = ClipType.MAIN
+
+            clip_config_obj = TemplateClipConfig.create(
+                template_id=created_template.id,
+                clip_type=clip_type,
+                order=clip.order,
+                min_duration=clip.duration,
+                max_duration=clip.duration,
+                text_template=clip.text_content or "",
+                transition_effect=transition,
+                config=clip_config,
+            )
+            created = self._clip_config_repo.create(clip_config_obj)
+            created_configs.append(created)
+
+        return {
+            "template": created_template,
+            "clip_configs": created_configs,
+        }
+
+    # ── 模板草稿（编辑器）相关 ──────────────────────────────────────────────────
+
+    def get_template_draft(self, template_id: str) -> Optional[Any]:
+        """获取模板的草稿剪辑计划
+
+        通过 template_id + config.is_template_draft=True 标记查找。
+        每个模板有且仅有一个草稿计划。
+
+        Args:
+            template_id: 模板 ID
+
+        Returns:
+            EditPlan | None: 草稿剪辑计划，不存在则返回 None
+        """
+        from packages.domain.edit_plan import EditPlan  # noqa: F401
+
+        plans = self._plan_repo.list_by_template(template_id, limit=50)
+        for plan in plans:
+            config = plan.config or {}
+            if config.get("is_template_draft") is True:
+                return plan
+        return None
+
+    def create_template_draft(
+        self,
+        template_id: str,
+        user_id: str,
+        *,
+        project_id: str = "",
+    ) -> Any:
+        """基于模板创建草稿剪辑计划
+
+        草稿与普通剪辑计划的区别：
+        - config.is_template_draft = True
+        - 不绑定具体素材（空素材列表）
+        - 用于模板编辑器的编辑上下文
+
+        Args:
+            template_id: 模板 ID
+            user_id: 创建者用户 ID
+            project_id: 所属项目 ID（可选）
+
+        Returns:
+            EditPlan: 创建的草稿剪辑计划
+
+        Raises:
+            ValueError: 模板不存在，或草稿已存在
+        """
+        from .plan_generator_service import PlanGeneratorService
+
+        # 检查模板是否存在
+        template = self.get_template_or_raise(template_id)
+
+        # 检查草稿是否已存在
+        existing = self.get_template_draft(template_id)
+        if existing is not None:
+            raise ValueError(f"模板草稿已存在: {template_id}")
+
+        # 读取模板片段配置
+        clip_configs = self.list_clip_configs(template_id)
+
+        # 基于模板生成计划（空素材）
+        generator = PlanGeneratorService(self._db)
+        result = generator.generate_from_template(
+            template=template,
+            clip_configs=clip_configs,
+            asset_ids=[],
+            project_id=project_id,
+            created_by_user_id=user_id,
+            name=f"{template.name} - 草稿",
+        )
+        plan = result["plan"]
+
+        # 标记为模板草稿
+        plan_config = plan.config or {}
+        plan_config["is_template_draft"] = True
+        plan.config = plan_config
+        plan = self._plan_repo.update(plan)
+
+        logger.info(
+            "创建模板草稿: template_id=%s draft_plan_id=%s user_id=%s",
+            template_id,
+            plan.id,
+            user_id,
+        )
+        return plan
+
+    def get_or_create_draft(
+        self,
+        template_id: str,
+        user_id: str,
+        *,
+        project_id: str = "",
+    ) -> Any:
+        """获取或创建模板草稿
+
+        首次访问模板编辑器时自动创建草稿。
+
+        Args:
+            template_id: 模板 ID
+            user_id: 操作用户 ID
+            project_id: 所属项目 ID（可选）
+
+        Returns:
+            EditPlan: 草稿剪辑计划
+        """
+        draft = self.get_template_draft(template_id)
+        if draft is not None:
+            return draft
+        return self.create_template_draft(template_id, user_id, project_id=project_id)
+
+    def publish_template_from_draft(
+        self,
+        template_id: str,
+        draft_plan_id: str,
+        *,
+        change_note: str = "",
+        published_by: str = "",
+    ) -> Any:
+        """将草稿剪辑计划的内容发布（同步）到模板
+
+        将草稿的配置和片段结构同步到模板，相当于"保存"编辑结果。
+        使用事务保证一致性，失败则回滚。
+
+        同步规则:
+        - 草稿 plan.config → template.config（过滤掉草稿特有字段）
+        - 草稿 clips → template_clip_configs（先删后插）
+        - 草稿 editing_mode → template.editing_mode
+        - 不更新模板名称、描述等元信息（由专门的接口处理）
+
+        Args:
+            template_id: 模板 ID
+            draft_plan_id: 草稿剪辑计划 ID
+
+        Returns:
+            EditTemplate: 更新后的模板
+
+        Raises:
+            ValueError: 模板/草稿不存在，或草稿不属于该模板
+        """
+        from packages.domain.template_clip_config import TemplateClipConfig
+
+        # 1. 校验模板和草稿
+        template = self.get_template_or_raise(template_id)
+        draft = self._plan_repo.get(draft_plan_id)
+        if draft is None:
+            raise ValueError(f"草稿计划不存在: {draft_plan_id}")
+        if draft.template_id != template_id:
+            raise ValueError(f"草稿不属于该模板: plan_template_id={draft.template_id}")
+        config = draft.config or {}
+        if config.get("is_template_draft") is not True:
+            raise ValueError("指定的计划不是模板草稿")
+
+        # 2. 读取草稿片段
+        draft_clips = self._plan_clip_repo.list_by_plan(draft_plan_id)
+        draft_clips.sort(key=lambda c: c.order)
+
+        # 3. 提取 editing_mode
+        editing_mode = config.get("editing_mode", "one_take")
+
+        # 4. 提取模板配置（去掉草稿/运行时字段）
+        draft_config = draft.config or {}
+        template_config: dict[str, Any] = {}
+        skip_keys = {
+            "is_template_draft",
+            "asset_ids",
+            "source_edit_plan_id",
+            "generation_task_id",
+        }
+        for key, value in draft_config.items():
+            if key not in skip_keys:
+                template_config[key] = value
+
+        # 5. 事务更新
+        try:
+            # 5.0 先保存旧版快照（发布前的状态），用于回滚
+            old_version = template.version or 1
+            old_clip_configs = self._clip_config_repo.list_by_template(template_id)
+            old_clip_snapshots = [
+                {
+                    "clip_type": cfg.clip_type.value if hasattr(cfg.clip_type, "value") else cfg.clip_type,
+                    "order": cfg.order,
+                    "min_duration": cfg.min_duration,
+                    "max_duration": cfg.max_duration,
+                    "text_template": cfg.text_template or "",
+                    "transition_effect": (
+                        cfg.transition_effect.value
+                        if hasattr(cfg.transition_effect, "value")
+                        else cfg.transition_effect
+                    ),
+                    "config": cfg.config or {},
+                }
+                for cfg in old_clip_configs
+            ]
+
+            from packages.domain.template_version import EditTemplateVersion
+
+            old_snapshot = EditTemplateVersion.create(
+                template_id=template_id,
+                version=old_version,
+                name=template.name,
+                editing_mode=template.editing_mode,
+                config=dict(template.config) if template.config else {},
+                clip_configs=old_clip_snapshots,
+                change_note=f"v{old_version} 快照（发布前）",
+                published_by=published_by,
+            )
+            self._version_repo.create(old_snapshot)
+
+            # 更新模板元信息
+            template.config = template_config
+            template.editing_mode = editing_mode
+            template.bump_version()  # 版本号 +1
+            updated_template = self._template_repo.update(template)
+
+            # 批量删除旧的片段配置（外层事务统一提交）
+            self._clip_config_repo.delete_by_template(template_id, commit=False)
+
+            # 创建新的片段配置
+            created_configs: list[TemplateClipConfig] = []
+            for clip in draft_clips:
+                clip_config: dict[str, Any] = {}
+                # 播放速度存入 config
+                if clip.playback_speed and clip.playback_speed != 1.0:
+                    clip_config["playback_speed"] = clip.playback_speed
+                # 片段自有 config 合并
+                if clip.config:
+                    clip_config.update(clip.config)
+                # 去掉素材相关字段
+                clip_config.pop("asset_info", None)
+                clip_config.pop("source_asset_id", None)
+
+                # 转场效果兼容校验
+                try:
+                    from packages.domain.template_clip_config import (
+                        TransitionEffect,
+                    )
+
+                    transition = TransitionEffect(clip.transition_effect)
+                except (ValueError, ImportError):
+                    transition = TransitionEffect.CUT  # type: ignore
+
+                # 片段类型兼容校验
+                try:
+                    from packages.domain.template_clip_config import ClipType
+
+                    clip_type = ClipType(clip.clip_type)
+                except (ValueError, ImportError):
+                    clip_type = ClipType.MAIN  # type: ignore
+
+                config_obj = TemplateClipConfig.create(
+                    template_id=template_id,
+                    clip_type=clip_type,
+                    order=clip.order,
+                    min_duration=clip.duration,
+                    max_duration=clip.duration,
+                    text_template=clip.text_content or "",
+                    transition_effect=transition,
+                    config=clip_config,
+                )
+                created = self._clip_config_repo.create(config_obj)
+                created_configs.append(created)
+
+            self._db.commit()
+            logger.info(
+                "发布模板草稿: template_id=%s draft_plan_id=%s clip_count=%d",
+                template_id,
+                draft_plan_id,
+                len(created_configs),
+            )
+            return updated_template
+
+        except Exception as exc:
+            self._db.rollback()
+            logger.error(
+                "发布模板草稿失败: template_id=%s draft_plan_id=%s error=%s",
+                template_id,
+                draft_plan_id,
+                exc,
+            )
+            raise
+
+    # ── 版本历史与回滚 ────────────────────────────────────────────────────
+
+    def list_template_versions(self, template_id: str, limit: int = 50) -> list[Any]:
+        """列出模板的发布版本历史（按版本号倒序）"""
+        self.get_template_or_raise(template_id)  # 校验存在性
+        return self._version_repo.list_by_template(template_id, limit=limit)
+
+    def rollback_to_version(self, template_id: str, version: int) -> Any:
+        """回滚模板到指定历史版本
+
+        流程：
+        1. 校验目标版本存在
+        2. 保存当前状态为新版本快照（当前版本号）
+        3. 用目标版本的快照覆盖模板 config + clip_configs
+        4. 版本号 +1（回滚本身也是一次发布）
+
+        Returns:
+            EditTemplate: 回滚后的模板
+
+        Raises:
+            ValueError: 模板/版本不存在
+        """
+        from packages.domain.template_clip_config import TemplateClipConfig
+
+        template = self.get_template_or_raise(template_id)
+
+        # 1. 读取目标版本快照
+        target_version = self._version_repo.get_by_version(template_id, version)
+        if target_version is None:
+            raise ValueError(f"模板 {template_id} 不存在版本 {version}")
+
+        current_version = template.version or 1
+
+        try:
+            # 2. 先保存当前状态快照（当前版本号），确保回滚可撤销
+            old_clip_configs = self._clip_config_repo.list_by_template(template_id)
+            old_clip_snapshots = [
+                {
+                    "clip_type": cfg.clip_type.value if hasattr(cfg.clip_type, "value") else cfg.clip_type,
+                    "order": cfg.order,
+                    "min_duration": cfg.min_duration,
+                    "max_duration": cfg.max_duration,
+                    "text_template": cfg.text_template or "",
+                    "transition_effect": (
+                        cfg.transition_effect.value
+                        if hasattr(cfg.transition_effect, "value")
+                        else cfg.transition_effect
+                    ),
+                    "config": cfg.config or {},
+                }
+                for cfg in old_clip_configs
+            ]
+
+            from packages.domain.template_version import EditTemplateVersion
+
+            current_snapshot = EditTemplateVersion.create(
+                template_id=template_id,
+                version=current_version,
+                name=template.name,
+                editing_mode=template.editing_mode,
+                config=dict(template.config) if template.config else {},
+                clip_configs=old_clip_snapshots,
+                change_note=f"v{current_version} 快照（回滚到 v{version} 前）",
+                published_by="rollback",
+            )
+            self._version_repo.create(current_snapshot)
+
+            # 3. 覆盖模板配置 + editing_mode + name + preview_url
+            template.config = dict(target_version.config)
+            template.editing_mode = target_version.editing_mode
+            if target_version.name:
+                template.name = target_version.name
+            template.bump_version()  # 版本号 +1
+            updated_template = self._template_repo.update(template)
+
+            # 4. 先删后插 clip_configs（批量删除避免N+1）
+            from packages.adapters.sqlalchemy_impl.models import (
+                TemplateClipConfigModel,
+            )
+
+            self._db.query(TemplateClipConfigModel).filter(TemplateClipConfigModel.template_id == template_id).delete(
+                synchronize_session=False
+            )
+
+            for clip_snap in target_version.clip_configs:
+                # 转场效果兼容校验
+                try:
+                    from packages.domain.template_clip_config import TransitionEffect
+
+                    transition = TransitionEffect(clip_snap.get("transition_effect", "cut"))
+                except (ValueError, ImportError):
+                    from packages.domain.template_clip_config import TransitionEffect
+
+                    transition = TransitionEffect.CUT
+
+                # 片段类型兼容校验
+                try:
+                    from packages.domain.template_clip_config import ClipType
+
+                    clip_type = ClipType(clip_snap.get("clip_type", "main"))
+                except (ValueError, ImportError):
+                    from packages.domain.template_clip_config import ClipType
+
+                    clip_type = ClipType.MAIN
+
+                config_obj = TemplateClipConfig.create(
+                    template_id=template_id,
+                    clip_type=clip_type,
+                    order=clip_snap.get("order", 0),
+                    min_duration=clip_snap.get("min_duration", 0.0),
+                    max_duration=clip_snap.get("max_duration", 0.0),
+                    text_template=clip_snap.get("text_template", ""),
+                    transition_effect=transition,
+                    config=clip_snap.get("config", {}) or {},
+                )
+                self._clip_config_repo.create(config_obj)
+
+            self._db.commit()
+            logger.info(
+                "模板回滚成功: template_id=%s from_v=%d to_v=%d new_v=%d",
+                template_id,
+                current_version,
+                version,
+                updated_template.version,
+            )
+            return updated_template
+
+        except Exception as exc:
+            self._db.rollback()
+            logger.error(
+                "模板回滚失败: template_id=%s target_version=%d error=%s",
+                template_id,
+                version,
+                exc,
+            )
+            raise

apps/api/app/services/job_service.py

@@ -13,8 +13,6 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from sqlalchemy.orm import Session
-
 from packages.application.jobs import (
     CancelJobUseCase,
     CompleteJobCommand,

apps/api/app/services/plan_generator_service.py

@@ -13,7 +13,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, List, Optional
+from typing import Any, List
 
 from sqlalchemy.orm import Session
 
@@ -99,6 +99,11 @@ class PlanGeneratorService:
         # 3. 生成片段列表
         if clip_configs:
             clips = self._create_clips_from_configs(plan.id, clip_configs)
+            # 模板 clip_config 的 clip_type 是 ClipType 枚举（main/intro/outro 等），
+            # 但 PIP / VOICE_PIP 模式需要特定的 clip_type（overlay/background/corner_voice/b_roll）
+            # 才能让素材分配和渲染分层正确工作。
+            # 这里将 MAIN 类型的片段按顺序映射为对应模式的角色类型。
+            self._map_clip_types_for_mode(clips, editing_mode)
         else:
             clips = self._generate_default_clips(plan.id, editing_mode, len(asset_ids))
 
@@ -146,8 +151,8 @@ class PlanGeneratorService:
         plan_config: dict[str, Any] = {
             "editing_mode": editing_mode,
         }
-        # 继承模板的 cover/title/subtitle/bgm 配置
-        for key in ("cover", "title", "subtitle", "bgm"):
+        # 继承模板的 cover/title/subtitle/bgm/export/filter 配置
+        for key in ("cover", "title", "subtitle", "bgm", "export", "filter"):
             if key in template_config:
                 plan_config[key] = template_config[key]
 
@@ -182,6 +187,10 @@ class PlanGeneratorService:
                 cfg.transition_effect.value if hasattr(cfg.transition_effect, "value") else cfg.transition_effect
             )
 
+            # 从 clip config 中解析 playback_speed（兼容 speed_ratio 字段名）
+            clip_cfg = cfg.config or {}
+            playback_speed = clip_cfg.get("playback_speed", clip_cfg.get("speed_ratio", 1.0)) or 1.0
+
             clip = EditPlanClip.create(
                 plan_id=plan_id,
                 clip_type=clip_type,
@@ -190,11 +199,48 @@ class PlanGeneratorService:
                 text_content=getattr(cfg, "text_template", "") or "",
                 duration=duration,
                 transition_effect=transition or "cut",
+                playback_speed=playback_speed,
+                config=clip_cfg,
             )
             clips.append(clip)
 
         return clips
 
+    def _map_clip_types_for_mode(self, clips: List[EditPlanClip], editing_mode: str) -> None:
+        """将模板 clip_config 生成的 MAIN 类型片段，按 editing_mode 映射为对应角色类型。
+
+        模板的 clip_config 使用 ClipType 枚举（main/intro/outro 等），
+        但 PIP / VOICE_PIP 模式的素材分配和渲染分层依赖特定的 clip_type 命名
+        （overlay / background / corner_voice / b_roll）。
+
+        映射规则（仅修改 MAIN 类型片段，非 MAIN 片段保持原类型）：
+        - PIP: 第1个 MAIN → main（背景），其余 MAIN → overlay（画中画）
+        - VOICE_PIP: 第1个 → background，第2个 → corner_voice，第3+个 → b_roll
+        - ONE_TAKE / VOICE_OVER: 保持 main 不变
+        """
+        from packages.domain.template_clip_config import ClipType
+
+        main_clips = [c for c in clips if c.clip_type == ClipType.MAIN.value]
+        if not main_clips:
+            return
+
+        if editing_mode == EditingMode.PIP.value:
+            # 第1个 main 保持（背景层），其余改为 overlay（画中画层）
+            for i, clip in enumerate(main_clips):
+                if i > 0:
+                    clip.clip_type = "overlay"
+
+        elif editing_mode == EditingMode.VOICE_PIP.value:
+            for i, clip in enumerate(main_clips):
+                if i == 0:
+                    clip.clip_type = "background"
+                elif i == 1:
+                    clip.clip_type = "corner_voice"
+                else:
+                    clip.clip_type = "b_roll"
+
+        # ONE_TAKE / VOICE_OVER: 保持 main 不变，无需处理
+
     def _generate_default_clips(
         self,
         plan_id: str,
@@ -224,7 +270,7 @@ class PlanGeneratorService:
             )
             order += 1
             # 剩余为 overlay
-            for i in range(1, n):
+            for _ in range(1, n):
                 clips.append(
                     EditPlanClip.create(
                         plan_id=plan_id,
@@ -237,7 +283,7 @@ class PlanGeneratorService:
 
         elif editing_mode == EditingMode.VOICE_OVER.value:
             # N 个 main clips（B-roll）
-            for i in range(n):
+            for _ in range(n):
                 clips.append(
                     EditPlanClip.create(
                         plan_id=plan_id,
@@ -271,7 +317,7 @@ class PlanGeneratorService:
             )
             order += 1
             # 剩余为 b_roll
-            for i in range(2, n):
+            for _ in range(2, n):
                 clips.append(
                     EditPlanClip.create(
                         plan_id=plan_id,
@@ -284,7 +330,7 @@ class PlanGeneratorService:
 
         else:
             # ONE_TAKE: N 个 main clips
-            for i in range(n):
+            for _ in range(n):
                 clips.append(
                     EditPlanClip.create(
                         plan_id=plan_id,

apps/api/app/services/smart_asset_selector.py

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

apps/api/app/services/video_compose_service.py

@@ -16,7 +16,6 @@ FFmpeg 视频合成编排服务：
 from __future__ import annotations
 
 import logging
-import shutil
 from dataclasses import dataclass, field
 from typing import Any
 
@@ -28,7 +27,7 @@ from packages.adapters.sqlalchemy_impl.edit_plan_clip_repository import (
 from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
     SQLAlchemyEditPlanRepository,
 )
-from packages.domain.edit_plan import EditPlan, EditPlanStatus
+from packages.domain.edit_plan import EditPlanStatus
 from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
 from packages.domain.template_clip_config import TransitionEffect
 
@@ -220,7 +219,7 @@ class VideoComposeService:
         根据 EditPlan 的所有 ready 片段，生成完整的 filter_complex 命令。
 
         滤镜链逻辑：
-        - 每个片段：scale → crop → setpts → trim → atrim
+        - 每个片段：scale → crop → fps → setpts → trim → atrim
         - 多片段之间：concat 滤镜 或 xfade 转场
         - 最终输出：-map '[outv]' -map '[outa]'（如有音频）
         """
@@ -407,20 +406,30 @@ class VideoComposeService:
         滤镜顺序：
         1. scale — 等比缩放到目标分辨率（保证覆盖）
         2. crop — 居中裁剪到目标分辨率
-        3. setpts — 重置时间戳 + 偏移
-        4. trim — 视频时长裁剪
-        5. atrim — 音频时长裁剪（如有音频流）
+        3. fps — 统一输出帧率（concat 要求所有输入帧率一致）
+        4. setpts — 重置时间戳 + 偏移
+        5. trim — 视频时长裁剪
+        6. atrim — 音频时长裁剪（如有音频流）
         """
         duration = clip.duration if clip.duration > 0 else 5.0  # 默认 5 秒
         start = clip.start_time
 
         filters: list[str] = []
 
-        # 1. scale: 等比缩放，保证覆盖目标区域（scale to larger, then crop）
-        filters.append(f"scale={output_width}:{output_height}" f":force_original_aspect_ratio=increase")
+        # 1. scale: 等比缩放（保持比例，不裁剪）
+        filters.append(f"scale={output_width}:{output_height}" f":force_original_aspect_ratio=decrease")
 
-        # 2. crop: 居中裁剪
-        filters.append(f"crop={output_width}:{output_height}")
+        # 2. pad: 居中+留黑边到目标分辨率（保持原始比例，不裁剪内容）
+        filters.append(f"pad={output_width}:{output_height}:(ow-iw)/2:(oh-ih)/2:black")
+
+        # 3. format: 统一像素格式为 yuv420p（H.264 标准格式，concat 要求所有输入像素格式一致）
+        # 不同素材可能是 yuv420p / yuv422p / yuv444p / nv12 等，必须统一
+        filters.append("format=yuv420p")
+
+        # 4. fps: 统一帧率（concat 要求所有输入帧率一致）
+        # 放在 pad 之后、setpts 之前，确保分辨率和帧率都已统一
+        if fps and fps > 0:
+            filters.append(f"fps={fps}")
 
         # 3. setpts: 重置时间戳
         if start > 0:
@@ -533,11 +542,17 @@ def _build_concat_filter(
     concat_filter = f"{concat_inputs}concat=n={n}:v=1:a=0[outv]"
     parts.append(concat_filter)
 
-    # 音频 concat（如果有）
+    # 音频 concat（如果有）— 先统一音频格式再拼接，否则不同采样率/声道会导致concat失败
     audio_parts: list[str] = []
     for idx, chain in enumerate(clip_chains):
         if chain.audio_label:
-            audio_parts.append(f"[{idx}:a]atrim=0:{chain.duration},asetpts=PTS-STARTPTS[{chain.audio_label}]")
+            # aformat: 统一采样率48000Hz + 双声道stereo + fltp采样格式（AAC标准格式）
+            audio_filters = [
+                "aformat=sample_rates=48000:channel_layouts=stereo:sample_fmts=fltp",
+                f"atrim=0:{chain.duration}",
+                "asetpts=PTS-STARTPTS",
+            ]
+            audio_parts.append(f"[{idx}:a]{','.join(audio_filters)}[{chain.audio_label}]")
 
     if audio_parts:
         parts.extend(audio_parts)
@@ -612,13 +627,22 @@ def _build_xfade_filter(
     # 总时长需要减去转场重叠部分
     total_duration -= transition_duration * (n - 1)
 
-    # 音频 crossfade（简化处理：使用 adelay + amix）
-    audio_labels = [c.audio_label for c in clip_chains if c.audio_label]
-    if len(audio_labels) >= 2:
-        # 简单拼接音频（不做 crossfade）
-        audio_inputs = "".join(f"[{label}]" for label in audio_labels)
-        parts.append(f"{audio_inputs}concat=n={len(audio_labels)}:v=0:a=1[outa]")
-    elif len(audio_labels) == 1:
-        parts.append(f"[{audio_labels[0]}]acopy[outa]")
+    # 音频：先 aformat 归一化再 concat（不同采样率/声道/采样格式会导致concat失败）
+    audio_chains_with_label = [(c, c.audio_label) for c in clip_chains if c.audio_label]
+    if len(audio_chains_with_label) >= 2:
+        normalized_audio_labels: list[str] = []
+        for chain, _ in audio_chains_with_label:
+            norm_label = f"anorm_{chain.video_label}"
+            audio_filters = [
+                "aformat=sample_rates=48000:channel_layouts=stereo:sample_fmts=fltp",
+                f"atrim=0:{chain.duration}",
+                "asetpts=PTS-STARTPTS",
+            ]
+            parts.append(f"[{chain.audio_label}]{','.join(audio_filters)}[{norm_label}]")
+            normalized_audio_labels.append(norm_label)
+        audio_inputs = "".join(f"[{label}]" for label in normalized_audio_labels)
+        parts.append(f"{audio_inputs}concat=n={len(normalized_audio_labels)}:v=0:a=1[outa]")
+    elif len(audio_chains_with_label) == 1:
+        parts.append(f"[{audio_chains_with_label[0][0].audio_label}]acopy[outa]")
 
     return ";".join(parts), max(0.0, total_duration)

apps/web/.eslintrc.cjs

@@ -8,16 +8,14 @@ module.exports = {
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:react-hooks/recommended",
+    "prettier", // 关掉与 Prettier 冲突的 ESLint 规则
   ],
   ignorePatterns: ["dist", ".eslintrc.cjs"],
   parser: "@typescript-eslint/parser",
   plugins: ["react-refresh"],
   rules: {
-    "react-refresh/only-export-components": [
-      "warn",
-      { allowConstantExport: true },
-    ],
+    "react-refresh/only-export-components": ["warn", { allowConstantExport: true }],
     "@typescript-eslint/no-explicit-any": "warn",
-    "@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_" }],
+    "@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
   },
-};
+}

apps/web/.prettierignore

@@ -0,0 +1,12 @@
+node_modules
+dist
+dist-ssr
+*.local
+.vscode/*
+!.vscode/extensions.json
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

apps/web/.prettierrc.json

@@ -0,0 +1,12 @@
+{
+  "semi": false,
+  "singleQuote": false,
+  "trailingComma": "all",
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "arrowParens": "always",
+  "endOfLine": "lf",
+  "bracketSpacing": true,
+  "bracketSameLine": false
+}

apps/web/README.md

@@ -91,17 +91,17 @@ VITE_API_URL=http://localhost:8000
 使用 Zustand 创建 Store：
 
 ```typescript
-import { create } from "zustand";
+import { create } from "zustand"
 
 interface MyStore {
-  data: any;
-  setData: (data: any) => void;
+  data: any
+  setData: (data: any) => void
 }
 
 export const useMyStore = create<MyStore>((set) => ({
   data: null,
   setData: (data) => set({ data }),
-}));
+}))
 ```
 
 ## 部署

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

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

apps/web/e2e/auth-guard.spec.ts

@@ -1,8 +1,8 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "@playwright/test"
 
 test.describe("App route guard", () => {
   test("redirects anonymous users to login", async ({ page }) => {
-    await page.goto("/app/dashboard");
-    await expect(page).toHaveURL(/\/login/);
-  });
-});
+    await page.goto("/app/dashboard")
+    await expect(page).toHaveURL(/\/login/)
+  })
+})