fix: correct workflow yaml syntax

fix: add workflow to fix cmd agent auth
debug: read auth logic and test various auth methods
2026-07-12 00:48:07 +08:00 · 2026-07-12 00:46:24 +08:00 · 2026-07-12 00:37:11 +08:00 · 2026-07-12 00:35:51 +08:00 · 2026-07-12 00:34:44 +08:00 · 2026-07-12 00:33:07 +08:00
1182 changed files with 36146 additions and 188412 deletions
@@ -1 +0,0 @@
-re-trigger
@@ -1,2 +1 @@
-CI trigger file - safe to delete
-updated!
+# CI trigger Fri Jun 26 09:53:28 PM CST 2026
@@ -1,198 +1,57 @@
-# ============================================================
-# 小虾 SaaS 环境变量完整配置
-# ============================================================
-# 本文件列出所有可配置的环境变量及默认值。
-# 复制为 .env 后按需修改；生产环境务必覆盖所有密钥类配置。
-#
-# 配置读取规则（pydantic-settings，大小写不敏感）：
-#   1. 系统环境变量（最高优先级）
-#   2. .env.{APP_ENV} 文件（如 .env.staging）
-#   3. .env 文件
-#   4. 代码中的默认值（最低优先级）
-# ============================================================
+# 小虾 SaaS 环境变量配置

-
-# ==================== 应用基本配置 ====================
-
-# 应用名称
-APP_NAME=xiaoxia-saas
-
-# 应用版本号（展示用，代码中已内置默认）
-APP_VERSION=0.1.61
-
-# 环境标识：development / staging / production
-# 决定读取 .env.{APP_ENV} 还是 .env，也影响部分配置的严格校验
-APP_ENV=development
-
-# 是否开启 Debug 模式（开发环境 true，生产环境 false）
-DEBUG=true
-
-# 应用基础 URL，用于生成认证邮件、回调链接等
+# ==================== 应用配置 ====================
+APP_NAME=小虾 SaaS
 APP_BASE_URL=http://localhost:3000

-# API 服务监听地址（容器内绑定，外部暴露由 Docker/Nginx 控制）
-API_HOST=0.0.0.0
-
-# API 服务监听端口
-API_PORT=8000
-
-# 是否自动创建数据库表结构（开发环境可开启，生产环境用 alembic migration）
-AUTO_CREATE_SCHEMA=false
-
-
 # ==================== 数据库配置 ====================
+DATABASE_URL=postgresql://xiaoxia_user:your_password@localhost:5432/xiaoxia_saas

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

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

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

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

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

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

 # ==================== CORS 配置 ====================
+CORS_ORIGINS=["http://localhost:3000","http://localhost:5173"]

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

+# ==================== CosyVoice 语音合成配置 ====================
+# 注意：base_url 只需写到 /api/v1，具体路径由代码拼接
+# 模型: cosyvoice-v3-flash (推荐，支持系统音色，性价比高)
+#       cosyvoice-v3-plus (高质量，系统音色少)
+#       cosyvoice-v3.5-flash / cosyvoice-v3.5-plus (仅支持克隆/设计音色，无系统音色)
+# 音色: v3系列系统音色带 _v3 后缀，如 longxiaochun_v3, longxiaoxia_v3, longanyang (无后缀)
 COSYVOICE_API_KEY=your-cosyvoice-api-key
 COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
 COSYVOICE_MODEL=cosyvoice-v3-flash
 COSYVOICE_VOICE=longxiaochun_v3
 COSYVOICE_SAMPLE_RATE=22050
 COSYVOICE_FORMAT=mp3
-
-# 音色克隆模型名（固定为 voice-enrollment，通常不需修改）
-COSYVOICE_CLONE_MODEL=voice-enrollment
-
-
-# ==================== 豆包大模型（火山引擎方舟） ====================
-# 用于 AI 文案生成、智能剪辑等需要大模型能力的场景
-
-DOUBAO_API_KEY=your-doubao-api-key
-DOUBAO_MODEL=doubao-seed-1-6-250615
-DOUBAO_BASE_URL=https://ark.cn-beijing.volces.com/api/v3
-DOUBAO_TIMEOUT=30
-DOUBAO_MAX_RETRIES=2
@@ -5,6 +5,7 @@ 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
@@ -0,0 +1,14 @@
+[flake8]
+max-line-length = 120
+exclude =
+    .git,
+    .cache,
+    __pycache__,
+    .venv,
+    venv,
+    node_modules,
+    alembic
+
+per-file-ignores =
+    tests/integration/*:F821
+    tests/unit/*:F821
@@ -1,161 +0,0 @@
-name: ACR Cleanup
-
-on:
-  schedule:
-    - cron: '0 19 * * *'  # UTC 19:00 = 北京时间凌晨3:00
-  workflow_dispatch:
-    inputs:
-      pr_sha:
-        description: "PR commit SHA（仅清理指定PR镜像，留空则全量清理）"
-        required: false
-        default: ""
-      dry_run:
-        description: "预览模式（dry-run），不实际删除"
-        required: false
-        default: "true"
-  pull_request_target:
-    types: [closed]
-    branches: [develop, main]
-
-concurrency:
-  group: acr-cleanup-${{ gitea.ref }}
-  cancel-in-progress: false
-
-jobs:
-  cleanup:
-    name: ACR Image Cleanup
-    runs-on: ci-l2
-    timeout-minutes: 20
-    permissions:
-      contents: read
-    env:
-      ACR_REGISTRY: xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com
-      ACR_NAMESPACE: xiaoxiakeji
-      ACR_SERVICE: registry.aliyuncs.com:cn-hangzhou:china:cri-fvec8o9q4mmxrkaa
-      GITEA_URL: https://git.xiaoxiajianji.com
-      GITEA_REPO: xiaoxia/xiaoxia-saas
-    steps:
-      - name: Checkout code
-        shell: sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN"             "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"             | bash
-
-      # ====== Cron模式：获取staging运行中镜像作为白名单 ======
-      - name: Get staging running images (whitelist)
-        id: protected_images
-        if: gitea.event_name != 'pull_request_target' && !gitea.event.inputs.pr_sha
-        env:
-          STAGING_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
-        run: |
-          set +e
-          echo "获取staging服务器运行中镜像作为白名单..."
-          mkdir -p ~/.ssh
-          echo "$STAGING_SSH_KEY" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-
-          staging_host="${STAGING_SSH_HOST:-47.98.113.167}"
-          staging_port="${STAGING_SSH_PORT:-22222}"
-
-          ssh-keyscan -p "$staging_port" -H "$staging_host" >> ~/.ssh/known_hosts 2>/dev/null
-
-          # 获取所有运行容器的镜像，提取tag部分
-          IMAGES=$(ssh -p "$staging_port" -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no \
-            "root@$staging_host" "docker ps --format '{{.Image}}' 2>/dev/null" 2>/dev/null | grep -v "^$" | sort -u)
-
-          PROTECTED_TAGS=""
-          if [ -n "$IMAGES" ]; then
-            while IFS= read -r img; do
-              # 从完整镜像名中提取tag（最后一个冒号后）
-              tag=$(echo "$img" | rev | cut -d: -f1 | rev)
-              if [ -n "$tag" ] && [ "$tag" != "latest" ] && [ ${#tag} -gt 5 ]; then
-                if [ -z "$PROTECTED_TAGS" ]; then
-                  PROTECTED_TAGS="$tag"
-                else
-                  PROTECTED_TAGS="$PROTECTED_TAGS,$tag"
-                fi
-              fi
-            done <<< "$IMAGES"
-          fi
-
-          echo "staging运行中镜像tag: ${PROTECTED_TAGS:-（无）}"
-          echo "protected_tags=$PROTECTED_TAGS" >> $GITEA_OUTPUT
-
-      # ====== Docker登录 ======
-      - name: Docker login to ACR
-        env:
-          ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-          ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-        run: |
-          printf '%s' "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" -u "$ACR_USERNAME" --password-stdin
-
-      # ====== 模式1：PR关闭时清理 ======
-      - name: Cleanup PR images (PR closed)
-        if: gitea.event_name == 'pull_request_target'
-        env:
-          ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-          ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          PR_SHA: ${{ gitea.event.pull_request.head.sha }}
-          PR_NUMBER: ${{ gitea.event.pull_request.number }}
-        run: |
-          echo "============================================"
-          echo "  PR #$PR_NUMBER 已关闭，清理对应镜像"
-          echo "  Head SHA: ${PR_SHA::12}"
-          echo "============================================"
-          echo ""
-          python3 scripts/ci/acr_cleanup.py \
-            --pr-sha "$PR_SHA" \
-            --execute
-
-      # ====== 模式2：Cron全量清理 ======
-      - name: Full cleanup (cron / manual)
-        if: gitea.event_name != 'pull_request_target' && !gitea.event.inputs.pr_sha
-        env:
-          ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-          ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          PROTECTED_TAGS: ${{ steps.protected_images.outputs.protected_tags }}
-          DRY_RUN_INPUT: ${{ gitea.event.inputs.dry_run }}
-        run: |
-          echo "============================================"
-          echo "  ACR 全量清理（${{ gitea.event_name }}）"
-          echo "============================================"
-          echo ""
-
-          # 决定是否dry-run
-          DRY_RUN_FLAG=""
-          if [ "$DRY_RUN_INPUT" = "true" ]; then
-            DRY_RUN_FLAG="--dry-run"
-            echo "模式: 预览模式 (dry-run)"
-          else
-            echo "模式: 执行模式"
-          fi
-          echo ""
-
-          python3 scripts/ci/acr_cleanup.py \
-            --keep 20 \
-            --protected-tags "$PROTECTED_TAGS" \
-            $DRY_RUN_FLAG
-
-      # ====== 模式3：手动指定PR SHA清理 ======
-      - name: Cleanup specific PR image (manual)
-        if: gitea.event_name == 'workflow_dispatch' && gitea.event.inputs.pr_sha
-        env:
-          ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-          ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-          PR_SHA: ${{ gitea.event.inputs.pr_sha }}
-          DRY_RUN_INPUT: ${{ gitea.event.inputs.dry_run }}
-        run: |
-          echo "手动清理PR镜像: ${PR_SHA::12}"
-          echo ""
-
-          DRY_RUN_FLAG=""
-          if [ "$DRY_RUN_INPUT" = "true" ]; then
-            DRY_RUN_FLAG="--dry-run"
-          fi
-
-          python3 scripts/ci/acr_cleanup.py \
-            --pr-sha "$PR_SHA" \
-            $DRY_RUN_FLAG
@@ -1,78 +0,0 @@
-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
@@ -1,103 +0,0 @@
-name: CI Health Daily Report
-on:
-  schedule:
-    - cron: '0 1 * * *'  # UTC 01:00 = 北京时间 09:00
-  workflow_dispatch:
-permissions:
-  contents: read
-jobs:
-  ci-health-report:
-    name: CI健康度每日巡检
-    runs-on: ci-l2
-    timeout-minutes: 15
-    steps:
-    - name: Checkout code
-      shell: sh
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        set -eu
-        python3 - <<'PY'
-        import io, os, tarfile, time, urllib.request, urllib.error
-        url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
-        request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
-        last_err = None
-        for attempt in range(5):
-            try:
-                with urllib.request.urlopen(request, timeout=120) as response:
-                    archive = response.read()
-                break
-            except urllib.error.HTTPError as e:
-                last_err = e
-                if e.code >= 500 and attempt < 4:
-                    wait = 2 ** attempt
-                    print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
-                    time.sleep(wait)
-                    continue
-                raise
-            except Exception as e:
-                last_err = e
-                if attempt < 4:
-                    wait = 2 ** attempt
-                    print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
-                    time.sleep(wait)
-                    continue
-                raise
-        else:
-            raise last_err
-        with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
-            root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
-            for member in tar.getmembers():
-                name = member.name
-                if name == root_prefix[:-1]:
-                    continue
-                if name.startswith(root_prefix):
-                    member.name = name[len(root_prefix):]
-                if member.name:
-                    tar.extract(member, '.')
-        PY
-
-    - name: Generate CI Dashboard HTML
-      shell: sh
-      env:
-        GITEA_TOKEN: ${{ github.token }}
-      run: |
-        set +e
-        echo "=== 生成 CI 健康度 HTML 看板 ==="
-        echo "时间: $(date '+%Y-%m-%d %H:%M:%S')"
-        echo ""
-        python3 scripts/ci/ci_dashboard.py --days 7 --html --html-output ci_dashboard.html
-        EXIT_CODE=$?
-        if [ $EXIT_CODE -eq 0 ] && [ -f ci_dashboard.html ]; then
-            HTML_SIZE=$(wc -c < ci_dashboard.html)
-            echo ""
-            echo "✅ HTML 看板生成成功 (${HTML_SIZE} bytes)"
-            echo "路径: $(pwd)/ci_dashboard.html"
-            # 输出文件内容前几行，方便在 Actions 日志中确认
-            echo ""
-            echo "--- 看板预览 (前 5 行) ---"
-            head -5 ci_dashboard.html
-            echo "...（完整内容见产物文件）"
-        else
-            echo "❌ HTML 看板生成失败 (exit code: $EXIT_CODE)"
-        fi
-        echo ""
-        # 永远成功，看板生成失败不影响主流程
-        exit 0
-
-    - name: Run CI health check and report
-      shell: sh
-      env:
-        GITEA_TOKEN: ${{ github.token }}
-        CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
-      run: |
-        set +e
-        echo "=== CI健康度每日巡检 ==="
-        echo "时间: $(date '+%Y-%m-%d %H:%M:%S')"
-        echo ""
-        python3 scripts/ci/ci_health_report.py --limit 30
-        EXIT_CODE=$?
-        echo ""
-        echo "巡检完成 (exit code: $EXIT_CODE)"
-        # 永远成功，不影响CI状态（通知失败不应该标红）
-        exit 0
@@ -1,52 +0,0 @@
-name: CI Trigger Monitor
-
-on:
-  schedule:
-    - cron: '*/5 * * * *'  # 每5分钟检查一次
-  workflow_dispatch:
-    inputs:
-      stale_threshold:
-        description: 'CI未触发告警阈值（分钟）'
-        required: false
-        default: '5'
-
-permissions:
-  contents: read
-
-jobs:
-  monitor:
-    name: Monitor CI Trigger Reliability
-    runs-on: ci-l2
-    timeout-minutes: 5
-    steps:
-      - name: Checkout code
-        shell: sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN"             "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"             | bash
-      
-      - name: Check CI trigger status for all open PRs
-        env:
-          GITEA_API_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
-          GITEA_URL: https://git.xiaoxiajianji.com
-          GITEA_REPO: xiaoxia/xiaoxia-saas
-          CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
-          STALE_THRESHOLD_MIN: ${{ inputs.stale_threshold || 5 }}
-        run: |
-          set +e
-          python3 scripts/ci_trigger_monitor.py
-          # 监控脚本永远不fail，避免告警风暴
-          exit 0
-      - name: Report CI trace
-        if: always()
-        shell: sh
-        env:
-          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
-        run: |
-          STATUS="ok"
-          [ ${{ job.status }} = "success" ] || STATUS="error"
-          START_TIME=""
-          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
-          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
-
@@ -1,77 +0,0 @@
-name: AI Code Review
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-
-# 同一个 PR 只跑一个 review，新的取消旧的
-concurrency:
-  group: code-review-${{ gitea.repository }}-${{ gitea.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  code-review:
-    name: AI Code Review
-    runs-on: ci-l2
-    # 跳过草稿 PR
-    if: ${{ !gitea.event.pull_request.draft }}
-
-    steps:
-      # actions/checkout 由 runner 在宿主机层面处理，不受容器网络影响
-      - name: Checkout code
-        shell: sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN"             "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"             | bash
-
-      - name: Install dependencies
-        run: |
-          # 确保 python3-pip 可用（兼容不同基础镜像）
-          if ! python3 -m pip --version >/dev/null 2>&1; then
-            apt-get update -qq && apt-get install -y -qq python3-pip python3-venv >/dev/null 2>&1
-          fi
-          # 部分镜像 ensurepip 方式兜底
-          if ! python3 -m pip --version >/dev/null 2>&1; then
-            python3 -m ensurepip --upgrade 2>/dev/null || curl -sS https://bootstrap.pypa.io/get-pip.py | python3
-          fi
-          python3 -m pip install --upgrade pip
-          python3 -m pip install requests
-
-      - name: Run AI Code Review
-        env:
-          # Gitea 配置（自动从运行环境获取）
-          GITEA_API_URL: ${{ gitea.server_url }}
-          GITEA_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
-          REPO_NAME: ${{ gitea.repository }}
-          PR_NUMBER: ${{ gitea.event.pull_request.number }}
-          # 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
-
@@ -1,5 +1,4 @@
 name: Daily Health Check
-# 注意：使用 curl step_checkout.sh 方式以兼容 docker runner

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

-      - name: Report CI trace
-        if: always()
-        shell: sh
-        env:
-          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
-        run: |
-          STATUS="ok"
-          [ ${{ job.status }} = "success" ] || STATUS="error"
-          START_TIME=""
-          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
-          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
-
  # ── 2. Staging API 集成测试 ─────────────────────────────────────────
  staging-api-tests:
    name: Staging API Integration Tests
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 10
    outputs:
      report: ${{ steps.smoke.outputs.report }}
@@ -95,15 +120,50 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ github.token }}
        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN" \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
-            | bash
+          set -eu
+          python3 - <<'PY'
+          import io, os, tarfile, time, urllib.request, urllib.error
+          url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
+          request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
+          last_err = None
+          for attempt in range(5):
+              try:
+                  with urllib.request.urlopen(request, timeout=120) as response:
+                      archive = response.read()
+                  break
+              except urllib.error.HTTPError as e:
+                  last_err = e
+                  if e.code >= 500 and attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+              except Exception as e:
+                  last_err = e
+                  if attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+          else:
+              raise last_err
+          with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
+              root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
+              for member in tar.getmembers():
+                  name = member.name
+                  if name == root_prefix[:-1]:
+                      continue
+                  if name.startswith(root_prefix):
+                      member.name = name[len(root_prefix):]
+                  if member.name:
+                      tar.extract(member, '.')
+          PY
+
      - name: Run API smoke test on staging
        id: smoke
        shell: sh
-        env:
-          STAGING_TEST_USER: ${{ secrets.STAGING_TEST_USER }}
-          STAGING_TEST_PASSWORD: ${{ secrets.STAGING_TEST_PASSWORD }}
        run: |
          set +e
          START_TIME=$(date +%s)
@@ -111,8 +171,8 @@ jobs:
          docker run --rm \
            -e BASE_URL=https://staging-api.xiaoxiajianji.com \
            -e WEB_URL=https://staging.xiaoxiajianji.com \
-            -e TEST_USER="$STAGING_TEST_USER" \
-            -e TEST_PASSWORD="$STAGING_TEST_PASSWORD" \
+            -e TEST_USER=18314979086@163.com \
+            -e TEST_PASSWORD=Ying1234 \
            -e CLEANUP_ENABLED=1 \
            -e PERF_CHECK_ENABLED=1 \
            -e PERF_WARN_THRESHOLD_MS=500 \
@@ -183,22 +243,10 @@ jobs:
            echo "report=FAIL" >> "${GITHUB_OUTPUT}"
          fi

-      - name: Report CI trace
-        if: always()
-        shell: sh
-        env:
-          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
-        run: |
-          STATUS="ok"
-          [ ${{ job.status }} = "success" ] || STATUS="error"
-          START_TIME=""
-          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
-          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
-
  # ── 3. Staging 浏览器 E2E ──────────────────────────────────────────
  staging-e2e:
    name: Staging Browser E2E
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 15
    outputs:
      report: ${{ steps.smoke.outputs.report }}
@@ -209,9 +257,47 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ github.token }}
        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN" \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
-            | bash
+          set -eu
+          python3 - <<'PY'
+          import io, os, tarfile, time, urllib.request, urllib.error
+          url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
+          request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
+          last_err = None
+          for attempt in range(5):
+              try:
+                  with urllib.request.urlopen(request, timeout=120) as response:
+                      archive = response.read()
+                  break
+              except urllib.error.HTTPError as e:
+                  last_err = e
+                  if e.code >= 500 and attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+              except Exception as e:
+                  last_err = e
+                  if attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+          else:
+              raise last_err
+          with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
+              root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
+              for member in tar.getmembers():
+                  name = member.name
+                  if name == root_prefix[:-1]:
+                      continue
+                  if name.startswith(root_prefix):
+                      member.name = name[len(root_prefix):]
+                  if member.name:
+                      tar.extract(member, '.')
+          PY
+
      - name: Run Playwright E2E on staging
        id: e2e
        shell: sh
@@ -246,22 +332,10 @@ jobs:
          echo "=========================================="
          exit $EXIT_CODE

