fix: 生成任务入队失败时标记为failed，避免pending僵尸任务

根因：任务创建(DB commit)和入队(Celery send_task)是两个独立操作，
send_task失败时任务卡在pending状态永远不会执行。

修复：
- 新增_safe_enqueue_generation_task安全入队函数
- send_task失败时自动标记任务为failed并记录错误
- 覆盖4处入口：批量创建、generation重试、task_center两级重试

.env.example

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

.env.production.example

@@ -42,15 +42,10 @@ OSS_DIRECT_UPLOAD_MAX_MB=2000
 OSS_DIRECT_UPLOAD_EXPIRE_SECONDS=900
 
 # ==================== CosyVoice 语音合成（必须配置）====================
-# 注意：base_url 只需写到 /api/v1，具体路径由代码拼接
-# 模型: cosyvoice-v3-flash (推荐，支持系统音色，性价比高)
-#       cosyvoice-v3-plus (高质量，系统音色少)
-#       cosyvoice-v3.5-flash / cosyvoice-v3.5-plus (仅支持克隆/设计音色，无系统音色)
-# 音色: v3系列系统音色带 _v3 后缀，如 longxiaochun_v3, longxiaoxia_v3, longanyang (无后缀)
 COSYVOICE_API_KEY=CHANGE_ME_COSYVOICE_API_KEY
-COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
-COSYVOICE_MODEL=cosyvoice-v3-flash
-COSYVOICE_VOICE=longxiaochun_v3
+COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1/services/aigc/text2audio
+COSYVOICE_MODEL=cosyvoice-v1
+COSYVOICE_VOICE=longxiaochun
 COSYVOICE_SAMPLE_RATE=22050
 COSYVOICE_FORMAT=mp3
 

.flake8

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

.gitea/workflows/auto-merge.yml

@@ -0,0 +1,65 @@
+name: Auto Merge PRs
+
+on:
+  schedule:
+    - cron: '0 */6 * * *'
+  workflow_dispatch:
+
+jobs:
+  auto-merge:
+    runs-on: saas
+    timeout-minutes: 10
+    steps:
+      - name: Checkout code
+        shell: sh
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          set -eu
+          python3 - <<'PY'
+          import io, os, tarfile, time, urllib.request, urllib.error
+          url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/{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:
+              top_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
+              for member in tar.getmembers():
+                  name = member.name
+                  if name == top_prefix[:-1]:
+                      continue
+                  if name.startswith(top_prefix):
+                      member.name = name[len(top_prefix):]
+                  if member.name:
+                      tar.extract(member, '.')
+          PY
+
+      - name: Auto merge develop PRs
+        run: |
+          bash scripts/auto_merge_prs.sh develop
+
+      - name: Auto merge main PRs (release only)
+        run: |
+          bash scripts/auto_merge_prs.sh main

.gitea/workflows/test-ssh-secret.yml

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

.gitea/workflows/tests.yml

@@ -0,0 +1,163 @@
+name: Tests
+
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: runtime-builder
+
+    steps:
+    - name: Checkout code
+      shell: sh
+      run: |
+        set -eu
+        python - <<'PY'
+        import io
+        import os
+        import tarfile
+        import time
+        import urllib.error
+        import urllib.request
+
+        url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
+        request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
+        # Retry up to 5 times with backoff for transient 5xx errors
+        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: Show Python version
+      shell: sh
+      run: |
+        set -eu
+        python --version
+        python -m pip --version
+
+    - name: Install dependencies
+      shell: sh
+      run: |
+        set -eu
+        python -m pip install --upgrade pip -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
+        python -m pip install -r requirements.txt -r requirements-dev.txt -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
+
+    - name: Run unit tests
+      shell: sh
+      run: |
+        set -eu
+        PYTHONPATH="$PWD/apps/api:$PWD" python -m pytest tests/unit -q
+
+    - name: Run integration tests
+      shell: sh
+      run: |
+        set -eu
+        PYTHONPATH="$PWD/apps/api:$PWD" python -m pytest tests/integration -q --timeout=60 -x
+
+  lint:
+    runs-on: runtime-builder
+
+    steps:
+    - name: Checkout code
+      shell: sh
+      run: |
+        set -eu
+        python - <<'PY'
+        import io
+        import os
+        import tarfile
+        import time
+        import urllib.error
+        import urllib.request
+
+        url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
+        request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
+        # Retry up to 5 times with backoff for transient 5xx errors
+        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: Install dependencies
+      shell: sh
+      run: |
+        set -eu
+        python -m pip install --upgrade pip -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
+        python -m pip install -r requirements.txt -r requirements-dev.txt -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
+
+    - name: Run Black (check only)
+      shell: sh
+      run: |
+        set -eu
+        python -m black --check alembic apps packages tests scripts
+
+    - name: Run Flake8
+      shell: sh
+      run: |
+        set -eu
+        python -m flake8 apps packages tests --count --statistics

.gitignore

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

apps/api/app/__init__.py

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

apps/api/app/api/__init__.py

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

apps/api/app/api/router.py

@@ -8,12 +8,10 @@ from app.api.routes.dashboard import router as dashboard_router
 from app.api.routes.duplication import router as duplication_router
 from app.api.routes.edit_plans import router as edit_plans_router
 from app.api.routes.edit_templates import router as edit_templates_router
-from app.api.routes.feature_flags import router as feature_flags_router
 from app.api.routes.generated_videos import router as generated_videos_router
 from app.api.routes.generation_tasks import router as generation_tasks_router
 from app.api.routes.health import router as health_check_router
 from app.api.routes.ingest_jobs import router as ingest_jobs_router
-from app.api.routes.internal_render import router as internal_render_router
 from app.api.routes.jobs import router as jobs_router
 from app.api.routes.projects import router as projects_router
 from app.api.routes.recipes import router as recipes_router
@@ -153,11 +151,3 @@ api_router.include_router(
     prefix="/tts",
     tags=["TTS"],
 )
-api_router.include_router(
-    feature_flags_router,
-    tags=["Internal"],
-)
-api_router.include_router(
-    internal_render_router,
-    tags=["Internal"],
-)

apps/api/app/api/routes/_helpers.py

@@ -1,48 +0,0 @@
-"""路由层共享辅助函数 — 消除跨文件重复定义。"""
-
-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")

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

@@ -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,
@@ -161,7 +168,7 @@ 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)

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

@@ -27,8 +27,6 @@ from packages.application import (
 )
 from packages.domain import AssetStatus, ClassificationStatus
 
-from app.api.routes._helpers import check_project_access
-
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
@@ -74,6 +72,14 @@ def _to_asset_response(item, storage_service=None) -> AssetResponse:
     )
 
 
+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(
@@ -130,7 +136,7 @@ def list_assets(
             library = asset_library_repository.get(library_id)
             if library is None:
                 raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
-            check_project_access(library.project_id, user_id, project_repository)
+            _check_project_access(library.project_id, user_id, project_repository)
             if ft:
                 items = asset_repository.find_by_library_and_file_type(library_id, ft, skip=skip, limit=limit)
                 total = asset_repository.count_by_project(library.project_id) if not kind else len(items)
@@ -146,7 +152,7 @@ def list_assets(
 
         # 模式2：指定 project_id
         if project_id:
-            check_project_access(project_id, user_id, project_repository)
+            _check_project_access(project_id, user_id, project_repository)
             if ft:
                 # 无直接方法，加载后按 file_type 过滤（仍比全量加载好）
                 all_items = asset_repository.find_by_project(project_id)
@@ -204,13 +210,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 kind:
             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)
     elif project_id:
-        check_project_access(project_id, user_id, project_repository)
+        _check_project_access(project_id, user_id, project_repository)
         all_items = asset_repository.find_by_project(project_id)
     else:
         try:
@@ -256,7 +262,7 @@ 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)
@@ -280,7 +286,7 @@ def batch_delete_assets(
             failed_ids.append(asset_id)
             continue
         try:
-            check_project_access(item.project_id, user_id, project_repository)
+            _check_project_access(item.project_id, user_id, project_repository)
             deleted_ids.append(asset_id)
         except HTTPException:
             failed_ids.append(asset_id)
@@ -301,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)
 
 
@@ -316,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:
@@ -340,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)
 
 
@@ -357,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:
@@ -381,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)
 

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

@@ -206,7 +206,7 @@ async def verify_email_post(
     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),
@@ -223,7 +223,7 @@ 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),
@@ -243,6 +243,7 @@ async def logout(
     current_user: AuthenticatedUser = Depends(get_current_user),
 ):
     """登出 - 将当前 token 加入黑名单"""
+    from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
     if credentials:
         try:

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

@@ -14,6 +14,7 @@ from typing import Any
 from uuid import uuid4
 
 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 (
@@ -34,8 +35,6 @@ from fastapi.params import File
 
 from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase
 
-from app.api.routes._helpers import require_project_and_library
-
 router = APIRouter()
 logger = logging.getLogger(__name__)
 
@@ -114,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)
@@ -191,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:
@@ -205,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,

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

@@ -24,7 +24,6 @@ from typing import Any, List, Optional
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.core.celery_app import celery_app
-from app.core.task_enqueue import GLOBAL_PENDING_LIMIT, USER_PENDING_LIMIT
 from app.dependencies import get_asset_library_repository, get_asset_repository, get_db_session, get_project_repository
 from app.schemas.generation_task import GenerationTaskResponse
 from app.services import EditPlanService, PlanGeneratorService
@@ -32,6 +31,12 @@ from fastapi import APIRouter, Depends, HTTPException, Query, status
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import Session
 
+from packages.adapters.sqlalchemy_impl.asset_library_repository import (
+    SQLAlchemyAssetLibraryRepository,
+)
+from packages.adapters.sqlalchemy_impl.asset_repository import (
+    SQLAlchemyAssetRepository,
+)
 from packages.adapters.sqlalchemy_impl.generation_task_repository import (
     SQLAlchemyGenerationTaskRepository,
 )
@@ -45,8 +50,6 @@ from packages.application.generation_tasks import (
     CreateGenerationTaskCommand,
     CreateGenerationTaskUseCase,
 )
-
-from ._helpers import check_project_access
 from packages.domain.config_schemas import normalize_plan_config
 from packages.domain.edit_plan import EditPlan, EditPlanStatus
 
@@ -243,6 +246,17 @@ class GenerateFromTemplateResponse(BaseModel):
 # ── Helpers ───────────────────────────────────────────────────────────────────
 
 