-      - name: Report CI trace
-        if: always()
-        shell: sh
-        env:
-          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
-        run: |
-          STATUS="ok"
-          [ ${{ job.status }} = "success" ] || STATUS="error"
-          START_TIME=""
-          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
-          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
-
  # ── 4. 性能基线巡检 ────────────────────────────────────────────────
  performance-check:
    name: Performance Baseline Check
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 8
    outputs:
      report: ${{ steps.report.outputs.report }}
@@ -270,9 +344,6 @@ jobs:
      - name: Run performance baseline checks
        id: perf
        shell: sh
-        env:
-          STAGING_TEST_USER: ${{ secrets.STAGING_TEST_USER }}
-          STAGING_TEST_PASSWORD: ${{ secrets.STAGING_TEST_PASSWORD }}
        run: |
          set +e
          START_TIME=$(date +%s)
@@ -308,10 +379,9 @@ jobs:

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

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

            local CURL_ARGS="-s -o /dev/null -w '%{http_code} %{time_total}' --max-time 30"
            if [ "$method" = "POST" ]; then
-              CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d \"$LOGIN_BODY\""
+              CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d '{\"email\":\"18314979086@163.com\",\"password\":\"Ying1234\"}'"
            fi
            if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
              CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
@@ -514,22 +580,10 @@ jobs:
            exit 0
          fi

-      - name: Report CI trace
-        if: always()
-        shell: sh
-        env:
-          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
-        run: |
-          STATUS="ok"
-          [ ${{ job.status }} = "success" ] || STATUS="error"
-          START_TIME=""
-          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
-          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
-
  # ── 5. 每日巡检汇总报告 ────────────────────────────────────────────
  daily-report:
    name: Daily Check Report
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 2
    if: always()
    needs:
@@ -602,15 +656,3 @@ 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
-
@@ -0,0 +1,44 @@
+name: Debug CMD Agent
+
+on:
+  push:
+    branches:
+      - 'debug/cmd-agent'
+
+jobs:
+  debug:
+    name: Debug CMD Agent
+    runs-on: host
+    timeout-minutes: 5
+    steps:
+      - name: Diagnose
+        shell: bash
+        run: |
+          set +e
+          echo "=== 1. CMD Agent config ==="
+          cat /opt/xiaoxia-cmd-agent/config.json 2>/dev/null || cat /opt/xiaoxia-cmd-agent/config.yaml 2>/dev/null || echo "no config found"
+          ls -la /opt/xiaoxia-cmd-agent/ 2>/dev/null
+
+          echo ""
+          echo "=== 2. CMD Agent process ==="
+          ps aux | grep cmd-agent | grep -v grep
+
+          echo ""
+          echo "=== 3. Local curl test (127.0.0.1:18888) ==="
+          curl -s -X POST http://127.0.0.1:18888/cmd-agent/exec \
+            -H "Authorization: Bearer xsa-f2778a6953d59948cd1e5be4d99f60f7" \
+            -H "Content-Type: application/json" \
+            -d '{"command":"hostname"}' 2>&1 || echo "FAILED"
+
+          echo ""
+          echo "=== 4. Nginx config for cmd-agent ==="
+          grep -r "cmd-agent" /etc/nginx/sites-enabled/ 2>/dev/null || \
+          grep -r "cmd-agent" /etc/nginx/conf.d/ 2>/dev/null || \
+          echo "no nginx cmd-agent config found"
+
+          echo ""
+          echo "=== 5. Nginx access log (last 5 lines) ==="
+          tail -5 /var/log/nginx/access.log 2>/dev/null | grep cmd || echo "no log"
+
+          echo ""
+          echo "=== DONE ==="
@@ -0,0 +1,46 @@
+name: Fix CMD Agent Auth
+
+on:
+  push:
+    branches:
+      - 'debug/cmd-agent'
+
+jobs:
+  fix:
+    runs-on: host
+    steps:
+      - name: 验证不带Bearer
+        run: |
+          curl -s -w "\nHTTP_CODE:%{http_code}" http://127.0.0.1:18888/status -H "Authorization: xsa-f2778a6953d59948cd1e5be4d99f60f7"
+      - name: 验证带Bearer（应该失败）
+        run: |
+          curl -s -w "\nHTTP_CODE:%{http_code}" http://127.0.0.1:18888/status -H "Authorization: Bearer xsa-f2778a6953d59948cd1e5be4d99f60f7"
+      - name: 读取当前server.py的check_auth
+        run: |
+          grep -A 5 "def check_auth" /opt/xiaoxia-cmd-agent/server.py
+      - name: 修复check_auth函数
+        run: |
+          cp /opt/xiaoxia-cmd-agent/server.py /opt/xiaoxia-cmd-agent/server.py.bak
+          sed -i '/def check_auth/,/return True/{
+            /def check_auth/a\        t = self.headers.get("Authorization", "")
+            /if t != AUTH_TOKEN/i\        if t.startswith("Bearer "):\n            t = t[7:]
+          }' /opt/xiaoxia-cmd-agent/server.py
+          echo "Done via sed"
+      - name: 验证修复后的check_auth
+        run: |
+          grep -A 8 "def check_auth" /opt/xiaoxia-cmd-agent/server.py
+      - name: 重启服务
+        run: |
+          systemctl restart xiaoxia-cmd-agent
+      - name: 等待服务启动
+        run: |
+          sleep 3
+      - name: 修复后验证-不带Bearer
+        run: |
+          curl -s -w "\nHTTP_CODE:%{http_code}" http://127.0.0.1:18888/status -H "Authorization: xsa-f2778a6953d59948cd1e5be4d99f60f7"
+      - name: 修复后验证-带Bearer
+        run: |
+          curl -s -w "\nHTTP_CODE:%{http_code}" http://127.0.0.1:18888/status -H "Authorization: Bearer xsa-f2778a6953d59948cd1e5be4d99f60f7"
+      - name: 公网路径验证
+        run: |
+          curl -sk -w "\nHTTP_CODE:%{http_code}" https://127.0.0.1/cmd-agent/status -H "Authorization: Bearer xsa-f2778a6953d59948cd1e5be4d99f60f7"
@@ -1,56 +0,0 @@
-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
@@ -1,113 +0,0 @@
-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
@@ -1,207 +0,0 @@
-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
-
@@ -1,283 +0,0 @@
-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
-        cd apps/web
-
-        # Config npm mirror for speed
-        npm config set registry https://registry.npmmirror.com
-
-        # Install dependencies with retry
-        for i in 1 2 3; do
-          npm ci --no-audit --no-fund && break
-          echo "npm ci failed, retry $i/3..."
-          [ $i -eq 3 ] && exit 1
-          rm -rf node_modules
-          sleep 5
-        done
-
-        # TypeScript check
-        echo "=== TypeScript check ==="
-        npx --no-install tsc --noEmit
-
-        # Vite build
-        echo "=== Vite build ==="
-        export VITE_API_URL=https://staging-api.xiaoxiajianji.com
-        npx --no-install vite build
-
-        echo "=== Build completed ==="
-        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
-
@@ -0,0 +1,38 @@
+name: Read Auth Logic
+
+on:
+  push:
+    branches:
+      - 'debug/cmd-agent'
+
+jobs:
+  read:
+    name: Read check_auth logic
+    runs-on: host
+    timeout-minutes: 3
+    steps:
+      - name: Read
+        shell: bash
+        run: |
+          echo "=== Full server.py (lines 1-50) ==="
+          sed -n '1,50p' /opt/xiaoxia-cmd-agent/server.py
+          echo ""
+          echo "=== Lines 120-160 (startup logic) ==="
+          sed -n '120,160p' /opt/xiaoxia-cmd-agent/server.py
+          echo ""
+          echo "=== Test with X-Token header ==="
+          curl -s -X POST http://127.0.0.1:18888/cmd-agent/exec \
+            -H "X-Token: $(cat /etc/xiaoxia-cmd-agent.token)" \
+            -H "Content-Type: application/json" \
+            -d '{"command":"hostname"}'
+          echo ""
+          echo "=== Test with token in query string ==="
+          curl -s -X POST "http://127.0.0.1:18888/cmd-agent/exec?token=$(cat /etc/xiaoxia-cmd-agent.token)" \
+            -H "Content-Type: application/json" \
+            -d '{"command":"hostname"}'
+          echo ""
+          echo "=== Check if path is /exec not /cmd-agent/exec ==="
+          curl -s -X POST http://127.0.0.1:18888/exec \
+            -H "Authorization: Bearer $(cat /etc/xiaoxia-cmd-agent.token)" \
+            -H "Content-Type: application/json" \
+            -d '{"command":"hostname"}'
@@ -0,0 +1,27 @@
+name: Read CMD Agent Source
+
+on:
+  push:
+    branches:
+      - 'debug/cmd-agent'
+
+jobs:
+  read:
+    name: Read CMD Agent server.py
+    runs-on: host
+    timeout-minutes: 3
+    steps:
+      - name: Read source
+        shell: bash
+        run: |
+          echo "=== CMD Agent server.py (first 80 lines) ==="
+          head -80 /opt/xiaoxia-cmd-agent/server.py
+          echo ""
+          echo "=== Token-related lines ==="
+          grep -n -i "token\|auth\|secret\|key" /opt/xiaoxia-cmd-agent/server.py
+          echo ""
+          echo "=== Systemd service config ==="
+          cat /etc/systemd/system/xiaoxia-cmd-agent.service 2>/dev/null || echo "no systemd service"
+          echo ""
+          echo "=== Environment variables from process ==="
+          cat /proc/1034/environ 2>/dev/null | tr '\0' '\n' | grep -i "token\|auth\|secret\|key" || echo "no env vars found"
@@ -0,0 +1,30 @@
+name: Read CMD Agent Token
+
+on:
+  push:
+    branches:
+      - 'debug/cmd-agent'
+
+jobs:
+  read:
+    name: Read Real Token
+    runs-on: host
+    timeout-minutes: 3
+    steps:
+      - name: Read
+        shell: bash
+        run: |
+          echo "=== Real CMD Agent Token ==="
+          cat /etc/xiaoxia-cmd-agent.token
+          echo ""
+          echo "=== Test with real token ==="
+          curl -s -X POST http://127.0.0.1:18888/cmd-agent/exec \
+            -H "Authorization: Bearer $(cat /etc/xiaoxia-cmd-agent.token)" \
+            -H "Content-Type: application/json" \
+            -d '{"command":"hostname && whoami"}'
+          echo ""
+          echo "=== Nginx config for cmd-agent (full) ==="
+          sed -n '/cmd-agent/,/}/p' /etc/nginx/sites-enabled/00-xiaoxia-saas | head -20
+          echo ""
+          echo "=== All listening ports ==="
+          ss -tlnp | head -20
@@ -1,103 +0,0 @@
-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"
@@ -49,8 +49,3 @@ build/
 tracker_tasks.json

 frontend-v21-ui-prototype-final.html
-
-!.vscode/
-!.vscode/settings.json
-.vscode/extensions.json
-.coverage
@@ -1,29 +0,0 @@
-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
@@ -1,49 +0,0 @@
-{
-  "[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"
-}
@@ -1,3 +1,4 @@
+import os
 from logging.config import fileConfig

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

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

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

 # Interpret the config file for Python logging.
 # This line sets up loggers basically.
@@ -1,47 +0,0 @@
-"""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")
@@ -1,34 +0,0 @@
-"""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")
@@ -1,29 +0,0 @@
-"""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")
@@ -1,29 +0,0 @@
-"""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")
@@ -1,29 +0,0 @@
-"""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")
@@ -1,33 +0,0 @@
-"""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")
@@ -1,34 +0,0 @@
-"""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")
@@ -1,36 +0,0 @@
-"""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
@@ -1,33 +0,0 @@
-"""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")
@@ -1,64 +0,0 @@
-"""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")
@@ -1,37 +0,0 @@
-"""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",
-        ),
-    )
@@ -1,97 +0,0 @@
-"""#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")
@@ -1,48 +0,0 @@
-"""#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")
@@ -1,53 +0,0 @@
-"""#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")
@@ -1,64 +0,0 @@
-"""#642 - 生成任务新增 bgm_config 字段
-
-Revision ID: 052_generation_task_bgm_config
-Revises: 051_generation_task_resolution
-Create Date: 2026-07-25
-
-Changes:
-1. generation_tasks 表新增 bgm_config 字段（JSON类型），存储用户自定义BGM配置
-2. 为空时使用默认空字典
-
-背景：
-#642 一键生成支持自定义BGM 功能在 SQLAlchemy 模型中加了 bgm_config 字段，
-但遗漏了 alembic migration，导致 staging 环境数据库没有该列，
-创建生成任务时直接 500。
-"""
-
-import sqlalchemy as sa
-
-from alembic import context, op
-
-revision = "052_generation_task_bgm_config"
-down_revision = "051_generation_task_resolution"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    if context.get_context().dialect.name == "postgresql":
-        # 检查列是否已存在（幂等）
-        result = conn.execute(
-            sa.text(
-                "SELECT column_name FROM information_schema.columns "
-                "WHERE table_name = 'generation_tasks' AND column_name = 'bgm_config'"
-            )
-        )
-        if result.scalar() is not None:
-            return
-
-    op.add_column(
-        "generation_tasks",
-        sa.Column(
-            "bgm_config",
-            sa.JSON,
-            nullable=False,
-            server_default=sa.text("'{}'::json"),
-        ),
-    )
-
-
-def downgrade() -> None:
-    conn = op.get_bind()
-    if context.get_context().dialect.name == "postgresql":
-        # 检查列是否存在（幂等）
-        result = conn.execute(
-            sa.text(
-                "SELECT column_name FROM information_schema.columns "
-                "WHERE table_name = 'generation_tasks' AND column_name = 'bgm_config'"
-            )
-        )
-        if result.scalar() is None:
-            return
-
-    op.drop_column("generation_tasks", "bgm_config")
@@ -0,0 +1 @@
+"""API application package."""
@@ -0,0 +1 @@
+"""API package."""
@@ -1,27 +1,27 @@
-from app.api.routes.ai import router as ai_router
 from app.api.routes.asset_diagnosis import router as asset_diagnosis_router
 from app.api.routes.asset_libraries import router as asset_libraries_router
 from app.api.routes.assets import router as assets_router
 from app.api.routes.auth import router as auth_router
 from app.api.routes.chunked_upload import router as chunked_upload_router
 from app.api.routes.classification_jobs import router as classification_jobs_router
+from app.api.routes.dashboard import router as dashboard_router
 from app.api.routes.duplication import router as duplication_router
-from app.api.routes.feature_flags import router as feature_flags_router
+from app.api.routes.edit_plans import router as edit_plans_router
+from app.api.routes.edit_templates import router as edit_templates_router
+from app.api.routes.generated_videos import router as generated_videos_router
 from app.api.routes.generation_tasks import router as generation_tasks_router
 from app.api.routes.health import router as health_check_router
 from app.api.routes.ingest_jobs import router as ingest_jobs_router
-from app.api.routes.internal_render import router as internal_render_router
+from app.api.routes.jobs import router as jobs_router
 from app.api.routes.projects import router as projects_router
-from app.api.routes.share import router as share_router
+from app.api.routes.recipes import router as recipes_router
 from app.api.routes.subscription import router as subscription_router
 from app.api.routes.tags import router as tags_router
 from app.api.routes.task_center import router as task_center_router
 from app.api.routes.templates import router as templates_router
-from app.api.routes.templates_editor import router as templates_editor_router
 from app.api.routes.titles import router as titles_router
 from app.api.routes.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
@@ -87,6 +87,15 @@ 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",
@@ -102,14 +111,6 @@ 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",
@@ -120,31 +121,33 @@ 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(
-    templates_editor_router,
-    prefix="/templates/{template_id}/editor",
-    tags=["TemplateEditor"],
+    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"],
 )
 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"],
-)
@@ -1,141 +0,0 @@
-"""路由层共享辅助函数 — 消除跨文件重复定义。"""
-
-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")
@@ -1,136 +0,0 @@
-"""AI 相关接口 — 智能标题、智能素材匹配等.
-
-基于豆包大模型的 AI 能力接口，未配置 API Key 时自动降级为本地模拟。
-"""
-
-from __future__ import annotations
-
-from typing import List, Literal
-
-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"],
-    )
@@ -12,7 +12,7 @@ from app.schemas.asset_library import (
    EnsureDefaultLibraryRequest,
    ListAssetLibrariesResponse,
 )
-from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
+from fastapi import APIRouter, Depends, HTTPException, Query, status

 from packages.application import (
    CreateAssetLibraryCommand,
@@ -22,11 +22,18 @@ 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,
@@ -146,7 +153,7 @@ def ensure_default_library(
    return _to_asset_library_response(created)


-@router.delete("/{library_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
+@router.delete("/{library_id}", status_code=status.HTTP_204_NO_CONTENT)
 def delete_asset_library(
    library_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -161,12 +168,13 @@ 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)
-    for asset in assets_in_library:
-        asset_repository.delete(asset.id)
+    if assets_in_library:
+        asset_ids_to_delete = [a.id for a in assets_in_library]
+        asset_repository.batch_delete(asset_ids_to_delete)

    # 删除素材库本身
    asset_library_repository.delete(library_id)
@@ -1,7 +1,6 @@
 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 (
@@ -12,18 +11,15 @@ from app.dependencies import (
 )
 from app.schemas.asset import (
    AssetResponse,
-    BatchClassifyRequest,
    BatchDeleteRequest,
-    BatchMarkRequest,
-    BatchOperationResponse,
-    BatchTagRequest,
+    BatchDeleteResponse,
    CreateAssetRequest,
    ListAssetsResponse,
    UpdateAssetRequest,
    UpdateAssetReviewRequest,
 )
 from app.schemas.tag import TagAssetsRequest
-from fastapi import APIRouter, Depends, HTTPException, Query, Response
+from fastapi import APIRouter, Depends, HTTPException, Query

 from packages.application import (
    CreateAssetCommand,
@@ -71,12 +67,20 @@ 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),
@@ -86,21 +90,6 @@ 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),
@@ -110,26 +99,6 @@ 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"}

@@ -140,11 +109,11 @@ def list_assets(
        if not filter_tag_ids:
            filter_tag_ids = None

-    # 需要内存过滤的标志（keyword/gender/style/tag_ids/smart_view/classification 无法在 DB 层过滤）
-    needs_memory_filter = bool(keyword or gender or style or filter_tag_ids or smart_view or classification)
+    # 需要内存过滤的标志（keyword/gender/style/tag_ids 无法在 DB 层过滤）
+    needs_memory_filter = bool(keyword or gender or style or filter_tag_ids)

    def _apply_memory_filters(items):
-        """应用 keyword / gender / style / tag_ids / smart_view / classification 内存过滤。"""
+        """应用 keyword / gender / style / tag_ids 内存过滤。"""
        result = items
        if keyword:
            kw = keyword.lower()
@@ -153,38 +122,9 @@ 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 级分页 ──
@@ -196,15 +136,13 @@ 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, status=status_list
-                )
-                total = asset_repository.count_by_library_and_file_type(library_id, ft, status=status_list)
+                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)
            else:
-                items = asset_repository.find_by_library(library_id, skip=skip, limit=limit, status=status_list)
-                total = asset_repository.count_by_project(library.project_id, status=status_list)
+                items = asset_repository.find_by_library(library_id, skip=skip, limit=limit)
+                total = asset_repository.count_by_project(library.project_id)
            return ListAssetsResponse(
                items=[_to_asset_response(item) for item in items],
                total=total,
@@ -214,16 +152,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:
-                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
+                # 无直接方法，加载后按 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]
            else:
-                items = asset_repository.find_by_project(project_id, skip=skip, limit=limit, status=status_list)
-                total = asset_repository.count_by_project(project_id, status=status_list)
+                items = asset_repository.find_by_project(project_id, skip=skip, limit=limit)
+                total = asset_repository.count_by_project(project_id)
                paged = items
            return ListAssetsResponse(
                items=[_to_asset_response(item) for item in paged],
@@ -243,43 +181,22 @@ def list_assets(
        if not project_ids:
            return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)

-        if ft:
-            # 有 kind 过滤：逐项目查 file_type，凑够一页
-            total = 0
-            paged_items: list = []
-            offset = skip
-            remaining = limit
-            for pid in project_ids:
-                proj_total = asset_repository.count_by_project_and_file_type(pid, ft, status=status_list)
-                total += proj_total
-                if offset >= proj_total:
-                    offset -= proj_total
-                    continue
-                proj_items = asset_repository.find_by_project_and_file_type(
-                    pid, ft, skip=offset, limit=remaining, status=status_list
-                )
-                paged_items.extend(proj_items)
-                remaining -= len(proj_items)
-                offset = 0
-                if remaining <= 0:
-                    break
-        else:
-            total = asset_repository.count_by_project_ids(project_ids, status=status_list)
-            # 跨项目分页：逐项目累积直到凑够一页
-            paged_items: list = []
-            offset = skip
-            remaining = limit
-            for pid in project_ids:
-                proj_total = asset_repository.count_by_project(pid, status=status_list)
-                if offset >= proj_total:
-                    offset -= proj_total
-                    continue
-                proj_items = asset_repository.find_by_project(pid, skip=offset, limit=remaining, status=status_list)
-                paged_items.extend(proj_items)
-                remaining -= len(proj_items)
-                offset = 0
-                if remaining <= 0:
-                    break
+        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

        return ListAssetsResponse(
            items=[_to_asset_response(item) for item in paged_items],
@@ -293,23 +210,14 @@ 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], status=status_list
-            )
+            all_items = asset_repository.find_by_library_and_file_type(library_id, kind_to_file_type[kind])
        else:
-            all_items = asset_repository.find_by_library(library_id, status=status_list)
+            all_items = asset_repository.find_by_library(library_id)
    elif project_id:
-        check_project_access(project_id, user_id, project_repository)
-        if kind:
-            ft = kind_to_file_type.get(kind)
-            if ft:
-                all_items = asset_repository.find_by_project_and_file_type(project_id, ft, status=status_list)
-            else:
-                all_items = asset_repository.find_by_project(project_id, status=status_list)
-        else:
-            all_items = asset_repository.find_by_project(project_id, status=status_list)
+        _check_project_access(project_id, user_id, project_repository)
+        all_items = asset_repository.find_by_project(project_id)
    else:
        try:
            projects = project_repository.find_accessible_projects(user_id)
@@ -318,18 +226,12 @@ def list_assets(
            return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
        all_items = []
        for proj in projects:
-            if kind and kind_to_file_type.get(kind):
-                all_items.extend(
-                    asset_repository.find_by_project_and_file_type(proj.id, kind_to_file_type[kind], status=status_list)
-                )
-            else:
-                all_items.extend(asset_repository.find_by_project(proj.id, status=status_list))
+            all_items.extend(asset_repository.find_by_project(proj.id))

    # 应用 kind 过滤（如果有）+ keyword/gender/style
    if kind:
        ft = kind_to_file_type.get(kind)
-        if ft:
-            all_items = [i for i in all_items if i.file_type == ft]
+        all_items = [i for i in all_items if i.mime_type and i.mime_type.startswith(ft or "")]
    filtered = _apply_memory_filters(all_items)
    total = len(filtered)
    paged = filtered[skip : skip + limit]
@@ -360,163 +262,39 @@ def update_asset_review_status(
    item = asset_repository.get(asset_id)
    if item is None:
        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
-    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    _check_project_access(item.project_id, authenticated_user.user.id, project_repository)
    _apply_asset_review_status(item, request.review_status)
    updated = asset_repository.update(item)
    return _to_asset_response(updated)


-@router.post("/batch-delete", response_model=BatchOperationResponse)
+@router.post("/batch-delete", response_model=BatchDeleteResponse)
 def batch_delete_assets(
    request: BatchDeleteRequest,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
    asset_repository: Any = Depends(get_asset_repository),
    project_repository: Any = Depends(get_project_repository),
-) -> BatchOperationResponse:
-    """批量删除素材（软删除，标记 status=deleted），需逐项校验项目权限。"""
+) -> BatchDeleteResponse:
+    """批量删除素材（配音素材等），需逐项校验项目权限。"""
    user_id = authenticated_user.user.id
-    success_ids: list[str] = []
-    failed_details: dict[str, str] = {}
+    deleted_ids: list[str] = []
+    failed_ids: list[str] = []

-    for asset_id in request.asset_ids:
+    for asset_id in request.ids:
        item = asset_repository.find_by_id(asset_id)
        if item is None:
-            failed_details[asset_id] = "not_found"
+            failed_ids.append(asset_id)
            continue
        try:
-            check_project_access(item.project_id, user_id, project_repository)
-            success_ids.append(asset_id)
+            _check_project_access(item.project_id, user_id, project_repository)
+            deleted_ids.append(asset_id)
        except HTTPException:
-            failed_details[asset_id] = "access_denied"
+            failed_ids.append(asset_id)

-    if success_ids:
-        asset_repository.batch_delete(success_ids)
+    if deleted_ids:
+        asset_repository.batch_delete(deleted_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,
-    )
+    return BatchDeleteResponse(deleted_count=len(deleted_ids), failed_ids=failed_ids)


@router.get("/{asset_id}", response_model=AssetResponse)
@@ -529,7 +307,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)


@@ -544,7 +322,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:
@@ -558,7 +336,7 @@ def update_asset(
    return _to_asset_response(updated)


-@router.delete("/{asset_id}", status_code=204, response_class=Response)
+@router.delete("/{asset_id}", status_code=204)
 def delete_asset(
    asset_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -568,7 +346,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)


@@ -585,7 +363,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:
@@ -597,7 +375,7 @@ def tag_asset(
    return _to_asset_response(updated)


-@router.delete("/{asset_id}/tags/{tag_id}", status_code=204, response_class=Response)
+@router.delete("/{asset_id}/tags/{tag_id}", status_code=204)
 def untag_asset(
    asset_id: str,
    tag_id: str,
@@ -609,7 +387,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)

@@ -81,9 +81,6 @@ class CurrentUserResponse(BaseModel):
    username: str
    display_name: str
    email_verified: bool
-    phone: str = ""
-    phone_verified: bool = False
-    binding_complete: bool = False


 class PasswordResetRequestModel(BaseModel):
@@ -108,7 +105,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,
@@ -139,7 +136,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,
@@ -165,7 +162,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,
@@ -197,7 +194,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)


@@ -205,16 +202,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("/forgot-password", response_model=MessageResponse, status_code=status.HTTP_202_ACCEPTED)
+@router.post("/password/forgot", 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,
@@ -226,11 +223,11 @@ async def forgot_password(
    return MessageResponse(message="如果账户存在，密码重置邮件已发送")


-@router.post("/reset-password", response_model=MessageResponse)
+@router.post("/password/reset", 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)
    )
@@ -244,8 +241,9 @@ 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:
@@ -260,18 +258,14 @@ 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,
    )


@@ -330,7 +324,7 @@ def _get_internal_api_keys() -> list[str]:
            if content:
                return [k.strip() for k in content.split(",") if k.strip()]
    except Exception:
-        logger.warning("无法读取内部 API 密钥文件，仅依赖环境变量配置", exc_info=True)
+        logger.debug("Failed to read internal API keys from file", exc_info=True)

    return []

@@ -361,7 +355,7 @@ async def wechat_sync(
    request: WechatSyncRequest,
    user_repository: UserRepository = Depends(get_user_repository),
    _: bool = Depends(_verify_internal_api_key),
-) -> WechatSyncResponse:
+):
    """
    微信同步登录/注册（系统级内部接口）

@@ -387,202 +381,3 @@ 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 返回值补充字段实现
@@ -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,6 +113,22 @@ 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)
@@ -190,6 +206,7 @@ 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:
@@ -204,7 +221,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,
@@ -0,0 +1,92 @@
+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,
+    )
@@ -239,9 +239,7 @@ def get_duplication_detail(
    return _to_detail_response(record)


-@router.delete(
-    "/records/{record_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response
-)
+@router.delete("/records/{record_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None)
 def delete_duplication_record(
    record_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -259,7 +257,7 @@ def delete_duplication_record(

    use_case = DeleteDuplicationRecordUseCase(duplication_repository)
    use_case.execute(record_id)
-    return
+    return Response(status_code=204)


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

    Args:
        assets: 素材库中所有素材（Asset 实体列表）
-        mode: 选取模式 — all=全部, random=随机, smart=智能匹配（多维度评分+多样性）
+        mode: 选取模式 — all=全部, random=随机, smart=按质量评分
        count: 选取数量，0 表示全部（仅 random/smart 模式有效）

    Returns:
@@ -124,19 +129,17 @@ def _select_assets_from_library(
        return [a.id for a in selected]

    if mode == "smart":
-        # 智能匹配：按质量分降序 + 时长降序作为tiebreaker
-        # 注意：这里使用简单的 quality_score 排序保持向后兼容
-        # 更复杂的4维评分+多样性策略由 SmartAssetSelector 服务提供（用于 AI 精选等场景）
-        scored_assets = sorted(
+        # 按质量分降序排列（质量分高的优先），质量分相同时按时长降序
+        sorted_assets = sorted(
            ready_video_assets,
            key=lambda a: (
-                -(a.quality_score if a.quality_score is not None else 0.0),
-                -(getattr(a, "duration", 0.0) or 0.0),
+                a.quality_score if a.quality_score is not None else 0.0,
+                a.duration if a.duration is not None else 0.0,
            ),
+            reverse=True,
        )
-        if count > 0:
-            scored_assets = scored_assets[:count]
-        return [a.id for a in scored_assets]
+        selected = sorted_assets if count <= 0 else sorted_assets[:count]
+        return [a.id for a in selected]

    # 默认 all 模式：返回全部 ready 视频素材
    return [a.id for a in ready_video_assets]
@@ -227,20 +230,6 @@ 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
@@ -287,11 +276,6 @@ 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,
-                    bgm_config=request.bgm_config,
-                    auto_retry_enabled=request.auto_retry_enabled,
-                    auto_retry_max=request.auto_retry_max,
                )
            )
            try:
@@ -305,28 +289,28 @@ def create_generation_task(
                    created_tasks.append(task)
                else:
                    failed_tasks.append(task)
-            except UserPendingLimitExceeded as _e:
+            except UserPendingLimitExceeded:
                # 兜底：如果预检查后又并发提交了，在这里也拦住
                failed_tasks.append(task)
                if not created_tasks:
                    raise HTTPException(
                        status_code=429,
                        detail="您的待处理任务过多，请等待完成后再提交",
-                    ) from _e
+                    )
                break
-            except GlobalQueueFull as _e:
+            except GlobalQueueFull:
                failed_tasks.append(task)
                if not created_tasks:
                    raise HTTPException(
                        status_code=503,
                        detail="系统繁忙，请稍后再试",
-                    ) from _e
+                    )
                break
    except HTTPException:
        raise
    except Exception as e:
        logger.error("[生成任务] 创建失败: %s", e, exc_info=True)
-        raise HTTPException(status_code=500, detail="创建生成任务失败，请稍后重试或查看任务日志") from e
+        raise HTTPException(status_code=500, detail="创建生成任务失败，请稍后重试或查看任务日志")

    items = [_to_generation_task_response(t) for t in created_tasks + failed_tasks]
    return BatchGenerationTaskResponse(items=items, total=len(items))
@@ -355,7 +339,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)


@@ -372,7 +356,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 = []
@@ -427,8 +411,6 @@ 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:
@@ -451,53 +433,3 @@ 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)
@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import datetime

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

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

 from packages.application import (
    CreateProjectCommand,
@@ -72,20 +72,20 @@ def create_project(
    return _to_project_response(project)


-@router.delete("/{project_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
+@router.delete("/{project_id}")
 def delete_project(
    project_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
    project_repository: Any = Depends(get_project_repository),
-) -> dict:
+):
    use_case = DeleteProjectUseCase(project_repository)
    try:
        deleted = use_case.execute(project_id, authenticated_user.user.id)
-    except PermissionError as _e:
+    except PermissionError:
        raise HTTPException(
            status_code=status.HTTP_403_FORBIDDEN,
            detail="Only the project owner can delete this project",
-        ) from _e
+        )
    if not deleted:
        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
-    return  # type: ignore[return-value]
+    return {"message": "Project deleted successfully"}
@@ -0,0 +1,212 @@
+"""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],
+    )
@@ -1,298 +0,0 @@
-"""视频分享 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}
@@ -2,7 +2,6 @@

 from __future__ import annotations

-import logging
 from dataclasses import replace
 from datetime import datetime, timezone
 from typing import List
@@ -21,8 +20,6 @@ from fastapi import APIRouter, Depends, HTTPException, status

 from packages.ports.user_repository import UserRepository

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


@@ -95,7 +92,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)

@@ -103,7 +100,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
@@ -137,7 +134,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"}
@@ -189,7 +186,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":
@@ -215,7 +212,7 @@ async def payment_callback(
    amount: float,
    payment_method: str = "alipay",
    payment_id: str = "",
-) -> dict:
+):
    """支付回调 - 在事务中更新账单和订阅状态

    注意：生产环境需要验证支付签名
@@ -235,7 +232,7 @@ async def payment_callback(

        # 创建账单记录
        record_id = uuid.uuid4().hex
-        repo.create(
+        record = repo.create(
            {
                "id": record_id,
                "user_id": user_id,
@@ -257,9 +254,7 @@ async def payment_callback(
        return {"success": True, "message": "支付成功", "record_id": record_id}
    except Exception as e:
        session.rollback()
-        logger.error(f"支付回调处理失败: user_id={user_id}, plan={plan}, error={e}")
-        # 不返回原始异常信息，避免泄漏内部实现细节
-        raise HTTPException(status_code=500, detail="支付处理失败，请稍后重试") from e
+        raise HTTPException(status_code=500, detail=f"支付处理失败: {str(e)}")
    finally:
        session.close()

@@ -268,7 +263,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 "已关闭自动续费"
@@ -10,7 +10,7 @@ from app.schemas.tag import (
    ListTagsResponse,
    TagResponse,
 )
-from fastapi import APIRouter, Depends, HTTPException, Response
+from fastapi import APIRouter, Depends, HTTPException

 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, response_class=Response)
+@router.delete("/{tag_id}", status_code=204)
 def delete_tag(
    tag_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -1,7 +1,6 @@
 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 (
@@ -22,10 +21,11 @@ from app.schemas.task_center import (
    ProjectTaskResponse,
    UserTaskResponse,
 )
-from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi import APIRouter, Depends, HTTPException

 from packages.application import (
-    RetryGenerationTaskUseCase,
+    CreateGenerationTaskCommand,
+    CreateGenerationTaskUseCase,
    SubmitIngestJobCommand,
    SubmitIngestJobUseCase,
 )
@@ -34,10 +34,6 @@ 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:
@@ -67,8 +63,6 @@ def _generation_step(task) -> str:
        return "生成完成"
    if s == "failed":
        return "生成失败"
-    if s == "cancelled":
-        return "已取消"
    return s


@@ -85,26 +79,6 @@ 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}",
@@ -114,77 +88,49 @@ 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=format_utc_datetime(task.created_at),
-        updated_at=format_utc_datetime(task.completed_at or task.started_at or task.created_at),
+        created_at=task.created_at,
+        updated_at=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），支持状态/类型筛选和分页。"""
-    status = _validate_status(status)
-    page_size = _clamp_page_size(page_size)
+    """用户级任务列表（跨 project），合并 ingest + generation 任务。"""
    user_id = authenticated_user.user.id
-    offset = (page - 1) * page_size
-
    items: list[UserTaskResponse] = []

-    # 生成任务
-    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 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,
+            )
        )
-        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)
-
-    # 总数（仅generation，ingest暂不计入总数以保持简单）
-    total = generation_task_repository.count_by_user_filtered(user_id, status=status)
-
-    return ListTasksResponse(items=items[:page_size], total=total)
+    return ListTasksResponse(items=items)


@router.post("/tasks/{task_id}/retry", response_model=UserTaskResponse)
@@ -193,7 +139,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，retry_count+1）。"""
+    """简化重试：通过 task_id 直接重试失败的生成任务。"""
    task = generation_task_repository.get(task_id)
    if task is None:
        raise HTTPException(status_code=404, detail="Generation task not found")
@@ -203,7 +149,6 @@ 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()
@@ -218,11 +163,20 @@ def retry_task_by_id(
            detail="系统繁忙，请稍后再试",
        )

-    # 原地重试
-    use_case = RetryGenerationTaskUseCase(generation_task_repository)
-    retried = use_case.execute(task_id)
-
-    # 重新入队
+    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,
+        )
+    )
    try:
        if not safe_enqueue_generation_task(
            retried, generation_task_repository, user_id=user_id, log_prefix="[任务中心]"
@@ -238,8 +192,18 @@ def retry_task_by_id(
            status_code=503,
            detail="系统繁忙，请稍后再试",
        ) from None
-
-    return _generation_task_to_user_response(retried)
+    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,
+    )


 # ── 项目级端点 ──
@@ -248,64 +212,37 @@ 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] = []
-
-    # 导入任务
-    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),
-                )
+    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 == "generation":
-        gen_items = generation_task_repository.list_by_project_filtered(
-            project_id,
-            status=status,
-            limit=page_size + 1,
-            offset=offset,
        )
-        for task in gen_items:
-            items.append(_generation_task_to_project_response(task))
-
+    for task in generation_task_repository.list_by_project(project_id):
+        items.append(_generation_task_to_project_response(task))
    items.sort(key=lambda item: item.updated_at or item.created_at or "", reverse=True)
-
-    total = generation_task_repository.count_by_project_filtered(project_id, status=status)
-
-    return ListProjectTasksResponse(items=items[:page_size], total=total)
+    return ListProjectTasksResponse(items=items)


@router.post("/tasks/{task_type}/{source_id}/retry", response_model=ProjectTaskResponse)
@@ -316,7 +253,6 @@ 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:
@@ -325,7 +261,6 @@ 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()
@@ -340,10 +275,20 @@ def retry_project_task(
                detail="系统繁忙，请稍后再试",
            )

-        # 原地重试
-        use_case = RetryGenerationTaskUseCase(generation_task_repository)
-        retried = use_case.execute(source_id)
-
+        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,
+            )
+        )
        try:
            if not safe_enqueue_generation_task(
                retried, generation_task_repository, user_id=user_id, log_prefix="[任务中心]"
@@ -360,16 +305,15 @@ 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)  # type: ignore[assignment]
+        use_case = SubmitIngestJobUseCase(ingest_job_repository)
        retried = use_case.execute(
-            SubmitIngestJobCommand(  # type: ignore[arg-type]
+            SubmitIngestJobCommand(
                project_id=job.project_id,
                library_id=job.library_id,
                storage_key=job.storage_key,
@@ -384,7 +328,7 @@ def retry_project_task(
            progress=0,
            current_step=_ingest_step(retried),
            source_id=retried.id,
-            created_at=format_utc_datetime(retried.created_at),
-            updated_at=format_utc_datetime(retried.updated_at),  # type: ignore[attr-defined]
+            created_at=retried.created_at,
+            updated_at=retried.updated_at,
        )
    raise HTTPException(status_code=400, detail="Unsupported task type")
@@ -8,16 +8,13 @@ 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,
@@ -30,24 +27,19 @@ 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,
@@ -75,7 +67,7 @@ def _segment_to_response(seg) -> SegmentResponse:
    )


-def _to_response(template, usage_count: int = 0) -> TemplateResponse:
+def _to_response(template) -> TemplateResponse:
    return TemplateResponse(
        id=template.id,
        user_id=template.user_id,
@@ -89,7 +81,6 @@ def _to_response(template, usage_count: int = 0) -> 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,
    )
@@ -102,36 +93,19 @@ def _to_response(template, usage_count: int = 0) -> 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, 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))
+        templates = use_case.execute(user_id, skip=skip, limit=limit)
+        total = template_repository.count_by_user(user_id)
    except Exception:
        logger.exception("list_templates 查询失败: user_id=%s", user_id)
        return ListTemplatesResponse(items=[], total=0)
    return ListTemplatesResponse(
-        items=items,
+        items=[_to_response(t) for t in templates],
        total=total,
    )

@@ -146,13 +120,12 @@ def get_template(
    try:
        use_case = GetTemplateUseCase(template_repository)
        template = use_case.execute(template_id, user_id)
-        usage = template_repository.get_usage_count(template_id)
-    except Exception as _e:
+    except Exception:
        logger.exception("get_template 查询失败: template_id=%s", template_id)
-        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="模板查询失败") from _e
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="模板查询失败")
    if template is None:
        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
-    return _to_response(template, usage_count=usage)
+    return _to_response(template)


@router.post("", response_model=TemplateResponse, status_code=status.HTTP_201_CREATED)
@@ -186,7 +159,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)) from exc
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))
    return _to_response(template)


@@ -226,14 +199,14 @@ def update_template(
    use_case = UpdateTemplateUseCase(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 NotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
    except ValidationError as exc:
-        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))
    return _to_response(template)