+def _check_project_access(project_id: str, user_id: str, project_repository: Any) -> None:
+    """校验用户对项目的访问权限（参照 assets.py 的 can_access 模式）"""
+    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 _to_response(p: EditPlan) -> EditPlanResponse:
     return EditPlanResponse(
         id=p.id,
@@ -296,7 +310,7 @@ def list_plans(
 
     # 项目鉴权：如果指定了 project_id，校验用户是否有权访问
     if project_id:
-        check_project_access(project_id, current_user.user.id, project_repository)
+        _check_project_access(project_id, current_user.user.id, project_repository)
 
     skip = (page - 1) * page_size
     plans = svc.list_plans(
@@ -338,7 +352,7 @@ def get_plan(
         )
     # 项目鉴权
     if plan.project_id:
-        check_project_access(plan.project_id, current_user.user.id, project_repository)
+        _check_project_access(plan.project_id, current_user.user.id, project_repository)
     return _to_response(plan)
 
 
@@ -354,7 +368,7 @@ def create_plan(
     project_id = (body.project_id or "").strip()
     # 项目鉴权
     if project_id:
-        check_project_access(project_id, current_user.user.id, project_repository)
+        _check_project_access(project_id, current_user.user.id, project_repository)
     svc = EditPlanService(db)
     # 标准化 config，填充 cover/title/subtitle/bgm 默认值
     normalized_config = normalize_plan_config(body.config)
@@ -396,7 +410,7 @@ def update_plan(
     if existing is None:
         raise HTTPException(status_code=404, detail=f"剪辑计划不存在: {plan_id}")
     if existing.project_id:
-        check_project_access(existing.project_id, current_user.user.id, project_repository)
+        _check_project_access(existing.project_id, current_user.user.id, project_repository)
 
     # 基础字段更新
     try:
@@ -450,7 +464,7 @@ def delete_plan(
     # 项目鉴权
     existing = svc.get_plan(plan_id)
     if existing and existing.project_id:
-        check_project_access(existing.project_id, current_user.user.id, project_repository)
+        _check_project_access(existing.project_id, current_user.user.id, project_repository)
     deleted = svc.delete_plan(plan_id)
     if not deleted:
         raise HTTPException(
@@ -492,7 +506,7 @@ def generate_plan(
     if plan_check is None:
         raise HTTPException(status_code=404, detail=f"剪辑计划不存在: {plan_id}")
     if plan_check.project_id:
-        check_project_access(plan_check.project_id, current_user.user.id, project_repository)
+        _check_project_access(plan_check.project_id, current_user.user.id, project_repository)
 
     # ── 自动兜底 1: draft → editing ──────────────────────────────────────
     if plan_check.status == EditPlanStatus.DRAFT:
@@ -630,31 +644,6 @@ def generate_plan(
 
         # 创建 GenerationTask
         gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-
-        # 队列限流预检查（repository 不支持计数时跳过）
-        user_id = current_user.user.id
-        try:
-            has_count = hasattr(gen_task_repo, "count_pending_by_user") and hasattr(
-                gen_task_repo, "count_pending_total"
-            )
-            if has_count:
-                user_pending = gen_task_repo.count_pending_by_user(user_id)
-                global_pending = gen_task_repo.count_pending_total()
-                if user_pending >= USER_PENDING_LIMIT:
-                    raise HTTPException(
-                        status_code=429,
-                        detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
-                    )
-                if global_pending >= GLOBAL_PENDING_LIMIT:
-                    raise HTTPException(
-                        status_code=503,
-                        detail="系统繁忙，请稍后再试",
-                    )
-        except HTTPException:
-            raise
-        except Exception as e:
-            logger.warning("[队列限流] 剪辑计划限流检查失败，跳过: %s", e)
-
         gen_task_use_case = CreateGenerationTaskUseCase(gen_task_repo)
         plan = svc.get_plan_or_raise(plan_id)
         gen_task = gen_task_use_case.execute(
@@ -695,7 +684,7 @@ def generate_plan(
     except HTTPException:
         # 已处理的 HTTP 异常直接透传
         raise
-    except Exception:
+    except Exception as exc:
         logger.exception("触发剪辑计划生成失败: plan_id=%s", plan_id)
         # 尝试将计划标记为失败（RENDERING → FAILED 是合法的状态流转）
         try:
@@ -734,7 +723,7 @@ def get_generation_status(
     plan = gen_status["plan"]
     # 项目鉴权
     if plan.project_id:
-        check_project_access(plan.project_id, current_user.user.id, project_repository)
+        _check_project_access(plan.project_id, current_user.user.id, project_repository)
     clips = gen_status["clips"]
 
     clip_items = [
@@ -776,7 +765,7 @@ def list_plan_generations(
     # 验证计划存在 + 项目鉴权
     plan = svc.get_plan_or_raise(plan_id)
     if plan.project_id:
-        check_project_access(plan.project_id, current_user.user.id, project_repository)
+        _check_project_access(plan.project_id, current_user.user.id, project_repository)
 
     gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
     tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
@@ -845,7 +834,7 @@ def ai_recommend_clips(
 
     # 项目鉴权
     if plan.project_id:
-        check_project_access(plan.project_id, current_user.user.id, project_repository)
+        _check_project_access(plan.project_id, current_user.user.id, project_repository)
 
     # 验证状态：只允许 draft 或 editing
     plan_status = plan.status.value if hasattr(plan.status, "value") else plan.status
@@ -894,7 +883,7 @@ def ai_recommend_clips(
             config=normalized_config,
             total_duration=result["total_duration"],
         )
-    except Exception:
+    except Exception as exc:
         logger.exception("AI 推荐写入失败，plan_id=%s 数据可能不一致", plan_id)
         # 尝试回滚未提交的变更
         try:
@@ -975,7 +964,7 @@ def generate_cover(
 
     # 项目鉴权
     if plan.project_id:
-        check_project_access(plan.project_id, current_user.user.id, project_repository)
+        _check_project_access(plan.project_id, current_user.user.id, project_repository)
 
     # 调用 AI 封面生成服务
     from apps.worker.worker_app.tasks.ai_tasks import run_generate_cover
@@ -1095,7 +1084,7 @@ def get_plan_timeline(
     plan = svc.get_plan_or_raise(plan_id)
     # 项目鉴权
     if plan.project_id:
-        check_project_access(plan.project_id, current_user.user.id, project_repository)
+        _check_project_access(plan.project_id, current_user.user.id, project_repository)
 
     clips = svc.list_clips(plan_id=plan_id, skip=0, limit=200)
     # 按 order 排序
@@ -1156,7 +1145,7 @@ def generate_from_template(
 
     # 项目鉴权
     if body.project_id:
-        check_project_access(body.project_id, current_user.user.id, project_repository)
+        _check_project_access(body.project_id, current_user.user.id, project_repository)
 
     template_svc = EditTemplateService(db)
 

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

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

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

@@ -4,15 +4,8 @@ import uuid
 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.core.task_enqueue import (
-    GLOBAL_PENDING_LIMIT,
-    USER_PENDING_LIMIT,
-    GlobalQueueFull,
-    UserPendingLimitExceeded,
-    check_queue_limits,
-    safe_enqueue_generation_task,
-)
 from app.dependencies import (
     get_asset_library_repository,
     get_asset_repository,
@@ -32,8 +25,6 @@ from app.schemas.generation_task import (
 )
 from fastapi import APIRouter, Depends, HTTPException
 
-from app.api.routes._helpers import check_project_access
-
 from packages.application import (
     CreateGenerationTaskCommand,
     CreateGenerationTaskUseCase,
@@ -45,6 +36,53 @@ logger = logging.getLogger(__name__)
 
 router = APIRouter()
 
+
+def _safe_enqueue_generation_task(
+    task: Any,
+    generation_task_repository: Any,
+) -> bool:
+    """安全入队：send_task 失败时自动把任务标记为 failed，避免留下 pending 僵尸任务。
+
+    Returns:
+        True 表示入队成功，False 表示入队失败（已标记为 failed）
+    """
+    try:
+        celery_app.send_task("worker.generate_video", args=[task.id])
+        logger.info(
+            "[生成任务] 入队成功: task_id=%s, status=%s",
+            task.id,
+            task.status,
+        )
+        return True
+    except Exception as e:
+        logger.error(
+            "[生成任务] 入队失败，标记为失败: task_id=%s error=%s",
+            task.id,
+            e,
+            exc_info=True,
+        )
+        try:
+            task.mark_failed(f"任务入队失败: {e}")
+            generation_task_repository.update(task)
+        except Exception as update_err:
+            logger.error(
+                "[生成任务] 入队失败后更新状态也失败: task_id=%s error=%s",
+                task.id,
+                update_err,
+                exc_info=True,
+            )
+        return False
+
+
+def _check_project_access(project_id: str, user_id: str, project_repository) -> None:
+    """检查用户是否有项目访问权限"""
+    project = project_repository.find_by_id(project_id)
+    if project is None:
+        raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
+    if not project.can_access(user_id):
+        raise HTTPException(status_code=403, detail="Access denied to project")
+
+
 def _to_generation_task_response(task) -> GenerationTaskResponse:
     return GenerationTaskResponse(
         id=task.id,
@@ -228,31 +266,9 @@ def create_generation_task(
     count = request.count
     created_tasks = []
     failed_tasks = []
-    user_id = authenticated_user.user.id
     # 同批次任务共享 batch_id，用于视频查重时批次内比对
     batch_id = uuid.uuid4().hex if count > 1 else ""
 
-    # 预检查：批量提交前先看会不会超限，避免建一半才拒
-    try:
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
-        global_pending = generation_task_repository.count_pending_total()
-        if user_pending + count > USER_PENDING_LIMIT:
-            raise UserPendingLimitExceeded(
-                user_id=user_id, pending_count=user_pending + count, limit=USER_PENDING_LIMIT
-            )
-        if global_pending + count > GLOBAL_PENDING_LIMIT:
-            raise GlobalQueueFull(pending_count=global_pending + count, limit=GLOBAL_PENDING_LIMIT)
-    except UserPendingLimitExceeded as e:
-        raise HTTPException(
-            status_code=429,
-            detail=f"您的待处理任务过多（当前 {e.pending_count - count}/{e.limit}，本次提交 {count} 个），请等待完成后再提交",
-        ) from e
-    except GlobalQueueFull as e:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from e
-
     try:
         for _ in range(count):
             task = use_case.execute(
@@ -265,42 +281,16 @@ def create_generation_task(
                     asset_ids=resolved_asset_ids,
                     title_ids=request.title_ids,
                     voice_ids=request.voice_ids,
-                    created_by_user_id=user_id,
+                    created_by_user_id=authenticated_user.user.id,
                     source_edit_plan_id=request.source_edit_plan_id,
                     asset_select_mode=request.asset_select_mode,
                     batch_id=batch_id,
                 )
             )
-            try:
-                if safe_enqueue_generation_task(
-                    task,
-                    generation_task_repository,
-                    user_id=user_id,
-                    log_prefix="[生成任务]",
-                    log_task_status=True,
-                ):
-                    created_tasks.append(task)
-                else:
-                    failed_tasks.append(task)
-            except UserPendingLimitExceeded:
-                # 兜底：如果预检查后又并发提交了，在这里也拦住
+            if _safe_enqueue_generation_task(task, generation_task_repository):
+                created_tasks.append(task)
+            else:
                 failed_tasks.append(task)
-                if not created_tasks:
-                    raise HTTPException(
-                        status_code=429,
-                        detail="您的待处理任务过多，请等待完成后再提交",
-                    )
-                break
-            except GlobalQueueFull:
-                failed_tasks.append(task)
-                if not created_tasks:
-                    raise HTTPException(
-                        status_code=503,
-                        detail="系统繁忙，请稍后再试",
-                    )
-                break
-    except HTTPException:
-        raise
     except Exception as e:
         logger.error("[生成任务] 创建失败: %s", e, exc_info=True)
         raise HTTPException(status_code=500, detail="创建生成任务失败，请稍后重试或查看任务日志")
@@ -332,7 +322,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)
 
 
@@ -349,7 +339,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 = []
@@ -375,21 +365,6 @@ def retry_generation_task(
     if status_val != "failed":
         raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
 
-    user_id = authenticated_user.user.id
-    # 预检查：创建前判断，>= 上限就拒绝
-    user_pending = generation_task_repository.count_pending_by_user(user_id)
-    global_pending = generation_task_repository.count_pending_total()
-    if user_pending >= USER_PENDING_LIMIT:
-        raise HTTPException(
-            status_code=429,
-            detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
-        )
-    if global_pending >= GLOBAL_PENDING_LIMIT:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        )
-
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
     retried = use_case.execute(
         CreateGenerationTaskCommand(
@@ -401,28 +376,11 @@ def retry_generation_task(
             asset_ids=task.asset_ids,
             title_ids=task.title_ids,
             voice_ids=task.voice_ids,
-            created_by_user_id=user_id,
+            created_by_user_id=authenticated_user.user.id,
             source_edit_plan_id=task.source_edit_plan_id or "",
             asset_select_mode=getattr(task, "asset_select_mode", ""),
         )
     )
-    try:
-        if not safe_enqueue_generation_task(
-            retried,
-            generation_task_repository,
-            user_id=user_id,
-            log_prefix="[生成任务]",
-            log_task_status=True,
-        ):
-            logger.warning("[生成任务] 重试入队失败: task_id=%s", retried.id)
-    except UserPendingLimitExceeded:
-        raise HTTPException(
-            status_code=429,
-            detail="您的待处理任务过多，请等待完成后再提交",
-        ) from None
-    except GlobalQueueFull:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from None
+    if not _safe_enqueue_generation_task(retried, generation_task_repository):
+        logger.warning("[生成任务] 重试入队失败: task_id=%s", retried.id)
     return _to_generation_task_response(retried)

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

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

apps/api/app/api/routes/jobs.py

@@ -20,7 +20,7 @@ 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_job_repository, get_project_repository
+from app.dependencies import get_db_session, get_job_repository, get_project_repository
 from app.schemas.job import (
     CompleteJobRequest,
     CreateJobRequest,
@@ -51,8 +51,6 @@ from packages.application.jobs import (
 )
 from packages.domain.job import JobType
 
-from app.api.routes._helpers import check_project_access
-
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
@@ -68,6 +66,15 @@ _JOB_TYPE_TO_CELERY_TASK: dict[str, str] = {
 }
 
 
+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")
+
+
 # ── 创建任务 ──────────────────────────────────────────────────────────────────
 
 
@@ -82,7 +89,7 @@ def create_job(
 
     创建后任务处于 pending 状态，需要调用 /submit 提交执行。
     """
-    check_project_access(request.project_id, authenticated_user.user.id, project_repository)
+    _check_project_access(request.project_id, authenticated_user.user.id, project_repository)
 
     # 校验 job_type
     try:
@@ -175,7 +182,7 @@ def list_project_jobs(
     offset: int = Query(default=0, ge=0),
 ) -> ListJobsResponse:
     """获取项目下的任务列表。"""
-    check_project_access(project_id, authenticated_user.user.id, project_repository)
+    _check_project_access(project_id, authenticated_user.user.id, project_repository)
 
     use_case = ListJobsUseCase(job_repo)
     jobs = use_case.execute(
@@ -197,7 +204,7 @@ def get_job_statistics(
     project_repository: Any = Depends(get_project_repository),
 ) -> JobStatisticsResponse:
     """获取项目任务统计摘要。"""
-    check_project_access(project_id, authenticated_user.user.id, project_repository)
+    _check_project_access(project_id, authenticated_user.user.id, project_repository)
 
     use_case = GetJobStatisticsUseCase(job_repo)
     stats = use_case.execute(project_id)

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

@@ -33,8 +33,6 @@ from packages.application.recipe.use_cases import (
 )
 from packages.ports.user_repository import UserRepository
 
-from app.api.routes._helpers import get_user_plan
-
 router = APIRouter()
 
 
@@ -42,6 +40,13 @@ def _get_recipe_repository(session: Session = Depends(get_db_session)) -> SQLAlc
     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,
@@ -189,7 +194,7 @@ def use_recipe(
     user_repository: UserRepository = Depends(get_user_repository),
 ) -> UseRecipeResponse:
     user_id = authenticated_user.user.id
-    plan_name = get_user_plan(user_id, user_repository)
+    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)

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

@@ -232,7 +232,7 @@ async def payment_callback(
 
         # 创建账单记录
         record_id = uuid.uuid4().hex
-        repo.create(
+        record = repo.create(
             {
                 "id": record_id,
                 "user_id": user_id,

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

@@ -1,15 +1,7 @@
-import logging
 from typing import Any
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.core.celery_app import celery_app
-from app.core.task_enqueue import (
-    GLOBAL_PENDING_LIMIT,
-    USER_PENDING_LIMIT,
-    GlobalQueueFull,
-    UserPendingLimitExceeded,
-    safe_enqueue_generation_task,
-)
 from app.dependencies import (
     get_generation_task_repository,
     get_ingest_job_repository,
@@ -30,10 +22,38 @@ from packages.application import (
     SubmitIngestJobUseCase,
 )
 
-logger = logging.getLogger(__name__)
-
 router = APIRouter()
 
+
+def _safe_enqueue_generation_task(
+    task: Any,
+    generation_task_repository: Any,
+) -> bool:
+    """安全入队：send_task 失败时自动把任务标记为 failed，避免留下 pending 僵尸任务。"""
+    try:
+        celery_app.send_task("worker.generate_video", args=[task.id])
+        logger.info("[任务中心] 生成任务入队成功: task_id=%s", task.id)
+        return True
+    except Exception as e:
+        logger.error(
+            "[任务中心] 生成任务入队失败，标记为失败: task_id=%s error=%s",
+            task.id,
+            e,
+            exc_info=True,
+        )
+        try:
+            task.mark_failed(f"任务入队失败: {e}")
+            generation_task_repository.update(task)
+        except Exception as update_err:
+            logger.error(
+                "[任务中心] 入队失败后更新状态也失败: task_id=%s error=%s",
+                task.id,
+                update_err,
+                exc_info=True,
+            )
+        return False
+
+
 def _humanize_task_error(error_message: str) -> str:
     raw = (error_message or "").strip()
     if not raw:
@@ -148,21 +168,6 @@ def retry_task_by_id(
     if _status_value(task.status) != "failed":
         raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
 
-    user_id = authenticated_user.user.id
-    # 预检查
-    user_pending = generation_task_repository.count_pending_by_user(user_id)
-    global_pending = generation_task_repository.count_pending_total()
-    if user_pending >= USER_PENDING_LIMIT:
-        raise HTTPException(
-            status_code=429,
-            detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
-        )
-    if global_pending >= GLOBAL_PENDING_LIMIT:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        )
-
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
     retried = use_case.execute(
         CreateGenerationTaskCommand(
@@ -174,24 +179,11 @@ def retry_task_by_id(
             asset_ids=task.asset_ids,
             title_ids=task.title_ids,
             voice_ids=task.voice_ids,
-            created_by_user_id=user_id,
+            created_by_user_id=authenticated_user.user.id,
         )
     )
-    try:
-        if not safe_enqueue_generation_task(
-            retried, generation_task_repository, user_id=user_id, log_prefix="[任务中心]"
-        ):
-            logger.warning("[任务中心] 用户级重试入队失败: task_id=%s", retried.id)
-    except UserPendingLimitExceeded:
-        raise HTTPException(
-            status_code=429,
-            detail="您的待处理任务过多，请等待完成后再提交",
-        ) from None
-    except GlobalQueueFull:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from None
+    if not _safe_enqueue_generation_task(retried, generation_task_repository):
+        logger.warning("[任务中心] 用户级重试入队失败: task_id=%s", retried.id)
     return UserTaskResponse(
         id=f"generation:{retried.id}",
         task_type="generation",
@@ -259,22 +251,6 @@ def retry_project_task(
             raise HTTPException(status_code=404, detail="Generation task not found")
         if _status_value(task.status) != "failed":
             raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
-
-        user_id = authenticated_user.user.id
-        # 预检查
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
-        global_pending = generation_task_repository.count_pending_total()
-        if user_pending >= USER_PENDING_LIMIT:
-            raise HTTPException(
-                status_code=429,
-                detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
-            )
-        if global_pending >= GLOBAL_PENDING_LIMIT:
-            raise HTTPException(
-                status_code=503,
-                detail="系统繁忙，请稍后再试",
-            )
-
         use_case = CreateGenerationTaskUseCase(generation_task_repository)
         retried = use_case.execute(
             CreateGenerationTaskCommand(
@@ -286,24 +262,11 @@ def retry_project_task(
                 asset_ids=task.asset_ids,
                 title_ids=task.title_ids,
                 voice_ids=task.voice_ids,
-                created_by_user_id=user_id,
+                created_by_user_id=authenticated_user.user.id,
             )
         )
-        try:
-            if not safe_enqueue_generation_task(
-                retried, generation_task_repository, user_id=user_id, log_prefix="[任务中心]"
-            ):
-                logger.warning("[任务中心] 项目级重试入队失败: task_id=%s", retried.id)
-        except UserPendingLimitExceeded:
-            raise HTTPException(
-                status_code=429,
-                detail="您的待处理任务过多，请等待完成后再提交",
-            ) from None
-        except GlobalQueueFull:
-            raise HTTPException(
-                status_code=503,
-                detail="系统繁忙，请稍后再试",
-            ) from None
+        if not _safe_enqueue_generation_task(retried, generation_task_repository):
+            logger.warning("[任务中心] 项目级重试用队失败: task_id=%s", retried.id)
         return _generation_task_to_project_response(retried)
     if task_type == "ingest":
         job = ingest_job_repository.get(source_id)

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

@@ -28,8 +28,6 @@ from packages.application.title_library.use_cases import (
 )
 from packages.ports.user_repository import UserRepository
 
-from app.api.routes._helpers import get_user_plan
-
 router = APIRouter()
 
 
@@ -53,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),
@@ -93,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,

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

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

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

@@ -1,5 +1,5 @@
 import logging
-from typing import Any
+from typing import Annotated, Any
 from uuid import uuid4
 
 from app.auth import AuthenticatedUser, get_current_user
@@ -17,13 +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 app.api.routes._helpers import require_project_and_library
+from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase
 
 logger = logging.getLogger(__name__)
 
@@ -81,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,
@@ -121,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,
@@ -169,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,
@@ -238,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:

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

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

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

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

apps/api/app/config.py

@@ -25,7 +25,7 @@ class Settings(BaseSettings):
     DATABASE_POOL_SIZE: int = 20
     DATABASE_MAX_OVERFLOW: int = 10  # 调整为合理值：pool_size(20) + max_overflow(10) = 最大30连接
     DATABASE_POOL_TIMEOUT: int = 30
-    DATABASE_POOL_RECYCLE: int = 3600
+    DATABASE_POOL_RECYLE: int = 3600
     USE_IN_MEMORY_DB: bool = False
     AUTO_CREATE_SCHEMA: bool = False
 
@@ -41,11 +41,6 @@ class Settings(BaseSettings):
     # 密钥轮换天数（到达此天数后建议更换密钥）
     SECRET_ROTATION_DAYS: int = 90
 
-    # JWT 算法与过期时间（与 .env.example 对齐）
-    JWT_ALGORITHM: str = "HS256"
-    JWT_ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
-    JWT_REFRESH_TOKEN_EXPIRE_DAYS: int = 30
-
     @field_validator("JWT_SECRET_KEY", mode="before")
     @classmethod
     def validate_jwt_secret_key(cls, v):
@@ -114,9 +109,6 @@ class Settings(BaseSettings):
     LOG_LEVEL: str = "INFO"
     CORS_ORIGINS_RAW: str = "http://localhost:3000,http://localhost:5173,http://localhost:8000"
 
-    # 渲染引擎选择：legacy=旧VideoComposeService，unified=新UnifiedRenderService
-    RENDER_ENGINE: str = "legacy"
-
     model_config = SettingsConfigDict(
         env_file=".env",
         env_file_encoding="utf-8",

apps/api/app/core/__init__.py

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

apps/api/app/core/task_enqueue.py

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

apps/api/app/dependencies.py

@@ -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)
 
@@ -195,7 +207,6 @@ def get_cosyvoice_service():
     能被 CosyVoice 服务器下载。
     """
     from app.core.storage import get_storage_service
-
     from packages.application.cosyvoice_service import CosyVoiceService
 
     storage = get_storage_service()
@@ -205,21 +216,3 @@ def get_cosyvoice_service():
         return storage.get_download_url(url, expires_seconds=86400)
 
     return CosyVoiceService(audio_url_signer=_sign_audio_url)
-
-
-def get_audio_url_signer():
-    """提供音频URL预签名函数（24小时有效期）。
-
-    用于所有 API 返回给前端的音频 URL，确保私有 OSS bucket 下可正常访问。
-    空 URL、非 OSS URL 直接原样返回；签名失败时回退到原始 URL。
-    """
-    from app.core.storage import get_storage_service
-
-    storage = get_storage_service()
-
-    def sign_audio_url(url: str) -> str:
-        if not url:
-            return url
-        return storage.get_download_url(url, expires_seconds=86400)
-
-    return sign_audio_url

apps/api/app/middleware/auth.py

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

apps/api/app/middleware/monitoring.py

@@ -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__)

apps/api/app/schemas/subscription.py

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

apps/api/app/services/auto_clip_service.py

@@ -24,7 +24,7 @@ from packages.adapters.sqlalchemy_impl import (
 )
 from packages.domain.asset import AssetType
 from packages.domain.classification import AssetClassification
-from packages.domain.edit_plan_clip import EditPlanClip
+from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
 
 logger = logging.getLogger(__name__)
 

apps/api/app/services/edit_plan_service.py

@@ -18,6 +18,7 @@ from packages.adapters.sqlalchemy_impl import (
 )
 from packages.domain.edit_plan import EditPlan, EditPlanStatus
 from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
+from packages.domain.generation_task import GenerationTaskStatus
 
 logger = logging.getLogger(__name__)
 

apps/api/app/services/job_service.py

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

apps/api/app/services/plan_generator_service.py

@@ -13,7 +13,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, List
+from typing import Any, List, Optional
 
 from sqlalchemy.orm import Session
 

apps/api/app/services/video_compose_service.py

@@ -16,6 +16,7 @@ FFmpeg 视频合成编排服务：
 from __future__ import annotations
 
 import logging
+import shutil
 from dataclasses import dataclass, field
 from typing import Any
 
@@ -27,7 +28,7 @@ from packages.adapters.sqlalchemy_impl.edit_plan_clip_repository import (
 from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
     SQLAlchemyEditPlanRepository,
 )
-from packages.domain.edit_plan import EditPlanStatus
+from packages.domain.edit_plan import EditPlan, EditPlanStatus
 from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
 from packages.domain.template_clip_config import TransitionEffect
 

apps/web/src/api/dashboard.ts

@@ -0,0 +1,42 @@
+/**
+ * 仪表盘 API
+ * Phase 1 新增：用户仪表盘概览
+ */
+import apiClient from "./client";
+
+/** 仪表盘概览数据 */
+export interface DashboardOverview {
+  /** 素材总数 */
+  total_assets: number;
+  /** 已用存储（字节） */
+  used_storage_bytes: number;
+  /** 总标题数 */
+  total_titles: number;
+  /** 总配音数 */
+  total_voices: number;
+  /** 生成任务总数 */
+  total_tasks: number;
+  /** 成品总数 */
+  total_products: number;
+  /** 最近生成任务 */
+  recent_tasks: Array<{
+    id: string;
+    task_type: string;
+    status: string;
+    progress: number;
+    user_message: string;
+    created_at: string;
+  }>;
+  /** 订阅信息 */
+  subscription: {
+    plan: "free" | "pro" | "enterprise";
+    status: "active" | "inactive" | "expired";
+    expires_at?: string;
+  };
+}
+
+/** 获取仪表盘概览数据 */
+export const getDashboardOverview = async (): Promise<DashboardOverview> => {
+  const response = await apiClient.get("/dashboard/overview");
+  return response.data;
+};

apps/web/src/components/business/business.css

@@ -0,0 +1,365 @@
+/* V21 业务组件统一样式 */
+
+/* ==================== 按钮 ==================== */
+.xx-primary-btn {
+  background: var(--gradient-primary) !important;
+  color: var(--text-inverse) !important;
+  border: none !important;
+  border-radius: var(--radius-md) !important;
+  padding: 10px 20px !important;
+  font-weight: var(--font-weight-bold) !important;
+  box-shadow: var(--shadow-primary) !important;
+  transition: var(--transition-all) !important;
+  cursor: pointer;
+  height: auto !important;
+}
+
+.xx-primary-btn:hover {
+  box-shadow: var(--shadow-hover) !important;
+  transform: translateY(-1px);
+}
+
+.xx-ghost-btn {
+  background: transparent !important;
+  color: var(--primary-color) !important;
+  border: 2px solid var(--primary-color) !important;
+  border-radius: var(--radius-md) !important;
+  padding: var(--space-sm) 18px !important;
+  font-weight: var(--font-weight-bold) !important;
+  transition: var(--transition-all) !important;
+  cursor: pointer;
+  height: auto !important;
+}
+
+.xx-ghost-btn:hover {
+  background: var(--primary-soft) !important;
+}
+
+/* ==================== 卡片 ==================== */
+.xx-card {
+  background: var(--bg-elevated);
+  border: 1px solid var(--border-color);
+  border-radius: var(--radius-xl);
+  box-shadow: var(--shadow-card);
+  padding: var(--space-lg);
+  margin-bottom: 20px;
+  transition: all var(--transition-slow);
+}
+
+.xx-card:hover {
+  box-shadow: var(--shadow-md);
+  transform: translateY(-2px);
+}
+
+/* ==================== 页面结构 ==================== */
+.xx-page {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: var(--space-lg);
+}
+
+.xx-page-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 18px;
+  margin-bottom: 28px;
+}
+
+.xx-page-head h2 {
+  font-size: 26px;
+  font-weight: var(--font-weight-extrabold);
+  color: var(--text-primary);
+  margin: 0 0 var(--space-sm);
+}
+
+.xx-page-head p {
+  font-size: var(--font-size-base);
+  color: var(--text-secondary);
+  margin: 0;
+}
+
+/* ==================== 表格样式 ==================== */
+.xx-table-card {
+  background: var(--bg-elevated);
+  border: 1px solid var(--border-color);
+  border-radius: var(--radius-xl);
+  box-shadow: var(--shadow-card);
+  padding: 20px;
+  overflow: hidden;
+}
+
+/* 表格包装器 */
+.xx-table-wrapper {
+  border-radius: var(--radius-lg);
+  overflow: hidden;
+}
+
+/* ==================== 标签/Tag ==================== */
+.xx-tag {
+  padding: var(--space-xs) 12px;
+  border-radius: var(--radius-xs);
+  font-size: 13px;
+  font-weight: var(--font-weight-medium);
+}
+
+.xx-tag-indigo {
+  background: var(--primary-soft);
+  color: var(--primary-color);
+  border: 1px solid var(--color-primary-200);
+}
+
+.xx-tag-success {
+  background: var(--success-soft);
+  color: var(--color-secondary-500);
+  border: 1px solid var(--success-border);
+}
+
+.xx-tag-warning {
+  background: var(--warning-soft);
+  color: var(--accent-dark);
+  border: 1px solid var(--color-accent-200);
+}
+
+.xx-tag-error {
+  background: var(--error-soft);
+  color: var(--error-color);
+  border: 1px solid var(--error-border);
+}
+
+/* ==================== 搜索栏 ==================== */
+.xx-search-bar {
+  margin-bottom: 20px;
+}
+
+.xx-search-input {
+  width: 100%;
+  padding: 12px 18px;
+  border: 2px solid var(--border-color);
+  border-radius: var(--radius-md);
+  font-size: var(--font-size-base);
+  background: var(--bg-primary);
+  transition: var(--transition-all);
+  outline: none;
+}
+
+.xx-search-input:focus {
+  border-color: var(--primary-color);
+  box-shadow: 0 0 0 4px
+    color-mix(in srgb, var(--primary-color) 10%, transparent);
+}
+
+/* ==================== Modal ==================== */
+.xx-modal .ant-modal-content {
+  border-radius: var(--radius-xl);
+  padding: var(--space-lg);
+}
+
+.xx-modal .ant-modal-header {
+  border-radius: var(--radius-xl) var(--radius-xl) 0 0;
+  padding: 20px var(--space-lg);
+  border-bottom: 1px solid var(--border-color);
+}
+
+.xx-modal .ant-modal-title {
+  font-size: var(--font-size-lg);
+  font-weight: var(--font-weight-bold);
+  color: var(--text-primary);
+}
+
+.xx-modal .ant-modal-footer {
+  border-top: 1px solid var(--border-color);
+  padding: var(--space-md) var(--space-lg);
+}
+
+/* ==================== 空状态 ==================== */
+.xx-empty-state {
+  text-align: center;
+  padding: var(--space-3xl) var(--space-lg);
+  color: var(--text-secondary);
+}
+
+.xx-empty-state-icon {
+  font-size: 48px;
+  margin-bottom: var(--space-md);
+}
+
+/* ==================== 网格布局 ==================== */
+.xx-grid-2 {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 20px;
+}
+
+.xx-grid-3 {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 20px;
+}
+
+.xx-grid-4 {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 20px;
+}
+
+@media (max-width: 768px) {
+  .xx-grid-2,
+  .xx-grid-3,
+  .xx-grid-4 {
+    grid-template-columns: 1fr;
+  }
+}
+
+/* ==================== 配额展示 ==================== */
+.xx-quota-item {
+  padding: 20px;
+  background: var(--bg-primary);
+  border: 1px solid var(--border-color);
+  border-radius: var(--radius-lg);
+  transition: var(--transition-all);
+}
+
+.xx-quota-item:hover {
+  border-color: var(--primary-color);
+  box-shadow: 0 8px 24px
+    color-mix(in srgb, var(--primary-color) 10%, transparent);
+}
+
+/* ==================== 进度条 ==================== */
+.xx-progress {
+  margin-top: 12px;
+}
+
+/* ==================== Ant Design 覆盖样式 ==================== */
+/* Table overrides */
+.ant-table-wrapper .ant-table-thead > tr > th {
+  background: var(--bg-secondary) !important;
+  font-weight: var(--font-weight-bold) !important;
+  color: var(--text-primary) !important;
+  border-bottom: 2px solid var(--border-color) !important;
+  padding: 14px var(--space-md) !important;
+}
+
+.ant-table-wrapper .ant-table-tbody > tr > td {
+  padding: 14px var(--space-md) !important;
+  border-bottom: 1px solid var(--color-gray-100) !important;
+}
+
+.ant-table-wrapper .ant-table-tbody > tr:hover > td {
+  background: var(--color-gray-50) !important;
+}
+
+/* Card overrides */
+.ant-card {
+  border-radius: var(--radius-xl) !important;
+  border: 1px solid var(--border-color) !important;
+}
+
+.ant-card-head {
+  border-bottom: 1px solid var(--border-color) !important;
+  min-height: 52px !important;
+  padding: 0 var(--space-lg) !important;
+}
+
+.ant-card-head-title {
+  font-weight: var(--font-weight-bold) !important;
+  font-size: var(--font-size-md) !important;
+  color: var(--text-primary) !important;
+}
+
+.ant-card-body {
+  padding: 20px var(--space-lg) !important;
+}
+
+/* Modal overrides */
+.ant-modal-content {
+  border-radius: var(--radius-xl) !important;
+  overflow: hidden;
+}
+
+.ant-modal-header {
+  padding: 20px var(--space-lg) !important;
+  background: var(--bg-primary) !important;
+}
+
+.ant-modal-title {
+  font-weight: var(--font-weight-bold) !important;
+  font-size: var(--font-size-lg) !important;
+  color: var(--text-primary) !important;
+}
+
+.ant-modal-body {
+  padding: var(--space-lg) !important;
+}
+
+.ant-modal-footer {
+  padding: var(--space-md) var(--space-lg) !important;
+}
+
+/* Button overrides */
+.ant-btn-primary {
+  background: var(--gradient-primary) !important;
+  border: none !important;
+  border-radius: var(--radius-md) !important;
+  box-shadow: var(--shadow-primary) !important;
+  height: auto !important;
+  padding: 10px 20px !important;
+  font-weight: var(--font-weight-bold) !important;
+}
+
+.ant-btn-primary:hover {
+  background: var(--gradient-primary) !important;
+  box-shadow: var(--shadow-hover) !important;
+  transform: translateY(-1px);
+}
+
+/* Tag overrides */
+.ant-tag {
+  border-radius: var(--radius-xs) !important;
+  padding: var(--space-xs) 12px !important;
+  font-weight: var(--font-weight-medium) !important;
+}
+
+/* Select overrides */
+.ant-select-selector {
+  border-radius: var(--radius-md) !important;
+  border-color: var(--border-color) !important;
+}
+
+.ant-select:not(.ant-select-disabled):hover .ant-select-selector {
+  border-color: var(--primary-color) !important;
+}
+
+.ant-select-focused .ant-select-selector {
+  border-color: var(--primary-color) !important;
+  box-shadow: 0 0 0 3px
+    color-mix(in srgb, var(--primary-color) 10%, transparent) !important;
+}
+
+/* Input overrides */
+.ant-input {
+  border-radius: var(--radius-md) !important;
+  border-color: var(--border-color) !important;
+  padding: 10px 14px !important;
+}
+
+.ant-input:hover {
+  border-color: var(--primary-color) !important;
+}
+
+.ant-input:focus {
+  border-color: var(--primary-color) !important;
+  box-shadow: 0 0 0 3px
+    color-mix(in srgb, var(--primary-color) 10%, transparent) !important;
+}
+
+/* Progress overrides */
+.ant-progress-inner {
+  background: var(--color-gray-100) !important;
+  border-radius: var(--radius-xs) !important;
+}
+
+.ant-progress-bg {
+  border-radius: var(--radius-xs) !important;
+}

apps/web/src/config/navigation.tsx

@@ -0,0 +1,211 @@
+/**
+ * 统一导航配置
+ * Header 和 Sidebar 共用此数据源
+ */
+import React from "react";
+import {
+  DashboardOutlined,
+  VideoCameraOutlined,
+  FileOutlined,
+  AudioOutlined,
+  FileTextOutlined,
+  TrophyOutlined,
+  AppstoreOutlined,
+  HistoryOutlined,
+  ControlOutlined,
+  CrownOutlined,
+  ScanOutlined,
+  EditOutlined,
+  FolderOutlined,
+} from "@ant-design/icons";
+
+/** 导航项定义 */
+export interface NavItem {
+  key: string;
+  label: string;
+  path: string;
+  icon: React.ReactNode;
+}
+
+/** 导航分组定义 */
+export interface NavGroup {
+  title: string;
+  items: NavItem[];
+}
+
+/**
+ * 扁平导航列表（Header 使用）
+ */
+export const NAV_ITEMS: NavItem[] = [
+  {
+    key: "dashboard",
+    label: "概览",
+    path: "/app/dashboard",
+    icon: <DashboardOutlined />,
+  },
+  {
+    key: "assets",
+    label: "素材库",
+    path: "/app/assets",
+    icon: <FileOutlined />,
+  },
+  {
+    key: "titles",
+    label: "标题库",
+    path: "/app/titles",
+    icon: <FileTextOutlined />,
+  },
+  {
+    key: "voices",
+    label: "配音库",
+    path: "/app/voices",
+    icon: <AudioOutlined />,
+  },
+  {
+    key: "voice-clone",
+    label: "我的音色",
+    path: "/app/voice-clone",
+    icon: <AudioOutlined />,
+  },
+  {
+    key: "voice-materials",
+    label: "配音素材库",
+    path: "/app/voice-materials",
+    icon: <AudioOutlined />,
+  },
+  {
+    key: "templates",
+    label: "模板库",
+    path: "/app/templates",
+    icon: <AppstoreOutlined />,
+  },
+  {
+    key: "editing-planner",
+    label: "剪辑编辑器",
+    path: "/app/editing-planner",
+    icon: <EditOutlined />,
+  },
+  {
+    key: "my-templates",
+    label: "我的模板",
+    path: "/app/my-templates",
+    icon: <FolderOutlined />,
+  },
+  {
+    key: "generate",
+    label: "一键生成",
+    path: "/app/generate",
+    icon: <VideoCameraOutlined />,
+  },
+  {
+    key: "history",
+    label: "任务历史",
+    path: "/app/history",
+    icon: <HistoryOutlined />,
+  },
+  {
+    key: "products",
+    label: "成品库",
+    path: "/app/products",
+    icon: <TrophyOutlined />,
+  },
+  {
+    key: "duplication",
+    label: "查重",
+    path: "/app/duplication",
+    icon: <ScanOutlined />,
+  },
+];
+
+/**
+ * 分组导航列表（Sidebar 使用）
+ */
+export const NAV_GROUPS: NavGroup[] = [
+  {
+    title: "创作工具",
+    items: [
+      {
+        key: "dashboard",
+        label: "首页",
+        path: "/app/dashboard",
+        icon: <DashboardOutlined />,
+      },
+      {
+        key: "generate",
+        label: "一键生成",
+        path: "/app/generate",
+        icon: <VideoCameraOutlined />,
+      },
+    ],
+  },
+  {
+    title: "资源管理",
+    items: [
+      {
+        key: "assets",
+        label: "素材库",
+        path: "/app/assets",
+        icon: <FileOutlined />,
+      },
+      {
+        key: "voices",
+        label: "配音库",
+        path: "/app/voices",
+        icon: <AudioOutlined />,
+      },
+      {
+        key: "voice-clone",
+        label: "我的音色",
+        path: "/app/voice-clone",
+        icon: <AudioOutlined />,
+      },
+      {
+        key: "voice-materials",
+        label: "配音素材库",
+        path: "/app/voice-materials",
+        icon: <AudioOutlined />,
+      },
+      {
+        key: "titles",
+        label: "标题库",
+        path: "/app/titles",
+        icon: <FileTextOutlined />,
+      },
+      {
+        key: "products",
+        label: "成片库",
+        path: "/app/products",
+        icon: <TrophyOutlined />,
+      },
+      {
+        key: "templates",
+        label: "模板库",
+        path: "/app/templates",
+        icon: <AppstoreOutlined />,
+      },
+    ],
+  },
+  {
+    title: "系统",
+    items: [
+      {
+        key: "history",
+        label: "任务历史",
+        path: "/app/history",
+        icon: <HistoryOutlined />,
+      },
+      {
+        key: "admin",
+        label: "控制台",
+        path: "/app/admin",
+        icon: <ControlOutlined />,
+      },
+      {
+        key: "subscription",
+        label: "订阅管理",
+        path: "/app/subscription",
+        icon: <CrownOutlined />,
+      },
+    ],
+  },
+];

apps/web/src/pages/admin/Admin.css

@@ -75,6 +75,35 @@
   margin: 0;
 }
 
+/* V21 卡片 */
+.xx-card {
+  background: rgba(255, 255, 255, 0.94);
+  border: 1px solid rgba(226, 232, 240, 0.95);
+  border-radius: var(--radius-lg);
+  box-shadow: 0 10px 30px rgba(15, 23, 42, 0.06);
+  padding: 24px;
+  transition: all 0.3s;
+}
+
+.xx-card:hover {
+  box-shadow: 0 16px 40px rgba(15, 23, 42, 0.08);
+}
+
+.xx-card .ant-card-head {
+  border-bottom: 1px solid rgba(226, 232, 240, 0.8);
+  padding: 20px 24px;
+}
+
+.xx-card .ant-card-head-title {
+  font-weight: 800;
+  font-size: 17px;
+  color: var(--slate, #0f172a);
+}
+
+.xx-card .ant-card-body {
+  padding: 24px;
+}
+
 /* 统计卡片网格 - 4列 */
 .xx-grid-4 {
   display: grid;
@@ -273,6 +302,17 @@
   box-shadow: 0 0 0 3px rgba(79, 70, 229, 0.1) !important;
 }
 
+/* V21 Select */
+.xx-select {
+  border-radius: var(--radius-md) !important;
+}
+
+.xx-select:hover,
+.xx-select:focus {
+  border-color: var(--indigo, #4f46e5) !important;
+  box-shadow: 0 0 0 3px rgba(79, 70, 229, 0.1) !important;
+}
+
 /* V21 Tag */
 .xx-tag {
   border-radius: var(--radius-xs) !important;

apps/web/src/pages/generate/generate.css

@@ -612,6 +612,54 @@
   flex: 1;
 }
 
+/* ============================================================
+   按钮（匹配原型 .btn .ghost / .btn .primary）
+   ============================================================ */
+.xx-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  height: 42px;
+  padding: 0 20px;
+  border-radius: var(--radius-sm);
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.15s ease;
+  border: none;
+  outline: none;
+  white-space: nowrap;
+}
+
+.xx-btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.xx-btn-primary {
+  background: var(--gradient-primary);
+  color: var(--text-inverse);
+  box-shadow: 0 14px 26px rgba(79, 70, 229, 0.22);
+}
+
+.xx-btn-primary:hover:not(:disabled) {
+  transform: translateY(-2px);
+  box-shadow: 0 18px 34px rgba(79, 70, 229, 0.28);
+}
+
+.xx-btn-ghost {
+  background: var(--bg-primary);
+  border: 1px solid var(--border-color);
+  color: var(--text-secondary);
+}
+
+.xx-btn-ghost:hover:not(:disabled) {
+  border-color: var(--info-border);
+  color: var(--primary-dark);
+  background: var(--primary-soft);
+}
+
 /* ============================================================
    右侧预览区 generate-preview
    ============================================================ */

apps/web/src/router/index.tsx

@@ -170,6 +170,13 @@ export const router = createBrowserRouter([
             Component: m.default,
           })),
       },
+      {
+        path: "my-voices",
+        lazy: () =>
+          import("@/pages/my-voices/MyVoices").then((m) => ({
+            Component: m.default,
+          })),
+      },
       {
         path: "accounts",
         lazy: () =>

apps/worker/video_processing/__init__.py

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

apps/worker/video_processing/dedup.py

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

apps/worker/video_processing/editing_modes.py

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

apps/worker/video_processing/ffmpeg_utils.py

@@ -1,7 +1,8 @@
-"""FFmpeg 工具函数 — 共享原语.
+"""FFmpeg 工具函数 — 从 editing_modes.py / video_compose_service.py 提取的共享原语.
 
 提供 FFmpeg / FFprobe 调用、视频信息探测、视频标准化、xfade 转场滤镜构建
-等底层能力，供 UnifiedRenderService、VideoComposeService 等复用。
+等底层能力，供 EditingModeProcessor、VideoComposeService、UnifiedRenderService
+共同复用。
 """
 
 from __future__ import annotations
@@ -31,10 +32,6 @@ XFADE_TRANSITION_MAP: dict[str, str] = {
     "slide_left": "slideleft",
     "slideright": "slideright",
     "slide_right": "slideright",
-    "slideup": "slideup",
-    "slide_up": "slideup",
-    "slidedown": "slidedown",
-    "slide_down": "slidedown",
     "dissolve": "dissolve",
     "wipe": "wipeleft",
     "wipeleft": "wipeleft",
@@ -42,10 +39,6 @@ XFADE_TRANSITION_MAP: dict[str, str] = {
 
 DEFAULT_TRANSITION_DURATION = 0.5
 
-# FFmpeg 执行默认超时（秒），防止 FFmpeg hang 住导致 worker 永久阻塞
-# 默认 30 分钟，足够处理大部分短视频渲染；超长视频可单独传参覆盖
-DEFAULT_FFMPEG_TIMEOUT = 1800
-
 
 # ── FFmpeg 执行 ───────────────────────────────────────────────────────────────
 
@@ -54,14 +47,12 @@ def run_ffmpeg(
     command: list[str],
     *,
     capture_output: bool = True,
-    timeout: int | None = DEFAULT_FFMPEG_TIMEOUT,
 ) -> tuple[str, str]:
     """执行 FFmpeg 命令。
 
     Args:
         command: 完整的 ffmpeg 命令列表（含 "ffmpeg" 本身）
         capture_output: 是否捕获 stdout/stderr
-        timeout: 超时时间（秒），默认 1800s（30分钟）；None 表示不设超时（不推荐）
 
     Returns:
         (stdout, stderr) 元组
@@ -69,7 +60,6 @@ def run_ffmpeg(
     Raises:
         subprocess.CalledProcessError: 命令执行失败时抛出，
             异常信息包含完整 stderr 以便排查。
-        subprocess.TimeoutExpired: 超时未完成时抛出，FFmpeg 进程会被 kill。
     """
     try:
         result = subprocess.run(  # nosec B603
@@ -78,16 +68,8 @@ def run_ffmpeg(
             stdout=subprocess.PIPE if capture_output else None,
             stderr=subprocess.PIPE if capture_output else None,
             text=True,
-            timeout=timeout,
         )
         return (result.stdout or "", result.stderr or "")
-    except subprocess.TimeoutExpired as e:
-        logger.error(
-            "FFmpeg 命令超时 (%ds): command=%s",
-            timeout or -1,
-            " ".join(str(c) for c in command[:20]),
-        )
-        raise
     except subprocess.CalledProcessError as e:
         # 把完整 stderr 打到日志，方便排查 exit code 183 等问题
         stderr_text = (e.stderr or "").strip()
@@ -100,41 +82,6 @@ def run_ffmpeg(
         raise
 
 
-def probe_has_audio(local_path: str | Path) -> bool:
-    """探测文件是否包含音频流。
-
-    Args:
-        local_path: 本地文件路径
-
-    Returns:
-        True 表示有音频流（或探测失败保守返回），False 表示确认无音频流
-    """
-    try:
-        result = subprocess.run(  # nosec B603
-            [
-                FFPROBE_BIN,
-                "-v",
-                "error",
-                "-select_streams",
-                "a:0",
-                "-show_entries",
-                "stream=codec_type",
-                "-of",
-                "default=noprint_wrappers=1:nokey=1",
-                str(local_path),
-            ],
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=10,
-        )
-        return result.stdout.strip() == "audio"
-    except Exception:
-        # 探测失败保守返回 True，让 FFmpeg 自己处理（避免误删音频）
-        return True
-
-
 def probe_duration(local_path: str | Path) -> float:
     """用 ffprobe 获取视频时长（秒）。
 
@@ -163,14 +110,10 @@ def probe_duration(local_path: str | Path) -> float:
 
 
 def probe_video_info(video_path: str) -> dict[str, Any]:
-    """获取视频信息（宽、高、时长、fps、编码、像素格式）。
+    """获取视频信息（宽、高、时长、fps）。
 
     Returns:
-        {
-            "width": int, "height": int, "duration": float, "fps": float,
-            "video_codec": str, "audio_codec": str, "pix_fmt": str,
-            "has_audio": bool,
-        }
+        {"width": int, "height": int, "duration": float, "fps": float}
         失败时返回默认值。
     """
     try:
@@ -179,8 +122,10 @@ def probe_video_info(video_path: str) -> dict[str, Any]:
                 FFPROBE_BIN,
                 "-v",
                 "error",
+                "-select_streams",
+                "v:0",
                 "-show_entries",
-                "stream=width,height,r_frame_rate,duration,codec_name,codec_type,pix_fmt",
+                "stream=width,height,r_frame_rate,duration",
                 "-show_entries",
                 "format=duration",
                 "-of",
@@ -191,25 +136,19 @@ def probe_video_info(video_path: str) -> dict[str, Any]:
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
-            timeout=15,
         )
 
         import json
 
         info = json.loads(result.stdout)
-        streams = info.get("streams", [])
+        stream = info.get("streams", [{}])[0]
         fmt = info.get("format", {})
 
-        video_stream = next((s for s in streams if s.get("codec_type") == "video"), {})
-        audio_stream = next((s for s in streams if s.get("codec_type") == "audio"), {})
-
-        width = int(video_stream.get("width", DEFAULT_OUTPUT_WIDTH))
-        height = int(video_stream.get("height", DEFAULT_OUTPUT_HEIGHT))
-        video_codec = video_stream.get("codec_name", "") or ""
-        pix_fmt = video_stream.get("pix_fmt", "") or ""
+        width = int(stream.get("width", DEFAULT_OUTPUT_WIDTH))
+        height = int(stream.get("height", DEFAULT_OUTPUT_HEIGHT))
 
         # 解析帧率
-        fps_str = video_stream.get("r_frame_rate", "25/1")
+        fps_str = stream.get("r_frame_rate", "25/1")
         if "/" in fps_str:
             num, den = fps_str.split("/")
             fps = float(num) / float(den) if float(den) > 0 else DEFAULT_FPS
@@ -217,20 +156,13 @@ def probe_video_info(video_path: str) -> dict[str, Any]:
             fps = float(fps_str) if fps_str else DEFAULT_FPS
 
         # 时长
-        duration = float(fmt.get("duration", 0)) or float(video_stream.get("duration", 0))
-
-        has_audio = bool(audio_stream)
-        audio_codec = audio_stream.get("codec_name", "") or ""
+        duration = float(fmt.get("duration", 0)) or float(stream.get("duration", 0))
 
         return {
             "width": width,
             "height": height,
             "duration": duration,
             "fps": round(fps, 2),
-            "video_codec": video_codec,
-            "audio_codec": audio_codec,
-            "pix_fmt": pix_fmt,
-            "has_audio": has_audio,
         }
     except Exception as e:
         logger.warning("获取视频信息失败: %s, error: %s", video_path, e)
@@ -239,10 +171,6 @@ def probe_video_info(video_path: str) -> dict[str, Any]:
             "height": DEFAULT_OUTPUT_HEIGHT,
             "duration": 0.0,
             "fps": DEFAULT_FPS,
-            "video_codec": "",
-            "audio_codec": "",
-            "pix_fmt": "",
-            "has_audio": True,
         }
 
 

apps/worker/video_processing/oss_helpers.py

@@ -9,7 +9,6 @@ from __future__ import annotations
 import hashlib
 import logging
 import os
-import threading
 from pathlib import Path
 from typing import Optional
 from urllib.parse import urlparse
@@ -18,13 +17,6 @@ import oss2
 
 logger = logging.getLogger(__name__)
 
-# OSS 上传配置
-OSS_CONNECT_TIMEOUT = 10  # 连接超时（秒），防止 TCP 握手挂死
-OSS_UPLOAD_TOTAL_TIMEOUT = 300  # 单文件上传总超时（秒），防止网络慢时无限卡住
-OSS_MULTIPART_THRESHOLD = 100 * 1024 * 1024  # 分片上传阈值：100MB 以上走分片
-OSS_PART_SIZE = 8 * 1024 * 1024  # 分片大小：8MB
-OSS_MULTIPART_NUM_THREADS = 3  # 分片上传并发数
-
 
 # ── OSS 配置 ──────────────────────────────────────────────────────────────────
 
@@ -51,9 +43,6 @@ def oss_bucket() -> oss2.Bucket | None:
     P0-2 修复：endpoint 不带 scheme 时自动补 https:// 前缀，
     确保 sign_url 等依赖 scheme 的方法返回 HTTPS URL。
 
-    P0-staging 修复：增加 connect_timeout=10s，防止网络抖动时
-    TCP 握手阶段无限挂死，导致 worker 进程卡死。
-
     Returns:
         oss2.Bucket 实例，配置缺失时返回 None。
     """
@@ -64,12 +53,7 @@ def oss_bucket() -> oss2.Bucket | None:
     # endpoint 无 scheme 时补 https://，与 API 端 storage.py 保持一致
     if not endpoint.startswith(("http://", "https://")):
         endpoint = f"https://{endpoint}"
-    return oss2.Bucket(
-        oss2.Auth(access_key_id, access_key_secret),
-        endpoint,
-        bucket_name,
-        connect_timeout=OSS_CONNECT_TIMEOUT,
-    )
+    return oss2.Bucket(oss2.Auth(access_key_id, access_key_secret), endpoint, bucket_name)
 
 
 def normalize_storage_key(storage_key_or_url: str) -> str:
@@ -112,9 +96,6 @@ def download_asset(asset_storage_key: str, local_path: Path) -> bool:
 def upload_to_oss(local_path: Path, storage_key: str) -> str | None:
     """上传文件到 OSS，返回公开 URL。
 
-    大文件（>100MB）自动走分片上传，降低内存峰值，减少 OOM 风险。
-    上传加总超时保护（默认 300s），防止网络异常时无限挂死。
-
     Args:
         local_path: 本地文件路径
         storage_key: 目标存储键
@@ -125,71 +106,18 @@ def upload_to_oss(local_path: Path, storage_key: str) -> str | None:
     bucket = oss_bucket()
     if bucket is None:
         return None
-
-    result: dict = {"url": None, "error": None, "file_size": 0}
-    done = threading.Event()
-
-    def _do_upload():
-        try:
-            # 尝试获取文件大小，用于分片判断和日志；stat 失败时 fallback 走普通上传
-            try:
-                file_size = local_path.stat().st_size
-                result["file_size"] = file_size
-                use_multipart = file_size >= OSS_MULTIPART_THRESHOLD
-            except OSError:
-                use_multipart = False
-                file_size = 0
-
-            if use_multipart:
-                # 分片上传：降低内存峰值，每片 8MB，3 线程并发
-                logger.info(
-                    "大文件分片上传: storage_key=%s, size=%.1fMB, part_size=%dMB, threads=%d",
-                    storage_key[:80],
-                    file_size / 1024 / 1024,
-                    OSS_PART_SIZE // 1024 // 1024,
-                    OSS_MULTIPART_NUM_THREADS,
-                )
-                oss2.resumable_upload(
-                    bucket,
-                    storage_key,
-                    str(local_path),
-                    multipart_threshold=OSS_MULTIPART_THRESHOLD,
-                    part_size=OSS_PART_SIZE,
-                    num_threads=OSS_MULTIPART_NUM_THREADS,
-                )
-            else:
-                bucket.put_object_from_file(storage_key, str(local_path))
-
-            # 构造返回 URL
-            settings = oss_settings()
-            if settings:
-                _, _, endpoint, bucket_name = settings
-                endpoint_clean = endpoint.replace("https://", "").replace("http://", "")
-                result["url"] = f"https://{bucket_name}.{endpoint_clean}/{storage_key}"
-        except Exception as e:
-            result["error"] = e
-            logger.exception("上传 OSS 失败: %s", storage_key)
-        finally:
-            done.set()
-
-    upload_thread = threading.Thread(target=_do_upload, daemon=True)
-    upload_thread.start()
-    finished = done.wait(timeout=OSS_UPLOAD_TOTAL_TIMEOUT)
-
-    if not finished:
-        logger.error(
-            "OSS 上传超时（%.0fs），强制中止: storage_key=%s, size=%.1fMB",
-            OSS_UPLOAD_TOTAL_TIMEOUT,
-            storage_key[:80],
-            result["file_size"] / 1024 / 1024 if result["file_size"] else 0,
-        )
+    try:
+        bucket.put_object_from_file(storage_key, str(local_path))
+        settings = oss_settings()
+        if settings:
+            _, _, endpoint, bucket_name = settings
+            endpoint_clean = endpoint.replace("https://", "").replace("http://", "")
+            return f"https://{bucket_name}.{endpoint_clean}/{storage_key}"
         return None
-
-    if result["error"]:
+    except Exception:
+        logger.exception("上传 OSS 失败: %s", storage_key)
         return None
 
-    return result["url"]
-
 
 def get_signed_download_url(storage_key_or_url: str, expires_seconds: int = 3600) -> str | None:
     """生成预签名下载 URL（用于私有 bucket 的 URL 校验或临时下载）。

apps/worker/video_processing/render_adapter.py

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

apps/worker/video_processing/render_engine_resolver.py

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

apps/worker/video_processing/video_compose_service.py

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

apps/worker/worker_app/core/config.py

@@ -17,10 +17,6 @@ class WorkerSettings(BaseSettings):
     database_pool_recycle: int = 3600
     environment: str = "development"
     auto_create_schema: bool = False
-    redis_url: str = "redis://redis:6379/0"
-
-    # 渲染引擎选择：legacy=旧VideoComposeService，unified=新UnifiedRenderService
-    render_engine: str = "legacy"
 
     model_config = SettingsConfigDict(
         env_file=".env",

apps/worker/worker_app/tasks/compose_video.py

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

apps/worker/worker_app/tasks/edit_plan_generation.py

@@ -1,18 +1,13 @@
-"""剪辑计划渲染任务 — 支持 Feature Flag 灰度.
+"""剪辑计划渲染任务 — Phase 8 任务 2.05.
 
 Celery 任务 worker.render_edit_plan:
   1. 加载 EditPlan + EditPlanClips
-  2. 根据 Feature Flag 选择渲染引擎（legacy / unified）
-  3. 下载各片段素材 + 渲染
+  2. 下载各片段素材
+  3. 使用 UnifiedRenderService 按时间线+图层渲染
   4. 上传渲染结果到 OSS
   5. 创建 GeneratedVideo 记录 + 查重
   6. 更新 EditPlan / EditPlanClip 状态
   7. 更新 GenerationTask 进度
-
-渲染引擎灰度：
-  - 走 Feature Flag (render_engine) 控制
-  - legacy: VideoComposeService + FFmpeg filter_complex
-  - unified: UnifiedRenderService 图层架构
 """
 
 from __future__ import annotations
@@ -68,268 +63,14 @@ def _get_repos():
 # ── Celery Task ───────────────────────────────────────────────────────────────
 
 
-def _resolve_render_engine(user_id: str) -> str:
-    """根据 Feature Flag 决定使用哪个渲染引擎。
-
-    Returns:
-        "legacy" 或 "unified"
-    """
-    try:
-        from video_processing.render_engine_resolver import get_render_engine_resolver
-
-        resolver = get_render_engine_resolver()
-        return resolver.get_engine(user_id=user_id)
-    except Exception as exc:
-        logger.warning("获取渲染引擎配置失败，fallback 到 legacy: %s", exc)
-        return "legacy"
-
-
-def _mark_plan_failed(plan_repo, plan_id, gen_task_repo, generation_task_id, error_msg: str):
-    """统一的计划失败标记工具。"""
-    plan = plan_repo.get(plan_id)
-    if plan and plan.status.value == "rendering":
-        plan.mark_failed()
-        plan_repo.update(plan)
-    if generation_task_id:
-        gen_task = gen_task_repo.get(generation_task_id)
-        if gen_task and gen_task.status.value != "failed":
-            gen_task.status = "failed"
-            gen_task.error_message = error_msg
-            gen_task.completed_at = datetime.now(timezone.utc)
-            gen_task_repo.update(gen_task)
-
-
-def _finalize_render_success(
-    plan,
-    plan_repo,
-    clip_repo,
-    gen_task_repo,
-    db,
-    plan_id: str,
-    output_url: str,
-    storage_key: str,
-    duration: float,
-    file_size: int,
-    width: int,
-    height: int,
-    rendered_clip_ids: list[str],
-    failed_clip_ids: list[str],
-    generation_task_id: str,
-    output_path: Path,
-    engine: str,
-) -> dict:
-    """渲染成功后的统一收尾：查重 + 更新状态 + 返回结果。"""
-    # 创建 GeneratedVideo 记录 + 查重
-    project_id = plan.project_id or ""
-    batch_id = plan.config.get("batch_id", "")
-    mode = plan.config.get("mode", "edit_plan")
-    if generation_task_id and project_id:
-        try:
-            create_video_record_and_dedup(
-                generation_task_id=generation_task_id,
-                project_id=project_id,
-                batch_id=batch_id,
-                file_url=output_url or "",
-                file_size=file_size,
-                duration=duration,
-                video_path=str(output_path),
-                mode=mode,
-                session=db,
-                width=width,
-                height=height,
-                fps=OUTPUT_FPS,
-            )
-        except Exception as dedup_err:
-            logger.warning("查重失败（不影响渲染结果）: %s", dedup_err)
-
-    # 更新片段状态为 rendered
-    for clip_id in rendered_clip_ids:
-        clip = clip_repo.get(clip_id)
-        if clip and clip.status.value == "ready":
-            clip.mark_rendered()
-            clip_repo.update(clip)
-
-    # 更新 EditPlan 状态为 completed
-    plan.config["rendered_url"] = output_url or ""
-    plan.config["rendered_storage_key"] = storage_key
-    plan.mark_completed()
-    plan_repo.update(plan)
-
-    # 更新 GenerationTask 状态为 completed
-    if generation_task_id:
-        gen_task = gen_task_repo.get(generation_task_id)
-        if gen_task:
-            gen_task.status = "completed"
-            gen_task.progress = 100.0
-            gen_task.result_count = len(rendered_clip_ids)
-            gen_task.completed_at = datetime.now(timezone.utc)
-            gen_task_repo.update(gen_task)
-
-    logger.info(
-        "剪辑计划渲染完成: plan_id=%s engine=%s rendered=%d failed=%d duration=%.1fs",
-        plan_id,
-        engine,
-        len(rendered_clip_ids),
-        len(failed_clip_ids),
-        duration,
-    )
-
-    return {
-        "status": "completed",
-        "plan_id": plan_id,
-        "rendered_count": len(rendered_clip_ids),
-        "failed_count": len(failed_clip_ids),
-        "output_url": output_url,
-        "duration": duration,
-    }
-
-
-def _render_with_unified(
-    plan,
-    clips,
-    asset_path_map: dict[str, Path],
-    tmpdir_path: Path,
-    rendered_clip_ids: list[str],
-    plan_id: str,
-    generation_task_id: str,
-    plan_repo,
-    clip_repo,
-    gen_task_repo,
-    db,
-) -> dict:
-    """统一渲染引擎路径（UnifiedRenderService 图层架构）。"""
-    render_service = UnifiedRenderService(
-        plan=plan,
-        clips=clips,
-        asset_path_map=asset_path_map,
-        work_dir=tmpdir_path,
-        output_width=OUTPUT_WIDTH,
-        output_height=OUTPUT_HEIGHT,
-        output_fps=int(OUTPUT_FPS),
-    )
-
-    try:
-        render_result = render_service.render()
-    except Exception as render_err:
-        logger.error("渲染失败(unified): %s — %s", plan_id, render_err)
-        _mark_plan_failed(plan_repo, plan_id, gen_task_repo, generation_task_id, f"渲染失败: {render_err}")
-        return {"status": "error", "message": f"渲染失败: {render_err}"}
-
-    output_path = render_result.output_path
-
-    # 上传到 OSS
-    storage_key = f"rendered/{plan_id}/output.mp4"
-    output_url = upload_to_oss(output_path, storage_key)
-
-    failed_clip_ids: list[str] = []
-    return _finalize_render_success(
-        plan=plan,
-        plan_repo=plan_repo,
-        clip_repo=clip_repo,
-        gen_task_repo=gen_task_repo,
-        db=db,
-        plan_id=plan_id,
-        output_url=output_url or "",
-        storage_key=storage_key,
-        duration=render_result.duration,
-        file_size=render_result.file_size,
-        width=render_result.width,
-        height=render_result.height,
-        rendered_clip_ids=rendered_clip_ids,
-        failed_clip_ids=failed_clip_ids,
-        generation_task_id=generation_task_id,
-        output_path=output_path,
-        engine="unified",
-    )
-
-
-def _render_with_legacy(
-    plan,
-    clips,
-    rendered_clip_ids: list[str],
-    failed_clip_ids: list[str],
-    tmpdir_path: Path,
-    plan_id: str,
-    generation_task_id: str,
-    plan_repo,
-    clip_repo,
-    gen_task_repo,
-    db,
-) -> dict:
-    """旧引擎路径（VideoComposeService + FFmpeg filter_complex）。"""
-    import os
-    import subprocess
-
-    from apps.api.app.services.video_compose_service import VideoComposeService
-
-    compose_svc = VideoComposeService(db)
-
-    # 校验合成条件
-    validation = compose_svc.validate_compose(plan_id)
-    if not validation.valid:
-        error_msg = "; ".join(validation.errors)
-        logger.error("合成校验失败(legacy): %s — %s", plan_id, error_msg)
-        _mark_plan_failed(plan_repo, plan_id, gen_task_repo, generation_task_id, f"合成校验失败: {error_msg}")
-        return {"status": "error", "message": error_msg}
-
-    # 构建 FFmpeg 命令
-    output_dir = os.environ.get("VIDEO_OUTPUT_DIR", str(tmpdir_path))
-    output_path = Path(output_dir) / f"{plan_id}.mp4"
-    compose_cmd = compose_svc.build_compose_command(plan_id, str(output_path))
-
-    logger.info("执行 FFmpeg (legacy): plan_id=%s", plan_id)
-    try:
-        subprocess.run(
-            compose_cmd.command,
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=3600,
-        )
-    except subprocess.CalledProcessError as e:
-        error_msg = f"FFmpeg 执行失败: {e.stderr[:500]}"
-        logger.error("FFmpeg 执行失败(legacy): %s — %s", plan_id, error_msg)
-        _mark_plan_failed(plan_repo, plan_id, gen_task_repo, generation_task_id, error_msg)
-        return {"status": "error", "message": error_msg}
-
-    # 获取文件大小
-    file_size = output_path.stat().st_size if output_path.exists() else 0
-    duration = compose_cmd.estimated_duration or 0.0
-
-    # 上传到 OSS
-    storage_key = f"rendered/{plan_id}/output.mp4"
-    output_url = upload_to_oss(output_path, storage_key)
-
-    return _finalize_render_success(
-        plan=plan,
-        plan_repo=plan_repo,
-        clip_repo=clip_repo,
-        gen_task_repo=gen_task_repo,
-        db=db,
-        plan_id=plan_id,
-        output_url=output_url or "",
-        storage_key=storage_key,
-        duration=duration,
-        file_size=file_size,
-        width=OUTPUT_WIDTH,
-        height=OUTPUT_HEIGHT,
-        rendered_clip_ids=rendered_clip_ids,
-        failed_clip_ids=failed_clip_ids,
-        generation_task_id=generation_task_id,
-        output_path=output_path,
-        engine="legacy",
-    )
-
-
 @celery_app.task(name="worker.render_edit_plan", bind=True, max_retries=2)
 def render_edit_plan(self, plan_id: str) -> dict:
     """渲染剪辑计划
 
     流程：
     1. 加载 EditPlan + EditPlanClips
-    2. 根据 Feature Flag 选择渲染引擎（legacy / unified）
-    3. 下载素材 + 渲染
+    2. 下载各片段素材到临时目录，构建 asset_path_map
+    3. 使用 UnifiedRenderService 按时间线+图层渲染
     4. 上传渲染结果到 OSS
     5. 创建 GeneratedVideo 记录 + 查重
     6. 更新 EditPlan → completed, EditPlanClips → rendered
@@ -338,7 +79,6 @@ def render_edit_plan(self, plan_id: str) -> dict:
     logger.info("开始渲染剪辑计划: plan_id=%s", plan_id)
 
     generation_task_id = ""
-    engine = "legacy"
 
     for repos in _get_repos():
         plan_repo, clip_repo, gen_task_repo, db = repos
@@ -353,12 +93,7 @@ def render_edit_plan(self, plan_id: str) -> dict:
             # 获取 generation_task_id（提前读取，确保 except 块可用）
             generation_task_id = plan.config.get("generation_task_id", "")
 
-            # 2. 选择渲染引擎（Feature Flag 灰度控制）
-            user_id = plan.created_by_user_id or ""
-            engine = _resolve_render_engine(user_id)
-            logger.info("剪辑计划渲染引擎: plan_id=%s engine=%s user_id=%s", plan_id, engine, user_id)
-
-            # 3. 加载片段列表（按 order 排序）
+            # 2. 加载片段列表（按 order 排序）
             clips = clip_repo.list_by_plan(plan_id, skip=0, limit=10000)
             if not clips:
                 logger.warning("剪辑计划没有片段: %s", plan_id)
@@ -381,15 +116,6 @@ def render_edit_plan(self, plan_id: str) -> dict:
                 rendered_clip_ids: list[str] = []
                 failed_clip_ids: list[str] = []
 
-                # 预先批量查询所有素材的 storage_key（file_url）
-                from packages.adapters.sqlalchemy_impl.models import AssetModel
-
-                clip_asset_ids = [c.asset_id for c in clips if c.asset_id]
-                asset_storage_map: dict[str, str] = {}
-                if clip_asset_ids:
-                    assets = db.query(AssetModel).filter(AssetModel.id.in_(clip_asset_ids)).all()
-                    asset_storage_map = {a.id: a.file_url for a in assets if a.file_url}
-
                 for clip in clips:
                     if not clip.asset_id:
                         # 没有素材的片段跳过，标记为失败
@@ -403,22 +129,10 @@ def render_edit_plan(self, plan_id: str) -> dict:
                         rendered_clip_ids.append(clip.id)
                         continue
 
-                    storage_key = asset_storage_map.get(clip.asset_id)
-                    if not storage_key:
-                        logger.warning(
-                            "片段素材无 storage_key，跳过: clip_id=%s asset_id=%s",
-                            clip.id,
-                            clip.asset_id,
-                        )
-                        clip.mark_failed()
-                        clip_repo.update(clip)
-                        failed_clip_ids.append(clip.id)
-                        continue
-
                     # 下载素材
-                    ext = Path(storage_key).suffix or ".mp4"
+                    ext = Path(clip.asset_id).suffix or ".mp4"
                     local_path = tmpdir_path / f"clip_{clip.order:04d}{ext}"
-                    if download_asset(storage_key, local_path):
+                    if download_asset(clip.asset_id, local_path):
                         asset_path_map[clip.asset_id] = local_path
                         rendered_clip_ids.append(clip.id)
                     else:
@@ -439,38 +153,100 @@ def render_edit_plan(self, plan_id: str) -> dict:
                             gen_task_repo.update(gen_task)
                     return {"status": "error", "message": "所有片段素材下载失败"}
 
-                # 4. 根据引擎选择渲染方式
-                if engine == "unified":
-                    result = _render_with_unified(
-                        plan=plan,
-                        clips=clips,
-                        asset_path_map=asset_path_map,
-                        tmpdir_path=tmpdir_path,
-                        rendered_clip_ids=rendered_clip_ids,
-                        plan_id=plan_id,
-                        generation_task_id=generation_task_id,
-                        plan_repo=plan_repo,
-                        clip_repo=clip_repo,
-                        gen_task_repo=gen_task_repo,
-                        db=db,
-                    )
-                else:
-                    result = _render_with_legacy(
-                        plan=plan,
-                        clips=clips,
-                        rendered_clip_ids=rendered_clip_ids,
-                        failed_clip_ids=failed_clip_ids,
-                        tmpdir_path=tmpdir_path,
-                        plan_id=plan_id,
-                        generation_task_id=generation_task_id,
-                        plan_repo=plan_repo,
-                        clip_repo=clip_repo,
-                        gen_task_repo=gen_task_repo,
-                        db=db,
-                    )
+                # 4. 使用 UnifiedRenderService 渲染
+                render_service = UnifiedRenderService(
+                    plan=plan,
+                    clips=clips,
+                    asset_path_map=asset_path_map,
+                    work_dir=tmpdir_path,
+                    output_width=OUTPUT_WIDTH,
+                    output_height=OUTPUT_HEIGHT,
+                    output_fps=int(OUTPUT_FPS),
+                )
 
-                result["engine"] = engine
-                return result
+                try:
+                    render_result = render_service.render()
+                except Exception as render_err:
+                    logger.error("渲染失败: %s — %s", plan_id, render_err)
+                    plan.mark_failed()
+                    plan_repo.update(plan)
+                    if generation_task_id:
+                        gen_task = gen_task_repo.get(generation_task_id)
+                        if gen_task:
+                            gen_task.status = "failed"
+                            gen_task.error_message = f"渲染失败: {render_err}"
+                            gen_task.completed_at = datetime.now(timezone.utc)
+                            gen_task_repo.update(gen_task)
+                    return {"status": "error", "message": f"渲染失败: {render_err}"}
+
+                output_path = render_result.output_path
+
+                # 5. 上传到 OSS
+                storage_key = f"rendered/{plan_id}/output.mp4"
+                output_url = upload_to_oss(output_path, storage_key)
+
+                # 6. 创建 GeneratedVideo 记录 + 查重
+                project_id = plan.project_id or ""
+                batch_id = plan.config.get("batch_id", "")
+                mode = plan.config.get("mode", "edit_plan")
+                if generation_task_id and project_id:
+                    try:
+                        create_video_record_and_dedup(
+                            generation_task_id=generation_task_id,
+                            project_id=project_id,
+                            batch_id=batch_id,
+                            file_url=output_url or "",
+                            file_size=render_result.file_size,
+                            duration=render_result.duration,
+                            video_path=str(output_path),
+                            mode=mode,
+                            session=db,
+                            width=render_result.width,
+                            height=render_result.height,
+                            fps=OUTPUT_FPS,
+                        )
+                    except Exception as dedup_err:
+                        logger.warning("查重失败（不影响渲染结果）: %s", dedup_err)
+
+                # 7. 更新片段状态为 rendered
+                for clip_id in rendered_clip_ids:
+                    clip = clip_repo.get(clip_id)
+                    if clip and clip.status.value == "ready":
+                        clip.mark_rendered()
+                        clip_repo.update(clip)
+
+                # 8. 更新 EditPlan 状态为 completed
+                plan.config["rendered_url"] = output_url or ""
+                plan.config["rendered_storage_key"] = storage_key
+                plan.mark_completed()
+                plan_repo.update(plan)
+
+                # 9. 更新 GenerationTask 状态为 completed
+                if generation_task_id:
+                    gen_task = gen_task_repo.get(generation_task_id)
+                    if gen_task:
+                        gen_task.status = "completed"
+                        gen_task.progress = 100.0
+                        gen_task.result_count = len(rendered_clip_ids)
+                        gen_task.completed_at = datetime.now(timezone.utc)
+                        gen_task_repo.update(gen_task)
+
+                logger.info(
+                    "剪辑计划渲染完成: plan_id=%s rendered=%d failed=%d duration=%.1fs",
+                    plan_id,
+                    len(rendered_clip_ids),
+                    len(failed_clip_ids),
+                    render_result.duration,
+                )
+
+                return {
+                    "status": "completed",
+                    "plan_id": plan_id,
+                    "rendered_count": len(rendered_clip_ids),
+                    "failed_count": len(failed_clip_ids),
+                    "output_url": output_url,
+                    "duration": render_result.duration,
+                }
 
         except Exception as exc:
             logger.exception("渲染剪辑计划异常: %s", plan_id)

apps/worker/worker_app/tasks/generation.py

@@ -113,7 +113,6 @@ from video_processing.oss_helpers import (
     get_signed_download_url,
     upload_to_oss,
 )
-from video_processing.render_engine_resolver import ENGINE_LEGACY, ENGINE_UNIFIED
 from video_processing.unified_render_service import UnifiedRenderService
 
 # ── 虚拟 Plan / Clip（内存中构建，不写数据库） ────────────────────────────────
@@ -125,7 +124,6 @@ class _VirtualPlan:
 
     id: str
     name: str = ""
-    config: dict[str, Any] = field(default_factory=dict)
 
 
 @dataclass
@@ -163,15 +161,13 @@ def _build_plan_and_clips_from_task(
     """
     plan = _VirtualPlan(id=task_id, name=f"Generated-{task_id[:8]}")
 
-    # 为每个下载路径生成合成 asset_id，并预探测素材时长
+    # 为每个下载路径生成合成 asset_id
     asset_path_map: dict[str, Path] = {}
     path_to_asset_id: dict[Path, str] = {}
-    path_duration: dict[Path, float] = {}
     for i, p in enumerate(downloaded_paths):
         asset_id = f"gen_{task_id[:8]}_{i:03d}{p.suffix or '.mp4'}"
         asset_path_map[asset_id] = p
         path_to_asset_id[p] = asset_id
-        path_duration[p] = probe_duration(p)
 
     clips: list[_VirtualClip] = []
     n = len(downloaded_paths)
@@ -187,7 +183,6 @@ def _build_plan_and_clips_from_task(
                     clip_type=clip_type,
                     order=i,
                     asset_id=path_to_asset_id[p],
-                    duration=path_duration[p],
                 )
             )
     elif mode == "voice_over":
@@ -200,7 +195,6 @@ def _build_plan_and_clips_from_task(
                     clip_type="main",
                     order=i,
                     asset_id=path_to_asset_id[p],
-                    duration=path_duration[p],
                     config={"role": "b_roll"},
                 )
             )
@@ -220,7 +214,6 @@ def _build_plan_and_clips_from_task(
                     clip_type=clip_type,
                     order=i,
                     asset_id=path_to_asset_id[p],
-                    duration=path_duration[p],
                 )
             )
     else:
@@ -233,7 +226,6 @@ def _build_plan_and_clips_from_task(
                     clip_type="main",
                     order=i,
                     asset_id=path_to_asset_id[p],
-                    duration=path_duration[p],
                 )
             )
 
@@ -388,37 +380,31 @@ def _download_library_assets(
 
         session = SessionLocal()
         try:
-            # 构建查询
+            # 构建查询：根据模式选择不同的过滤条件
             query = session.query(AssetModel).filter(
                 AssetModel.status == "ready",
                 AssetModel.file_type.in_(["video", "video/mp4", "video/quicktime"]),
             )
 
-            if asset_ids:
-                # 明确指定了 asset_ids：直接按 ID 查，不预先按 library/project 过滤
-                # 避免项目级素材或跨库素材因为 library_id 不匹配而查不到
-                # 归属安全由后面的归属校验保证
-                query = query.filter(AssetModel.id.in_(asset_ids))
+            if asset_library_id:
+                # 素材库模式
+                query = query.filter(AssetModel.asset_library_id == asset_library_id)
                 logger.info(
-                    "下载指定素材: asset_ids=%d 个, asset_library_id=%s, project_id=%s",
-                    len(asset_ids),
-                    asset_library_id or "none",
-                    project_id or "none",
+                    "下载素材库视频: asset_library_id=%s asset_ids=%s",
+                    asset_library_id,
+                    asset_ids or "all",
                 )
             else:
-                # 未指定 asset_ids：按 library 或 project 下载全部 ready 视频
-                if asset_library_id:
-                    query = query.filter(AssetModel.asset_library_id == asset_library_id)
-                    logger.info(
-                        "下载素材库全部视频: asset_library_id=%s",
-                        asset_library_id,
-                    )
-                else:
-                    query = query.filter(AssetModel.project_id == project_id)
-                    logger.info(
-                        "下载项目全部视频: project_id=%s",
-                        project_id,
-                    )
+                # 项目级模式
+                query = query.filter(AssetModel.project_id == project_id)
+                logger.info(
+                    "下载项目级视频: project_id=%s asset_ids=%s",
+                    project_id,
+                    asset_ids or "all",
+                )
+
+            if asset_ids:
+                query = query.filter(AssetModel.id.in_(asset_ids))
 
             assets = query.order_by(AssetModel.created_at).all()
 
@@ -435,15 +421,13 @@ def _download_library_assets(
                 if missing_ids:
                     raise ValueError(f"素材不存在: asset_ids={sorted(missing_ids)}")
                 for asset in assets:
-                    # 校验素材库归属（只要传了 asset_library_id 就校验）
                     if asset_library_id and asset.asset_library_id != asset_library_id:
                         raise ValueError(
                             f"素材不属于指定素材库: asset_id={asset.id}, "
                             f"expected_asset_library_id={asset_library_id}, "
                             f"actual_asset_library_id={asset.asset_library_id}"
                         )
-                    # 校验项目归属（只要传了 project_id 就校验）
-                    if project_id and asset.project_id != project_id:
+                    if not asset_library_id and project_id and asset.project_id != project_id:
                         raise ValueError(
                             f"素材不属于指定项目: asset_id={asset.id}, "
                             f"expected_project_id={project_id}, "
@@ -574,148 +558,6 @@ def _validate_template_exists(template_id: str) -> None:
         session.close()
 
 
-# ── 渲染引擎选择 ─────────────────────────────────────────────────────────────
-
-
-def _resolve_render_engine(user_id: str) -> str:
-    """根据 Feature Flag 决定使用哪个渲染引擎。
-
-    Returns:
-        "legacy" 或 "unified"
-    """
-    try:
-        from video_processing.render_engine_resolver import get_render_engine_resolver
-
-        resolver = get_render_engine_resolver()
-        return resolver.get_engine(user_id=user_id)
-    except Exception as exc:
-        logger.warning("获取渲染引擎配置失败，fallback 到 unified: %s", exc)
-        return ENGINE_UNIFIED
-
-
-# ── 旧引擎渲染（FFmpeg filter_complex） ────────────────────────────────────────
-
-
-def _render_with_legacy_engine(
-    task_id: str,
-    virtual_clips: list[_VirtualClip],
-    asset_path_map: dict[str, Path],
-    work_dir: Path,
-    output_path: Path,
-) -> tuple[float, int]:
-    """旧引擎渲染路径：手动构建 FFmpeg filter_complex 命令。
-
-    说明：generate_video 任务使用虚拟 clips（无 EditPlan 数据库记录），
-    因此无法直接复用 VideoComposeService。这里手动构建等价的 filter_complex
-    命令，与旧引擎行为一致（scale → crop → setpts → trim → setpts，
-    无 fps 归一化，保持原帧率）。
-
-    支持模式：one_take / pip / voice_over / voice_pip
-    - 所有模式统一走 concat 滤镜（与旧引擎多片段逻辑一致）
-
-    Returns:
-        (duration_seconds, file_size_bytes)
-    """
-    import subprocess
-
-    main_clips = [
-        c
-        for c in virtual_clips
-        if c.clip_type in ("main", "b_roll", "background")
-        or (c.clip_type == "main" and c.config.get("role") == "b_roll")
-    ]
-    if not main_clips:
-        main_clips = virtual_clips[:1]
-
-    input_args: list[str] = []
-    video_filters: list[str] = []
-    audio_filters: list[str] = []
-
-    for i, clip in enumerate(main_clips):
-        local_path = asset_path_map.get(clip.asset_id)
-        if not local_path:
-            continue
-        input_args.extend(["-i", str(local_path)])
-
-        duration = clip.duration or 0.0
-
-        # 视频滤镜：scale → crop → setpts → trim → setpts（与旧引擎一致）
-        vf = (
-            f"[{i}:v]"
-            f"scale={OUTPUT_WIDTH}:{OUTPUT_HEIGHT}:force_original_aspect_ratio=increase,"
-            f"crop={OUTPUT_WIDTH}:{OUTPUT_HEIGHT},"
-            f"setpts=PTS-STARTPTS,"
-            f"trim=0:{duration:.3f},"
-            f"setpts=PTS-STARTPTS"
-            f"[v{i}]"
-        )
-        video_filters.append(vf)
-
-        # 音频滤镜：atrim → asetpts
-        af = f"[{i}:a]atrim=0:{duration:.3f},asetpts=PTS-STARTPTS[a{i}]"
-        audio_filters.append(af)
-
-    n = len(main_clips)
-
-    if n == 1:
-        video_label = "[v0]"
-        audio_label = "[a0]"
-    else:
-        # concat 视频
-        v_inputs = "".join(f"[v{i}]" for i in range(n))
-        video_filters.append(f"{v_inputs}concat=n={n}:v=1:a=0[outv]")
-        # concat 音频
-        a_inputs = "".join(f"[a{i}]" for i in range(n))
-        audio_filters.append(f"{a_inputs}concat=n={n}:v=0:a=1[outa]")
-        video_label = "[outv]"
-        audio_label = "[outa]"
-
-    # 组装 filter_complex
-    fc_parts = video_filters + audio_filters
-    filter_complex = ";".join(fc_parts)
-
-    command = [
-        FFMPEG_BIN,
-        "-y",
-        *input_args,
-        "-filter_complex",
-        filter_complex,
-        "-map",
-        video_label,
-        "-map",
-        audio_label,
-        "-c:v",
-        "libx264",
-        "-crf",
-        "23",
-        "-preset",
-        "medium",
-        "-c:a",
-        "aac",
-        "-b:a",
-        "192k",
-        "-movflags",
-        "+faststart",
-        str(output_path),
-    ]
-
-    logger.info("[task_id=%s] [渲染] legacy 引擎 FFmpeg 开始: clips=%d", task_id, n)
-    try:
-        run_ffmpeg(command)
-    except subprocess.CalledProcessError as e:
-        logger.error(
-            "[task_id=%s] [渲染] legacy 引擎 FFmpeg 失败: %s\nfilter_complex: %s",
-            task_id,
-            e,
-            filter_complex[:500],
-        )
-        raise
-
-    file_size = output_path.stat().st_size if output_path.exists() else 0
-    duration = probe_duration(output_path)
-    return duration, file_size
-
-
 # ── Celery Task ──────────────────────────────────────────────────────────────
 
 
@@ -873,59 +715,31 @@ def generate_video(self, task_id: str) -> dict:
                 )
                 _flush_logs(task_id, gen_task)
 
-            # 3. 根据 Feature Flag 选择渲染引擎
-            user_id = getattr(gen_task, "created_by_user_id", "") if gen_task else ""
-            engine = _resolve_render_engine(user_id) if user_id else ENGINE_UNIFIED
-            logger.info("[task_id=%s] [渲染] 引擎选择: %s (user_id=%s)", task_id, engine, user_id)
-
+            # 使用 UnifiedRenderService 渲染
+            logger.info("[task_id=%s] [渲染] FFmpeg 渲染开始", task_id)
             render_start = time.monotonic()
-            render_output_path = temp_path / f"rendered-{task_id}.mp4"
-
-            if engine == ENGINE_LEGACY:
-                # 旧引擎：filter_complex + concat（保持原帧率，无 fps 归一化）
-                render_duration, render_file_size = _render_with_legacy_engine(
-                    task_id=task_id,
-                    virtual_clips=virtual_clips,
-                    asset_path_map=asset_path_map,
-                    work_dir=temp_path,
-                    output_path=render_output_path,
-                )
-                render_elapsed = time.monotonic() - render_start
-                logger.info(
-                    "[task_id=%s] [渲染] legacy 引擎完成: 耗时=%.1fs, 时长=%.2fs",
-                    task_id,
-                    render_elapsed,
-                    render_duration,
-                )
-            else:
-                # 新引擎：UnifiedRenderService 图层架构
-                logger.info("[task_id=%s] [渲染] unified 引擎 FFmpeg 渲染开始", task_id)
-                render_service = UnifiedRenderService(
-                    plan=virtual_plan,
-                    clips=virtual_clips,
-                    asset_path_map=asset_path_map,
-                    work_dir=temp_path,
-                    output_width=OUTPUT_WIDTH,
-                    output_height=OUTPUT_HEIGHT,
-                    output_fps=int(OUTPUT_FPS),
-                )
-                render_result = render_service.render()
-                render_output_path = render_result.output_path
-                render_duration = render_result.duration
-                render_file_size = render_result.file_size
-                render_elapsed = time.monotonic() - render_start
-                logger.info(
-                    "[task_id=%s] [渲染] unified 引擎完成: 耗时=%.1fs",
-                    task_id,
-                    render_elapsed,
-                )
+            render_service = UnifiedRenderService(
+                plan=virtual_plan,
+                clips=virtual_clips,
+                asset_path_map=asset_path_map,
+                work_dir=temp_path,
+                output_width=OUTPUT_WIDTH,
+                output_height=OUTPUT_HEIGHT,
+                output_fps=int(OUTPUT_FPS),
+            )
+            render_result = render_service.render()
+            render_elapsed = time.monotonic() - render_start
+            logger.info(
+                "[task_id=%s] [渲染] FFmpeg 渲染完成: 耗时=%.1fs",
+                task_id,
+                render_elapsed,
+            )
 
             if gen_task:
                 gen_task.append_log(
                     "渲染",
-                    f"引擎={engine}, 耗时={render_elapsed:.1f}s",
+                    f"FFmpeg 渲染完成, 耗时={render_elapsed:.1f}s",
                     duration=round(render_elapsed, 2),
-                    engine=engine,
                 )
                 _flush_logs(task_id, gen_task)
 
@@ -933,14 +747,14 @@ def generate_video(self, task_id: str) -> dict:
             if audio_path:
                 final_path = temp_path / f"final-{task_id}.mp4"
                 try:
-                    _mux_audio_track(render_output_path, audio_path, final_path)
+                    _mux_audio_track(render_result.output_path, audio_path, final_path)
                     # 混音成功，使用混音后的文件
                     output_path = final_path
                 except Exception as mux_err:
                     logger.warning("[task_id=%s] [混音] 音频混合失败，使用无音频版本: %s", task_id, mux_err)
-                    output_path = render_output_path
+                    output_path = render_result.output_path
             else:
-                output_path = render_output_path
+                output_path = render_result.output_path
 
             file_size = output_path.stat().st_size
             duration = probe_duration(output_path)
@@ -964,12 +778,14 @@ def generate_video(self, task_id: str) -> dict:
             verify_url = get_signed_download_url(file_url, expires_seconds=300) or file_url
             if not _verify_url_accessible(verify_url):
                 # 预签名 URL 也访问失败时，退一步用 object_exists 确认上传成功
-                from video_processing.oss_helpers import normalize_storage_key, oss_bucket
+                from video_processing.oss_helpers import oss_bucket, normalize_storage_key
 
                 bucket = oss_bucket()
                 key = normalize_storage_key(file_url)
                 if bucket and bucket.object_exists(key):
-                    logger.info("URL 校验失败但 object_exists 确认文件存在，视为上传成功: storage_key=%s", key)
+                    logger.info(
+                        "URL 校验失败但 object_exists 确认文件存在，视为上传成功: storage_key=%s", key
+                    )
                     if gen_task:
                         gen_task.append_log("OSS上传", "URL校验降级: object_exists确认存在", level="WARN")
                 else:

apps/worker/worker_app/tasks/voice_clone.py

@@ -4,7 +4,6 @@ import logging
 
 from celery import Task
 from celery.exceptions import Retry
-from video_processing.oss_helpers import get_signed_download_url
 from worker_app.celery_app import celery_app
 from worker_app.db import SessionLocal
 
@@ -17,6 +16,7 @@ from packages.application.cosyvoice_service import (
     CosyVoiceTimeoutError,
 )
 from packages.application.voice_clone.workflow import VoiceCloneWorkflowService
+from video_processing.oss_helpers import get_signed_download_url
 
 logger = logging.getLogger(__name__)
 

packages/__init__.py

@@ -0,0 +1 @@
+"""Packages root."""

packages/adapters/__init__.py

@@ -0,0 +1 @@
+"""Adapters package for external implementations."""

packages/adapters/redis/__init__.py

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

packages/adapters/redis/feature_flag_store.py

@@ -1,259 +0,0 @@
-"""Feature Flag 存储实现。
-
-支持两种后端：
-- RedisFeatureFlagStore：生产环境使用，支持多实例共享、热更新
-- InMemoryFeatureFlagStore：测试/开发环境使用，纯内存
-
-支持的 Flag 类型：
-- 全局开关（enabled: bool）
-- 白名单（whitelist: Set[str]，如 user_id 列表）
-- 百分比切流（percentage: 0-100，基于标识符哈希取模）
-
-判定优先级：白名单 > 百分比 > 全局开关
-"""
-
-from __future__ import annotations
-
-import hashlib
-import json
-import logging
-import threading
-import time
-from abc import ABC, abstractmethod
-from dataclasses import dataclass, field
-from typing import Optional, Set
-
-logger = logging.getLogger(__name__)
-
-# Redis key 前缀
-FEATURE_FLAG_REDIS_PREFIX = "feature_flag:"
-
-
-@dataclass
-class FeatureFlagConfig:
-    """单个 Feature Flag 的配置。"""
-
-    name: str
-    enabled: bool = False
-    percentage: int = 0  # 0-100
-    whitelist: Set[str] = field(default_factory=set)
-
-    def to_dict(self) -> dict:
-        return {
-            "name": self.name,
-            "enabled": self.enabled,
-            "percentage": self.percentage,
-            "whitelist": sorted(self.whitelist),
-        }
-
-    @classmethod
-    def from_dict(cls, data: dict) -> "FeatureFlagConfig":
-        return cls(
-            name=data["name"],
-            enabled=bool(data.get("enabled", False)),
-            percentage=int(data.get("percentage", 0)),
-            whitelist=set(data.get("whitelist", [])),
-        )
-
-    def is_active(self, identifier: Optional[str] = None) -> bool:
-        """判断当前 flag 是否激活。
-
-        判定优先级：
-        1. 全局关闭 → False
-        2. 白名单匹配 → True
-        3. 百分比命中 → True
-        4. 其他 → False
-
-        Args:
-            identifier: 用于白名单匹配和百分比哈希的标识符（如 user_id）。
-                       传 None 时只看全局开关 + 百分比（百分比用随机值）。
-        """
-        if not self.enabled:
-            return False
-
-        # 白名单：精确匹配
-        if identifier and identifier in self.whitelist:
-            return True
-
-        # 百分比：0 直接 False，100 直接 True
-        if self.percentage <= 0:
-            # 没有白名单且百分比为0 → 未启用
-            return False
-        if self.percentage >= 100:
-            return True
-
-        # 基于 identifier 做哈希取模，确保同一用户始终落在同一侧
-        if identifier:
-            hash_val = int(
-                hashlib.md5(f"{self.name}:{identifier}".encode("utf-8")).hexdigest(), 16  # nosec B324
-            )  # nosec B324 - 用于哈希取模做百分比切流，非安全用途
-            return (hash_val % 100) < self.percentage
-
-        # 无 identifier 且百分比在 0-100 之间 → 按比例随机（不保证一致性）
-        import random
-
-        return random.randint(0, 99) < self.percentage
-
-
-class FeatureFlagStore(ABC):
-    """Feature Flag 存储抽象接口。"""
-
-    @abstractmethod
-    def get(self, name: str) -> FeatureFlagConfig:
-        """获取指定 flag 的配置，不存在则返回默认配置（关闭状态）。"""
-        ...
-
-    @abstractmethod
-    def set(self, config: FeatureFlagConfig) -> None:
-        """设置 flag 配置。"""
-        ...
-
-    @abstractmethod
-    def delete(self, name: str) -> bool:
-        """删除 flag，返回是否成功删除。"""
-        ...
-
-    @abstractmethod
-    def list_all(self) -> dict[str, FeatureFlagConfig]:
-        """列出所有 flag。"""
-        ...
-
-    def is_active(self, name: str, identifier: Optional[str] = None) -> bool:
-        """便捷方法：判断 flag 是否激活。"""
-        return self.get(name).is_active(identifier)
-
-
-class InMemoryFeatureFlagStore(FeatureFlagStore):
-    """内存实现，用于测试和本地开发。"""
-
-    def __init__(self) -> None:
-        self._flags: dict[str, FeatureFlagConfig] = {}
-        self._lock = threading.Lock()
-
-    def get(self, name: str) -> FeatureFlagConfig:
-        with self._lock:
-            return self._flags.get(name, FeatureFlagConfig(name=name, enabled=False))
-
-    def set(self, config: FeatureFlagConfig) -> None:
-        with self._lock:
-            self._flags[config.name] = config
-
-    def delete(self, name: str) -> bool:
-        with self._lock:
-            if name in self._flags:
-                del self._flags[name]
-                return True
-            return False
-
-    def list_all(self) -> dict[str, FeatureFlagConfig]:
-        with self._lock:
-            return dict(self._flags)
-
-
-class RedisFeatureFlagStore(FeatureFlagStore):
-    """Redis 实现，支持多实例共享配置。
-
-    每个 flag 存在一个独立的 Redis hash key 中：
-      Key: feature_flag:{name}
-      Fields: enabled, percentage, whitelist(JSON array)
-    """
-
-    def __init__(self, redis_url: str, key_prefix: str = FEATURE_FLAG_REDIS_PREFIX) -> None:
-        import redis as redis_lib
-
-        self._redis = redis_lib.from_url(redis_url, decode_responses=True)
-        self._key_prefix = key_prefix
-        # 本地缓存 + TTL，减少 Redis 调用
-        self._cache: dict[str, tuple[FeatureFlagConfig, float]] = {}
-        self._cache_ttl = 5.0  # 秒，默认5秒本地缓存
-        self._lock = threading.Lock()
-
-    def _redis_key(self, name: str) -> str:
-        return f"{self._key_prefix}{name}"
-
-    def _parse_whitelist(self, raw: Optional[str]) -> Set[str]:
-        if not raw:
-            return set()
-        try:
-            data = json.loads(raw)
-            return set(data) if isinstance(data, list) else set()
-        except (json.JSONDecodeError, TypeError):
-            return set()
-
-    def get(self, name: str) -> FeatureFlagConfig:
-        now = time.time()
-
-        # 先查本地缓存
-        with self._lock:
-            cached = self._cache.get(name)
-            if cached and now - cached[1] < self._cache_ttl:
-                return cached[0]
-
-        # 从 Redis 读取
-        try:
-            key = self._redis_key(name)
-            data = self._redis.hgetall(key)
-            if not data:
-                config = FeatureFlagConfig(name=name, enabled=False)
-            else:
-                config = FeatureFlagConfig(
-                    name=name,
-                    enabled=(data.get("enabled", "0") in ("1", "true", "True")),
-                    percentage=int(data.get("percentage", 0)),
-                    whitelist=self._parse_whitelist(data.get("whitelist")),
-                )
-
-            # 写入本地缓存
-            with self._lock:
-                self._cache[name] = (config, now)
-
-            return config
-        except Exception as exc:
-            logger.warning("Failed to get feature flag %s from Redis: %s", name, exc)
-            # Redis 不可用时返回默认值（关闭），不影响业务
-            return FeatureFlagConfig(name=name, enabled=False)
-
-    def set(self, config: FeatureFlagConfig) -> None:
-        key = self._redis_key(config.name)
-        self._redis.hset(
-            key,
-            mapping={
-                "enabled": "1" if config.enabled else "0",
-                "percentage": str(config.percentage),
-                "whitelist": json.dumps(sorted(config.whitelist), ensure_ascii=False),
-            },
-        )
-        # 失效本地缓存
-        with self._lock:
-            self._cache.pop(config.name, None)
-
-    def delete(self, name: str) -> bool:
-        key = self._redis_key(name)
-        result = self._redis.delete(key)
-        with self._lock:
-            self._cache.pop(name, None)
-        return bool(result)
-
-    def list_all(self) -> dict[str, FeatureFlagConfig]:
-        pattern = f"{self._key_prefix}*"
-        result: dict[str, FeatureFlagConfig] = {}
-        try:
-            cursor = 0
-            while True:
-                cursor, keys = self._redis.scan(cursor=cursor, match=pattern, count=100)
-                for key in keys:
-                    name = key[len(self._key_prefix) :]
-                    result[name] = self.get(name)
-                if cursor == 0:
-                    break
-        except Exception as exc:
-            logger.warning("Failed to list feature flags from Redis: %s", exc)
-        return result
-
-    def invalidate_cache(self, name: Optional[str] = None) -> None:
-        """手动失效本地缓存。"""
-        with self._lock:
-            if name:
-                self._cache.pop(name, None)
-            else:
-                self._cache.clear()

packages/adapters/sqlalchemy_impl/generation_task_repository.py

@@ -91,23 +91,6 @@ class SQLAlchemyGenerationTaskRepository:
     def count_by_user(self, user_id: str) -> int:
         return self.session.query(GenerationTaskModel).filter(GenerationTaskModel.created_by_user_id == user_id).count()
 
-    def count_pending_by_user(self, user_id: str) -> int:
-        return (
-            self.session.query(GenerationTaskModel)
-            .filter(
-                GenerationTaskModel.created_by_user_id == user_id,
-                GenerationTaskModel.status == GenerationTaskStatus.PENDING.value,
-            )
-            .count()
-        )
-
-    def count_pending_total(self) -> int:
-        return (
-            self.session.query(GenerationTaskModel)
-            .filter(GenerationTaskModel.status == GenerationTaskStatus.PENDING.value)
-            .count()
-        )
-
     def list_recent_by_user(self, user_id: str, limit: int = 5) -> list[GenerationTask]:
         models = (
             self.session.query(GenerationTaskModel)

packages/adapters/sqlalchemy_impl/models.py

@@ -1,6 +1,6 @@
 from datetime import datetime, timezone
 
-from sqlalchemy import JSON, Boolean, Column, DateTime, Float, Integer, String, Text, UniqueConstraint
+from sqlalchemy import JSON, Boolean, Column, DateTime, Float, Integer, String, Text, UniqueConstraint, create_engine
 from sqlalchemy.orm import declarative_base
 
 Base = declarative_base()

packages/application/__init__.py

@@ -27,6 +27,7 @@ from .generated_videos import (
 from .generation_tasks import (
     CreateGenerationTaskCommand,
     CreateGenerationTaskUseCase,
+    GetGenerationTaskUseCase,
 )
 from .ingest_jobs import SubmitIngestJobCommand, SubmitIngestJobUseCase
 from .jobs import (

packages/application/auth/jwt_handler.py

@@ -12,9 +12,10 @@ JWT 处理器委托层
     payload = jwt_handler.verify_access_token(token)
 """
 
+from datetime import datetime, timedelta
 from typing import Any, Dict, Optional
 
-from packages.application.auth.jwt_service import JWTConfig, JWTService
+from packages.application.auth.jwt_service import JWTConfig, JWTService, TokenType
 
 
 class JWTHandler:

packages/application/auth/jwt_service.py

@@ -208,10 +208,10 @@ def _get_jwt_service():
         kw = dict(secret_key=settings.JWT_SECRET_KEY)
         if hasattr(settings, "JWT_ALGORITHM"):
             kw["algorithm"] = settings.JWT_ALGORITHM
-        if hasattr(settings, "JWT_ACCESS_TOKEN_EXPIRE_MINUTES"):
-            kw["access_token_expire_minutes"] = settings.JWT_ACCESS_TOKEN_EXPIRE_MINUTES
-        if hasattr(settings, "JWT_REFRESH_TOKEN_EXPIRE_DAYS"):
-            kw["refresh_token_expire_days"] = settings.JWT_REFRESH_TOKEN_EXPIRE_DAYS
+        if hasattr(settings, "ACCESS_TOKEN_EXPIRE_MINUTES"):
+            kw["access_token_expire_minutes"] = settings.ACCESS_TOKEN_EXPIRE_MINUTES
+        if hasattr(settings, "REFRESH_TOKEN_EXPIRE_DAYS"):
+            kw["refresh_token_expire_days"] = settings.REFRESH_TOKEN_EXPIRE_DAYS
         _jwt_service_instance = JWTService(JWTConfig(**kw))
     return _jwt_service_instance
 

packages/application/auth/login_use_case.py

@@ -293,7 +293,7 @@ class LogoutUseCase:
         try:
             if request.logout_all_devices:
                 # 删除所有设备的 session
-                self.session_store.delete_all_user_sessions(request.user_id)
+                count = self.session_store.delete_all_user_sessions(request.user_id)
                 return True, None
             else:
                 # 删除当前 session

packages/application/auth/password_hasher.py

@@ -85,6 +85,8 @@ class PasswordHasher:
             True 如果需要重新哈希
         """
         try:
+            hashed_bytes = hashed_password.encode("utf-8")
+            current_rounds = bcrypt.getsalt(hashed_bytes)
 
             # 提取当前的 cost factor
             # bcrypt hash 格式: $2b$rounds$salt+hash

packages/application/auth/register_user_use_case.py

@@ -3,7 +3,7 @@
 """
 
 import secrets
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from typing import Optional
 from uuid import uuid4
 

packages/application/common/pagination.py

@@ -3,7 +3,7 @@
 """
 
 from math import ceil
-from typing import Generic, List, TypeVar
+from typing import Generic, List, Optional, TypeVar
 
 from pydantic import BaseModel, Field
 

packages/application/cosyvoice_service.py

@@ -70,21 +70,21 @@ class CosyVoiceService:
     - 音色克隆: POST /services/audio/tts/customization (model=voice-enrollment)
       - action=create_voice: 创建克隆音色，返回 voice_id（状态 DEPLOYING）
       - action=query_voice: 查询音色状态（DEPLOYING / OK / UNDEPLOYED）
-    - 语音合成: POST /services/audio/tts/SpeechSynthesizer (model=cosyvoice-v3-flash)
+    - 语音合成: POST /services/audio/tts/SpeechSynthesizer (model=cosyvoice-v3.5-plus)
       - 非流式: 同步返回音频 URL
 
     使用示例:
         service = CosyVoiceService(
             api_key="your-api-key",
             base_url="https://dashscope.aliyuncs.com/api/v1",
-            model="cosyvoice-v3-flash",
+            model="cosyvoice-v3.5-plus",
         )
 
         # 音色克隆
         result = service.clone_voice(audio_url="https://example.com/audio.mp3")
 
         # 语音合成
-        result = service.synthesize_speech(text="你好世界", voice_id="longxiaochun_v3")
+        result = service.synthesize_speech(text="你好世界", voice_id="longxiaochun")
     """
 
     # 音色状态轮询配置
@@ -121,49 +121,16 @@ class CosyVoiceService:
         self._api_key = api_key or settings.cosyvoice_api_key
         self._base_url = base_url or settings.cosyvoice_base_url
         self._model = model or settings.cosyvoice_model
-        self._clone_model = clone_model or getattr(settings, "cosyvoice_clone_model", "voice-enrollment")
+        self._clone_model = clone_model or getattr(
+            settings, "cosyvoice_clone_model", "voice-enrollment"
+        )
         self._audio_url_signer = audio_url_signer
 
-        # base_url 规范化：去掉末尾的路径残留（兼容旧版配置）
-        # 旧版 .env 模板中 base_url 包含 /services/aigc/text2audio 完整路径，
-        # 新版只需 /api/v1，具体路径由代码拼接。这里自动修正，避免配置滞后导致418。
-        if "/services/aigc/text2audio" in self._base_url:
-            old_url = self._base_url
-            # 截取到 /api/v1 为止
-            idx = self._base_url.find("/api/v1")
-            if idx >= 0:
-                self._base_url = self._base_url[: idx + len("/api/v1")]
-            logger.warning(
-                "[CosyVoice Config] base_url包含旧版text2audio路径，已自动修正: " "%s -> %s",
-                old_url,
-                self._base_url,
-            )
-
         self._client = http_client or httpx.Client(
             timeout=httpx.Timeout(60.0, connect=10.0),
         )
         self._owns_client = http_client is None
 
-        # 启动时打印配置（脱敏），方便排查环境变量覆盖问题
-        if self._owns_client:
-            masked_key = ""
-            if self._api_key:
-                if len(self._api_key) > 8:
-                    masked_key = f"{self._api_key[:4]}...{self._api_key[-4:]}"
-                else:
-                    masked_key = "***"
-            logger.info(
-                "[CosyVoice Config] 初始化配置: "
-                "model=%s, base_url=%s, default_voice=%s, "
-                "sample_rate=%d, format=%s, api_key=%s",
-                self._model,
-                self._base_url,
-                getattr(settings, "cosyvoice_voice", "(unset)"),
-                settings.cosyvoice_sample_rate,
-                settings.cosyvoice_format,
-                masked_key or "(empty)",
-            )
-
     def __enter__(self) -> CosyVoiceService:
         return self
 
@@ -234,7 +201,8 @@ class CosyVoiceService:
         if self._audio_url_signer:
             try:
                 signed_audio_url = self._audio_url_signer(audio_url)
-                logger.info("音频URL已预签名: original=%s signed_prefix=%s", audio_url[:80], signed_audio_url[:80])
+                logger.info("音频URL已预签名: original=%s signed_prefix=%s",
+                            audio_url[:80], signed_audio_url[:80])
             except Exception as e:
                 logger.warning("音频URL预签名失败，使用原始URL: %s", e)
 
@@ -355,7 +323,9 @@ class CosyVoiceService:
         while attempts < self.CLONE_MAX_POLL_ATTEMPTS:
             elapsed = time.time() - start_time
             if elapsed > timeout:
-                raise CosyVoiceTimeoutError(f"音色克隆任务超时（{timeout}秒）: voice_id={voice_id}")
+                raise CosyVoiceTimeoutError(
+                    f"音色克隆任务超时（{timeout}秒）: voice_id={voice_id}"
+                )
 
             result = self.query_voice_status(voice_id)
             status = result.get("status", "").upper()
@@ -363,7 +333,9 @@ class CosyVoiceService:
             if status == "OK":
                 return {"voice_id": voice_id}
             elif status == "UNDEPLOYED":
-                raise CosyVoiceError(f"音色克隆任务失败（审核未通过）: voice_id={voice_id}")
+                raise CosyVoiceError(
+                    f"音色克隆任务失败（审核未通过）: voice_id={voice_id}"
+                )
             elif status in ("DEPLOYING", "PENDING", "PROCESSING", ""):
                 # 继续轮询
                 time.sleep(self.CLONE_POLL_INTERVAL)
@@ -373,7 +345,9 @@ class CosyVoiceService:
                 time.sleep(self.CLONE_POLL_INTERVAL)
                 attempts += 1
 
-        raise CosyVoiceTimeoutError(f"音色克隆任务轮询次数超限: voice_id={voice_id}")
+        raise CosyVoiceTimeoutError(
+            f"音色克隆任务轮询次数超限: voice_id={voice_id}"
+        )
 
     def clone_voice(
         self,
@@ -488,7 +462,9 @@ class CosyVoiceService:
         request_id = response.get("request_id", "")
 
         if not audio_url:
-            raise CosyVoiceError(f"CosyVoice API 未返回 audio_url: {response}")
+            raise CosyVoiceError(
+                f"CosyVoice API 未返回 audio_url: {response}"
+            )
 
         return {
             "task_id": "",  # 同步接口无 task_id，兼容旧接口
@@ -498,7 +474,9 @@ class CosyVoiceService:
             "request_id": request_id,
         }
 
-    def poll_synthesize_task(self, task_id: str, timeout: float = 120.0) -> dict:
+    def poll_synthesize_task(
+        self, task_id: str, timeout: float = 120.0
+    ) -> dict:
         """轮询合成任务（同步接口无需轮询，保留兼容）.
 
         CosyVoice SpeechSynthesizer 非流式接口是同步的，
@@ -507,7 +485,10 @@ class CosyVoiceService:
         Raises:
             CosyVoiceError: 同步接口无需轮询
         """
-        raise CosyVoiceError("CosyVoice 非流式合成接口是同步的，无需轮询. " "请直接使用 submit_synthesize_task().")
+        raise CosyVoiceError(
+            "CosyVoice 非流式合成接口是同步的，无需轮询. "
+            "请直接使用 submit_synthesize_task()."
+        )
 
     def synthesize_speech(
         self,
@@ -608,22 +589,6 @@ class CosyVoiceService:
             "Content-Type": "application/json",
         }
 
-        # DEBUG: 打印完整请求信息，用于排查418错误
-        import json as json_lib
-
-        safe_headers = {k: v for k, v in headers.items()}
-        if "Authorization" in safe_headers:
-            token = safe_headers["Authorization"]
-            if len(token) > 20:
-                safe_headers["Authorization"] = token[:13] + "..." + token[-4:]
-        logger.info(
-            "[CosyVoice Debug] 请求详情: " "method=%s, url=%s, headers=%s, body=%s",
-            method,
-            url,
-            safe_headers,
-            json_lib.dumps(json, ensure_ascii=False) if json else "None",
-        )
-
         last_error: Optional[Exception] = None
 
         for attempt in range(self.MAX_RETRIES):
@@ -636,18 +601,13 @@ class CosyVoiceService:
                     timeout=timeout,
                 )
 
-                # DEBUG: 打印响应状态和完整响应体
-                logger.info(
-                    "[CosyVoice Debug] 响应详情: " "status=%d, body=%s",
-                    response.status_code,
-                    response.text[:2000],  # 最多2000字符，避免日志过大
-                )
-
                 # 处理响应
                 if response.status_code == 200:
                     return response.json()
                 elif response.status_code in (401, 403):
-                    raise CosyVoiceAuthError(f"CosyVoice API 认证失败: HTTP {response.status_code}")
+                    raise CosyVoiceAuthError(
+                        f"CosyVoice API 认证失败: HTTP {response.status_code}"
+                    )
                 elif response.status_code == 400:
                     # 客户端错误，不重试
                     body_text = response.text
@@ -655,12 +615,19 @@ class CosyVoiceService:
                         body = response.json()
                         code = body.get("code", "")
                         message = body.get("message", "")
-                        raise CosyVoiceError(f"CosyVoice API 参数错误: HTTP 400, " f"code={code}, message={message}")
+                        raise CosyVoiceError(
+                            f"CosyVoice API 参数错误: HTTP 400, "
+                            f"code={code}, message={message}"
+                        )
                     except ValueError:
-                        raise CosyVoiceError(f"CosyVoice API 调用失败: HTTP 400, body={body_text}")
+                        raise CosyVoiceError(
+                            f"CosyVoice API 调用失败: HTTP 400, body={body_text}"
+                        )
                 elif response.status_code >= 500:
                     # 服务端错误，可重试
-                    last_error = CosyVoiceError(f"CosyVoice API 服务端错误: HTTP {response.status_code}")
+                    last_error = CosyVoiceError(
+                        f"CosyVoice API 服务端错误: HTTP {response.status_code}"
+                    )
                     logger.warning(
                         "CosyVoice API 失败 (尝试 %d/%d): HTTP %d",
                         attempt + 1,
@@ -670,7 +637,8 @@ class CosyVoiceService:
                 else:
                     # 其他客户端错误，不重试
                     raise CosyVoiceError(
-                        f"CosyVoice API 调用失败: HTTP {response.status_code}, " f"body={response.text}"
+                        f"CosyVoice API 调用失败: HTTP {response.status_code}, "
+                        f"body={response.text}"
                     )
 
             except httpx.TimeoutException as e:

packages/application/jobs.py

@@ -7,7 +7,9 @@ from __future__ import annotations
 
 import logging
 from dataclasses import dataclass, field
+from datetime import datetime, timezone
 from typing import Any
+from uuid import uuid4
 
 from packages.domain.job import Job, JobStatus, JobType
 from packages.ports.job_repository import JobRepository

packages/application/recipe/use_cases.py

@@ -9,6 +9,7 @@ from typing import List, Optional
 from packages.adapters.sqlalchemy_impl.recipe_repository import SQLAlchemyRecipeRepository
 from packages.application.recipe.commands import (
     CreateRecipeCommand,
+    RecipeItemCommand,
     UpdateRecipeCommand,
 )
 from packages.domain.recipe import Recipe, RecipeItem

packages/application/tts_job/__init__.py

@@ -0,0 +1 @@
+"""TTS Job application layer."""

packages/application/tts_job/streaming_service.py

@@ -148,6 +148,7 @@ class TTSStreamingService:
 
         # 并发合成所有分段，按顺序流式推送
         queue: asyncio.Queue[tuple[int, Optional[bytes], Optional[str]]] = asyncio.Queue()
+        completed_count = 0
 
         async def _synthesize_one(idx: int, seg_text: str) -> None:
             """合成单个分段并放入队列。"""

packages/application/tts_job/workflow.py

@@ -24,7 +24,7 @@ from packages.application.cosyvoice_service import (
     CosyVoiceError,
     CosyVoiceService,
 )
-from packages.application.tts_job.audio_merger import AudioMerger
+from packages.application.tts_job.audio_merger import AudioMergeError, AudioMerger
 from packages.application.tts_job.text_splitter import split_text
 from packages.domain.tts_job import TTSJob, TTSJobStatus
 from packages.ports.tts_job_repository import TTSJobRepository
@@ -219,7 +219,9 @@ class TTSWorkflowService:
 
         # 新接口（同步）：没有 task_id，重新合成
         if not task_id:
-            logger.info(f"TTS 任务无 task_id，重新同步合成: job_id={job_id}")
+            logger.info(
+                f"TTS 任务无 task_id，重新同步合成: job_id={job_id}"
+            )
             return self._resynthesize_and_complete(job)
 
         # 旧接口遗留的 task_id，尝试轮询（兼容过渡）
@@ -233,7 +235,9 @@ class TTSWorkflowService:
             )
         except CosyVoiceError:
             # 旧接口轮询失败，重新同步合成
-            logger.warning(f"旧 task_id 轮询失败，重新同步合成: job_id={job_id}, task_id={task_id}")
+            logger.warning(
+                f"旧 task_id 轮询失败，重新同步合成: job_id={job_id}, task_id={task_id}"
+            )
             return self._resynthesize_and_complete(job)
 
     def process_synthesis_result(
@@ -520,7 +524,10 @@ class TTSWorkflowService:
         missing_indices = [i for i in range(segment_count) if results[i] is None]
 
         if missing_indices:
-            logger.info(f"分段任务重新合成缺失段: job_id={job.id}, " f"缺失={len(missing_indices)}/{segment_count}")
+            logger.info(
+                f"分段任务重新合成缺失段: job_id={job.id}, "
+                f"缺失={len(missing_indices)}/{segment_count}"
+            )
             # 并发重新合成缺失分段
             max_workers = min(len(missing_indices), _MAX_SEGMENT_WORKERS)
             with ThreadPoolExecutor(max_workers=max_workers) as executor:
@@ -543,8 +550,13 @@ class TTSWorkflowService:
                     try:
                         results[idx] = future.result()
                     except Exception as e:
-                        logger.error(f"分段重新合成失败: job_id={job.id}, " f"segment={idx}, error={e}")
-                        self._handle_segment_failure(job, f"分段 {idx + 1} 重新合成失败: {e}")
+                        logger.error(
+                            f"分段重新合成失败: job_id={job.id}, "
+                            f"segment={idx}, error={e}"
+                        )
+                        self._handle_segment_failure(
+                            job, f"分段 {idx + 1} 重新合成失败: {e}"
+                        )
                         return self.repository.get(job.id)
 
         # 所有分段完成，下载合并
@@ -552,7 +564,9 @@ class TTSWorkflowService:
             try:
                 merged_data, total_duration = self._download_and_merge_segments(results, job)
 
-                permanent_url, storage_key = self._upload_merged_to_oss(merged_data, job.user_id, job.id, job.format)
+                permanent_url, storage_key = self._upload_merged_to_oss(
+                    merged_data, job.user_id, job.id, job.format
+                )
 
                 job.mark_completed(
                     output_audio_url=permanent_url,
@@ -561,7 +575,10 @@ class TTSWorkflowService:
                     file_size=len(merged_data),
                 )
                 job = self.repository.update(job)
-                logger.info(f"分段合成完成（重新合成路径）: job_id={job.id}, " f"merged_size={len(merged_data)}")
+                logger.info(
+                    f"分段合成完成（重新合成路径）: job_id={job.id}, "
+                    f"merged_size={len(merged_data)}"
+                )
                 return job
 
             except Exception as e:

packages/application/voice_clone/use_cases.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import uuid
 from typing import List, Optional
 
 from packages.domain.voice_clone_profile import VoiceCloneProfile

packages/application/voice_clone/workflow.py

@@ -10,7 +10,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Optional
+from typing import Any, Optional
 
 from packages.application.cosyvoice_service import (
     CosyVoiceAuthError,
@@ -21,8 +21,9 @@ from packages.application.voice_clone.use_cases import (
     CreateVoiceCloneUseCase,
     RetryVoiceCloneUseCase,
     VoiceCloneNotFoundError,
+    VoiceCloneNotRetryableError,
 )
-from packages.domain.voice_clone_profile import VoiceCloneProfile
+from packages.domain.voice_clone_profile import VoiceCloneProfile, VoiceCloneStatus
 from packages.ports.voice_clone_profile_repository import VoiceCloneProfileRepository
 
 logger = logging.getLogger(__name__)
@@ -132,9 +133,7 @@ class VoiceCloneWorkflowService:
 
                 profile.metadata = task_metadata
                 profile = self.repository.update(profile)
-                logger.info(
-                    f"音色克隆任务已提交: profile_id={profile.id}, " f"voice_id={submit_result.get('voice_id')}"
-                )
+                logger.info(f"音色克隆任务已提交: profile_id={profile.id}, " f"voice_id={submit_result.get('voice_id')}")
 
             except (CosyVoiceError, CosyVoiceAuthError) as e:
                 # CosyVoice 提交失败，标记为 failed

packages/domain/classification.py

@@ -13,6 +13,7 @@ else:
         pass
 
 
+from typing import Any
 from uuid import uuid4
 
 

packages/domain/config_schemas.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 
 import copy
 from enum import Enum
-from typing import Optional
+from typing import List, Optional
 
 from pydantic import BaseModel, Field
 

packages/domain/entities.py

@@ -134,25 +134,6 @@ class AssetStatus(StrEnum):
     PROCESSING = "processing"
     ERROR = "error"
 
-    @classmethod
-    def _missing_(cls, value: object) -> "AssetStatus":
-        """兼容历史数据，避免枚举转换失败导致500。
-
-        - uploaded → READY（早期版本用 uploaded 表示上传完成）
-        - 其他未知值 → READY（兜底，不阻塞业务）
-        """
-        if isinstance(value, str):
-            normalized = value.strip().lower()
-            if normalized in ("uploaded", "success", "ok", "done", "complete"):
-                return cls.READY
-            if normalized in ("upload", "uploading_start", "upload_start"):
-                return cls.UPLOADING
-            if normalized in ("failed", "fail", "err"):
-                return cls.ERROR
-            if normalized in ("process", "processing", "running", "run"):
-                return cls.PROCESSING
-        return cls.READY
-
 
 class ClassificationStatus(StrEnum):
     PENDING = "pending"
@@ -160,23 +141,6 @@ class ClassificationStatus(StrEnum):
     COMPLETED = "completed"
     FAILED = "failed"
 
-    @classmethod
-    def _missing_(cls, value: object) -> "ClassificationStatus":
-        """兼容历史数据，避免枚举转换失败导致500。
-
-        - done → COMPLETED（早期版本用 done 表示完成）
-        - 其他未知值 → PENDING（兜底，不阻塞业务）
-        """
-        if isinstance(value, str):
-            normalized = value.strip().lower()
-            if normalized in ("done", "success", "finished", "complete"):
-                return cls.COMPLETED
-            if normalized in ("fail", "error", "err"):
-                return cls.FAILED
-            if normalized in ("process", "processing", "running", "run"):
-                return cls.PROCESSING
-        return cls.PENDING
-
 
 @dataclass(slots=True)
 class Asset:

packages/domain/preset_voices.py

@@ -16,7 +16,7 @@ class PresetVoice:
     """预置音色定义。
 
     Attributes:
-        voice_id: CosyVoice 模型音色名（如 longxiaochun_v3）
+        voice_id: CosyVoice 模型音色名（如 longxiaochun）
         name: 中文展示名
         description: 音色描述
         gender: 性别（male/female）
@@ -49,7 +49,7 @@ class PresetVoice:
 # 预置音色列表（阿里云 CosyVoice 真实可用音色）
 PRESET_VOICES: list[PresetVoice] = [
     PresetVoice(
-        voice_id="longxiaochun_v3",
+        voice_id="longxiaochun",
         name="龙小淳",
         description="温柔女声，适合情感类内容",
         gender="female",
@@ -57,7 +57,7 @@ PRESET_VOICES: list[PresetVoice] = [
         tags=["温柔", "女声", "情感"],
     ),
     PresetVoice(
-        voice_id="longxiaoxia_v3",
+        voice_id="longxiaoxia",
         name="龙小夏",
         description="知性女声，适合新闻播报",
         gender="female",
@@ -65,7 +65,7 @@ PRESET_VOICES: list[PresetVoice] = [
         tags=["知性", "女声", "播报"],
     ),
     PresetVoice(
-        voice_id="longxiaochen_v3",
+        voice_id="longxiaochen",
         name="龙小晨",
         description="磁性男声，适合有声书",
         gender="male",
@@ -73,7 +73,7 @@ PRESET_VOICES: list[PresetVoice] = [
         tags=["磁性", "男声", "有声书"],
     ),
     PresetVoice(
-        voice_id="longyue_v3",
+        voice_id="longyue",
         name="龙悦",
         description="甜美女声，适合广告配音",
         gender="female",
@@ -81,7 +81,7 @@ PRESET_VOICES: list[PresetVoice] = [
         tags=["甜美", "女声", "广告"],
     ),
     PresetVoice(
-        voice_id="longshu_v3",
+        voice_id="longshu",
         name="龙书",
         description="沉稳男声，适合教育讲解",
         gender="male",
@@ -89,7 +89,7 @@ PRESET_VOICES: list[PresetVoice] = [
         tags=["沉稳", "男声", "教育"],
     ),
     PresetVoice(
-        voice_id="longjing_v3",
+        voice_id="longjing",
         name="龙静",
         description="优雅女声，适合纪录片解说",
         gender="female",
@@ -97,7 +97,7 @@ PRESET_VOICES: list[PresetVoice] = [
         tags=["优雅", "女声", "纪录片"],
     ),
     PresetVoice(
-        voice_id="longbo_v3",
+        voice_id="longbo",
         name="龙博",
         description="浑厚男声，适合科技类内容",
         gender="male",
@@ -105,7 +105,7 @@ PRESET_VOICES: list[PresetVoice] = [
         tags=["浑厚", "男声", "科技"],
     ),
     PresetVoice(
-        voice_id="longtian_v3",
+        voice_id="longtian",
         name="龙甜",
         description="活泼女声，适合短视频配音",
         gender="female",

packages/infrastructure/feature_flags.py

@@ -24,7 +24,7 @@ from __future__ import annotations
 
 import logging
 from dataclasses import dataclass, field
-from typing import Dict, Optional
+from typing import Any, Dict, Optional, Set
 
 logger = logging.getLogger(__name__)
 

packages/infrastructure/module_registry.py

@@ -14,7 +14,7 @@ from __future__ import annotations
 import logging
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Callable, Dict, List, Optional, Set
 
 logger = logging.getLogger(__name__)
 

packages/ports/asset_library_repository.py

@@ -2,7 +2,7 @@
 
 from abc import ABC, abstractmethod
 
-from packages.domain import AssetLibrary
+from packages.domain import AssetLibrary, AssetLibraryKind
 
 
 class AssetLibraryRepository(ABC):

packages/ports/generation_task_repository.py

@@ -16,10 +16,6 @@ class GenerationTaskRepository(Protocol):
 
     def count_by_user(self, user_id: str) -> int: ...
 
-    def count_pending_by_user(self, user_id: str) -> int: ...
-
-    def count_pending_total(self) -> int: ...
-
     def list_recent_by_user(self, user_id: str, limit: int = 5) -> list[GenerationTask]: ...
 
     def list_by_source_edit_plan(self, plan_id: str) -> list[GenerationTask]: ...

packages/shared/config.py

@@ -32,8 +32,8 @@ class SharedSettings(BaseSettings):
     # CosyVoice (阿里云百炼语音合成)
     cosyvoice_api_key: str = ""
     cosyvoice_base_url: str = "https://dashscope.aliyuncs.com/api/v1"
-    cosyvoice_model: str = "cosyvoice-v3-flash"
-    cosyvoice_voice: str = "longxiaochun_v3"  # 默认音色（v3 系列系统音色带 _v3 后缀）
+    cosyvoice_model: str = "cosyvoice-v3.5-plus"
+    cosyvoice_voice: str = "longxiaochun"  # 默认音色
     cosyvoice_sample_rate: int = 22050
     cosyvoice_format: str = "mp3"  # 输出格式：mp3/wav/pcm
     # 音色克隆模型名（固定为 voice-enrollment）

pyproject.toml

@@ -1,70 +1,7 @@
 [tool.black]
 line-length = 120
 target-version = ["py312"]
-extend-exclude = '''
-(
-  \.git
-  | \.cache
-  | \.pytest_cache
-  | \.mypy_cache
-  | __pycache__
-  | node_modules
-  | \.venv
-  | venv
-  | build
-  | dist
-  | \.next
-  | out
-  | coverage
-)
-'''
 
 [tool.isort]
 profile = "black"
 line_length = 120
-extend_skip_glob = [
-    ".git/**",
-    ".cache/**",
-    ".pytest_cache/**",
-    ".mypy_cache/**",
-    "__pycache__/**",
-    "node_modules/**",
-    ".venv/**",
-    "venv/**",
-    "build/**",
-    "dist/**",
-    ".next/**",
-    "out/**",
-    "coverage/**",
-]
-
-[tool.coverage.run]
-source = ["apps/api/app", "packages"]
-omit = [
-    "*/migrations/*",
-    "*/tests/*",
-    "*/test_*.py",
-    "*/site-packages/*",
-]
-branch = true
-
-[tool.coverage.report]
-exclude_lines = [
-    "pragma: no cover",
-    "def __repr__",
-    "if __name__ == .__main__.:",
-    "raise NotImplementedError",
-    "pass",
-    "if TYPE_CHECKING:",
-    "class .*Protocol",
-    "@abstractmethod",
-    "raise AssertionError",
-    "raise RuntimeError",
-    "if 0:",
-    "if __debug__:",
-]
-show_missing = true
-skip_covered = false
-
-[tool.coverage.xml]
-output = "coverage.xml"

scripts/build_release_images.sh

@@ -30,8 +30,7 @@ fi
 # ---- Registry 配置 ----
 REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
 CACHE_REGISTRY="${CACHE_REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
-# 主缓存 tag：develop 分支构建时写入，所有分支读取
-CACHE_TAG_PRIMARY="${CACHE_TAG:-develop}"
+CACHE_TAG="${CACHE_TAG:-release}"
 
 API_IMAGE="xiaoxia-saas-api:$VERSION"
 WORKER_IMAGE="xiaoxia-saas-worker:$VERSION"
@@ -46,7 +45,6 @@ REGISTRY_WEB="${REGISTRY}/xiaoxia-saas-web:$VERSION"
 
 USE_CACHE=0
 USE_PUSH=0
-CACHE_WRITE=0
 
 # 检查 buildx 和 Registry 认证
 if docker buildx version >/dev/null 2>&1; then
@@ -56,10 +54,7 @@ if docker buildx version >/dev/null 2>&1; then
   docker buildx use default 2>/dev/null || true
 fi
 
-# ---- 缓存读写策略（按分支隔离）----
-# 默认只读不写，防止 feature 分支污染主缓存
-# 只有 develop/main 分支才写回缓存
-BRANCH_NAME="${GITHUB_REF_NAME:-${CI_COMMIT_BRANCH:-unknown}}"
+echo "=== Building API image ==="
 if [ "$USE_CACHE" -eq 1 ]; then
   docker buildx build \
     --build-arg APP_VERSION="$VERSION" \
@@ -73,52 +68,6 @@ else
   docker build --pull=false --build-arg APP_VERSION="$VERSION" -f infra/docker/api.Dockerfile -t "$API_IMAGE" -t "$API_LATEST" .
 fi
 
-build_with_cache() {
-  # usage: build_with_cache <image_name> <dockerfile> <extra_args...>
-  IMG_NAME="$1"
-  DOCKERFILE="$2"
-  shift 2
-  EXTRA_ARGS="$*"
-
-  CACHE_FROM="type=registry,ref=${CACHE_REGISTRY}/${IMG_NAME}-cache:${CACHE_TAG_PRIMARY},ignore-error=true"
-
-  if [ "$CACHE_WRITE" -eq 1 ]; then
-    CACHE_TO="type=registry,ref=${CACHE_REGISTRY}/${IMG_NAME}-cache:${CACHE_TAG_PRIMARY},mode=max"
-    echo "  cache: read+write from ${CACHE_REGISTRY}/${IMG_NAME}-cache:${CACHE_TAG_PRIMARY}"
-  else
-    CACHE_TO=""
-    echo "  cache: read-only from ${CACHE_REGISTRY}/${IMG_NAME}-cache:${CACHE_TAG_PRIMARY}"
-  fi
-
-  if [ "$USE_CACHE" -eq 1 ]; then
-    if [ -n "$CACHE_TO" ]; then
-      docker buildx build \
-        $EXTRA_ARGS \
-        --cache-from "$CACHE_FROM" \
-        --cache-to "$CACHE_TO" \
-        -f "$DOCKERFILE" \
-        -t "$IMG_NAME:$VERSION" \
-        --load \
-        .
-    else
-      docker buildx build \
-        $EXTRA_ARGS \
-        --cache-from "$CACHE_FROM" \
-        -f "$DOCKERFILE" \
-        -t "$IMG_NAME:$VERSION" \
-        --load \
-        .
-    fi
-  else
-    docker build --pull=false $EXTRA_ARGS -f "$DOCKERFILE" -t "$IMG_NAME:$VERSION" .
-  fi
-}
-
-echo "=== Building API image ==="
-build_with_cache "api" "infra/docker/api.Dockerfile" \
-  "--build-arg APP_VERSION=$VERSION"
-docker tag "$API_IMAGE" "$API_LATEST"
-
 echo "=== Building Worker image ==="
 if [ "$USE_CACHE" -eq 1 ]; then
   docker buildx build \
@@ -134,16 +83,9 @@ else
 fi
 
 echo "=== Building Web image (with buildx cache) ==="
-# 先构建前端产物（使用持久化 npm 缓存卷）
-NPM_CACHE_VOLUME="xiaoxia-npm-cache"
-if ! docker volume inspect "$NPM_CACHE_VOLUME" >/dev/null 2>&1; then
-  docker volume create "$NPM_CACHE_VOLUME" >/dev/null
-  echo "  Created npm cache volume: $NPM_CACHE_VOLUME"
-fi
-
+# 先构建前端产物
 docker run --rm \
   -v "$PWD:/workspace" \
-  -v "$NPM_CACHE_VOLUME:/workspace/apps/web/node_modules" \
   -w /workspace/apps/web \
   docker.m.daocloud.io/library/node:20 \
   sh -lc "npm ci && npm run build"

scripts/check_migration_safety.py

@@ -247,4 +247,3 @@ def main() -> int:
 
 if __name__ == "__main__":
     sys.exit(main())
-

scripts/ci-deploy-production.sh

@@ -1,256 +0,0 @@
-#!/bin/sh
-# ============================================================
-# Production 部署脚本 - Registry 拉取方式
-# ============================================================
-# 原始位置：原内嵌在 .gitea/workflows/ci-cd.yml 的 deploy-production Job 中
-# 以 base64 编码存储在 DEPLOY_B64 变量中，通过 SSH 管道传送到服务器执行
-#
-# 功能：
-#   1. 登录 Gitea Registry
-#   2. Pull api / worker / web 三个镜像
-#   3. 备份旧前端静态资源（兼容 CDN 缓存，防止 404）
-#   4. 检查基础设施容器（PostgreSQL / Redis）
-#   5. 执行数据库 Migration
-#   6. 停止并重新启动三个业务容器
-#   7. 健康检查等待就绪
-#   8. 清理旧镜像
-#
-# 依赖的环境变量（由 CI 通过 SSH 传入）：
-#   IMAGE_TAG       - 镜像版本标签（如 v0.1.127，对应 git tag）
-#   REGISTRY_TOKEN  - Gitea Registry 访问令牌
-# ============================================================
-
-set -eu
-
-IMAGE_TAG="${IMAGE_TAG:-}"
-REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
-REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
-REGISTRY_TOKEN="${REGISTRY_TOKEN:-}"
-
-ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-production/.env}"
-GENERATED_DIR="${GENERATED_DIR:-/var/lib/xiaoxia-saas-production/generated}"
-LEGACY_ASSETS_DIR="${LEGACY_ASSETS_DIR:-/var/lib/xiaoxia-saas-production/legacy-assets}"
-
-if [ -z "$IMAGE_TAG" ]; then
-  echo "ERROR: IMAGE_TAG is required"
-  exit 1
-fi
-
-test -f "$ENV_FILE"
-mkdir -p "$GENERATED_DIR"
-mkdir -p "$LEGACY_ASSETS_DIR"
-
-# ---- 登录 Registry ----
-if [ -n "$REGISTRY_TOKEN" ]; then
-  echo "Logging in to registry: $REGISTRY"
-  REGISTRY_HOST=$(echo "$REGISTRY" | cut -d/ -f1)
-  printf %s "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin 2>/dev/null || {
-    echo "WARN: docker login failed, will try to pull anyway"
-  }
-fi
-
-# ---- Pull 三个镜像 ----
-REGISTRY_API="${REGISTRY}/xiaoxia-saas-api:${IMAGE_TAG}"
-REGISTRY_WORKER="${REGISTRY}/xiaoxia-saas-worker:${IMAGE_TAG}"
-REGISTRY_WEB="${REGISTRY}/xiaoxia-saas-web:${IMAGE_TAG}"
-
-LOCAL_API="xiaoxia-saas-api:${IMAGE_TAG}"
-LOCAL_WORKER="xiaoxia-saas-worker:${IMAGE_TAG}"
-LOCAL_WEB="xiaoxia-saas-web:${IMAGE_TAG}"
-
-echo "Pulling API image..."
-docker pull "$REGISTRY_API"
-echo "Pulling Worker image..."
-docker pull "$REGISTRY_WORKER"
-echo "Pulling Web image..."
-docker pull "$REGISTRY_WEB"
-
-# ---- Re-tag 成本地镜像名 ----
-docker tag "$REGISTRY_API" "$LOCAL_API"
-docker tag "$REGISTRY_WORKER" "$LOCAL_WORKER"
-docker tag "$REGISTRY_WEB" "$LOCAL_WEB"
-echo "All images pulled and tagged."
-
-# ---- 备份旧前端 assets（生产环境访问量大，防止 CDN 缓存命中 404） ----
-echo "Backing up legacy assets from current web container..."
-if docker inspect xiaoxia-web-production >/dev/null 2>&1; then
-  _tmpdir="/tmp/legacy-assets-$$"
-  rm -rf "$_tmpdir"
-  mkdir -p "$_tmpdir"
-  docker cp xiaoxia-web-production:/usr/share/nginx/html/assets/. "$_tmpdir/" 2>/dev/null || true
-  # 复制到 LEGACY_ASSETS_DIR（下一次部署时作为 fallback 挂载）
-  if [ -d "$_tmpdir" ] && [ "$(ls -A "$_tmpdir" 2>/dev/null)" ]; then
-    cp -an "$_tmpdir"/. "$LEGACY_ASSETS_DIR"/ 2>/dev/null || true
-    echo "Legacy assets backed up: $(ls "$_tmpdir" | wc -l) files"
-  fi
-  rm -rf "$_tmpdir"
-else
-  echo "No existing web container, skipping legacy assets backup"
-fi
-
-# 清理超过 7 天的旧 assets 文件
-if [ -d "$LEGACY_ASSETS_DIR" ]; then
-  find "$LEGACY_ASSETS_DIR" -type f -mtime +7 -delete 2>/dev/null || true
-  echo "Legacy assets cleanup done (retain 7 days)"
-fi
-
-# ---- 检查基础设施容器状态 ----
-echo "Checking infrastructure containers..."
-for c in xiaoxia-postgres-production xiaoxia-redis-production; do
-  if ! docker inspect "$c" >/dev/null 2>&1; then
-    echo "ERROR: Required container not found: $c"
-    exit 1
-  fi
-  state=$(docker inspect -f '{{.State.Status}}' "$c")
-  if [ "$state" != "running" ]; then
-    echo "ERROR: Container not running: $c ($state)"
-    exit 1
-  fi
-done
-
-# ---- 创建生产网络 ----
-docker network create xiaoxia-net-production 2>/dev/null || true
-
-# ---- 执行数据库 Migration ----
-echo "Running database migrations..."
-docker run --rm \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-production \
-  -e APP_ENV=production \
-  "$LOCAL_API" sh -c "cd /app && alembic upgrade head"
-echo "Migrations completed."
-
-# ---- 停止旧容器 ----
-echo "Stopping old containers..."
-docker rm -f xiaoxia-api-production 2>/dev/null || true
-docker rm -f xiaoxia-worker-production 2>/dev/null || true
-docker rm -f xiaoxia-web-production 2>/dev/null || true
-
-# ---- 启动参数（日志配置统一） ----
-LOG_OPTS="--log-driver json-file --log-opt max-size=50m --log-opt max-file=3"
-
-# ---- 启动 API 容器 ----
-echo "Starting API container..."
-docker run -d \
-  --name xiaoxia-api-production \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-production \
-  -p 127.0.0.1:8001:8000 \
-  -e APP_ENV=production \
-  -e APP_VERSION="$IMAGE_TAG" \
-  -e GENERATED_FILES_DIR=/app/generated \
-  -e GENERATED_FILES_URL_PREFIX=/generated-files \
-  -e PUBLIC_API_BASE_URL=https://api.xiaoxiajianji.com \
-  -v "$GENERATED_DIR:/app/generated" \
-  --restart unless-stopped \
-  --cpus 2 \
-  --memory 2g \
-  --health-cmd "python3 -c \"import urllib.request; urllib.request.urlopen('http://localhost:8000/health', timeout=5)\"" \
-  --health-interval 30s \
-  --health-timeout 10s \
-  --health-retries 3 \
-  --health-start-period 40s \
-  $LOG_OPTS \
-  "$LOCAL_API"
-
-# ---- 启动 Worker 容器 ----
-echo "Starting Worker container..."
-docker run -d \
-  --name xiaoxia-worker-production \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-production \
-  -e APP_ENV=production \
-  -e APP_VERSION="$IMAGE_TAG" \
-  -e WORKER_CONCURRENCY=1 \
-  -e WORKER_MAX_TASKS_PER_CHILD=100 \
-  -e GENERATED_FILES_DIR=/app/generated \
-  -e GENERATED_FILES_URL_PREFIX=/generated-files \
-  -e PUBLIC_API_BASE_URL=https://api.xiaoxiajianji.com \
-  -v "$GENERATED_DIR:/app/generated" \
-  --restart unless-stopped \
-  --cpus 2 \
-  --memory 2g \
-  --health-cmd "sh -c \"grep -q celery /proc/1/cmdline || exit 1\"" \
-  --health-interval 30s \
-  --health-timeout 10s \
-  --health-retries 3 \
-  --health-start-period 30s \
-  $LOG_OPTS \
-  "$LOCAL_WORKER"
-
-# ---- 启动 Web 容器 ----
-# Legacy assets 挂载到 /usr/share/nginx/html/assets-legacy/assets/
-# nginx 配置中 assets location 有 fallback 规则
-LEGACY_VOLUME=""
-if [ -d "$LEGACY_ASSETS_DIR" ] && [ "$(ls -A "$LEGACY_ASSETS_DIR" 2>/dev/null)" ]; then
-  LEGACY_VOLUME="-v ${LEGACY_ASSETS_DIR}:/usr/share/nginx/html/assets-legacy/assets:ro"
-  echo "Web container: legacy assets mounted (fallback)"
-else
-  echo "Web container: no legacy assets to mount"
-fi
-
-echo "Starting Web container..."
-docker run -d \
-  --name xiaoxia-web-production \
-  --network xiaoxia-net-production \
-  -p 127.0.0.1:3002:80 \
-  --restart unless-stopped \
-  --cpus 0.5 \
-  --memory 512m \
-  $LEGACY_VOLUME \
-  --health-cmd "wget --spider -q http://127.0.0.1:80" \
-  --health-interval 30s \
-  --health-timeout 5s \
-  --health-retries 3 \
-  $LOG_OPTS \
-  "$LOCAL_WEB"
-
-# ---- 等待 API 就绪 ----
-echo "Waiting for API to become healthy..."
-i=0
-while [ "$i" -lt 40 ]; do
-  if curl -sf --max-time 5 http://127.0.0.1:8001/health >/dev/null 2>&1; then
-    echo "API is healthy!"
-    break
-  fi
-  i=$((i + 1))
-  echo "  Waiting... ($i/40)"
-  sleep 3
-done
-
-if [ "$i" -ge 40 ]; then
-  echo "ERROR: API did not become healthy within 120s"
-  docker logs --tail 50 xiaoxia-api-production
-  exit 1
-fi
-
-# ---- 等待 Web 就绪 ----
-echo "Waiting for Web to become healthy..."
-i=0
-while [ "$i" -lt 15 ]; do
-  if curl -sf --max-time 5 http://127.0.0.1:3002/ >/dev/null 2>&1; then
-    echo "Web is healthy!"
-    break
-  fi
-  i=$((i + 1))
-  echo "  Waiting... ($i/15)"
-  sleep 2
-done
-
-if [ "$i" -ge 15 ]; then
-  echo "ERROR: Web did not become healthy within 30s"
-  docker logs --tail 30 xiaoxia-web-production
-  exit 1
-fi
-
-# ---- 清理旧镜像 ----
-echo "Cleaning up old images..."
-docker image prune -af --filter "until=168h" 2>/dev/null || true
-docker builder prune -af --filter "until=168h" 2>/dev/null || true
-
-echo ""
-echo "=== Production deployment complete ==="
-echo "API:      http://127.0.0.1:8001"
-echo "Web:      http://127.0.0.1:3002"
-echo "Version:  $IMAGE_TAG"
-docker ps --format "table {{.Names}}\t{{.Status}}\t{{.Image}}" | grep production

scripts/ci-deploy-staging.sh

@@ -1,219 +0,0 @@
-#!/bin/sh
-# ============================================================
-# Staging 部署脚本 - Registry 拉取方式（替代 Watchtower）
-# ============================================================
-# 说明：原 Staging 使用 Watchtower 轮询 :staging 标签自动更新
-# 本脚本替代 Watchtower，由 CI 主动触发部署，优势：
-#   - 部署时机精确可控，无需固定 sleep 等待
-#   - 部署完成立即健康检查，失败可快速回滚
-#   - 部署日志完整记录在 CI 中
-#
-# 功能：
-#   1. 登录 Gitea Registry
-#   2. Pull api / worker / web 三个镜像（用 commit SHA 作为 tag）
-#   3. 执行数据库 Migration
-#   4. 停止并重新启动三个业务容器
-#   5. 健康检查等待就绪
-#
-# 依赖的环境变量（由 CI 通过 SSH 传入）：
-#   IMAGE_TAG       - 镜像标签（一般为 commit SHA）
-#   REGISTRY_TOKEN  - Gitea Registry 访问令牌
-# ============================================================
-
-set -eu
-
-IMAGE_TAG="${IMAGE_TAG:-}"
-REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
-REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
-REGISTRY_TOKEN="${REGISTRY_TOKEN:-}"
-
-ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-staging/.env}"
-GENERATED_DIR="${GENERATED_DIR:-/var/lib/xiaoxia-saas-staging/generated}"
-
-if [ -z "$IMAGE_TAG" ]; then
-  echo "ERROR: IMAGE_TAG is required"
-  exit 1
-fi
-
-test -f "$ENV_FILE"
-mkdir -p "$GENERATED_DIR"
-
-# ---- 登录 Registry ----
-if [ -n "$REGISTRY_TOKEN" ]; then
-  echo "Logging in to registry: $REGISTRY"
-  REGISTRY_HOST=$(echo "$REGISTRY" | cut -d/ -f1)
-  printf %s "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin 2>/dev/null || {
-    echo "WARN: docker login failed, will try to pull anyway"
-  }
-fi
-
-# ---- Pull 三个镜像 ----
-REGISTRY_API="${REGISTRY}/xiaoxia-saas-api:${IMAGE_TAG}"
-REGISTRY_WORKER="${REGISTRY}/xiaoxia-saas-worker:${IMAGE_TAG}"
-REGISTRY_WEB="${REGISTRY}/xiaoxia-saas-web:${IMAGE_TAG}"
-
-LOCAL_API="xiaoxia-saas-api:staging-${IMAGE_TAG}"
-LOCAL_WORKER="xiaoxia-saas-worker:staging-${IMAGE_TAG}"
-LOCAL_WEB="xiaoxia-saas-web:staging-${IMAGE_TAG}"
-
-echo "Pulling API image..."
-docker pull "$REGISTRY_API"
-echo "Pulling Worker image..."
-docker pull "$REGISTRY_WORKER"
-echo "Pulling Web image..."
-docker pull "$REGISTRY_WEB"
-
-# ---- Re-tag 成本地镜像名 ----
-docker tag "$REGISTRY_API" "$LOCAL_API"
-docker tag "$REGISTRY_WORKER" "$LOCAL_WORKER"
-docker tag "$REGISTRY_WEB" "$LOCAL_WEB"
-echo "All images pulled and tagged."
-
-# ---- 检查基础设施容器 ----
-echo "Checking infrastructure containers..."
-for c in xiaoxia-postgres-staging xiaoxia-redis-staging; do
-  if ! docker inspect "$c" >/dev/null 2>&1; then
-    echo "ERROR: Required container not found: $c"
-    exit 1
-  fi
-  state=$(docker inspect -f '{{.State.Status}}' "$c")
-  if [ "$state" != "running" ]; then
-    echo "ERROR: Container not running: $c ($state)"
-    exit 1
-  fi
-done
-
-# ---- 创建 Staging 网络 ----
-docker network create xiaoxia-net-staging 2>/dev/null || true
-
-# ---- 执行数据库 Migration ----
-echo "Running database migrations..."
-docker run --rm \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-staging \
-  -e APP_ENV=staging \
-  "$LOCAL_API" sh -c "cd /app && alembic upgrade head"
-echo "Migrations completed."
-
-# ---- 停止旧容器 ----
-echo "Stopping old containers..."
-docker rm -f xiaoxia-api-staging 2>/dev/null || true
-docker rm -f xiaoxia-worker-staging 2>/dev/null || true
-docker rm -f xiaoxia-web-staging 2>/dev/null || true
-
-# ---- 启动参数（日志配置统一） ----
-LOG_OPTS="--log-driver json-file --log-opt max-size=50m --log-opt max-file=3"
-
-# ---- 启动 API 容器 ----
-echo "Starting API container..."
-docker run -d \
-  --name xiaoxia-api-staging \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-staging \
-  -p 127.0.0.1:8000:8000 \
-  -e APP_ENV=staging \
-  -e APP_VERSION="$IMAGE_TAG" \
-  -e GENERATED_FILES_DIR=/app/generated \
-  -e GENERATED_FILES_URL_PREFIX=/generated-files \
-  -e PUBLIC_API_BASE_URL=https://staging-api.xiaoxiajianji.com \
-  -v "$GENERATED_DIR:/app/generated" \
-  --restart unless-stopped \
-  --cpus 1 \
-  --memory 1g \
-  --health-cmd "python3 -c \"import urllib.request; urllib.request.urlopen('http://localhost:8000/health', timeout=5)\"" \
-  --health-interval 30s \
-  --health-timeout 10s \
-  --health-retries 3 \
-  --health-start-period 30s \
-  $LOG_OPTS \
-  "$LOCAL_API"
-
-# ---- 启动 Worker 容器 ----
-echo "Starting Worker container..."
-docker run -d \
-  --name xiaoxia-worker-staging \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-staging \
-  -e APP_ENV=staging \
-  -e APP_VERSION="$IMAGE_TAG" \
-  -e WORKER_CONCURRENCY=1 \
-  -e WORKER_MAX_TASKS_PER_CHILD=100 \
-  -e GENERATED_FILES_DIR=/app/generated \
-  -e GENERATED_FILES_URL_PREFIX=/generated-files \
-  -e PUBLIC_API_BASE_URL=https://staging-api.xiaoxiajianji.com \
-  -v "$GENERATED_DIR:/app/generated" \
-  --restart unless-stopped \
-  --cpus 1 \
-  --memory 1g \
-  --health-cmd "sh -c \"grep -q celery /proc/1/cmdline || exit 1\"" \
-  --health-interval 30s \
-  --health-timeout 10s \
-  --health-retries 3 \
-  --health-start-period 30s \
-  $LOG_OPTS \
-  "$LOCAL_WORKER"
-
-# ---- 启动 Web 容器 ----
-echo "Starting Web container..."
-docker run -d \
-  --name xiaoxia-web-staging \
-  --network xiaoxia-net-staging \
-  -p 127.0.0.1:3001:80 \
-  --restart unless-stopped \
-  --cpus 0.5 \
-  --memory 256m \
-  --health-cmd "wget --spider -q http://127.0.0.1:80" \
-  --health-interval 30s \
-  --health-timeout 5s \
-  --health-retries 3 \
-  $LOG_OPTS \
-  "$LOCAL_WEB"
-
-# ---- 等待 API 就绪 ----
-echo "Waiting for API to become healthy..."
-i=0
-while [ "$i" -lt 30 ]; do
-  if curl -sf --max-time 5 http://127.0.0.1:8000/health >/dev/null 2>&1; then
-    echo "API is healthy!"
-    break
-  fi
-  i=$((i + 1))
-  echo "  Waiting... ($i/30)"
-  sleep 2
-done
-
-if [ "$i" -ge 30 ]; then
-  echo "ERROR: API did not become healthy within 60s"
-  docker logs --tail 50 xiaoxia-api-staging
-  exit 1
-fi
-
-# ---- 等待 Web 就绪 ----
-echo "Waiting for Web to become healthy..."
-i=0
-while [ "$i" -lt 15 ]; do
-  if curl -sf --max-time 5 http://127.0.0.1:3001/ >/dev/null 2>&1; then
-    echo "Web is healthy!"
-    break
-  fi
-  i=$((i + 1))
-  echo "  Waiting... ($i/15)"
-  sleep 2
-done
-
-if [ "$i" -ge 15 ]; then
-  echo "ERROR: Web did not become healthy within 30s"
-  docker logs --tail 30 xiaoxia-web-staging
-  exit 1
-fi
-
-# ---- 清理旧镜像 ----
-echo "Cleaning up old images..."
-docker image prune -af --filter "until=72h" 2>/dev/null || true
-
-echo ""
-echo "=== Staging deployment complete ==="
-echo "API:      http://127.0.0.1:8000"
-echo "Web:      http://127.0.0.1:3001"
-echo "Version:  $IMAGE_TAG"
-docker ps --format "table {{.Names}}\t{{.Status}}\t{{.Image}}" | grep staging

scripts/ci_coverage_summary.py

@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-"""解析 coverage.xml 并输出覆盖率汇总。"""
-
-import os
-import sys
-import xml.etree.ElementTree as ET
-
-THRESHOLD = int(os.environ.get("COVERAGE_THRESHOLD", 65))  # 行覆盖率门槛，百分比，可通过环境变量覆盖
-
-
-def main() -> int:
-    try:
-        tree = ET.parse("coverage.xml")
-    except FileNotFoundError:
-        print("coverage.xml 不存在，跳过汇总")
-        return 0
-
-    root = tree.getroot()
-    line_rate = float(root.get("line-rate", 0)) * 100
-    branch_rate = float(root.get("branch-rate", 0)) * 100
-    lines_covered = int(root.get("lines-covered", 0))
-    lines_valid = int(root.get("lines-valid", 0))
-
-    print(f"行覆盖率: {line_rate:.2f}% ({lines_covered}/{lines_valid})")
-    print(f"分支覆盖率: {branch_rate:.2f}%")
-    print(f"门槛: {THRESHOLD}%")
-    status = "PASS ✅" if line_rate >= THRESHOLD else "FAIL ❌"
-    print(f"状态: {status}")
-
-    return 0 if line_rate >= THRESHOLD else 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())

scripts/ci_notify_failure.py

@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-"""发送 CI 失败通知到飞书/项目群 webhook。"""
-
-import json
-import os
-import sys
-import urllib.request
-
-
-def main() -> int:
-    webhook = os.environ.get("CI_NOTIFY_WEBHOOK", "")
-    if not webhook:
-        print("未配置 CI_NOTIFY_WEBHOOK，跳过通知")
-        print("如需启用，请在仓库 Settings -> Secrets and variables -> Actions 中添加 CI_NOTIFY_WEBHOOK")
-        return 0
-
-    failed_job = os.environ.get("FAILED_JOB", "Unknown Job")
-    branch = os.environ.get("GITHUB_REF_NAME", "unknown")
-    commit = os.environ.get("GITHUB_SHA", "unknown")[:8]
-    actor = os.environ.get("GITHUB_ACTOR", "unknown")
-    run_id = os.environ.get("GITHUB_RUN_ID", "unknown")
-    repo = os.environ.get("GITHUB_REPOSITORY", "unknown")
-    run_url = f"https://git.xiaoxiajianji.com/{repo}/actions/runs/{run_id}"
-
-    payload = {
-        "msg_type": "interactive",
-        "card": {
-            "header": {
-                "title": {
-                    "tag": "plain_text",
-                    "content": "❌ CI 构建失败",
-                },
-                "status": "red",
-            },
-            "elements": [
-                {
-                    "tag": "div",
-                    "text": {
-                        "tag": "lark_md",
-                        "content": (
-                            f"**任务**: {failed_job}\n"
-                            f"**分支**: {branch}\n"
-                            f"**提交**: {commit}\n"
-                            f"**提交者**: {actor}\n"
-                            f"**Run ID**: {run_id}"
-                        ),
-                    },
-                },
-                {
-                    "tag": "action",
-                    "actions": [
-                        {
-                            "tag": "button",
-                            "text": {"tag": "plain_text", "content": "查看失败日志"},
-                            "url": run_url,
-                            "type": "danger",
-                        }
-                    ],
-                },
-            ],
-        },
-    }
-
-    data = json.dumps(payload).encode("utf-8")
-    req = urllib.request.Request(
-        webhook,
-        data=data,
-        headers={"Content-Type": "application/json"},
-        method="POST",
-    )
-    try:
-        with urllib.request.urlopen(req, timeout=10) as resp:
-            resp.read()
-        print("通知已发送")
-    except Exception as e:
-        print(f"通知发送失败: {e}", file=sys.stderr)
-        return 1
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())