-@router.delete("/{template_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
+@router.delete("/{template_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None)
 def delete_template(
    template_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -244,48 +217,7 @@ 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
-
-
-@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)
+    return Response(status_code=204)


@router.post("/{template_id}/toggle-favorite", response_model=ToggleFavoriteResponse)
@@ -299,9 +231,9 @@ def toggle_favorite(
    use_case = GetTemplateUseCase(template_repository)
    try:
        template = use_case.execute(template_id, user_id)
-    except Exception as _e:
+    except Exception:
        logger.exception("toggle_favorite 查询失败: template_id=%s", template_id)
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
    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)
@@ -326,10 +258,10 @@ def validate_template(
    use_case = ValidateTemplateUseCase(template_repository)
    try:
        result = use_case.execute(command)
-    except NotFoundError as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
+    except NotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
    except ValidationError as exc:
-        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))

    return ValidateTemplateResponse(
        template=_to_response(result.template),
@@ -375,9 +307,7 @@ def create_category(
    )


-@router.delete(
-    "/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response
-)
+@router.delete("/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None)
 def delete_category(
    category_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -389,22 +319,3 @@ 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)
@@ -1,65 +0,0 @@
-"""模板编辑器 API 路由包.
-
-将原来 2560 行的 templates_editor.py 巨无霸拆分为 12 个模块：
- schemas.py:        所有 Pydantic model
- dependencies.py:   依赖注入
- _utils.py:         工具函数
- _fallback.py:      自动兜底逻辑
- draft.py:          草稿管理（详情/更新/发布/版本/回滚）
- clips.py:          片段管理（CRUD/分割/合并/重排/批量删除/从素材创建）
- adjustments.py:    片段调整（速度/音量/裁剪/批量调速）
- bgm.py:            BGM 管理
- effects.py:        转场 + 滤镜
- export.py:         导出配置
- cover.py:          封面管理 + AI 生成封面
- subtitles.py:      字幕管理
- ai_features.py:    AI 推荐
- generation.py:     生成（触发/进度/记录）
- timeline.py:       时间线
-
-挂载路径: /api/v1/templates/{template_id}/editor/
-"""
-
-from __future__ import annotations
-
-# 向后兼容：测试和其他模块可能直接从 templates_editor 导入这些符号
-from app.auth import get_current_user  # noqa: F401
-from app.dependencies import get_db_session  # noqa: F401
-from fastapi import APIRouter
-
-from .adjustments import router as adjustments_router
-from .ai_features import router as ai_features_router
-from .bgm import router as bgm_router
-from .clips import router as clips_router
-from .cover import router as cover_router
-from .dependencies import get_draft_plan_id, get_editor_services  # noqa: F401
-from .draft import router as draft_router
-from .effects import router as effects_router
-from .export import router as export_router
-from .generation import router as generation_router
-from .subtitles import router as subtitles_router
-from .timeline import router as timeline_router
-
-# 主 router，所有子路由都合并到这里
-router = APIRouter(tags=["Template Editor"])
-
-# 合并所有子模块的路由（不用 include_router 是因为子路由有空路径 ""）
-_sub_routers = [
-    draft_router,
-    clips_router,
-    adjustments_router,
-    bgm_router,
-    effects_router,
-    export_router,
-    cover_router,
-    subtitles_router,
-    ai_features_router,
-    generation_router,
-    timeline_router,
-]
-
-for sub in _sub_routers:
-    for route in sub.routes:
-        router.routes.append(route)
-
-__all__ = ["router"]
@@ -1,163 +0,0 @@
-"""模板编辑器自动兜底逻辑.
-
-generate_editor_draft 触发生成前的自动修复流程：
-1. draft → editing 状态迁移
-2. 无片段时从模板复制片段配置
-3. 为无素材片段分配指定素材
-4. 项目有素材库时自动选素材
-"""
-
-from __future__ import annotations
-
-import logging
-import random
-from typing import Any
-
-from app.services.edit_plan_service import EditPlanService
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.template_clip_config_repository import (
-    SQLAlchemyTemplateClipConfigRepository,
-)
-from packages.adapters.sqlalchemy_impl.template_repository import (
-    SQLAlchemyTemplateRepository,
-)
-from packages.domain.edit_plan import EditPlanStatus
-
-logger = logging.getLogger(__name__)
-
-
-def _auto_fallback_draft_to_editing(
-    svc: EditPlanService, plan_id: str, plan_check
-) -> None:
-    """自动兜底 1: draft → editing"""
-    if plan_check.status == EditPlanStatus.DRAFT:
-        logger.info("模板编辑器自动兜底: plan=%s draft→editing", plan_id)
-        svc.transition_status(plan_id, EditPlanStatus.EDITING)
-
-
-def _auto_fallback_copy_template_clips(
-    svc: EditPlanService, plan_id: str, plan_check, db: Session
-) -> None:
-    """自动兜底 2: 无片段 + 有 template_id → 从模板复制片段配置"""
-    existing_clips = svc.count_clips(plan_id)
-    if existing_clips == 0 and plan_check.template_id:
-        logger.info(
-            "模板编辑器自动兜底: plan=%s 无片段，从模板 %s 复制片段配置",
-            plan_id,
-            plan_check.template_id,
-        )
-        clip_config_repo = SQLAlchemyTemplateClipConfigRepository(db)
-        configs = clip_config_repo.list_by_template(plan_check.template_id)
-        if configs:
-            for cfg in configs:
-                svc.create_clip(
-                    plan_id=plan_id,
-                    clip_type=cfg.clip_type.value
-                    if hasattr(cfg.clip_type, "value")
-                    else cfg.clip_type,
-                    order=cfg.order,
-                    template_clip_config_id=cfg.id,
-                    duration=cfg.default_duration,
-                    transition_effect=cfg.transition_effect.value
-                    if hasattr(cfg.transition_effect, "value")
-                    else cfg.transition_effect,
-                )
-            logger.info(
-                "模板编辑器自动兜底: plan=%s 从 template_clip_configs 复制了 %d 个片段",
-                plan_id,
-                len(configs),
-            )
-        else:
-            tpl_repo = SQLAlchemyTemplateRepository(db)
-            segments = tpl_repo.list_segments(plan_check.template_id)
-            for seg in segments:
-                avg_duration = (seg.duration_min + seg.duration_max) / 2
-                svc.create_clip(
-                    plan_id=plan_id,
-                    clip_type="main",
-                    order=seg.segment_order,
-                    duration=avg_duration,
-                    config={
-                        "material_type": seg.material_type or "",
-                        "template_segment_id": seg.id,
-                    },
-                )
-            logger.info(
-                "模板编辑器自动兜底: plan=%s 从旧模板 segments 复制了 %d 个片段",
-                plan_id,
-                len(segments),
-            )
-
-
-def _auto_fallback_assign_assets(
-    svc: EditPlanService, plan_id: str, plan_check
-) -> list:
-    """自动兜底 3: 为没有素材的片段分配素材。返回剩余无素材片段列表。"""
-    all_clips = svc.list_clips(plan_id)
-    clips_without_asset = [c for c in all_clips if not c.asset_id]
-    config_asset_ids = (plan_check.config or {}).get("asset_ids", [])
-
-    if clips_without_asset and config_asset_ids:
-        logger.info(
-            "模板编辑器自动兜底3: plan=%s 为 %d 个无素材片段分配 %d 个指定素材",
-            plan_id,
-            len(clips_without_asset),
-            len(config_asset_ids),
-        )
-        for i, clip in enumerate(clips_without_asset):
-            asset_idx = i % len(config_asset_ids)
-            svc.assign_asset(clip.id, config_asset_ids[asset_idx])
-        logger.info("模板编辑器自动兜底3: plan=%s 素材分配完成", plan_id)
-        clips_without_asset = []
-
-    return clips_without_asset
-
-
-def _auto_fallback_auto_material_mode(
-    svc: EditPlanService,
-    plan_id: str,
-    plan_check,
-    clips_without_asset: list,
-    asset_library_repo: Any,
-    asset_repo: Any,
-) -> None:
-    """自动兜底 4: 项目有视频素材库时自动选素材"""
-    if not clips_without_asset:
-        return
-    if not plan_check.project_id:
-        return
-
-    logger.info(
-        "模板编辑器自动兜底4: plan=%s 自动选素材分配给 %d 个无素材片段",
-        plan_id,
-        len(clips_without_asset),
-    )
-    libs = asset_library_repo.find_by_project(plan_check.project_id)
-    video_lib = None
-    for lib in libs:
-        lib_kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
-        if lib_kind == "video":
-            video_lib = lib
-            break
-
-    if video_lib:
-        assets = asset_repo.find_by_library(video_lib.id)
-        ready_videos = [
-            a
-            for a in assets
-            if (a.status.value if hasattr(a.status, "value") else a.status) == "ready"
-            and a.mime_type
-            and a.mime_type.startswith("video")
-        ]
-        if ready_videos:
-            random.shuffle(ready_videos)
-            for i, clip in enumerate(clips_without_asset):
-                asset = ready_videos[i % len(ready_videos)]
-                svc.assign_asset(clip.id, asset.id)
-            logger.info(
-                "模板编辑器自动兜底4: plan=%s 从素材库 %s 分配了 %d 个素材",
-                plan_id,
-                video_lib.name,
-                len(ready_videos),
-            )
@@ -1,109 +0,0 @@
-"""模板编辑器内部工具函数.
-
-纯函数，不依赖请求上下文。
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from .schemas import ClipAdjustResponse
-
-# 时间线场景颜色映射
-_CLIP_TYPE_COLORS = {
-    "intro": "#6366f1",
-    "title": "#6366f1",
-    "product": "#818cf8",
-    "showcase": "#10b981",
-    "scene": "#10b981",
-    "subtitle": "#f59e0b",
-    "text": "#f59e0b",
-    "cta": "#ef4444",
-    "outro": "#ef4444",
-    "voiceover": "#8b5cf6",
-    "transition": "#64748b",
-}
-_DEFAULT_COLOR = "#6366f1"
-
-
-def _format_time(seconds: float) -> str:
-    """秒数格式化为 m:ss"""
-    m = int(seconds) // 60
-    s = int(seconds) % 60
-    return f"{m}:{s:02d}"
-
-
-def _clip_type_to_scene_label(clip_type: str, text_content: str) -> str:
-    """片段类型转时间线场景标签"""
-    type_labels = {
-        "intro": "开场",
-        "title": "标题",
-        "product": "产品展示",
-        "showcase": "场景展示",
-        "scene": "场景",
-        "subtitle": "字幕",
-        "text": "文字",
-        "cta": "结尾 CTA",
-        "outro": "结尾",
-        "voiceover": "配音",
-        "transition": "转场",
-    }
-    label = type_labels.get(clip_type, clip_type or "片段")
-    if text_content:
-        short = text_content[:20].strip()
-        if short:
-            return f"{label} - {short}"
-    return label
-
-
-# ── 片段调整相关工具 ────────────────────────────────────────────────────────
-
-
-def _get_clip_config(clip) -> dict:
-    """安全获取 clip.config"""
-    config = getattr(clip, "config", {}) or {}
-    if not isinstance(config, dict):
-        config = {}
-    return config
-
-
-def _get_adjust_volume(clip) -> float:
-    """获取片段音量"""
-    config = _get_clip_config(clip)
-    return float(config.get("volume", 1.0))
-
-
-def _get_adjust_trim(clip) -> tuple[float, float]:
-    """获取片段裁剪起止"""
-    config = _get_clip_config(clip)
-    trim_start = float(config.get("trim_start", 0.0))
-    trim_end = float(config.get("trim_end", 0.0))
-    return trim_start, trim_end
-
-
-def _build_adjust_response(clip) -> ClipAdjustResponse:
-    """构造片段调整响应"""
-    trim_start, trim_end = _get_adjust_trim(clip)
-    return ClipAdjustResponse(
-        clip_id=clip.id,
-        speed=clip.playback_speed,
-        volume=_get_adjust_volume(clip),
-        trim_start=trim_start,
-        trim_end=trim_end,
-        duration=clip.duration,
-    )
-
-
-def _validate_trim(trim_start: float, trim_end: float, total_duration: float) -> None:
-    """校验裁剪时长合法性"""
-    if trim_start + trim_end >= total_duration:
-        raise ValueError(
-            f"裁剪总时长（{trim_start + trim_end:.2f}s）不能大于等于片段总时长（{total_duration:.2f}s）"
-        )
-
-
-def _clip_value(value: Any) -> str:
-    """获取枚举/字符串值的统一方法"""
-    if hasattr(value, "value"):
-        return value.value
-    return str(value)
@@ -1,167 +0,0 @@
-"""片段调整路由.
-
-端点：
- PUT /clips/{clip_id}/speed         调速
- PUT /clips/{clip_id}/volume        调音量
- PUT /clips/{clip_id}/trim          裁剪
- PUT /clips/{clip_id}/adjustments   统一调整
- POST /clips/batch-speed            批量调速
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException
-
-from ._utils import _build_adjust_response, _get_adjust_trim, _get_clip_config, _validate_trim
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import (
-    BatchSpeedRequest,
-    BatchSpeedResponse,
-    ClipAdjustmentsRequest,
-    ClipAdjustResponse,
-    SpeedAdjustRequest,
-    TrimAdjustRequest,
-    VolumeAdjustRequest,
-)
-
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.put("/clips/{clip_id}/speed", response_model=ClipAdjustResponse)
-def adjust_editor_clip_speed(
-    template_id: str,
-    clip_id: str,
-    body: SpeedAdjustRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipAdjustResponse:
-    """调整片段播放速度"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    updated = plan_svc.update_clip(clip_id, playback_speed=body.speed)
-    return _build_adjust_response(updated)
-
-
-@router.put("/clips/{clip_id}/volume", response_model=ClipAdjustResponse)
-def adjust_editor_clip_volume(
-    template_id: str,
-    clip_id: str,
-    body: VolumeAdjustRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipAdjustResponse:
-    """调整片段音量"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(_get_clip_config(clip))
-    config["volume"] = body.volume
-    updated = plan_svc.update_clip(clip_id, config=config)
-    return _build_adjust_response(updated)
-
-
-@router.put("/clips/{clip_id}/trim", response_model=ClipAdjustResponse)
-def adjust_editor_clip_trim(
-    template_id: str,
-    clip_id: str,
-    body: TrimAdjustRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipAdjustResponse:
-    """裁剪片段（trim in/out）"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    try:
-        _validate_trim(body.trim_start, body.trim_end, clip.duration)
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e)) from e
-
-    config = dict(_get_clip_config(clip))
-    config["trim_start"] = body.trim_start
-    config["trim_end"] = body.trim_end
-    updated = plan_svc.update_clip(clip_id, config=config)
-    return _build_adjust_response(updated)
-
-
-@router.put("/clips/{clip_id}/adjustments", response_model=ClipAdjustResponse)
-def adjust_editor_clip_all(
-    template_id: str,
-    clip_id: str,
-    body: ClipAdjustmentsRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipAdjustResponse:
-    """统一调整片段的 speed / volume / trim"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    update_kwargs: dict[str, Any] = {}
-    config_updates: dict[str, Any] = {}
-
-    if body.speed is not None:
-        update_kwargs["playback_speed"] = body.speed
-    if body.volume is not None:
-        config_updates["volume"] = body.volume
-    if body.trim_start is not None:
-        config_updates["trim_start"] = body.trim_start
-    if body.trim_end is not None:
-        config_updates["trim_end"] = body.trim_end
-
-    current_trim_start, current_trim_end = _get_adjust_trim(clip)
-    new_trim_start = body.trim_start if body.trim_start is not None else current_trim_start
-    new_trim_end = body.trim_end if body.trim_end is not None else current_trim_end
-
-    if body.trim_start is not None or body.trim_end is not None:
-        try:
-            _validate_trim(new_trim_start, new_trim_end, clip.duration)
-        except ValueError as e:
-            raise HTTPException(status_code=400, detail=str(e)) from e
-
-    if config_updates:
-        config = dict(_get_clip_config(clip))
-        config.update(config_updates)
-        update_kwargs["config"] = config
-
-    if not update_kwargs:
-        return _build_adjust_response(clip)
-
-    updated = plan_svc.update_clip(clip_id, **update_kwargs)
-    return _build_adjust_response(updated)
-
-
-@router.post("/clips/batch-speed", response_model=BatchSpeedResponse)
-def batch_adjust_editor_speed(
-    template_id: str,
-    body: BatchSpeedRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> BatchSpeedResponse:
-    """批量调整草稿内所有片段的播放速度"""
-    _, plan_svc = services
-    clips = plan_svc.list_clips(plan_id, limit=500, skip=0)
-    count = 0
-    for clip in clips:
-        plan_svc.update_clip(clip.id, playback_speed=body.speed)
-        count += 1
-
-    return BatchSpeedResponse(updated_count=count, plan_id=plan_id)
@@ -1,121 +0,0 @@
-"""AI 功能路由.
-
-端点：
- POST /ai-recommend       AI 推荐片段方案
-"""
-
-from __future__ import annotations
-
-import logging
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, status
-from sqlalchemy.orm import Session
-
-from packages.domain.config_schemas import normalize_plan_config
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import AIRecommendRequest, AIRecommendResponse
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.post("/ai-recommend", response_model=AIRecommendResponse)
-def editor_ai_recommend(
-    template_id: str,
-    body: AIRecommendRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> AIRecommendResponse:
-    """AI 推荐片段方案"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    plan_status = plan.status.value if hasattr(plan.status, "value") else plan.status
-    if plan_status not in ("draft", "editing"):
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="当前草稿状态不支持AI推荐，请先编辑后再试",
-        )
-
-    from packages.shared.ai_service import run_ai_recommend
-
-    result = run_ai_recommend(
-        plan_id=plan_id,
-        template_id=plan.template_id,
-        asset_ids=body.asset_ids,
-        editing_mode=body.editing_mode,
-        target_duration=body.target_duration,
-    )
-
-    try:
-        plan_svc.delete_all_clips(plan_id)
-
-        for clip_data in result["clips"]:
-            plan_svc.create_clip(
-                plan_id=plan_id,
-                clip_type=clip_data["clip_type"],
-                order=clip_data["order"],
-                text_content=clip_data.get("text_content", ""),
-                duration=clip_data["duration"],
-                transition_effect=clip_data.get("transition_effect", "cut"),
-                asset_id=clip_data.get("asset_id", ""),
-                start_time=clip_data.get("start_time", 0.0),
-                config=clip_data.get("config", {}),
-            )
-
-        normalized_config = normalize_plan_config(result.get("config", {}))
-        plan_svc.update_plan(
-            plan_id,
-            config=normalized_config,
-            total_duration=result["total_duration"],
-        )
-    except Exception as _e:
-        logger.exception(
-            "模板编辑器AI推荐写入失败: template_id=%s plan_id=%s",
-            template_id,
-            plan_id,
-        )
-        try:
-            db.rollback()
-        except Exception:
-            pass
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="AI推荐结果保存失败，请稍后重试",
-        ) from _e
-
-    logger.info(
-        "模板编辑器AI推荐: template_id=%s plan_id=%s clips=%d duration=%.1f by user=%s",
-        template_id,
-        plan_id,
-        len(result["clips"]),
-        result["total_duration"],
-        current_user.user.id,
-    )
-
-    return AIRecommendResponse(
-        plan_id=plan_id,
-        clips=[
-            {
-                "clip_type": c["clip_type"],
-                "order": c["order"],
-                "text_content": c.get("text_content", ""),
-                "duration": c["duration"],
-                "transition_effect": c.get("transition_effect", "cut"),
-                "asset_id": c.get("asset_id", ""),
-                "start_time": c.get("start_time", 0.0),
-                "config": c.get("config", {}),
-            }
-            for c in result["clips"]
-        ],
-        config=normalized_config,
-        total_duration=result["total_duration"],
-        confidence=result["confidence"],
-    )
@@ -1,133 +0,0 @@
-"""BGM 管理路由.
-
-端点：
- GET  /bgm              获取 BGM 配置
- PUT  /bgm              更新 BGM 配置
- GET  /bgm/presets      预设 BGM 列表
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import BGMConfigUpdateRequest
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.get("/bgm", response_model=dict[str, Any])
-def get_editor_bgm(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取草稿的 BGM 配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    config = plan.config or {}
-    return {
-        "plan_id": plan.id,
-        "bgm": config.get("bgm", {}),
-    }
-
-
-@router.put("/bgm", response_model=dict[str, Any])
-def update_editor_bgm(
-    template_id: str,
-    body: BGMConfigUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-):
-    """更新草稿的 BGM 配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    config = dict(plan.config) if plan.config else {}
-    current_bgm = dict(config.get("bgm", {}))
-    update_data = body.model_dump(exclude_none=True)
-    current_bgm.update(update_data)
-
-    if current_bgm.get("enabled"):
-        has_source = any(
-            current_bgm.get(key)
-            for key in ("asset_id", "preset_id", "audio_url")
-            if current_bgm.get(key)
-        )
-        if not has_source:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="启用 BGM 时需要指定素材来源（asset_id / preset_id / audio_url）",
-            )
-
-    config["bgm"] = current_bgm
-    updated_plan = plan_svc.update_plan_config(plan_id, config)
-
-    logger.info(
-        "模板编辑器更新BGM: template_id=%s plan_id=%s enabled=%s by user=%s",
-        template_id,
-        plan_id,
-        current_bgm.get("enabled", False),
-        current_user.user.id,
-    )
-
-    return {
-        "plan_id": updated_plan.id,
-        "bgm": current_bgm,
-    }
-
-
-@router.get("/bgm/presets", response_model=dict[str, Any])
-def list_editor_bgm_presets(
-    style: str | None = Query(default=None, description="按风格筛选"),
-    keyword: str | None = Query(default=None, description="关键词搜索"),
-    skip: int = Query(default=0, ge=0, description="分页偏移"),
-    limit: int = Query(default=50, ge=1, le=200, description="每页数量"),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取预设 BGM 列表"""
-    from packages.domain.preset_bgm import (
-        BGM_STYLES,
-        PRESET_BGM_LIBRARY,
-        list_preset_bgm_by_style,
-        search_preset_bgm,
-    )
-
-    bgm_list = PRESET_BGM_LIBRARY
-    if keyword:
-        bgm_list = search_preset_bgm(keyword)
-    elif style:
-        bgm_list = list_preset_bgm_by_style(style)
-
-    total = len(bgm_list)
-    paged = bgm_list[skip : skip + limit]
-
-    return {
-        "total": total,
-        "skip": skip,
-        "limit": limit,
-        "styles": BGM_STYLES,
-        "items": [
-            {
-                "id": bgm.id,
-                "name": bgm.name,
-                "style": bgm.style,
-                "style_label": BGM_STYLES.get(bgm.style, bgm.style),
-                "duration": bgm.duration,
-                "artist": bgm.artist,
-                "description": bgm.description,
-                "tags": bgm.tags,
-                "audio_url": bgm.audio_url,
-            }
-            for bgm in paged
-        ],
-    }
@@ -1,318 +0,0 @@
-"""片段管理路由.
-
-端点：
- GET    /clips                    片段列表
- POST   /clips                    创建片段
- GET    /clips/{clip_id}          片段详情
- PUT    /clips/{clip_id}          更新片段
- DELETE /clips/{clip_id}          删除片段
- POST   /clips/{clip_id}/split    分割片段
- POST   /clips/merge              合并片段
- POST   /clips/reorder            重排片段
- POST   /clips/batch-delete       批量删除
- POST   /clips/from-assets        从素材创建片段
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import (
-    ClipBatchDeleteRequest,
-    ClipBatchDeleteResponse,
-    ClipReorderRequest,
-    ClipReorderResponse,
-    ClipsFromAssetsRequest,
-    ClipsFromAssetsResponse,
-    EditorClipCreateRequest,
-    EditorClipListResponse,
-    EditorClipResponse,
-    EditorClipUpdateRequest,
-    MergeClipsRequest,
-    SplitClipRequest,
-)
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Template Editor"])
-
-
-def _clip_to_response(clip) -> EditorClipResponse:
-    """统一构造片段响应"""
-    return EditorClipResponse(
-        id=clip.id,
-        plan_id=clip.plan_id,
-        clip_type=clip.clip_type.value
-        if hasattr(clip.clip_type, "value")
-        else str(clip.clip_type),
-        order=clip.order,
-        duration=clip.duration,
-        text_content=clip.text_content or "",
-        transition_effect=clip.transition_effect.value
-        if hasattr(clip.transition_effect, "value")
-        else str(clip.transition_effect),
-        playback_speed=clip.playback_speed or 1.0,
-        config=clip.config or {},
-    )
-
-
-@router.get("/clips", response_model=EditorClipListResponse)
-def list_draft_clips(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    skip: int = Query(default=0, ge=0),
-    limit: int = Query(default=100, ge=1, le=500),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取草稿的片段列表"""
-    _, plan_svc = services
-    clips = plan_svc.list_clips(plan_id, skip=skip, limit=limit)
-    total = plan_svc.count_clips(plan_id)
-    return EditorClipListResponse(
-        items=[_clip_to_response(c) for c in clips],
-        total=total,
-    )
-
-
-@router.post("/clips", response_model=EditorClipResponse, status_code=status.HTTP_201_CREATED)
-def create_draft_clip(
-    template_id: str,
-    req: EditorClipCreateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """在草稿中创建新片段"""
-    _, plan_svc = services
-    try:
-        clip = plan_svc.create_clip(
-            plan_id,
-            clip_type=req.clip_type,
-            order=req.order,
-            duration=req.duration,
-            text_content=req.text_content,
-            transition_effect=req.transition_effect,
-            config=req.config,
-        )
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    return _clip_to_response(clip)
-
-
-@router.put("/clips/{clip_id}", response_model=EditorClipResponse)
-def update_draft_clip(
-    template_id: str,
-    clip_id: str,
-    req: EditorClipUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """更新草稿中的片段"""
-    _, plan_svc = services
-    try:
-        clip = plan_svc.update_clip(
-            clip_id,
-            order=req.order,
-            duration=req.duration,
-            text_content=req.text_content,
-            transition_effect=req.transition_effect,
-            playback_speed=req.playback_speed,
-            config=req.config,
-        )
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    return _clip_to_response(clip)
-
-
-@router.delete("/clips/{clip_id}", status_code=status.HTTP_204_NO_CONTENT)
-def delete_draft_clip(
-    template_id: str,
-    clip_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """删除草稿中的片段"""
-    _, plan_svc = services
-    success = plan_svc.delete_clip(clip_id)
-    if not success:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    return None
-
-
-@router.get("/clips/{clip_id}", response_model=EditorClipResponse)
-def get_draft_clip_detail(
-    template_id: str,
-    clip_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取草稿中的片段详情"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if clip is None:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    if clip.plan_id != plan_id:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    return _clip_to_response(clip)
-
-
-@router.post("/clips/{clip_id}/split", response_model=dict[str, Any], status_code=status.HTTP_200_OK)
-def split_draft_clip(
-    template_id: str,
-    clip_id: str,
-    body: SplitClipRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """将一个片段从指定时间点分割为两个片段"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if clip is None or clip.plan_id != plan_id:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    try:
-        result = plan_svc.split_clip(clip_id, body.split_time)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)
-        ) from exc
-    left = result["left_clip"]
-    right = result["right_clip"]
-    return {
-        "left_clip": {
-            "id": left.id,
-            "plan_id": left.plan_id,
-            "clip_type": left.clip_type,
-            "order": left.order,
-            "duration": left.duration,
-            "start_time": left.start_time,
-        },
-        "right_clip": {
-            "id": right.id,
-            "plan_id": right.plan_id,
-            "clip_type": right.clip_type,
-            "order": right.order,
-            "duration": right.duration,
-            "start_time": right.start_time,
-        },
-    }
-
-
-@router.post("/clips/merge", response_model=dict[str, Any], status_code=status.HTTP_200_OK)
-def merge_draft_clips(
-    template_id: str,
-    body: MergeClipsRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """将多个连续的同类型片段合并为一个片段"""
-    _, plan_svc = services
-    for cid in body.clip_ids:
-        clip = plan_svc.get_clip(cid)
-        if clip is None or clip.plan_id != plan_id:
-            raise HTTPException(status_code=404, detail=f"片段不存在: {cid}")
-    try:
-        merged = plan_svc.merge_clips(body.clip_ids)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)
-        ) from exc
-    return {
-        "id": merged.id,
-        "plan_id": merged.plan_id,
-        "clip_type": merged.clip_type,
-        "order": merged.order,
-        "duration": merged.duration,
-        "text_content": merged.text_content,
-    }
-
-
-@router.post("/clips/reorder", response_model=ClipReorderResponse)
-def reorder_editor_clips(
-    template_id: str,
-    body: ClipReorderRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipReorderResponse:
-    """批量重排片段顺序"""
-    _, plan_svc = services
-    count = 0
-    for item in body.items:
-        try:
-            plan_svc.update_clip(item.clip_id, order=item.new_order)
-            count += 1
-        except ValueError:
-            pass
-
-    return ClipReorderResponse(updated_count=count, plan_id=plan_id)
-
-
-@router.post("/clips/batch-delete", response_model=ClipBatchDeleteResponse)
-def batch_delete_editor_clips(
-    template_id: str,
-    body: ClipBatchDeleteRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipBatchDeleteResponse:
-    """批量删除片段"""
-    _, plan_svc = services
-    deleted = 0
-    for clip_id in body.clip_ids:
-        if plan_svc.delete_clip(clip_id):
-            deleted += 1
-
-    return ClipBatchDeleteResponse(deleted_count=deleted, plan_id=plan_id)
-
-
-@router.post("/clips/from-assets", response_model=ClipsFromAssetsResponse)
-def create_clips_from_assets_editor(
-    template_id: str,
-    body: ClipsFromAssetsRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> ClipsFromAssetsResponse:
-    """从素材批量创建片段"""
-    _, plan_svc = services
-    clips = []
-    for i, asset_id in enumerate(body.asset_ids):
-        try:
-            clip = plan_svc.create_clip(
-                plan_id,
-                clip_type="main",
-                order=body.start_order + i if hasattr(body, "start_order") else i,
-                duration=5.0,
-                asset_id=asset_id,
-            )
-            clips.append(clip)
-        except ValueError:
-            pass
-
-    logger.info(
-        "模板编辑器从素材创建片段: template_id=%s plan_id=%s count=%d by user=%s",
-        template_id,
-        plan_id,
-        len(clips),
-        current_user.user.id,
-    )
-
-    return ClipsFromAssetsResponse(
-        created_count=len(clips),
-        plan_id=plan_id,
-        clip_ids=[c.id for c in clips],
-    )
@@ -1,209 +0,0 @@
-"""封面管理路由.
-
-端点：
- GET  /cover              封面配置
- PUT  /cover              更新封面
- POST /cover/extract      抽帧生成封面
- POST /cover/smart        智能选帧
- POST /generate-cover     AI 生成封面
-"""
-
-from __future__ import annotations
-
-import logging
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException
-
-from packages.domain.config_schemas import normalize_plan_config
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import (
-    CoverConfigResponse,
-    CoverExtractRequest,
-    CoverGenerateResponse,
-    CoverSmartRequest,
-    CoverUpdateRequest,
-    GenerateCoverRequest,
-    GenerateCoverResponse,
-)
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.get("/cover", response_model=CoverConfigResponse)
-def get_editor_cover(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> CoverConfigResponse:
-    """获取草稿封面配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    config = plan.config or {}
-    cover_config = config.get("cover", {})
-
-    return CoverConfigResponse(
-        type=cover_config.get("cover_type", "auto"),
-        image_url=cover_config.get("cover_image_url", ""),
-        frame_time=cover_config.get("frame_time", 0.0),
-    )
-
-
-@router.put("/cover", response_model=CoverConfigResponse)
-def update_editor_cover(
-    template_id: str,
-    body: CoverUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> CoverConfigResponse:
-    """更新草稿封面配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    config = dict(plan.config) if plan.config else {}
-    current_cover = dict(config.get("cover", {}))
-    update_data = body.model_dump(exclude_none=True)
-    current_cover.update(update_data)
-
-    config["cover"] = current_cover
-    normalized = normalize_plan_config(config)
-    plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
-
-    return CoverConfigResponse(
-        type=current_cover.get("cover_type", "auto"),
-        image_url=current_cover.get("cover_image_url", ""),
-        frame_time=current_cover.get("frame_time", 0.0),
-    )
-
-
-@router.post("/cover/extract", response_model=CoverGenerateResponse)
-def extract_editor_cover(
-    template_id: str,
-    body: CoverExtractRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> CoverGenerateResponse:
-    """从指定片段抽帧生成封面"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    clip = plan_svc.get_clip(body.clip_id)
-    if not clip or clip.plan_id != plan_id:
-        raise HTTPException(status_code=400, detail="片段不存在或不属于当前草稿")
-
-    cover_url = f"cover/extract/{plan_id}_{body.clip_id}_{body.frame_time}.jpg"
-
-    config = dict(plan.config) if plan.config else {}
-    cover_config = dict(config.get("cover", {}))
-    cover_config.update(
-        {
-            "cover_type": "extract",
-            "cover_image_url": cover_url,
-            "clip_id": body.clip_id,
-            "frame_time": body.frame_time,
-        }
-    )
-    config["cover"] = cover_config
-    normalized = normalize_plan_config(config)
-    plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
-
-    logger.info(
-        "模板编辑器封面抽帧: template_id=%s plan_id=%s clip_id=%s by user=%s",
-        template_id,
-        plan_id,
-        body.clip_id,
-        current_user.user.id,
-    )
-
-    return CoverGenerateResponse(
-        type="extract",
-        image_url=cover_url,
-        frame_time=body.frame_time,
-    )
-
-
-@router.post("/cover/smart", response_model=CoverGenerateResponse)
-def smart_editor_cover(
-    template_id: str,
-    body: CoverSmartRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> CoverGenerateResponse:
-    """智能选帧生成封面"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    cover_url = f"cover/smart/{plan_id}_smart.jpg"
-    strategy = getattr(body, "strategy", "auto")
-
-    config = dict(plan.config) if plan.config else {}
-    cover_config = dict(config.get("cover", {}))
-    cover_config.update(
-        {
-            "cover_type": "smart",
-            "cover_image_url": cover_url,
-            "strategy": strategy,
-        }
-    )
-    config["cover"] = cover_config
-    normalized = normalize_plan_config(config)
-    plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
-
-    logger.info(
-        "模板编辑器智能封面: template_id=%s plan_id=%s strategy=%s by user=%s",
-        template_id,
-        plan_id,
-        strategy,
-        current_user.user.id,
-    )
-
-    return CoverGenerateResponse(
-        type="smart",
-        image_url=cover_url,
-        frame_time=None,
-    )
-
-
-@router.post("/generate-cover", response_model=GenerateCoverResponse)
-def editor_generate_cover(
-    template_id: str,
-    body: GenerateCoverRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> GenerateCoverResponse:
-    """AI 生成封面"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    from packages.shared.ai_service import run_generate_cover
-
-    cover_data = run_generate_cover(
-        plan_id=plan_id,
-        asset_ids=body.asset_ids,
-        cover_type=body.cover_type,
-        frame_time=body.frame_time,
-    )
-
-    current_config = dict(plan.config) if plan.config else {}
-    current_config["cover"] = cover_data
-    normalized = normalize_plan_config(current_config)
-    plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
-
-    logger.info(
-        "模板编辑器封面生成: template_id=%s plan_id=%s type=%s by user=%s",
-        template_id,
-        plan_id,
-        body.cover_type,
-        current_user.user.id,
-    )
-
-    return GenerateCoverResponse(plan_id=plan_id, cover=cover_data)
@@ -1,141 +0,0 @@
-"""模板编辑器依赖注入.
-
-核心依赖：
- get_editor_services: 获取模板+计划服务
- get_draft_plan_id: 根据 template_id 获取或创建草稿，返回 plan_id
- _check_queue_limits: 生成队列限流检查
-"""
-
-from __future__ import annotations
-
-import logging
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.core.task_enqueue import GLOBAL_PENDING_LIMIT, USER_PENDING_LIMIT
-from app.dependencies import get_db_session
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import Depends, HTTPException, status
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.template_repository import (
-    SQLAlchemyTemplateRepository,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def get_editor_services(
-    db: Session = Depends(get_db_session),
-) -> tuple[EditTemplateService, EditPlanService]:
-    """获取模板编辑器所需的两个服务"""
-    return EditTemplateService(db), EditPlanService(db)
-
-
-def get_draft_plan_id(
-    template_id: str,
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-) -> str:
-    """路径依赖：根据 template_id 获取或创建草稿，返回 plan_id.
-
-    这是模板编辑器路由的核心依赖——所有编辑器端点都先经过这里，
-    确保 template_id → plan_id 的映射始终存在。
-
-    兼容策略：优先从新模板系统（edit_templates 表）查找，
-    若不存在则回退到旧模板系统（templates 表），确保用户自建模板可用。
-    """
-    tpl_svc, plan_svc = services
-    user_id = str(current_user.user.id)
-
-    # 1. 草稿已存在 → 直接返回
-    draft = tpl_svc.get_template_draft(template_id)
-    if draft is not None:
-        return draft.id
-
-    # 2. 新系统有模板 → 用新服务创建草稿
-    if tpl_svc.get_template(template_id) is not None:
-        draft = tpl_svc.create_template_draft(template_id, user_id=user_id)
-        return draft.id
-
-    # 3. 回退到旧模板系统（templates 表）
-    old_repo = SQLAlchemyTemplateRepository(db)
-    old_template = old_repo.get(template_id, user_id=user_id)
-    if old_template is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="模板不存在")
-
-    # 4. 基于旧模板创建草稿计划
-    from app.services.plan_generator_service import PlanGeneratorService
-
-    from packages.domain.edit_template import EditTemplate, EditTemplateStatus
-    from packages.domain.template_clip_config import ClipType, TemplateClipConfig
-
-    # 构造伪 EditTemplate 对象（只填 generate_from_template 需要的字段）
-    pseudo_template = EditTemplate(
-        id=old_template.id,
-        name=old_template.name,
-        editing_mode=old_template.mode,
-        status=EditTemplateStatus.ACTIVE,
-    )
-
-    # 将旧模板 segments 转换为 clip_configs
-    clip_configs: list[TemplateClipConfig] = []
-    for seg in old_template.segments or []:
-        clip_configs.append(
-            TemplateClipConfig(
-                id=f"seg_{seg.id}",
-                template_id=old_template.id,
-                clip_type=ClipType.MAIN,
-                order=seg.segment_order,
-                min_duration=seg.duration_min,
-                max_duration=seg.duration_max,
-            )
-        )
-
-    generator = PlanGeneratorService(db)
-    result = generator.generate_from_template(
-        template=pseudo_template,
-        clip_configs=clip_configs,
-        asset_ids=[],
-        created_by_user_id=user_id,
-        name=f"{old_template.name} - 草稿",
-    )
-    plan = result["plan"]
-
-    # 标记为模板草稿（后续可复用 tpl_svc.get_template_draft 的查找逻辑）
-    plan_svc.update_plan_config(plan.id, {"is_template_draft": True})
-
-    logger.info(
-        "旧模板自动创建草稿: template_id=%s draft_plan_id=%s user_id=%s",
-        template_id,
-        plan.id,
-        user_id,
-    )
-    return plan.id
-
-
-def _check_queue_limits(gen_task_repo, user_id: str) -> None:
-    """队列限流预检查"""
-    try:
-        has_count = (
-            hasattr(gen_task_repo, "count_pending_by_user")
-            and hasattr(gen_task_repo, "count_pending_total")
-        )
-        if has_count:
-            user_pending = gen_task_repo.count_pending_by_user(user_id)
-            global_pending = gen_task_repo.count_pending_total()
-            if user_pending >= USER_PENDING_LIMIT:
-                raise HTTPException(
-                    status_code=429,
-                    detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
-                )
-            if global_pending >= GLOBAL_PENDING_LIMIT:
-                raise HTTPException(
-                    status_code=503,
-                    detail="系统繁忙，请稍后再试",
-                )
-    except HTTPException:
-        raise
-    except Exception as e:
-        logger.warning("[模板编辑器队列限流] 检查失败，跳过: %s", e)
@@ -1,164 +0,0 @@
-"""草稿管理路由.
-
-端点：
- GET    /              获取草稿详情
- PUT    /              更新草稿
- POST   /publish       发布草稿到模板
- GET    /versions      模板版本历史
- POST   /rollback      回滚到指定版本
-"""
-
-from __future__ import annotations
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import (
-    EditorDraftResponse,
-    EditorPublishResponse,
-    EditorRollbackRequest,
-    EditorRollbackResponse,
-    EditorTemplateVersionItem,
-    EditorUpdateRequest,
-    EditorVersionListResponse,
-)
-
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.get("", response_model=EditorDraftResponse)
-def get_editor_draft(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取模板编辑器草稿详情
-
-    首次访问时自动创建草稿。
-    """
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    clips = plan_svc.list_clips(plan_id)
-    return EditorDraftResponse(
-        plan_id=plan.id,
-        template_id=plan.template_id,
-        name=plan.name,
-        status=plan.status.value if hasattr(plan.status, "value") else str(plan.status),
-        config=plan.config or {},
-        total_duration=plan.total_duration,
-        clip_count=len(clips),
-    )
-
-
-@router.put("", response_model=EditorDraftResponse)
-def update_editor_draft(
-    template_id: str,
-    req: EditorUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """更新模板编辑器草稿"""
-    _, plan_svc = services
-    plan = plan_svc.update_plan(
-        plan_id,
-        name=req.name,
-        config=req.config,
-        total_duration=req.total_duration,
-    )
-    clips = plan_svc.list_clips(plan_id)
-    return EditorDraftResponse(
-        plan_id=plan.id,
-        template_id=plan.template_id,
-        name=plan.name,
-        status=plan.status.value if hasattr(plan.status, "value") else str(plan.status),
-        config=plan.config or {},
-        total_duration=plan.total_duration,
-        clip_count=len(clips),
-    )
-
-
-@router.post("/publish", response_model=EditorPublishResponse, status_code=status.HTTP_200_OK)
-def publish_draft_to_template(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """将草稿发布（同步）到正式模板
-
-    草稿的 config 和 clips 会同步覆盖到模板，事务保证一致性。
-    """
-    tpl_svc, plan_svc = services
-    try:
-        tpl = tpl_svc.publish_template_from_draft(template_id, plan_id)
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    clips = plan_svc.list_clips(plan_id)
-    return EditorPublishResponse(
-        template_id=tpl.id,
-        status="published",
-        clip_count=len(clips),
-        version=tpl.version,
-    )
-
-
-@router.get("/versions", response_model=EditorVersionListResponse)
-def list_template_versions(
-    template_id: str,
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-    limit: int = Query(default=50, ge=1, le=200),
-):
-    """查询模板发布版本历史"""
-    tpl_svc, _ = services
-    versions = tpl_svc.list_template_versions(template_id, limit=limit)
-    items = [
-        EditorTemplateVersionItem(
-            version=v.version,
-            name=v.name,
-            editing_mode=v.editing_mode,
-            clip_count=len(v.clip_configs),
-            change_note=v.change_note,
-            published_by=v.published_by,
-            created_at=(
-                v.created_at.isoformat()
-                if hasattr(v.created_at, "isoformat")
-                else str(v.created_at)
-            ),
-        )
-        for v in versions
-    ]
-    return EditorVersionListResponse(versions=items, total=len(items))
-
-
-@router.post("/rollback", response_model=EditorRollbackResponse, status_code=status.HTTP_200_OK)
-def rollback_template(
-    template_id: str,
-    request: EditorRollbackRequest,
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """回滚模板到指定历史版本
-
-    回滚本身也是一次发布，版本号会 +1，可以再次回滚。
-    """
-    tpl_svc, _ = services
-    try:
-        tpl = tpl_svc.rollback_to_version(template_id, request.version)
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    clip_configs = tpl_svc.list_clip_configs(template_id)
-    return EditorRollbackResponse(
-        template_id=tpl.id,
-        status="rolled_back",
-        rollback_to_version=request.version,
-        new_version=tpl.version,
-        clip_count=len(clip_configs),
-    )
@@ -1,195 +0,0 @@
-"""转场 & 滤镜路由.
-
-端点：
- GET  /transition-presets           转场预设列表
- PUT  /clips/{clip_id}/transition   单片段转场
- POST /transitions/batch            批量转场
- GET  /filter-presets               滤镜预设列表
- GET  /filter                       滤镜配置
- PUT  /filter                       更新滤镜
-"""
-
-from __future__ import annotations
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException
-
-from packages.domain.config_schemas import normalize_plan_config
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import (
-    BatchTransitionRequest,
-    BatchTransitionResponse,
-    ClipTransitionResponse,
-    FilterConfigResponse,
-    FilterPresetListResponse,
-    FilterUpdateRequest,
-    TransitionPresetListResponse,
-    TransitionUpdateRequest,
-)
-
-router = APIRouter(tags=["Template Editor"])
-
-
-# ── 转场 ────────────────────────────────────────────────────────────────────
-
-
-@router.get("/transition-presets", response_model=TransitionPresetListResponse)
-def list_editor_transition_presets(
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> TransitionPresetListResponse:
-    """获取转场预设列表"""
-    from packages.domain.transition_presets import TRANSITION_PRESETS
-
-    items = [
-        {
-            "id": p["id"],
-            "name": p["name"],
-            "category": p.get("category", "通用"),
-            "duration": p.get("default_duration", 0.5),
-            "description": p.get("description", ""),
-        }
-        for p in TRANSITION_PRESETS
-    ]
-    return TransitionPresetListResponse(items=items, total=len(items))
-
-
-@router.put("/clips/{clip_id}/transition", response_model=ClipTransitionResponse)
-def update_editor_clip_transition(
-    template_id: str,
-    clip_id: str,
-    body: TransitionUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipTransitionResponse:
-    """设置单个片段的转场效果"""
-    _, plan_svc = services
-    try:
-        clip = plan_svc.update_clip(
-            clip_id,
-            transition_effect=body.effect,
-            transition_duration=body.duration,
-        )
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    return ClipTransitionResponse(
-        clip_id=clip.id,
-        effect=clip.transition_effect.value
-        if hasattr(clip.transition_effect, "value")
-        else clip.transition_effect,
-        duration=clip.transition_duration or 0.5,
-    )
-
-
-@router.post("/transitions/batch", response_model=BatchTransitionResponse)
-def batch_update_editor_transitions(
-    template_id: str,
-    body: BatchTransitionRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> BatchTransitionResponse:
-    """批量设置所有片段的转场效果"""
-    _, plan_svc = services
-    clips = plan_svc.list_clips(plan_id, limit=500)
-    updated = 0
-    for clip in clips:
-        if clip.order > 0:  # 第一个片段不加转场
-            try:
-                plan_svc.update_clip(
-                    clip.id,
-                    transition_effect=body.effect,
-                    transition_duration=body.duration,
-                )
-                updated += 1
-            except ValueError:
-                pass
-
-    return BatchTransitionResponse(
-        updated_count=updated,
-        plan_id=plan_id,
-    )
-
-
-# ── 滤镜 ────────────────────────────────────────────────────────────────────
-
-
-@router.get("/filter-presets", response_model=FilterPresetListResponse)
-def list_editor_filter_presets(
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> FilterPresetListResponse:
-    """获取滤镜预设列表"""
-    from packages.domain.filter_presets import FILTER_PRESETS
-
-    items = [
-        {
-            "id": p["id"],
-            "name": p["name"],
-            "category": p.get("category", "通用"),
-            "thumbnail": p.get("thumbnail", ""),
-            "description": p.get("description", ""),
-        }
-        for p in FILTER_PRESETS
-    ]
-    return FilterPresetListResponse(items=items, total=len(items))
-
-
-@router.get("/filter", response_model=FilterConfigResponse)
-def get_editor_filter(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> FilterConfigResponse:
-    """获取草稿的全局滤镜配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    config = plan.config or {}
-    filter_config = config.get("filter", {})
-
-    return FilterConfigResponse(
-        plan_id=plan.id,
-        enabled=filter_config.get("enabled", False),
-        preset_id=filter_config.get("preset_id", ""),
-        intensity=filter_config.get("intensity", 1.0),
-        brightness=filter_config.get("brightness", 0.0),
-        contrast=filter_config.get("contrast", 1.0),
-        saturation=filter_config.get("saturation", 1.0),
-        warmth=filter_config.get("warmth", 0.0),
-    )
-
-
-@router.put("/filter", response_model=FilterConfigResponse)
-def update_editor_filter(
-    template_id: str,
-    body: FilterUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> FilterConfigResponse:
-    """更新草稿的全局滤镜配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    config = dict(plan.config) if plan.config else {}
-    current_filter = dict(config.get("filter", {}))
-    update_data = body.model_dump(exclude_none=True)
-    current_filter.update(update_data)
-
-    config["filter"] = current_filter
-    updated_plan = plan_svc.update_plan_config(plan_id, normalize_plan_config(config))
-
-    return FilterConfigResponse(
-        plan_id=updated_plan.id,
-        enabled=current_filter.get("enabled", False),
-        preset_id=current_filter.get("preset_id", ""),
-        intensity=current_filter.get("intensity", 1.0),
-        brightness=current_filter.get("brightness", 0.0),
-        contrast=current_filter.get("contrast", 1.0),
-        saturation=current_filter.get("saturation", 1.0),
-        warmth=current_filter.get("warmth", 0.0),
-    )
@@ -1,106 +0,0 @@
-"""导出配置路由.
-
-端点：
- GET /export-presets      导出预设列表
- GET /export              导出配置
- PUT /export              更新导出配置
-"""
-
-from __future__ import annotations
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends
-
-from packages.domain.config_schemas import normalize_plan_config
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import ExportConfigResponse, ExportPresetListResponse, ExportUpdateRequest
-
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.get("/export-presets", response_model=ExportPresetListResponse)
-def list_editor_export_presets(
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ExportPresetListResponse:
-    """获取导出预设列表"""
-    from packages.domain.export_presets import EXPORT_PRESETS
-
-    items = [
-        {
-            "id": p["id"],
-            "name": p["name"],
-            "resolution": p.get("resolution", "1080p"),
-            "fps": p.get("fps", 30),
-            "video_bitrate": p.get("bitrate", ""),
-            "audio_bitrate": p.get("audio_bitrate", 128),
-            "format": p.get("format", "mp4"),
-            "quality_preset": p.get("quality_preset", "balanced"),
-            "description": p.get("description", ""),
-            "size_hint": p.get("size_hint", ""),
-        }
-        for p in EXPORT_PRESETS
-    ]
-    return ExportPresetListResponse(items=items, total=len(items))
-
-
-@router.get("/export", response_model=ExportConfigResponse)
-def get_editor_export(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ExportConfigResponse:
-    """获取草稿的导出配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    config = plan.config or {}
-    export_config = config.get("export", {})
-
-    return ExportConfigResponse(
-        plan_id=plan.id,
-        resolution=export_config.get("resolution", "1080p"),
-        fps=export_config.get("fps", 30),
-        video_bitrate=export_config.get("video_bitrate", 4000),
-        audio_bitrate=export_config.get("audio_bitrate", 128),
-        format=export_config.get("format", "mp4"),
-        quality_preset=export_config.get("quality_preset", "balanced"),
-        watermark_enabled=export_config.get("watermark_enabled", True),
-        watermark_text=export_config.get("watermark_text", ""),
-    )
-
-
-@router.put("/export", response_model=ExportConfigResponse)
-def update_editor_export(
-    template_id: str,
-    body: ExportUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ExportConfigResponse:
-    """更新草稿的导出配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    config = dict(plan.config) if plan.config else {}
-    current_export = dict(config.get("export", {}))
-    update_data = body.model_dump(exclude_none=True)
-    current_export.update(update_data)
-
-    config["export"] = current_export
-    updated_plan = plan_svc.update_plan_config(plan_id, normalize_plan_config(config))
-    updated_export = (updated_plan.config or {}).get("export", {})
-
-    return ExportConfigResponse(
-        plan_id=updated_plan.id,
-        resolution=updated_export.get("resolution", "1080p"),
-        fps=updated_export.get("fps", 30),
-        video_bitrate=updated_export.get("video_bitrate", 4000),
-        audio_bitrate=updated_export.get("audio_bitrate", 128),
-        format=updated_export.get("format", "mp4"),
-        quality_preset=updated_export.get("quality_preset", "balanced"),
-        watermark_enabled=updated_export.get("watermark_enabled", True),
-        watermark_text=updated_export.get("watermark_text", ""),
-    )
@@ -1,250 +0,0 @@
-"""草稿生成路由.
-
-端点：
- POST /generate              触发生成
- GET  /generation-status     生成进度
- GET  /generations           生成记录列表
-"""
-
-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.core.storage import OSSStorageService, get_storage_service
-from app.dependencies import (
-    get_asset_library_repository,
-    get_asset_repository,
-    get_db_session,
-)
-from app.schemas.generation_task import GenerationTaskResponse
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, status
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.generation_task_repository import (
-    SQLAlchemyGenerationTaskRepository,
-)
-from packages.application.generation_tasks import (
-    CreateGenerationTaskCommand,
-    CreateGenerationTaskUseCase,
-)
-from packages.domain.edit_plan import EditPlanStatus
-
-from ._fallback import (
-    _auto_fallback_assign_assets,
-    _auto_fallback_auto_material_mode,
-    _auto_fallback_copy_template_clips,
-    _auto_fallback_draft_to_editing,
-)
-from .dependencies import _check_queue_limits, get_draft_plan_id, get_editor_services
-from .schemas import (
-    ClipStatusItem,
-    EditPlanGenerateResponse,
-    EditPlanGenerationsResponse,
-    EditPlanGenerationStatusResponse,
-)
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.post("/generate", response_model=EditPlanGenerateResponse)
-def generate_editor_draft(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    asset_library_repo: Any = Depends(get_asset_library_repository),
-    asset_repo: Any = Depends(get_asset_repository),
-) -> EditPlanGenerateResponse:
-    """触发模板草稿渲染生成"""
-    _, plan_svc = services
-    plan_check = plan_svc.get_plan_or_raise(plan_id)
-
-    # 自动兜底流程
-    _auto_fallback_draft_to_editing(plan_svc, plan_id, plan_check)
-    _auto_fallback_copy_template_clips(plan_svc, plan_id, plan_check, db)
-    clips_without_asset = _auto_fallback_assign_assets(plan_svc, plan_id, plan_check)
-    _auto_fallback_auto_material_mode(
-        plan_svc, plan_id, plan_check, clips_without_asset, asset_library_repo, asset_repo
-    )
-
-    # 检查是否可生成
-    try:
-        can_gen, reason = plan_svc.can_generate(plan_id)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)
-        ) from exc
-    if not can_gen:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST, detail=reason
-        )
-
-    try:
-        clip_count = plan_svc.mark_clips_ready(plan_id)
-
-        gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-        user_id = current_user.user.id
-        _check_queue_limits(gen_task_repo, user_id)
-
-        gen_task_use_case = CreateGenerationTaskUseCase(gen_task_repo)
-        plan = plan_svc.get_plan_or_raise(plan_id)
-        config_asset_ids = (plan.config or {}).get("asset_ids", [])
-        gen_task = gen_task_use_case.execute(
-            CreateGenerationTaskCommand(
-                project_id=plan.project_id or "",
-                template_id=plan.template_id,
-                created_by_user_id=current_user.user.id,
-                source_edit_plan_id=plan_id,
-                asset_ids=list(config_asset_ids) if config_asset_ids else [],
-            ),
-        )
-
-        plan_svc.update_plan_config(plan_id, {"generation_task_id": gen_task.id})
-        plan_svc.transition_status(plan_id, EditPlanStatus.RENDERING)
-        celery_app.send_task("worker.render_edit_plan", args=[plan_id])
-
-        updated_plan = plan_svc.get_plan_or_raise(plan_id)
-
-        logger.info(
-            "模板编辑器触发生成: template_id=%s plan_id=%s gen_task_id=%s clips=%d by user=%s",
-            template_id,
-            plan_id,
-            gen_task.id,
-            clip_count,
-            current_user.user.id,
-        )
-
-        return EditPlanGenerateResponse(
-            plan_id=plan_id,
-            plan_status=updated_plan.status.value
-            if hasattr(updated_plan.status, "value")
-            else updated_plan.status,
-            generation_task_id=gen_task.id,
-            clip_count=clip_count,
-        )
-    except HTTPException:
-        raise
-    except Exception as _e:
-        logger.exception(
-            "模板编辑器触发生成失败: template_id=%s plan_id=%s",
-            template_id,
-            plan_id,
-        )
-        try:
-            plan_svc.transition_status(plan_id, EditPlanStatus.FAILED)
-        except Exception:
-            pass
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="生成失败，请稍后重试",
-        ) from _e
-
-
-@router.get("/generation-status", response_model=EditPlanGenerationStatusResponse)
-def get_editor_generation_status(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    storage_service: OSSStorageService = Depends(get_storage_service),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanGenerationStatusResponse:
-    """查询草稿生成进度"""
-    _, plan_svc = services
-    try:
-        gen_status = plan_svc.get_generation_status(plan_id)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)
-        ) from exc
-
-    plan = gen_status["plan"]
-    clips = gen_status["clips"]
-
-    clip_items = [
-        ClipStatusItem(
-            clip_id=c.id,
-            clip_type=c.clip_type,
-            order=c.order,
-            status=c.status.value if hasattr(c.status, "value") else c.status,
-            asset_id=c.asset_id or "",
-            text_content=c.text_content or "",
-            duration=c.duration,
-        )
-        for c in clips
-    ]
-
-    raw_video_url = (plan.config or {}).get("rendered_url", "")
-    video_url = ""
-    if raw_video_url:
-        try:
-            video_url = storage_service.get_download_url(
-                raw_video_url, expires_seconds=86400
-            )
-        except Exception as e:
-            logger.warning(
-                "生成视频签名URL失败: template_id=%s error=%s", template_id, e
-            )
-            video_url = raw_video_url
-
-    progress = gen_status.get("progress", 0.0)
-    error_message = gen_status.get("error_message", "")
-    gen_task_status = gen_status.get("generation_task_status")
-    plan_status_val = (
-        plan.status.value if hasattr(plan.status, "value") else plan.status
-    )
-    if plan_status_val == "completed" and progress < 100:
-        progress = 100.0
-
-    return EditPlanGenerationStatusResponse(
-        plan_id=plan_id,
-        plan_status=plan_status_val,
-        generation_task_id=gen_status["generation_task_id"],
-        generation_task_status=gen_task_status,
-        progress=progress,
-        video_url=video_url,
-        error_message=error_message,
-        clips=clip_items,
-    )
-
-
-@router.get("/generations", response_model=EditPlanGenerationsResponse)
-def list_editor_generations(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    db: Session = Depends(get_db_session),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanGenerationsResponse:
-    """查询草稿关联的生成记录列表"""
-    _, plan_svc = services
-    plan_svc.get_plan_or_raise(plan_id)
-
-    gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-    tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
-    items = [
-        GenerationTaskResponse(
-            id=t.id,
-            project_id=t.project_id,
-            asset_library_id=t.asset_library_id,
-            strategy_id=t.strategy_id,
-            voice_library_id=t.voice_library_id,
-            template_id=t.template_id,
-            asset_ids=t.asset_ids,
-            title_ids=t.title_ids,
-            voice_ids=t.voice_ids,
-            source_edit_plan_id=t.source_edit_plan_id or "",
-            status=t.status.value if hasattr(t.status, "value") else t.status,
-            progress=t.progress,
-            result_count=t.result_count,
-            error_message=t.error_message,
-        )
-        for t in tasks
-    ]
-    return EditPlanGenerationsResponse(items=items, total=len(items))
@@ -1,622 +0,0 @@
-"""模板编辑器所有 Pydantic Schema 定义.
-
-集中管理，避免在路由文件里散落 40+ 个 model。
-"""
-
-from __future__ import annotations
-
-import re as _re
-from typing import Any, List, Optional
-
-from app.schemas.generation_task import GenerationTaskResponse
-from pydantic import BaseModel, Field, validator
-
-_EXPORT_RESOLUTION_PATTERN = _re.compile(r"^\d+x\d+$")
-_EXPORT_VALID_QUALITY_PRESETS = {"ultra_fast", "fast", "balanced", "high", "best"}
-_EXPORT_VALID_FORMATS = {"mp4", "mov"}
-
-
-# ── 生成状态相关 ────────────────────────────────────────────────────────────
-
-
-class ClipStatusItem(BaseModel):
-    """片段生成状态"""
-
-    clip_id: str
-    clip_type: str
-    order: int
-    status: str
-    asset_id: str
-    text_content: str
-    duration: float
-
-
-class EditPlanGenerationStatusResponse(BaseModel):
-    """剪辑计划生成进度响应体"""
-
-    plan_id: str
-    plan_status: str
-    generation_task_id: Optional[str] = None
-    generation_task_status: Optional[str] = None
-    progress: float = 0.0
-    video_url: str = ""
-    error_message: str = ""
-    clips: List[ClipStatusItem]
-
-
-class EditPlanGenerateResponse(BaseModel):
-    """剪辑计划触发生成响应体"""
-
-    plan_id: str
-    plan_status: str
-    generation_task_id: str
-    clip_count: int
-
-
-class EditPlanGenerationsResponse(BaseModel):
-    """剪辑计划关联的生成记录列表响应体"""
-
-    items: List[GenerationTaskResponse]
-    total: int
-
-
-# ── AI 推荐 ────────────────────────────────────────────────────────────────
-
-
-class AIRecommendRequest(BaseModel):
-    """AI 推荐片段方案请求体"""
-
-    asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表")
-    editing_mode: str = Field(
-        default="one_take", description="剪辑模式: one_take / pip / voice_over / voice_pip"
-    )
-    target_duration: float = Field(
-        default=30.0, ge=1.0, le=600.0, description="目标时长（秒）"
-    )
-
-
-class AIRecommendClipItem(BaseModel):
-    """AI 推荐的单个片段"""
-
-    clip_type: str = Field(..., description="片段类型: intro / showcase / title / subtitle / cta / outro")
-    order: int = Field(..., ge=0, description="片段顺序")
-    text_content: str = Field(default="", description="文字内容")
-    duration: float = Field(..., ge=0.0, description="片段时长（秒）")
-    transition_effect: str = Field(default="cut", description="转场效果")
-    transition_duration: float = Field(default=0.0, ge=0.0, description="转场时长（秒），0 表示使用默认值")
-    asset_id: str = Field(default="", description="关联素材 ID")
-    start_time: float = Field(default=0.0, ge=0.0, description="素材截取起始时间（秒）")
-    config: dict[str, Any] = Field(default_factory=dict, description="片段额外配置")
-
-
-class AIRecommendResponse(BaseModel):
-    """AI 推荐片段方案响应体"""
-
-    plan_id: str = Field(..., description="剪辑计划 ID")
-    clips: List[AIRecommendClipItem] = Field(..., description="推荐的片段列表")
-    config: dict[str, Any] = Field(..., description="推荐的 plan config（cover/title/subtitle/bgm）")
-    total_duration: float = Field(..., ge=0.0, description="推荐方案总时长（秒）")
-    confidence: float = Field(..., ge=0.0, le=1.0, description="AI 推荐置信度 (0~1)")
-
-
-# ── 封面生成 ────────────────────────────────────────────────────────────────
-
-
-class GenerateCoverRequest(BaseModel):
-    """AI 封面生成请求体"""
-
-    asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表（确定视频来源）")
-    cover_type: str = Field(
-        default="ai_frame",
-        description="封面类型: ai_frame / manual / upload / ai_regenerate",
-    )
-    frame_time: Optional[float] = Field(
-        default=None,
-        ge=0.0,
-        description="手动选帧时间点（秒），仅 cover_type=manual 时有效",
-    )
-
-
-class GenerateCoverResponse(BaseModel):
-    """AI 封面生成响应体"""
-
-    plan_id: str = Field(..., description="剪辑计划 ID")
-    cover: dict[str, Any] = Field(..., description="封面数据（type / image_url / frame_time 等）")
-
-
-# ── BGM ────────────────────────────────────────────────────────────────────
-
-
-class BGMConfigUpdateRequest(BaseModel):
-    """更新BGM配置请求体"""
-
-    enabled: Optional[bool] = Field(default=None, description="是否启用 BGM")
-    source: Optional[str] = Field(default=None, description="BGM 来源: library/upload/ai_recommend")
-    asset_id: Optional[str] = Field(default=None, max_length=64, description="BGM 素材 ID")
-    preset_id: Optional[str] = Field(default=None, max_length=64, description="预设 BGM ID")
-    audio_url: Optional[str] = Field(default=None, max_length=500, description="BGM 音频 URL")
-    volume: Optional[float] = Field(default=None, ge=0.0, le=1.0, description="音量 (0.0 ~ 1.0)")
-    fade_in: Optional[float] = Field(default=None, ge=0.0, le=30.0, description="淡入时长（秒）")
-    fade_out: Optional[float] = Field(default=None, ge=0.0, le=30.0, description="淡出时长（秒）")
-    loop_enabled: Optional[bool] = Field(default=None, description="是否循环播放")
-    sidechain_enabled: Optional[bool] = Field(default=None, description="是否启用人声闪避")
-    sidechain_ratio: Optional[float] = Field(default=None, ge=0.0, le=1.0, description="闪避音量降低比例")
-
-
-# ── 片段调整 ────────────────────────────────────────────────────────────────
-
-
-class SpeedAdjustRequest(BaseModel):
-    """调速请求"""
-
-    speed: float = Field(..., ge=0.25, le=4.0, description="播放速度 0.25~4.0")
-
-
-class VolumeAdjustRequest(BaseModel):
-    """音量调节请求"""
-
-    volume: float = Field(..., ge=0.0, le=2.0, description="音量倍率 0~2.0（1.0=原音量）")
-
-
-class TrimAdjustRequest(BaseModel):
-    """裁剪请求"""
-
-    trim_start: float = Field(0.0, ge=0.0, description="开头裁剪秒数")
-    trim_end: float = Field(0.0, ge=0.0, description="结尾裁剪秒数")
-
-
-class ClipAdjustmentsRequest(BaseModel):
-    """统一调整请求"""
-
-    speed: Optional[float] = Field(default=None, ge=0.25, le=4.0)
-    volume: Optional[float] = Field(default=None, ge=0.0, le=2.0)
-    trim_start: Optional[float] = Field(default=None, ge=0.0)
-    trim_end: Optional[float] = Field(default=None, ge=0.0)
-
-
-class BatchSpeedRequest(BaseModel):
-    """批量调速请求"""
-
-    speed: float = Field(..., ge=0.25, le=4.0, description="播放速度")
-
-
-class ClipAdjustResponse(BaseModel):
-    """片段调整响应"""
-
-    clip_id: str
-    speed: float
-    volume: float
-    trim_start: float
-    trim_end: float
-    duration: float
-
-
-class BatchSpeedResponse(BaseModel):
-    """批量调速响应"""
-
-    updated_count: int
-    plan_id: str
-
-
-# ── 片段批量操作 ────────────────────────────────────────────────────────────
-
-
-class ClipReorderItem(BaseModel):
-    """重排序条目"""
-
-    clip_id: str
-    new_order: int = Field(..., ge=0, description="新的排序序号")
-
-
-class ClipReorderRequest(BaseModel):
-    """片段重排序请求"""
-
-    items: List[ClipReorderItem] = Field(..., min_length=1, max_length=500, description="重排序条目列表")
-
-
-class ClipReorderResponse(BaseModel):
-    """片段重排序响应"""
-
-    success: bool = True
-    updated_count: int
-    message: str = ""
-
-
-class ClipBatchDeleteRequest(BaseModel):
-    """批量删除片段请求"""
-
-    clip_ids: List[str] = Field(..., min_length=1, max_length=500, description="要删除的片段ID列表")
-
-
-class ClipBatchDeleteResponse(BaseModel):
-    """批量删除片段响应"""
-
-    success: bool = True
-    deleted_count: int
-    message: str = ""
-
-
-class ClipsFromAssetsRequest(BaseModel):
-    """从素材批量创建片段请求"""
-
-    asset_ids: List[str] = Field(
-        ..., min_length=1, max_length=200, description="素材 ID 列表，按顺序追加到时间线末尾"
-    )
-    clip_type: str = Field(default="main", description="片段类型，默认 main")
-
-
-class ClipsFromAssetsResponse(BaseModel):
-    """从素材批量创建片段响应"""
-
-    success: bool = True
-    created_count: int
-    message: str = ""
-    clip_ids: List[str] = Field(default_factory=list, description="创建的片段ID列表")
-
-
-# ── 封面配置 ────────────────────────────────────────────────────────────────
-
-
-class CoverConfigResponse(BaseModel):
-    """封面配置响应"""
-
-    type: str = Field(..., description="封面类型: ai_frame / manual / upload")
-    image_url: str = Field(default="", description="封面图片 URL")
-    frame_time: Optional[float] = Field(default=None, description="抽帧时间点（秒）")
-
-
-class CoverUpdateRequest(BaseModel):
-    """更新封面配置请求"""
-
-    type: Optional[str] = Field(default=None, description="封面类型")
-    image_url: Optional[str] = Field(default=None, description="封面图片 URL")
-    frame_time: Optional[float] = Field(default=None, ge=0.0, description="抽帧时间点（秒）")
-
-
-class CoverExtractRequest(BaseModel):
-    """从片段抽帧生成封面请求"""
-
-    clip_id: str = Field(..., description="片段 ID")
-    frame_time: float = Field(1.0, ge=0.0, description="抽帧时间点（秒）")
-
-
-class CoverSmartRequest(BaseModel):
-    """智能选帧请求"""
-
-    clip_id: Optional[str] = Field(default=None, description="指定片段 ID（不传则用第一个视频片段）")
-
-
-class CoverGenerateResponse(BaseModel):
-    """封面生成响应"""
-
-    type: str = Field(..., description="封面类型")
-    image_url: str = Field(..., description="封面图片 URL")
-    frame_time: Optional[float] = Field(default=None, description="抽帧时间点（秒）")
-
-
-# ── 导出配置 ────────────────────────────────────────────────────────────────
-
-
-class ExportConfigResponse(BaseModel):
-    """导出配置响应"""
-
-    resolution: str
-    fps: int
-    video_bitrate: int
-    audio_bitrate: int
-    format: str
-    quality_preset: str
-    watermark_enabled: bool
-    watermark_text: str
-
-
-class ExportUpdateRequest(BaseModel):
-    """更新导出配置请求"""
-
-    resolution: Optional[str] = None
-    fps: Optional[int] = Field(default=None, ge=15, le=60)
-    video_bitrate: Optional[int] = Field(default=None, ge=1000, le=20000)
-    audio_bitrate: Optional[int] = Field(default=None, ge=64, le=320)
-    format: Optional[str] = None
-    quality_preset: Optional[str] = None
-    watermark_enabled: Optional[bool] = None
-    watermark_text: Optional[str] = None
-
-    @validator("resolution")
-    def validate_resolution(cls, v):
-        if v is None:
-            return v
-        if not _EXPORT_RESOLUTION_PATTERN.match(v):
-            raise ValueError("分辨率格式错误，应为 宽x高，如 1080x1920")
-        w, h = v.split("x")
-        if int(w) < 100 or int(h) < 100:
-            raise ValueError("分辨率数值过小")
-        if int(w) > 4096 or int(h) > 4096:
-            raise ValueError("分辨率数值过大，最大 4096x4096")
-        return v
-
-    @validator("format")
-    def validate_format(cls, v):
-        if v is None:
-            return v
-        if v not in _EXPORT_VALID_FORMATS:
-            raise ValueError(f"无效格式: {v}，支持: {_EXPORT_VALID_FORMATS}")
-        return v
-
-    @validator("quality_preset")
-    def validate_quality_preset(cls, v):
-        if v is None:
-            return v
-        if v not in _EXPORT_VALID_QUALITY_PRESETS:
-            raise ValueError(f"无效质量预设: {v}，支持: {_EXPORT_VALID_QUALITY_PRESETS}")
-        return v
-
-
-class ExportPresetItem(BaseModel):
-    """导出预设条目"""
-
-    id: str
-    name: str
-    resolution: str
-    fps: int
-    video_bitrate: int
-    audio_bitrate: int
-    format: str
-    quality_preset: str
-    description: str
-    size_hint: str
-
-
-class ExportPresetListResponse(BaseModel):
-    """导出预设列表响应"""
-
-    items: List[ExportPresetItem]
-    total: int
-
-
-# ── 滤镜 ────────────────────────────────────────────────────────────────────
-
-
-class FilterPresetResponse(BaseModel):
-    """滤镜预设响应"""
-
-    id: str
-    name: str
-    category: str
-    description: str
-    tags: List[str] = Field(default_factory=list)
-
-
-class FilterConfigResponse(BaseModel):
-    """滤镜配置响应"""
-
-    enabled: bool
-    preset_id: str
-    intensity: int
-    brightness: float
-    contrast: float
-    saturation: float
-    warmth: float
-
-
-class FilterUpdateRequest(BaseModel):
-    """更新滤镜配置请求"""
-
-    enabled: Optional[bool] = None
-    preset_id: Optional[str] = None
-    intensity: Optional[int] = Field(default=None, ge=0, le=100)
-    brightness: Optional[float] = Field(default=None, ge=-1.0, le=1.0)
-    contrast: Optional[float] = Field(default=None, ge=0.0, le=2.0)
-    saturation: Optional[float] = Field(default=None, ge=0.0, le=3.0)
-    warmth: Optional[float] = Field(default=None, ge=-1.0, le=1.0)
-
-
-class FilterPresetListResponse(BaseModel):
-    """滤镜预设列表响应"""
-
-    items: List[FilterPresetResponse]
-    total: int
-
-
-# ── 转场 ────────────────────────────────────────────────────────────────────
-
-
-class TransitionPresetResponse(BaseModel):
-    """转场预设响应"""
-
-    id: str
-    name: str
-    category: str
-    description: str
-    tags: List[str] = Field(default_factory=list)
-    default_duration: float
-    min_duration: float
-    max_duration: float
-
-
-class TransitionUpdateRequest(BaseModel):
-    """更新转场请求"""
-
-    effect: str = Field(..., description="转场效果 ID")
-    duration: Optional[float] = Field(default=None, ge=0.0, description="转场时长（秒）")
-
-
-class BatchTransitionRequest(BaseModel):
-    """批量设置转场请求"""
-
-    effect: str = Field(..., description="转场效果 ID")
-    duration: Optional[float] = Field(default=None, ge=0.0, description="转场时长（秒）")
-    apply_to: str = Field(
-        default="all",
-        description="应用范围: all=所有片段, except_first=除第一个外, except_last=除最后一个, middle=中间片段",
-    )
-
-
-class ClipTransitionResponse(BaseModel):
-    """片段转场信息响应"""
-
-    clip_id: str
-    effect: str
-    duration: float
-
-
-class BatchTransitionResponse(BaseModel):
-    """批量转场响应"""
-
-    updated_count: int
-    plan_id: str
-
-
-class TransitionPresetListResponse(BaseModel):
-    """转场预设列表响应"""
-
-    items: List[TransitionPresetResponse]
-    total: int
-
-
-# ── 编辑器草稿 & 片段 ───────────────────────────────────────────────────────
-
-
-class EditorDraftResponse(BaseModel):
-    """模板编辑器草稿详情响应"""
-
-    plan_id: str
-    template_id: str
-    name: str
-    status: str
-    config: dict[str, Any]
-    total_duration: float
-    clip_count: int
-    is_draft: bool = True
-
-
-class EditorUpdateRequest(BaseModel):
-    """更新草稿请求"""
-
-    name: Optional[str] = Field(default=None, min_length=1, max_length=200)
-    config: Optional[dict[str, Any]] = Field(default=None)
-    total_duration: Optional[float] = Field(default=None, ge=0.0)
-
-
-class EditorClipResponse(BaseModel):
-    """片段响应"""
-
-    id: str
-    plan_id: str
-    clip_type: str
-    order: int
-    duration: float
-    text_content: str = ""
-    transition_effect: str = "cut"
-    playback_speed: float = 1.0
-    config: dict[str, Any] = Field(default_factory=dict)
-
-
-class EditorClipListResponse(BaseModel):
-    """片段列表响应"""
-
-    items: List[EditorClipResponse]
-    total: int
-
-
-class EditorClipCreateRequest(BaseModel):
-    """创建片段请求"""
-
-    clip_type: str = Field(..., min_length=1, max_length=32)
-    order: int = Field(..., ge=0)
-    duration: float = Field(..., gt=0.0)
-    text_content: str = Field(default="", max_length=2000)
-    transition_effect: str = Field(default="cut", max_length=32)
-    config: dict[str, Any] = Field(default_factory=dict)
-
-
-class EditorClipUpdateRequest(BaseModel):
-    """更新片段请求"""
-
-    order: Optional[int] = Field(default=None, ge=0)
-    duration: Optional[float] = Field(default=None, gt=0.0)
-    text_content: Optional[str] = Field(default=None, max_length=2000)
-    transition_effect: Optional[str] = Field(default=None, max_length=32)
-    playback_speed: Optional[float] = Field(default=None, gt=0.0)
-    config: Optional[dict[str, Any]] = None
-
-
-class EditorPublishResponse(BaseModel):
-    """发布草稿响应"""
-
-    template_id: str
-    status: str = "published"
-    clip_count: int
-    version: int = 1
-
-
-class EditorTemplateVersionItem(BaseModel):
-    """模板版本历史条目"""
-
-    version: int
-    name: str
-    editing_mode: str
-    clip_count: int
-    change_note: str
-    published_by: str
-    created_at: str
-
-
-class EditorVersionListResponse(BaseModel):
-    """模板版本列表响应"""
-
-    versions: list[EditorTemplateVersionItem]
-    total: int
-
-
-class EditorRollbackRequest(BaseModel):
-    """回滚请求体"""
-
-    version: int
-
-
-class EditorRollbackResponse(BaseModel):
-    """回滚响应"""
-
-    template_id: str
-    status: str = "rolled_back"
-    rollback_to_version: int
-    new_version: int
-    clip_count: int
-
-
-# ── 片段分割与合并 ──────────────────────────────────────────────────────────
-
-
-class SplitClipRequest(BaseModel):
-    """分割片段请求体"""
-
-    split_time: float = Field(..., gt=0, description="分割点（秒，相对于片段起始）")
-
-
-class MergeClipsRequest(BaseModel):
-    """合并片段请求体"""
-
-    clip_ids: list[str] = Field(..., min_length=2, description="要合并的片段 ID 列表")
-
-
-# ── 时间线 ──────────────────────────────────────────────────────────────────
-
-
-class EditorTimelineSceneResponse(BaseModel):
-    """时间线场景"""
-
-    scene: str
-    time: str
-    duration: float
-    color: str
-    clip_id: str = ""
-    clip_type: str = ""
-
-
-class EditorTimelineResponse(BaseModel):
-    """时间线响应"""
-
-    plan_id: str
-    total_duration: float
-    scenes: List[EditorTimelineSceneResponse]
@@ -1,173 +0,0 @@
-"""字幕管理路由.
-
-端点：
- GET    /clips/{clip_id}/subtitles              字幕列表
- POST   /clips/{clip_id}/subtitles              新增字幕
- PUT    /clips/{clip_id}/subtitles/{subtitle_id} 更新字幕
- DELETE /clips/{clip_id}/subtitles/{subtitle_id} 删除字幕
- PUT    /clips/{clip_id}/subtitles              批量更新字幕（全量替换）
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, status
-
-from .dependencies import get_draft_plan_id, get_editor_services
-
-router = APIRouter(tags=["Template Editor"])
-
-
-def _get_clip_subtitles(plan_svc: EditPlanService, clip_id: str, plan_id: str) -> list[dict[str, Any]]:
-    """获取片段字幕列表，统一校验"""
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    if clip.plan_id != plan_id:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    config = clip.config or {}
-    subtitles = config.get("subtitles", [])
-    if not isinstance(subtitles, list):
-        subtitles = []
-    return subtitles
-
-
-@router.get("/clips/{clip_id}/subtitles", response_model=list[dict[str, Any]])
-def get_editor_clip_subtitles(
-    template_id: str,
-    clip_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> list[dict[str, Any]]:
-    """获取片段的字幕列表"""
-    _, plan_svc = services
-    return _get_clip_subtitles(plan_svc, clip_id, plan_id)
-
-
-@router.post("/clips/{clip_id}/subtitles", response_model=dict[str, Any])
-def create_editor_clip_subtitle(
-    template_id: str,
-    clip_id: str,
-    body: dict[str, Any],
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> dict[str, Any]:
-    """新增片段字幕"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(clip.config) if clip.config else {}
-    subtitles = config.get("subtitles", [])
-    if not isinstance(subtitles, list):
-        subtitles = []
-
-    new_id = f"sub_{len(subtitles) + 1}"
-    new_subtitle = {
-        "id": body.get("id", new_id),
-        "start_time": body.get("start_time", 0.0),
-        "end_time": body.get("end_time", 0.0),
-        "text": body.get("text", ""),
-        "style": body.get("style", {}),
-    }
-    subtitles.append(new_subtitle)
-    config["subtitles"] = subtitles
-
-    plan_svc.update_clip(clip_id, config=config)
-    return new_subtitle
-
-
-@router.put("/clips/{clip_id}/subtitles/{subtitle_id}", response_model=dict[str, Any])
-def update_editor_clip_subtitle(
-    template_id: str,
-    clip_id: str,
-    subtitle_id: str,
-    body: dict[str, Any],
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> dict[str, Any]:
-    """更新片段字幕"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(clip.config) if clip.config else {}
-    subtitles = config.get("subtitles", [])
-    if not isinstance(subtitles, list):
-        subtitles = []
-
-    found = False
-    for i, sub in enumerate(subtitles):
-        if sub.get("id") == subtitle_id:
-            subtitles[i].update(body)
-            found = True
-            break
-
-    if not found:
-        raise HTTPException(status_code=404, detail="字幕不存在")
-
-    config["subtitles"] = subtitles
-    plan_svc.update_clip(clip_id, config=config)
-    return subtitles[i]
-
-
-@router.delete(
-    "/clips/{clip_id}/subtitles/{subtitle_id}",
-    status_code=status.HTTP_204_NO_CONTENT,
-)
-def delete_editor_clip_subtitle(
-    template_id: str,
-    clip_id: str,
-    subtitle_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """删除片段字幕"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(clip.config) if clip.config else {}
-    subtitles = config.get("subtitles", [])
-    if not isinstance(subtitles, list):
-        subtitles = []
-
-    new_subtitles = [s for s in subtitles if s.get("id") != subtitle_id]
-    if len(new_subtitles) == len(subtitles):
-        raise HTTPException(status_code=404, detail="字幕不存在")
-
-    config["subtitles"] = new_subtitles
-    plan_svc.update_clip(clip_id, config=config)
-    return None
-
-
-@router.put("/clips/{clip_id}/subtitles", response_model=list[dict[str, Any]])
-def batch_update_editor_clip_subtitles(
-    template_id: str,
-    clip_id: str,
-    body: list[dict[str, Any]],
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> list[dict[str, Any]]:
-    """批量更新片段字幕（全量替换）"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(clip.config) if clip.config else {}
-    config["subtitles"] = body
-    plan_svc.update_clip(clip_id, config=config)
-    return body
@@ -1,61 +0,0 @@
-"""时间线路由.
-
-端点：
- GET /timeline       时间线场景数据
-"""
-
-from __future__ import annotations
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends
-
-from ._utils import _CLIP_TYPE_COLORS, _DEFAULT_COLOR, _clip_type_to_scene_label, _format_time
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import EditorTimelineResponse, EditorTimelineSceneResponse
-
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.get("/timeline", response_model=EditorTimelineResponse)
-def get_editor_timeline(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> EditorTimelineResponse:
-    """获取草稿的时间线场景数据"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    clips = plan_svc.list_clips(plan_id=plan_id, skip=0, limit=200)
-    clips.sort(key=lambda c: c.order)
-
-    scenes = []
-    current_time = 0.0
-
-    for clip in clips:
-        start = current_time
-        end = start + clip.duration
-        color = _CLIP_TYPE_COLORS.get(clip.clip_type, _DEFAULT_COLOR)
-        scene_label = _clip_type_to_scene_label(clip.clip_type, clip.text_content)
-
-        scenes.append(
-            EditorTimelineSceneResponse(
-                scene=scene_label,
-                time=f"{_format_time(start)} - {_format_time(end)}",
-                duration=clip.duration,
-                color=color,
-                clip_id=clip.id,
-                clip_type=clip.clip_type,
-            )
-        )
-        current_time = end
-
-    total_duration = sum(s.duration for s in scenes) or plan.total_duration
-
-    return EditorTimelineResponse(
-        plan_id=plan_id,
-        total_duration=total_duration,
-        scenes=scenes,
-    )
@@ -4,7 +4,6 @@ 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 (
@@ -17,18 +16,13 @@ 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,
-    PickTitleCommand,
-    UpdateTitleLibraryCommand,
-)
+from packages.application.title_library.commands import CreateTitleLibraryCommand, UpdateTitleLibraryCommand
 from packages.application.title_library.use_cases import (
    CreateTitleLibraryUseCase,
    DeleteTitleLibraryUseCase,
    GetTitleLibraryUseCase,
    ListTitleLibraryUseCase,
    NotFoundError,
-    PickTitleUseCase,
    QuotaExceededError,
    UpdateTitleLibraryUseCase,
 )
@@ -57,6 +51,13 @@ 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),
@@ -75,41 +76,6 @@ 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,
@@ -132,7 +98,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,
@@ -148,7 +114,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)


@@ -172,12 +138,12 @@ def update_title(
    use_case = UpdateTitleLibraryUseCase(title_repository)
    try:
        item = use_case.execute(command)
-    except NotFoundError as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Title not found") from _e
+    except NotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Title not found")
    return _to_response(item)


-@router.delete("/{title_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
+@router.delete("/{title_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None)
 def delete_title(
    title_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -188,4 +154,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
+    return Response(status_code=204)
@@ -6,7 +6,6 @@ import logging
 from typing import Optional

 from app.auth import AuthenticatedUser, get_current_user
-from app.core.celery_app import celery_app
 from app.dependencies import (
    get_audio_url_signer,
    get_cosyvoice_service,
@@ -47,7 +46,6 @@ 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__)
@@ -55,34 +53,6 @@ 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)

@@ -182,9 +152,13 @@ def synthesize(

        try:
            if is_segment:
-                celery_app.send_task("worker.process_tts_segment_synthesis", args=[job.id])
+                from worker_app.tasks import process_tts_segment_synthesis
+
+                process_tts_segment_synthesis.delay(job.id)
            else:
-                celery_app.send_task("worker.process_tts_synthesis", args=[job.id])
+                from worker_app.tasks import process_tts_synthesis
+
+                process_tts_synthesis.delay(job.id)
        except Exception as e:
            # Celery 调度失败，标记 job 为 failed
            try:
@@ -233,8 +207,8 @@ def get_tts_job(
    use_case = GetTTSJobUseCase(repository)
    try:
        job = use_case.execute(job_id, user_id)
-    except TTSJobNotFoundError as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found") from _e
+    except TTSJobNotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found")
    return _to_response(job, sign_url)


@@ -250,8 +224,8 @@ def get_tts_job_status(
    use_case = GetTTSJobStatusUseCase(repository)
    try:
        job = use_case.execute(job_id, user_id)
-    except TTSJobNotFoundError as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found") from _e
+    except TTSJobNotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found")
    output_url = job.output_audio_url
    if output_url:
        output_url = sign_url(output_url)
@@ -267,7 +241,7 @@ def get_tts_job_status(
    )


-@router.delete("/jobs/{job_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
+@router.delete("/jobs/{job_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None)
 def delete_tts_job(
    job_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -279,7 +253,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
+    return Response(status_code=204)


@router.post(
@@ -306,8 +280,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 as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found") from _e
+    except TTSJobNotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found")

    # 校验已完成
    if not job.is_completed:
@@ -360,7 +334,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,
@@ -398,10 +372,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 as send_err:
-            logger.warning("WebSocket 错误消息发送失败（连接可能已断开）: %s", send_err)
+        except Exception:
+            pass
@@ -1,8 +1,7 @@
 import logging
-from typing import Any
+from typing import Annotated, 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
@@ -18,11 +17,12 @@ from app.schemas.upload import (
    DirectUploadCompleteResponse,
    DirectUploadPrepareRequest,
    DirectUploadPrepareResponse,
+    UploadAssetRequest,
    UploadAssetResponse,
 )
 from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, status

-from packages.application import SubmitIngestJobCommand, SubmitIngestJobUseCase
+from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase

 logger = logging.getLogger(__name__)

@@ -80,6 +80,21 @@ 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,
@@ -120,7 +135,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,
@@ -168,7 +183,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,
@@ -237,7 +252,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:
@@ -1,238 +0,0 @@
-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,
-    )
@@ -6,7 +6,6 @@ import logging
 from typing import Optional

 from app.auth import AuthenticatedUser, get_current_user
-from app.core.celery_app import celery_app
 from app.dependencies import get_cosyvoice_service, get_voice_clone_profile_repository
 from app.schemas.voice_clone import (
    CreateVoiceCloneRequest,
@@ -29,6 +28,7 @@ from packages.application.voice_clone.use_cases import (
    VoiceCloneNotRetryableError,
 )
 from packages.application.voice_clone.workflow import (
+    VoiceCloneWorkflowError,
    VoiceCloneWorkflowService,
 )

@@ -98,7 +98,9 @@ def create_voice_clone(
    task_id = (profile.metadata or {}).get("cosyvoice_task_id", "")
    if profile.status == "processing" and task_id:
        try:
-            celery_app.send_task("worker.process_voice_clone", args=[profile.id])
+            from worker_app.tasks import process_voice_clone
+
+            process_voice_clone.delay(profile.id)
            logger.info(f"Celery task dispatched for voice clone {profile.id}")
        except Exception as e:
            logger.error(f"Failed to dispatch Celery task: {e}")
@@ -140,8 +142,8 @@ def get_voice_clone(
    use_case = GetVoiceCloneUseCase(repository)
    try:
        profile = use_case.execute(clone_id, user_id)
-    except VoiceCloneNotFoundError as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found") from _e
+    except VoiceCloneNotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found")
    return _to_response(profile)


@@ -156,8 +158,8 @@ def get_voice_clone_status(
    use_case = GetVoiceCloneStatusUseCase(repository)
    try:
        profile = use_case.execute(clone_id, user_id)
-    except VoiceCloneNotFoundError as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found") from _e
+    except VoiceCloneNotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found")
    return VoiceCloneStatusResponse(
        id=profile.id,
        status=profile.status,
@@ -171,7 +173,6 @@ 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,
@@ -184,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
+    return Response(status_code=204)


@router.post("/{clone_id}/retry", response_model=VoiceCloneProfileResponse)
@@ -200,19 +201,21 @@ def retry_voice_clone(
    user_id = authenticated_user.user.id
    try:
        profile = workflow.retry_clone(clone_id, user_id)
-    except VoiceCloneNotFoundError as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found") from _e
-    except VoiceCloneNotRetryableError as _e:
+    except VoiceCloneNotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found")
+    except VoiceCloneNotRetryableError:
        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", "")
    if profile.status == "processing" and task_id:
        try:
-            celery_app.send_task("worker.process_voice_clone", args=[profile.id])
+            from worker_app.tasks import process_voice_clone
+
+            process_voice_clone.delay(profile.id)
            logger.info(f"Celery task dispatched for voice clone retry {profile.id}")
        except Exception as e:
            logger.error(f"Failed to dispatch Celery task: {e}")
@@ -7,9 +7,8 @@ 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_cosyvoice_service, get_db_session, get_user_repository
+from app.dependencies import get_audio_url_signer, get_db_session, get_user_repository
 from app.schemas.voice import (
    PresetVoiceItemResponse,
    PresetVoiceListResponse,
@@ -27,7 +26,6 @@ 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,
@@ -38,18 +36,11 @@ from packages.application.voice_library.use_cases import (
    QuotaExceededError,
    UpdateVoiceLibraryUseCase,
 )
-from packages.domain.preset_voices import PRESET_VOICES, get_preset_voice_by_id
+from packages.domain.preset_voices import PRESET_VOICES
 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)
@@ -134,6 +125,13 @@ 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"
+
+
 # ==================== 统一配音列表（预置 + 克隆）====================


@@ -224,58 +222,6 @@ 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 端点（保持向后兼容）====================


@@ -325,7 +271,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,
@@ -347,7 +293,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)


@@ -377,12 +323,12 @@ def update_voice(
    use_case = UpdateVoiceLibraryUseCase(voice_repository)
    try:
        item = use_case.execute(command)
-    except NotFoundError as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice not found") from _e
+    except NotFoundError:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice not found")
    return _to_response(item, sign_url)


-@router.delete("/{voice_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
+@router.delete("/{voice_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None)
 def delete_voice(
    voice_id: str,
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -393,4 +339,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
+    return Response(status_code=204)
@@ -1,28 +1,171 @@
-"""API 服务配置（向后兼容层）。
+import os
+from typing import Optional

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

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

-from packages.config import APISettings as Settings
-from packages.config import get_api_settings as get_settings
-from packages.config import reload_settings_cache
+class Settings(BaseSettings):
+    APP_NAME: str = "xiaoxia-saas"
+    APP_VERSION: str = "0.1.61"
+    ENVIRONMENT: str = "development"
+    DEBUG: bool = True
+
+    # 应用基础 URL，用于生成认证邮件中的链接
+    # 开发环境默认 http://localhost:3000
+    # 生产环境应通过环境变量 APP_BASE_URL 设置
+    APP_BASE_URL: str = "http://localhost:3000"
+
+    # Container bind address; external expose is controlled by Docker/Nginx.
+    API_HOST: str = "0.0.0.0"  # nosec: B104
+    API_PORT: int = 8000
+    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
+    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
+
+    @field_validator("JWT_SECRET_KEY", mode="before")
+    @classmethod
+    def validate_jwt_secret_key(cls, v):
+        if v is None or v == "":
+            raise ValueError(
+                "JWT_SECRET_KEY must be set via environment variable. " "Do not use default value in production!"
+            )
+        # Block known insecure default values
+        insecure_defaults = [
+            "your-secret-key-change-in-production",
+            "your-secret-key",
+            "secret",
+            "changeme",
+            "password",
+        ]
+        if v.lower() in [d.lower() for d in insecure_defaults]:
+            raise ValueError(
+                f"JWT_SECRET_KEY '{v}' is insecure. " "Please set a strong random secret via environment variable."
+            )
+        return v
+
+    ENABLE_EMAIL_DELIVERY: bool = False
+    SMTP_HOST: str = "smtp.gmail.com"
+    SMTP_PORT: int = 587
+    SMTP_USER: str = ""
+    SMTP_PASSWORD: str = ""
+    SMTP_FROM_EMAIL: str = ""
+    SMTP_FROM_NAME: str = "小虾 SaaS"
+    SMTP_USE_TLS: bool = True
+
+    CELERY_BROKER_URL: str = "redis://localhost:6379/0"
+    CELERY_RESULT_BACKEND: str = "redis://localhost:6379/1"
+
+    # OSS 七牛云相关
+    OSS_ENDPOINT: str = "oss-cn-hangzhou.aliiyuncs.com"
+    OSS_ACCESS_KEY_ID: str = ""
+    OSS_ACCESS_KEY_SECRET: str = ""
+    OSS_BUCKET_NAME: str = "xiaoxia-autocut"
+
+    @field_validator("OSS_ACCESS_KEY_ID", mode="before")
+    @classmethod
+    def validate_oss_access_key_id(cls, v):
+        if (v is None or v == "") and os.getenv("APP_ENV", "development") != "development":
+            raise ValueError(
+                "OSS_ACCESS_KEY_ID must be set via environment variable in non-development environments. "
+                "Check the server .env file (e.g. /var/lib/xiaoxia-saas-staging/.env)."
+            )
+        return v or ""
+
+    @field_validator("OSS_ACCESS_KEY_SECRET", mode="before")
+    @classmethod
+    def validate_oss_access_key_secret(cls, v):
+        if (v is None or v == "") and os.getenv("APP_ENV", "development") != "development":
+            raise ValueError(
+                "OSS_ACCESS_KEY_SECRET must be set via environment variable in non-development environments. "
+                "Check the server .env file (e.g. /var/lib/xiaoxia-saas-staging/.env)."
+            )
+        return v or ""
+
+    OSS_DIRECT_UPLOAD_MAX_MB: int = Field(
+        default=2000,
+        validation_alias=AliasChoices("OSS_DIRECT_UPLOAD_MAX_MB", "MAX_UPLOAD_SIZE_MB"),
+    )
+    OSS_DIRECT_UPLOAD_EXPIRE_SECONDS: int = 900
+
+    LOG_LEVEL: str = "INFO"
+    CORS_ORIGINS_RAW: str = "http://localhost:3000,http://localhost:5173,http://localhost:8000"
+
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        env_file_encoding="utf-8",
+        case_sensitive=False,
+        extra="ignore",
+    )
+
+    @property
+    def CORS_ORIGINS(self) -> list[str]:
+        return [origin.strip() for origin in self.CORS_ORIGINS_RAW.split(",") if origin.strip()]
+
+    @property
+    def database_url(self) -> str:
+        return self.DATABASE_URL
+
+    @property
+    def redis_url(self) -> str:
+        return self.REDIS_URL
+
+    @property
+    def celery_broker_url(self) -> str:
+        return self.CELERY_BROKER_URL
+
+    @property
+    def celery_result_backend(self) -> str:
+        return self.CELERY_RESULT_BACKEND
+
+    @property
+    def oss_endpoint(self) -> str:
+        return self.OSS_ENDPOINT
+
+    @property
+    def oss_access_key_id(self) -> str:
+        return self.OSS_ACCESS_KEY_ID
+
+    @property
+    def oss_access_key_secret(self) -> str:
+        return self.OSS_ACCESS_KEY_SECRET
+
+    @property
+    def oss_bucket_name(self) -> str:
+        return self.OSS_BUCKET_NAME
+
+
+_settings: Optional[Settings] = None
+
+
+def get_settings() -> Settings:
+    global _settings
+    if _settings is None:
+        env = os.getenv("APP_ENV", "development")
+        env_file = f".env.{env}" if env != "development" else ".env"
+        if os.path.exists(env_file):
+            _settings = Settings(_env_file=env_file)
+        else:
+            _settings = Settings()
+    return _settings
+

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

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

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


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

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

-settings = get_settings()

 __all__ = ["AppSettings", "get_settings", "reload_settings", "settings"]
@@ -1,14 +1,283 @@
-"""Backward-compatible re-export from shared storage.
+"""阿里云 OSS 存储服务"""

-All storage logic now lives in ``packages.shared.storage``.
-This module keeps old import paths working so existing code
-does not need to change.
-"""
+import base64
+import datetime as dt
+import hashlib
+import hmac
+import json
+import logging
+import os
+from urllib.parse import urlparse

-from packages.shared.storage import SharedStorageService as OSSStorageService
-from packages.shared.storage import (
-    get_shared_storage_service,
-    get_storage_service,
-)
+try:
+    import oss2
+except ImportError:  # pragma: no cover - exercised in minimal local/test environments
+    oss2 = None
+from app.config import get_settings

-__all__ = ["OSSStorageService", "get_storage_service", "get_shared_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
@@ -141,7 +141,7 @@ def safe_enqueue_generation_task(
            global_pending_limit,
            user_id or "unknown",
        )
-        exc: Exception = GlobalQueueFull(pending_count=global_pending, limit=global_pending_limit)
+        exc = 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 = GlobalQueueFull(pending_count=global_after, limit=global_pending_limit)
+            exc: Exception = GlobalQueueFull(pending_count=global_after, limit=global_pending_limit)
        else:
            reason = f"用户 pending 超限(入队后): {user_after}/{user_pending_limit}"
            exc = UserPendingLimitExceeded(user_id=user_id, pending_count=user_after, limit=user_pending_limit)
@@ -50,8 +50,20 @@ 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)

@@ -132,7 +144,7 @@ def get_tag_repository(
    session: Session = Depends(get_db_session),
 ) -> TagRepository:
    """Provide the SQLAlchemy tag repository implementation."""
-    return SQLAlchemyTagRepository(session)  # type: ignore[return-value]
+    return SQLAlchemyTagRepository(session)


 def get_user_repository(
@@ -7,16 +7,12 @@ 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, HTTPException
+from fastapi import Depends
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer

-logger = logging.getLogger(__name__)
-
 from packages.domain.entities import User
 from packages.ports.user_repository import UserRepository

@@ -37,10 +33,6 @@ async def get_current_user_optional(
        return None
    try:
        authenticated_user = await get_authenticated_user(credentials, user_repository)
-    except HTTPException as exc:
-        if exc.status_code >= 500:
-            # 服务端错误不应被静默吞掉，记录日志
-            logger.error("可选认证遇到服务端错误，status=%s", exc.status_code, exc_info=True)
-        # 4xx 认证失败（如 token 无效、用户不存在）属于正常流程，返回 None
+    except HTTPException:
        return None
    return authenticated_user.user
@@ -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: dict[str, list[float]] = {}
+        self.requests = {}  # {ip: [timestamps]}

    async def dispatch(self, request: Request, call_next):
        # 如果配置了路径过滤，只对指定路径限流
@@ -6,7 +6,7 @@ import logging
 import time
 from typing import Callable

-from fastapi import Request
+from fastapi import Request, Response
 from starlette.middleware.base import BaseHTTPMiddleware

 logger = logging.getLogger(__name__)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xiaoxia	f5802a1142	fix: correct workflow yaml syntax Debug CMD Agent / Debug CMD Agent (push) Successful in 0s Details Fix CMD Agent Auth / fix (push) Successful in 3s Details Read Auth Logic / Read check_auth logic (push) Successful in 0s Details Read CMD Agent Source / Read CMD Agent server.py (push) Successful in 0s Details Read CMD Agent Token / Read Real Token (push) Successful in 0s Details	2026-07-12 00:48:07 +08:00
xiaoxia	eea9f01f7b	fix: add workflow to fix cmd agent auth Debug CMD Agent / Debug CMD Agent (push) Successful in 0s Details Read Auth Logic / Read check_auth logic (push) Successful in 0s Details Read CMD Agent Source / Read CMD Agent server.py (push) Successful in 0s Details Read CMD Agent Token / Read Real Token (push) Successful in 0s Details	2026-07-12 00:46:24 +08:00
用户CI Test	aa8a41ddb3	debug: read auth logic and test various auth methods Debug CMD Agent / Debug CMD Agent (push) Successful in 0s Details Read Auth Logic / Read check_auth logic (push) Successful in 0s Details Read CMD Agent Source / Read CMD Agent server.py (push) Successful in 0s Details Read CMD Agent Token / Read Real Token (push) Successful in 0s Details	2026-07-12 00:37:11 +08:00
用户CI Test	1e314e3168	debug: read real cmd-agent token and verify Debug CMD Agent / Debug CMD Agent (push) Successful in 0s Details Read CMD Agent Source / Read CMD Agent server.py (push) Successful in 0s Details Read CMD Agent Token / Read Real Token (push) Successful in 0s Details	2026-07-12 00:35:51 +08:00
用户CI Test	9427e72ba4	debug: read cmd-agent source code Debug CMD Agent / Debug CMD Agent (push) Successful in 0s Details Read CMD Agent Source / Read CMD Agent server.py (push) Successful in 0s Details	2026-07-12 00:34:44 +08:00
用户CI Test	b7f105d4ac	debug: diagnose cmd-agent auth issue Debug CMD Agent / Debug CMD Agent (push) Successful in 0s Details	2026-07-12 00:33:07 +08:00