fix(edit-flow): 批量生成时 plan.config 只回写一次，避免 generation_task_id 被循环覆盖

PR #1464 AI Review 发现的阻塞问题：count > 1 批量生成时，循环内
对同一 source_edit_plan_id 多次调用 _writeback_edit_plan_config，
每次都会覆盖 config.generation_task_id，最终只保留最后一个 task id。

修复：仅在首个成功任务（len(created_tasks)==1）时回写。

apps/api/app/api/routes/generation_cover.py

@@ -63,15 +63,7 @@ class GenerateCoverResponse(BaseModel):
 # ── Route ────────────────────────────────────────────────────────────────
 
 
-def _persist_cover_frame(
-    frame_url: str,
-    plan_id: str,
-    title_text: str = "",
-    *,
-    title_color: str = "#ffffff",
-    title_position: str = "bottom",
-    title_font_size: int | None = None,
-) -> str:
+def _persist_cover_frame(frame_url: str, plan_id: str, title_text: str = "") -> str:
     """下载 MediaKit 返回的临时帧图，可选叠加标题后转存到 OSS covers/ 路径。
 
     Args:
@@ -79,9 +71,6 @@ def _persist_cover_frame(
         plan_id: 剪辑计划 ID（生成 OSS key）
         title_text: 非空时用 Pillow 在帧上叠加标题（用于 E2 从源素材抽帧，
             因为源素材本身没有烧录标题）
-        title_color: 标题字体颜色（#RRGGBB）
-        title_position: 标题位置 top/center/bottom
-        title_font_size: 标题字号，None 时自动计算
     """
     import tempfile
     import uuid
@@ -105,13 +94,7 @@ def _persist_cover_frame(
             try:
                 from packages.shared.title_overlay import apply_title_to_image
 
-                applied = apply_title_to_image(
-                    tmp_path,
-                    title_text,
-                    color=title_color,
-                    position=title_position,
-                    font_size=title_font_size,
-                )
+                applied = apply_title_to_image(tmp_path, title_text)
                 if applied:
                     logger.info("[封面生成] E2 帧图已叠加标题: plan_id=%s", plan_id)
             except Exception:
@@ -435,15 +418,11 @@ def generate_cover(
             asset_repo = SQLAlchemyAssetRepository(db)
             storage_svc = get_shared_storage_service()
             mk_client = get_mediakit_client()
-            # 从 plan.config 读取完整标题样式，E2 从源素材抽帧时叠加（源素材本身无标题）
+            # 从 plan.config 读取标题，E2 从源素材抽帧时叠加（源素材本身无标题）
             _e2_title_cfg = (plan.config or {}).get("title", {}) or {}
             if not isinstance(_e2_title_cfg, dict):
                 _e2_title_cfg = {}
             _e2_title_text = (_e2_title_cfg.get("text", "") or "").strip() if _e2_title_cfg.get("enabled", True) else ""
-            # 读取标题样式：前端可能传 color 或 font_color，都兼容
-            _e2_title_color = _e2_title_cfg.get("color") or _e2_title_cfg.get("font_color") or "#ffffff"
-            _e2_title_position = _e2_title_cfg.get("position", "bottom") or "bottom"
-            _e2_title_font_size = _e2_title_cfg.get("font_size") or _e2_title_cfg.get("size")
             if mk_client.is_available:
                 for aid in body.asset_ids:
                     try:
@@ -473,14 +452,7 @@ def generate_cover(
                         if snapshots:
                             raw = snapshots[0].get("image_url") or snapshots[0].get("url") or ""
                             if raw:
-                                cover_url_from_task = _persist_cover_frame(
-                                    raw,
-                                    plan_id,
-                                    title_text=_e2_title_text,
-                                    title_color=_e2_title_color,
-                                    title_position=_e2_title_position,
-                                    title_font_size=_e2_title_font_size,
-                                )
+                                cover_url_from_task = _persist_cover_frame(raw, plan_id, title_text=_e2_title_text)
                                 logger.info(
                                     "[封面生成] 统一管道封面(步骤E-source-asset): plan_id=%s url=%s",
                                     plan_id,

apps/api/app/api/routes/generation_preview.py

@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 
+import json
 import logging
 
 from app.auth import AuthenticatedUser, get_current_user
@@ -267,7 +268,19 @@ def create_preview_generation_task(
     # 从模板读取 editing_mode / mode 作为 strategy_id（渲染 pipeline 的 mode 参数）
     strategy_id = _resolve_strategy_id_from_template(request.template_id, db, user_id)
 
+    # 处理标题配置：如果有标题文本，序列化到 custom_title 字段传递给 worker
     title_config = request.title_config or {}
+    title_text = (title_config.get("text") or "").strip()
+    custom_title_value = ""
+    if title_text:
+        # 将标题文本和样式配置序列化为 JSON 存入 custom_title
+        # Worker 端会解析 JSON 获取完整标题配置
+        custom_title_value = json.dumps(title_config, ensure_ascii=False)
+        logger.info(
+            "[预览生成] 标题配置: text=%s, config_keys=%s",
+            title_text[:30],
+            list(title_config.keys()),
+        )
 
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
 
@@ -292,7 +305,7 @@ def create_preview_generation_task(
                 auto_retry_enabled=False,
                 auto_retry_max=0,
                 is_preview=True,
-                title_config=title_config,
+                custom_title=custom_title_value,
             )
         )
     except ValueError as e:

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

@@ -70,6 +70,7 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
         output_width=getattr(task, "output_width", 1280),
         output_height=getattr(task, "output_height", 720),
         cover_url=getattr(task, "cover_url", ""),
+        custom_title=getattr(task, "custom_title", ""),
         title_config=getattr(task, "title_config", {}) or {},
         logs=getattr(task, "logs", "[]"),
         status=task.status,
@@ -293,89 +294,6 @@ def create_generation_task(
                     detail="当前项目没有符合条件的视频素材，请先上传并等待导入完成后再生成。",
                 )
 
-    # ── 兜底复用预览产物 ──
-    # 前端刷新后 previewTaskId 丢失，降级调 create 接口时，
-    # 如果同一 edit_plan 有已完成的预览任务，直接复用（秒出）。
-    if request.source_edit_plan_id and not request.is_preview:
-        try:
-            from packages.adapters.sqlalchemy_impl.models import (
-                GenerationTaskModel,
-            )
-
-            _preview_model = (
-                db.query(GenerationTaskModel)
-                .filter(
-                    GenerationTaskModel.source_edit_plan_id == request.source_edit_plan_id,
-                    GenerationTaskModel.is_preview.is_(True),
-                    GenerationTaskModel.status == "completed",
-                    GenerationTaskModel.created_by_user_id == authenticated_user.user.id,
-                )
-                .order_by(GenerationTaskModel.created_at.desc())
-                .first()
-            )
-            if _preview_model is not None:
-                # 校验分辨率一致性（与 confirm 端点逻辑相同）
-                req_w = request.output_width or 0
-                req_h = request.output_height or 0
-                src_w = getattr(_preview_model, "output_width", 0) or 0
-                src_h = getattr(_preview_model, "output_height", 0) or 0
-                resolution_match = (req_w == 0 or req_w == src_w) and (req_h == 0 or req_h == src_h)
-
-                if resolution_match:
-                    from packages.adapters.sqlalchemy_impl.generation_task_repository import (
-                        _to_domain,
-                    )
-
-                    preview_task = _to_domain(_preview_model)
-
-                    # 如果传了标题，更新 title_config
-                    fallback_title_config = None
-                    if request.title_config and request.title_config.get("text", "").strip():
-                        fallback_title_config = dict(preview_task.title_config or {})
-                        fallback_title_config.update(request.title_config)
-
-                    preview_task.mark_confirmed(
-                        cover_url=request.cover_url or preview_task.cover_url,
-                        output_width=request.output_width or preview_task.output_width,
-                        output_height=request.output_height or preview_task.output_height,
-                        title_config=fallback_title_config,
-                    )
-                    generation_task_repository.update(preview_task)
-
-                    # 同步标题到 EditPlan.config
-                    if fallback_title_config:
-                        _writeback_edit_plan_config(
-                            plan_id=request.source_edit_plan_id,
-                            task_id=preview_task.id,
-                            title_config=fallback_title_config,
-                            db=db,
-                        )
-
-                    logger.info(
-                        "[生成任务] 兜底复用预览产物: preview_task_id=%s, plan_id=%s",
-                        preview_task.id,
-                        request.source_edit_plan_id,
-                    )
-                    return BatchGenerationTaskResponse(
-                        items=[_to_generation_task_response(preview_task)],
-                        total=1,
-                    )
-                else:
-                    logger.info(
-                        "[生成任务] 兜底复用跳过（分辨率不一致）: plan_id=%s, src=%sx%s, req=%sx%s",
-                        request.source_edit_plan_id,
-                        src_w,
-                        src_h,
-                        req_w,
-                        req_h,
-                    )
-        except Exception:
-            logger.warning(
-                "[生成任务] 兜底复用预览产物异常（不影响主流程）: plan_id=%s",
-                request.source_edit_plan_id,
-                exc_info=True,
-            )
-
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
     count = request.count
     created_tasks = []
@@ -437,53 +355,11 @@ def create_generation_task(
                     output_width=request.output_width,
                     output_height=request.output_height,
                     cover_url=request.cover_url,
+                    custom_title=request.custom_title,
                     title_config=request.title_config or {},
                 )
             )
             try:
-                # 兜底关联编辑计划：前端未传 source_edit_plan_id 时，
-                # 通过 template_id + user_id 在 DB 层直接查找最新的 plan。
-                # 必须在 enqueue 之前执行，避免 worker 读取时 source_edit_plan_id 为空（竞态条件）
-                if not task.source_edit_plan_id and request.template_id:
-                    try:
-                        from packages.adapters.sqlalchemy_impl.models import EditPlanModel
-
-                        _plan_model = (
-                            db.query(EditPlanModel)
-                            .filter(
-                                EditPlanModel.template_id == request.template_id,
-                                EditPlanModel.created_by_user_id == user_id,
-                            )
-                            .order_by(EditPlanModel.created_at.desc())
-                            .first()
-                        )
-                        if _plan_model:
-                            task.source_edit_plan_id = _plan_model.id
-                            generation_task_repository.update(task)
-                            logger.info(
-                                "[生成任务] 自动关联编辑计划: task_id=%s plan_id=%s",
-                                task.id,
-                                _plan_model.id,
-                            )
-                    except Exception:
-                        logger.warning(
-                            "[生成任务] 查找关联编辑计划失败（不影响主流程）: task_id=%s",
-                            task.id,
-                            exc_info=True,
-                        )
-
-                # 回写 plan.config：必须在 enqueue 之前执行，
-                # 确保 worker 读取 plan 时 config 中已包含 generation_task_id。
-                # 只在首个任务时回写一次，避免批量生成时循环覆盖。
-                _effective_plan_id = task.source_edit_plan_id
-                if _effective_plan_id and len(created_tasks) == 0:
-                    _writeback_edit_plan_config(
-                        plan_id=_effective_plan_id,
-                        task_id=task.id,
-                        title_config=request.title_config,
-                        db=db,
-                    )
-
                 if safe_enqueue_generation_task(
                     task,
                     generation_task_repository,
@@ -492,6 +368,15 @@ def create_generation_task(
                     log_task_status=True,
                 ):
                     created_tasks.append(task)
+                    # 只在首个成功任务时回写一次 plan.config，
+                    # 避免批量生成时循环覆盖 generation_task_id
+                    if request.source_edit_plan_id and len(created_tasks) == 1:
+                        _writeback_edit_plan_config(
+                            plan_id=request.source_edit_plan_id,
+                            task_id=task.id,
+                            title_config=request.title_config,
+                            db=db,
+                        )
                 else:
                     failed_tasks.append(task)
             except UserPendingLimitExceeded as _e:
@@ -528,7 +413,6 @@ def confirm_generation(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     generation_task_repository: Any = Depends(get_generation_task_repository),
     project_repository: Any = Depends(get_project_repository),
-    db: Session = Depends(get_db_session),
 ) -> BatchGenerationTaskResponse:
     """确认生成 -- 复用预览渲染产物（预览与正式品质一致）。
 
@@ -557,29 +441,13 @@ def confirm_generation(
         resolution_match = (req_w == 0 or req_w == src_w) and (req_h == 0 or req_h == src_h)
 
         if resolution_match:
-            # 如果用户传了 custom_title，同步更新 title_config
-            confirmed_title_config = None
-            if request.custom_title and request.custom_title.strip():
-                confirmed_title_config = dict(getattr(source_task, "title_config", {}) or {})
-                confirmed_title_config["text"] = request.custom_title.strip()
-
             source_task.mark_confirmed(
                 cover_url=request.cover_url,
+                custom_title=request.custom_title,
                 output_width=request.output_width,
                 output_height=request.output_height,
-                title_config=confirmed_title_config,
             )
             generation_task_repository.update(source_task)
-
-            # 同步标题到 EditPlan.config
-            if confirmed_title_config and source_task.source_edit_plan_id:
-                _writeback_edit_plan_config(
-                    plan_id=source_task.source_edit_plan_id,
-                    task_id=source_task.id,
-                    title_config=confirmed_title_config,
-                    db=db,
-                )
-
             logger.info(
                 "[确认生成] 复用预览产物: task_id=%s, user_id=%s",
                 task_id,
@@ -621,6 +489,7 @@ def confirm_generation(
             output_width=request.output_width,
             output_height=request.output_height,
             cover_url=request.cover_url,
+            custom_title=request.custom_title,
         )
     )
 
@@ -753,6 +622,7 @@ def retry_generation_task(
             output_width=getattr(task, "output_width", 1280),
             output_height=getattr(task, "output_height", 720),
             cover_url=getattr(task, "cover_url", ""),
+            custom_title=getattr(task, "custom_title", ""),
         )
     )
     try:

apps/api/app/api/routes/templates_editor/__init__.py

@@ -1,9 +1,10 @@
 """模板编辑器 API 路由包.
 
-模块拆分：
+将原来 2560 行的 templates_editor.py 巨无霸拆分为 12 个模块：
 - schemas.py:        所有 Pydantic model
 - dependencies.py:   依赖注入
 - _utils.py:         工具函数
+- _fallback.py:      自动兜底逻辑
 - draft.py:          草稿管理（详情/更新/发布/版本/回滚）
 - clips.py:          片段管理（CRUD/分割/合并/重排/批量删除/从素材创建）
 - adjustments.py:    片段调整（速度/音量/裁剪/批量调速）
@@ -12,6 +13,7 @@
 - export.py:         导出配置
 - subtitles.py:      字幕管理
 - ai_features.py:    AI 推荐
+- generation.py:     生成（触发/进度/记录）
 - timeline.py:       时间线
 
 挂载路径: /api/v1/templates/{template_id}/editor/
@@ -32,6 +34,7 @@ from .dependencies import get_draft_plan_id, get_editor_services  # noqa: F401
 from .draft import router as draft_router
 from .effects import router as effects_router
 from .export import router as export_router
+from .generation import router as generation_router
 from .subtitles import router as subtitles_router
 from .timeline import router as timeline_router
 
@@ -48,6 +51,7 @@ _sub_routers = [
     export_router,
     subtitles_router,
     ai_features_router,
+    generation_router,
     timeline_router,
 ]
 

apps/api/app/api/routes/templates_editor/_fallback.py

@@ -0,0 +1,227 @@
+"""模板编辑器自动兜底逻辑.
+
+generate_editor_draft 触发生成前的自动修复流程：
+1. draft → editing 状态迁移
+2. 无片段时从模板复制片段配置
+3. 为无素材片段分配指定素材
+4. 项目有素材库时自动选素材
+"""
+
+from __future__ import annotations
+
+import logging
+import random
+from typing import Any
+
+from app.services.edit_plan_service import EditPlanService
+from sqlalchemy.orm import Session
+
+from packages.adapters.sqlalchemy_impl.template_clip_config_repository import (
+    SQLAlchemyTemplateClipConfigRepository,
+)
+from packages.adapters.sqlalchemy_impl.template_repository import (
+    SQLAlchemyTemplateRepository,
+)
+from packages.domain.edit_plan import EditPlanStatus
+
+logger = logging.getLogger(__name__)
+
+
+def _auto_fallback_draft_to_editing(svc: EditPlanService, plan_id: str, plan_check) -> None:
+    """自动兜底 1: draft → editing"""
+    if plan_check.status == EditPlanStatus.DRAFT:
+        logger.info("模板编辑器自动兜底: plan=%s draft→editing", plan_id)
+        svc.transition_status(plan_id, EditPlanStatus.EDITING)
+
+
+def _auto_fallback_copy_template_clips(svc: EditPlanService, plan_id: str, plan_check, db: Session) -> None:
+    """自动兜底 2: 无片段 + 有 template_id → 从模板复制片段配置"""
+    existing_clips = svc.count_clips(plan_id)
+    if existing_clips == 0 and plan_check.template_id:
+        logger.info(
+            "模板编辑器自动兜底: plan=%s 无片段，从模板 %s 复制片段配置",
+            plan_id,
+            plan_check.template_id,
+        )
+        clip_config_repo = SQLAlchemyTemplateClipConfigRepository(db)
+        configs = clip_config_repo.list_by_template(plan_check.template_id)
+        if configs:
+            for cfg in configs:
+                svc.create_clip(
+                    plan_id=plan_id,
+                    clip_type=cfg.clip_type.value if hasattr(cfg.clip_type, "value") else cfg.clip_type,
+                    order=cfg.order,
+                    template_clip_config_id=cfg.id,
+                    duration=cfg.default_duration,
+                    transition_effect=(
+                        cfg.transition_effect.value
+                        if hasattr(cfg.transition_effect, "value")
+                        else cfg.transition_effect
+                    ),
+                )
+            logger.info(
+                "模板编辑器自动兜底: plan=%s 从 template_clip_configs 复制了 %d 个片段",
+                plan_id,
+                len(configs),
+            )
+        else:
+            tpl_repo = SQLAlchemyTemplateRepository(db)
+            segments = tpl_repo.list_segments(plan_check.template_id)
+            for seg in segments:
+                avg_duration = (seg.duration_min + seg.duration_max) / 2
+                svc.create_clip(
+                    plan_id=plan_id,
+                    clip_type="main",
+                    order=seg.segment_order,
+                    duration=avg_duration,
+                    config={
+                        "material_type": seg.material_type or "",
+                        "template_segment_id": seg.id,
+                    },
+                )
+            logger.info(
+                "模板编辑器自动兜底: plan=%s 从旧模板 segments 复制了 %d 个片段",
+                plan_id,
+                len(segments),
+            )
+
+
+def _auto_fallback_assign_assets(svc: EditPlanService, plan_id: str, plan_check) -> list:
+    """自动兜底 3: 为没有素材的片段分配素材。返回剩余无素材片段列表。"""
+    all_clips = svc.list_clips(plan_id)
+    clips_without_asset = [c for c in all_clips if not c.asset_id]
+    config_asset_ids = (plan_check.config or {}).get("asset_ids", [])
+
+    logger.info(
+        "模板编辑器自动兜底3 诊断: plan=%s total_clips=%d " "clips_without_asset=%d config_asset_ids=%r",
+        plan_id,
+        len(all_clips),
+        len(clips_without_asset),
+        config_asset_ids[:5] if config_asset_ids else [],
+    )
+
+    if clips_without_asset and config_asset_ids:
+        logger.info(
+            "模板编辑器自动兜底3: plan=%s 为 %d 个无素材片段分配 %d 个指定素材",
+            plan_id,
+            len(clips_without_asset),
+            len(config_asset_ids),
+        )
+        assigned = 0
+        for i, clip in enumerate(clips_without_asset):
+            asset_idx = i % len(config_asset_ids)
+            try:
+                svc.assign_asset(clip.id, config_asset_ids[asset_idx])
+                assigned += 1
+            except Exception as exc:
+                logger.error(
+                    "模板编辑器自动兜底3: plan=%s clip=%s 分配素材 %s 失败: %s",
+                    plan_id,
+                    clip.id,
+                    config_asset_ids[asset_idx],
+                    exc,
+                )
+        logger.info(
+            "模板编辑器自动兜底3: plan=%s 素材分配完成 assigned=%d/%d",
+            plan_id,
+            assigned,
+            len(clips_without_asset),
+        )
+        # 重新检查剩余无素材片段
+        all_clips_after = svc.list_clips(plan_id)
+        clips_without_asset = [c for c in all_clips_after if not c.asset_id]
+        if clips_without_asset:
+            logger.warning(
+                "模板编辑器自动兜底3: plan=%s 仍有 %d 个片段无素材",
+                plan_id,
+                len(clips_without_asset),
+            )
+    elif not clips_without_asset:
+        logger.info("模板编辑器自动兜底3: plan=%s 所有片段已有素材，跳过", plan_id)
+    elif not config_asset_ids:
+        logger.info(
+            "模板编辑器自动兜底3: plan=%s config.asset_ids 为空，跳过分配",
+            plan_id,
+        )
+
+    return clips_without_asset
+
+
+def _auto_fallback_auto_material_mode(
+    svc: EditPlanService,
+    plan_id: str,
+    plan_check,
+    clips_without_asset: list,
+    asset_library_repo: Any,
+    asset_repo: Any,
+    user_id: str = "",
+) -> None:
+    """自动兜底 4: 自动选素材分配给无素材片段
+
+    查找策略（按优先级）：
+    1. plan 有 project_id → 从项目素材库查找
+    2. plan 无 project_id 但有 user_id → 从用户上传的素材中查找
+    """
+    if not clips_without_asset:
+        return
+
+    ready_videos: list = []
+    source_desc = ""
+
+    # 策略 1: 通过 project_id 查找项目素材库
+    if plan_check.project_id:
+        libs = asset_library_repo.find_by_project(plan_check.project_id)
+        video_lib = None
+        for lib in libs:
+            lib_kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
+            if lib_kind == "video":
+                video_lib = lib
+                break
+        if video_lib:
+            assets = asset_repo.find_by_library(video_lib.id)
+            ready_videos = [
+                a
+                for a in assets
+                if (a.status.value if hasattr(a.status, "value") else a.status) == "ready"
+                and a.mime_type
+                and a.mime_type.startswith("video")
+            ]
+            source_desc = f"素材库 {video_lib.name}"
+
+    # 策略 2: 通过 user_id 查找用户上传的素材
+    if not ready_videos and user_id and hasattr(asset_repo, "find_ready_videos_by_user"):
+        logger.info(
+            "模板编辑器自动兜底4: plan=%s project_id 为空，尝试通过 user_id=%s 查找素材",
+            plan_id,
+            user_id,
+        )
+        ready_videos = asset_repo.find_ready_videos_by_user(user_id)
+        source_desc = f"用户上传 (user_id={user_id[:8]}...)"
+
+    if not ready_videos:
+        logger.warning(
+            "模板编辑器自动兜底4: plan=%s 未找到可用素材 (project_id=%s, user_id=%s)",
+            plan_id,
+            plan_check.project_id or "(empty)",
+            user_id[:8] + "..." if user_id else "(empty)",
+        )
+        return
+
+    logger.info(
+        "模板编辑器自动兜底4: plan=%s 自动选素材分配给 %d 个无素材片段 (来源: %s, 共 %d 个)",
+        plan_id,
+        len(clips_without_asset),
+        source_desc,
+        len(ready_videos),
+    )
+    random.shuffle(ready_videos)
+    for i, clip in enumerate(clips_without_asset):
+        asset = ready_videos[i % len(ready_videos)]
+        svc.assign_asset(clip.id, asset.id)
+    logger.info(
+        "模板编辑器自动兜底4: plan=%s 从 %s 分配了 %d 个素材给 %d 个片段",
+        plan_id,
+        source_desc,
+        len(ready_videos),
+        len(clips_without_asset),
+    )

apps/api/app/api/routes/templates_editor/dependencies.py

@@ -3,6 +3,7 @@
 核心依赖：
 - get_editor_services: 获取模板+计划服务
 - get_draft_plan_id: 根据 template_id 获取或创建草稿，返回 plan_id
+- _check_queue_limits: 生成队列限流检查
 """
 
 from __future__ import annotations
@@ -10,6 +11,7 @@ from __future__ import annotations
 import logging
 
 from app.auth import AuthenticatedUser, get_current_user
+from app.core.task_enqueue import GLOBAL_PENDING_LIMIT, USER_PENDING_LIMIT
 from app.dependencies import get_db_session
 from app.services.edit_plan_service import EditPlanService
 from app.services.edit_template_service import EditTemplateService
@@ -111,3 +113,29 @@ def get_draft_plan_id(
         user_id,
     )
     return plan.id
+
+
+def _check_queue_limits(gen_task_repo, user_id: str) -> None:
+    """队列限流预检查"""
+    try:
+        has_count = (
+            hasattr(gen_task_repo, "count_pending_by_user")
+            and hasattr(gen_task_repo, "count_pending_total")
+        )
+        if has_count:
+            user_pending = gen_task_repo.count_pending_by_user(user_id)
+            global_pending = gen_task_repo.count_pending_total()
+            if user_pending >= USER_PENDING_LIMIT:
+                raise HTTPException(
+                    status_code=429,
+                    detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
+                )
+            if global_pending >= GLOBAL_PENDING_LIMIT:
+                raise HTTPException(
+                    status_code=503,
+                    detail="系统繁忙，请稍后再试",
+                )
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.warning("[模板编辑器队列限流] 检查失败，跳过: %s", e)

apps/api/app/api/routes/templates_editor/draft.py

@@ -17,8 +17,6 @@ from fastapi import APIRouter, Depends, HTTPException, Query, status
 
 from .dependencies import get_draft_plan_id, get_editor_services
 from .schemas import (
-    EditorClipBatchUpdateRequest,
-    EditorClipBatchUpdateResponse,
     EditorDraftResponse,
     EditorPublishResponse,
     EditorRollbackRequest,
@@ -128,7 +126,11 @@ def list_template_versions(
             clip_count=len(v.clip_configs),
             change_note=v.change_note,
             published_by=v.published_by,
-            created_at=(v.created_at.isoformat() if hasattr(v.created_at, "isoformat") else str(v.created_at)),
+            created_at=(
+                v.created_at.isoformat()
+                if hasattr(v.created_at, "isoformat")
+                else str(v.created_at)
+            ),
         )
         for v in versions
     ]
@@ -160,35 +162,3 @@ def rollback_template(
         new_version=tpl.version,
         clip_count=len(clip_configs),
     )
-
-
-@router.put("/clips", response_model=EditorClipBatchUpdateResponse)
-def batch_update_clips(
-    template_id: str,
-    req: EditorClipBatchUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """批量替换草稿clips（全量覆盖，用于前端选择素材后同步片段）
-
-    事务保证：清空→创建→标记ready 在同一数据库事务内完成，
-    任何步骤失败时自动回滚，避免数据不一致。
-    """
-    _, plan_svc = services
-    plan_svc.get_plan_or_raise(plan_id)
-
-    clips_data = []
-    for clip_item in req.clips:
-        item = {
-            "asset_id": clip_item.asset_id,
-            "start_time": clip_item.start_time,
-            "duration": clip_item.duration,
-        }
-        if clip_item.order is not None:
-            item["order"] = clip_item.order
-        clips_data.append(item)
-
-    plan_svc.replace_all_clips_transactional(plan_id, clips_data)
-
-    return EditorClipBatchUpdateResponse(plan_id=plan_id, clip_count=len(req.clips))

apps/api/app/api/routes/templates_editor/generation.py

@@ -0,0 +1,385 @@
+"""草稿生成路由.
+
+端点：
+- POST /generate              触发生成
+- GET  /generation-status     生成进度
+- GET  /generations           生成记录列表
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+from typing import Any, Optional
+
+from app.auth import AuthenticatedUser, get_current_user
+from app.core.celery_app import celery_app
+from app.core.storage import OSSStorageService, get_storage_service
+from app.dependencies import (
+    get_asset_library_repository,
+    get_asset_repository,
+    get_db_session,
+    get_generated_video_repository,
+)
+from app.schemas.generation_task import GenerationTaskResponse
+from app.services.edit_plan_service import EditPlanService
+from app.services.edit_template_service import EditTemplateService
+from fastapi import APIRouter, Depends, HTTPException, status
+from sqlalchemy.orm import Session
+
+from packages.adapters.sqlalchemy_impl.generation_task_repository import (
+    SQLAlchemyGenerationTaskRepository,
+)
+from packages.application.generated_videos import ListGeneratedVideosByTaskUseCase
+from packages.application.generation_tasks import (
+    CreateGenerationTaskCommand,
+    CreateGenerationTaskUseCase,
+)
+from packages.domain.edit_plan import EditPlanStatus
+
+from ._fallback import (
+    _auto_fallback_assign_assets,
+    _auto_fallback_auto_material_mode,
+    _auto_fallback_copy_template_clips,
+    _auto_fallback_draft_to_editing,
+)
+from .dependencies import _check_queue_limits, get_draft_plan_id, get_editor_services
+from .schemas import (
+    ClipStatusItem,
+    EditPlanGenerateRequest,
+    EditPlanGenerateResponse,
+    EditPlanGenerationsResponse,
+    EditPlanGenerationStatusResponse,
+)
+
+logger = logging.getLogger(__name__)
+router = APIRouter(tags=["Template Editor"])
+
+
+# DEPRECATED: 前端已改用 /generation/tasks 体系，此路由保留仅供旧版兼容，计划下线
+@router.post("/generate", response_model=EditPlanGenerateResponse)
+def generate_editor_draft(
+    template_id: str,
+    request: Optional[EditPlanGenerateRequest] = None,
+    plan_id: str = Depends(get_draft_plan_id),
+    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
+    db: Session = Depends(get_db_session),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+    asset_library_repo: Any = Depends(get_asset_library_repository),
+    asset_repo: Any = Depends(get_asset_repository),
+) -> EditPlanGenerateResponse:
+    """触发模板草稿渲染生成"""
+    req = request or EditPlanGenerateRequest()
+    _, plan_svc = services
+    plan_check = plan_svc.get_plan_or_raise(plan_id)
+
+    # 自动兜底流程
+    _auto_fallback_draft_to_editing(plan_svc, plan_id, plan_check)
+    _auto_fallback_copy_template_clips(plan_svc, plan_id, plan_check, db)
+    clips_without_asset = _auto_fallback_assign_assets(plan_svc, plan_id, plan_check)
+    _auto_fallback_auto_material_mode(
+        plan_svc,
+        plan_id,
+        plan_check,
+        clips_without_asset,
+        asset_library_repo,
+        asset_repo,
+        user_id=str(current_user.user.id),
+    )
+
+    # 检查是否可复用已完成的预览产物（预览品质已与正式一致）
+    gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
+    reusable_task = _find_reusable_preview_task(gen_task_repo, plan_id, plan_check)
+    if reusable_task:
+        # 复用预览产物：标记为正式产出，跳过渲染
+        # 如果前端传了 title_config，需要创建新任务（因为预览任务的 custom_title 可能不同）
+        title_config_reuse = req.title_config or {}
+        title_text_reuse = (title_config_reuse.get("text") or "").strip()
+        existing_custom_title = getattr(reusable_task, "custom_title", "") or ""
+        if title_text_reuse and existing_custom_title:
+            # 如果新标题和已有标题不同，不能复用，走新建任务流程
+            new_title_json = json.dumps(title_config_reuse, ensure_ascii=False)
+            if new_title_json != existing_custom_title:
+                logger.info(
+                    "[模板生成] 标题已变更，跳过复用: task_id=%s",
+                    reusable_task.id,
+                )
+                reusable_task = None
+        elif title_text_reuse and not existing_custom_title:
+            # 原来没标题，现在有标题，不能复用
+            logger.info(
+                "[模板生成] 新增标题，跳过复用: task_id=%s",
+                reusable_task.id,
+            )
+            reusable_task = None
+        elif not title_text_reuse and existing_custom_title:
+            # 原来有标题，现在移除了，不能复用
+            logger.info(
+                "[模板生成] 移除标题，跳过复用: task_id=%s",
+                reusable_task.id,
+            )
+            reusable_task = None
+
+    if reusable_task:
+        # 复用预览产物：标记为正式产出，跳过渲染
+        reusable_task.mark_confirmed()
+        gen_task_repo.update(reusable_task)
+
+        # 将产物 URL 写入 plan config
+        rendered_url = _get_task_output_url(reusable_task, gen_task_repo, db)
+        plan_svc.update_plan_config(
+            plan_id,
+            {
+                "generation_task_id": reusable_task.id,
+                "rendered_storage_key": rendered_url,  # 统一用 rendered_storage_key
+            },
+        )
+        plan_svc.transition_status(plan_id, EditPlanStatus.COMPLETED)
+
+        updated_plan = plan_svc.get_plan_or_raise(plan_id)
+        logger.info(
+            "模板编辑器复用预览产物: template_id=%s plan_id=%s task_id=%s by user=%s",
+            template_id,
+            plan_id,
+            reusable_task.id,
+            current_user.user.id,
+        )
+        return EditPlanGenerateResponse(
+            plan_id=plan_id,
+            plan_status=updated_plan.status.value if hasattr(updated_plan.status, "value") else updated_plan.status,
+            generation_task_id=reusable_task.id,
+            clip_count=len((plan_check.config or {}).get("clips", [])),
+        )
+
+    # 检查是否可生成（含最后防线自动修复 + 诊断日志）
+    try:
+        can_gen, reason = plan_svc.can_generate(plan_id)
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc
+    if not can_gen:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=reason)
+
+    try:
+        clip_count = plan_svc.mark_clips_ready(plan_id)
+
+        user_id = current_user.user.id
+        _check_queue_limits(gen_task_repo, user_id)
+
+        gen_task_use_case = CreateGenerationTaskUseCase(gen_task_repo)
+        plan = plan_svc.get_plan_or_raise(plan_id)
+        config_asset_ids = (plan.config or {}).get("asset_ids", [])
+        # 从 plan config 读取封面 URL（由 generate-cover 保存）
+        cover_url_from_config = (plan.config or {}).get("cover", {}).get("image_url", "")
+
+        # 处理标题配置：序列化 title_config 为 JSON 存入 custom_title
+        title_config = req.title_config or {}
+        title_text = (title_config.get("text") or "").strip()
+        custom_title_value = ""
+        if title_text:
+            custom_title_value = json.dumps(title_config, ensure_ascii=False)
+            logger.info(
+                "[模板生成] 标题配置: text=%s, config_keys=%s",
+                title_text[:30],
+                list(title_config.keys()),
+            )
+
+        gen_task = gen_task_use_case.execute(
+            CreateGenerationTaskCommand(
+                project_id=plan.project_id or "",
+                template_id=plan.template_id,
+                created_by_user_id=current_user.user.id,
+                source_edit_plan_id=plan_id,
+                asset_ids=list(config_asset_ids) if config_asset_ids else [],
+                cover_url=cover_url_from_config,
+                custom_title=custom_title_value,
+            ),
+        )
+
+        plan_svc.update_plan_config(plan_id, {"generation_task_id": gen_task.id})
+        plan_svc.transition_status(plan_id, EditPlanStatus.RENDERING)
+        celery_app.send_task("worker.render_edit_plan", args=[plan_id])
+
+        updated_plan = plan_svc.get_plan_or_raise(plan_id)
+
+        logger.info(
+            "模板编辑器触发生成: template_id=%s plan_id=%s gen_task_id=%s clips=%d by user=%s",
+            template_id,
+            plan_id,
+            gen_task.id,
+            clip_count,
+            current_user.user.id,
+        )
+
+        return EditPlanGenerateResponse(
+            plan_id=plan_id,
+            plan_status=updated_plan.status.value if hasattr(updated_plan.status, "value") else updated_plan.status,
+            generation_task_id=gen_task.id,
+            clip_count=clip_count,
+        )
+    except HTTPException:
+        raise
+    except Exception as _e:
+        logger.exception(
+            "模板编辑器触发生成失败: template_id=%s plan_id=%s",
+            template_id,
+            plan_id,
+        )
+        try:
+            plan_svc.transition_status(plan_id, EditPlanStatus.FAILED)
+        except Exception:
+            pass
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="生成失败，请稍后重试",
+        ) from _e
+
+
+def _find_reusable_preview_task(gen_task_repo, plan_id: str, plan) -> "object | None":
+    """查找该 plan 关联的已完成预览任务，判断是否可复用。
+
+    复用条件：
+    1. 存在 source_edit_plan_id == plan_id 的已完成预览任务
+    2. plan 在预览完成后未被修改（updated_at <= 预览完成时间）
+
+    Returns:
+        可复用的 GenerationTask，或 None
+    """
+    try:
+        tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
+    except Exception:
+        return None
+
+    for task in tasks:
+        if not getattr(task, "is_preview", False):
+            continue
+        if not task.is_completed:
+            continue
+        # 检查 plan 是否在预览完成后被修改
+        completed_at = getattr(task, "completed_at", None)
+        if completed_at and hasattr(plan, "updated_at"):
+            plan_updated = plan.updated_at
+            # 如果 plan.updated_at 为空，无法判断是否修改过，跳过
+            if plan_updated is None:
+                continue
+            # 如果 plan 在预览完成后又被修改了，不能复用
+            if plan_updated > completed_at:
+                continue
+        return task
+    return None
+
+
+def _get_task_output_url(task, gen_task_repo, db) -> str:
+    """获取任务的输出视频 URL。"""
+    try:
+        video_repo = get_generated_video_repository(db)
+        use_case = ListGeneratedVideosByTaskUseCase(video_repo)
+        videos = use_case.execute(task.id)
+        if videos:
+            url = getattr(videos[0], "file_url", "") or ""
+            # 规范化：合并路径中的双斜杠（保留协议头 ://）
+            if url:
+                import re as _re
+                url = _re.sub(r"(?<!:)//", "/", url)
+            return url
+    except Exception:
+        pass
+    return ""
+
+
+# DEPRECATED: 前端已改用 /generation/tasks 体系，此路由保留仅供旧版兼容，计划下线
+@router.get("/generation-status", response_model=EditPlanGenerationStatusResponse)
+def get_editor_generation_status(
+    template_id: str,
+    plan_id: str = Depends(get_draft_plan_id),
+    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
+    storage_service: OSSStorageService = Depends(get_storage_service),
+    _: AuthenticatedUser = Depends(get_current_user),
+) -> EditPlanGenerationStatusResponse:
+    """查询草稿生成进度"""
+    _, plan_svc = services
+    try:
+        gen_status = plan_svc.get_generation_status(plan_id)
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc
+
+    plan = gen_status["plan"]
+    clips = gen_status["clips"]
+
+    clip_items = [
+        ClipStatusItem(
+            clip_id=c.id,
+            clip_type=c.clip_type,
+            order=c.order,
+            status=c.status.value if hasattr(c.status, "value") else c.status,
+            asset_id=c.asset_id or "",
+            text_content=c.text_content or "",
+            duration=c.duration,
+        )
+        for c in clips
+    ]
+
+    raw_video_url = (plan.config or {}).get("rendered_storage_key", "") or (plan.config or {}).get("rendered_url", "")
+    video_url = ""
+    if raw_video_url:
+        if raw_video_url.startswith("http"):
+            video_url = raw_video_url  # 已经是完整 URL
+        else:
+            try:
+                video_url = storage_service.get_url(raw_video_url)  # storage_key -> 完整 URL
+            except Exception as e:
+                logger.warning("生成视频URL获取失败: template_id=%s error=%s", template_id, e)
+                video_url = raw_video_url
+
+    progress = gen_status.get("progress", 0.0)
+    error_message = gen_status.get("error_message", "")
+    gen_task_status = gen_status.get("generation_task_status")
+    plan_status_val = plan.status.value if hasattr(plan.status, "value") else plan.status
+    if plan_status_val == "completed" and progress < 100:
+        progress = 100.0
+
+    return EditPlanGenerationStatusResponse(
+        plan_id=plan_id,
+        plan_status=plan_status_val,
+        generation_task_id=gen_status["generation_task_id"],
+        generation_task_status=gen_task_status,
+        progress=progress,
+        video_url=video_url,
+        error_message=error_message,
+        clips=clip_items,
+    )
+
+
+@router.get("/generations", response_model=EditPlanGenerationsResponse)
+def list_editor_generations(
+    template_id: str,
+    plan_id: str = Depends(get_draft_plan_id),
+    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
+    db: Session = Depends(get_db_session),
+    _: AuthenticatedUser = Depends(get_current_user),
+) -> EditPlanGenerationsResponse:
+    """查询草稿关联的生成记录列表"""
+    _, plan_svc = services
+    plan_svc.get_plan_or_raise(plan_id)
+
+    gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
+    tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
+    items = [
+        GenerationTaskResponse(
+            id=t.id,
+            project_id=t.project_id,
+            asset_library_id=t.asset_library_id,
+            strategy_id=t.strategy_id,
+            voice_library_id=t.voice_library_id,
+            template_id=t.template_id,
+            asset_ids=t.asset_ids,
+            title_ids=t.title_ids,
+            voice_ids=t.voice_ids,
+            source_edit_plan_id=t.source_edit_plan_id or "",
+            status=t.status.value if hasattr(t.status, "value") else t.status,
+            progress=t.progress,
+            result_count=t.result_count,
+            error_message=t.error_message,
+        )
+        for t in tasks
+    ]
+    return EditPlanGenerationsResponse(items=items, total=len(items))

apps/api/app/api/routes/templates_editor/schemas.py

@@ -6,8 +6,9 @@
 from __future__ import annotations
 
 import re as _re
-from typing import Any, List, Optional
+from typing import Any, Dict, List, Optional
 
+from app.schemas.generation_task import GenerationTaskResponse
 from pydantic import BaseModel, Field, validator
 
 _EXPORT_RESOLUTION_PATTERN = _re.compile(r"^\d+x\d+$")
@@ -15,6 +16,58 @@ _EXPORT_VALID_QUALITY_PRESETS = {"ultra_fast", "fast", "balanced", "high", "best
 _EXPORT_VALID_FORMATS = {"mp4", "mov"}
 
 
+# ── 生成状态相关 ────────────────────────────────────────────────────────────
+
+
+class ClipStatusItem(BaseModel):
+    """片段生成状态"""
+
+    clip_id: str
+    clip_type: str
+    order: int
+    status: str
+    asset_id: str
+    text_content: str
+    duration: float
+
+
+class EditPlanGenerationStatusResponse(BaseModel):
+    """剪辑计划生成进度响应体"""
+
+    plan_id: str
+    plan_status: str
+    generation_task_id: Optional[str] = None
+    generation_task_status: Optional[str] = None
+    progress: float = 0.0
+    video_url: str = ""
+    error_message: str = ""
+    clips: List[ClipStatusItem]
+
+
+class EditPlanGenerateRequest(BaseModel):
+    """模板编辑器触发生成请求体"""
+    title_config: Optional[Dict[str, Any]] = Field(
+        default_factory=dict,
+        description="标题配置（可选），渲染时烧录到视频中。支持字段: text/font/font_size/font_color/position/bold/stroke/shadow",
+    )
+
+
+class EditPlanGenerateResponse(BaseModel):
+    """剪辑计划触发生成响应体"""
+
+    plan_id: str
+    plan_status: str
+    generation_task_id: str
+    clip_count: int
+
+
+class EditPlanGenerationsResponse(BaseModel):
+    """剪辑计划关联的生成记录列表响应体"""
+
+    items: List[GenerationTaskResponse]
+    total: int
+
+
 # ── AI 推荐 ────────────────────────────────────────────────────────────────
 
 
@@ -22,8 +75,12 @@ class AIRecommendRequest(BaseModel):
     """AI 推荐片段方案请求体"""
 
     asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表")
-    editing_mode: str = Field(default="one_take", description="剪辑模式: one_take / pip / voice_over / voice_pip")
-    target_duration: float = Field(default=30.0, ge=1.0, le=600.0, description="目标时长（秒）")
+    editing_mode: str = Field(
+        default="one_take", description="剪辑模式: one_take / pip / voice_over / voice_pip"
+    )
+    target_duration: float = Field(
+        default=30.0, ge=1.0, le=600.0, description="目标时长（秒）"
+    )
 
 
 class AIRecommendClipItem(BaseModel):
@@ -50,6 +107,8 @@ class AIRecommendResponse(BaseModel):
     confidence: float = Field(..., ge=0.0, le=1.0, description="AI 推荐置信度 (0~1)")
 
 
+
+
 # ── BGM ────────────────────────────────────────────────────────────────────
 
 
@@ -165,7 +224,9 @@ class ClipBatchDeleteResponse(BaseModel):
 class ClipsFromAssetsRequest(BaseModel):
     """从素材批量创建片段请求"""
 
-    asset_ids: List[str] = Field(..., min_length=1, max_length=200, description="素材 ID 列表，按顺序追加到时间线末尾")
+    asset_ids: List[str] = Field(
+        ..., min_length=1, max_length=200, description="素材 ID 列表，按顺序追加到时间线末尾"
+    )
     clip_type: str = Field(default="main", description="片段类型，默认 main")
 
 
@@ -440,28 +501,6 @@ class EditorClipUpdateRequest(BaseModel):
     config: Optional[dict[str, Any]] = None
 
 
-class EditorClipBatchItem(BaseModel):
-    """批量更新clips的单个片段"""
-
-    asset_id: str = Field(default="", max_length=100, description="关联素材ID，可为空（占位片段）")
-    start_time: float = Field(default=0.0, ge=0.0)
-    duration: float = Field(default=0.0, ge=0.0)
-    order: Optional[int] = Field(default=None, ge=0, description="排序，None表示按数组顺序")
-
-
-class EditorClipBatchUpdateRequest(BaseModel):
-    """批量替换clips请求（全量覆盖）"""
-
-    clips: List[EditorClipBatchItem] = Field(default_factory=list)
-
-
-class EditorClipBatchUpdateResponse(BaseModel):
-    """批量更新clips响应"""
-
-    plan_id: str
-    clip_count: int
-
-
 class EditorPublishResponse(BaseModel):
     """发布草稿响应"""
 

apps/api/app/schemas/generation_task.py

@@ -10,7 +10,7 @@ class ConfirmGenerationRequest(BaseModel):
     output_width: int = Field(default=1080, ge=100, description="输出视频宽度")
     output_height: int = Field(default=1920, ge=100, description="输出视频高度")
     cover_url: str = Field(default="", description="自定义封面图片 URL")
-    custom_title: str = Field(default="", description="用户自定义标题文本，非空时同步到任务和编辑计划")
+    custom_title: str = Field(default="", description="自定义视频标题")
 
 
 class CreateGenerationTaskRequest(BaseModel):
@@ -33,7 +33,7 @@ class CreateGenerationTaskRequest(BaseModel):
     voice_ids: list[str] = Field(default_factory=list)
     # ── 来源剪辑计划 ──
     source_edit_plan_id: str = ""
-    # ── 标题配置（结构化）──
+    # ── 标题配置（结构化，优先于 custom_title 纯文本）──
     title_config: dict | None = Field(
         default=None,
         description="标题样式对象，包含 text/font/font_size/font_color/position/bold/stroke/shadow 等。为空时不影响现有行为。",
@@ -77,6 +77,7 @@ class CreateGenerationTaskRequest(BaseModel):
     output_width: int = Field(default=1280, description="输出视频宽度")
     output_height: int = Field(default=720, description="输出视频高度")
     cover_url: str = Field(default="", description="封面图片 URL")
+    custom_title: str = Field(default="", description="自定义视频标题")
 
     @model_validator(mode="after")
     def _check_at_least_one_mode(self) -> "CreateGenerationTaskRequest":
@@ -112,6 +113,7 @@ class GenerationTaskResponse(BaseModel):
     output_width: int = 1280
     output_height: int = 720
     cover_url: str = ""
+    custom_title: str = ""
     title_config: dict = Field(default_factory=dict)
     status: str
     progress: float

apps/api/app/services/edit_plan_service.py

@@ -371,88 +371,6 @@ class EditPlanService:
         logger.info("删除所有片段: plan_id=%s count=%d", plan_id, count)
         return count
 
-    def replace_all_clips_transactional(
-        self,
-        plan_id: str,
-        clips_data: list[dict],
-    ) -> int:
-        """事务性地替换所有片段：清空→创建→标记ready，单事务保证原子性。
-
-        Args:
-            plan_id: 计划 ID
-            clips_data: 片段数据列表，每项包含 asset_id/start_time/duration/order
-
-        Returns:
-            int: 创建的片段数量
-
-        Raises:
-            Exception: 任何步骤失败时自动回滚
-        """
-        from packages.adapters.sqlalchemy_impl.models import EditPlanClipModel
-
-        db = self._clip_repo.session
-        try:
-            # 1. 清空现有 clips（不 commit）
-            deleted_count = db.query(EditPlanClipModel).filter(EditPlanClipModel.plan_id == plan_id).delete()
-
-            # 2. 批量创建新 clips（不 commit）
-            for i, clip_item in enumerate(clips_data):
-                order = clip_item.get("order") or i
-                clip = EditPlanClip.create(
-                    plan_id=plan_id,
-                    clip_type="main",
-                    order=order,
-                    asset_id=clip_item.get("asset_id", ""),
-                    start_time=clip_item.get("start_time", 0.0),
-                    duration=clip_item.get("duration", 0.0),
-                )
-                model = EditPlanClipModel(
-                    id=clip.id,
-                    plan_id=clip.plan_id,
-                    clip_type=clip.clip_type,
-                    order=clip.order,
-                    asset_id=clip.asset_id,
-                    text_content=clip.text_content,
-                    start_time=clip.start_time,
-                    duration=clip.duration,
-                    transition_effect=clip.transition_effect,
-                    transition_duration=clip.transition_duration,
-                    playback_speed=clip.playback_speed,
-                    status=clip.status.value,
-                    config=clip.config,
-                )
-                db.add(model)
-
-            # flush 让新建 clip 写入当前事务（未 commit），后续查询才能找到它们
-            db.flush()
-
-            # 3. 标记有 asset_id 的 clips 为 ready（不 commit）
-            pending_with_asset = (
-                db.query(EditPlanClipModel)
-                .filter(
-                    EditPlanClipModel.plan_id == plan_id,
-                    EditPlanClipModel.status == "pending",
-                    EditPlanClipModel.asset_id != "",
-                )
-                .all()
-            )
-            for m in pending_with_asset:
-                m.status = "ready"
-
-            # 4. 一次性提交
-            db.commit()
-            logger.info(
-                "事务性替换片段: plan_id=%s deleted=%d created=%d",
-                plan_id,
-                deleted_count,
-                len(clips_data),
-            )
-            return len(clips_data)
-        except Exception:
-            db.rollback()
-            logger.exception("事务性替换片段失败: plan_id=%s", plan_id)
-            raise
-
     # ── 片段分割与合并 ──────────────────────────────────────────────────────
 
     def split_clip(self, clip_id: str, split_time: float) -> Dict[str, Any]:

apps/web/src/api/generation/types.ts

@@ -38,8 +38,6 @@ export interface CreatePreviewResponse {
   is_preview: boolean
   resolution: string
   created_at: string
-  /** 后端自动关联的编辑计划 ID（用于 fallback 路径传递 source_edit_plan_id） */
-  source_edit_plan_id?: string
 }
 
 /** 预览任务详情响应 */

apps/web/src/api/tasks/types.ts

@@ -84,14 +84,6 @@ export interface CreateGenerationTaskRequest {
   }
   /** 关联的草稿 ID（编辑流程数据链路用） */
   source_edit_plan_id?: string
-  /** 配音素材库 ID（用户上传的音频或 AI 配音素材） */
-  voice_library_id?: string
-  /** 自定义 BGM 配置，覆盖模板 BGM 设置 */
-  bgm_config?: {
-    enabled: boolean
-    preset_id?: string
-    volume?: number
-  }
 }
 
 /** 单个生成任务详情（对齐后端 GenerationTaskResponse） */

apps/web/src/api/template-editor/editPlans.ts

@@ -1,8 +1,15 @@
 /**
- * 模板草稿 CRUD API
+ * 模板草稿 CRUD + 生成相关 API
  */
 import apiClient from "../client"
-import type { EditPlan, UpdateEditPlanRequest, GeneratedVideo } from "./types"
+import type {
+  EditPlan,
+  UpdateEditPlanRequest,
+  GenerateResponse,
+  GenerationStatusResponse,
+  EditPlanGeneration,
+  GeneratedVideo,
+} from "./types"
 
 /** 获取单个模板草稿 */
 export async function getEditPlan(templateId: string): Promise<EditPlan> {
@@ -20,34 +27,26 @@ export async function updateEditPlan(
   return response.data
 }
 
+/** 触发生成 */
+export async function generateEditPlan(templateId: string): Promise<GenerateResponse> {
+  const response = await apiClient.post(`/templates/${templateId}/editor/generate`)
+  return response.data
+}
+
+/** 获取生成状态（轮询用） */
+export async function getGenerationStatus(templateId: string): Promise<GenerationStatusResponse> {
+  const response = await apiClient.get(`/templates/${templateId}/editor/generation-status`)
+  return response.data
+}
+
+/** 获取模板草稿关联的生成记录 */
+export async function getEditPlanGenerations(templateId: string): Promise<EditPlanGeneration[]> {
+  const response = await apiClient.get(`/templates/${templateId}/editor/generations`)
+  return response.data.items || []
+}
+
 /** 获取生成任务的视频结果列表 */
 export async function getGenerationTaskResults(taskId: string): Promise<GeneratedVideo[]> {
   const response = await apiClient.get(`/generation/tasks/${taskId}/results`)
   return response.data.items || response.data || []
 }
-
-/** ── 草稿 clips 批量更新 ── */
-
-export interface EditPlanClipInput {
-  asset_id: string
-  start_time: number
-  duration: number
-  order: number
-}
-
-/**
- * 批量替换草稿的 clips（先全删再批量插入）
- * 后端路由：PUT /templates/{template_id}/editor/clips
- */
-export async function updateEditPlanClips(
-  templateId: string,
-  clips: EditPlanClipInput[],
-  signal?: AbortSignal,
-): Promise<{ count: number }> {
-  const response = await apiClient.put(
-    `/templates/${templateId}/editor/clips`,
-    { clips },
-    { signal },
-  )
-  return response.data
-}

apps/web/src/api/template-editor/index.ts

@@ -16,7 +16,10 @@ export type {
   EditPlanConfig,
   EditPlan,
   UpdateEditPlanRequest,
+  GenerateResponse,
+  EditPlanGeneration,
   ClipStatusItem,
+  GenerationStatusResponse,
   GeneratedVideo,
   AIRecommendRequest,
   AIRecommendClipItem,
@@ -48,10 +51,11 @@ export {
 export {
   getEditPlan,
   updateEditPlan,
-  updateEditPlanClips,
+  generateEditPlan,
+  getGenerationStatus,
+  getEditPlanGenerations,
   getGenerationTaskResults,
 } from "./editPlans"
-export type { EditPlanClipInput } from "./editPlans"
 
 // 片段 CRUD + 批量操作
 export {

apps/web/src/api/template-editor/types.ts

@@ -187,6 +187,31 @@ export interface EditPlanListResponse {
 
 /* ── 生成相关 ── */
 
+/** 生成响应 */
+export interface GenerateResponse {
+  plan_id: string
+  plan_status: EditPlanStatus
+  generation_task_id: string
+  clip_count: number
+}
+
+/** 模板草稿关联的生成记录 */
+export interface EditPlanGeneration {
+  id: string
+  source_edit_plan_id: string
+  template_id: string
+  asset_ids: string[]
+  status: EditPlanStatus
+  progress: number
+  result_count: number
+  error_message: string
+  error_info: Record<string, unknown>
+  logs: Array<Record<string, unknown>>
+  retry_count: number
+  created_at?: string
+  updated_at?: string
+}
+
 /** 片段生成状态 */
 export interface ClipStatusItem {
   clip_id: string
@@ -199,6 +224,17 @@ export interface ClipStatusItem {
   error_message?: string
 }
 
+/** 生成状态轮询响应 */
+export interface GenerationStatusResponse {
+  plan_id: string
+  plan_status: EditPlanStatus
+  generation_task_id?: string
+  error_message?: string
+  clips: ClipStatusItem[]
+  error?: string
+  message?: string
+}
+
 /** 生成视频详情 */
 export interface GeneratedVideo {
   id: string

apps/web/src/config/navigation.ts

@@ -71,7 +71,7 @@ export const NAV_ITEMS: NavItem[] = [
   },
   {
     key: "editing-planner",
-    label: "剪辑模板",
+    label: "剪辑编辑器",
     path: "/app/editing-planner",
     icon: React.createElement(EditOutlined),
   },
@@ -133,7 +133,7 @@ export const NAV_GROUPS: NavGroup[] = [
       },
       {
         key: "editing-planner",
-        label: "剪辑模板",
+        label: "剪辑编辑器",
         path: "/app/editing-planner",
         icon: React.createElement(EditOutlined),
       },

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

@@ -0,0 +1,116 @@
+/**
+ * 生成历史弹窗 — 展示当前模板草稿的生成任务记录
+ * 从 EditingPlanner 拆分，避免主文件过大
+ */
+import React from "react"
+import { CloseOutlined, InboxOutlined } from "@ant-design/icons"
+import type { EditPlanGeneration } from "@/api/template-editor"
+import { PLAN_STATUS_LABELS } from "@/api/template-editor"
+
+interface GenerationHistoryModalProps {
+  open: boolean
+  loading: boolean
+  history: EditPlanGeneration[]
+  onClose: () => void
+  onCancel?: (taskId: string) => void
+  cancelLoading?: boolean
+}
+
+const GenerationHistoryModal: React.FC<GenerationHistoryModalProps> = ({
+  open,
+  loading,
+  history,
+  onClose,
+  onCancel,
+  cancelLoading,
+}) => {
+  if (!open) return null
+
+  return (
+    <div className="ep-modal-overlay" onClick={onClose}>
+      <div className="ep-modal ep-gh-modal" onClick={(e) => e.stopPropagation()}>
+        <div className="ep-modal-header">
+          <h3>生成历史</h3>
+          <button className="ep-modal-close" onClick={onClose}>
+            <CloseOutlined />
+          </button>
+        </div>
+        <div className="ep-modal-body ep-gh-body">
+          {loading ? (
+            <div className="ep-gh-empty">
+              <div className="ep-skeleton">
+                <div className="ep-skeleton-item ep-skeleton-item--header" />
+                <div className="ep-skeleton-item" />
+                <div className="ep-skeleton-item" />
+                <div className="ep-skeleton-item" />
+              </div>
+            </div>
+          ) : history.length === 0 ? (
+            <div className="ep-gh-empty">
+              <InboxOutlined style={{ fontSize: 32, opacity: 0.4 }} />
+              <span>暂无生成记录</span>
+            </div>
+          ) : (
+            <table className="ep-gh-table">
+              <thead>
+                <tr className="ep-gh-table-header-row">
+                  <th className="ep-gh-th">任务ID</th>
+                  <th className="ep-gh-th">状态</th>
+                  <th className="ep-gh-th">创建时间</th>
+                  <th className="ep-gh-th">更新时间</th>
+                  {onCancel && <th className="ep-gh-th">操作</th>}
+                </tr>
+              </thead>
+              <tbody>
+                {history.map((gen) => {
+                  const statusClass = `ep-gh-status-tag--${gen.status}`
+                  const canCancel = gen.status === "rendering" || gen.status === "editing"
+                  return (
+                    <tr key={gen.id} className="ep-gh-table-row">
+                      <td className="ep-gh-td ep-gh-td-id">
+                        {gen.id ? `${gen.id.slice(0, 8)}...` : "—"}
+                      </td>
+                      <td className="ep-gh-td">
+                        <span className={`ep-gh-status-tag ${statusClass}`}>
+                          {PLAN_STATUS_LABELS[gen.status] || gen.status}
+                        </span>
+                      </td>
+                      <td className="ep-gh-td ep-gh-td-time">
+                        {gen.created_at ? new Date(gen.created_at).toLocaleString("zh-CN") : "—"}
+                      </td>
+                      <td className="ep-gh-td ep-gh-td-time">
+                        {gen.updated_at ? new Date(gen.updated_at).toLocaleString("zh-CN") : "—"}
+                      </td>
+                      {onCancel && (
+                        <td className="ep-gh-td ep-gh-td-action">
+                          {canCancel ? (
+                            <button
+                              className="ep-gh-cancel-btn"
+                              onClick={() => onCancel(gen.id)}
+                              disabled={cancelLoading}
+                            >
+                              取消
+                            </button>
+                          ) : (
+                            <span className="ep-gh-action-placeholder">—</span>
+                          )}
+                        </td>
+                      )}
+                    </tr>
+                  )
+                })}
+              </tbody>
+            </table>
+          )}
+        </div>
+        <div className="ep-modal-footer">
+          <button className="ep-btn ep-btn-secondary" onClick={onClose}>
+            关闭
+          </button>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default GenerationHistoryModal

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

@@ -0,0 +1,6 @@
+/**
+ * 生成进度弹窗 — 入口文件（向后兼容）
+ * 实际实现已移至 ./generation-progress-modal/ 目录
+ */
+export { default } from "./generation-progress-modal"
+export type { GenPhase, GenerationProgressModalProps } from "./generation-progress-modal"

apps/web/src/pages/editing-planner/components/generation-progress-modal/ProgressPhase.tsx

@@ -0,0 +1,65 @@
+import React from "react"
+import { Modal } from "@/components/ui"
+import type { TaskItem } from "@/api/tasks"
+import { getStepLabel, getStatusColor } from "./constants"
+
+interface ProgressPhaseProps {
+  open: boolean
+  task: TaskItem | null
+  onCancel: () => void
+}
+
+/** progress（进度轮询）阶段弹窗 */
+export const ProgressPhase: React.FC<ProgressPhaseProps> = ({ open, task, onCancel }) => {
+  const progress = task?.progress ?? 0
+  const status = task?.status ?? ""
+  const currentStep = task?.current_step ?? ""
+  const userMessage = task?.user_message ?? ""
+  const stepColor = getStatusColor(status, currentStep)
+
+  return (
+    <Modal open={open} title="视频生成中" footer={null} onCancel={onCancel} closable width={480}>
+      <div className="ep-gen-progress">
+        {/* 进度环 */}
+        <div className="ep-gen-progress-ring-wrap">
+          <svg className="ep-gen-progress-ring" viewBox="0 0 120 120">
+            <circle className="ep-gen-progress-ring-bg" cx="60" cy="60" r="52" />
+            <circle
+              className="ep-gen-progress-ring-fill"
+              cx="60"
+              cy="60"
+              r="52"
+              style={{
+                strokeDasharray: `${2 * Math.PI * 52}`,
+                strokeDashoffset: `${2 * Math.PI * 52 * (1 - progress / 100)}`,
+                stroke: stepColor,
+              }}
+            />
+          </svg>
+          <span className="ep-gen-progress-pct" style={{ color: stepColor }}>
+            {progress}%
+          </span>
+        </div>
+
+        {/* 当前步骤 */}
+        <div className="ep-gen-step-text">
+          {userMessage || getStepLabel(currentStep) || "处理中…"}
+        </div>
+
+        {/* 进度条 */}
+        <div className="ep-gen-progress-bar">
+          <div
+            className="ep-gen-progress-bar-fill"
+            style={{
+              width: `${progress}%`,
+              backgroundColor: stepColor,
+            }}
+          />
+        </div>
+
+        {/* 任务 ID */}
+        {task?.id && <div className="ep-gen-task-id">任务 ID: {task.id}</div>}
+      </div>
+    </Modal>
+  )
+}

apps/web/src/pages/editing-planner/components/generation-progress-modal/ResultPhase.tsx

@@ -0,0 +1,82 @@
+import React from "react"
+import { Modal, Button } from "@/components/ui"
+import type { TaskItem } from "@/api/tasks"
+
+interface ResultPhaseProps {
+  open: boolean
+  phase: "completed" | "failed"
+  task: TaskItem | null
+  onCancel: () => void
+  onRetry?: () => void
+  onClose?: () => void
+}
+
+/** completed / failed（结果）阶段弹窗 */
+export const ResultPhase: React.FC<ResultPhaseProps> = ({
+  open,
+  phase,
+  task,
+  onCancel,
+  onRetry,
+  onClose,
+}) => {
+  const userMessage = task?.user_message ?? ""
+  const errorMessage = task?.error_message ?? ""
+  const retryable = task?.retryable ?? false
+  const handleClose = onClose || onCancel
+
+  if (phase === "completed") {
+    return (
+      <Modal
+        open={open}
+        title="✅ 生成完成"
+        footer={null}
+        onCancel={handleClose}
+        closable
+        width={440}
+      >
+        <div className="ep-gen-result">
+          <div className="ep-gen-result-icon">🎉</div>
+          <div className="ep-gen-result-title">视频生成完成！</div>
+          {userMessage && <div className="ep-gen-result-msg">{userMessage}</div>}
+          <div className="ep-gen-result-actions">
+            <Button buttonType="primary" onClick={handleClose}>
+              查看结果
+            </Button>
+          </div>
+        </div>
+      </Modal>
+    )
+  }
+
+  return (
+    <Modal
+      open={open}
+      title="❌ 生成失败"
+      footer={null}
+      onCancel={handleClose}
+      closable
+      width={440}
+    >
+      <div className="ep-gen-result ep-gen-result--error">
+        <div className="ep-gen-result-icon">😥</div>
+        <div className="ep-gen-result-title">视频生成失败</div>
+        {(errorMessage || userMessage) && (
+          <div className="ep-gen-result-msg ep-gen-result-msg--error">
+            {errorMessage || userMessage}
+          </div>
+        )}
+        <div className="ep-gen-result-actions">
+          {retryable && onRetry && (
+            <Button buttonType="primary" onClick={onRetry}>
+              🔄 重试
+            </Button>
+          )}
+          <Button buttonType="secondary" onClick={handleClose}>
+            关闭
+          </Button>
+        </div>
+      </div>
+    </Modal>
+  )
+}

apps/web/src/pages/editing-planner/components/generation-progress-modal/SetupPhase.tsx

@@ -0,0 +1,53 @@
+import React from "react"
+import { Modal } from "@/components/ui"
+
+interface SetupPhaseProps {
+  open: boolean
+  voiceoverDuration: number | null
+  estimatedDuration: number
+  submitting: boolean
+  onDurationChange: (v: number | null) => void
+  onGenerate: () => void
+  onCancel: () => void
+}
+
+/** setup（配置）阶段弹窗 */
+export const SetupPhase: React.FC<SetupPhaseProps> = ({
+  open,
+  voiceoverDuration,
+  estimatedDuration,
+  submitting,
+  onDurationChange,
+  onGenerate,
+  onCancel,
+}) => (
+  <Modal
+    open={open}
+    title="使用模板生成视频"
+    confirmLoading={submitting}
+    onOk={onGenerate}
+    onCancel={onCancel}
+    okText="开始生成"
+    cancelText="取消"
+    width={440}
+  >
+    <div className="ep-gen-setup">
+      <label className="ep-gen-field-label">配音时长（秒）</label>
+      <input
+        type="number"
+        className="ep-gen-duration-input"
+        placeholder="请输入配音时长"
+        value={voiceoverDuration ?? ""}
+        onChange={(e) => {
+          const v = e.target.value ? Number(e.target.value) : null
+          onDurationChange(v)
+        }}
+        min={1}
+        max={600}
+      />
+      <div className="ep-gen-estimate">
+        预估总时长：<strong>{estimatedDuration}s</strong>
+      </div>
+    </div>
+  </Modal>
+)

apps/web/src/pages/editing-planner/components/generation-progress-modal/constants.ts

@@ -0,0 +1,31 @@
+/* ──────────── 步骤文案映射 ──────────── */
+
+export const STEP_LABELS: Record<string, string> = {
+  queued: "排队中…",
+  preparing: "准备素材…",
+  generating_video: "渲染视频中…",
+  adding_effects: "添加特效…",
+  composing: "合成中…",
+  encoding: "编码输出中…",
+  completed: "生成完成！",
+  failed: "生成失败",
+}
+
+export const getStepLabel = (step: string) => STEP_LABELS[step] || step.replace(/_/g, " ")
+
+/* ──────────── 状态徽标颜色 ──────────── */
+
+export const STATUS_COLOR: Record<string, string> = {
+  queued: "#6b7280",
+  pending: "#6b7280",
+  preparing: "#f59e0b",
+  generating_video: "#4f46e5",
+  adding_effects: "#7c3aed",
+  composing: "#2563eb",
+  encoding: "#0891b2",
+  completed: "#10b981",
+  failed: "#ef4444",
+}
+
+export const getStatusColor = (status: string, currentStep: string) =>
+  STATUS_COLOR[status] || STATUS_COLOR[currentStep] || "#4f46e5"

apps/web/src/pages/editing-planner/components/generation-progress-modal/index.tsx

@@ -0,0 +1,70 @@
+/**
+ * 生成进度弹窗 — 任务 2.17
+ * 三阶段 UI：setup（配置）→ progress（进度轮询）→ completed / failed（结果）
+ * V21 设计系统，CSS 类名前缀 ep-gen-
+ */
+import React, { useEffect, useRef } from "react"
+import type { GenPhase, GenerationProgressModalProps } from "./types"
+import { SetupPhase } from "./SetupPhase"
+import { ProgressPhase } from "./ProgressPhase"
+import { ResultPhase } from "./ResultPhase"
+
+/* 重新导出类型，保持向后兼容 */
+export type { GenPhase, GenerationProgressModalProps }
+
+const GenerationProgressModal: React.FC<GenerationProgressModalProps> = ({
+  open,
+  phase,
+  voiceoverDuration,
+  estimatedDuration,
+  onDurationChange,
+  onGenerate,
+  task,
+  submitting,
+  onCancel,
+  onRetry,
+  onClose,
+}) => {
+  /* 关闭弹窗时重置（避免下次打开残留旧状态） */
+  const prevOpen = useRef(false)
+  useEffect(() => {
+    if (prevOpen.current && !open) {
+      /* modal just closed — parent handles reset */
+    }
+    prevOpen.current = open
+  }, [open])
+
+  /* setup 阶段 */
+  if (phase === "setup") {
+    return (
+      <SetupPhase
+        open={open}
+        voiceoverDuration={voiceoverDuration}
+        estimatedDuration={estimatedDuration}
+        submitting={submitting}
+        onDurationChange={onDurationChange}
+        onGenerate={onGenerate}
+        onCancel={onCancel}
+      />
+    )
+  }
+
+  /* progress 阶段 */
+  if (phase === "progress") {
+    return <ProgressPhase open={open} task={task} onCancel={onCancel} />
+  }
+
+  /* completed / failed 阶段 */
+  return (
+    <ResultPhase
+      open={open}
+      phase={phase as "completed" | "failed"}
+      task={task}
+      onCancel={onCancel}
+      onRetry={onRetry}
+      onClose={onClose}
+    />
+  )
+}
+
+export default GenerationProgressModal

apps/web/src/pages/editing-planner/components/generation-progress-modal/types.ts

@@ -0,0 +1,23 @@
+import type { TaskItem } from "@/api/tasks"
+
+export type GenPhase = "setup" | "progress" | "completed" | "failed"
+
+export interface GenerationProgressModalProps {
+  open: boolean
+  phase: GenPhase
+
+  /* setup 阶段 */
+  voiceoverDuration: number | null
+  estimatedDuration: number
+  onDurationChange: (v: number | null) => void
+  onGenerate: () => void
+
+  /* progress / 结果阶段 */
+  task: TaskItem | null
+
+  /* 通用 */
+  submitting: boolean
+  onCancel: () => void
+  onRetry?: () => void
+  onClose?: () => void
+}

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

@@ -1,20 +1,21 @@
 /**
- * 智能剪辑页面 — 服务器渲染预览架构
+ * 智能剪辑页面 — V24 前端预览播放器架构改造
  * 7 步向导：选择模板 → 素材 → 配音 → 标题 → 预览 → 封面 → 确认生成
  * 左右布局：左侧 generate-form + 右侧 generate-preview
  *
- * 架构：
- * - Step4+ 右侧预览面板自动创建服务器预览渲染任务（POST /generation/preview）
- * - 轮询完成后播放服务器渲染的真实视频（<video> 标签）
- * - 标题样式编辑时 CSS 层实时叠加预览
- * - 素材/配音/BGM 变更自动重新渲染；标题变更标记 stale
- * - 点"确认生成"时走 confirm 路径，成品就是预览视频本身，100% 一致
+ * 架构改造：
+ * - Step5 预览改为前端素材切片播放（FrontendPreviewPlayer）
+ * - 完全去除后端 FFmpeg 预览依赖
+ * - 标题样式通过 CSS 层实时叠加，所见即所得
+ * - 最终成片仍走后端 FFmpeg 渲染（Step7 确认生成）
  */
-import React, { useMemo, useCallback } from "react"
+import React, { useMemo } from "react"
 import { Modal, message } from "antd"
 import { useNavigate } from "react-router-dom"
 import type { VoiceClone } from "@/api/voice-clone"
+import { useQuery } from "@tanstack/react-query"
 import { useCloneProgress } from "@/hooks/useCloneProgress"
+import { getAssetsByKind } from "@/api/assets"
 import CloneModal from "@/components/voice/CloneModal"
 import GenerateHeader from "./components/GenerateHeader"
 import {
@@ -30,7 +31,6 @@ import { useGenerateFormState } from "./hooks/useGenerateFormState"
 import { useStepNavigation } from "./hooks/useStepNavigation"
 import { useGenerateVideo } from "./hooks/useGenerateVideo"
 import { usePreviewAssets } from "./hooks/usePreviewAssets"
-import { useServerPreview } from "./hooks/useServerPreview"
 import { useTitleStyleUpdaters } from "./hooks/useStep4Title/useTitleStyleUpdaters"
 import "./generate.css"
 
@@ -72,18 +72,13 @@ const GeneratePage: React.FC = () => {
     autoSubtitles,
     bgm,
     editPlanId,
-    sourceEditPlanId,
     previewVideo,
     setPreviewVideo,
     previewModalOpen,
     setPreviewModalOpen,
-    previewTaskId,
-    setPreviewTaskId,
-    storedSourceEditPlanId,
-    setStoredSourceEditPlanId,
   } = formState
 
-  /* ── 标题样式回调 ── */
+  /* ── 标题样式回调（Step5 样式面板 + 右侧预览 CSS 层共用） ── */
   const styleUpdaters = useTitleStyleUpdaters({
     titleSettings,
     onTitleSettingsChange: setTitleSettings,
@@ -98,103 +93,45 @@ const GeneratePage: React.FC = () => {
     message.success("音色克隆成功！")
   }
 
-  /* ── 素材 ID 列表 ── */
+  /* ── 前端预览：加载选中素材的视频文件信息 ── */
   const previewAssetIds = useMemo(
     () => (materialMode === "auto" ? smartSelectedIds : selectedMaterials),
     [materialMode, smartSelectedIds, selectedMaterials],
   )
+  const previewAssetsEnabled = currentStep >= 4 && previewAssetIds.length > 0
+  const {
+    assets: previewAssets,
+    loading: previewAssetsLoading,
+    ready: previewAssetsReady,
+  } = usePreviewAssets(previewAssetIds, previewAssetsEnabled)
 
-  /* ── 当前模板对象 ── */
+  /* ── 当前模板对象（传给前端预览播放器） ── */
   const currentTemplate = useMemo(
     () => userTemplates.find((t) => t.id === selectedTemplate) || null,
     [userTemplates, selectedTemplate],
   )
 
-  /* ── BGM 配置 ── */
-  const bgmConfig = useMemo(
-    () => ({
-      enabled: bgm,
-      music_id: currentTemplate?.bgm_config?.music_id || "",
-    }),
-    [bgm, currentTemplate],
-  )
-
-  /* ── 加载素材详情（仅用于配音时长校验，不用于播放） ── */
-  const previewAssetsEnabled = previewAssetIds.length > 0
-  const { assets: previewAssets } = usePreviewAssets(previewAssetIds, previewAssetsEnabled)
-
-  /* ── 视频总时长计算 ── */
+  /* ── 视频总时长计算（用于配音时长校验） ── */
   const totalVideoDuration = useMemo(() => {
+    // 优先用素材精确时长；素材未加载时用模板 segments 的 duration_max 之和估算
     const exact = calculateTotalVideoDuration(previewAssets, currentTemplate ?? undefined)
     if (exact > 0) return exact
     return estimateTotalVideoDuration(currentTemplate ?? undefined)
   }, [previewAssets, currentTemplate])
 
-  /* ── 解析配音 ID ── */
-  const voiceLibraryId = useMemo(
-    () => (voiceMode === "clone" ? selectedClonedVoice || "" : selectedVoice || ""),
-    [voiceMode, selectedClonedVoice, selectedVoice],
-  )
-
-  /* ── 构建服务器预览请求参数 ── */
-  const buildPreviewRequest = useCallback(() => {
-    return {
-      template_id: selectedTemplate,
-      asset_ids: previewAssetIds,
-      duration: duration || 30,
-      video_ratio: videoRatio,
-      ...(voiceLibraryId ? { voice_library_id: voiceLibraryId } : {}),
-      bgm_config: {
-        enabled: bgm !== false,
-        ...(bgmConfig.music_id ? { preset_id: bgmConfig.music_id } : {}),
-      },
-      ...(titleSettings.title
-        ? {
-            title_config: {
-              text: titleSettings.title,
-              font: titleSettings.font,
-              font_size: titleSettings.size,
-              font_color: titleSettings.color,
-              position: titleSettings.position,
-              bold: titleSettings.bold,
-              stroke: titleSettings.stroke,
-              shadow: titleSettings.shadow,
-            },
-          }
-        : {}),
-    }
-  }, [
-    selectedTemplate,
-    previewAssetIds,
-    duration,
-    videoRatio,
-    voiceLibraryId,
-    bgm,
-    bgmConfig,
-    titleSettings,
-  ])
-
-  /* ── 服务器预览 ── */
-  const serverPreviewEnabled = currentStep >= 4 && !!selectedTemplate && previewAssetIds.length > 0
-
-  const {
-    status: previewStatus,
-    videoUrl: previewVideoUrl,
-    progress: previewProgress,
-    error: previewError,
-    triggerPreview,
-  } = useServerPreview({
-    enabled: serverPreviewEnabled,
-    buildRequest: buildPreviewRequest,
-    onPreviewTaskCreated: (taskId, planId) => {
-      setPreviewTaskId(taskId)
-      if (planId) setStoredSourceEditPlanId(planId)
-    },
+  /* ── 配音音频 URL ── */
+  const { data: voiceMaterials = [] } = useQuery({
+    queryKey: ["assets", "voice"],
+    queryFn: () => getAssetsByKind("voice", { limit: 50 }),
   })
 
+  const voiceAudioUrl = useMemo(() => {
+    if (!selectedVoice) return undefined
+    const asset = voiceMaterials.find((v) => v.id === selectedVoice)
+    return asset?.file_url || undefined
+  }, [selectedVoice, voiceMaterials])
+
   /* ── 步骤导航 ── */
-  // Step5 需要服务器预览完成才能前进
-  const previewReady = previewStatus === "ready"
   const { goNext, goPrev } = useStepNavigation({
     currentStep,
     setCurrentStep,
@@ -203,7 +140,7 @@ const GeneratePage: React.FC = () => {
     selectedMaterials,
     smartSelectedIds,
     titleSettings,
-    previewReady,
+    previewReady: previewAssetsReady,
   })
 
   /* ── 视频生成核心逻辑 ── */
@@ -234,30 +171,22 @@ const GeneratePage: React.FC = () => {
     autoSubtitles,
     bgm,
     generateCount,
-    sourceEditPlanId: storedSourceEditPlanId || sourceEditPlanId,
-    previewTaskId,
-    bgmConfig,
-    onGenerationSuccess: () => {
-      setPreviewTaskId(null)
-      setStoredSourceEditPlanId(null)
-    },
+    sourceEditPlanId: editPlanId,
   })
 
-  /* ── 手动重新预览（标题变更后或失败重试） ── */
-  const handleRetryPreview = useCallback(() => {
-    triggerPreview()
-  }, [triggerPreview])
-
   /* ================================================================
-     渲染
+     渲染 — 主页面
      ================================================================ */
 
   return (
     <div className="xx-generate-page">
+      {/* ── 页头 ── */}
       <GenerateHeader fromEditPlan={!!editPlanId} />
 
+      {/* ── 步骤条 ── */}
       <GenerateStepsBar currentStep={currentStep} onStepClick={setCurrentStep} />
 
+      {/* ── 主布局 ── */}
       <div className="xx-generate-layout">
         {/* ════ 左侧：表单区 ════ */}
         <div className="xx-generate-form">
@@ -274,6 +203,7 @@ const GeneratePage: React.FC = () => {
             onSmartSelectedIdsChange={setSmartSelectedIds}
             titleSettings={titleSettings}
             onTitleSettingsChange={setTitleSettings}
+            /* 标题样式回调 */
             onUpdatePosition={styleUpdaters.updatePosition}
             onUpdateFont={styleUpdaters.updateFont}
             onUpdateSize={styleUpdaters.updateSize}
@@ -284,10 +214,6 @@ const GeneratePage: React.FC = () => {
             onApplyPreset={styleUpdaters.applyPreset}
             activePreset={styleUpdaters.activePreset}
             titlePresets={styleUpdaters.titlePresets}
-            onPreviewTaskCreated={setPreviewTaskId}
-            onSourceEditPlanIdExtracted={setStoredSourceEditPlanId}
-            bgm={bgm}
-            bgmConfig={bgmConfig}
             coverSettings={coverSettings}
             onCoverSettingsChange={setCoverSettings}
             duration={duration}
@@ -313,8 +239,6 @@ const GeneratePage: React.FC = () => {
             onRetry={handleRetryGenerate}
             onDismissError={handleDismissError}
             presetVoices={presetVoices}
-            previewStatus={previewStatus}
-            onRetryPreview={handleRetryPreview}
           />
 
           <GenerateStepActions
@@ -328,18 +252,18 @@ const GeneratePage: React.FC = () => {
           />
         </div>
 
-        {/* ════ 右侧：预览 + 结果 ════ */}
+        {/* ════ 右侧：预览 + 生成结果 ════ */}
         <div className="xx-generate-right-col">
+          {/* 预览视频面板（Step4+ 显示，含 CSS 标题实时预览层） */}
           {currentStep >= 4 && (
             <PreviewVideoPanel
-              previewStatus={previewStatus}
-              videoUrl={previewVideoUrl}
-              progress={previewProgress}
-              error={previewError}
-              onRetry={handleRetryPreview}
+              assets={previewAssets}
+              template={currentTemplate}
               videoRatio={videoRatio}
+              assetsReady={previewAssetsReady}
+              assetsLoading={previewAssetsLoading}
               titleSettings={titleSettings}
-              assetCount={previewAssetIds.length}
+              voiceAudioUrl={voiceAudioUrl}
             />
           )}
           {currentStep >= 6 && (
@@ -361,7 +285,7 @@ const GeneratePage: React.FC = () => {
         </div>
       </div>
 
-      {/* 视频预览弹窗 */}
+      {/* ── 视频预览弹窗 ── */}
       <Modal
         className="xx-preview-modal"
         open={previewModalOpen}
@@ -384,7 +308,7 @@ const GeneratePage: React.FC = () => {
         )}
       </Modal>
 
-      {/* 音色克隆弹窗 */}
+      {/* ── 音色克隆弹窗 ── */}
       <CloneModal
         open={cloneModalOpen}
         onClose={() => setCloneModalOpen(false)}

apps/web/src/pages/generate/components/GenerateStepContent.tsx

@@ -76,18 +76,6 @@ export interface GenerateStepContentProps {
   onDismissError: () => void
   /* 其他 */
   presetVoices: PresetVoiceItem[]
-  /** 预览任务创建回调——传递给 Step6CoverSettings */
-  onPreviewTaskCreated?: (taskId: string) => void
-  /** 从预览响应中提取到 source_edit_plan_id 时的回调 */
-  onSourceEditPlanIdExtracted?: (planId: string) => void
-  /** BGM 开关 */
-  bgm: boolean
-  /** BGM 配置（来自模板） */
-  bgmConfig?: { enabled: boolean; music_id?: string }
-  /** 服务器预览状态 */
-  previewStatus?: import("../hooks/useServerPreview").ServerPreviewStatus
-  /** 重新预览回调 */
-  onRetryPreview?: () => void
 }
 
 export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) => {
@@ -133,18 +121,8 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
     onRetry,
     onDismissError,
     presetVoices,
-    onPreviewTaskCreated,
-    onSourceEditPlanIdExtracted,
-    bgm,
-    bgmConfig,
-    previewStatus,
-    onRetryPreview,
   } = props
 
-  /* 当前模板的 segments，传给 Step2 构建 clips */
-  const currentTemplate = userTemplates.find((t) => t.id === selectedTemplate)
-  const templateSegments = currentTemplate?.segments
-
   switch (currentStep) {
     case 1:
       return (
@@ -164,7 +142,6 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           smartSelectedIds={smartSelectedIds}
           onSmartSelectedIdsChange={onSmartSelectedIdsChange}
           selectedTemplate={selectedTemplate}
-          templateSegments={templateSegments}
         />
       )
     case 3:
@@ -197,8 +174,6 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           onApplyPreset={onApplyPreset}
           activePreset={activePreset}
           titlePresets={titlePresets}
-          previewStatus={previewStatus || "idle"}
-          onRetryPreview={onRetryPreview || (() => {})}
         />
       )
     case 6:
@@ -210,13 +185,6 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           assetIds={materialMode === "auto" ? smartSelectedIds : selectedMaterials}
           selectedTemplate={selectedTemplate}
           titleSettings={titleSettings}
-          onPreviewTaskCreated={onPreviewTaskCreated}
-          onSourceEditPlanIdExtracted={onSourceEditPlanIdExtracted}
-          voiceMode={voiceMode}
-          selectedVoice={selectedVoice}
-          selectedClonedVoice={selectedClonedVoice}
-          bgm={bgm}
-          bgmConfig={bgmConfig}
         />
       )
     case 7:

apps/web/src/pages/generate/components/PreviewVideoPanel.tsx

@@ -1,42 +1,39 @@
 /**
- * 右侧预览视频面板 — 服务器渲染预览架构
+ * 右侧预览视频面板
+ * Step4+: 显示预览视频面板
+ * Step5: 前端实时预览 — 用原生 video 播放素材片段 + CSS 标题叠加
  *
- * Step4+: 显示预览面板
- * Step5: 播放服务器渲染的真实视频（POST /generation/preview）
+ * 架构改造：完全去除后端 FFmpeg 预览依赖
+ * - 使用 FrontendPreviewPlayer 直接播放素材片段
+ * - TitleOverlay CSS 层实时响应标题样式变化
  *
- * 架构：
- * - 进入 Step4/5 时自动创建服务器预览渲染任务
- * - 轮询完成后用 <video> 标签播放返回的 video_url
- * - 标题样式编辑时 CSS TitleOverlay 实时叠加预览
- * - 素材/配音/BGM 变更自动重新渲染
- * - 标题文字/样式变更标记 stale，保留旧视频 + 显示"重新预览"按钮
- *
- * 点"确认生成"时走 confirm 路径，成品就是预览视频本身，100% 一致。
+ * 布局：本组件提供 .xx-preview-video 容器（position: relative + overflow: hidden）
+ * FrontendPreviewPlayer 的内容通过 absolute 定位填充容器
+ * TitleOverlay 通过 absolute 定位 + z-index: 30 覆盖在最上层
  */
 import React, { useMemo, useRef, useState, useEffect } from "react"
-import { LoadingOutlined, ReloadOutlined, ExclamationCircleOutlined } from "@ant-design/icons"
-import { Button } from "antd"
+import { LoadingOutlined } from "@ant-design/icons"
+import type { AssetItem } from "@/api/assets"
+import type { EditingTemplate } from "@/api/editing-planner"
 import type { TitleSettings } from "../types"
 import { getFontFamily } from "../constants"
-import type { ServerPreviewStatus } from "../hooks/useServerPreview"
+import FrontendPreviewPlayer from "./FrontendPreviewPlayer"
 
 interface PreviewVideoPanelProps {
-  /** 服务器预览状态 */
-  previewStatus: ServerPreviewStatus
-  /** 服务器渲染视频 URL */
-  videoUrl: string | null
-  /** 渲染进度 0-100 */
-  progress: number
-  /** 错误信息 */
-  error: string | null
-  /** 重新预览回调 */
-  onRetry: () => void
+  /** 已加载的素材列表 */
+  assets: AssetItem[]
+  /** 当前模板 */
+  template: EditingTemplate | null
   /** 视频比例 */
   videoRatio: string
-  /** 标题设置 — CSS 实时预览层 */
+  /** 素材是否已加载就绪 */
+  assetsReady: boolean
+  /** 素材是否正在加载 */
+  assetsLoading: boolean
+  /** 标题设置 — 用于 CSS 实时预览层 */
   titleSettings?: TitleSettings
-  /** 素材数量 */
-  assetCount?: number
+  /** 配音音频 URL */
+  voiceAudioUrl?: string
 }
 
 /* ── ASS 坐标系参数（与后端 ass_subtitle_builder.py 一致） ── */
@@ -45,8 +42,13 @@ const ASS_TITLE_MARGIN_TOP = 60
 const ASS_TITLE_MARGIN_BOTTOM = 60
 const ASS_TITLE_MARGIN_SIDE = 40
 
+/**
+ * 根据 position 计算 CSS 垂直定位
+ * 与后端 position_to_ass_alignment() 对齐：top→8, center→5, bottom→2
+ */
 function getPositionStyle(position: string): React.CSSProperties {
   const sidePercent = (ASS_TITLE_MARGIN_SIDE / 1280) * 100
+
   switch (position) {
     case "bottom":
       return {
@@ -74,11 +76,16 @@ function getPositionStyle(position: string): React.CSSProperties {
   }
 }
 
+/**
+ * 构建 CSS 标题层的样式
+ * 所有渲染参数与后端 FFmpeg ASS 字幕一致
+ */
 function buildTitleStyle(settings: TitleSettings, containerHeight: number): React.CSSProperties {
+  // 用 px 计算 fontSize，不再依赖父元素 font-size 的百分比
   const fontSizePx =
     containerHeight > 0
       ? (Math.min(settings.size, 96) / ASS_VIDEO_HEIGHT) * containerHeight
-      : (Math.min(settings.size, 96) / ASS_VIDEO_HEIGHT) * 400
+      : (Math.min(settings.size, 96) / ASS_VIDEO_HEIGHT) * 400 // fallback
 
   const base: React.CSSProperties = {
     fontFamily: getFontFamily(settings.font),
@@ -93,16 +100,28 @@ function buildTitleStyle(settings: TitleSettings, containerHeight: number): Reac
     paddingLeft: `${(ASS_TITLE_MARGIN_SIDE / 1280) * 100}%`,
     paddingRight: `${(ASS_TITLE_MARGIN_SIDE / 1280) * 100}%`,
   }
-  if (settings.stroke) base.WebkitTextStroke = "1px #000000"
-  if (settings.shadow) base.textShadow = "2px 2px 4px rgba(0,0,0,0.8)"
+
+  if (settings.stroke) {
+    base.WebkitTextStroke = "1px #000000"
+  }
+
+  if (settings.shadow) {
+    base.textShadow = "2px 2px 4px rgba(0,0,0,0.8)"
+  }
+
   return base
 }
 
-/** CSS 标题实时预览覆盖层 */
+/**
+ * CSS 标题预览覆盖层
+ * 始终渲染：有标题显示标题，无标题显示占位文本"标题预览"
+ * z-index: 20（在视频 z-index:1 和控制条 z-index:10 之上）
+ */
 const TitleOverlay: React.FC<{ titleSettings: TitleSettings }> = ({ titleSettings }) => {
   const containerRef = useRef<HTMLDivElement>(null)
-  const [containerHeight, setContainerHeight] = useState(400)
+  const [containerHeight, setContainerHeight] = useState(400) // fallback
 
+  // ResizeObserver 获取容器实际高度
   useEffect(() => {
     const el = containerRef.current
     if (!el) return
@@ -113,6 +132,7 @@ const TitleOverlay: React.FC<{ titleSettings: TitleSettings }> = ({ titleSetting
       }
     })
     ro.observe(el)
+    // 初始化也读一次
     const rect = el.getBoundingClientRect()
     if (rect.height > 0) setContainerHeight(rect.height)
     return () => ro.disconnect()
@@ -124,7 +144,7 @@ const TitleOverlay: React.FC<{ titleSettings: TitleSettings }> = ({ titleSetting
   )
   const titleStyle = useMemo(
     () => buildTitleStyle(titleSettings, containerHeight),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- 已逐字段列出 titleSettings 依赖
     [
       containerHeight,
       titleSettings.font,
@@ -150,7 +170,13 @@ const TitleOverlay: React.FC<{ titleSettings: TitleSettings }> = ({ titleSetting
         overflow: "hidden",
       }}
     >
-      <div style={{ ...positionStyle, ...titleStyle, position: "absolute" }}>
+      <div
+        style={{
+          ...positionStyle,
+          ...titleStyle,
+          position: "absolute",
+        }}
+      >
         {displayTitle.split("/").map((part, i) => (
           <span key={i}>
             {i > 0 && <br />}
@@ -165,47 +191,30 @@ const TitleOverlay: React.FC<{ titleSettings: TitleSettings }> = ({ titleSetting
 /* ── 主组件 ── */
 
 export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
-  previewStatus,
-  videoUrl,
-  progress,
-  error,
-  onRetry,
+  assets,
+  template,
   videoRatio,
+  assetsReady,
+  assetsLoading,
   titleSettings,
-  assetCount,
+  voiceAudioUrl,
 }) => {
   const videoAspectStyle = { aspectRatio: (videoRatio || "9:16").replace(":", "/") }
-  const isLoading = previewStatus === "loading"
-  const isReady = previewStatus === "ready" || previewStatus === "stale"
-  const isFailed = previewStatus === "failed"
-  const isIdle = previewStatus === "idle"
-  const isStale = previewStatus === "stale"
 
   return (
     <div className="xx-generate-preview">
       <div className="xx-preview-header">
         <h3>预览视频</h3>
-        {isReady && !isStale && <span className="xx-preview-badge">服务器渲染</span>}
-        {isStale && (
-          <span
-            style={{
-              fontSize: 12,
-              color: "#faad14",
-              display: "flex",
-              alignItems: "center",
-              gap: 4,
-            }}
-          >
-            <ExclamationCircleOutlined /> 配置已变更
-          </span>
-        )}
-        {isLoading && <span className="xx-preview-badge">渲染中</span>}
+        {assetsReady && assets.length > 0 && <span className="xx-preview-badge">实时预览</span>}
       </div>
 
+      {/* ✅ 预览容器 — 唯一的 .xx-preview-video 容器
+          内部所有内容（视频、控制条、标题叠加层）通过 absolute 定位填充 */}
       <div className="xx-preview-video" style={{ ...videoAspectStyle, position: "relative" }}>
-        {/* 加载中 */}
-        {isLoading && (
+        {/* 加载中状态 */}
+        {assetsLoading && (
           <div
+            className="xx-preview-loading-center"
             style={{
               position: "absolute",
               inset: 0,
@@ -214,130 +223,34 @@ export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
               alignItems: "center",
               justifyContent: "center",
               zIndex: 5,
-              background: "rgba(0,0,0,0.6)",
             }}
           >
             <LoadingOutlined style={{ fontSize: 36, color: "#fff" }} spin />
-            <p style={{ marginTop: 12, color: "rgba(255,255,255,0.9)", fontSize: 14 }}>
-              正在渲染预览视频{progress > 0 ? `...${progress}%` : "..."}
-            </p>
-            <p style={{ marginTop: 4, color: "rgba(255,255,255,0.5)", fontSize: 12 }}>
-              首次渲染约需 30-60 秒
+            <p style={{ marginTop: 12, color: "rgba(255,255,255,0.8)", fontSize: 14 }}>
+              加载素材中...
             </p>
           </div>
         )}
 
-        {/* 空闲状态（尚未触发预览） */}
-        {isIdle && (
-          <div
-            style={{
-              position: "absolute",
-              inset: 0,
-              display: "flex",
-              flexDirection: "column",
-              alignItems: "center",
-              justifyContent: "center",
-              background: "rgba(0,0,0,0.3)",
-              zIndex: 5,
-            }}
-          >
-            <p style={{ color: "rgba(255,255,255,0.7)", fontSize: 14 }}>等待素材选择...</p>
-          </div>
-        )}
+        {/* 前端播放器（视频 + 控制条 + 播放按钮）*/}
+        <FrontendPreviewPlayer
+          assets={assets}
+          template={template}
+          videoRatio={videoRatio}
+          ready={assetsReady}
+          voiceAudioUrl={voiceAudioUrl}
+        />
 
-        {/* 服务器渲染的真实视频 */}
-        {isReady && videoUrl && (
-          <video
-            key={videoUrl}
-            src={videoUrl}
-            controls
-            autoPlay
-            loop
-            playsInline
-            style={{
-              width: "100%",
-              height: "100%",
-              objectFit: "contain",
-              position: "absolute",
-              inset: 0,
-              zIndex: 1,
-            }}
-          />
-        )}
-
-        {/* 标题样式实时预览层（仅在有视频时叠加） */}
-        {isReady && titleSettings && <TitleOverlay titleSettings={titleSettings} />}
-
-        {/* stale 遮罩：配置变更提示 */}
-        {isStale && (
-          <div
-            style={{
-              position: "absolute",
-              bottom: 0,
-              left: 0,
-              right: 0,
-              padding: "10px 16px",
-              background: "linear-gradient(transparent, rgba(0,0,0,0.85))",
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "space-between",
-              gap: 8,
-              zIndex: 30,
-            }}
-          >
-            <span style={{ color: "rgba(255,255,255,0.9)", fontSize: 12 }}>
-              配置已变更，预览内容可能不是最新
-            </span>
-            <Button size="small" type="primary" icon={<ReloadOutlined />} onClick={onRetry}>
-              重新预览
-            </Button>
-          </div>
-        )}
-
-        {/* 错误状态 */}
-        {isFailed && (
-          <div
-            style={{
-              position: "absolute",
-              inset: 0,
-              display: "flex",
-              flexDirection: "column",
-              alignItems: "center",
-              justifyContent: "center",
-              background: "rgba(0,0,0,0.7)",
-              zIndex: 10,
-              padding: 24,
-            }}
-          >
-            <ExclamationCircleOutlined style={{ fontSize: 40, color: "#ff4d4f" }} />
-            <p
-              style={{
-                marginTop: 12,
-                color: "rgba(255,255,255,0.9)",
-                fontSize: 14,
-                textAlign: "center",
-              }}
-            >
-              {error || "预览渲染失败"}
-            </p>
-            <Button
-              type="primary"
-              icon={<ReloadOutlined />}
-              onClick={onRetry}
-              style={{ marginTop: 12 }}
-            >
-              重新预览
-            </Button>
-          </div>
-        )}
+        {/* CSS 标题实时预览层 — z-index: 20，始终渲染在内容层之上 */}
+        {titleSettings && <TitleOverlay titleSettings={titleSettings} />}
       </div>
 
       {/* 素材信息 */}
-      {assetCount !== undefined && assetCount > 0 && (
+      {assetsReady && assets.length > 0 && (
         <div className="xx-preview-info">
           <div className="xx-preview-info-row">
             <span>素材数</span>
-            <span>{assetCount} 个</span>
+            <span>{assets.length} 个</span>
           </div>
           <div className="xx-preview-info-row">
             <span>比例</span>

apps/web/src/pages/generate/components/Step2MaterialSelect.tsx

@@ -2,7 +2,6 @@
  * Step 2 素材选择组件
  */
 import React from "react"
-import type { TemplateSegment } from "@/api/templates/types"
 import { useStep2Materials } from "../hooks/useStep2Materials"
 import MaterialModeTabs from "./material/MaterialModeTabs"
 import ManualMaterialList from "./material/ManualMaterialList"
@@ -18,8 +17,6 @@ interface Step2MaterialSelectProps {
   onSmartSelectedIdsChange: (ids: string[]) => void
   /** 当前选中的模板/草稿 ID，用于自动保存 */
   selectedTemplate?: string
-  /** 当前模板的 segments（用于构建 clips duration） */
-  templateSegments?: TemplateSegment[]
 }
 
 const Step2MaterialSelect: React.FC<Step2MaterialSelectProps> = (props) => {

apps/web/src/pages/generate/components/Step5GeneratePreview.tsx

@@ -1,21 +1,16 @@
 /**
- * Step 5 预览设置组件
- *
- * 服务器渲染预览架构：
- * - 进入此步骤时右侧面板自动播放服务器渲染的真实视频
- * - 标题样式可实时调整（CSS 层叠加预览）
- * - 调整标题后点击"重新预览"可刷新服务器渲染结果
- * - 素材/配音/BGM 变更会自动重新渲染
+ * Step 5 生成预览组件
+ * 架构改造：移除后端预览生成，改为前端实时预览
+ * 左侧仅保留标题样式面板，视频在右侧 PreviewVideoPanel 实时播放
  */
 import React from "react"
-import { PlayCircleOutlined, ReloadOutlined } from "@ant-design/icons"
-import { Button } from "antd"
+import { PlayCircleOutlined } from "@ant-design/icons"
 import { POSITION_OPTIONS, FONT_OPTIONS } from "../constants"
 import type { TitleSettings } from "../types"
-import type { ServerPreviewStatus } from "../hooks/useServerPreview"
 import TitleStylePanel from "./title/TitleStylePanel"
 
 interface Step5GeneratePreviewProps {
+  /* 标题样式 */
   titleSettings: TitleSettings
   onUpdatePosition: (position: string) => void
   onUpdateFont: (font: string) => void
@@ -27,10 +22,6 @@ interface Step5GeneratePreviewProps {
   onApplyPreset: (presetKey: string) => void
   activePreset: string | null
   titlePresets: { key: string; label: string; previewStyle: React.CSSProperties }[]
-  /** 服务器预览状态 */
-  previewStatus: ServerPreviewStatus
-  /** 重新预览回调 */
-  onRetryPreview: () => void
 }
 
 const Step5GeneratePreview: React.FC<Step5GeneratePreviewProps> = ({
@@ -45,18 +36,14 @@ const Step5GeneratePreview: React.FC<Step5GeneratePreviewProps> = ({
   onApplyPreset,
   activePreset,
   titlePresets,
-  previewStatus,
-  onRetryPreview,
 }) => {
-  const isLoading = previewStatus === "loading"
-  const isStale = previewStatus === "stale"
-  const isFailed = previewStatus === "failed"
-
   return (
     <div className="xx-form-section">
       <h3>🎬 预览设置</h3>
 
+      {/* 前端实时预览提示 */}
       <div
+        className="xx-preview-tip"
         style={{
           display: "flex",
           alignItems: "center",
@@ -70,71 +57,11 @@ const Step5GeneratePreview: React.FC<Step5GeneratePreviewProps> = ({
       >
         <PlayCircleOutlined style={{ fontSize: 18, color: "#3b82f6" }} />
         <span style={{ fontSize: 13, color: "var(--text-secondary, #666)" }}>
-          右侧为服务器渲染的真实预览视频，最终成片与预览完全一致
+          右侧面板直接播放素材片段，调整标题样式可实时预览效果
         </span>
       </div>
 
-      {/* 配置变更提示条 */}
-      {isStale && (
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "space-between",
-            gap: 8,
-            padding: "10px 16px",
-            background: "rgba(250, 173, 20, 0.1)",
-            borderRadius: 8,
-            marginBottom: 16,
-            border: "1px solid rgba(250, 173, 20, 0.2)",
-          }}
-        >
-          <span style={{ fontSize: 13, color: "#d48806" }}>
-            标题已修改，点击重新预览刷新服务器渲染
-          </span>
-          <Button size="small" type="primary" icon={<ReloadOutlined />} onClick={onRetryPreview}>
-            重新预览
-          </Button>
-        </div>
-      )}
-
-      {isFailed && (
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "space-between",
-            gap: 8,
-            padding: "10px 16px",
-            background: "rgba(255, 77, 79, 0.1)",
-            borderRadius: 8,
-            marginBottom: 16,
-            border: "1px solid rgba(255, 77, 79, 0.2)",
-          }}
-        >
-          <span style={{ fontSize: 13, color: "#ff4d4f" }}>预览渲染失败</span>
-          <Button size="small" danger icon={<ReloadOutlined />} onClick={onRetryPreview}>
-            重新预览
-          </Button>
-        </div>
-      )}
-
-      {isLoading && (
-        <div
-          style={{
-            padding: "10px 16px",
-            background: "rgba(82, 196, 26, 0.08)",
-            borderRadius: 8,
-            marginBottom: 16,
-            border: "1px solid rgba(82, 196, 26, 0.15)",
-          }}
-        >
-          <span style={{ fontSize: 13, color: "#389e0d" }}>
-            ⏳ 正在服务器渲染预览视频，请稍候...
-          </span>
-        </div>
-      )}
-
+      {/* 标题样式面板 */}
       <TitleStylePanel
         settings={titleSettings}
         onUpdatePosition={onUpdatePosition}

apps/web/src/pages/generate/components/Step6CoverSettings.tsx

@@ -16,20 +16,6 @@ interface Step6CoverSettingsProps {
   selectedTemplate?: string
   /** Step4 标题设置，用于预览视频烧录标题 & 封面叠加标题 */
   titleSettings?: import("../types").TitleSettings
-  /** 预览任务创建回调——将 task_id 暴露给父组件供 confirmGeneration 复用 */
-  onPreviewTaskCreated?: (taskId: string) => void
-  /** 从预览响应中提取到 source_edit_plan_id 时的回调 */
-  onSourceEditPlanIdExtracted?: (planId: string) => void
-  /** 配音模式 */
-  voiceMode?: "preset" | "custom" | "clone"
-  /** 选中的配音素材 ID */
-  selectedVoice?: string
-  /** 选中的克隆音色 ID */
-  selectedClonedVoice?: string
-  /** BGM 开关 */
-  bgm?: boolean
-  /** BGM 配置 */
-  bgmConfig?: { enabled: boolean; music_id?: string }
 }
 
 const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
@@ -57,13 +43,6 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
     assetIds: props.assetIds,
     selectedTemplate: props.selectedTemplate,
     titleSettings: props.titleSettings,
-    onPreviewTaskCreated: props.onPreviewTaskCreated,
-    onSourceEditPlanIdExtracted: props.onSourceEditPlanIdExtracted,
-    voiceMode: props.voiceMode,
-    selectedVoice: props.selectedVoice,
-    selectedClonedVoice: props.selectedClonedVoice,
-    bgm: props.bgm,
-    bgmConfig: props.bgmConfig,
   })
 
   const handleAutoGenerate = () => {

apps/web/src/pages/generate/hooks/generate-video/types.ts

@@ -21,15 +21,6 @@ export interface UseGenerateVideoProps {
   generateCount: number
   /** 当前草稿 ID（URL 参数 edit_plan_id，用于后端回写任务关联） */
   sourceEditPlanId?: string | null
-  /** 预览任务 ID（由 useStep6Cover 创建后写入，供 confirmGeneration 复用预览产物） */
-  previewTaskId?: string | null
-  /** BGM 配置（来自模板 bgm_config，受 bgm 开关控制） */
-  bgmConfig?: {
-    enabled: boolean
-    music_id?: string
-  }
-  /** 生成成功后的回调（用于清除持久化的 previewTaskId 等状态） */
-  onGenerationSuccess?: () => void
 }
 
 /** 生成阶段 */

apps/web/src/pages/generate/hooks/useGenerateFormState/index.ts

@@ -14,7 +14,6 @@ import { useTemplateSelection } from "./useTemplateSelection"
 import { useTitleCoverSync } from "./useTitleCoverSync"
 import { useVoiceState } from "./useVoiceState"
 import { usePlanConfigLoader } from "./usePlanConfigLoader"
-import { usePersistedState } from "../usePersistedState"
 
 const DEFAULT_TITLE_SETTINGS: TitleSettings = {
   aiAutoSelect: false,
@@ -83,27 +82,11 @@ export interface GenerateFormState {
   editPlanId: string | null
   planConfigStr: string | null
 
-  /**
-   * 传给 Worker 的 source_edit_plan_id。
-   * 仅使用 URL 中的 edit_plan_id（从剪辑模板编辑器跳转时携带）。
-   * URL 没有时传 null，后端正式生成 API 会通过 template_id+user_id 兜底查找正确的 plan。
-   * 注意：selectedTemplate 是模板 ID，不是 edit_plan_id，不能作为此值传递。
-   */
-  sourceEditPlanId: string | null
-
   /* 预览弹窗 */
   previewVideo: GeneratedVideo | null
   setPreviewVideo: (v: GeneratedVideo | null) => void
   previewModalOpen: boolean
   setPreviewModalOpen: (open: boolean) => void
-
-  /** 预览任务 ID（由 useStep6Cover 创建后写入，供 useGenerateVideo 复用） */
-  previewTaskId: string | null
-  setPreviewTaskId: (id: string | null) => void
-
-  /** 从预览响应中提取的 source_edit_plan_id（供 fallback 路径使用） */
-  storedSourceEditPlanId: string | null
-  setStoredSourceEditPlanId: (planId: string | null) => void
 }
 
 export const useGenerateFormState = (): GenerateFormState => {
@@ -117,11 +100,6 @@ export const useGenerateFormState = (): GenerateFormState => {
   /* ── 模板选择 ── */
   const { selectedTemplate, setSelectedTemplate, userTemplates } = useTemplateSelection()
 
-  /* ── source_edit_plan_id：仅取 URL 参数，无则 null 让后端兜底 ── */
-  // selectedTemplate 是模板 ID 而非 edit_plan_id，不能混淆；
-  // 后端正式生成 API 会在 source_edit_plan_id 为空时通过 template_id+user_id 自动关联。
-  const sourceEditPlanId = editPlanId || null
-
   /* ── 素材 ── */
   const [selectedMaterials, setSelectedMaterials] = useState<string[]>([])
   const [materialMode, setMaterialMode] = useState<"manual" | "auto">("manual")
@@ -169,30 +147,6 @@ export const useGenerateFormState = (): GenerateFormState => {
   const [previewVideo, setPreviewVideo] = useState<GeneratedVideo | null>(null)
   const [previewModalOpen, setPreviewModalOpen] = useState(false)
 
-  /* ── 预览任务 ID（useStep6Cover 创建预览时写入，useGenerateVideo 复用） ── */
-  // 持久化到 localStorage，key 按 editPlanId/templateId 区分，刷新页面后可恢复
-  const previewStorageKey = editPlanId
-    ? `preview_task_id_${editPlanId}`
-    : selectedTemplate
-      ? `preview_task_id_tpl_${selectedTemplate}`
-      : null
-  const [previewTaskId, setPreviewTaskId] = usePersistedState<string | null>(
-    previewStorageKey,
-    null,
-  )
-
-  /* ── 从预览响应中提取的 source_edit_plan_id（供 fallback 路径使用） ── */
-  // 持久化到 localStorage，刷新页面后 fallback 路径仍能正确传递 source_edit_plan_id
-  const planIdStorageKey = editPlanId
-    ? `source_edit_plan_id_${editPlanId}`
-    : selectedTemplate
-      ? `source_edit_plan_id_tpl_${selectedTemplate}`
-      : null
-  const [storedSourceEditPlanId, setStoredSourceEditPlanId] = usePersistedState<string | null>(
-    planIdStorageKey,
-    null,
-  )
-
   /* ── 从 URL / 编辑计划加载配置 ── */
   usePlanConfigLoader({
     editPlanId,
@@ -235,15 +189,10 @@ export const useGenerateFormState = (): GenerateFormState => {
     autoSubtitles,
     bgm,
     editPlanId,
-    sourceEditPlanId,
     planConfigStr,
     previewVideo,
     setPreviewVideo,
     previewModalOpen,
     setPreviewModalOpen,
-    previewTaskId,
-    setPreviewTaskId,
-    storedSourceEditPlanId,
-    setStoredSourceEditPlanId,
   }
 }

apps/web/src/pages/generate/hooks/useGenerateVideo.ts

@@ -6,7 +6,6 @@ import { useState, useCallback } from "react"
 import { message } from "antd"
 import type { GeneratedVideo } from "@/api/template-editor"
 import { createGenerationTask } from "@/api/tasks/tasks"
-import { confirmGeneration } from "@/api/generation/confirm"
 import type { UseGenerateVideoProps } from "./generate-video/types"
 import { getGenerationPhase } from "./generate-video/phase"
 import { useGenerationPolling } from "./generate-video/useGenerationPolling"
@@ -14,7 +13,7 @@ import { validateGenerateInputs } from "./generate-video/buildPayload"
 import { extractBackendError, translateError } from "./generate-video/errorUtils"
 
 export function useGenerateVideo(props: UseGenerateVideoProps) {
-  const { selectedTemplate, onGenerationSuccess } = props
+  const { selectedTemplate } = props
 
   /* ── 生成状态 ── */
   const [generating, setGenerating] = useState(false)
@@ -24,16 +23,11 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
   const [generatedVideos, setGeneratedVideos] = useState<GeneratedVideo[]>([])
 
   const handleProgress = useCallback((p: number) => setProgress(p), [])
-  const handleComplete = useCallback(
-    (videos: unknown[]) => {
-      setGenerating(false)
-      setGenerated(true)
-      setGeneratedVideos(videos as GeneratedVideo[])
-      // 生成成功后清除持久化的预览状态，避免下次进入复用旧任务
-      onGenerationSuccess?.()
-    },
-    [onGenerationSuccess],
-  )
+  const handleComplete = useCallback((videos: unknown[]) => {
+    setGenerating(false)
+    setGenerated(true)
+    setGeneratedVideos(videos as GeneratedVideo[])
+  }, [])
   const handleFailed = useCallback((errorMsg: string) => {
     setGenerating(false)
     setGenerateError(errorMsg)
@@ -98,79 +92,35 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
       // 封面 URL：优先 AI 生成缩略图，兜底用户上传
       const coverUrl = props.coverSettings?.thumbnail_url || props.coverSettings?.upload_url || ""
 
-      // ── Step7 确认生成：优先复用预览产物（秒出），fallback 到全量渲染 ──
-      let taskId: string | undefined
-
-      // 主路径：如果有预览任务 ID 且只生成 1 个视频，调用 confirmGeneration 复用预览产物
-      // generateCount > 1 时需要走 createGenerationTask 支持批量生成
-      const isSingleGenerate = !props.generateCount || props.generateCount === 1
-      if (props.previewTaskId && isSingleGenerate) {
-        try {
-          console.log(
-            "[handleGenerate] 尝试 confirmGeneration 复用预览产物, previewTaskId:",
-            props.previewTaskId,
-          )
-          const confirmResp = await confirmGeneration(props.previewTaskId, {
-            output_width: outputWidth,
-            output_height: outputHeight,
-            cover_url: coverUrl,
-            custom_title: props.titleSettings?.title || "",
-          })
-          taskId = confirmResp.items?.[0]?.id
-          if (taskId) {
-            console.log("[handleGenerate] confirmGeneration 成功, taskId:", taskId)
-          }
-        } catch (confirmErr) {
-          console.warn(
-            "[handleGenerate] confirmGeneration 失败, fallback 到 createGenerationTask:",
-            confirmErr,
-          )
-          // 继续走 fallback 路径
-        }
-      }
-
-      // 解析配音参数：voiceMode=clone 时用 selectedClonedVoice，否则用 selectedVoice（配音素材库 asset ID）
-      const voiceLibraryId =
-        props.voiceMode === "clone" ? props.selectedClonedVoice || "" : props.selectedVoice || ""
-
-      // Fallback 路径：没有预览任务或 confirmGeneration 失败，创建新的生成任务
-      if (!taskId) {
-        const taskResp = await createGenerationTask({
-          template_id: selectedTemplate,
-          asset_ids: assetIds,
-          output_width: outputWidth,
-          output_height: outputHeight,
-          cover_url: coverUrl,
-          custom_title: props.titleSettings?.title || "",
-          duration: props.duration || undefined,
-          video_ratio: props.videoRatio,
-          // 配音：优先用 voice_library_id（配音素材库 asset），兜底 voice_ids
-          ...(voiceLibraryId ? { voice_library_id: voiceLibraryId } : {}),
-          ...(props.selectedVoice && !voiceLibraryId ? { voice_ids: [props.selectedVoice] } : {}),
-          // BGM 配置：受 bgm 开关控制，enabled=false 时也显式传覆盖模板 BGM
-          bgm_config: {
-            enabled: props.bgm !== false,
-            ...(props.bgmConfig?.music_id ? { preset_id: props.bgmConfig.music_id } : {}),
-          },
-          ...(props.sourceEditPlanId ? { source_edit_plan_id: props.sourceEditPlanId } : {}),
-          ...(props.titleSettings?.title
-            ? {
-                title_config: {
-                  text: props.titleSettings.title,
-                  font: props.titleSettings.font,
-                  font_size: props.titleSettings.size,
-                  font_color: props.titleSettings.color,
-                  position: props.titleSettings.position,
-                  bold: props.titleSettings.bold,
-                  stroke: props.titleSettings.stroke,
-                  shadow: props.titleSettings.shadow,
-                },
-              }
-            : {}),
-        })
-        taskId = taskResp.items?.[0]?.id
-      }
+      // 直接创建正式生成任务
+      const taskResp = await createGenerationTask({
+        template_id: selectedTemplate,
+        asset_ids: assetIds,
+        output_width: outputWidth,
+        output_height: outputHeight,
+        cover_url: coverUrl,
+        custom_title: props.titleSettings?.title || "",
+        duration: props.duration || undefined,
+        video_ratio: props.videoRatio,
+        ...(props.sourceEditPlanId ? { source_edit_plan_id: props.sourceEditPlanId } : {}),
+        ...(props.titleSettings?.title
+          ? {
+              title_config: {
+                text: props.titleSettings.title,
+                font: props.titleSettings.font,
+                font_size: props.titleSettings.size,
+                font_color: props.titleSettings.color,
+                position: props.titleSettings.position,
+                bold: props.titleSettings.bold,
+                stroke: props.titleSettings.stroke,
+                shadow: props.titleSettings.shadow,
+              },
+            }
+          : {}),
+      })
 
+      // 从创建响应直接拿 task_id，改用新接口轮询
+      const taskId = taskResp.items?.[0]?.id
       if (!taskId) {
         throw new Error("创建任务成功但未返回任务 ID，请稍后在任务列表查看")
       }

apps/web/src/pages/generate/hooks/usePersistedState.ts

@@ -1,63 +0,0 @@
-import { useState, useEffect, useCallback, useRef } from "react"
-
-/**
- * 持久化到 localStorage 的 state hook
- *
- * 用于在页面刷新后恢复 previewTaskId / sourceEditPlanId 等关键状态。
- * 当 localStorage 不可用（SSR、隐私模式等）时自动降级为普通 useState。
- * 当 key 变化时（例如切换模板），自动从新 key 重新读取并更新 state。
- */
-export function usePersistedState<T>(
-  key: string | null | undefined,
-  defaultValue: T,
-): [T, (value: T | ((prev: T) => T)) => void] {
-  const storageKey = key ? `xiaoxia_${key}` : null
-  // defaultValue 用 ref 持有，避免作为 useEffect 依赖导致频繁重跑
-  const defaultValueRef = useRef(defaultValue)
-  defaultValueRef.current = defaultValue
-
-  const readFromStorage = useCallback((k: string | null): T => {
-    if (!k) return defaultValueRef.current
-    try {
-      const stored = localStorage.getItem(k)
-      if (stored !== null) {
-        return JSON.parse(stored) as T
-      }
-    } catch (e) {
-      // localStorage 不可用或 JSON 解析失败，使用默认值
-      console.warn("[usePersistedState] 读取 localStorage 失败:", e)
-    }
-    return defaultValueRef.current
-  }, [])
-
-  const [state, setState] = useState<T>(() => readFromStorage(storageKey))
-
-  // key 变化时（如切换模板/草稿），从新 key 重新读取，避免状态与存储不同步
-  useEffect(() => {
-    setState(readFromStorage(storageKey))
-  }, [storageKey, readFromStorage])
-
-  const setPersistedState = useCallback(
-    (value: T | ((prev: T) => T)) => {
-      setState((prev) => {
-        const nextValue = typeof value === "function" ? (value as (prev: T) => T)(prev) : value
-        if (storageKey) {
-          try {
-            if (nextValue === null || nextValue === undefined || nextValue === "") {
-              localStorage.removeItem(storageKey)
-            } else {
-              localStorage.setItem(storageKey, JSON.stringify(nextValue))
-            }
-          } catch (e) {
-            // localStorage 写入失败（存储空间满/隐私模式），静默忽略
-            console.warn("[usePersistedState] 写入 localStorage 失败:", e)
-          }
-        }
-        return nextValue
-      })
-    },
-    [storageKey],
-  )
-
-  return [state, setPersistedState]
-}

apps/web/src/pages/generate/hooks/useServerPreview.ts

@@ -1,294 +0,0 @@
-/**
- * 服务器渲染预览 Hook
- *
- * 核心职责：
- * 1. 调用 POST /generation/preview 创建服务器预览渲染任务
- * 2. 轮询 GET /generation/preview/{task_id} 直到完成
- * 3. 返回服务器渲染的真实视频 URL（供 <video> 标签播放）
- * 4. 检测配置变更，标记预览失效（stale）或自动重新渲染
- * 5. 网络错误自动重试 2 次
- *
- * 状态机：
- *   idle → loading → ready → stale (config changed)
- *                   ↘ failed → idle (retry)
- */
-import { useState, useCallback, useRef, useEffect } from "react"
-import { createPreview, getPreviewStatus } from "@/api/generation/preview"
-import type { CreatePreviewRequest } from "@/api/generation/types"
-
-export type ServerPreviewStatus = "idle" | "loading" | "ready" | "stale" | "failed"
-
-interface UseServerPreviewOptions {
-  /** 是否启用预览（Step4+ 且有素材和模板时） */
-  enabled: boolean
-  /** 构建预览请求参数（每次 render 调用，获取最新配置） */
-  buildRequest: () => CreatePreviewRequest
-  /** 预览任务创建成功回调 */
-  onPreviewTaskCreated?: (taskId: string, sourceEditPlanId?: string) => void
-}
-
-interface UseServerPreviewReturn {
-  status: ServerPreviewStatus
-  videoUrl: string | null
-  error: string | null
-  /** 进度 0-100 */
-  progress: number
-  /** 手动触发预览创建（"重新预览"按钮或标题变更后手动刷新） */
-  triggerPreview: () => void
-  /** 当前预览任务 ID */
-  taskId: string | null
-}
-
-const POLL_INTERVAL = 2000
-const POLL_TIMEOUT = 120_000
-const MAX_NETWORK_RETRIES = 2
-
-/**
- * 对配置参数做指纹，用于检测配置是否变化
- */
-function buildFingerprint(req: CreatePreviewRequest): string {
-  return JSON.stringify({
-    t: req.template_id,
-    a: [...req.asset_ids].sort(),
-    d: req.duration,
-    r: req.video_ratio,
-    v: req.voice_library_id,
-    b: req.bgm_config,
-    title: req.title_config,
-  })
-}
-
-export function useServerPreview({
-  enabled,
-  buildRequest,
-  onPreviewTaskCreated,
-}: UseServerPreviewOptions): UseServerPreviewReturn {
-  const [status, setStatus] = useState<ServerPreviewStatus>("idle")
-  const [videoUrl, setVideoUrl] = useState<string | null>(null)
-  const [error, setError] = useState<string | null>(null)
-  const [progress, setProgress] = useState(0)
-  const [taskId, setTaskId] = useState<string | null>(null)
-
-  const pollTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const timeoutTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const requestSeqRef = useRef(0)
-  const renderedFingerprintRef = useRef<string>("")
-  const mountedRef = useRef(true)
-  const networkRetriesRef = useRef(0)
-
-  // 始终持有最新的 buildRequest 和回调
-  const buildRequestRef = useRef(buildRequest)
-  buildRequestRef.current = buildRequest
-  const onCreatedRef = useRef(onPreviewTaskCreated)
-  onCreatedRef.current = onPreviewTaskCreated
-
-  /* ── 清理 ── */
-  const clearTimers = useCallback(() => {
-    if (pollTimerRef.current) {
-      clearTimeout(pollTimerRef.current)
-      pollTimerRef.current = null
-    }
-    if (timeoutTimerRef.current) {
-      clearTimeout(timeoutTimerRef.current)
-      timeoutTimerRef.current = null
-    }
-  }, [])
-
-  useEffect(() => {
-    mountedRef.current = true
-    return () => {
-      mountedRef.current = false
-      clearTimers()
-    }
-  }, [clearTimers])
-
-  /* ── 创建预览 + 轮询 ── */
-  const createAndPoll = useCallback(
-    async (request: CreatePreviewRequest, seq: number) => {
-      setStatus("loading")
-      setProgress(0)
-      setError(null)
-      networkRetriesRef.current = 0
-
-      try {
-        const resp = await createPreview(request)
-        if (seq !== requestSeqRef.current || !mountedRef.current) return
-
-        setTaskId(resp.task_id)
-        onCreatedRef.current?.(resp.task_id, resp.source_edit_plan_id)
-
-        let completed = false
-
-        // 超时保护
-        timeoutTimerRef.current = setTimeout(() => {
-          if (completed || seq !== requestSeqRef.current || !mountedRef.current) return
-          completed = true
-          clearTimers()
-          setStatus("failed")
-          setError("预览渲染超时（120秒），请重试")
-        }, POLL_TIMEOUT)
-
-        const poll = async () => {
-          if (completed || seq !== requestSeqRef.current || !mountedRef.current) return
-
-          try {
-            const st = await getPreviewStatus(resp.task_id)
-            if (completed || seq !== requestSeqRef.current || !mountedRef.current) return
-
-            if (st.status === "completed" && st.video_url) {
-              completed = true
-              clearTimers()
-              renderedFingerprintRef.current = buildFingerprint(request)
-              setVideoUrl(st.video_url)
-              setProgress(100)
-              setStatus("ready")
-              setError(null)
-              return
-            }
-
-            if (st.status === "failed" || st.status === "cancelled") {
-              completed = true
-              clearTimers()
-              setStatus("failed")
-              setError(
-                st.status === "cancelled"
-                  ? "预览任务已取消"
-                  : st.error_message || "预览渲染失败，请重试",
-              )
-              return
-            }
-
-            // pending / generating
-            if (typeof st.progress === "number") setProgress(st.progress)
-            pollTimerRef.current = setTimeout(poll, POLL_INTERVAL)
-          } catch (pollErr) {
-            if (completed || seq !== requestSeqRef.current || !mountedRef.current) return
-            if (networkRetriesRef.current < MAX_NETWORK_RETRIES) {
-              networkRetriesRef.current += 1
-              console.warn(
-                `[ServerPreview] 轮询网络错误，第 ${networkRetriesRef.current} 次重试`,
-                pollErr,
-              )
-              pollTimerRef.current = setTimeout(poll, POLL_INTERVAL * 2)
-            } else {
-              completed = true
-              clearTimers()
-              setStatus("failed")
-              setError("网络错误，无法获取预览状态，请重试")
-            }
-          }
-        }
-
-        poll()
-      } catch (createErr) {
-        if (seq !== requestSeqRef.current || !mountedRef.current) return
-        console.error("[ServerPreview] 创建预览任务失败:", createErr)
-
-        const isNetworkError =
-          !!(createErr as { request?: unknown })?.request ||
-          (createErr as { code?: string })?.code === "ERR_NETWORK"
-
-        if (isNetworkError && networkRetriesRef.current < MAX_NETWORK_RETRIES) {
-          networkRetriesRef.current += 1
-          console.warn(`[ServerPreview] 创建任务网络错误，第 ${networkRetriesRef.current} 次重试`)
-          setTimeout(() => {
-            if (seq === requestSeqRef.current && mountedRef.current) {
-              createAndPoll(request, seq)
-            }
-          }, POLL_INTERVAL * 2)
-          return
-        }
-
-        const errData = (
-          createErr as { response?: { data?: { detail?: string; message?: string } } }
-        )?.response?.data
-        setStatus("failed")
-        setError(errData?.detail || errData?.message || "预览任务创建失败，请重试")
-      }
-    },
-    [clearTimers],
-  )
-
-  /* ── 手动触发预览 ── */
-  const triggerPreview = useCallback(() => {
-    if (!enabled) return
-    const request = buildRequestRef.current()
-    if (!request.template_id || request.asset_ids.length === 0) return
-
-    clearTimers()
-    const seq = ++requestSeqRef.current
-    setVideoUrl(null)
-    setTaskId(null)
-    createAndPoll(request, seq)
-  }, [enabled, clearTimers, createAndPoll])
-
-  /* ── 自动触发 + 配置变更检测 ── */
-  // 每次 render 都检查最新配置 fingerprint，与已渲染的 fingerprint 比较
-  const request = enabled ? buildRequest() : null
-  const currentFingerprint = request
-    ? request.template_id && request.asset_ids.length > 0
-      ? buildFingerprint(request)
-      : ""
-    : ""
-
-  // 首次进入自动触发
-  const didInitRef = useRef(false)
-  useEffect(() => {
-    if (!enabled || !currentFingerprint) {
-      didInitRef.current = false
-      // 禁用时取消进行中的轮询，避免回到前序步骤后仍在后台轮询
-      requestSeqRef.current += 1
-      clearTimers()
-      return
-    }
-    if (!didInitRef.current) {
-      didInitRef.current = true
-      renderedFingerprintRef.current = currentFingerprint
-      triggerPreview()
-    }
-  }, [enabled, currentFingerprint, triggerPreview, clearTimers])
-
-  // 配置变更检测：素材/配音/BGM 等变化 → 自动重渲染；标题样式变化 → 标记 stale
-  const prevFingerprintRef = useRef(currentFingerprint)
-  useEffect(() => {
-    if (!enabled || !currentFingerprint) return
-    const prev = prevFingerprintRef.current
-    prevFingerprintRef.current = currentFingerprint
-
-    if (!prev || prev === currentFingerprint) return
-    if (currentFingerprint === renderedFingerprintRef.current) return
-
-    // 配置已变更
-    // 判断是标题样式变更还是素材/配音/BGM 变更
-    const prevParsed = JSON.parse(prev) as Record<string, unknown>
-    const currParsed = JSON.parse(currentFingerprint) as Record<string, unknown>
-    const nonTitleChanged =
-      prevParsed.t !== currParsed.t ||
-      prevParsed.a !== currParsed.a ||
-      prevParsed.d !== currParsed.d ||
-      prevParsed.r !== currParsed.r ||
-      prevParsed.v !== currParsed.v ||
-      JSON.stringify(prevParsed.b) !== JSON.stringify(currParsed.b)
-
-    if (nonTitleChanged) {
-      // 素材/配音/BGM/模板等变化 → 自动重新渲染
-      renderedFingerprintRef.current = currentFingerprint
-      triggerPreview()
-    } else {
-      // 仅标题文字/样式变化 → 标记 stale，不自动重渲染（避免频繁请求）
-      // 实时预览由 CSS TitleOverlay 提供
-      setStatus((s) => (s === "ready" ? "stale" : s))
-    }
-  }, [enabled, currentFingerprint, triggerPreview])
-
-  return {
-    status,
-    videoUrl,
-    error,
-    progress,
-    triggerPreview,
-    taskId,
-  }
-}
-
-export default useServerPreview

apps/web/src/pages/generate/hooks/useStep2Materials.ts

@@ -3,11 +3,7 @@
  * 组合素材库加载 + 智能匹配两个子 Hook
  */
 import { useCallback, useEffect, useRef } from "react"
-import type { AssetItem } from "@/api/assets"
-import type { TemplateSegment } from "@/api/templates/types"
-import { updateEditPlanClips } from "@/api/template-editor"
 import { formatDuration } from "../utils/formatDuration"
-import { buildClipsFromAssets } from "../utils/buildClipsFromAssets"
 import { useMaterialLibrary } from "./step2-materials/useMaterialLibrary"
 import { useSmartMatch } from "./step2-materials/useSmartMatch"
 import { useDraftAutoSave } from "./useDraftAutoSave"
@@ -21,8 +17,6 @@ interface UseStep2MaterialsProps {
   onSmartSelectedIdsChange: (ids: string[]) => void
   /** 当前选中的模板/草稿 ID，用于自动保存 */
   selectedTemplate?: string
-  /** 当前模板的 segments（用于构建 clips duration） */
-  templateSegments?: TemplateSegment[]
 }
 
 export function useStep2Materials({
@@ -33,7 +27,6 @@ export function useStep2Materials({
   smartSelectedIds,
   onSmartSelectedIdsChange,
   selectedTemplate,
-  templateSegments,
 }: UseStep2MaterialsProps) {
   const { libraries, selectedLibraryId, setSelectedLibraryId, materials, materialsLoading } =
     useMaterialLibrary()
@@ -64,7 +57,7 @@ export function useStep2Materials({
     handleSmartMatch()
   }, [selectedLibraryId, materialMode, materialsLoading, materials.items, handleSmartMatch])
 
-  /* ── Step2 选择素材后自动保存草稿 asset_ids（防抖 500ms，失败静默） ── */
+  /* ── Step2 选择素材后自动保存草稿（防抖 500ms，失败静默） ── */
   const { scheduleSave } = useDraftAutoSave(selectedTemplate)
   useEffect(() => {
     if (!selectedTemplate) return
@@ -72,61 +65,6 @@ export function useStep2Materials({
     scheduleSave({ asset_ids: ids }, 500)
   }, [selectedTemplate, materialMode, selectedMaterials, smartSelectedIds, scheduleSave])
 
-  /* ── Step2 选择素材后同步写入 edit_plan_clips（防抖 800ms，失败静默） ── */
-  const clipsTimerRef = useRef<ReturnType<typeof setTimeout>>()
-  const clipsAbortRef = useRef<AbortController | null>(null)
-  const templateSegmentsRef = useRef(templateSegments)
-  templateSegmentsRef.current = templateSegments
-  const selectedTemplateRef = useRef(selectedTemplate)
-  selectedTemplateRef.current = selectedTemplate
-  const materialsRef = useRef(materials)
-  materialsRef.current = materials
-  const smartMatchedRef = useRef<AssetItem[]>(smartMatch.smartMatchedResults)
-  smartMatchedRef.current = smartMatch.smartMatchedResults
-
-  useEffect(() => {
-    const tid = selectedTemplateRef.current
-    if (!tid) return
-    const ids = materialMode === "auto" ? smartSelectedIds : selectedMaterials
-    if (!ids.length) return
-
-    if (clipsTimerRef.current) clearTimeout(clipsTimerRef.current)
-    clipsTimerRef.current = setTimeout(async () => {
-      // 取消上一次未完成的请求
-      if (clipsAbortRef.current) clipsAbortRef.current.abort()
-      const controller = new AbortController()
-      clipsAbortRef.current = controller
-
-      const clips = buildClipsFromAssets({
-        selectedIds: ids,
-        materials: materialsRef.current.items,
-        smartMatchedAssets: smartMatchedRef.current,
-        templateSegments: templateSegmentsRef.current || [],
-      })
-
-      try {
-        await updateEditPlanClips(tid, clips, controller.signal)
-      } catch (err) {
-        const name = (err as { name?: string })?.name
-        if (name !== "CanceledError" && name !== "AbortError") {
-          console.warn("[useStep2Materials] 写入 clips 失败:", err)
-        }
-      }
-    }, 800)
-
-    return () => {
-      if (clipsTimerRef.current) clearTimeout(clipsTimerRef.current)
-    }
-  }, [selectedTemplate, materialMode, selectedMaterials, smartSelectedIds, templateSegments])
-
-  // 组件卸载时取消未完成请求
-  useEffect(() => {
-    return () => {
-      if (clipsTimerRef.current) clearTimeout(clipsTimerRef.current)
-      if (clipsAbortRef.current) clipsAbortRef.current.abort()
-    }
-  }, [])
-
   /* ── 手动选择素材 ── */
   const handleToggleMaterial = useCallback(
     (materialId: string) => {

apps/web/src/pages/generate/hooks/useStep6Cover.ts

@@ -2,7 +2,7 @@
  * Step 6 封面设置 Hook
  * 封装封面设置的交互逻辑，对接后端封面模板 CRUD API
  */
-import { useCallback, useEffect, useRef, useState } from "react"
+import { useCallback, useEffect, useState } from "react"
 import { message } from "antd"
 import type { CoverConfig, CoverTemplate } from "../types/cover"
 import { generateCover } from "@/api/generation"
@@ -26,20 +26,6 @@ interface UseStep6CoverProps {
   selectedTemplate?: string
   /** Step4 标题设置，用于预览视频烧录标题 & 封面叠加标题 */
   titleSettings?: TitleSettings
-  /** 预览任务创建回调——将 task_id 暴露给父组件供 confirmGeneration 复用 */
-  onPreviewTaskCreated?: (taskId: string) => void
-  /** 从预览响应中提取到 source_edit_plan_id 时的回调 */
-  onSourceEditPlanIdExtracted?: (planId: string) => void
-  /** 配音模式 */
-  voiceMode?: "preset" | "custom" | "clone"
-  /** 选中的配音素材 ID（配音素材库 asset ID） */
-  selectedVoice?: string
-  /** 选中的克隆音色 ID */
-  selectedClonedVoice?: string
-  /** BGM 开关 */
-  bgm?: boolean
-  /** BGM 配置（来自模板） */
-  bgmConfig?: { enabled: boolean; music_id?: string }
 }
 
 export function useStep6Cover({
@@ -49,17 +35,8 @@ export function useStep6Cover({
   assetIds = [],
   selectedTemplate = "",
   titleSettings,
-  onPreviewTaskCreated,
-  onSourceEditPlanIdExtracted,
-  voiceMode,
-  selectedVoice,
-  selectedClonedVoice,
-  bgm,
-  bgmConfig,
 }: UseStep6CoverProps) {
   const [generating, setGenerating] = useState(false)
-  // 防竞态：记录当前预览生成的参数指纹，任务完成时校验一致性
-  const previewParamsRef = useRef<string>("")
 
   // ── 封面设置弹窗状态 ──
   const [showCoverSettings, setShowCoverSettings] = useState(false)
@@ -174,22 +151,10 @@ export function useStep6Cover({
         console.log("[Step6] 检测到预览缺失，尝试自动创建预览渲染任务...")
         message.info("正在准备预览视频，请稍候...")
         try {
-          // 记录当前参数指纹，用于任务完成时校验一致性（防竞态）
-          previewParamsRef.current = JSON.stringify({ selectedTemplate, assetIds, titleSettings })
-          // 解析配音参数：voiceMode=clone 时用 selectedClonedVoice，否则用 selectedVoice
-          const previewVoiceLibraryId =
-            voiceMode === "clone" ? selectedClonedVoice || "" : selectedVoice || ""
           const previewResp = await createPreview({
             template_id: selectedTemplate,
             asset_ids: assetIds,
             duration: duration || 30,
-            // 配音：voice_library_id 是配音素材库 asset ID（用户上传的音频或 AI 配音）
-            ...(previewVoiceLibraryId ? { voice_library_id: previewVoiceLibraryId } : {}),
-            // BGM 配置：受 bgm 开关控制
-            bgm_config: {
-              enabled: bgm !== false,
-              ...(bgmConfig?.music_id ? { preset_id: bgmConfig.music_id } : {}),
-            },
             ...(titleSettings?.title
               ? {
                   title_config: {
@@ -205,15 +170,6 @@ export function useStep6Cover({
                 }
               : {}),
           })
-          // 将预览任务 ID 暴露给父组件，供 Step7 确认生成时复用（confirmGeneration）
-          const currentFingerprint = JSON.stringify({ selectedTemplate, assetIds, titleSettings })
-          if (previewResp.task_id && previewParamsRef.current === currentFingerprint) {
-            onPreviewTaskCreated?.(previewResp.task_id)
-            // 提取后端自动关联的 source_edit_plan_id，供 fallback 路径使用
-            if (previewResp.source_edit_plan_id) {
-              onSourceEditPlanIdExtracted?.(previewResp.source_edit_plan_id)
-            }
-          }
           // 轮询等待预览渲染完成：递归 setTimeout 避免请求重叠 + 120s 超时兜底
           await new Promise<void>((resolve, reject) => {
             let finished = false
@@ -326,13 +282,6 @@ export function useStep6Cover({
     generating,
     duration,
     titleSettings,
-    onPreviewTaskCreated,
-    onSourceEditPlanIdExtracted,
-    voiceMode,
-    selectedVoice,
-    selectedClonedVoice,
-    bgm,
-    bgmConfig,
   ])
 
   // ── 模板操作方法 ──

apps/web/src/pages/generate/hooks/useStepNavigation.ts

@@ -3,7 +3,7 @@
  * 管理步骤切换与各步骤的前置校验
  * 步骤顺序：模板(1) → 素材(2) → 配音(3) → 标题(4) → 预览(5) → 封面(6) → 确认(7)
  *
- * 服务器预览架构：Step5 需要服务器渲染预览完成才能前进
+ * V24: previewReady 改为前端素材加载状态
  */
 import { message } from "antd"
 import type { TitleSettings } from "../types"
@@ -16,7 +16,7 @@ export interface UseStepNavigationOptions {
   selectedMaterials: string[]
   smartSelectedIds: string[]
   titleSettings: TitleSettings
-  /** 服务器预览是否已完成（ready 状态） */
+  /** 预览是否就绪（前端素材已加载） */
   previewReady: boolean
 }
 
@@ -50,12 +50,13 @@ export const useStepNavigation = (options: UseStepNavigationOptions): UseStepNav
       message.warning("请先进行智能匹配并选择素材")
       return
     }
+    // Step3 配音：配音为可选项，不强制校验，用户可跳过
     if (currentStep === 4 && !titleSettings.title.trim()) {
       message.warning("请选择或输入标题")
       return
     }
     if (currentStep === 5 && !previewReady) {
-      message.warning("请等待预览视频渲染完成后再继续")
+      message.warning("请先选择素材以预览效果")
       return
     }
     if (currentStep < 7) {

apps/web/src/pages/generate/utils/buildClipsFromAssets.ts

@@ -1,69 +0,0 @@
-/**
- * 将选中素材 + 模板 segments 构建为 edit_plan_clips 写入数据。
- *
- * 逻辑必须与 FrontendPreviewPlayer.tsx 中 buildPlaybackSegments 完全一致：
- *   assetDuration = asset.duration || asset.metadata?.duration || 30
- *   tplSeg = templateSegments[i] || lastSegment
- *   segDuration = clamp(assetDuration, tplSeg.duration_min, tplSeg.duration_max)
- *   start_time = 0
- *   // 关键：预览播放器中 endTime = min(startTime + segDuration, assetDuration)
- *   // 因此 clips.duration 也必须用 min(segDuration, assetDuration) 截断，
- *   // 避免素材实际时长比 clamp 后的 segDuration 短时，Worker 尝试读取不存在的片段
- *   duration = min(segDuration, assetDuration)
- *
- * 预览播放器（Canvas 实时预览）直接在内存中构建 segments 播放，不读 edit_plan_clips；
- * 本函数产出的 clips 写入 DB 后由 Worker 渲染。两边用完全相同的时长计算，
- * 保证用户在编辑过程中看到的预览与最终生成视频一致。
- */
-import type { AssetItem } from "@/api/assets"
-import type { TemplateSegment } from "@/api/templates/types"
-import type { EditPlanClipInput } from "@/api/template-editor"
-
-interface BuildClipsOptions {
-  /** 选中的素材 ID 列表（按选择顺序） */
-  selectedIds: string[]
-  /** 已加载的素材列表（用于查 duration） */
-  materials: AssetItem[]
-  /** 智能匹配返回的素材（auto 模式下可能不在 materials 列表中） */
-  smartMatchedAssets?: AssetItem[]
-  /** 模板 segments */
-  templateSegments?: TemplateSegment[]
-}
-
-export function buildClipsFromAssets({
-  selectedIds,
-  materials,
-  smartMatchedAssets = [],
-  templateSegments = [],
-}: BuildClipsOptions): EditPlanClipInput[] {
-  if (!selectedIds.length) return []
-
-  // 合并两个素材来源，建立 id → asset 索引
-  const assetMap = new Map<string, AssetItem>()
-  for (const a of materials) assetMap.set(a.id, a)
-  for (const a of smartMatchedAssets) assetMap.set(a.id, a)
-
-  const lastSeg = templateSegments[templateSegments.length - 1]
-
-  return selectedIds.map((assetId, i) => {
-    const asset = assetMap.get(assetId)
-    const assetDuration = asset?.duration || asset?.metadata?.duration || 30
-
-    const tplSeg = templateSegments[i] || lastSeg
-    const segDuration = tplSeg
-      ? Math.min(tplSeg.duration_max, Math.max(tplSeg.duration_min, assetDuration))
-      : Math.min(assetDuration, 10)
-
-    // 与 FrontendPreviewPlayer.buildPlaybackSegments 中
-    //   endTime = Math.min(startTime + segDuration, assetDuration)
-    // 保持一致：duration 不能超过素材实际时长
-    const duration = Math.min(segDuration, assetDuration)
-
-    return {
-      asset_id: assetId,
-      start_time: 0,
-      duration,
-      order: i,
-    }
-  })
-}

apps/web/src/pages/templates/hooks/useTemplateLibrary.ts

@@ -87,7 +87,7 @@ export const useTemplateLibrary = () => {
     [copyMutation],
   )
 
-  /* 操作：使用模板 → 跳转剪辑模板 */
+  /* 操作：使用模板 → 跳转剪辑编辑器 */
   const handleUse = useCallback(
     (template: TemplateItem) => {
       navigate(`/app/editing-planner?templateId=${template.id}`)

apps/web/src/test/api/edit-plans.test.ts

@@ -2,7 +2,10 @@ import { describe, expect, it, vi, beforeEach } from "vitest"
 import {
   getEditPlan,
   updateEditPlan,
+  generateEditPlan,
+  getGenerationStatus,
   aiRecommendClips,
+  getEditPlanGenerations,
   getGenerationTaskResults,
   getEditPlanClips,
   getEditPlanClip,
@@ -77,6 +80,38 @@ describe("editPlans API", () => {
     })
   })
 
+  describe("generateEditPlan", () => {
+    it("should resolve successfully", async () => {
+      await expect(generateEditPlan("test-planId")).resolves.not.toThrow()
+    })
+
+    it("should reject on API error", async () => {
+      mockGet.mockRejectedValue(new Error("Network error"))
+      mockPost.mockRejectedValue(new Error("Network error"))
+      mockPut.mockRejectedValue(new Error("Network error"))
+      mockDelete.mockRejectedValue(new Error("Network error"))
+      mockPatch.mockRejectedValue(new Error("Network error"))
+
+      await expect(generateEditPlan("test-planId")).rejects.toThrow()
+    })
+  })
+
+  describe("getGenerationStatus", () => {
+    it("should resolve successfully", async () => {
+      await expect(getGenerationStatus("test-planId")).resolves.not.toThrow()
+    })
+
+    it("should reject on API error", async () => {
+      mockGet.mockRejectedValue(new Error("Network error"))
+      mockPost.mockRejectedValue(new Error("Network error"))
+      mockPut.mockRejectedValue(new Error("Network error"))
+      mockDelete.mockRejectedValue(new Error("Network error"))
+      mockPatch.mockRejectedValue(new Error("Network error"))
+
+      await expect(getGenerationStatus("test-planId")).rejects.toThrow()
+    })
+  })
+
   describe("aiRecommendClips", () => {
     it("should resolve successfully", async () => {
       await expect(aiRecommendClips("test-planId")).resolves.not.toThrow()
@@ -93,6 +128,22 @@ describe("editPlans API", () => {
     })
   })
 
+  describe("getEditPlanGenerations", () => {
+    it("should resolve successfully", async () => {
+      await expect(getEditPlanGenerations("test-planId")).resolves.not.toThrow()
+    })
+
+    it("should reject on API error", async () => {
+      mockGet.mockRejectedValue(new Error("Network error"))
+      mockPost.mockRejectedValue(new Error("Network error"))
+      mockPut.mockRejectedValue(new Error("Network error"))
+      mockDelete.mockRejectedValue(new Error("Network error"))
+      mockPatch.mockRejectedValue(new Error("Network error"))
+
+      await expect(getEditPlanGenerations("test-planId")).rejects.toThrow()
+    })
+  })
+
   describe("getGenerationTaskResults", () => {
     it("should resolve successfully", async () => {
       await expect(getGenerationTaskResults("test-taskId")).resolves.not.toThrow()

apps/web/src/test/pages/EditingPlanner.test.tsx

@@ -148,8 +148,11 @@ vi.mock("@/api/editing-planner", () => ({
 
 vi.mock("@/api/template-editor", () => ({
   getMediaAssets: vi.fn().mockResolvedValue({ items: [] }),
+  getEditPlanGenerations: vi.fn().mockResolvedValue({ items: [] }),
   getEditPlan: vi.fn().mockResolvedValue({}),
   updateEditPlan: vi.fn().mockResolvedValue({}),
+  generateEditPlan: vi.fn().mockResolvedValue({ task_id: "test-task" }),
+  getGenerationStatus: vi.fn().mockResolvedValue({ status: "completed" }),
   getGenerationTaskResults: vi.fn().mockResolvedValue({ items: [] }),
   getEditPlanClips: vi.fn().mockResolvedValue({ items: [] }),
   createEditPlanClip: vi.fn().mockResolvedValue({}),
@@ -220,6 +223,12 @@ vi.mock("@/pages/editing-planner/components/StickerPanel", () => ({
 vi.mock("@/pages/editing-planner/components/SaveModal", () => ({
   default: () => React.createElement("div", { "data-testid": "SaveModal" }),
 }))
+vi.mock("@/pages/editing-planner/components/GenerationHistoryModal", () => ({
+  default: () => React.createElement("div", { "data-testid": "GenerationHistoryModal" }),
+}))
+vi.mock("@/pages/editing-planner/components/GenerationProgressModal", () => ({
+  default: () => React.createElement("div", { "data-testid": "GenerationProgressModal" }),
+}))
 
 // === useUndoRedo hook mock ===
 vi.mock("@/pages/editing-planner/hooks/useUndoRedo", () => ({

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

@@ -214,6 +214,12 @@ vi.mock("@/api/titles", () => ({
 }))
 
 vi.mock("@/api/template-editor", () => ({
+  generateEditPlan: vi.fn().mockResolvedValue({
+    plan_id: "test-plan",
+    generation_task_id: "test-task",
+    plan_status: "processing",
+    clip_count: 5,
+  }),
   updateEditPlan: vi.fn().mockResolvedValue({ plan_id: "test-plan", template_id: "test-template" }),
   getEditPlan: vi.fn().mockResolvedValue({
     plan_id: "test-plan",
@@ -222,6 +228,9 @@ vi.mock("@/api/template-editor", () => ({
     config: {},
     status: "draft",
   }),
+  getGenerationStatus: vi
+    .fn()
+    .mockResolvedValue({ plan_status: "completed", generation_task_id: "test-task", clips: [] }),
   getGenerationTaskResults: vi.fn().mockResolvedValue({ items: [] }),
 }))
 

apps/web/src/test/pages/editing-planner/components/GenerationHistoryModal.test.tsx

@@ -0,0 +1,39 @@
+import { describe, expect, it, vi } from "vitest"
+import { render } from "@testing-library/react"
+import GenerationHistoryModal from "@/pages/editing-planner/components/GenerationHistoryModal"
+
+const defaultProps = {
+  open: true,
+  loading: false,
+  history: [],
+  onClose: vi.fn(),
+  onCancel: vi.fn(),
+  cancelLoading: false,
+}
+
+describe("GenerationHistoryModal", () => {
+  it("should render without crashing", () => {
+    const { container } = render(<GenerationHistoryModal {...defaultProps} />)
+    expect(container).toBeTruthy()
+  })
+
+  it("should not render when open is false", () => {
+    const { container } = render(<GenerationHistoryModal {...defaultProps} open={false} />)
+    expect(container.firstChild).toBeNull()
+  })
+
+  it("should render with history items", () => {
+    const history = [
+      {
+        id: "1",
+        status: "completed",
+        created_at: "2024-01-01T00:00:00Z",
+        duration: 60,
+      },
+    ]
+    const { container } = render(
+      <GenerationHistoryModal {...defaultProps} history={history as any} />,
+    )
+    expect(container).toBeTruthy()
+  })
+})

apps/web/src/test/pages/editing-planner/components/GenerationProgressModal.test.tsx

@@ -0,0 +1,102 @@
+import { describe, expect, it, vi } from "vitest"
+import { render } from "@testing-library/react"
+import GenerationProgressModal from "@/pages/editing-planner/components/GenerationProgressModal"
+
+const baseProps = {
+  open: true,
+  voiceoverDuration: null,
+  estimatedDuration: 60,
+  onDurationChange: vi.fn(),
+  onGenerate: vi.fn(),
+  task: null,
+  submitting: false,
+  onCancel: vi.fn(),
+  onRetry: vi.fn(),
+  onClose: vi.fn(),
+}
+
+describe("GenerationProgressModal", () => {
+  it("should render setup phase", () => {
+    const { container } = render(<GenerationProgressModal {...baseProps} phase="setup" />)
+    expect(container).toBeTruthy()
+  })
+
+  it("should render progress phase without task", () => {
+    const { container } = render(<GenerationProgressModal {...baseProps} phase="progress" />)
+    expect(container).toBeTruthy()
+  })
+
+  it("should render progress phase with task data", () => {
+    const { container } = render(
+      <GenerationProgressModal
+        {...baseProps}
+        phase="progress"
+        task={
+          {
+            id: "task-123",
+            status: "generating_video",
+            progress: 50,
+            current_step: "generating_video",
+            user_message: "正在生成视频",
+          } as any
+        }
+      />,
+    )
+    expect(container).toBeTruthy()
+  })
+
+  it("should render completed phase", () => {
+    const { container } = render(
+      <GenerationProgressModal
+        {...baseProps}
+        phase="completed"
+        task={{ id: "task-1", status: "completed", progress: 100 } as any}
+      />,
+    )
+    expect(container).toBeTruthy()
+  })
+
+  it("should render failed phase with retry", () => {
+    const { container } = render(
+      <GenerationProgressModal
+        {...baseProps}
+        phase="failed"
+        task={
+          {
+            id: "task-1",
+            status: "failed",
+            progress: 30,
+            error_message: "生成失败",
+            retryable: true,
+          } as any
+        }
+      />,
+    )
+    expect(container).toBeTruthy()
+  })
+
+  it("should render failed phase without retry", () => {
+    const { container } = render(
+      <GenerationProgressModal
+        {...baseProps}
+        phase="failed"
+        task={
+          {
+            id: "task-1",
+            status: "failed",
+            progress: 30,
+            retryable: false,
+          } as any
+        }
+      />,
+    )
+    expect(container).toBeTruthy()
+  })
+
+  it("should not render when closed", () => {
+    const { container } = render(
+      <GenerationProgressModal {...baseProps} phase="setup" open={false} />,
+    )
+    expect(container).toBeTruthy()
+  })
+})

apps/web/src/test/pages/editing-planner/smoke.test.tsx

@@ -31,6 +31,8 @@ import "@/pages/editing-planner/components/ClipPropertiesPanel"
 import "@/pages/editing-planner/components/EditorClipList"
 import "@/pages/editing-planner/components/EditingDrawers"
 import "@/pages/editing-planner/components/FilterPanel"
+import "@/pages/editing-planner/components/GenerationHistoryModal"
+import "@/pages/editing-planner/components/GenerationProgressModal"
 import "@/pages/editing-planner/components/GreenScreenPanel"
 import "@/pages/editing-planner/components/IntroOutroPanel"
 import "@/pages/editing-planner/components/MediaPanel"

apps/worker/video_processing/__init__.py

@@ -7,7 +7,7 @@ VideoProcessor 等）按需从子模块导入，避免 __init__ 阶段引入
 packages / DB 等重依赖。
 """
 
-# 共享工具模块（零外部依赖，供 editing_modes / generation 等复用）
+# 共享工具模块（零外部依赖，供 editing_modes / generation / edit_plan_generation 等复用）
 from . import dedup_helpers, ffmpeg_utils, oss_helpers, url_security
 
 __all__ = [

apps/worker/video_processing/dedup_helpers.py

@@ -1,6 +1,6 @@
 """查重辅助函数 — 从 generation.py 提取的 GeneratedVideo 记录 + 查重逻辑.
 
-供 generate_video 共同复用，
+供 render_edit_plan 和 generate_video 共同复用，
 创建 GeneratedVideo 记录后计算指纹并执行项目级 + 批次内查重。
 """
 

apps/worker/video_processing/oss_helpers.py

@@ -1,4 +1,4 @@
-"""OSS 工具函数 — 从 generation.py 提取的共享 OSS 操作.
+"""OSS 工具函数 — 从 generation.py / edit_plan_generation.py 提取的共享 OSS 操作.
 
 提供 OSS 配置读取、Bucket 创建、素材上传/下载、asset_id → 本地路径解析
 等能力，供 render_edit_plan 和 generate_video 共同复用。

apps/worker/video_processing/render_adapter.py

@@ -84,7 +84,6 @@ class RenderAdapterResult:
     cover_candidates: list[dict] | None = (
         None  # 封面候选帧 [{"image_url": "...", "frame_time": 5.0, "storage_key": "..."}]
     )
-    temp_dir: str | None = None  # 渲染临时目录，成功时由调用方清理，失败时由 finally 清理
 
     def __post_init__(self):
         if self.rendered_clip_ids is None:
@@ -129,7 +128,6 @@ class RenderAdapter:
         job_id: str = "",
         work_dir: Path | None = None,
         progress_cb: ProgressCallback | None = None,
-        voiceover_audio_path: str | None = None,
     ) -> RenderAdapterResult:
         """渲染一个 EditPlan。
 
@@ -144,7 +142,6 @@ class RenderAdapter:
             job_id: 关联的 Job ID（用于结果存储路径）
             work_dir: 工作目录，不传则使用临时目录
             progress_cb: 进度回调函数
-            voiceover_audio_path: 配音音频本地路径（一键生成场景使用）
 
         Returns:
             RenderAdapterResult
@@ -201,7 +198,7 @@ class RenderAdapter:
             self._report_progress(progress_cb, 35.0, "准备 BGM 音频")
 
             # 3~6. 统一渲染核心流程（BGM + ASR + 渲染 + 缩略图 + 上传）
-            result = self._do_render(
+            return self._do_render(
                 plan=plan,
                 clips=ready_clips,
                 asset_path_map=asset_path_map,
@@ -211,13 +208,7 @@ class RenderAdapter:
                 progress_cb=progress_cb,
                 rendered_clip_ids=rendered_clip_ids,
                 failed_clip_ids=failed_clip_ids,
-                voiceover_audio_path=voiceover_audio_path,
             )
-            # 成功时将临时目录所有权转移给调用方，阻止 finally 清理
-            if result.success and temp_dir:
-                result.temp_dir = temp_dir
-                temp_dir = None  # 阻止 finally 块清理
-            return result
 
         except subprocess.CalledProcessError as exc:
             stderr_text = (exc.stderr or "").strip()

apps/worker/video_processing/render_audio.py

@@ -67,16 +67,6 @@ def clip_has_audio(ctx: RenderContext, clip: ResolvedClip) -> bool:
     return ctx._audio_cache[key]
 
 
-def _clip_volume(clip: ResolvedClip) -> float:
-    """读取 clip 的音量配置（0.0~1.0，>1 放大）。缺省 1.0 原声。"""
-    cfg = getattr(clip, "config", None) or {}
-    try:
-        vol = float(cfg.get("volume", 1.0))
-    except (TypeError, ValueError):
-        return 1.0
-    return max(0.0, vol)
-
-
 # ── 音频混音 ──────────────────────────────────────────────────────────────────
 
 
@@ -92,13 +82,12 @@ def mix_audio(
     """音频后处理混音.
 
     处理逻辑：
-    1. 保留主图层（main/broll/overlay/corner_voice）视频素材的原声，按顺序 concat 拼接
-    2. 每个 clip 按 config.volume 应用音量（volume=0 静音，=1 原声）
-    3. 独立音频轨（audio role，TTS/配音）通过 amix 混入
-    4. 如果提供了 bgm_path，则额外混入 BGM（支持淡入淡出、循环、人声闪避）
-    5. 如果配置了 audio_tracks，则混入多轨道音频（配音、音效等）
-    6. 输出时长截断到 video_duration
-    7. 如果配置了降噪，最后应用降噪
+    1. 丢弃主图层（main/broll/overlay/corner_voice）的原始音频，避免录入源视频杂音
+    2. 仅使用独立音频轨（audio role，TTS/配音）作为主音频
+    3. 如果提供了 bgm_path，则额外混入 BGM（支持淡入淡出、循环、人声闪避）
+    4. 如果配置了 audio_tracks，则混入多轨道音频（配音、音效等）
+    5. 输出时长截断到 video_duration
+    6. 如果配置了降噪，最后应用降噪
 
     Args:
         ctx: 渲染上下文
@@ -134,12 +123,10 @@ def mix_audio(
     if "audio" in layer_map:
         audio_clips = layer_map["audio"].clips
 
-    # ── 保留源视频原声：过滤掉无音频流的 main clip（图片/无声素材） ──
-    # 注意：volume=0 的 clip 不能移除——移除会导致后续 clip 音频时间轴前移、音画不同步。
-    # volume=0 通过滤镜链生成静音流，保持时间轴对齐。
-    main_clips = [c for c in main_clips if clip_has_audio(ctx, c)]
+    # ── 丢弃源视频的原始音频（避免录入杂音），成片仅保留 TTS 配音 + BGM ──
+    main_clips = []
 
-    # ── 防御：过滤掉无音频流的独立音频轨 ──
+    # ── 防御：过滤掉无音频流的 clip ──
     audio_clips = [c for c in audio_clips if clip_has_audio(ctx, c)]
 
     if not main_clips and not audio_clips:
@@ -157,7 +144,7 @@ def mix_audio(
     # 构建音频处理命令
     output_path = ctx.work_dir / f"audio_{ctx.plan_id}.aac"
 
-    # 主音频为视频素材原声 concat；独立音频轨（TTS/配音）通过 amix 混入。
+    # 源视频原始音频已被丢弃（main_clips = []），最终音频完全由独立音频轨 + BGM + 多轨配置组成。
     # 当无 main_clips 时，将独立音频轨作为主音频走 concat 拼接；当二者均有则走 amix 混音。
     if main_clips:
         effective_main = main_clips
@@ -279,67 +266,28 @@ def concat_main_audio(
         has_speed = abs(speed - 1.0) >= 1e-6
 
         if not has_speed and not has_reverse:
-            # 无调速无倒放：根据是否需要裁剪/音量选择最高效的路径。
-            vol = _clip_volume(clip)
-            need_trim = trim_start > 0 or (effective_duration > 0 and final_duration < adjusted_duration)
-            need_volume = abs(vol - 1.0) >= 1e-6
-
-            if need_trim:
-                # 需要裁剪：用 atrim 滤镜在滤镜链中精确裁剪（采样点级精度，不浪费解码）。
-                # 滤镜顺序：atrim → asetpts → volume（先裁剪再调音量，避免处理被丢弃的数据）。
-                af_parts: list[str] = []
-                if trim_start > 0 and effective_duration > 0:
-                    af_parts.append(f"atrim=start={trim_start:.3f}:duration={final_duration:.3f}")
-                elif trim_start > 0:
-                    af_parts.append(f"atrim=start={trim_start:.3f}")
-                elif final_duration > 0:
-                    af_parts.append(f"atrim=duration={final_duration:.3f}")
-                af_parts.append("asetpts=PTS-STARTPTS")
-                if need_volume:
-                    af_parts.append(f"volume={vol:.4f}")
-                command = [
-                    FFMPEG_BIN,
-                    "-y",
-                    "-i",
-                    str(clip.local_path),
-                    "-vn",
-                    "-af",
-                    ",".join(af_parts),
-                    "-acodec",
-                    "aac",
-                    "-b:a",
-                    "128k",
-                    "-ar",
-                    "48000",
-                    "-ac",
-                    "2",
-                ]
-                # atrim 已精确控制时长，无需额外 -t
-                command.append(str(output_path))
-                run_ffmpeg(command)
-            else:
-                # 无需裁剪：直接提取，最高效。音量用单个 -af（如有）。
-                command = [
-                    FFMPEG_BIN,
-                    "-y",
-                    "-i",
-                    str(clip.local_path),
-                    "-vn",
-                    "-acodec",
-                    "aac",
-                    "-b:a",
-                    "128k",
-                    "-ar",
-                    "48000",
-                    "-ac",
-                    "2",
-                ]
-                if need_volume:
-                    command.extend(["-af", f"volume={vol:.4f}"])
-                if final_duration > 0:
-                    command.extend(["-t", f"{final_duration:.3f}"])
-                command.append(str(output_path))
-                run_ffmpeg(command)
+            # 无调速无倒放：简单命令行，-ss 裁剪更高效
+            command = [
+                FFMPEG_BIN,
+                "-y",
+                "-i",
+                str(clip.local_path),
+                "-vn",
+                "-acodec",
+                "aac",
+                "-b:a",
+                "128k",
+                "-ar",
+                "48000",
+                "-ac",
+                "2",
+            ]
+            if trim_start > 0:
+                command.extend(["-ss", f"{trim_start:.3f}"])
+            if final_duration > 0:
+                command.extend(["-t", f"{final_duration:.3f}"])
+            command.append(str(output_path))
+            run_ffmpeg(command)
         else:
             # 有调速或倒放：用 filter_complex
             speed_engine = SpeedEngine()
@@ -364,11 +312,6 @@ def concat_main_audio(
                 if reverse_filter:
                     audio_filters.append(reverse_filter)
 
-            # 音量
-            vol = _clip_volume(clip)
-            if abs(vol - 1.0) >= 1e-6:
-                audio_filters.append(f"volume={vol:.4f}")
-
             # aformat 归一化：统一输出格式为 48000Hz + stereo + fltp
             audio_filters.append("aformat=sample_rates=48000:channel_layouts=stereo:sample_fmts=fltp")
 
@@ -435,11 +378,6 @@ def concat_main_audio(
             if reverse_filter:
                 audio_filters.append(reverse_filter)
 
-        # 音量（0=静音，1=原声）
-        vol = _clip_volume(clip)
-        if abs(vol - 1.0) >= 1e-6:
-            audio_filters.append(f"volume={vol:.4f}")
-
         # aformat 归一化：统一采样率48000Hz + 双声道stereo + fltp采样格式
         # concat filter 要求所有输入音频参数完全一致，否则 exit=234 失败
         audio_filters.append("aformat=sample_rates=48000:channel_layouts=stereo:sample_fmts=fltp")

apps/worker/video_processing/thumbnail_generator.py

@@ -21,13 +21,12 @@ def apply_title_overlay(
     image_path: str,
     title_text: str,
     *,
-    color: str = "#ffffff",
     position: str = "bottom",
     font_size: int | None = None,
     margin_ratio: float = 0.06,
     stroke_width_ratio: float = 0.04,
 ) -> str:
-    """在图片上绘制标题文字（指定颜色 + 黑色描边/阴影）。
+    """在图片上绘制标题文字（白色 + 黑色描边/阴影）。
 
     委托给 packages.shared.title_overlay.apply_title_to_image，
     保持 Worker 内调用方式不变。title_text 为空时直接返回原路径。
@@ -39,7 +38,6 @@ def apply_title_overlay(
     result = apply_title_to_image(
         image_path,
         title_text,
-        color=color,
         position=position,
         font_size=font_size,
         margin_ratio=margin_ratio,
@@ -210,9 +208,6 @@ def extract_and_upload_cover_frames(
     *,
     num_frames: int = 3,
     title_text: str = "",
-    title_color: str = "#ffffff",
-    title_position: str = "bottom",
-    title_font_size: int | None = None,
 ) -> list[dict]:
     """从视频中抽取多帧作为封面候选，上传到 OSS。
 
@@ -220,11 +215,8 @@ def extract_and_upload_cover_frames(
         video_path: 视频文件路径
         plan_id: 编辑计划 ID（用于生成 storage key）
         num_frames: 抽取帧数（默认 3）
-        title_text: 标题文字；非空时用 Pillow 叠加到每帧。
+        title_text: 标题文字；非空时用 Pillow 叠加到每帧（白色 + 黑色描边）。
             从已渲染视频抽帧时通常传空（标题已烧录）；从源素材抽帧时传标题。
-        title_color: 标题字体颜色（#RRGGBB）
-        title_position: 标题位置 top/center/bottom
-        title_font_size: 标题字号，None 时自动计算
 
     Returns:
         封面候选列表，每项包含 {"url": str, "position": float}
@@ -252,13 +244,7 @@ def extract_and_upload_cover_frames(
             )
             # 从源素材抽帧时叠加标题文字；已渲染视频标题已烧录时传空字符串跳过
             if title_text and title_text.strip():
-                apply_title_overlay(
-                    frame_path,
-                    title_text,
-                    color=title_color,
-                    position=title_position,
-                    font_size=title_font_size,
-                )
+                apply_title_overlay(frame_path, title_text)
             storage_key = f"covers/{plan_id}/frame_{i}.jpg"
             url = upload_to_oss(frame_path, storage_key)
             if url:

apps/worker/video_processing/unified_render_service.py

@@ -36,7 +36,6 @@ from video_processing.ffmpeg_utils import (
     DEFAULT_TRANSITION_DURATION,
     FFMPEG_BIN,
     probe_duration,
-    probe_has_audio,
     probe_video_info,
     run_ffmpeg,
 )
@@ -1001,11 +1000,6 @@ class UnifiedRenderService:
         if abs(speed - 1.0) >= 1e-6:
             return False, f"有调速: speed={speed:.2f}x"
 
-        # 音量非默认（静音/放大）→ 需要音频滤镜重编码 → 不能 copy
-        vol = UnifiedRenderService._clip_volume(clip)
-        if abs(vol - 1.0) >= 1e-6:
-            return False, f"音量非默认: volume={vol:.2f}"
-
         # 有倒放 → 需要重编码 → 不能 copy
         reverse_config = ReverseConfig.from_dict(clip.config.get("reverse"))
         if reverse_config.enabled and (reverse_config.reverse_video or reverse_config.reverse_audio):
@@ -1276,23 +1270,13 @@ class UnifiedRenderService:
             "+faststart",
         ]
 
-        # 音频处理：background 通常是图片无音频，跳过；其他角色先探测是否真有音频流。
-        # volume=0 不丢弃音频流，而是保留后通过 volume=0 滤镜静音，保持时间轴对齐。
-        clip_volume = UnifiedRenderService._clip_volume(clip)
-        if role != "background":
-            try:
-                has_audio = probe_has_audio(clip.local_path)
-            except Exception as e:
-                # probe_has_audio 内部已保守返回 True；只有极端错误才会到这里。
-                # 此时不静默丢音频，记录 error 并向上抛出，让任务失败而不是产出无声视频。
-                logger.error("[unified-render] 探测音频流发生致命错误，终止渲染: %s: %s", clip.local_path, e)
-                raise
-        else:
-            has_audio = False
+        # 音频处理：background 通常是图片无音频，跳过；其他编码为 aac
+        # background 以外的视频素材，默认带音频
+        has_audio = role != "background"
         if has_audio:
             af_parts: list[str] = []
 
-            # 音频降噪（最先处理：在原始信号上降噪效果最好）
+            # 音频降噪
             try:
                 from video_processing.noise_reduction_engine import NoiseReductionConfig, NoiseReductionEngine
 
@@ -1306,16 +1290,13 @@ class UnifiedRenderService:
             except Exception as e:
                 logger.warning("[unified-render] 直通模式音频降噪应用失败，跳过: %s", e)
 
-            # 音频调速（在降噪之后、音量之前，与 render_audio.py concat 路径保持一致）
-            # SpeedEngine.build_audio_filter 内部已实现多级 atempo 串联，
-            # 自动处理超出 [0.5, 2.0] 范围的速度（如 0.25x → atempo=0.5,atempo=0.5）。
+            # 音频调速（与视频setpts对应，保持音画同步）
             speed = UnifiedRenderService._clip_speed(clip)
             if abs(speed - 1.0) >= 1e-6:
                 try:
                     from video_processing.speed_engine import SpeedConfig, SpeedEngine
 
                     speed_cfg = SpeedConfig(speed=speed)
-                    speed_cfg.clamp()
                     speed_engine = SpeedEngine()
                     af_parts.append(speed_engine.build_audio_filter(speed_cfg))
                 except Exception as e:
@@ -1328,10 +1309,6 @@ class UnifiedRenderService:
                 if af_filter:
                     af_parts.append(af_filter)
 
-            # 片段音量（最后应用：确保调速/倒放后的最终输出音量准确，与 concat 路径一致）
-            if abs(clip_volume - 1.0) >= 1e-6:
-                af_parts.append(f"volume={clip_volume:.4f}")
-
             if af_parts:
                 command.extend(["-af", ",".join(af_parts)])
 
@@ -1999,16 +1976,6 @@ class UnifiedRenderService:
         """
         return _clip_playback_speed_pure(getattr(clip, "playback_speed", 1.0))
 
-    @staticmethod
-    def _clip_volume(clip: ResolvedClip) -> float:
-        """获取 clip 的音量（config.volume）。缺省 1.0 原声，0.0 静音。"""
-        cfg = getattr(clip, "config", None) or {}
-        try:
-            vol = float(cfg.get("volume", 1.0))
-        except (TypeError, ValueError):
-            return 1.0
-        return max(0.0, vol)
-
     @staticmethod
     def _clip_adjusted_duration(clip: ResolvedClip) -> float:
         """计算调速后的 clip 实际时长（用于拼接计算）。

apps/worker/worker_app/celery_app.py

@@ -14,6 +14,8 @@ celery_app.conf.imports = (
     "worker_app.tasks.voice_extraction",
     "worker_app.tasks.voice_clone",
     "worker_app.tasks.tts_synthesis",
+    "worker_app.tasks.edit_plan_generation",
+    "worker_app.tasks.compose_video",
     "worker_app.tasks.batch_download",
     "worker_app.tasks._startup",
     "apps.worker.video_processing.dedup",

apps/worker/worker_app/tasks/__init__.py

@@ -25,6 +25,10 @@ def __getattr__(name: str):
         from .voice_extraction import extract_voice_task
 
         return extract_voice_task
+    elif name == "compose_video":
+        from .compose_video import compose_video
+
+        return compose_video
     elif name == "extract_background_task":
         from .voice_extraction import extract_background_task
 
@@ -54,6 +58,7 @@ def __getattr__(name: str):
 
 __all__ = [
     "classify_asset",
+    "compose_video",
     "generate_video",
     "healthcheck",
     "ingest_asset",

apps/worker/worker_app/tasks/compose_video.py

@@ -0,0 +1,198 @@
+"""视频合成 Celery 任务 — Phase 8 任务 2.10.
+
+使用 JobService 管理任务生命周期，通过 RenderAdapter 调用 UnifiedRenderService 执行合成。
+"""
+
+from __future__ import annotations
+
+import os
+import subprocess  # pragma: no cover
+import tempfile
+from pathlib import Path
+
+from celery.exceptions import SoftTimeLimitExceeded  # pragma: no cover
+from celery.utils.log import get_task_logger
+from worker_app.celery_app import celery_app
+from worker_app.db import SessionLocal
+
+logger = get_task_logger(__name__)
+
+# 任务超时时间（秒）：超过此时间 Celery 会抛出 SoftTimeLimitExceeded
+RENDER_TASK_SOFT_TIME_LIMIT = 600  # pragma: no cover  # 10 分钟
+# 硬超时：超过此时间进程会被强制 kill
+RENDER_TASK_TIME_LIMIT = 660  # pragma: no cover  # 10 分钟 + 1 分钟清理缓冲
+
+
+def _get_job_service():
+    """延迟导入 JobService，避免循环依赖。"""
+    from apps.api.app.services.job_service import JobService
+    from packages.adapters.sqlalchemy_impl.job_repository import SQLAlchemyJobRepository
+
+    db = SessionLocal()
+    repo = SQLAlchemyJobRepository(db)
+    return JobService(repo), db
+
+
+@celery_app.task(
+    name="worker.compose_video",
+    bind=True,
+    max_retries=3,
+    default_retry_delay=60,
+    soft_time_limit=RENDER_TASK_SOFT_TIME_LIMIT,
+    time_limit=RENDER_TASK_TIME_LIMIT,
+)
+def compose_video(self, job_id: str, **kwargs):  # pragma: no cover
+    """视频合成任务。
+
+    使用 UnifiedRenderService（图层架构）进行渲染。
+
+    Args:
+        job_id: JobService 中的任务 ID
+        **kwargs: 来自 Job.payload 的额外参数（plan_id, output_path 等）
+    """
+    job_service, db = _get_job_service()
+
+    try:
+        job = job_service.get_job(job_id)
+        if job is None:
+            logger.error("Job not found: %s", job_id)
+            return {"status": "error", "message": f"Job {job_id} not found"}
+
+        plan_id = job.payload.get("plan_id", "")
+        if not plan_id:
+            job_service.fail_job(job_id, "Missing plan_id in job payload")
+            return {"status": "error", "message": "Missing plan_id"}
+
+        # 使用 unified 渲染引擎
+        return _compose_with_unified_engine(self, job_service, job, plan_id, db)
+
+    except SoftTimeLimitExceeded:
+        # Celery 软超时：任务执行超过 soft_time_limit
+        error_msg = f"渲染任务超时（超过 {RENDER_TASK_SOFT_TIME_LIMIT // 60} 分钟）"
+        logger.error("视频合成超时: job_id=%s", job_id)
+        try:
+            job_service.fail_job(job_id, error_msg)
+        except Exception:
+            logger.exception("更新 Job 超时失败状态时出错")
+        # 超时不重试
+        return {"status": "error", "message": error_msg, "error_type": "timeout"}
+
+    except subprocess.TimeoutExpired as exc:
+        # FFmpeg 子进程超时
+        error_msg = f"FFmpeg 渲染超时（{exc.timeout}s）"
+        logger.error("视频合成 FFmpeg 超时: job_id=%s timeout=%s", job_id, exc.timeout)
+        try:
+            job_service.fail_job(job_id, error_msg)
+        except Exception:
+            logger.exception("更新 Job 超时失败状态时出错")
+        # 超时不重试
+        return {"status": "error", "message": error_msg, "error_type": "ffmpeg_timeout"}
+
+    except self.retry_exc as exc:
+        logger.warning("视频合成重试中: job_id=%s, exc=%s", job_id, exc)
+        raise
+
+    except subprocess.CalledProcessError as exc:
+        # FFmpeg 执行失败，提取有意义的错误信息
+        from video_processing.video_validation import get_exit_code_message
+
+        exit_msg = get_exit_code_message(exc.returncode)
+        stderr_text = (exc.stderr or "").strip()
+        stderr_tail = stderr_text[-300:] if len(stderr_text) > 300 else stderr_text
+        error_msg = f"渲染失败: {exit_msg}"
+        if stderr_tail:
+            error_msg += f" | {stderr_tail[:200]}"
+
+        logger.error("视频合成 FFmpeg 失败: job_id=%s %s", job_id, exit_msg)
+        try:
+            job_service.fail_job(job_id, error_msg[:500])
+        except Exception:
+            logger.exception("更新 Job 失败状态时出错")
+        # FFmpeg 错误不重试（通常是素材或配置问题）
+        return {"status": "error", "message": error_msg, "error_type": "ffmpeg_error", "exit_code": exc.returncode}
+
+    except Exception as exc:
+        logger.exception("视频合成异常: job_id=%s", job_id)
+        try:
+            job_service.fail_job(job_id, str(exc)[:500])
+        except Exception:
+            logger.exception("更新 Job 失败状态时出错")
+        raise self.retry(exc=exc, countdown=60) from exc
+    finally:
+        db.close()
+
+
+def _compose_with_unified_engine(task, job_service, job, plan_id: str, db) -> dict:  # pragma: no cover
+    """新引擎渲染路径（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:
+        error_msg = f"渲染失败: {result.error_message}"
+        job_service.fail_job(job_id, error_msg[:500])
+        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)

apps/worker/worker_app/tasks/edit_plan_generation.py

@@ -0,0 +1,452 @@
+"""剪辑计划渲染任务 — 使用 UnifiedRenderService 统一渲染引擎.
+
+Celery 任务 worker.render_edit_plan:
+  1. 加载 EditPlan + EditPlanClips
+  2. 通过 RenderAdapter 调用 UnifiedRenderService 渲染
+  3. 下载各片段素材 + 渲染
+  4. 上传渲染结果到 OSS
+  5. 创建 GeneratedVideo 记录 + 查重
+  6. 更新 EditPlan / EditPlanClip 状态
+  7. 更新 GenerationTask 进度
+"""
+
+from __future__ import annotations
+
+import logging
+from datetime import datetime, timezone
+from pathlib import Path
+
+from worker_app.celery_app import celery_app
+from worker_app.db import SessionLocal
+
+logger = logging.getLogger(__name__)
+
+OUTPUT_WIDTH = 1280
+OUTPUT_HEIGHT = 720
+OUTPUT_FPS = 25.0
+
+
+# ── 共享工具模块导入 ──────────────────────────────────────────────────────────
+
+from video_processing.dedup_helpers import create_video_record_and_dedup
+
+# ── Repository imports (延迟导入避免循环依赖) ─────────────────────────────────
+
+
+def _get_repos():
+    """获取数据库仓储实例"""
+    from packages.adapters.sqlalchemy_impl import SQLAlchemyEditPlanRepository
+    from packages.adapters.sqlalchemy_impl.edit_plan_clip_repository import (
+        SQLAlchemyEditPlanClipRepository,
+    )
+    from packages.adapters.sqlalchemy_impl.generation_task_repository import (
+        SQLAlchemyGenerationTaskRepository,
+    )
+
+    db = SessionLocal()
+    try:
+        plan_repo = SQLAlchemyEditPlanRepository(db)
+        clip_repo = SQLAlchemyEditPlanClipRepository(db)
+        gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
+        yield plan_repo, clip_repo, gen_task_repo, db
+    finally:
+        db.close()
+
+
+# ── Celery Task ───────────────────────────────────────────────────────────────
+
+
+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)
+            try:
+                gen_task.append_log(
+                    stage="render_failed",
+                    message=error_msg[:500],
+                    level="ERROR",
+                )
+            except Exception:
+                pass
+            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,
+    thumbnail_url: str = "",
+    cover_candidates: list[dict] | None = None,
+) -> dict:
+    """渲染成功后的统一收尾：查重 + 更新状态 + 返回结果。"""
+    # 创建 GeneratedVideo 记录 + 查重
+    project_id = plan.project_id or ""
+    batch_id = plan.config.get("batch_id", "")
+    mode = plan.config.get("mode", "edit_plan")
+    # 从 plan.config.title.text 读取视频名称
+    plan_config = plan.config or {}
+    title_cfg = plan_config.get("title", {}) or {}
+    if not isinstance(title_cfg, dict):
+        title_cfg = {}
+    video_name = (title_cfg.get("text") or "").strip() or f"generated-{generation_task_id[:8]}.mp4"
+    if generation_task_id:
+        try:
+            create_video_record_and_dedup(
+                generation_task_id=generation_task_id,
+                project_id=project_id,
+                user_id=plan.created_by_user_id or "",
+                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,
+                name=video_name,
+                thumbnail_url=thumbnail_url,
+            )
+        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
+    if hasattr(plan, "total_duration") and duration > 0:
+        plan.total_duration = duration
+    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
+            # 剪辑计划是多片段合成 1 个成片，result_count = 1
+            gen_task.result_count = 1
+            gen_task.append_log(
+                stage="render_complete",
+                message=f"渲染完成，输出时长 {duration:.1f}s",
+                level="INFO",
+                engine=engine,
+                clip_count=len(rendered_clip_ids),
+            )
+            gen_task.completed_at = datetime.now(timezone.utc)
+
+            # 回写封面 URL 到 GenerationTask，供封面生成接口读取
+            if cover_candidates:
+                first_cover = cover_candidates[0].get("image_url") or cover_candidates[0].get("url") or ""
+                if first_cover:
+                    gen_task.cover_url = first_cover
+                    logger.info(
+                        "预览渲染完成，回写 cover_url: plan_id=%s task_id=%s url=%s",
+                        plan_id,
+                        generation_task_id,
+                        first_cover[:80],
+                    )
+
+            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,
+    plan_id: str,
+    generation_task_id: str,
+    plan_repo,
+    clip_repo,
+    gen_task_repo,
+    db,
+) -> dict:
+    """统一渲染引擎路径（通过 RenderAdapter 调用 UnifiedRenderService）。
+
+    RenderAdapter 内部处理：素材下载、BGM 准备、ASR 自动字幕、渲染执行、OSS 上传。
+    本函数只负责：业务状态更新、查重、收尾。
+    """
+    from video_processing.render_adapter import RenderAdapter
+
+    adapter = RenderAdapter(db)
+
+    # 进度回调：更新 GenerationTask 进度
+    def _progress_cb(progress: float, stage: str):
+        if not generation_task_id:
+            return
+        try:
+            gen_task = gen_task_repo.get(generation_task_id)
+            if gen_task:
+                # 映射到 30%~90% 区间（素材下载前已到 30%）
+                mapped_progress = 30.0 + progress * 0.6
+                gen_task.progress = min(mapped_progress, 95.0)
+                gen_task.append_log(
+                    stage="render_progress",
+                    message=stage,
+                    level="INFO",
+                    progress=mapped_progress,
+                )
+                gen_task_repo.update(gen_task)
+        except Exception:
+            pass
+
+    try:
+        result = adapter.render_plan(
+            plan_id=plan_id,
+            job_id=generation_task_id or plan_id,
+            progress_cb=_progress_cb,
+        )
+    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}"}
+
+    if not result.success:
+        full_error = result.error_message or "渲染失败"
+        if result.error_detail:
+            full_error = f"{full_error}\n--- stderr ---\n{result.error_detail}"
+        logger.error("渲染失败(unified): %s — %s", plan_id, result.error_message)
+        _mark_plan_failed(plan_repo, plan_id, gen_task_repo, generation_task_id, full_error)
+        return {"status": "error", "message": result.error_message or "渲染失败"}
+
+    output_path = result.output_path or Path("")
+    output_url = result.output_url or ""
+    thumbnail_url = result.thumbnail_url or ""
+    # adapter 上传到 rendered/{plan_id}/{job_id}.mp4，从 URL 提取实际 key
+    # 不能用 output.mp4 硬编码，否则 cover 等下游通过 key 构造的 URL 指向不存在的文件
+    if output_url:
+        from packages.shared.storage import get_shared_storage_service
+
+        storage_key = get_shared_storage_service().normalize_storage_key(output_url)
+    else:
+        storage_key = f"rendered/{plan_id}/{generation_task_id or plan_id}.mp4"
+
+    # 用 adapter 返回的 clip 明细（以 adapter 的结果为准）
+    rendered_clip_ids = result.rendered_clip_ids or []
+    failed_clip_ids = result.failed_clip_ids or []
+
+    # 将封面候选帧写入 plan.config（供封面 API 直接使用，跳过 MediaKit 抽帧）
+    if result.cover_candidates:
+        plan_config = plan.config or {}
+        plan_config["cover_candidates"] = result.cover_candidates
+        plan.config = plan_config
+        logger.info(
+            "封面候选帧已写入 plan.config: plan_id=%s count=%d",
+            plan_id,
+            len(result.cover_candidates),
+        )
+
+    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=result.duration,
+        file_size=result.file_size,
+        width=result.width,
+        height=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",
+        thumbnail_url=thumbnail_url,
+        cover_candidates=result.cover_candidates,
+    )
+
+
+@celery_app.task(
+    name="worker.render_edit_plan",
+    bind=True,
+    max_retries=2,
+    soft_time_limit=600,  # 10 分钟软超时
+    time_limit=660,  # 11 分钟硬超时
+)
+def render_edit_plan(self, plan_id: str) -> dict:  # pragma: no cover
+    """渲染剪辑计划
+
+    流程：
+    1. 加载 EditPlan + EditPlanClips
+    2. 通过 RenderAdapter 调用 UnifiedRenderService 渲染
+    3. 下载素材 + 渲染
+    4. 上传渲染结果到 OSS
+    5. 创建 GeneratedVideo 记录 + 查重
+    6. 更新 EditPlan → completed, EditPlanClips → rendered
+    7. 更新 GenerationTask 进度
+    """
+    logger.info("开始渲染剪辑计划: plan_id=%s", plan_id)
+
+    generation_task_id = ""
+
+    for repos in _get_repos():
+        plan_repo, clip_repo, gen_task_repo, db = repos
+
+        try:
+            # 1. 加载 EditPlan
+            plan = plan_repo.get(plan_id)
+            if plan is None:
+                logger.error("剪辑计划不存在: %s", plan_id)
+                return {"status": "error", "message": f"计划不存在: {plan_id}"}
+
+            # 获取 generation_task_id（提前读取，确保 except 块可用）
+            generation_task_id = plan.config.get("generation_task_id", "")
+
+            # 2. 准备渲染（使用 unified 渲染引擎）
+
+            # 3. 加载片段列表（按 order 排序）
+            clips = clip_repo.list_by_plan(plan_id, skip=0, limit=10000)
+            if not clips:
+                logger.warning("剪辑计划没有片段: %s", plan_id)
+                plan.mark_failed()
+                plan_repo.update(plan)
+                return {"status": "error", "message": "没有可渲染的片段"}
+
+            # 更新 GenerationTask 状态为 running
+            if generation_task_id:
+                gen_task = gen_task_repo.get(generation_task_id)
+                if gen_task:
+                    gen_task.status = "running"
+                    gen_task.started_at = datetime.now(timezone.utc)
+                    gen_task.append_log(
+                        stage="render_start",
+                        message=f"开始渲染，片段数 {len(clips)}",
+                        level="INFO",
+                        engine="unified",
+                        clip_count=len(clips),
+                    )
+                    gen_task_repo.update(gen_task)
+
+            # 3. 渲染前取消检查
+            if generation_task_id:
+                current_task = gen_task_repo.get(generation_task_id)
+                if current_task:
+                    task_status = (
+                        current_task.status.value if hasattr(current_task.status, "value") else str(current_task.status)
+                    )
+                    if task_status == "cancelled":
+                        logger.info("任务已被取消，中止渲染: plan_id=%s task_id=%s", plan_id, generation_task_id)
+
+                        if plan.status.value == "rendering":
+                            try:
+                                plan.resume_editing()
+                                plan_repo.update(plan)
+                            except ValueError:
+                                pass
+                        return {"status": "cancelled", "plan_id": plan_id, "message": "任务已取消"}
+
+            # 4. 渲染（unified 引擎：RenderAdapter 统一处理下载 + BGM + ASR + 渲染 + 上传）
+            result = _render_with_unified(
+                plan=plan,
+                clips=clips,
+                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,
+            )
+
+            result["engine"] = "unified"
+            return result
+
+        except Exception as exc:
+            # 超时异常不重试，直接标记失败
+            from celery.exceptions import SoftTimeLimitExceeded
+
+            is_timeout = isinstance(exc, SoftTimeLimitExceeded)
+            if is_timeout:
+                logger.error("渲染剪辑计划超时: plan_id=%s", plan_id)
+            else:
+                logger.exception("渲染剪辑计划异常: %s", plan_id)
+
+            # 尝试标记计划和 GenerationTask 为失败
+            error_msg = "渲染任务超时（超过10分钟）" if is_timeout else f"渲染异常: {type(exc).__name__}: {exc}"
+            try:
+                plan = plan_repo.get(plan_id)
+                if plan and plan.status.value == "rendering":
+                    plan.mark_failed()
+                    plan_repo.update(plan)
+            except Exception as e:
+                logger.warning("标记计划失败时异常: plan_id=%s error=%s", plan_id, e, exc_info=True)
+            # 更新 GenerationTask 状态为 failed，前端轮询能看到失败状态
+            try:
+                if generation_task_id:
+                    gen_task = gen_task_repo.get(generation_task_id)
+                    if gen_task and gen_task.status.value != "failed":
+                        gen_task.status = "failed"
+                        gen_task.error_message = error_msg
+                        gen_task.completed_at = datetime.now(timezone.utc)
+                        try:
+                            log_stage = "render_timeout" if is_timeout else "render_failed"
+                            gen_task.append_log(
+                                stage=log_stage,
+                                message=error_msg[:500],
+                                level="ERROR",
+                                exception_type=type(exc).__name__,
+                            )
+                        except Exception:
+                            pass
+                        gen_task_repo.update(gen_task)
+                        logger.info(
+                            "GenerationTask 已标记为 failed: task_id=%s plan_id=%s",
+                            generation_task_id,
+                            plan_id,
+                        )
+            except Exception as e:
+                logger.warning(
+                    "更新 GenerationTask 失败状态时异常: task_id=%s error=%s", generation_task_id, e, exc_info=True
+                )
+            raise self.retry(exc=exc, countdown=60) from exc
+
+    return {"status": "error", "message": "数据库连接失败"}

packages/adapters/sqlalchemy_impl/generation_task_repository.py

@@ -41,6 +41,7 @@ def _to_domain(model: GenerationTaskModel) -> GenerationTask:
         output_width=getattr(model, "output_width", 1280) or 1280,
         output_height=getattr(model, "output_height", 720) or 720,
         cover_url=getattr(model, "cover_url", "") or "",
+        custom_title=getattr(model, "custom_title", "") or "",
         title_config=dict(getattr(model, "title_config", {}) or {}),
         logs=model.logs or "[]",
         created_at=model.created_at,
@@ -85,6 +86,7 @@ class SQLAlchemyGenerationTaskRepository:
             output_width=task.output_width,
             output_height=task.output_height,
             cover_url=task.cover_url or "",
+            custom_title=task.custom_title or "",
             title_config=dict(task.title_config) if task.title_config else {},
             logs=task.logs,
             created_at=task.created_at,
@@ -272,6 +274,7 @@ class SQLAlchemyGenerationTaskRepository:
         model.output_width = task.output_width
         model.output_height = task.output_height
         model.cover_url = task.cover_url or ""
+        model.custom_title = task.custom_title or ""
         model.title_config = dict(task.title_config) if task.title_config else {}
         model.logs = task.logs
         self.session.commit()

packages/application/generation_tasks.py

@@ -31,6 +31,7 @@ class CreateGenerationTaskCommand:
     output_width: int = 1280
     output_height: int = 720
     cover_url: str = ""
+    custom_title: str = ""
     title_config: dict = field(default_factory=dict)
 
 
@@ -67,6 +68,7 @@ class CreateGenerationTaskUseCase:
             output_width=command.output_width,
             output_height=command.output_height,
             cover_url=command.cover_url,
+            custom_title=command.custom_title,
             title_config=command.title_config,
         )
         return self.generation_task_repository.create(task)

packages/domain/generation_task.py

@@ -120,6 +120,7 @@ class GenerationTask:
     output_width: int = 1280
     output_height: int = 720
     cover_url: str = ""
+    custom_title: str = ""
     title_config: dict = field(default_factory=dict)
     extra_meta: dict = field(default_factory=dict)
     logs: str = "[]"
@@ -152,6 +153,7 @@ class GenerationTask:
         output_width: int = 1280,
         output_height: int = 720,
         cover_url: str = "",
+        custom_title: str = "",
         title_config: dict | None = None,
         extra_meta: dict | None = None,
     ) -> "GenerationTask":
@@ -183,6 +185,7 @@ class GenerationTask:
             output_width=output_width,
             output_height=output_height,
             cover_url=cover_url,
+            custom_title=custom_title,
             title_config=dict(title_config) if title_config else {},
             extra_meta=dict(extra_meta) if extra_meta else {},
         )
@@ -303,10 +306,10 @@ class GenerationTask:
         self,
         *,
         cover_url: str = "",
+        custom_title: str = "",
         extra_meta: dict | None = None,
         output_width: int = 0,
         output_height: int = 0,
-        title_config: dict | None = None,
     ) -> None:
         """将预览任务确认为正式产出。
 
@@ -316,12 +319,12 @@ class GenerationTask:
         self.is_preview = False
         if cover_url:
             self.cover_url = cover_url
+        if custom_title:
+            self.custom_title = custom_title
         if output_width > 0:
             self.output_width = output_width
         if output_height > 0:
             self.output_height = output_height
-        if title_config:
-            self.title_config = dict(title_config)
         if extra_meta:
             self.extra_meta.update(extra_meta)
         self.updated_at = datetime.now(timezone.utc)

packages/shared/title_overlay.py

@@ -40,21 +40,6 @@ def find_title_font(size: int):
     return ImageFont.load_default()
 
 
-def _parse_hex_color(color: str, fallback=(255, 255, 255)) -> tuple[int, int, int]:
-    "将 #RRGGBB / #RGB 解析为 RGB 元组，失败返回 fallback。"
-    if not color or not isinstance(color, str):
-        return fallback
-    c = color.strip().lstrip("#")
-    try:
-        if len(c) == 6:
-            return (int(c[0:2], 16), int(c[2:4], 16), int(c[4:6], 16))
-        if len(c) == 3:
-            return (int(c[0] * 2, 16), int(c[1] * 2, 16), int(c[2] * 2, 16))
-    except (ValueError, IndexError):
-        pass
-    return fallback
-
-
 def wrap_title_text(text: str, font, max_width: int) -> list[str]:
     """按像素宽度对中英文混合文本自动换行，支持显式 \\n。"""
     lines: list[str] = []
@@ -86,7 +71,6 @@ def apply_title_to_image(
     image_path: str,
     title_text: str,
     *,
-    color: str = "#ffffff",
     position: str = "bottom",
     font_size: Optional[int] = None,
     margin_ratio: float = 0.06,
@@ -97,7 +81,6 @@ def apply_title_to_image(
     Args:
         image_path: 图片路径（处理结果覆盖写回）
         title_text: 标题文字；为空直接返回 None 表示跳过
-        color: 字体颜色（#RRGGBB），默认白色
         position: top / center / bottom
         font_size: 字号，None 时按图片宽度自动计算
         margin_ratio: 边缘留白占短边比例
@@ -126,7 +109,6 @@ def apply_title_to_image(
     if font is None:
         return None
 
-    text_rgb = _parse_hex_color(color)
     stroke_width = max(2, int(font_size * stroke_width_ratio))
     margin = int(min(img_w, img_h) * margin_ratio)
     max_text_width = img_w - 2 * margin
@@ -157,12 +139,12 @@ def apply_title_to_image(
         y = y_start + i * (line_height + line_gap)
         # 阴影
         draw.text((x + 2, y + 2), ln, font=font, fill=(0, 0, 0))
-        # 文字（颜色由 color 参数控制）+ 黑色描边
+        # 白色文字 + 黑色描边
         draw.text(
             (x, y),
             ln,
             font=font,
-            fill=text_rgb,
+            fill=(255, 255, 255),
             stroke_width=stroke_width,
             stroke_fill=(0, 0, 0),
         )

tests/integration/test_four_mode_rendering.py

@@ -0,0 +1,234 @@
+"""剪辑模式渲染集成测试.
+
+验证剪辑模式（ONE_TAKE / VOICE_OVER）通过
+_build_plan_and_clips_from_task + UnifiedRenderService 的完整渲染流程。
+注：PIP / VOICE_PIP 已下线，统一映射为 ONE_TAKE。
+
+需要 ffmpeg 可用；CI 无 ffmpeg 时自动跳过。
+"""
+
+from __future__ import annotations
+
+import shutil
+import subprocess
+import tempfile
+from pathlib import Path
+
+import pytest
+from video_processing.unified_render_service import (
+    RenderResult,
+    UnifiedRenderService,
+    _resolve_layer_role,
+)
+from worker_app.tasks.generation import _build_plan_and_clips_from_task
+
+pytestmark = pytest.mark.skipif(
+    not shutil.which("ffmpeg"),
+    reason="ffmpeg not available",
+)
+
+
+# ── 辅助函数 ──────────────────────────────────────────────────────────────────
+
+
+def _generate_test_video(path: Path, duration: float = 3.0, color: str = "red") -> None:
+    """生成一个纯色测试视频。"""
+    cmd = [
+        "ffmpeg",
+        "-y",
+        "-f",
+        "lavfi",
+        "-i",
+        f"color=c={color}:s=640x360:d={duration}:r=25",
+        "-c:v",
+        "libx264",
+        "-pix_fmt",
+        "yuv420p",
+        "-movflags",
+        "+faststart",
+        str(path),
+    ]
+    subprocess.run(cmd, check=True, capture_output=True, timeout=30)
+
+
+def _render_with_mode(
+    mode: str,
+    num_clips: int = 3,
+    duration: float = 2.0,
+) -> tuple[RenderResult, Path]:
+    """用指定模式生成测试视频并渲染，返回 (result, work_dir)。
+
+    调用方负责清理 work_dir。
+    """
+    work_dir = Path(tempfile.mkdtemp(prefix="test_4mode_"))
+
+    # 生成测试视频素材
+    colors = ["red", "green", "blue", "yellow", "purple"]
+    downloaded_paths: list[Path] = []
+    for i in range(num_clips):
+        p = work_dir / f"test_{i:03d}.mp4"
+        _generate_test_video(p, duration=duration, color=colors[i % len(colors)])
+        downloaded_paths.append(p)
+
+    # 构建虚拟 plan + clips
+    task_id = f"test_task_{mode}"
+    plan, clips, asset_path_map = _build_plan_and_clips_from_task(
+        task_id=task_id,
+        downloaded_paths=downloaded_paths,
+        mode=mode,
+    )
+
+    # 渲染
+    service = UnifiedRenderService(
+        plan=plan,
+        clips=clips,
+        asset_path_map=asset_path_map,
+        work_dir=work_dir,
+        output_width=640,
+        output_height=360,
+        output_fps=25,
+    )
+    result = service.render()
+    return result, work_dir
+
+
+# ── 测试 _build_plan_and_clips_from_task ──────────────────────────────────────
+
+
+class TestBuildPlanAndClips:
+    """测试 4 种模式的虚拟 plan 构建。"""
+
+    def _make_paths(self, n: int) -> list[Path]:
+        return [Path(f"/tmp/test_{i}.mp4") for i in range(n)]
+
+    def test_one_take_mode(self):
+        paths = self._make_paths(3)
+        plan, clips, asset_map = _build_plan_and_clips_from_task("t1", paths, "one_take")
+
+        assert plan.id == "t1"
+        assert len(clips) == 3
+        assert all(c.clip_type == "main" for c in clips)
+        assert len(asset_map) == 3
+
+    def test_pip_mode_maps_to_one_take(self):
+        """PIP 已下线，映射为 one_take → 全部 main clips。"""
+        paths = self._make_paths(3)
+        plan, clips, asset_map = _build_plan_and_clips_from_task("t2", paths, "pip")
+
+        assert len(clips) == 3
+        assert all(c.clip_type == "main" for c in clips)
+
+    def test_voice_over_mode(self):
+        paths = self._make_paths(3)
+        plan, clips, asset_map = _build_plan_and_clips_from_task("t3", paths, "voice_over")
+
+        assert len(clips) == 3
+        assert all(c.clip_type == "main" for c in clips)
+        assert all(c.config.get("role") == "b_roll" for c in clips)
+
+    def test_voice_pip_mode_maps_to_one_take(self):
+        """VOICE_PIP 已下线，映射为 one_take → 全部 main clips。"""
+        paths = self._make_paths(4)
+        plan, clips, asset_map = _build_plan_and_clips_from_task("t4", paths, "voice_pip")
+
+        assert len(clips) == 4
+        assert all(c.clip_type == "main" for c in clips)
+
+    def test_unknown_mode_defaults_to_one_take(self):
+        paths = self._make_paths(2)
+        plan, clips, asset_map = _build_plan_and_clips_from_task("t5", paths, "unknown_mode")
+
+        assert len(clips) == 2
+        assert all(c.clip_type == "main" for c in clips)
+
+    def test_asset_path_map_keys_match_clip_asset_ids(self):
+        paths = self._make_paths(3)
+        _, clips, asset_map = _build_plan_and_clips_from_task("t6", paths, "one_take")
+
+        clip_asset_ids = {c.asset_id for c in clips}
+        map_keys = set(asset_map.keys())
+        assert clip_asset_ids == map_keys
+
+
+# ── 测试图层分组（4 模式） ────────────────────────────────────────────────────
+
+
+class TestFourModeLayerGrouping:
+    """验证 4 种模式的 clip_type 分布经 _resolve_layer_role 后产生正确的图层。"""
+
+    def test_one_take_layers(self):
+        """ONE_TAKE: 3 main → 1 main layer。"""
+        paths = [Path(f"/tmp/ot_{i}.mp4") for i in range(3)]
+        _, clips, _ = _build_plan_and_clips_from_task("ot", paths, "one_take")
+
+        roles = {_resolve_layer_role(c.clip_type, c.config) for c in clips}
+        assert roles == {"main"}
+
+    def test_pip_layers_now_one_take(self):
+        """PIP 已下线 → one_take: 3 main → 1 main layer。"""
+        paths = [Path(f"/tmp/pip_{i}.mp4") for i in range(3)]
+        _, clips, _ = _build_plan_and_clips_from_task("pip", paths, "pip")
+
+        roles = {_resolve_layer_role(c.clip_type, c.config) for c in clips}
+        assert roles == {"main"}
+
+    def test_voice_over_layers(self):
+        """VOICE_OVER: 3 main(b_roll) → broll。"""
+        paths = [Path(f"/tmp/vo_{i}.mp4") for i in range(3)]
+        _, clips, _ = _build_plan_and_clips_from_task("vo", paths, "voice_over")
+
+        roles = {_resolve_layer_role(c.clip_type, c.config) for c in clips}
+        assert roles == {"broll"}
+
+    def test_voice_pip_layers_now_one_take(self):
+        """VOICE_PIP 已下线 → one_take: 4 main → main layer。"""
+        paths = [Path(f"/tmp/vpip_{i}.mp4") for i in range(4)]
+        _, clips, _ = _build_plan_and_clips_from_task("vpip", paths, "voice_pip")
+
+        roles = {_resolve_layer_role(c.clip_type, c.config) for c in clips}
+        assert roles == {"main"}
+
+
+# ── 端到端渲染测试（需要 ffmpeg） ─────────────────────────────────────────────
+
+
+class TestEndToEndRendering:
+    """4 种模式的完整渲染测试，验证输出文件存在且时长合理。"""
+
+    def test_one_take_render(self):
+        result, work_dir = _render_with_mode("one_take", num_clips=2, duration=2.0)
+        try:
+            assert result.output_path.exists()
+            assert result.file_size > 0
+            assert result.duration > 0
+            assert result.width == 640
+            assert result.height == 360
+        finally:
+            shutil.rmtree(work_dir, ignore_errors=True)
+
+    def test_pip_render(self):
+        result, work_dir = _render_with_mode("pip", num_clips=2, duration=2.0)
+        try:
+            assert result.output_path.exists()
+            assert result.file_size > 0
+            assert result.duration > 0
+        finally:
+            shutil.rmtree(work_dir, ignore_errors=True)
+
+    def test_voice_over_render(self):
+        result, work_dir = _render_with_mode("voice_over", num_clips=2, duration=2.0)
+        try:
+            assert result.output_path.exists()
+            assert result.file_size > 0
+            assert result.duration > 0
+        finally:
+            shutil.rmtree(work_dir, ignore_errors=True)
+
+    def test_voice_pip_render(self):
+        result, work_dir = _render_with_mode("voice_pip", num_clips=3, duration=2.0)
+        try:
+            assert result.output_path.exists()
+            assert result.file_size > 0
+            assert result.duration > 0
+        finally:
+            shutil.rmtree(work_dir, ignore_errors=True)

tests/integration/test_full_pipeline.py

@@ -0,0 +1,189 @@
+"""全链路集成测试.
+
+验证 PlanGeneratorService → UnifiedRenderService → 查重 的端到端流程。
+"""
+
+from __future__ import annotations
+
+import shutil
+import subprocess
+import tempfile
+from pathlib import Path
+
+import pytest
+from video_processing.unified_render_service import (
+    UnifiedRenderService,
+)
+from worker_app.tasks.generation import _build_plan_and_clips_from_task
+
+pytestmark = pytest.mark.skipif(
+    not shutil.which("ffmpeg"),
+    reason="ffmpeg not available",
+)
+
+
+def _generate_test_video(path: Path, duration: float = 3.0) -> None:
+    """生成一个测试视频。"""
+    cmd = [
+        "ffmpeg",
+        "-y",
+        "-f",
+        "lavfi",
+        "-i",
+        f"color=c=blue:s=640x360:d={duration}:r=25",
+        "-c:v",
+        "libx264",
+        "-pix_fmt",
+        "yuv420p",
+        str(path),
+    ]
+    subprocess.run(cmd, check=True, capture_output=True, timeout=30)
+
+
+def _generate_test_audio(path: Path, duration: float = 5.0) -> None:
+    """生成一个测试音频文件。"""
+    cmd = [
+        "ffmpeg",
+        "-y",
+        "-f",
+        "lavfi",
+        "-i",
+        f"sine=frequency=440:duration={duration}",
+        "-c:a",
+        "aac",
+        "-b:a",
+        "128k",
+        str(path),
+    ]
+    subprocess.run(cmd, check=True, capture_output=True, timeout=30)
+
+
+class TestFullPipeline:
+    """验证从虚拟 plan 构建到渲染输出的完整流程。"""
+
+    def test_one_take_pipeline(self):
+        """ONE_TAKE 模式完整流程。"""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            work_dir = Path(tmpdir)
+
+            # 生成测试素材
+            paths = []
+            for i in range(3):
+                p = work_dir / f"clip_{i}.mp4"
+                _generate_test_video(p, duration=2.0)
+                paths.append(p)
+
+            # 构建虚拟 plan
+            plan, clips, asset_map = _build_plan_and_clips_from_task("pipeline_test", paths, "one_take")
+
+            # 渲染
+            service = UnifiedRenderService(
+                plan=plan,
+                clips=clips,
+                asset_path_map=asset_map,
+                work_dir=work_dir,
+                output_width=640,
+                output_height=360,
+            )
+            result = service.render()
+
+            assert result.output_path.exists()
+            assert result.duration > 0
+            assert result.file_size > 0
+            assert result.width == 640
+            assert result.height == 360
+
+    def test_pipeline_with_audio_mux(self):
+        """渲染 + 混音后处理。"""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            work_dir = Path(tmpdir)
+
+            # 生成测试素材
+            video_path = work_dir / "clip_0.mp4"
+            _generate_test_video(video_path, duration=3.0)
+
+            # 构建虚拟 plan
+            plan, clips, asset_map = _build_plan_and_clips_from_task("audio_test", [video_path], "one_take")
+
+            # 渲染
+            service = UnifiedRenderService(
+                plan=plan,
+                clips=clips,
+                asset_path_map=asset_map,
+                work_dir=work_dir,
+                output_width=640,
+                output_height=360,
+            )
+            render_result = service.render()
+
+            # 混音 - 直接用 ffmpeg（_mux_audio_track 已被清理）
+            audio_path = work_dir / "voice.aac"
+            _generate_test_audio(audio_path, duration=5.0)
+
+            final_path = work_dir / "final.mp4"
+            mux_cmd = [
+                "ffmpeg",
+                "-y",
+                "-i",
+                str(render_result.output_path),
+                "-i",
+                str(audio_path),
+                "-c:v",
+                "copy",
+                "-c:a",
+                "aac",
+                "-shortest",
+                str(final_path),
+            ]
+            subprocess.run(mux_cmd, check=True, capture_output=True, timeout=30)
+
+            assert final_path.exists()
+            assert final_path.stat().st_size > 0
+
+    def test_single_clip_pipeline(self):
+        """单 clip 渲染（无转场）。"""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            work_dir = Path(tmpdir)
+
+            video_path = work_dir / "single.mp4"
+            _generate_test_video(video_path, duration=5.0)
+
+            plan, clips, asset_map = _build_plan_and_clips_from_task("single_test", [video_path], "one_take")
+
+            service = UnifiedRenderService(
+                plan=plan,
+                clips=clips,
+                asset_path_map=asset_map,
+                work_dir=work_dir,
+                output_width=640,
+                output_height=360,
+            )
+            result = service.render()
+
+            assert result.output_path.exists()
+            assert result.duration > 0
+
+    def test_dedup_helper_integration(self):
+        """验证 dedup_helpers.create_video_record_and_dedup 的导入和签名。"""
+        # 只验证函数存在且签名正确（不实际调用，需要数据库）
+        import inspect
+
+        from video_processing.dedup_helpers import create_video_record_and_dedup
+
+        sig = inspect.signature(create_video_record_and_dedup)
+        params = set(sig.parameters.keys())
+        expected = {
+            "generation_task_id",
+            "project_id",
+            "batch_id",
+            "file_url",
+            "file_size",
+            "duration",
+            "video_path",
+            "mode",
+            "session",
+            "width",
+            "height",
+            "fps",
+        }
+        assert expected.issubset(params), f"Missing params: {expected - params}"

tests/unit/test_1280_preview_speedup.py

@@ -149,6 +149,14 @@ class TestWorkerGenerationNoPreviewOverride:
         assert 'resolution = "854x480"' not in source, "Should not override resolution to 480p in preview mode"
         assert 'bitrate = "1M"' not in source, "Should not override bitrate to 1M in preview mode"
 
+    def test_parallel_download_still_works(self):
+        """并行下载逻辑保留。"""
+        with open("apps/worker/worker_app/tasks/generation.py") as f:
+            source = f.read()
+
+        assert "ThreadPoolExecutor" in source, "Should use ThreadPoolExecutor for parallel downloads"
+        assert "as_completed" in source, "Should use as_completed for result collection"
+
 
 # ── 5. generation_preview.py 不再有 PREVIEW_RESOLUTION ──
 

tests/unit/test_1294_preview_voice_injection.py

@@ -2,6 +2,7 @@
 
 验证：
 1. _load_task_info 正确加载 voice_ids
+2. _render_video 接受 voice_ids 参数
 3. voice_ids 正确注入到 plan config 中（实际执行代码路径，diff-cover 可达）
 """
 
@@ -73,3 +74,185 @@ class TestLoadTaskInfoVoiceIds:
 
             result = _load_task_info("test_task_id")
             assert result["voice_ids"] == []
+
+
+class TestRenderVideoVoiceInjection:
+    """验证 _render_video 正确注入 voice_id 到 plan config（实际执行代码路径）"""
+
+    def test_render_video_accepts_voice_ids(self):
+        """_render_video 签名包含 voice_ids 参数"""
+        import inspect
+
+        from worker_app.tasks.generation import _render_video
+
+        sig = inspect.signature(_render_video)
+        assert "voice_ids" in sig.parameters
+
+    def test_voice_ids_default_none(self):
+        """voice_ids 参数默认为 None"""
+        import inspect
+
+        from worker_app.tasks.generation import _render_video
+
+        sig = inspect.signature(_render_video)
+        param = sig.parameters["voice_ids"]
+        assert param.default is None
+
+    def test_voice_ids_injected_into_plan_config(self):
+        """voice_ids 非空时，voice_id 和 subtitle.auto_generated 被注入到 plan config。
+
+        此测试实际执行 _render_video 的配音注入代码路径，确保 diff-cover 覆盖新增行。
+        """
+        from dataclasses import dataclass, field
+
+        @dataclass
+        class MockClip:
+            """模拟 VirtualClip，至少需要 duration 属性。"""
+
+            id: str = "clip_1"
+            duration: float = 5.0
+            config: dict = field(default_factory=dict)
+
+        @dataclass
+        class MockPlan:
+            """模拟 VirtualPlan，至少需要 config 属性。"""
+
+            id: str = "test_plan"
+            name: str = "test"
+            config: dict = field(default_factory=dict)
+
+        mock_plan = MockPlan(config={"some_key": "some_value"})
+        mock_clips = [MockClip(duration=5.0), MockClip(duration=3.0)]
+        mock_asset_path_map = {"asset_1": Path("/tmp/video1.mp4")}
+
+        # Mock RenderAdapter 和 render 结果
+        mock_render_result = MagicMock()
+        mock_render_result.success = True
+        mock_render_result.output_path = Path("/tmp/output.mp4")
+        mock_render_result.duration = 8.0
+
+        mock_adapter_cls = MagicMock(return_value=MagicMock())
+        mock_adapter_cls.return_value.render_from_memory.return_value = mock_render_result
+
+        mock_db = MagicMock()
+
+        with (
+            patch(
+                "worker_app.tasks.generation._build_plan_and_clips_from_task",
+                return_value=(mock_plan, mock_clips, mock_asset_path_map),
+            ),
+            patch(
+                "worker_app.tasks.generation._load_template_plan_config",
+                return_value=None,
+            ),
+            patch(
+                "video_processing.render_adapter.RenderAdapter",
+                mock_adapter_cls,
+            ),
+            patch(
+                "worker_app.tasks.generation.SessionLocal",
+                return_value=mock_db,
+            ),
+        ):
+            from worker_app.tasks.generation import _render_video
+
+            from packages.domain import EditingMode
+
+            output_path, render_duration, cover_candidates = _render_video(
+                task_id="test_task_123",
+                downloaded_videos=[Path("/tmp/video1.mp4")],
+                voice_path=None,
+                editing_mode=EditingMode.ONE_TAKE,
+                project_id="proj_1",
+                template_id="tmpl_1",
+                user_id="user_1",
+                temp_path=Path("/tmp"),
+                output_name="test_output.mp4",
+                resolution="854x480",
+                voice_ids=["voice_abc"],
+            )
+
+            # 验证 voice_id 被注入到 plan config（覆盖新增代码行）
+            assert mock_plan.config.get("voice_id") == "voice_abc"
+            # 验证 subtitle.auto_generated 被设置为 True
+            assert mock_plan.config.get("subtitle", {}).get("auto_generated") is True
+            # 验证 RenderAdapter 被调用
+            mock_adapter_cls.return_value.render_from_memory.assert_called_once()
+            # 验证返回值
+            assert output_path == Path("/tmp/output.mp4")
+            assert render_duration == 8.0
+
+    def test_voice_ids_empty_skips_injection(self):
+        """voice_ids 为空时，不注入 voice_id 到 plan config"""
+        from dataclasses import dataclass, field
+
+        @dataclass
+        class MockClip:
+            id: str = "clip_1"
+            duration: float = 5.0
+
+        @dataclass
+        class MockPlan:
+            id: str = "test_plan"
+            name: str = "test"
+            config: dict = field(default_factory=dict)
+
+        mock_plan = MockPlan(config={"export": {"resolution": "854x480"}})
+        mock_clips = [MockClip(duration=5.0)]
+
+        mock_render_result = MagicMock()
+        mock_render_result.success = True
+        mock_render_result.output_path = Path("/tmp/output.mp4")
+        mock_render_result.duration = 5.0
+
+        mock_adapter_cls = MagicMock(return_value=MagicMock())
+        mock_adapter_cls.return_value.render_from_memory.return_value = mock_render_result
+
+        with (
+            patch(
+                "worker_app.tasks.generation._build_plan_and_clips_from_task",
+                return_value=(mock_plan, mock_clips, {}),
+            ),
+            patch(
+                "worker_app.tasks.generation._load_template_plan_config",
+                return_value=None,
+            ),
+            patch(
+                "video_processing.render_adapter.RenderAdapter",
+                mock_adapter_cls,
+            ),
+            patch(
+                "worker_app.tasks.generation.SessionLocal",
+                return_value=MagicMock(),
+            ),
+        ):
+            from worker_app.tasks.generation import _render_video
+
+            from packages.domain import EditingMode
+
+            _render_video(
+                task_id="test_task_456",
+                downloaded_videos=[Path("/tmp/video1.mp4")],
+                voice_path=None,
+                editing_mode=EditingMode.ONE_TAKE,
+                project_id="proj_1",
+                template_id="",
+                user_id="user_1",
+                temp_path=Path("/tmp"),
+                output_name="test_output.mp4",
+                voice_ids=[],
+            )
+
+            # 验证 voice_id 没有被注入
+            assert "voice_id" not in mock_plan.config
+
+
+class TestGenerateVideoPassesVoiceIds:
+    """验证 generate_video 调用 _render_video 时传递 voice_ids"""
+
+    def test_generate_video_passes_voice_ids(self):
+        """generate_video 中 _render_video 调用包含 voice_ids 参数"""
+        with open("apps/worker/worker_app/tasks/generation.py", "r") as f:
+            content = f.read()
+
+        assert 'voice_ids=task_info.get("voice_ids", [])' in content

tests/unit/test_batch_clips_endpoint.py

@@ -1,135 +0,0 @@
-"""Tests for PUT /templates/{id}/editor/clips batch update endpoint.
-
-Updated for transactional replace_all_clips_transactional method.
-"""
-
-from __future__ import annotations
-
-import os
-from unittest.mock import MagicMock
-
-import pytest
-
-os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
-
-
-@pytest.fixture
-def mock_services():
-    plan_svc = MagicMock()
-    tpl_svc = MagicMock()
-    plan_svc.get_plan_or_raise.return_value = MagicMock(id="plan-1", template_id="tpl-1")
-    plan_svc.replace_all_clips_transactional.return_value = 2
-    return tpl_svc, plan_svc
-
-
-class TestBatchUpdateClips:
-    def test_batch_update_calls_transactional_replace(self, mock_services):
-        """验证批量更新调用事务性替换方法，传入正确的参数。"""
-        from app.api.routes.templates_editor.draft import batch_update_clips
-        from app.api.routes.templates_editor.schemas import (
-            EditorClipBatchItem,
-            EditorClipBatchUpdateRequest,
-        )
-
-        _, plan_svc = mock_services
-        req = EditorClipBatchUpdateRequest(
-            clips=[
-                EditorClipBatchItem(asset_id="a1", start_time=0.0, duration=3.0, order=0),
-                EditorClipBatchItem(asset_id="a2", start_time=3.0, duration=5.0, order=1),
-            ]
-        )
-
-        result = batch_update_clips(
-            template_id="tpl-1",
-            req=req,
-            plan_id="plan-1",
-            services=mock_services,
-            _=MagicMock(),
-        )
-
-        assert result.plan_id == "plan-1"
-        assert result.clip_count == 2
-        plan_svc.replace_all_clips_transactional.assert_called_once()
-        call_args = plan_svc.replace_all_clips_transactional.call_args
-        assert call_args[0][0] == "plan-1"
-        clips_data = call_args[0][1]
-        assert len(clips_data) == 2
-        assert clips_data[0]["asset_id"] == "a1"
-        assert clips_data[0]["start_time"] == 0.0
-        assert clips_data[0]["duration"] == 3.0
-        assert clips_data[1]["asset_id"] == "a2"
-
-    def test_batch_update_empty_clips(self, mock_services):
-        """空 clips 列表也能正常处理。"""
-        from app.api.routes.templates_editor.draft import batch_update_clips
-        from app.api.routes.templates_editor.schemas import EditorClipBatchUpdateRequest
-
-        _, plan_svc = mock_services
-        req = EditorClipBatchUpdateRequest(clips=[])
-
-        result = batch_update_clips(
-            template_id="tpl-1",
-            req=req,
-            plan_id="plan-1",
-            services=mock_services,
-            _=MagicMock(),
-        )
-
-        assert result.clip_count == 0
-        plan_svc.replace_all_clips_transactional.assert_called_once()
-        call_args = plan_svc.replace_all_clips_transactional.call_args
-        assert call_args[0][1] == []
-
-    def test_batch_update_passes_order_correctly(self, mock_services):
-        """验证 order 字段正确传递。"""
-        from app.api.routes.templates_editor.draft import batch_update_clips
-        from app.api.routes.templates_editor.schemas import (
-            EditorClipBatchItem,
-            EditorClipBatchUpdateRequest,
-        )
-
-        _, plan_svc = mock_services
-        req = EditorClipBatchUpdateRequest(
-            clips=[
-                EditorClipBatchItem(asset_id="a1", start_time=0.0, duration=3.0, order=5),
-            ]
-        )
-
-        batch_update_clips(
-            template_id="tpl-1",
-            req=req,
-            plan_id="plan-1",
-            services=mock_services,
-            _=MagicMock(),
-        )
-
-        clips_data = plan_svc.replace_all_clips_transactional.call_args[0][1]
-        assert clips_data[0]["order"] == 5
-        assert clips_data[0]["asset_id"] == "a1"
-        assert clips_data[0]["start_time"] == 0.0
-        assert clips_data[0]["duration"] == 3.0
-
-
-class TestEditorClipBatchItemValidation:
-    """验证 schema 校验规则。"""
-
-    def test_asset_id_empty_string_allowed(self):
-        """asset_id 空字符串允许通过（占位片段场景）。"""
-        from app.api.routes.templates_editor.schemas import EditorClipBatchItem
-
-        item = EditorClipBatchItem(asset_id="", start_time=0.0, duration=3.0, order=0)
-        assert item.asset_id == ""
-
-    def test_asset_id_valid(self):
-        """有效 asset_id 应通过校验。"""
-        from app.api.routes.templates_editor.schemas import EditorClipBatchItem
-
-        item = EditorClipBatchItem(asset_id="abc123", start_time=0.0, duration=3.0, order=0)
-        assert item.asset_id == "abc123"
-
-    def test_order_none_by_default(self):
-        """order 默认为 None，表示按数组顺序。"""
-        from app.api.routes.templates_editor.schemas import EditorClipBatchItem
-
-        item = EditorClipBatchItem(asset_id="a1", start_time=0.0, duration=3.0)
-        assert item.order is None

tests/unit/test_bool_config_defense.py

@@ -0,0 +1,130 @@
+"""
+测试：模板 config 字段存储了非 dict 值（如 True / False / str）时，
+渲染链路不会崩溃（'bool' object has no attribute 'get'）。
+
+覆盖两个关键文件：
+1. generation.py — _load_template_plan_config 旧系统路径
+2. unified_render_service.py — _maybe_generate_ass
+"""
+
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+# Add worker app to path
+sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "worker"))
+os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret")
+os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
+
+
+class TestLoadTemplatePlanConfigBoolDefense:
+    """_load_template_plan_config 旧系统路径对非 dict 值的防护。"""
+
+    def _call_old_path(self, title_cfg, subtitle_cfg, bgm_cfg):
+        """通过 mock 新模板系统返回 None，强制走旧模板系统 fallback 路径。"""
+        from worker_app.tasks.generation import _load_template_plan_config
+
+        mock_old_template = MagicMock()
+        mock_old_template.title_config = title_cfg
+        mock_old_template.subtitle_config = subtitle_cfg
+        mock_old_template.bgm_config = bgm_cfg
+
+        mock_session = MagicMock()
+        # 旧系统 query 返回 mock template
+        mock_session.query.return_value.filter.return_value.first.return_value = mock_old_template
+
+        # Mock 新模板系统 repo.get() 返回 None（强制走 fallback）
+        mock_repo_cls = MagicMock()
+        mock_repo_cls.return_value.get.return_value = None
+
+        with (
+            patch("worker_app.tasks.generation.SessionLocal", return_value=mock_session),
+            patch("packages.adapters.sqlalchemy_impl.SQLAlchemyEditTemplateRepository", mock_repo_cls),
+            patch("packages.adapters.sqlalchemy_impl.SQLAlchemyTemplateClipConfigRepository", MagicMock()),
+        ):
+            return _load_template_plan_config("fake-id")
+
+    def test_bool_values_return_empty(self):
+        """title_config=True / subtitle_config=False / bgm_config='str' → 全部过滤掉"""
+        result = self._call_old_path(True, False, "not_a_dict")
+        assert isinstance(result, dict)
+        assert "title" not in result
+        assert "subtitle" not in result
+        assert "bgm" not in result
+
+    def test_valid_dict_passes_through(self):
+        """正常 dict 正常传递"""
+        result = self._call_old_path(
+            {"text": "标题", "enabled": True},
+            {"text": "副标题"},
+            {"enabled": True, "source": "test.mp3"},
+        )
+        assert result["title"] == {"text": "标题", "enabled": True}
+        assert result["subtitle"] == {"text": "副标题"}
+        assert result["bgm"] == {"enabled": True, "source": "test.mp3"}
+
+    def test_none_returns_empty(self):
+        """None → 空 dict"""
+        result = self._call_old_path(None, None, None)
+        assert result == {}
+
+    def test_mixed_valid_and_invalid(self):
+        """部分有效、部分无效时只保留有效的"""
+        result = self._call_old_path({"text": "OK"}, True, None)
+        assert "title" in result
+        assert "subtitle" not in result
+        assert "bgm" not in result
+
+    def test_int_and_list_also_filtered(self):
+        """int / list 类型也被过滤"""
+        result = self._call_old_path(42, [1, 2, 3], 0)
+        assert result == {}
+
+
+class TestUnifiedRenderBoolConfigDefense:
+    """_maybe_generate_ass 对 plan.config 中非 dict title/subtitle 的防护。"""
+
+    def _make_service(self, config):
+        from video_processing.unified_render_service import UnifiedRenderService
+
+        service = UnifiedRenderService.__new__(UnifiedRenderService)
+        mock_plan = MagicMock()
+        mock_plan.config = config
+        service.plan = mock_plan
+        service.task_id = "test-task"
+        return service
+
+    def test_bool_title_does_not_crash(self):
+        """config['title']=True → 不崩溃，返回 None"""
+        service = self._make_service({"title": True, "subtitle": {}})
+        result = service._maybe_generate_ass(video_duration=10.0)
+        assert result is None
+
+    def test_bool_subtitle_does_not_crash(self):
+        """config['subtitle']=False → 不崩溃，返回 None"""
+        service = self._make_service({"title": {}, "subtitle": False})
+        result = service._maybe_generate_ass(video_duration=10.0)
+        assert result is None
+
+    def test_str_title_does_not_crash(self):
+        """config['title']='plain string' → 不崩溃"""
+        service = self._make_service({"title": "plain string", "subtitle": {}})
+        result = service._maybe_generate_ass(video_duration=10.0)
+        assert result is None
+
+    def test_none_config_does_not_crash(self):
+        """config=None → 不崩溃"""
+        service = self._make_service(None)
+        result = service._maybe_generate_ass(video_duration=10.0)
+        assert result is None
+
+    def test_int_title_does_not_crash(self):
+        """config['title']=42 → 不崩溃"""
+        service = self._make_service({"title": 42, "subtitle": 0})
+        result = service._maybe_generate_ass(video_duration=10.0)
+        assert result is None

tests/unit/test_confirm_generation.py

@@ -5,7 +5,7 @@
   - 预览任务未完成 → 创建新任务走渲染流程
   - 预览任务不存在 → 404
   - 权限不足 → 403
-  - cover_url 正确传递
+  - cover_url 和 custom_title 正确传递
 """
 
 from __future__ import annotations
@@ -201,6 +201,7 @@ def _make_preview_task(**kwargs: Any) -> GenerationTask:
         output_width=1080,
         output_height=1920,
         cover_url="",
+        custom_title="",
         video_title="",
         resolution="",
         bgm_config={},
@@ -232,6 +233,7 @@ class TestConfirmGenerationReuse:
                 "output_width": 1080,
                 "output_height": 1920,
                 "cover_url": "https://example.com/cover.jpg",
+                "custom_title": "我的视频",
             },
         )
 
@@ -249,6 +251,7 @@ class TestConfirmGenerationReuse:
         assert item["output_height"] == 1920
         # 封面和标题更新
         assert item["cover_url"] == "https://example.com/cover.jpg"
+        assert item["custom_title"] == "我的视频"
 
         # 没有创建新任务
         assert len(gen_task_repo._store) == initial_count
@@ -274,6 +277,7 @@ class TestConfirmGenerationReuse:
         assert updated is not None
         assert updated.is_preview is False
         assert updated.cover_url == "https://cdn.example.com/cover.png"
+        assert updated.custom_title == "测试标题"
 
     def test_confirm_creates_new_task_when_preview_not_completed(
         self,
@@ -352,6 +356,7 @@ class TestConfirmGenerationErrors:
         assert item["output_height"] == 1080
         # 默认封面和标题为空
         assert item["cover_url"] == ""
+        assert item["custom_title"] == ""
         # 配置保留
         assert item["voice_library_id"] == "voice-001"
         assert item["template_id"] == "tmpl-001"
@@ -363,7 +368,7 @@ class TestConfirmGenerationErrors:
         client: TestClient,
         gen_task_repo: StubGenerationTaskRepository,
     ) -> None:
-        """cover_url 正确传递"""
+        """cover_url 和 custom_title 正确传递"""
         preview = _make_preview_task()
         gen_task_repo.create(preview)
 
@@ -373,12 +378,14 @@ class TestConfirmGenerationErrors:
                 "output_width": 1080,
                 "output_height": 1920,
                 "cover_url": "https://cdn.example.com/my-cover.png",
+                "custom_title": "测试视频标题",
             },
         )
 
         assert resp.status_code == 200
         item = resp.json()["items"][0]
         assert item["cover_url"] == "https://cdn.example.com/my-cover.png"
+        assert item["custom_title"] == "测试视频标题"
 
     def test_confirm_default_resolution(
         self,

tests/unit/test_cover_url_finalize.py

@@ -0,0 +1,132 @@
+"""Tests for cover_url backfill to GenerationTask.
+
+Verifies _finalize_render_success correctly writes cover_url
+from cover_candidates to gen_task.cover_url.
+"""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+# Add worker app to sys.path
+_WORKER_ROOT = Path(__file__).resolve().parents[2] / "apps" / "worker"
+if str(_WORKER_ROOT) not in sys.path:
+    sys.path.insert(0, str(_WORKER_ROOT))
+
+
+class FakeGenTask:
+    """Simple stand-in for GenerationTask that tracks attribute assignment."""
+
+    def __init__(self):
+        object.__setattr__(self, "_assigned", {})
+        self.id = "task-1"
+        self.status = MagicMock()
+        self.status.value = "running"
+
+    def __setattr__(self, name, value):
+        if not name.startswith("_"):
+            self._assigned[name] = value
+        object.__setattr__(self, name, value)
+
+    def append_log(self, **kwargs):
+        pass
+
+
+def _make_plan():
+    plan = MagicMock()
+    plan.project_id = "proj-1"
+    plan.created_by_user_id = "user-1"
+    plan.config = {"batch_id": "batch-1", "mode": "edit_plan", "title": {"text": "test"}}
+    plan.mark_completed = MagicMock()
+    return plan
+
+
+def _call_finalize(cover_candidates=None, gen_task=None, plan=None):
+    from worker_app.tasks.edit_plan_generation import _finalize_render_success
+
+    plan = plan or _make_plan()
+    gen_task = gen_task or FakeGenTask()
+
+    plan_repo = MagicMock()
+    clip_repo = MagicMock()
+    gen_task_repo = MagicMock()
+    gen_task_repo.get.return_value = gen_task
+    db = MagicMock()
+
+    with patch("worker_app.tasks.edit_plan_generation.create_video_record_and_dedup"):
+        result = _finalize_render_success(
+            plan=plan,
+            plan_repo=plan_repo,
+            clip_repo=clip_repo,
+            gen_task_repo=gen_task_repo,
+            db=db,
+            plan_id="plan-1",
+            output_url="https://oss.example.com/output.mp4",
+            storage_key="rendered/plan-1/task-1.mp4",
+            duration=10.0,
+            file_size=1024,
+            width=1280,
+            height=720,
+            rendered_clip_ids=["clip-1"],
+            failed_clip_ids=[],
+            generation_task_id="task-1",
+            output_path=Path("/tmp/output.mp4"),
+            engine="unified",
+            thumbnail_url="",
+            cover_candidates=cover_candidates,
+        )
+
+    return result, gen_task, gen_task_repo
+
+
+class TestFinalizeCoverUrl:
+
+    def test_cover_url_set_from_image_url(self):
+        """cover_candidates with image_url should set gen_task.cover_url"""
+        candidates = [
+            {"image_url": "https://oss.example.com/cover1.jpg", "frame_time": 1.5},
+            {"image_url": "https://oss.example.com/cover2.jpg", "frame_time": 3.0},
+        ]
+        _, gen_task, gen_task_repo = _call_finalize(cover_candidates=candidates)
+        assert gen_task.cover_url == "https://oss.example.com/cover1.jpg"
+        gen_task_repo.update.assert_called()
+
+    def test_cover_url_fallback_to_url_key(self):
+        """Should fallback to 'url' key when 'image_url' is absent"""
+        candidates = [{"url": "https://oss.example.com/cover_url_key.jpg"}]
+        _, gen_task, _ = _call_finalize(cover_candidates=candidates)
+        assert gen_task.cover_url == "https://oss.example.com/cover_url_key.jpg"
+
+    def test_cover_url_not_set_when_empty_list(self):
+        """Empty cover_candidates should not set cover_url"""
+        _, gen_task, _ = _call_finalize(cover_candidates=[])
+        assert "cover_url" not in gen_task._assigned
+
+    def test_cover_url_not_set_when_none(self):
+        """None cover_candidates should not set cover_url"""
+        _, gen_task, _ = _call_finalize(cover_candidates=None)
+        assert "cover_url" not in gen_task._assigned
+
+    def test_cover_url_not_set_when_url_empty(self):
+        """Empty URL strings in candidates should not set cover_url"""
+        candidates = [{"image_url": "", "url": ""}]
+        _, gen_task, _ = _call_finalize(cover_candidates=candidates)
+        assert "cover_url" not in gen_task._assigned
+
+    def test_no_generation_task_no_crash(self):
+        """Should not crash when gen_task is None"""
+        candidates = [{"image_url": "https://oss.example.com/cover.jpg"}]
+        gen_task_repo = MagicMock()
+        gen_task_repo.get.return_value = None
+        result, _, _ = _call_finalize(cover_candidates=candidates)
+        assert result["status"] == "completed"
+
+    def test_image_url_priority_over_url(self):
+        """image_url should take priority over url key"""
+        candidates = [{"image_url": "https://a.jpg", "url": "https://b.jpg"}]
+        _, gen_task, _ = _call_finalize(cover_candidates=candidates)
+        assert gen_task.cover_url == "https://a.jpg"

tests/unit/test_create_reuse_preview_fallback.py

@@ -1,409 +0,0 @@
-"""create 端点兜底复用预览产物 + confirm 标题同步 — 单元测试."""
-
-from __future__ import annotations
-
-import os
-import sys
-from dataclasses import dataclass, field
-from typing import Any, Optional
-from unittest.mock import MagicMock, patch
-
-os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
-os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
-
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "apps", "api"))
-
-from packages.domain.generation_task import GenerationTask, GenerationTaskStatus
-
-# ── Stubs ────────────────────────────────────────────────────────────────────
-
-
-class StubGenerationTaskRepository:
-    def __init__(self) -> None:
-        self._store: dict[str, Any] = {}
-
-    def create(self, task: Any) -> Any:
-        self._store[task.id] = task
-        return task
-
-    def get(self, task_id: str) -> Optional[Any]:
-        return self._store.get(task_id)
-
-    def update(self, task: Any) -> Any:
-        self._store[task.id] = task
-        return task
-
-    def list_by_user(self, user_id: str) -> list[Any]:
-        return [t for t in self._store.values() if t.created_by_user_id == user_id]
-
-    def count_pending_by_user(self, user_id: str) -> int:
-        return len(
-            [
-                t
-                for t in self._store.values()
-                if t.created_by_user_id == user_id and t.status == GenerationTaskStatus.PENDING
-            ]
-        )
-
-    def count_pending_total(self) -> int:
-        return len([t for t in self._store.values() if t.status == GenerationTaskStatus.PENDING])
-
-    def count_by_user(self, user_id: str) -> int:
-        return len([t for t in self._store.values() if t.created_by_user_id == user_id])
-
-
-@dataclass
-class FakeProject:
-    id: str = "project-001"
-    owner_user_id: str = "user-001"
-    shared_users: list[str] = field(default_factory=list)
-    name: str = "Test Project"
-
-    def can_access(self, user_id: str) -> bool:
-        return user_id == self.owner_user_id or user_id in self.shared_users
-
-
-class StubProjectRepository:
-    def __init__(self) -> None:
-        self._projects: dict[str, FakeProject] = {}
-
-    def add(self, project: FakeProject) -> None:
-        self._projects[project.id] = project
-
-    def find_by_id(self, project_id: str) -> Optional[FakeProject]:
-        return self._projects.get(project_id)
-
-
-@dataclass
-class FakeUser:
-    id: str = "user-001"
-    email: str = "test@example.com"
-
-
-@dataclass
-class FakeAuthenticatedUser:
-    user: FakeUser = field(default_factory=FakeUser)
-    session_id: str | None = None
-    token_type: str | None = None
-
-
-def _make_preview_task(**kwargs: Any) -> GenerationTask:
-    defaults = dict(
-        id="preview-task-001",
-        project_id="project-001",
-        asset_library_id="library-001",
-        strategy_id="one_take",
-        voice_library_id="",
-        template_id="tmpl-001",
-        asset_ids=["asset-1"],
-        title_ids=[],
-        voice_ids=[],
-        status=GenerationTaskStatus.COMPLETED,
-        progress=100.0,
-        result_count=1,
-        error_message="",
-        created_by_user_id="user-001",
-        source_edit_plan_id="plan-001",
-        asset_select_mode="all",
-        is_preview=True,
-        source_task_id="",
-        output_width=1080,
-        output_height=1920,
-        cover_url="",
-        video_title="",
-        resolution="",
-        bgm_config={},
-        title_config={"text": "预览标题"},
-    )
-    defaults.update(kwargs)
-    return GenerationTask(**defaults)
-
-
-def _make_db_with_preview(preview: GenerationTask):
-    """Create a mock DB that returns a model-like object for the preview."""
-    db = MagicMock()
-    mock_model = MagicMock()
-    mock_model.id = preview.id
-    mock_model.output_width = preview.output_width
-    mock_model.output_height = preview.output_height
-    # Set up chain: db.query(...).filter(...).order_by(...).first()
-    chain = db.query.return_value
-    chain.filter.return_value = chain
-    chain.order_by.return_value = chain
-    chain.first.return_value = mock_model
-    return db, mock_model
-
-
-def _make_db_empty():
-    """Create a mock DB that returns None (no preview found)."""
-    db = MagicMock()
-    chain = db.query.return_value
-    chain.filter.return_value = chain
-    chain.order_by.return_value = chain
-    chain.first.return_value = None
-    return db
-
-
-# ── Fixtures ─────────────────────────────────────────────────────────────────
-
-
-@pytest.fixture
-def gen_task_repo() -> StubGenerationTaskRepository:
-    return StubGenerationTaskRepository()
-
-
-@pytest.fixture
-def project_repo() -> StubProjectRepository:
-    repo = StubProjectRepository()
-    repo.add(FakeProject())
-    return repo
-
-
-@pytest.fixture
-def app(
-    gen_task_repo: StubGenerationTaskRepository,
-    project_repo: StubProjectRepository,
-) -> FastAPI:
-    from app.api.routes.generation_tasks import router
-    from app.auth import get_current_user
-    from app.dependencies import (
-        get_asset_library_repository,
-        get_asset_repository,
-        get_db_session,
-        get_generated_video_repository,
-        get_generation_task_repository,
-        get_project_repository,
-    )
-
-    test_app = FastAPI()
-    test_app.include_router(router, prefix="/api/v1/generation")
-
-    test_app.dependency_overrides[get_current_user] = lambda: FakeAuthenticatedUser()
-    test_app.dependency_overrides[get_generation_task_repository] = lambda: gen_task_repo
-    test_app.dependency_overrides[get_project_repository] = lambda: project_repo
-    test_app.dependency_overrides[get_asset_library_repository] = lambda: MagicMock()
-    test_app.dependency_overrides[get_asset_repository] = lambda: MagicMock()
-    test_app.dependency_overrides[get_generated_video_repository] = lambda: MagicMock()
-    # db_session will be overridden per-test
-
-    yield test_app
-    test_app.dependency_overrides.clear()
-
-
-def _make_client(app: FastAPI, db: MagicMock) -> TestClient:
-    from app.dependencies import get_db_session
-
-    app.dependency_overrides[get_db_session] = lambda: db
-    return TestClient(app)
-
-
-# ── Domain: mark_confirmed with title_config ─────────────────────────────────
-
-
-class TestMarkConfirmedTitleConfig:
-    def test_mark_confirmed_sets_title_config(self):
-        task = _make_preview_task()
-        task.mark_confirmed(title_config={"text": "新标题"})
-        assert task.is_preview is False
-        assert task.title_config["text"] == "新标题"
-
-    def test_mark_confirmed_without_title_config_preserves_existing(self):
-        task = _make_preview_task(title_config={"text": "原标题"})
-        task.mark_confirmed()
-        assert task.title_config["text"] == "原标题"
-
-
-# ── Create endpoint fallback ─────────────────────────────────────────────────
-
-
-class TestCreateEndpointFallback:
-    """create 端点兜底复用预览产物。"""
-
-    def test_reuse_completed_preview(
-        self,
-        app: FastAPI,
-        gen_task_repo: StubGenerationTaskRepository,
-    ):
-        """带 source_edit_plan_id + is_preview=False → 复用已完成预览"""
-        preview = _make_preview_task()
-        gen_task_repo.create(preview)
-        db, _ = _make_db_with_preview(preview)
-
-        with (
-            patch(
-                "packages.adapters.sqlalchemy_impl.generation_task_repository._to_domain",
-                return_value=preview,
-            ),
-            patch(
-                "app.api.routes.generation_tasks._writeback_edit_plan_config",
-            ),
-        ):
-            client = _make_client(app, db)
-            resp = client.post(
-                "/api/v1/generation/tasks",
-                json={
-                    "project_id": "project-001",
-                    "template_id": "tmpl-001",
-                    "asset_ids": ["asset-1"],
-                    "source_edit_plan_id": "plan-001",
-                    "is_preview": False,
-                    "output_width": 1080,
-                    "output_height": 1920,
-                },
-            )
-
-        assert resp.status_code == 200
-        data = resp.json()
-        assert data["total"] == 1
-        assert data["items"][0]["id"] == preview.id
-        assert data["items"][0]["is_preview"] is False
-
-    def test_no_preview_found_creates_new_task(
-        self,
-        app: FastAPI,
-        gen_task_repo: StubGenerationTaskRepository,
-    ):
-        """没有已完成预览 → 正常创建新任务"""
-        db = _make_db_empty()
-
-        with patch("app.api.routes.generation_tasks.safe_enqueue_generation_task", return_value=True):
-            client = _make_client(app, db)
-            resp = client.post(
-                "/api/v1/generation/tasks",
-                json={
-                    "project_id": "project-001",
-                    "template_id": "tmpl-001",
-                    "asset_ids": ["asset-1"],
-                    "source_edit_plan_id": "plan-002",
-                    "is_preview": False,
-                },
-            )
-
-        assert resp.status_code == 200
-        data = resp.json()
-        assert data["total"] == 1
-        assert data["items"][0]["id"] != "preview-task-001"
-        assert data["items"][0]["is_preview"] is False
-
-    def test_preview_request_does_not_use_fallback(
-        self,
-        app: FastAPI,
-    ):
-        """is_preview=True → 不走兜底，正常创建预览任务"""
-        db = _make_db_empty()
-
-        with patch("app.api.routes.generation_tasks.safe_enqueue_generation_task", return_value=True):
-            client = _make_client(app, db)
-            resp = client.post(
-                "/api/v1/generation/tasks",
-                json={
-                    "project_id": "project-001",
-                    "template_id": "tmpl-001",
-                    "asset_ids": ["asset-1"],
-                    "source_edit_plan_id": "plan-001",
-                    "is_preview": True,
-                },
-            )
-
-        assert resp.status_code == 200
-        assert resp.json()["items"][0]["is_preview"] is True
-        # 兜底查询 GenerationTaskModel 不应被调用（只可能查 EditPlanModel 做自动关联）
-        from packages.adapters.sqlalchemy_impl.models import GenerationTaskModel
-
-        for call_args in db.query.call_args_list:
-            assert (
-                call_args[0][0] is not GenerationTaskModel
-            ), "fallback should not query GenerationTaskModel for preview requests"
-
-    def test_fallback_resolution_mismatch_creates_new(
-        self,
-        app: FastAPI,
-        gen_task_repo: StubGenerationTaskRepository,
-    ):
-        """兜底找到预览但分辨率不一致 → 跳过复用，创建新任务"""
-        preview = _make_preview_task(output_width=1080, output_height=1920)
-        gen_task_repo.create(preview)
-        db, _ = _make_db_with_preview(preview)
-
-        with (
-            patch(
-                "packages.adapters.sqlalchemy_impl.generation_task_repository._to_domain",
-                return_value=preview,
-            ),
-            patch("app.api.routes.generation_tasks.safe_enqueue_generation_task", return_value=True),
-        ):
-            client = _make_client(app, db)
-            resp = client.post(
-                "/api/v1/generation/tasks",
-                json={
-                    "project_id": "project-001",
-                    "template_id": "tmpl-001",
-                    "asset_ids": ["asset-1"],
-                    "source_edit_plan_id": "plan-001",
-                    "is_preview": False,
-                    "output_width": 1920,
-                    "output_height": 1080,
-                },
-            )
-
-        assert resp.status_code == 200
-        assert resp.json()["items"][0]["id"] != preview.id
-
-
-# ── Confirm endpoint title sync ──────────────────────────────────────────────
-
-
-class TestConfirmTitleSync:
-    """confirm 端点 custom_title 同步到 title_config。"""
-
-    def test_confirm_with_custom_title_updates_title_config(
-        self,
-        app: FastAPI,
-        gen_task_repo: StubGenerationTaskRepository,
-    ):
-        """传了 custom_title → title_config.text 被更新"""
-        preview = _make_preview_task(
-            title_config={"text": "旧标题", "font_size": 32},
-            source_edit_plan_id="plan-001",
-        )
-        gen_task_repo.create(preview)
-        db = _make_db_empty()
-
-        with patch("app.api.routes.generation_tasks._writeback_edit_plan_config"):
-            client = _make_client(app, db)
-            resp = client.post(
-                f"/api/v1/generation/tasks/{preview.id}/confirm",
-                json={
-                    "output_width": 1080,
-                    "output_height": 1920,
-                    "custom_title": "新标题",
-                },
-            )
-
-        assert resp.status_code == 200
-        item = resp.json()["items"][0]
-        assert item["title_config"]["text"] == "新标题"
-        assert item["title_config"]["font_size"] == 32
-
-    def test_confirm_without_custom_title_preserves_title(
-        self,
-        app: FastAPI,
-        gen_task_repo: StubGenerationTaskRepository,
-    ):
-        """没传 custom_title → title_config 不变"""
-        preview = _make_preview_task(title_config={"text": "原标题"})
-        gen_task_repo.create(preview)
-        db = _make_db_empty()
-
-        client = _make_client(app, db)
-        resp = client.post(
-            f"/api/v1/generation/tasks/{preview.id}/confirm",
-            json={"output_width": 1080, "output_height": 1920},
-        )
-
-        assert resp.status_code == 200
-        assert resp.json()["items"][0]["title_config"]["text"] == "原标题"

tests/unit/test_edit_plan_worker_failure.py

@@ -0,0 +1,333 @@
+"""P0-2: Celery 任务 render_edit_plan 失败时更新 GenerationTask 状态。
+
+验证：
+  - 异常发生时 GenerationTask 状态更新为 failed
+  - error_message 记录了异常类型和描述
+  - completed_at 被设置
+  - 即使 generation_task_id 为空也不崩溃
+  - 即使更新 GenerationTask 本身失败也不影响 retry
+"""
+
+from __future__ import annotations
+
+import os
+import sys
+from dataclasses import dataclass, field
+from types import ModuleType
+from typing import Any, Optional
+from unittest.mock import MagicMock, patch
+
+os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
+os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
+
+import pytest
+
+# ── Mock worker 模块以避免数据库连接 ──────────────────────────────────────────
+# worker_app.db 在 import 时会尝试连接数据库，必须在导入 task 模块前 mock
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "apps", "worker"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
+
+# 预注册 mock 模块，阻止真实数据库初始化
+_mock_db_mod = ModuleType("worker_app.db")
+_mock_db_mod.SessionLocal = MagicMock()
+sys.modules.setdefault("worker_app.db", _mock_db_mod)
+
+_mock_celery_mod = ModuleType("worker_app.celery_app")
+_mock_celery_app = MagicMock()
+# 让 @celery_app.task(...) 装饰器透传原始函数，否则函数变成 MagicMock
+_mock_celery_app.task = lambda **kwargs: lambda fn: fn
+_mock_celery_mod.celery_app = _mock_celery_app
+sys.modules.setdefault("worker_app.celery_app", _mock_celery_mod)
+
+
+# ── Stub domain objects ───────────────────────────────────────────────────────
+
+
+@dataclass
+class _StubStatus:
+    value: str
+
+    def __eq__(self, other):
+        if isinstance(other, str):
+            return self.value == other
+        if isinstance(other, _StubStatus):
+            return self.value == other.value
+        return NotImplemented
+
+
+@dataclass
+class StubEditPlan:
+    id: str = "plan-001"
+    template_id: str = "tmpl-001"
+    status: Any = None
+    config: dict = field(default_factory=dict)
+    project_id: str = ""
+    created_by_user_id: str = "user-001"
+
+    def mark_failed(self):
+        self.status = _StubStatus("failed")
+
+    def mark_completed(self):
+        self.status = _StubStatus("completed")
+
+
+@dataclass
+class StubGenerationTask:
+    id: str = "gen-task-001"
+    status: Any = field(default_factory=lambda: _StubStatus("pending"))
+    error_message: str = ""
+    progress: float = 0.0
+    result_count: int = 0
+    started_at: Any = None
+    completed_at: Any = None
+    project_id: str = ""
+    created_by_user_id: str = "user-001"
+
+
+@dataclass
+class StubClip:
+    id: str = "clip-001"
+    plan_id: str = "plan-001"
+    asset_id: str = "assets/video.mp4"
+    order: int = 1
+    status: Any = field(default_factory=lambda: _StubStatus("ready"))
+    transition_effect: str = ""
+    text_content: str = ""
+    clip_type: str = "MAIN"
+    duration: float = 0.0
+
+    def mark_failed(self):
+        self.status = _StubStatus("failed")
+
+    def mark_rendered(self):
+        self.status = _StubStatus("rendered")
+
+
+# ── Stub repositories ─────────────────────────────────────────────────────────
+
+
+class StubPlanRepo:
+    def __init__(self, plan: StubEditPlan):
+        self._plan = plan
+
+    def get(self, plan_id: str) -> Optional[StubEditPlan]:
+        if plan_id == self._plan.id:
+            return self._plan
+        return None
+
+    def update(self, plan: StubEditPlan) -> StubEditPlan:
+        self._plan = plan
+        return plan
+
+
+class StubClipRepo:
+    def __init__(self, clips: list[StubClip] | None = None):
+        self._clips = clips or []
+
+    def list_by_plan(self, plan_id: str, skip: int = 0, limit: int = 10000) -> list[StubClip]:
+        return [c for c in self._clips if c.plan_id == plan_id]
+
+    def get(self, clip_id: str) -> Optional[StubClip]:
+        for c in self._clips:
+            if c.id == clip_id:
+                return c
+        return None
+
+    def update(self, clip: StubClip) -> StubClip:
+        return clip
+
+
+class StubGenTaskRepo:
+    def __init__(self, task: StubGenerationTask | None = None):
+        self._store: dict[str, StubGenerationTask] = {}
+        if task:
+            self._store[task.id] = task
+
+    def get(self, task_id: str) -> Optional[StubGenerationTask]:
+        return self._store.get(task_id)
+
+    def update(self, task: StubGenerationTask) -> StubGenerationTask:
+        self._store[task.id] = task
+        return task
+
+
+# ── Import task module (after mocks are in place) ─────────────────────────────
+
+from worker_app.tasks.edit_plan_generation import render_edit_plan
+
+# ── Tests ─────────────────────────────────────────────────────────────────────
+
+
+class TestRenderEditPlanFailureUpdatesGenTask:
+    """P0-2: render_edit_plan 异常时更新 GenerationTask 状态为 failed"""
+
+    def _make_bound_task(self):
+        """构建绑定的 Celery task mock"""
+        task = MagicMock()
+        task.retry = MagicMock(side_effect=RuntimeError("retry called"))
+        return task
+
+    def test_exception_marks_gen_task_failed(self):
+        """异常时 GenerationTask.status 被设为 failed"""
+        plan = StubEditPlan(status=_StubStatus("rendering"))
+        plan.config["generation_task_id"] = "gen-task-001"
+        gen_task = StubGenerationTask(id="gen-task-001", status=_StubStatus("running"))
+
+        plan_repo = StubPlanRepo(plan)
+        gen_task_repo = StubGenTaskRepo(gen_task)
+
+        # 让 clip_repo 抛异常以触发 except 路径
+        clip_repo_bad = MagicMock()
+        clip_repo_bad.list_by_plan.side_effect = RuntimeError("OSS 连接失败")
+
+        def fake_get_repos():
+            yield plan_repo, clip_repo_bad, gen_task_repo, MagicMock()
+
+        bound_task = self._make_bound_task()
+
+        with patch(
+            "worker_app.tasks.edit_plan_generation._get_repos",
+            side_effect=fake_get_repos,
+        ):
+            with pytest.raises(RuntimeError, match="retry called"):
+                render_edit_plan(bound_task, "plan-001")
+
+        # 核心断言：GenerationTask 状态为 failed（生产代码赋值为字符串）
+        assert gen_task.status == "failed"
+
+    def test_exception_records_error_message(self):
+        """异常时 error_message 包含异常类型和描述"""
+        plan = StubEditPlan(status=_StubStatus("rendering"))
+        plan.config["generation_task_id"] = "gen-task-001"
+        gen_task = StubGenerationTask(id="gen-task-001", status=_StubStatus("running"))
+
+        plan_repo = StubPlanRepo(plan)
+        clip_repo = MagicMock()
+        clip_repo.list_by_plan.side_effect = RuntimeError("DB 查询超时")
+        gen_task_repo = StubGenTaskRepo(gen_task)
+
+        def fake_get_repos():
+            yield plan_repo, clip_repo, gen_task_repo, MagicMock()
+
+        bound_task = self._make_bound_task()
+
+        with patch(
+            "worker_app.tasks.edit_plan_generation._get_repos",
+            side_effect=fake_get_repos,
+        ):
+            with pytest.raises(RuntimeError, match="retry called"):
+                render_edit_plan(bound_task, "plan-001")
+
+        assert gen_task.status == "failed"
+        assert "DB 查询超时" in gen_task.error_message
+        assert "RuntimeError" in gen_task.error_message
+
+    def test_exception_sets_completed_at(self):
+        """异常时 completed_at 被设置"""
+        plan = StubEditPlan(status=_StubStatus("rendering"))
+        plan.config["generation_task_id"] = "gen-task-001"
+        gen_task = StubGenerationTask(id="gen-task-001", status=_StubStatus("running"))
+
+        plan_repo = StubPlanRepo(plan)
+        clip_repo = MagicMock()
+        clip_repo.list_by_plan.side_effect = RuntimeError("boom")
+        gen_task_repo = StubGenTaskRepo(gen_task)
+
+        def fake_get_repos():
+            yield plan_repo, clip_repo, gen_task_repo, MagicMock()
+
+        bound_task = self._make_bound_task()
+
+        with patch(
+            "worker_app.tasks.edit_plan_generation._get_repos",
+            side_effect=fake_get_repos,
+        ):
+            with pytest.raises(RuntimeError):
+                render_edit_plan(bound_task, "plan-001")
+
+        assert gen_task.completed_at is not None
+
+    def test_no_generation_task_id_does_not_crash(self):
+        """generation_task_id 为空时，异常处理不崩溃"""
+        plan = StubEditPlan(status=_StubStatus("rendering"))
+        plan.config = {}  # 不设置 generation_task_id
+
+        plan_repo = StubPlanRepo(plan)
+        clip_repo = MagicMock()
+        clip_repo.list_by_plan.side_effect = RuntimeError("boom")
+        gen_task_repo = StubGenTaskRepo()  # 空 repo
+
+        def fake_get_repos():
+            yield plan_repo, clip_repo, gen_task_repo, MagicMock()
+
+        bound_task = self._make_bound_task()
+
+        with patch(
+            "worker_app.tasks.edit_plan_generation._get_repos",
+            side_effect=fake_get_repos,
+        ):
+            with pytest.raises(RuntimeError, match="retry called"):
+                render_edit_plan(bound_task, "plan-001")
+
+        # 计划仍被标记为 failed
+        assert plan.status.value == "failed"
+
+    def test_gen_task_update_failure_does_not_block_retry(self):
+        """更新 GenerationTask 失败时，不影响 retry 流程"""
+        plan = StubEditPlan(status=_StubStatus("rendering"))
+        plan.config["generation_task_id"] = "gen-task-001"
+        gen_task = StubGenerationTask(id="gen-task-001", status=_StubStatus("running"))
+
+        plan_repo = StubPlanRepo(plan)
+        clip_repo = MagicMock()
+        clip_repo.list_by_plan.side_effect = RuntimeError("原始错误")
+        # gen_task_repo.update 也抛异常
+        gen_task_repo = MagicMock()
+        gen_task_repo.get.return_value = gen_task
+        gen_task_repo.update.side_effect = RuntimeError("DB 写入失败")
+
+        def fake_get_repos():
+            yield plan_repo, clip_repo, gen_task_repo, MagicMock()
+
+        bound_task = self._make_bound_task()
+
+        with patch(
+            "worker_app.tasks.edit_plan_generation._get_repos",
+            side_effect=fake_get_repos,
+        ):
+            with pytest.raises(RuntimeError, match="retry called"):
+                render_edit_plan(bound_task, "plan-001")
+
+        # retry 被调用说明流程正确
+        bound_task.retry.assert_called_once()
+
+    def test_already_failed_gen_task_not_overwritten(self):
+        """已经 failed 的 GenerationTask 不会被重复更新"""
+        plan = StubEditPlan(status=_StubStatus("rendering"))
+        plan.config["generation_task_id"] = "gen-task-001"
+        gen_task = StubGenerationTask(
+            id="gen-task-001",
+            status=_StubStatus("failed"),  # 已经是 failed
+            error_message="之前的错误",
+        )
+
+        plan_repo = StubPlanRepo(plan)
+        clip_repo = MagicMock()
+        clip_repo.list_by_plan.side_effect = RuntimeError("新错误")
+        gen_task_repo = StubGenTaskRepo(gen_task)
+
+        def fake_get_repos():
+            yield plan_repo, clip_repo, gen_task_repo, MagicMock()
+
+        bound_task = self._make_bound_task()
+
+        with patch(
+            "worker_app.tasks.edit_plan_generation._get_repos",
+            side_effect=fake_get_repos,
+        ):
+            with pytest.raises(RuntimeError, match="retry called"):
+                render_edit_plan(bound_task, "plan-001")
+
+        # error_message 应保持原值，不被覆盖
+        assert gen_task.error_message == "之前的错误"

tests/unit/test_empty_plan_id_marks_failed.py

@@ -1,32 +0,0 @@
-"""回归测试：source_edit_plan_id 为空时任务必须被标记为 failed。
-
-背景 (2026-08-24)：确认生成卡在 10%。根因是 worker 在
-source_edit_plan_id 为空时直接 return failed，但没有调用 mark_failed，
-导致 DB 状态永远停在 running。
-"""
-
-from pathlib import Path
-
-GENERATION_PY = Path(__file__).resolve().parents[2] / "apps" / "worker" / "worker_app" / "tasks" / "generation.py"
-
-
-def test_mark_failed_in_else_branch():
-    """generation.py 中 source_edit_plan_id 为空的 else 分支必须调用 mark_failed。"""
-    source = GENERATION_PY.read_text(encoding="utf-8")
-
-    # 定位 else 分支：紧跟在 'source_edit_plan_id 为空' 日志之后的 else 块
-    marker = "source_edit_plan_id 为空"
-    idx = source.find(marker)
-    assert idx != -1, f"generation.py 中未找到 '{marker}'"
-
-    # 从 marker 位置向后搜索到下一个 return 语句
-    after_marker = source[idx:]
-    return_idx = after_marker.find("return {")
-    assert return_idx != -1, "else 分支中未找到 return 语句"
-
-    # 关键断言：marker 和 return 之间必须包含 mark_failed
-    block = source[idx : idx + return_idx]
-    assert "mark_failed" in block, (
-        "else 分支在 return 之前必须调用 _update_task_status(task_id, "
-        "'mark_failed', ...) 以更新 DB 状态，否则任务永远卡在 running"
-    )

tests/unit/test_fallback_user_assets.py

@@ -0,0 +1,331 @@
+"""Unit tests for PR #1338: 确认生成兜底增强 — user_id 查找素材.
+
+覆盖:
+- SQLAlchemyAssetRepository.find_ready_videos_by_user
+- _auto_fallback_auto_material_mode 策略2 (user_id 兜底)
+"""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock
+
+import pytest
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
+sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "packages"))
+
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
+from packages.adapters.sqlalchemy_impl.asset_repository import SQLAlchemyAssetRepository
+from packages.adapters.sqlalchemy_impl.models import Base
+from packages.domain import Asset, AssetStatus
+
+
+def _make_repo():
+    engine = create_engine("sqlite:///:memory:")
+    Base.metadata.create_all(engine)
+    session = sessionmaker(bind=engine)()
+    return SQLAlchemyAssetRepository(session)
+
+
+class TestFindReadyVideosByUser:
+    """SQLAlchemyAssetRepository.find_ready_videos_by_user 测试."""
+
+    def test_returns_ready_videos_for_user(self):
+        repo = _make_repo()
+        user_id = "user-abc-123"
+        v1 = Asset.create(
+            project_id="",
+            library_id="lib-1",
+            name="video1.mp4",
+            storage_key="v/v1.mp4",
+            mime_type="video/mp4",
+            status=AssetStatus.READY,
+            uploaded_by_user_id=user_id,
+        )
+        v2 = Asset.create(
+            project_id="",
+            library_id="lib-1",
+            name="video2.mp4",
+            storage_key="v/v2.mp4",
+            mime_type="video/mp4",
+            status=AssetStatus.READY,
+            uploaded_by_user_id=user_id,
+        )
+        repo.create(v1)
+        repo.create(v2)
+        result = repo.find_ready_videos_by_user(user_id)
+        assert len(result) == 2
+        assert {a.id for a in result} == {v1.id, v2.id}
+
+    def test_excludes_non_video_assets(self):
+        repo = _make_repo()
+        user_id = "user-abc-123"
+        video = Asset.create(
+            project_id="",
+            library_id="lib-1",
+            name="clip.mp4",
+            storage_key="v/clip.mp4",
+            mime_type="video/mp4",
+            status=AssetStatus.READY,
+            uploaded_by_user_id=user_id,
+        )
+        image = Asset.create(
+            project_id="",
+            library_id="lib-1",
+            name="photo.jpg",
+            storage_key="v/photo.jpg",
+            mime_type="image/jpeg",
+            status=AssetStatus.READY,
+            uploaded_by_user_id=user_id,
+        )
+        repo.create(video)
+        repo.create(image)
+        result = repo.find_ready_videos_by_user(user_id)
+        assert len(result) == 1
+        assert result[0].id == video.id
+
+    def test_excludes_non_ready_assets(self):
+        repo = _make_repo()
+        user_id = "user-abc-123"
+        ready = Asset.create(
+            project_id="",
+            library_id="lib-1",
+            name="ready.mp4",
+            storage_key="v/ready.mp4",
+            mime_type="video/mp4",
+            status=AssetStatus.READY,
+            uploaded_by_user_id=user_id,
+        )
+        uploading = Asset.create(
+            project_id="",
+            library_id="lib-1",
+            name="uploading.mp4",
+            storage_key="v/uploading.mp4",
+            mime_type="video/mp4",
+            status=AssetStatus.UPLOADING,
+            uploaded_by_user_id=user_id,
+        )
+        repo.create(ready)
+        repo.create(uploading)
+        result = repo.find_ready_videos_by_user(user_id)
+        assert len(result) == 1
+        assert result[0].id == ready.id
+
+    def test_excludes_other_users_assets(self):
+        repo = _make_repo()
+        my_video = Asset.create(
+            project_id="",
+            library_id="lib-1",
+            name="mine.mp4",
+            storage_key="v/mine.mp4",
+            mime_type="video/mp4",
+            status=AssetStatus.READY,
+            uploaded_by_user_id="user-A",
+        )
+        other_video = Asset.create(
+            project_id="",
+            library_id="lib-1",
+            name="other.mp4",
+            storage_key="v/other.mp4",
+            mime_type="video/mp4",
+            status=AssetStatus.READY,
+            uploaded_by_user_id="user-B",
+        )
+        repo.create(my_video)
+        repo.create(other_video)
+        result = repo.find_ready_videos_by_user("user-A")
+        assert len(result) == 1
+        assert result[0].id == my_video.id
+
+    def test_empty_result_for_unknown_user(self):
+        repo = _make_repo()
+        result = repo.find_ready_videos_by_user("nonexistent-user")
+        assert result == []
+
+    def test_respects_limit(self):
+        repo = _make_repo()
+        user_id = "user-abc-123"
+        for i in range(10):
+            asset = Asset.create(
+                project_id="",
+                library_id="lib-1",
+                name=f"video_{i}.mp4",
+                storage_key=f"v/v{i}.mp4",
+                mime_type="video/mp4",
+                status=AssetStatus.READY,
+                uploaded_by_user_id=user_id,
+            )
+            repo.create(asset)
+        result = repo.find_ready_videos_by_user(user_id, limit=3)
+        assert len(result) == 3
+
+
+class TestAutoFallbackAutoMaterialModeUserId:
+    """_auto_fallback_auto_material_mode user_id 兜底策略测试."""
+
+    def _make_plan_check(self, project_id="", template_id="tmpl-1"):
+        plan = MagicMock()
+        plan.project_id = project_id
+        plan.template_id = template_id
+        plan.config = {}
+        return plan
+
+    def _make_clip(self, clip_id="clip-1"):
+        clip = MagicMock()
+        clip.id = clip_id
+        clip.asset_id = ""
+        return clip
+
+    def test_skips_when_no_clips_without_asset(self):
+        from app.api.routes.templates_editor._fallback import (
+            _auto_fallback_auto_material_mode,
+        )
+
+        svc = MagicMock()
+        plan_check = self._make_plan_check()
+        _auto_fallback_auto_material_mode(
+            svc,
+            "plan-1",
+            plan_check,
+            [],
+            MagicMock(),
+            MagicMock(),
+            user_id="user-1",
+        )
+        svc.assign_asset.assert_not_called()
+
+    def test_strategy2_user_id_fallback(self):
+        from app.api.routes.templates_editor._fallback import (
+            _auto_fallback_auto_material_mode,
+        )
+
+        svc = MagicMock()
+        plan_check = self._make_plan_check(project_id="")
+        clip = self._make_clip("clip-1")
+        mock_asset = MagicMock()
+        mock_asset.id = "asset-from-user"
+        mock_asset.status = AssetStatus.READY
+        mock_asset.mime_type = "video/mp4"
+        asset_repo = MagicMock()
+        asset_repo.find_ready_videos_by_user.return_value = [mock_asset]
+        asset_library_repo = MagicMock()
+        _auto_fallback_auto_material_mode(
+            svc,
+            "plan-1",
+            plan_check,
+            [clip],
+            asset_library_repo,
+            asset_repo,
+            user_id="user-123",
+        )
+        asset_repo.find_ready_videos_by_user.assert_called_once_with("user-123")
+        svc.assign_asset.assert_called_once_with("clip-1", "asset-from-user")
+
+    def test_strategy1_takes_priority_over_strategy2(self):
+        from app.api.routes.templates_editor._fallback import (
+            _auto_fallback_auto_material_mode,
+        )
+
+        svc = MagicMock()
+        plan_check = self._make_plan_check(project_id="proj-1")
+        clip = self._make_clip("clip-1")
+        mock_lib = MagicMock()
+        mock_lib.id = "lib-video"
+        mock_lib.kind = MagicMock()
+        mock_lib.kind.value = "video"
+        mock_asset = MagicMock()
+        mock_asset.id = "asset-from-project"
+        mock_asset.status = "ready"
+        mock_asset.mime_type = "video/mp4"
+        asset_library_repo = MagicMock()
+        asset_library_repo.find_by_project.return_value = [mock_lib]
+        asset_repo = MagicMock()
+        asset_repo.find_by_library.return_value = [mock_asset]
+        _auto_fallback_auto_material_mode(
+            svc,
+            "plan-1",
+            plan_check,
+            [clip],
+            asset_library_repo,
+            asset_repo,
+            user_id="user-123",
+        )
+        asset_library_repo.find_by_project.assert_called_once_with("proj-1")
+        asset_repo.find_ready_videos_by_user.assert_not_called()
+        svc.assign_asset.assert_called_once_with("clip-1", "asset-from-project")
+
+    def test_falls_back_when_project_has_no_videos(self):
+        from app.api.routes.templates_editor._fallback import (
+            _auto_fallback_auto_material_mode,
+        )
+
+        svc = MagicMock()
+        plan_check = self._make_plan_check(project_id="proj-1")
+        clip = self._make_clip("clip-1")
+        asset_library_repo = MagicMock()
+        asset_library_repo.find_by_project.return_value = []
+        mock_asset = MagicMock()
+        mock_asset.id = "asset-from-user"
+        mock_asset.status = AssetStatus.READY
+        mock_asset.mime_type = "video/mp4"
+        asset_repo = MagicMock()
+        asset_repo.find_ready_videos_by_user.return_value = [mock_asset]
+        _auto_fallback_auto_material_mode(
+            svc,
+            "plan-1",
+            plan_check,
+            [clip],
+            asset_library_repo,
+            asset_repo,
+            user_id="user-123",
+        )
+        asset_repo.find_ready_videos_by_user.assert_called_once_with("user-123")
+        svc.assign_asset.assert_called_once_with("clip-1", "asset-from-user")
+
+    def test_no_assets_found_does_nothing(self):
+        from app.api.routes.templates_editor._fallback import (
+            _auto_fallback_auto_material_mode,
+        )
+
+        svc = MagicMock()
+        plan_check = self._make_plan_check(project_id="")
+        clip = self._make_clip("clip-1")
+        asset_repo = MagicMock()
+        asset_repo.find_ready_videos_by_user.return_value = []
+        asset_library_repo = MagicMock()
+        _auto_fallback_auto_material_mode(
+            svc,
+            "plan-1",
+            plan_check,
+            [clip],
+            asset_library_repo,
+            asset_repo,
+            user_id="user-123",
+        )
+        svc.assign_asset.assert_not_called()
+
+    def test_no_user_id_skips_strategy2(self):
+        from app.api.routes.templates_editor._fallback import (
+            _auto_fallback_auto_material_mode,
+        )
+
+        svc = MagicMock()
+        plan_check = self._make_plan_check(project_id="")
+        clip = self._make_clip("clip-1")
+        asset_repo = MagicMock()
+        asset_library_repo = MagicMock()
+        _auto_fallback_auto_material_mode(
+            svc,
+            "plan-1",
+            plan_check,
+            [clip],
+            asset_library_repo,
+            asset_repo,
+            user_id="",
+        )
+        asset_repo.find_ready_videos_by_user.assert_not_called()
+        svc.assign_asset.assert_not_called()

tests/unit/test_generate_title_and_cover.py

@@ -0,0 +1,369 @@
+"""Tests for /generate endpoint — custom_title and cover_url passing."""
+
+from __future__ import annotations
+
+import json
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+
+class TestGenerateEndpointTitleAndCover:
+    """测试 /generate 端点传递 custom_title 和 cover_url。"""
+
+    def test_generate_passes_cover_url_from_plan_config(self):
+        """从 plan.config.cover.image_url 读取封面 URL 传递给生成任务。"""
+        from app.api.routes.templates_editor.generation import generate_editor_draft
+        from app.api.routes.templates_editor.schemas import EditPlanGenerateRequest
+
+        mock_plan = MagicMock()
+        mock_plan.id = "plan-123"
+        mock_plan.project_id = "project-1"
+        mock_plan.template_id = "template-1"
+        mock_plan.status = MagicMock(value="editing")
+        mock_plan.config = {
+            "clips": [{"id": "c1"}],
+            "asset_ids": ["a1"],
+            "cover": {"type": "upload", "image_url": "https://oss.example.com/uploaded/cover.jpg"},
+        }
+        mock_plan.updated_at = None
+
+        mock_plan_svc = MagicMock()
+        mock_plan_svc.get_plan_or_raise.return_value = mock_plan
+        mock_plan_svc.can_generate.return_value = (True, "")
+        mock_plan_svc.mark_clips_ready.return_value = 1
+        mock_template_svc = MagicMock()
+
+        mock_gen_task = MagicMock()
+        mock_gen_task.id = "task-new"
+        mock_gen_task.project_id = "project-1"
+
+        mock_current_user = MagicMock()
+        mock_current_user.user.id = "user-1"
+
+        body = EditPlanGenerateRequest()  # No title_config
+
+        with (
+            patch("app.api.routes.templates_editor.generation.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
+            patch("app.api.routes.templates_editor.generation.CreateGenerationTaskUseCase") as mock_usecase_cls,
+            patch("app.api.routes.templates_editor.generation._find_reusable_preview_task", return_value=None),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_draft_to_editing"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_copy_template_clips"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_assign_assets", return_value=[]),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_auto_material_mode"),
+            patch("app.api.routes.templates_editor.generation._check_queue_limits"),
+            patch("app.api.routes.templates_editor.generation.celery_app"),
+            patch("app.api.routes.templates_editor.generation.get_draft_plan_id", return_value="plan-123"),
+        ):
+            mock_repo = MagicMock()
+            mock_repo_cls.return_value = mock_repo
+
+            mock_usecase = MagicMock()
+            mock_usecase.execute.return_value = mock_gen_task
+            mock_usecase_cls.return_value = mock_usecase
+
+            mock_plan_svc.transition_status = MagicMock()
+            mock_plan_svc.get_plan_or_raise.return_value = mock_plan
+
+            result = generate_editor_draft(
+                template_id="template-1",
+                request=body,
+                plan_id="plan-123",
+                services=(mock_template_svc, mock_plan_svc),
+                db=MagicMock(),
+                current_user=mock_current_user,
+                asset_library_repo=MagicMock(),
+                asset_repo=MagicMock(),
+            )
+
+            # Verify cover_url was passed to CreateGenerationTaskCommand
+            call_args = mock_usecase.execute.call_args
+            command = call_args[0][0]
+            assert command.cover_url == "https://oss.example.com/uploaded/cover.jpg"
+            assert command.custom_title == ""
+
+    def test_generate_passes_custom_title_from_title_config(self):
+        """前端传 title_config 时，序列化为 JSON 存入 custom_title。"""
+        from app.api.routes.templates_editor.generation import generate_editor_draft
+        from app.api.routes.templates_editor.schemas import EditPlanGenerateRequest
+
+        mock_plan = MagicMock()
+        mock_plan.id = "plan-456"
+        mock_plan.project_id = "project-1"
+        mock_plan.template_id = "template-1"
+        mock_plan.status = MagicMock(value="editing")
+        mock_plan.config = {
+            "clips": [{"id": "c1"}],
+            "asset_ids": ["a1"],
+            "cover": {"type": "ai_frame", "image_url": "https://oss.example.com/cover.jpg"},
+        }
+        mock_plan.updated_at = None
+
+        mock_plan_svc = MagicMock()
+        mock_plan_svc.get_plan_or_raise.return_value = mock_plan
+        mock_plan_svc.can_generate.return_value = (True, "")
+        mock_plan_svc.mark_clips_ready.return_value = 1
+        mock_template_svc = MagicMock()
+
+        mock_gen_task = MagicMock()
+        mock_gen_task.id = "task-title"
+
+        mock_current_user = MagicMock()
+        mock_current_user.user.id = "user-1"
+
+        title_config = {
+            "text": "测试标题",
+            "font_size": 36,
+            "font_color": "#ffffff",
+            "position": "center",
+        }
+        body = EditPlanGenerateRequest(title_config=title_config)
+
+        with (
+            patch("app.api.routes.templates_editor.generation.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
+            patch("app.api.routes.templates_editor.generation.CreateGenerationTaskUseCase") as mock_usecase_cls,
+            patch("app.api.routes.templates_editor.generation._find_reusable_preview_task", return_value=None),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_draft_to_editing"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_copy_template_clips"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_assign_assets", return_value=[]),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_auto_material_mode"),
+            patch("app.api.routes.templates_editor.generation._check_queue_limits"),
+            patch("app.api.routes.templates_editor.generation.celery_app"),
+        ):
+            mock_repo = MagicMock()
+            mock_repo_cls.return_value = mock_repo
+
+            mock_usecase = MagicMock()
+            mock_usecase.execute.return_value = mock_gen_task
+            mock_usecase_cls.return_value = mock_usecase
+
+            mock_plan_svc.transition_status = MagicMock()
+            mock_plan_svc.get_plan_or_raise.return_value = mock_plan
+
+            result = generate_editor_draft(
+                template_id="template-1",
+                request=body,
+                plan_id="plan-456",
+                services=(mock_template_svc, mock_plan_svc),
+                db=MagicMock(),
+                current_user=mock_current_user,
+                asset_library_repo=MagicMock(),
+                asset_repo=MagicMock(),
+            )
+
+            # Verify custom_title was serialized to JSON
+            call_args = mock_usecase.execute.call_args
+            command = call_args[0][0]
+            parsed_title = json.loads(command.custom_title)
+            assert parsed_title["text"] == "测试标题"
+            assert parsed_title["font_size"] == 36
+            assert command.cover_url == "https://oss.example.com/cover.jpg"
+
+    def test_generate_empty_title_config_passes_empty_custom_title(self):
+        """title_config 为空时 custom_title 为空字符串。"""
+        from app.api.routes.templates_editor.generation import generate_editor_draft
+        from app.api.routes.templates_editor.schemas import EditPlanGenerateRequest
+
+        mock_plan = MagicMock()
+        mock_plan.id = "plan-789"
+        mock_plan.project_id = "project-1"
+        mock_plan.template_id = "template-1"
+        mock_plan.status = MagicMock(value="editing")
+        mock_plan.config = {"clips": [{"id": "c1"}], "asset_ids": ["a1"]}
+        mock_plan.updated_at = None
+
+        mock_plan_svc = MagicMock()
+        mock_plan_svc.get_plan_or_raise.return_value = mock_plan
+        mock_plan_svc.can_generate.return_value = (True, "")
+        mock_plan_svc.mark_clips_ready.return_value = 1
+        mock_template_svc = MagicMock()
+
+        mock_gen_task = MagicMock()
+        mock_gen_task.id = "task-no-title"
+
+        body = EditPlanGenerateRequest()  # No title_config
+
+        with (
+            patch("app.api.routes.templates_editor.generation.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
+            patch("app.api.routes.templates_editor.generation.CreateGenerationTaskUseCase") as mock_usecase_cls,
+            patch("app.api.routes.templates_editor.generation._find_reusable_preview_task", return_value=None),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_draft_to_editing"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_copy_template_clips"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_assign_assets", return_value=[]),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_auto_material_mode"),
+            patch("app.api.routes.templates_editor.generation._check_queue_limits"),
+            patch("app.api.routes.templates_editor.generation.celery_app"),
+        ):
+            mock_repo = MagicMock()
+            mock_repo_cls.return_value = mock_repo
+
+            mock_usecase = MagicMock()
+            mock_usecase.execute.return_value = mock_gen_task
+            mock_usecase_cls.return_value = mock_usecase
+
+            mock_plan_svc.transition_status = MagicMock()
+            mock_plan_svc.get_plan_or_raise.return_value = mock_plan
+
+            result = generate_editor_draft(
+                template_id="template-1",
+                request=body,
+                plan_id="plan-789",
+                services=(mock_template_svc, mock_plan_svc),
+                db=MagicMock(),
+                current_user=MagicMock(),
+                asset_library_repo=MagicMock(),
+                asset_repo=MagicMock(),
+            )
+
+            call_args = mock_usecase.execute.call_args
+            command = call_args[0][0]
+            assert command.custom_title == ""
+
+
+class TestGenerateEndpointRequestSchema:
+    """测试 EditPlanGenerateRequest schema。"""
+
+    def test_schema_default_empty_title_config(self):
+        """默认 title_config 为空 dict。"""
+        from app.api.routes.templates_editor.schemas import EditPlanGenerateRequest
+
+        req = EditPlanGenerateRequest()
+        assert req.title_config == {}
+
+    def test_schema_accepts_title_config(self):
+        """可以传入标题配置。"""
+        from app.api.routes.templates_editor.schemas import EditPlanGenerateRequest
+
+        req = EditPlanGenerateRequest(title_config={"text": "我的标题", "font_size": 48})
+        assert req.title_config["text"] == "我的标题"
+        assert req.title_config["font_size"] == 48
+
+
+class TestGenerateTitleChangeSkipsReuse:
+    """测试标题变更时跳过预览产物复用。"""
+
+    def _make_mocks(self, custom_title=""):
+        mock_plan = MagicMock()
+        mock_plan.id = "plan-reuse"
+        mock_plan.project_id = "project-1"
+        mock_plan.template_id = "template-1"
+        mock_plan.status = MagicMock(value="editing")
+        mock_plan.config = {"clips": [{"id": "c1"}], "asset_ids": ["a1"]}
+        mock_plan.updated_at = None
+
+        mock_plan_svc = MagicMock()
+        mock_plan_svc.get_plan_or_raise.return_value = mock_plan
+        mock_plan_svc.can_generate.return_value = (True, "")
+        mock_plan_svc.mark_clips_ready.return_value = 1
+        mock_template_svc = MagicMock()
+
+        reusable_task = MagicMock()
+        reusable_task.id = "task-reusable"
+        reusable_task.is_completed = True
+        reusable_task.is_preview = True
+        reusable_task.custom_title = custom_title
+        reusable_task.project_id = "project-1"
+        reusable_task.source_edit_plan_id = "plan-reuse"
+
+        mock_new_task = MagicMock()
+        mock_new_task.id = "task-new"
+
+        return mock_plan, mock_plan_svc, mock_template_svc, reusable_task, mock_new_task
+
+    def test_title_removed_skips_reuse(self):
+        """原来有标题，现在移除了 → 跳过复用，创建新任务。"""
+        from app.api.routes.templates_editor.generation import generate_editor_draft
+        from app.api.routes.templates_editor.schemas import EditPlanGenerateRequest
+
+        mock_plan, mock_plan_svc, mock_template_svc, reusable_task, mock_new_task = self._make_mocks(
+            custom_title='{"text": "旧标题"}'
+        )
+
+        body = EditPlanGenerateRequest()  # No title_config → title removed
+
+        with (
+            patch("app.api.routes.templates_editor.generation.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
+            patch("app.api.routes.templates_editor.generation.CreateGenerationTaskUseCase") as mock_usecase_cls,
+            patch("app.api.routes.templates_editor.generation._find_reusable_preview_task", return_value=reusable_task),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_draft_to_editing"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_copy_template_clips"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_assign_assets", return_value=[]),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_auto_material_mode"),
+            patch("app.api.routes.templates_editor.generation._check_queue_limits"),
+            patch("app.api.routes.templates_editor.generation.celery_app"),
+            patch("app.api.routes.templates_editor.generation.get_draft_plan_id", return_value="plan-reuse"),
+        ):
+            mock_repo = MagicMock()
+            mock_repo_cls.return_value = mock_repo
+
+            mock_usecase = MagicMock()
+            mock_usecase.execute.return_value = mock_new_task
+            mock_usecase_cls.return_value = mock_usecase
+
+            mock_plan_svc.transition_status = MagicMock()
+            mock_plan_svc.get_plan_or_raise.return_value = mock_plan
+
+            result = generate_editor_draft(
+                template_id="template-1",
+                request=body,
+                plan_id="plan-reuse",
+                services=(mock_template_svc, mock_plan_svc),
+                db=MagicMock(),
+                current_user=MagicMock(),
+                asset_library_repo=MagicMock(),
+                asset_repo=MagicMock(),
+            )
+
+            # 应该创建新任务而不是复用
+            mock_usecase.execute.assert_called_once()
+            # 不应该 mark_confirmed 在 reusable_task 上
+            reusable_task.mark_confirmed.assert_not_called()
+
+    def test_title_changed_skips_reuse(self):
+        """标题变更 → 跳过复用。"""
+        import json
+
+        from app.api.routes.templates_editor.generation import generate_editor_draft
+        from app.api.routes.templates_editor.schemas import EditPlanGenerateRequest
+
+        mock_plan, mock_plan_svc, mock_template_svc, reusable_task, mock_new_task = self._make_mocks(
+            custom_title=json.dumps({"text": "旧标题", "font_size": 36}, ensure_ascii=False)
+        )
+
+        body = EditPlanGenerateRequest(title_config={"text": "新标题", "font_size": 48})
+
+        with (
+            patch("app.api.routes.templates_editor.generation.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
+            patch("app.api.routes.templates_editor.generation.CreateGenerationTaskUseCase") as mock_usecase_cls,
+            patch("app.api.routes.templates_editor.generation._find_reusable_preview_task", return_value=reusable_task),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_draft_to_editing"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_copy_template_clips"),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_assign_assets", return_value=[]),
+            patch("app.api.routes.templates_editor.generation._auto_fallback_auto_material_mode"),
+            patch("app.api.routes.templates_editor.generation._check_queue_limits"),
+            patch("app.api.routes.templates_editor.generation.celery_app"),
+            patch("app.api.routes.templates_editor.generation.get_draft_plan_id", return_value="plan-reuse"),
+        ):
+            mock_repo = MagicMock()
+            mock_repo_cls.return_value = mock_repo
+
+            mock_usecase = MagicMock()
+            mock_usecase.execute.return_value = mock_new_task
+            mock_usecase_cls.return_value = mock_usecase
+
+            mock_plan_svc.transition_status = MagicMock()
+            mock_plan_svc.get_plan_or_raise.return_value = mock_plan
+
+            result = generate_editor_draft(
+                template_id="template-1",
+                request=body,
+                plan_id="plan-reuse",
+                services=(mock_template_svc, mock_plan_svc),
+                db=MagicMock(),
+                current_user=MagicMock(),
+                asset_library_repo=MagicMock(),
+                asset_repo=MagicMock(),
+            )
+
+            mock_usecase.execute.assert_called_once()
+            reusable_task.mark_confirmed.assert_not_called()

tests/unit/test_generation_cover.py

@@ -987,159 +987,6 @@ class TestUploadCoverType:
             # 标题文字必须透传给持久化函数（用于源素材帧叠加标题）
             assert mock_persist.call_args.kwargs.get("title_text") == "我的视频标题"
 
-    def test_e2_passes_full_title_style_to_persist(self):
-        """步骤E2：plan.config.title 包含完整样式时，color/position/font_size 都传给 _persist_cover_frame。"""
-        from unittest.mock import MagicMock, patch
-
-        from app.api.routes.generation_cover import GenerateCoverRequest
-
-        mock_plan = MagicMock()
-        mock_plan.config = {
-            "title": {
-                "enabled": True,
-                "text": "样式标题",
-                "color": "#00ff00",
-                "position": "top",
-                "font_size": 42,
-            }
-        }
-
-        mock_plan_svc = MagicMock()
-        mock_plan_svc.get_plan_or_raise.return_value = mock_plan
-        mock_template_svc = MagicMock()
-        mock_db = MagicMock()
-
-        mock_asset = MagicMock()
-        mock_asset.file_type = "video"
-        mock_asset.storage_key = "uploads/src.mp4"
-        mock_asset_repo = MagicMock()
-        mock_asset_repo.get.return_value = mock_asset
-
-        mock_mk = MagicMock()
-        mock_mk.is_available = True
-        mock_mk.extract_frames.return_value = [{"image_url": "https://mk/frame.jpg"}]
-
-        mock_storage = MagicMock()
-        mock_storage.get_url.return_value = "https://oss.example.com/uploads/src.mp4"
-
-        body = GenerateCoverRequest(cover_type="ai_frame", asset_ids=["a1"])
-
-        with (
-            patch("app.api.routes.generation_cover.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
-            patch(
-                "packages.adapters.sqlalchemy_impl.asset_repository.SQLAlchemyAssetRepository",
-                return_value=mock_asset_repo,
-            ),
-            patch("packages.shared.mediakit_client.get_mediakit_client", return_value=mock_mk),
-            patch("packages.shared.storage.get_shared_storage_service", return_value=mock_storage),
-            patch(
-                "app.api.routes.generation_cover._persist_cover_frame",
-                return_value="https://oss.example.com/covers/styled.jpg",
-            ) as mock_persist,
-            patch("app.api.routes.generation_cover.normalize_plan_config") as mock_normalize,
-        ):
-            mock_repo = MagicMock()
-            mock_repo.get.return_value = None
-            mock_repo.list_by_source_edit_plan.return_value = []
-            mock_repo.list_latest_completed_preview.return_value = []
-            mock_repo_cls.return_value = mock_repo
-            mock_normalize.return_value = {
-                "cover": {"type": "ai_frame", "image_url": "https://oss.example.com/covers/styled.jpg"}
-            }
-
-            from app.api.routes.generation_cover import generate_cover
-
-            result = generate_cover(
-                body=body,
-                template_id="tpl",
-                plan_id="plan-style",
-                services=(mock_template_svc, mock_plan_svc),
-                db=mock_db,
-                current_user=MagicMock(),
-            )
-
-            assert result.cover["image_url"] == "https://oss.example.com/covers/styled.jpg"
-            kwargs = mock_persist.call_args.kwargs
-            assert kwargs["title_text"] == "样式标题"
-            assert kwargs["title_color"] == "#00ff00"
-            assert kwargs["title_position"] == "top"
-            assert kwargs["title_font_size"] == 42
-
-    def test_e2_title_style_fallback_font_color(self):
-        """步骤E2：前端传 font_color 时能正确兼容读取。"""
-        from unittest.mock import MagicMock, patch
-
-        from app.api.routes.generation_cover import GenerateCoverRequest
-
-        mock_plan = MagicMock()
-        mock_plan.config = {
-            "title": {
-                "enabled": True,
-                "text": "兼容标题",
-                "font_color": "#123456",
-                "position": "center",
-            }
-        }
-
-        mock_plan_svc = MagicMock()
-        mock_plan_svc.get_plan_or_raise.return_value = mock_plan
-        mock_template_svc = MagicMock()
-        mock_db = MagicMock()
-
-        mock_asset = MagicMock()
-        mock_asset.file_type = "video"
-        mock_asset.storage_key = "uploads/src.mp4"
-        mock_asset_repo = MagicMock()
-        mock_asset_repo.get.return_value = mock_asset
-
-        mock_mk = MagicMock()
-        mock_mk.is_available = True
-        mock_mk.extract_frames.return_value = [{"image_url": "https://mk/frame.jpg"}]
-
-        mock_storage = MagicMock()
-        mock_storage.get_url.return_value = "https://oss.example.com/uploads/src.mp4"
-
-        body = GenerateCoverRequest(cover_type="ai_frame", asset_ids=["a1"])
-
-        with (
-            patch("app.api.routes.generation_cover.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
-            patch(
-                "packages.adapters.sqlalchemy_impl.asset_repository.SQLAlchemyAssetRepository",
-                return_value=mock_asset_repo,
-            ),
-            patch("packages.shared.mediakit_client.get_mediakit_client", return_value=mock_mk),
-            patch("packages.shared.storage.get_shared_storage_service", return_value=mock_storage),
-            patch(
-                "app.api.routes.generation_cover._persist_cover_frame",
-                return_value="https://oss.example.com/covers/compat.jpg",
-            ) as mock_persist,
-            patch("app.api.routes.generation_cover.normalize_plan_config") as mock_normalize,
-        ):
-            mock_repo = MagicMock()
-            mock_repo.get.return_value = None
-            mock_repo.list_by_source_edit_plan.return_value = []
-            mock_repo.list_latest_completed_preview.return_value = []
-            mock_repo_cls.return_value = mock_repo
-            mock_normalize.return_value = {
-                "cover": {"type": "ai_frame", "image_url": "https://oss.example.com/covers/compat.jpg"}
-            }
-
-            from app.api.routes.generation_cover import generate_cover
-
-            generate_cover(
-                body=body,
-                template_id="tpl",
-                plan_id="plan-compat",
-                services=(mock_template_svc, mock_plan_svc),
-                db=mock_db,
-                current_user=MagicMock(),
-            )
-
-            kwargs = mock_persist.call_args.kwargs
-            assert kwargs["title_color"] == "#123456"
-            assert kwargs["title_position"] == "center"
-            assert kwargs["title_font_size"] is None
-
     def test_step_e_skips_non_video_assets(self):
         """步骤E2：asset_ids 里只有图片素材时，不调用 MediaKit 并返回 400。"""
         from unittest.mock import MagicMock, patch

tests/unit/test_generation_p3_optimizations.py

@@ -0,0 +1,389 @@
+"""P3 优化单元测试 — generation.py 三项优化.
+
+覆盖：
+  P3-1: _download_library_assets strict 模式
+  P3-2: 归属校验合并到同一 DB session
+  P3-3: _verify_url_accessible HEAD 重试
+"""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+from types import SimpleNamespace
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "worker"))
+
+# ── 预注入 mock 模块，防止 worker_app.db 触发真实数据库连接 ──
+# worker_app.db 在模块级别调用 ensure_database_exists() 尝试连接 PostgreSQL，
+# 增量测试单独跑这些文件时会失败。与 test_voice_clone_task.py 同理。
+_mock_db_module = MagicMock()
+_mock_db_module.SessionLocal = MagicMock()
+sys.modules.setdefault("worker_app.db", _mock_db_module)
+if "worker_app" in sys.modules:
+    sys.modules["worker_app"].db = _mock_db_module
+
+
+# ── P3-3: _verify_url_accessible 重试 ───────────────────────────────────────
+
+
+class TestVerifyUrlAccessibleRetry:
+    """_verify_url_accessible 重试逻辑."""
+
+    @patch("time.sleep")
+    @patch("urllib.request.OpenerDirector.open")
+    def test_first_attempt_success(self, mock_open, mock_sleep):
+        """首次成功，不重试."""
+        from worker_app.tasks.generation import _verify_url_accessible
+
+        mock_resp = MagicMock()
+        mock_resp.status = 200
+        mock_resp.__enter__ = MagicMock(return_value=mock_resp)
+        mock_resp.__exit__ = MagicMock(return_value=False)
+        mock_open.return_value = mock_resp
+
+        assert _verify_url_accessible("https://example.com/file.mp4") is True
+        assert mock_open.call_count == 1
+        mock_sleep.assert_not_called()
+
+    @patch("time.sleep")
+    @patch("urllib.request.OpenerDirector.open")
+    def test_retry_then_success(self, mock_open, mock_sleep):
+        """首次失败，重试后成功."""
+        from worker_app.tasks.generation import _verify_url_accessible
+
+        # 第一次失败（网络异常），第二次成功
+        mock_resp_ok = MagicMock()
+        mock_resp_ok.status = 200
+        mock_resp_ok.__enter__ = MagicMock(return_value=mock_resp_ok)
+        mock_resp_ok.__exit__ = MagicMock(return_value=False)
+
+        mock_open.side_effect = [
+            OSError("connection reset"),
+            mock_resp_ok,
+        ]
+
+        assert _verify_url_accessible("https://example.com/file.mp4") is True
+        assert mock_open.call_count == 2
+        mock_sleep.assert_called_once_with(1)
+
+    @patch("time.sleep")
+    @patch("urllib.request.OpenerDirector.open")
+    def test_all_retries_exhausted(self, mock_open, mock_sleep):
+        """全部重试耗尽，返回 False."""
+        from worker_app.tasks.generation import _verify_url_accessible
+
+        mock_open.side_effect = OSError("connection refused")
+
+        assert _verify_url_accessible("https://example.com/file.mp4") is False
+        # 1 首次 + 2 重试 = 3 次
+        assert mock_open.call_count == 3
+        assert mock_sleep.call_count == 2
+
+    @patch("time.sleep")
+    @patch("urllib.request.OpenerDirector.open")
+    def test_http_500_then_success(self, mock_open, mock_sleep):
+        """HTTP 500 后重试成功."""
+        from worker_app.tasks.generation import _verify_url_accessible
+
+        mock_resp_500 = MagicMock()
+        mock_resp_500.status = 500
+        mock_resp_500.__enter__ = MagicMock(return_value=mock_resp_500)
+        mock_resp_500.__exit__ = MagicMock(return_value=False)
+
+        mock_resp_200 = MagicMock()
+        mock_resp_200.status = 200
+        mock_resp_200.__enter__ = MagicMock(return_value=mock_resp_200)
+        mock_resp_200.__exit__ = MagicMock(return_value=False)
+
+        mock_open.side_effect = [mock_resp_500, mock_resp_200]
+
+        assert _verify_url_accessible("https://example.com/file.mp4") is True
+        assert mock_open.call_count == 2
+
+    @patch("time.sleep")
+    @patch("urllib.request.OpenerDirector.open")
+    def test_custom_retries_zero(self, mock_open, mock_sleep):
+        """retries=0 时不重试."""
+        from worker_app.tasks.generation import _verify_url_accessible
+
+        mock_open.side_effect = OSError("timeout")
+
+        assert _verify_url_accessible("https://example.com/file.mp4", retries=0) is False
+        assert mock_open.call_count == 1
+        mock_sleep.assert_not_called()
+
+
+# ── P3-1: _download_library_assets strict 模式 ──────────────────────────────
+
+
+def _make_mock_asset(
+    asset_id: str,
+    name: str,
+    file_url: str | None,
+    asset_library_id: str = "lib-1",
+    project_id: str = "",
+):
+    """构造 mock AssetModel 实例."""
+    return SimpleNamespace(
+        id=asset_id,
+        name=name,
+        file_url=file_url,
+        asset_library_id=asset_library_id,
+        project_id=project_id,
+        status="ready",
+        file_type="video",
+        created_at="2026-01-01",
+    )
+
+
+def _setup_mock_session(assets):
+    """构造 mock session，返回 (mock_session, mock_query_chain)."""
+    mock_session = MagicMock()
+    mock_query = MagicMock()
+
+    # chain: session.query().filter().filter().order_by().all()
+    mock_session.query.return_value = mock_query
+    mock_query.filter.return_value = mock_query
+    mock_query.order_by.return_value = mock_query
+    mock_query.all.return_value = assets
+
+    return mock_session
+
+
+class TestDownloadLibraryAssetsStrictMode:
+    """_download_library_assets strict 模式."""
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_strict_mode_raises_on_download_failure(self, mock_download, mock_session_factory):
+        """strict=True 时，单个素材下载失败立即抛 RuntimeError."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        assets = [
+            _make_mock_asset("a1", "video1.mp4", "uploads/video1.mp4"),
+            _make_mock_asset("a2", "video2.mp4", "uploads/video2.mp4"),
+        ]
+        mock_session = _setup_mock_session(assets)
+        mock_session_factory.return_value = mock_session
+
+        # 第一个成功，第二个失败
+        mock_download.side_effect = [True, False]
+
+        with pytest.raises(RuntimeError, match="素材下载失败"):
+            _download_library_assets(
+                Path("/tmp"),
+                asset_library_id="lib-1",
+                asset_ids=["a1", "a2"],
+                strict=True,
+            )
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_non_strict_mode_returns_partial_results(self, mock_download, mock_session_factory):
+        """strict=False 时，跳过失败素材，返回成功列表."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        assets = [
+            _make_mock_asset("a1", "video1.mp4", "uploads/video1.mp4"),
+            _make_mock_asset("a2", "video2.mp4", "uploads/video2.mp4"),
+            _make_mock_asset("a3", "video3.mp4", "uploads/video3.mp4"),
+        ]
+        mock_session = _setup_mock_session(assets)
+        mock_session_factory.return_value = mock_session
+
+        # 第一个成功，第二个失败，第三个成功
+        mock_download.side_effect = [True, False, True]
+
+        result = _download_library_assets(
+            Path("/tmp"),
+            asset_library_id="lib-1",
+            asset_ids=["a1", "a2", "a3"],
+            strict=False,
+        )
+
+        assert len(result) == 2
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_non_strict_all_fail_raises(self, mock_download, mock_session_factory):
+        """strict=False 但全部失败时仍抛 RuntimeError."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        assets = [
+            _make_mock_asset("a1", "video1.mp4", "uploads/video1.mp4"),
+        ]
+        mock_session = _setup_mock_session(assets)
+        mock_session_factory.return_value = mock_session
+        mock_download.return_value = False
+
+        with pytest.raises(RuntimeError, match="全部下载失败"):
+            _download_library_assets(
+                Path("/tmp"),
+                asset_library_id="lib-1",
+                asset_ids=["a1"],
+                strict=False,
+            )
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_strict_mode_raises_on_missing_file_url(self, mock_download, mock_session_factory):
+        """strict=True 时，素材缺少 file_url 立即抛异常."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        assets = [
+            _make_mock_asset("a1", "video1.mp4", None),  # file_url 为空
+        ]
+        mock_session = _setup_mock_session(assets)
+        mock_session_factory.return_value = mock_session
+
+        with pytest.raises(RuntimeError, match="素材缺少 file_url"):
+            _download_library_assets(
+                Path("/tmp"),
+                asset_library_id="lib-1",
+                strict=True,
+            )
+
+        # download_asset 不应被调用
+        mock_download.assert_not_called()
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_default_is_strict(self, mock_download, mock_session_factory):
+        """默认 strict=True."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        assets = [
+            _make_mock_asset("a1", "video1.mp4", "uploads/video1.mp4"),
+        ]
+        mock_session = _setup_mock_session(assets)
+        mock_session_factory.return_value = mock_session
+        mock_download.return_value = False
+
+        # 不传 strict 参数，默认严格模式
+        with pytest.raises(RuntimeError, match="素材下载失败"):
+            _download_library_assets(
+                Path("/tmp"),
+                asset_library_id="lib-1",
+            )
+
+
+# ── P3-2: 归属校验合并到同一 session ────────────────────────────────────────
+
+
+class TestDownloadLibraryAssetsOwnershipValidation:
+    """归属校验合并到 _download_library_assets 同一 session."""
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_ownership_mismatch_raises_value_error(self, mock_download, mock_session_factory):
+        """asset_ids 不属于指定素材库时抛 ValueError."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        # asset 属于 lib-2，但请求的是 lib-1
+        assets = [
+            _make_mock_asset("a1", "video1.mp4", "uploads/video1.mp4", asset_library_id="lib-2"),
+        ]
+        mock_session = _setup_mock_session(assets)
+        mock_session_factory.return_value = mock_session
+
+        with pytest.raises(ValueError, match="素材不属于指定素材库"):
+            _download_library_assets(
+                Path("/tmp"),
+                asset_library_id="lib-1",
+                asset_ids=["a1"],
+            )
+
+        # 不应调用 download_asset（校验在下载前）
+        mock_download.assert_not_called()
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_missing_asset_ids_raises_value_error(self, mock_download, mock_session_factory):
+        """指定的 asset_ids 不存在时抛 ValueError."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        # DB 返回空（asset_ids 不存在，query 过滤后无结果）
+        mock_session = _setup_mock_session([])
+        mock_session_factory.return_value = mock_session
+
+        with pytest.raises(RuntimeError, match="未找到视频素材"):
+            _download_library_assets(
+                Path("/tmp"),
+                asset_library_id="lib-1",
+                asset_ids=["nonexistent-id"],
+            )
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_project_ownership_mismatch_raises(self, mock_download, mock_session_factory):
+        """项目级模式下归属不匹配抛 ValueError."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        assets = [
+            _make_mock_asset(
+                "a1",
+                "video1.mp4",
+                "uploads/video1.mp4",
+                asset_library_id="",
+                project_id="proj-2",
+            ),
+        ]
+        mock_session = _setup_mock_session(assets)
+        mock_session_factory.return_value = mock_session
+
+        with pytest.raises(ValueError, match="素材不属于指定项目"):
+            _download_library_assets(
+                Path("/tmp"),
+                project_id="proj-1",
+                asset_ids=["a1"],
+            )
+
+        mock_download.assert_not_called()
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_ownership_pass_then_download(self, mock_download, mock_session_factory):
+        """归属校验通过后正常下载."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        assets = [
+            _make_mock_asset("a1", "video1.mp4", "uploads/video1.mp4", asset_library_id="lib-1"),
+        ]
+        mock_session = _setup_mock_session(assets)
+        mock_session_factory.return_value = mock_session
+        mock_download.return_value = True
+
+        result = _download_library_assets(
+            Path("/tmp"),
+            asset_library_id="lib-1",
+            asset_ids=["a1"],
+        )
+
+        assert len(result) == 1
+        mock_download.assert_called_once()
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_single_session_used(self, mock_download, mock_session_factory):
+        """验证只创建了一个 DB session（P3-2 核心）."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        assets = [
+            _make_mock_asset("a1", "video1.mp4", "uploads/video1.mp4", asset_library_id="lib-1"),
+        ]
+        mock_session = _setup_mock_session(assets)
+        mock_session_factory.return_value = mock_session
+        mock_download.return_value = True
+
+        _download_library_assets(
+            Path("/tmp"),
+            asset_library_id="lib-1",
+            asset_ids=["a1"],
+        )
+
+        # SessionLocal 只调用一次（合并前会调用两次：校验 + 下载）
+        assert mock_session_factory.call_count == 1

tests/unit/test_generation_worker_fixes.py

@@ -0,0 +1,228 @@
+"""Tests for generation.py worker-side fixes: segment durations + preview resolution."""
+
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+# Add worker app to path
+sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "worker"))
+os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret")
+os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
+
+
+def _patch_session_local(mock_session):
+    """Patch worker_app.db.SessionLocal robustly even when other tests
+    have pre-registered a MagicMock for worker_app.db in sys.modules.
+    Uses patch.dict to inject a clean module so that
+    'from worker_app.db import SessionLocal' resolves correctly."""
+    from types import ModuleType
+
+    _fresh_db = ModuleType("worker_app.db")
+    _fresh_db.SessionLocal = lambda *a, **kw: mock_session
+    return patch.dict(sys.modules, {"worker_app.db": _fresh_db})
+
+
+class TestLoadTemplateSegmentDurations:
+    """_load_template_segment_durations 单元测试 (covers lines 198-226)."""
+
+    def test_empty_template_id(self):
+        """空 template_id 直接返回空列表。"""
+        from worker_app.tasks.generation import _load_template_segment_durations
+
+        result = _load_template_segment_durations("")
+        assert result == []
+
+    def test_loads_durations_ordered(self):
+        """按 segment_order 排序返回 duration_max 列表。"""
+        from worker_app.tasks.generation import _load_template_segment_durations
+
+        mock_seg1 = MagicMock(duration_max=5.0)
+        mock_seg2 = MagicMock(duration_max=8.0)
+        mock_seg3 = MagicMock(duration_max=3.0)
+
+        mock_query = MagicMock()
+        mock_query.filter.return_value.order_by.return_value.all.return_value = [
+            mock_seg1,
+            mock_seg2,
+            mock_seg3,
+        ]
+        mock_session = MagicMock()
+        mock_session.query.return_value = mock_query
+
+        with _patch_session_local(mock_session):
+            result = _load_template_segment_durations("tpl_123")
+
+        assert result == [5.0, 8.0, 3.0]
+
+    def test_filters_zero_and_negative(self):
+        """duration_max <= 0 的 segment 被过滤。"""
+        from worker_app.tasks.generation import _load_template_segment_durations
+
+        mock_seg_valid = MagicMock(duration_max=5.0)
+        mock_seg_zero = MagicMock(duration_max=0.0)
+        mock_seg_none = MagicMock(duration_max=None)
+
+        mock_query = MagicMock()
+        mock_query.filter.return_value.order_by.return_value.all.return_value = [
+            mock_seg_valid,
+            mock_seg_zero,
+            mock_seg_none,
+        ]
+        mock_session = MagicMock()
+        mock_session.query.return_value = mock_query
+
+        with _patch_session_local(mock_session):
+            result = _load_template_segment_durations("tpl_456")
+
+        assert result == [5.0]
+
+    def test_db_error_returns_empty(self):
+        """数据库异常返回空列表，不抛出。"""
+        from types import ModuleType
+
+        from worker_app.tasks.generation import _load_template_segment_durations
+
+        _err_db = ModuleType("worker_app.db")
+
+        def _raise(*a, **kw):
+            raise Exception("DB down")
+
+        _err_db.SessionLocal = _raise
+        with patch.dict(sys.modules, {"worker_app.db": _err_db}):
+            result = _load_template_segment_durations("tpl_789")
+
+        assert result == []
+
+    def test_empty_segments_returns_empty(self):
+        """没有 segment 时返回空列表。"""
+        from worker_app.tasks.generation import _load_template_segment_durations
+
+        mock_query = MagicMock()
+        mock_query.filter.return_value.order_by.return_value.all.return_value = []
+        mock_session = MagicMock()
+        mock_session.query.return_value = mock_query
+
+        with _patch_session_local(mock_session):
+            result = _load_template_segment_durations("tpl_empty")
+
+        assert result == []
+
+
+class TestDurationCappingInBuildPlan:
+    """_build_plan_and_clips_from_task 时长约束测试 (covers lines 322-333)."""
+
+    def _make_temp_video(self, tmpdir: Path, name: str = "v.mp4") -> Path:
+        p = tmpdir / name
+        p.write_bytes(b"\x00" * 100)
+        return p
+
+    def test_clips_capped_by_segment_max(self):
+        """clip 时长超过 segment duration_max 时截断。"""
+        import tempfile
+
+        from worker_app.tasks.generation import _build_plan_and_clips_from_task
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            tmpdir = Path(tmpdir)
+            paths = [self._make_temp_video(tmpdir, f"v{i}.mp4") for i in range(3)]
+
+            with patch("worker_app.tasks.generation.probe_duration", return_value=30.0):
+                with patch(
+                    "worker_app.tasks.generation._load_template_segment_durations",
+                    return_value=[5.0, 4.0, 3.0],
+                ):
+                    with patch(
+                        "worker_app.tasks.generation._load_template_clip_configs",
+                        return_value=[],
+                    ):
+                        _, clips, _ = _build_plan_and_clips_from_task(
+                            task_id="test_cap",
+                            downloaded_paths=paths,
+                            mode="one_take",
+                            template_id="tpl_test",
+                        )
+
+            assert clips[0].duration == 5.0
+            assert clips[1].duration == 4.0
+            assert clips[2].duration == 3.0
+
+    def test_clips_not_capped_when_under_max(self):
+        """clip 时长小于 segment duration_max 时不截断。"""
+        import tempfile
+
+        from worker_app.tasks.generation import _build_plan_and_clips_from_task
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            tmpdir = Path(tmpdir)
+            paths = [self._make_temp_video(tmpdir)]
+
+            with patch("worker_app.tasks.generation.probe_duration", return_value=3.0):
+                with patch(
+                    "worker_app.tasks.generation._load_template_segment_durations",
+                    return_value=[5.0],
+                ):
+                    with patch(
+                        "worker_app.tasks.generation._load_template_clip_configs",
+                        return_value=[],
+                    ):
+                        _, clips, _ = _build_plan_and_clips_from_task(
+                            task_id="test_no_cap",
+                            downloaded_paths=paths,
+                            mode="one_take",
+                            template_id="tpl_test",
+                        )
+
+            assert clips[0].duration == 3.0
+
+    def test_no_capping_without_template(self):
+        """无 template_id 时不截断。"""
+        import tempfile
+
+        from worker_app.tasks.generation import _build_plan_and_clips_from_task
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            tmpdir = Path(tmpdir)
+            paths = [self._make_temp_video(tmpdir)]
+
+            with patch("worker_app.tasks.generation.probe_duration", return_value=30.0):
+                _, clips, _ = _build_plan_and_clips_from_task(
+                    task_id="test_no_tpl",
+                    downloaded_paths=paths,
+                    mode="one_take",
+                    template_id="",
+                )
+
+            assert clips[0].duration == 30.0
+
+    def test_partial_segments_only_caps_matching(self):
+        """segment 数量少于 clip 时，只截断有对应 segment 的 clip。"""
+        import tempfile
+
+        from worker_app.tasks.generation import _build_plan_and_clips_from_task
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            tmpdir = Path(tmpdir)
+            paths = [self._make_temp_video(tmpdir, f"v{i}.mp4") for i in range(3)]
+
+            with patch("worker_app.tasks.generation.probe_duration", return_value=20.0):
+                with patch(
+                    "worker_app.tasks.generation._load_template_segment_durations",
+                    return_value=[5.0],  # only 1 segment for 3 clips
+                ):
+                    with patch(
+                        "worker_app.tasks.generation._load_template_clip_configs",
+                        return_value=[],
+                    ):
+                        _, clips, _ = _build_plan_and_clips_from_task(
+                            task_id="test_partial",
+                            downloaded_paths=paths,
+                            mode="one_take",
+                            template_id="tpl_test",
+                        )
+
+            assert clips[0].duration == 5.0  # capped
+            assert clips[1].duration == 20.0  # not capped (no matching segment)
+            assert clips[2].duration == 20.0  # not capped

tests/unit/test_oneclick_gen_p0_fixes.py

@@ -1,6 +1,7 @@
 """P0/P1 修复单元测试 — 一键生成 P0 问题 + P1 校验.
 
 覆盖：
+  P0-1: _download_library_assets 双模式查询（asset_library_id / project_id）
   P0-2: OSS 上传失败抛异常 + URL 可访问性校验
   P0-3: FFmpeg 失败时完整 stderr 日志
   P1:   template_id 存在性校验 + asset_ids 归属校验
@@ -25,6 +26,130 @@ if str(_WORKER_ROOT) not in sys.path:
 # ── P0-1: _download_library_assets ────────────────────────────────────────────
 
 
+class TestDownloadLibraryAssets:
+    """P0-1: 素材下载双模式 + 错误处理."""
+
+    def _make_asset(self, id_: str, file_url: str, project_id: str = "p1", library_id: str = "lib1"):
+        mock = MagicMock()
+        mock.id = id_
+        mock.file_url = file_url
+        mock.name = f"asset_{id_}"
+        mock.project_id = project_id
+        mock.asset_library_id = library_id
+        return mock
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_asset_library_mode(self, mock_download, mock_session_factory):
+        """素材库模式：按 asset_library_id 查询."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        session = MagicMock()
+        mock_session_factory.return_value = session
+        query = MagicMock()
+        session.query.return_value = query
+        filter_result = MagicMock()
+        query.filter.return_value = filter_result
+        in_filter = MagicMock()
+        filter_result.filter.return_value = in_filter
+        assets = [self._make_asset("a1", "video/a1.mp4")]
+        in_filter.order_by.return_value.all.return_value = assets
+
+        mock_download.return_value = True
+
+        with patch("worker_app.tasks.generation.AssetModel", create=True):
+            result = _download_library_assets(
+                Path("/tmp/test"),
+                asset_library_id="lib1",
+            )
+
+        assert len(result) == 1
+        mock_download.assert_called_once()
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_project_mode(self, mock_download, mock_session_factory):
+        """项目级模式：asset_library_id 为空时按 project_id 查询."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        session = MagicMock()
+        mock_session_factory.return_value = session
+        query = MagicMock()
+        session.query.return_value = query
+        filter_result = MagicMock()
+        query.filter.return_value = filter_result
+        proj_filter = MagicMock()
+        filter_result.filter.return_value = proj_filter
+        assets = [self._make_asset("a1", "video/a1.mp4", project_id="proj1")]
+        proj_filter.order_by.return_value.all.return_value = assets
+
+        mock_download.return_value = True
+
+        result = _download_library_assets(
+            Path("/tmp/test"),
+            project_id="proj1",
+        )
+
+        assert len(result) == 1
+
+    def test_both_empty_raises(self):
+        """asset_library_id 和 project_id 都为空时抛 ValueError."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        with pytest.raises(ValueError, match="至少需要提供一个"):
+            _download_library_assets(Path("/tmp/test"))
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    def test_no_assets_found_raises(self, mock_session_factory):
+        """查不到素材时抛 RuntimeError."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        session = MagicMock()
+        mock_session_factory.return_value = session
+        query = MagicMock()
+        session.query.return_value = query
+        filter_result = MagicMock()
+        query.filter.return_value = filter_result
+        in_filter = MagicMock()
+        filter_result.filter.return_value = in_filter
+        in_filter.order_by.return_value.all.return_value = []
+
+        with pytest.raises(RuntimeError, match="未找到视频素材"):
+            _download_library_assets(
+                Path("/tmp/test"),
+                asset_library_id="lib1",
+            )
+
+    @patch("worker_app.tasks.generation.SessionLocal")
+    @patch("worker_app.tasks.generation.download_asset")
+    def test_all_asset_ids_fail_raises(self, mock_download, mock_session_factory):
+        """指定 asset_ids 但全部下载失败时抛 RuntimeError."""
+        from worker_app.tasks.generation import _download_library_assets
+
+        session = MagicMock()
+        mock_session_factory.return_value = session
+        query = MagicMock()
+        session.query.return_value = query
+        filter_result = MagicMock()
+        query.filter.return_value = filter_result
+        id_filter = MagicMock()
+        filter_result.filter.return_value = id_filter
+        assets = [self._make_asset("a1", "video/a1.mp4")]
+        id_filter.order_by.return_value.all.return_value = assets
+
+        mock_download.return_value = False  # 全部下载失败
+
+        with pytest.raises(RuntimeError, match="素材下载失败"):
+            _download_library_assets(
+                Path("/tmp/test"),
+                asset_library_id="lib1",
+                asset_ids=["a1"],
+            )
+
+
+# ── P0-2: OSS 上传 + URL 校验 ────────────────────────────────────────────────
+
+
 class TestOSSUploadAndVerify:
     """P0-2: OSS 上传失败抛异常 + URL 可访问性校验."""
 
@@ -165,3 +290,318 @@ class TestP1Validations:
 
 
 # ── P1: 一键生成 clip 级效果层映射 ───────────────────────────────────────────
+
+
+class TestTemplateClipEffectMapping:
+    """P1: 模板 clip 级效果层映射到一键生成素材 clips."""
+
+    def _make_virtual_clip(self, idx: int, clip_type: str = "main", config: dict | None = None):
+        from dataclasses import dataclass, field
+
+        _clip_type_val = clip_type
+
+        @dataclass
+        class FakeClip:
+            id: str = f"vc_{idx:03d}"
+            plan_id: str = "task_001"
+            clip_type: str = _clip_type_val
+            order: int = idx
+            asset_id: str = f"asset_{idx}"
+            duration: float = 5.0
+            transition_effect: str = "cut"
+            transition_duration: float = 0.0
+            playback_speed: float = 1.0
+            config: dict = field(default_factory=dict)
+
+        return FakeClip(config=config or {})
+
+    def _make_template_clip_config(self, clip_type: str = "main", transition: str = "cut", config: dict | None = None):
+        mock = MagicMock()
+        mock.clip_type = clip_type
+        mock.transition_effect = transition
+        mock.config = config or {}
+        mock.default_duration = 3.0
+        mock.text_template = ""
+        return mock
+
+    def test_transition_effect_mapped(self):
+        """转场效果正确映射到素材 clips."""
+        from worker_app.tasks.generation import _apply_template_clip_effects
+
+        clips = [self._make_virtual_clip(i) for i in range(3)]
+        clip_configs = [
+            self._make_template_clip_config("main", transition="fade"),
+            self._make_template_clip_config("main", transition="dissolve"),
+        ]
+
+        _apply_template_clip_effects(clips, clip_configs, "one_take")
+
+        # 前两个按顺序映射，第三个用最后一个模板配置
+        assert clips[0].transition_effect == "fade"
+        assert clips[1].transition_effect == "dissolve"
+        assert clips[2].transition_effect == "dissolve"  # 复用最后一个
+
+    def test_color_grade_mapped(self):
+        """滤镜配置正确映射到 clip.config.color_grade."""
+        from worker_app.tasks.generation import _apply_template_clip_effects
+
+        clips = [self._make_virtual_clip(i) for i in range(2)]
+        clip_configs = [
+            self._make_template_clip_config(
+                "main", config={"color_grade": {"enabled": True, "filter": "vintage", "brightness": 0.1}}
+            ),
+        ]
+
+        _apply_template_clip_effects(clips, clip_configs, "one_take")
+
+        assert clips[0].config["color_grade"]["filter"] == "vintage"
+        assert clips[0].config["color_grade"]["brightness"] == 0.1
+        # 第二个素材复用第一个模板配置
+        assert clips[1].config["color_grade"]["filter"] == "vintage"
+
+    def test_existing_config_preserved(self):
+        """已有 clip.config 内容（如 role）被保留."""
+        from worker_app.tasks.generation import _apply_template_clip_effects
+
+        clips = [self._make_virtual_clip(0, config={"role": "b_roll"})]
+        clip_configs = [
+            self._make_template_clip_config("main", config={"color_grade": {"enabled": True, "filter": "warm"}}),
+        ]
+
+        _apply_template_clip_effects(clips, clip_configs, "voice_over")
+
+        assert clips[0].config["role"] == "b_roll"  # 保留原有配置
+        assert clips[0].config["color_grade"]["filter"] == "warm"  # 新增滤镜配置
+
+    def test_empty_clip_configs_no_change(self):
+        """空模板配置时 clips 保持不变."""
+        from worker_app.tasks.generation import _apply_template_clip_effects
+
+        clips = [self._make_virtual_clip(i) for i in range(2)]
+        _apply_template_clip_effects(clips, [], "one_take")
+
+        assert clips[0].transition_effect == "cut"
+        assert clips[1].transition_effect == "cut"
+
+    def test_cut_transition_not_overwritten(self):
+        """模板转场为 cut 时不覆盖（保持默认）."""
+        from worker_app.tasks.generation import _apply_template_clip_effects
+
+        clips = [self._make_virtual_clip(0)]
+        clips[0].transition_effect = "fade"  # 已有非默认值
+        clip_configs = [
+            self._make_template_clip_config("main", transition="cut"),
+        ]
+
+        _apply_template_clip_effects(clips, clip_configs, "one_take")
+
+        # 模板是 cut 时，保留原有值（避免无意义覆盖）
+        assert clips[0].transition_effect == "fade"
+
+    def test_transition_duration_mapped(self):
+        """转场时长（transition_duration）从模板 config 正确映射到 clip."""
+        from worker_app.tasks.generation import _apply_template_clip_effects
+
+        clips = [self._make_virtual_clip(i) for i in range(3)]
+        clip_configs = [
+            self._make_template_clip_config("main", transition="fade", config={"transition_duration": 0.8}),
+            self._make_template_clip_config("main", transition="dissolve", config={"transition_duration": 1.2}),
+        ]
+
+        _apply_template_clip_effects(clips, clip_configs, "one_take")
+
+        # 前两个按顺序映射，第三个复用最后一个
+        assert clips[0].transition_effect == "fade"
+        assert clips[0].transition_duration == 0.8
+        assert clips[1].transition_effect == "dissolve"
+        assert clips[1].transition_duration == 1.2
+        assert clips[2].transition_effect == "dissolve"
+        assert clips[2].transition_duration == 1.2
+
+    def test_transition_duration_ignored_for_cut(self):
+        """模板转场为 cut 时，transition_duration 不生效（保持默认0）."""
+        from worker_app.tasks.generation import _apply_template_clip_effects
+
+        clips = [self._make_virtual_clip(0)]
+        clip_configs = [
+            self._make_template_clip_config("main", transition="cut", config={"transition_duration": 0.5}),
+        ]
+
+        _apply_template_clip_effects(clips, clip_configs, "one_take")
+
+        # cut 转场不映射，transition_duration 也不应用
+        assert clips[0].transition_duration == 0.0
+
+    def test_transition_duration_invalid_value_skipped(self):
+        """transition_duration 为无效值时安全跳过."""
+        from worker_app.tasks.generation import _apply_template_clip_effects
+
+        clips = [self._make_virtual_clip(0)]
+        clip_configs = [
+            self._make_template_clip_config("main", transition="fade", config={"transition_duration": "abc"}),
+        ]
+
+        _apply_template_clip_effects(clips, clip_configs, "one_take")
+
+        assert clips[0].transition_effect == "fade"
+        assert clips[0].transition_duration == 0.0  # 无效值保持默认
+
+    def test_intro_outro_extracted(self):
+        """intro/outro 类型 clip_config 正确提取为 plan 级 intro_outro 配置."""
+        from worker_app.tasks.generation import _extract_intro_outro_from_clip_configs
+
+        clip_configs = [
+            self._make_template_clip_config("intro", config={"intro_type": "text", "intro_text_color": "#ffffff"}),
+            self._make_template_clip_config("main"),
+            self._make_template_clip_config("outro", config={"outro_type": "follow", "outro_follow_text": "关注我们"}),
+        ]
+        # 设置 intro/outro 的 text_template
+        clip_configs[0].text_template = "精彩视频"
+        clip_configs[0].default_duration = 2.5
+
+        result = _extract_intro_outro_from_clip_configs(clip_configs)
+
+        assert result["has_intro"] is True
+        assert result["intro_type"] == "text"
+        assert result["intro_text"] == "精彩视频"
+        assert result["intro_duration"] == 2.5
+        assert result["intro_text_color"] == "#ffffff"
+        assert result["has_outro"] is True
+        assert result["outro_type"] == "follow"
+        assert result["outro_follow_text"] == "关注我们"
+
+    def test_intro_outro_empty_when_none(self):
+        """没有 intro/outro 时返回空 dict."""
+        from worker_app.tasks.generation import _extract_intro_outro_from_clip_configs
+
+        clip_configs = [
+            self._make_template_clip_config("main"),
+            self._make_template_clip_config("main"),
+        ]
+
+        result = _extract_intro_outro_from_clip_configs(clip_configs)
+        assert result == {}
+
+
+class TestTemplatePlanConfigLoading:
+    """验证从模板加载 plan 级配置（BGM、字幕、标题）的逻辑。"""
+
+    def _mock_template(
+        self,
+        title_config=None,
+        subtitle_config=None,
+        bgm_config=None,
+        is_active=True,
+    ):
+        template = MagicMock()
+        template.id = "tmpl_001"
+        template.name = "Test Template"
+        template.is_active = is_active
+        template.title_config = title_config or {}
+        template.subtitle_config = subtitle_config or {}
+        template.bgm_config = bgm_config or {}
+        return template
+
+    def _mock_session(self, template):
+        session = MagicMock()
+
+        # EditTemplateModel 查询返回 None（走旧模板系统 fallback）
+        edit_query = MagicMock()
+        edit_filter = MagicMock()
+        edit_query.filter.return_value = edit_filter
+        edit_filter.first.return_value = None
+
+        # TemplateModel 查询返回 template（旧模板系统）
+        old_query = MagicMock()
+        old_filter = MagicMock()
+        old_query.filter.return_value = old_filter
+        old_filter.first.return_value = template
+
+        def _query_side_effect(model):
+            name = getattr(model, "__name__", "")
+            if "EditTemplate" in name:
+                return edit_query
+            return old_query
+
+        session.query.side_effect = _query_side_effect
+        return session
+
+    def test_load_template_config_assembles_three_fields(self):
+        """模板的三个独立字段正确组装成 plan.config 格式。"""
+        from worker_app.tasks.generation import _load_template_plan_config
+
+        title_cfg = {"enabled": True, "text": "我的标题", "font_size": 36}
+        subtitle_cfg = {"enabled": True, "auto_generated": True, "language": "zh"}
+        bgm_cfg = {"enabled": True, "preset_id": "bgm-001", "volume": 0.5}
+
+        template = self._mock_template(
+            title_config=title_cfg,
+            subtitle_config=subtitle_cfg,
+            bgm_config=bgm_cfg,
+        )
+        session = self._mock_session(template)
+
+        with patch("worker_app.tasks.generation.SessionLocal", return_value=session):
+            result = _load_template_plan_config("tmpl_001")
+
+        assert result["title"] == title_cfg
+        assert result["subtitle"] == subtitle_cfg
+        assert result["bgm"] == bgm_cfg
+
+    def test_load_template_config_empty_template_returns_empty(self):
+        """模板三个字段都为空时返回空 dict。"""
+        from worker_app.tasks.generation import _load_template_plan_config
+
+        template = self._mock_template()
+        session = self._mock_session(template)
+
+        with patch("worker_app.tasks.generation.SessionLocal", return_value=session):
+            result = _load_template_plan_config("tmpl_001")
+
+        assert result == {}
+
+    def test_load_template_config_only_bgm(self):
+        """只有 BGM 配置时只返回 bgm 字段。"""
+        from worker_app.tasks.generation import _load_template_plan_config
+
+        bgm_cfg = {"enabled": True, "audio_url": "https://example.com/bgm.mp3"}
+        template = self._mock_template(bgm_config=bgm_cfg)
+        session = self._mock_session(template)
+
+        with patch("worker_app.tasks.generation.SessionLocal", return_value=session):
+            result = _load_template_plan_config("tmpl_001")
+
+        assert "bgm" in result
+        assert result["bgm"] == bgm_cfg
+        assert "title" not in result
+        assert "subtitle" not in result
+
+    def test_load_template_config_empty_template_id(self):
+        """空 template_id 直接返回空 dict。"""
+        from worker_app.tasks.generation import _load_template_plan_config
+
+        result = _load_template_plan_config("")
+        assert result == {}
+
+        result = _load_template_plan_config(None)
+        assert result == {}
+
+    def test_load_template_config_not_found_returns_empty(self):
+        """模板不存在时返回空 dict，不抛异常。"""
+        from worker_app.tasks.generation import _load_template_plan_config
+
+        session = MagicMock()
+
+        def _query_side_effect(model):
+            q = MagicMock()
+            f = MagicMock()
+            q.filter.return_value = f
+            f.first.return_value = None
+            return q
+
+        session.query.side_effect = _query_side_effect
+
+        with patch("worker_app.tasks.generation.SessionLocal", return_value=session):
+            result = _load_template_plan_config("tmpl_nonexist")
+
+        assert result == {}

tests/unit/test_original_audio_retained.py

@@ -1,215 +0,0 @@
-"""回归测试：render_plan 新路径必须保留视频素材原声。
-
-历史 Bug：mix_audio 中 `main_clips = []` 无条件丢弃源视频原声，
-导致最终生成视频没有原声（与预览不一致）。本测试钉住新行为：
-- 有音频流的 main/broll clip 原声必须进入最终音轨
-- clip.config.volume=0 静音，volume≠1.0 应用音量滤镜
-- 无音频流的素材被安全过滤
-- 直通（pass-through）路径同样尊重 probe + volume
-"""
-
-from __future__ import annotations
-
-from pathlib import Path
-from unittest.mock import patch
-
-import pytest
-from video_processing.render_audio import (
-    RenderContext,
-    _clip_volume,
-    mix_audio,
-)
-from video_processing.unified_render_service import (
-    ResolvedClip,
-    UnifiedRenderService,
-)
-
-
-def _ctx() -> RenderContext:
-    return RenderContext(work_dir=Path("/tmp/test_render_audio_fix"), plan_id="plan_audio")
-
-
-def _clip(
-    cid: str,
-    *,
-    clip_type: str = "main",
-    order: int = 0,
-    duration: float = 5.0,
-    config: dict | None = None,
-    asset: str | None = None,
-) -> ResolvedClip:
-    return ResolvedClip(
-        clip_id=cid,
-        asset_id=asset or f"asset_{cid}.mp4",
-        clip_type=clip_type,
-        order=order,
-        local_path=Path(f"/tmp/asset_{cid}.mp4"),
-        duration=duration,
-        actual_duration=duration,
-        config=config or {},
-    )
-
-
-def _layers(svc, clips):
-    # 直接把 ResolvedClip 分组为图层，跳过 _resolve_clips（后者要求原始 EditPlanClip）
-    return svc._group_clips_into_layers(clips)
-
-
-def _service(clips):
-    paths = {c.asset_id: c.local_path for c in clips}
-    return UnifiedRenderService(
-        plan=type("P", (), {"id": "plan_audio", "config": {}})(),
-        clips=clips,
-        asset_path_map=paths,
-        work_dir=Path("/tmp/test_render_audio_fix"),
-        output_width=1080,
-        output_height=1920,
-        output_fps=25,
-    )
-
-
-class TestOriginalAudioRetained:
-    """钉住原声不再被丢弃。"""
-
-    def test_single_main_clip_audio_kept(self):
-        svc = _service([_clip("c1")])
-        with (
-            patch("pathlib.Path.exists", return_value=True),
-            patch("video_processing.unified_render_service.probe_duration", return_value=5.0),
-            patch("video_processing.render_audio.probe_has_audio", return_value=True),
-            patch("video_processing.render_audio.run_ffmpeg") as mock_run,
-        ):
-            result = mix_audio(_ctx(), _layers(svc, [_clip("c1")]), 5.0)
-
-        assert result is not None
-        cmd_str = " ".join(mock_run.call_args[0][0])
-        assert "asset_c1.mp4" in cmd_str
-
-    def test_multi_main_clips_concat_audio(self):
-        clips = [_clip("c1", order=0), _clip("c2", order=1)]
-        svc = _service(clips)
-        with (
-            patch("pathlib.Path.exists", return_value=True),
-            patch("video_processing.unified_render_service.probe_duration", return_value=5.0),
-            patch("video_processing.render_audio.probe_has_audio", return_value=True),
-            patch("video_processing.render_audio.run_ffmpeg") as mock_run,
-        ):
-            result = mix_audio(_ctx(), _layers(svc, clips), 9.0)
-
-        assert result is not None
-        cmd_str = " ".join(mock_run.call_args[0][0])
-        assert "asset_c1.mp4" in cmd_str
-        assert "asset_c2.mp4" in cmd_str
-        assert "concat=n=2:v=0:a=1" in cmd_str
-
-    def test_main_audio_plus_independent_track_amix(self):
-        clips = [
-            _clip("c1", order=0),
-            _clip("tts1", order=1, config={"role": "audio", "volume": 0.5}),
-        ]
-        svc = _service(clips)
-        with (
-            patch("pathlib.Path.exists", return_value=True),
-            patch("video_processing.unified_render_service.probe_duration", return_value=5.0),
-            patch("video_processing.render_audio.probe_has_audio", return_value=True),
-            patch("video_processing.render_audio.run_ffmpeg") as mock_run,
-        ):
-            result = mix_audio(_ctx(), _layers(svc, clips), 5.0)
-
-        assert result is not None
-        cmd_str = " ".join(mock_run.call_args[0][0])
-        assert "amix=inputs=2" in cmd_str
-        assert "asset_c1.mp4" in cmd_str
-        assert "asset_tts1.mp4" in cmd_str
-        assert "volume=0.5" in cmd_str
-
-    def test_silent_clip_volume_zero_retained_with_silence_filter(self):
-        """volume=0 的素材必须保留在 concat 中（用 volume=0 滤镜静音），不能移除以避免音画不同步。"""
-        clips = [_clip("mute", order=0, config={"volume": 0})]
-        svc = _service(clips)
-        with (
-            patch("pathlib.Path.exists", return_value=True),
-            patch("video_processing.unified_render_service.probe_duration", return_value=5.0),
-            patch("video_processing.render_audio.probe_has_audio", return_value=True),
-            patch("video_processing.render_audio.run_ffmpeg") as mock_run,
-        ):
-            result = mix_audio(_ctx(), _layers(svc, clips), 5.0)
-
-        # 有音频流 → 应生成音频文件，且 ffmpeg 命令包含 volume=0.0000 静音滤镜
-        assert result is not None
-        mock_run.assert_called_once()
-        cmd_str = " ".join(mock_run.call_args[0][0])
-        assert "volume=0" in cmd_str
-
-    def test_no_audio_stream_returns_none(self):
-        clips = [_clip("c1")]
-        svc = _service(clips)
-        with (
-            patch("pathlib.Path.exists", return_value=True),
-            patch("video_processing.unified_render_service.probe_duration", return_value=5.0),
-            patch("video_processing.render_audio.probe_has_audio", return_value=False),
-            patch("video_processing.render_audio.run_ffmpeg") as mock_run,
-        ):
-            result = mix_audio(_ctx(), _layers(svc, clips), 5.0)
-
-        assert result is None
-        mock_run.assert_not_called()
-
-    def test_volume_helper_default_and_override(self):
-        assert _clip_volume(_clip("c1")) == 1.0
-        assert _clip_volume(_clip("c2", config={"volume": 0.3})) == pytest.approx(0.3)
-        assert _clip_volume(_clip("c3", config={"volume": 0})) == 0.0
-
-
-class TestPassThroughAudioProbe:
-    """直通路径必须先探测音频，不能无条件假设 main 有音频。"""
-
-    def test_pass_through_probes_audio_before_encoding(self):
-        clips = [_clip("c1")]
-        svc = _service(clips)
-        with (
-            patch("pathlib.Path.exists", return_value=True),
-            patch("video_processing.unified_render_service.probe_duration", return_value=5.0),
-            patch(
-                "video_processing.unified_render_service.probe_has_audio",
-                return_value=False,
-            ) as mock_probe,
-            patch("video_processing.unified_render_service.run_ffmpeg") as mock_run,
-        ):
-            layers = svc._group_clips_into_layers(clips)
-            has_audio = svc._render_pass_through(layers, Path("/tmp/out.mp4"), video_duration=5.0)
-
-        assert has_audio is False
-        mock_probe.assert_called()
-        cmd_str = " ".join(mock_run.call_args[0][0])
-        assert "aac" not in cmd_str
-
-    def test_pass_through_volume_non_default_disables_stream_copy(self):
-        svc = _service([_clip("c1", config={"volume": 0.5})])
-        clip = _clip("c1", config={"volume": 0.5})
-        can_copy, reason = svc._can_use_stream_copy(clip)
-        assert can_copy is False
-        assert "音量" in reason
-
-    def test_clip_volume_static_helper(self):
-        assert UnifiedRenderService._clip_volume(_clip("c1")) == 1.0
-        assert UnifiedRenderService._clip_volume(_clip("c2", config={"volume": 0.7})) == pytest.approx(0.7)
-
-    def test_pass_through_probe_exception_raises(self):
-        """probe_has_audio 抛致命异常时必须向上抛出，不能静默丢音频产出无声视频。"""
-        clips = [_clip("c1")]
-        svc = _service(clips)
-        with (
-            patch("pathlib.Path.exists", return_value=True),
-            patch("video_processing.unified_render_service.probe_duration", return_value=5.0),
-            patch(
-                "video_processing.unified_render_service.probe_has_audio",
-                side_effect=RuntimeError("probe failed"),
-            ),
-            patch("video_processing.unified_render_service.run_ffmpeg") as mock_run,
-            pytest.raises(RuntimeError, match="probe failed"),
-        ):
-            layers = svc._group_clips_into_layers(clips)
-            svc._render_pass_through(layers, Path("/tmp/out.mp4"), video_duration=5.0)
-
-        mock_run.assert_not_called()

tests/unit/test_preview_title_config.py

@@ -0,0 +1,190 @@
+"""Tests for preview title_config feature.
+
+验证预览 API 的 title_config 字段和 Worker 的标题配置解析逻辑。
+"""
+
+from __future__ import annotations
+
+import json
+
+import pytest
+
+
+class TestPreviewTitleConfigSchema:
+    """测试 CreatePreviewGenerationTaskRequest 的 title_config 字段."""
+
+    def test_title_config_default_empty(self):
+        """title_config 默认为空 dict."""
+        from app.schemas.generation_task import CreatePreviewGenerationTaskRequest
+
+        req = CreatePreviewGenerationTaskRequest(
+            template_id="test_template",
+            asset_ids=["asset1"],
+        )
+        assert req.title_config == {}
+
+    def test_title_config_with_text(self):
+        """传入标题文本."""
+        from app.schemas.generation_task import CreatePreviewGenerationTaskRequest
+
+        req = CreatePreviewGenerationTaskRequest(
+            template_id="test_template",
+            asset_ids=["asset1"],
+            title_config={"text": "测试标题"},
+        )
+        assert req.title_config["text"] == "测试标题"
+
+    def test_title_config_with_full_style(self):
+        """传入完整标题样式配置."""
+        from app.schemas.generation_task import CreatePreviewGenerationTaskRequest
+
+        config = {
+            "text": "我的视频标题",
+            "font": "思源黑体",
+            "font_size": 48,
+            "font_color": "#ffffff",
+            "position": "top",
+            "bold": True,
+            "stroke": 2,
+            "shadow": True,
+        }
+        req = CreatePreviewGenerationTaskRequest(
+            template_id="test_template",
+            asset_ids=["asset1"],
+            title_config=config,
+        )
+        assert req.title_config["text"] == "我的视频标题"
+        assert req.title_config["font_size"] == 48
+        assert req.title_config["position"] == "top"
+
+
+class TestCommandTitleConfig:
+    """测试 CreateGenerationTaskCommand 的 title_config 字段."""
+
+    def test_command_has_title_config(self):
+        """Command 包含 title_config 字段."""
+        from packages.application.generation_tasks import CreateGenerationTaskCommand
+
+        cmd = CreateGenerationTaskCommand(
+            title_config={"text": "hello", "font_size": 32},
+        )
+        assert cmd.title_config["text"] == "hello"
+        assert cmd.title_config["font_size"] == 32
+
+    def test_command_title_config_default_empty(self):
+        """Command 的 title_config 默认为空 dict."""
+        from packages.application.generation_tasks import CreateGenerationTaskCommand
+
+        cmd = CreateGenerationTaskCommand()
+        assert cmd.title_config == {}
+
+
+class TestWorkerTitleConfigParsing:
+    """测试 Worker 渲染时的标题配置解析逻辑."""
+
+    def test_json_format_parsing(self):
+        """JSON 格式的 custom_title 能正确解析."""
+        config = {"text": "测试标题", "font_size": 48, "font_color": "#ff0000"}
+        custom_title = json.dumps(config, ensure_ascii=False)
+
+        ct_stripped = custom_title.strip()
+        parsed = None
+        if ct_stripped.startswith("{"):
+            try:
+                parsed = json.loads(ct_stripped)
+            except (json.JSONDecodeError, ValueError):
+                parsed = None
+
+        assert parsed is not None
+        assert parsed["text"] == "测试标题"
+        assert parsed["font_size"] == 48
+
+    def test_plain_text_fallback(self):
+        """纯文本的 custom_title 不触发 JSON 解析."""
+        custom_title = "简单的标题文字"
+
+        ct_stripped = custom_title.strip()
+        parsed = None
+        if ct_stripped.startswith("{"):
+            try:
+                parsed = json.loads(ct_stripped)
+            except (json.JSONDecodeError, ValueError):
+                parsed = None
+
+        assert parsed is None
+
+    def test_invalid_json_fallback(self):
+        """无效 JSON 的 custom_title 降级为纯文本."""
+        custom_title = "{invalid json"
+
+        ct_stripped = custom_title.strip()
+        parsed = None
+        if ct_stripped.startswith("{"):
+            try:
+                parsed = json.loads(ct_stripped)
+            except (json.JSONDecodeError, ValueError):
+                parsed = None
+
+        assert parsed is None
+
+    def test_json_without_text_skipped(self):
+        """JSON 格式但缺少 text 字段时，跳过标题注入."""
+        config = {"font_size": 48}
+        custom_title = json.dumps(config, ensure_ascii=False)
+
+        ct_stripped = custom_title.strip()
+        parsed = json.loads(ct_stripped)
+        title_text = (parsed.get("text") or "").strip()
+
+        assert title_text == ""
+
+    def test_style_key_mapping(self):
+        """前端字段名正确映射到 ASS 字段名."""
+        config = {
+            "text": "标题",
+            "font_size": 48,
+            "font_color": "#ffffff",
+            "font_preset": "思源黑体",
+        }
+
+        style_keys = ["font", "font_size", "font_color", "position", "bold", "stroke", "shadow", "font_preset"]
+        title_cfg = {}
+        for key in style_keys:
+            if key in config and config[key] is not None:
+                mapped_key = {
+                    "font_size": "size",
+                    "font_color": "color",
+                    "font_preset": "font",
+                }.get(key, key)
+                title_cfg[mapped_key] = config[key]
+
+        assert title_cfg["size"] == 48
+        assert title_cfg["color"] == "#ffffff"
+        assert title_cfg["font"] == "思源黑体"
+
+
+class TestPreviewRouteTitleConfigPassing:
+    """测试预览路由正确序列化 title_config 到 custom_title."""
+
+    def test_title_config_serialization(self):
+        """title_config 序列化为 JSON 字符串."""
+        title_config = {
+            "text": "我的标题",
+            "font_size": 32,
+            "font_color": "#d4a843",
+        }
+        serialized = json.dumps(title_config, ensure_ascii=False)
+
+        parsed = json.loads(serialized)
+        assert parsed["text"] == "我的标题"
+        assert parsed["font_size"] == 32
+
+    def test_empty_title_config_produces_empty_string(self):
+        """空 title_config 时 custom_title 为空字符串."""
+        title_config = {}
+        title_text = (title_config.get("text") or "").strip()
+        custom_title_value = ""
+        if title_text:
+            custom_title_value = json.dumps(title_config, ensure_ascii=False)
+
+        assert custom_title_value == ""

tests/unit/test_preview_title_render.py

@@ -0,0 +1,256 @@
+"""预览视频标题渲染修复测试 — 覆盖3个断点。
+
+断点1: generate_video() → _render_video() 传递 custom_title
+断点2: _render_video() 解析 custom_title 并注入 virtual_plan.config["title"]
+断点3: generate_ass_from_timeline() ASR路径也渲染标题
+"""
+
+import json
+import time
+from pathlib import Path
+from unittest.mock import MagicMock, PropertyMock, patch
+
+import pytest
+
+# ── 断点2: _render_video 标题注入 ─────────────────────────────────────────────
+
+
+class TestRenderVideoCustomTitleInjection:
+    """验证 _render_video 正确接收并注入 custom_title 到 virtual_plan.config['title']。"""
+
+    @pytest.fixture
+    def sample_custom_title(self):
+        """模拟前端发送的 custom_title JSON（含 font_size/font_color）。"""
+        return json.dumps(
+            {
+                "text": "测试标题",
+                "font": "思源黑体",
+                "font_size": 30,
+                "font_color": "#FF0000",
+                "position": "top",
+                "bold": True,
+                "stroke": True,
+                "shadow": False,
+            },
+            ensure_ascii=False,
+        )
+
+    def _call_render_video_with_capture(self, custom_title, template_config=None, tmp_path=None):
+        """调用 _render_video，在 RenderAdapter 处中断并捕获 virtual_plan.config。"""
+        from worker_app.tasks.generation import _render_video
+
+        captured_config = {}
+
+        class FakePlan:
+            def __init__(self):
+                self.config = {}
+                self.id = "test-plan"
+
+        fake_plan = FakePlan()
+
+        def capture_and_raise(*args, **kwargs):
+            # 此时 title 已注入到 fake_plan.config
+            captured_config.update(fake_plan.config or {})
+            raise RuntimeError("STOP_HERE")
+
+        with (
+            patch("worker_app.tasks.generation._build_plan_and_clips_from_task") as mock_build,
+            patch("worker_app.tasks.generation._load_template_plan_config", return_value=template_config),
+            patch("worker_app.tasks.generation.time.monotonic", side_effect=[0.0, 1.0]),
+            patch("video_processing.render_adapter.RenderAdapter") as mock_adapter_cls,
+        ):
+
+            mock_build.return_value = (fake_plan, [], {})
+            mock_adapter_cls.side_effect = capture_and_raise
+
+            with pytest.raises(RuntimeError, match="STOP_HERE"):
+                _render_video(
+                    task_id="test-task",
+                    downloaded_videos=[tmp_path / "v1.mp4"] if tmp_path else [Path("/tmp/v1.mp4")],
+                    voice_path=None,
+                    editing_mode=MagicMock(value="one_take"),
+                    project_id="proj-1",
+                    template_id="tpl-1",
+                    user_id="user-1",
+                    temp_path=tmp_path or Path("/tmp"),
+                    output_name="test_output",
+                    resolution="1280x720",
+                    bgm_config={},
+                    voice_ids=[],
+                    custom_title=custom_title,
+                )
+
+        return captured_config
+
+    def test_custom_title_injected_into_plan_config(self, sample_custom_title, tmp_path):
+        """custom_title JSON 应被解析并注入 virtual_plan.config['title']。"""
+        config = self._call_render_video_with_capture(sample_custom_title, tmp_path=tmp_path)
+
+        assert "title" in config
+        title_cfg = config["title"]
+        assert title_cfg["text"] == "测试标题"
+        # 字段归一化: font_size → size
+        assert title_cfg["size"] == 30
+        # 字段归一化: font_color → color
+        assert title_cfg["color"] == "#FF0000"
+
+    def test_custom_title_overrides_template_title(self, sample_custom_title, tmp_path):
+        """用户自定义标题应覆盖模板默认标题。"""
+        template_config = {"title": {"text": "模板默认标题", "size": 24}}
+        config = self._call_render_video_with_capture(
+            sample_custom_title, template_config=template_config, tmp_path=tmp_path
+        )
+
+        # 用户标题应覆盖模板标题
+        assert config["title"]["text"] == "测试标题"
+        assert config["title"]["size"] == 30
+
+    def test_empty_custom_title_no_injection(self, tmp_path):
+        """空 custom_title 不应注入 title 字段。"""
+        config = self._call_render_video_with_capture("", tmp_path=tmp_path)
+        assert "title" not in config
+
+    def test_malformed_custom_title_gracefully_ignored(self, tmp_path):
+        """非法 JSON 不应崩溃，应跳过注入。"""
+        config = self._call_render_video_with_capture("{invalid json!!!", tmp_path=tmp_path)
+        assert "title" not in config
+
+
+# ── 断点3: generate_ass_from_timeline ASR路径支持标题 ──────────────────────────
+
+
+class TestGenerateAssFromTimelineWithTitle:
+    """验证 generate_ass_from_timeline 在有标题时生成包含 TitleStyle 的 ASS。"""
+
+    def test_title_included_in_ass_output(self, tmp_path):
+        """有 title_text 时，ASS 输出应包含 TitleStyle 和标题事件。"""
+        from video_processing.subtitle_generator import generate_ass_from_timeline
+
+        from packages.domain.subtitle import SubtitleSegment, SubtitleTimeline
+
+        timeline = SubtitleTimeline(
+            segments=[
+                SubtitleSegment(start=0.0, end=2.0, text="你好世界"),
+            ]
+        )
+
+        ass_path = tmp_path / "test.ass"
+        result = generate_ass_from_timeline(
+            ass_path,
+            timeline,
+            video_width=1280,
+            video_height=720,
+            video_duration=10.0,
+            subtitle_config={"font": "思源黑体", "size": 24},
+            title_text="我的标题",
+            title_config={"font": "思源黑体", "size": 36, "color": "#FFFFFF", "position": "top"},
+        )
+
+        content = result.read_text(encoding="utf-8")
+        # 应包含 TitleStyle
+        assert "TitleStyle" in content
+        # 应包含标题文本
+        assert "我的标题" in content
+        # 也应包含 ASR 字幕
+        assert "你好世界" in content
+
+    def test_no_title_no_title_style(self, tmp_path):
+        """无标题时，ASS 输出不应包含 TitleStyle。"""
+        from video_processing.subtitle_generator import generate_ass_from_timeline
+
+        from packages.domain.subtitle import SubtitleSegment, SubtitleTimeline
+
+        timeline = SubtitleTimeline(
+            segments=[
+                SubtitleSegment(start=0.0, end=2.0, text="只有字幕"),
+            ]
+        )
+
+        ass_path = tmp_path / "test.ass"
+        result = generate_ass_from_timeline(
+            ass_path,
+            timeline,
+            video_width=1280,
+            video_height=720,
+            video_duration=10.0,
+            subtitle_config={},
+            title_text="",
+            title_config={},
+        )
+
+        content = result.read_text(encoding="utf-8")
+        assert "TitleStyle" not in content
+        assert "只有字幕" in content
+
+    def test_title_field_normalization_in_ass(self, tmp_path):
+        """前端字段名 font_size/font_color 应被正确归一化。"""
+        from video_processing.subtitle_generator import generate_ass_from_timeline
+
+        from packages.domain.subtitle import SubtitleSegment, SubtitleTimeline
+
+        timeline = SubtitleTimeline(segments=[SubtitleSegment(start=0.0, end=2.0, text="test")])
+
+        ass_path = tmp_path / "test.ass"
+        result = generate_ass_from_timeline(
+            ass_path,
+            timeline,
+            video_width=1280,
+            video_height=720,
+            video_duration=10.0,
+            subtitle_config={},
+            title_text="归一化测试",
+            title_config={
+                "font_size": 30,  # 前端字段名
+                "font_color": "#FF0000",  # 前端字段名
+                "position": "top",
+            },
+        )
+
+        content = result.read_text(encoding="utf-8")
+        assert "TitleStyle" in content
+        assert "归一化测试" in content
+
+    def test_title_boolean_stroke_shadow_compat(self, tmp_path):
+        """boolean stroke/shadow 应被兼容处理。"""
+        from video_processing.subtitle_generator import generate_ass_from_timeline
+
+        from packages.domain.subtitle import SubtitleSegment, SubtitleTimeline
+
+        timeline = SubtitleTimeline(segments=[SubtitleSegment(start=0.0, end=2.0, text="test")])
+
+        ass_path = tmp_path / "test.ass"
+        result = generate_ass_from_timeline(
+            ass_path,
+            timeline,
+            video_width=1280,
+            video_height=720,
+            video_duration=10.0,
+            subtitle_config={},
+            title_text="描边测试",
+            title_config={
+                "size": 36,
+                "stroke": True,  # boolean
+                "shadow": False,  # boolean
+            },
+        )
+
+        content = result.read_text(encoding="utf-8")
+        assert "TitleStyle" in content
+        assert "描边测试" in content
+
+
+# ── 断点1: _render_video 签名包含 custom_title ────────────────────────────────
+
+
+class TestRenderVideoSignature:
+    """验证 _render_video 函数签名正确。"""
+
+    def test_custom_title_parameter_exists(self):
+        """_render_video 应有 custom_title 参数，默认空字符串。"""
+        import inspect
+
+        from worker_app.tasks.generation import _render_video
+
+        sig = inspect.signature(_render_video)
+        assert "custom_title" in sig.parameters
+        assert sig.parameters["custom_title"].default == ""

tests/unit/test_preview_voice_ids_fallback.py

@@ -0,0 +1,151 @@
+"""Tests for voice_ids fallback in _download_all_assets.
+
+When voice_library_id is empty but voice_ids is non-empty, the Worker
+should fallback to voice_ids[0] as the audio asset_id.
+"""
+
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+
+class TestDownloadAllAssetsVoiceIdsFallback:
+    """_download_all_assets 配音下载 fallback 逻辑测试。"""
+
+    @patch("worker_app.tasks.generation._download_voice_asset")
+    @patch("worker_app.tasks.generation._download_library_assets")
+    def test_voice_library_id_takes_priority(self, mock_download_videos, mock_download_voice, tmp_path):
+        """voice_library_id 存在时优先使用，不 fallback 到 voice_ids。"""
+        from worker_app.tasks.generation import _download_all_assets
+
+        mock_download_videos.return_value = [tmp_path / "v1.mp4"]
+        mock_download_voice.return_value = True
+
+        videos, audio = _download_all_assets(
+            temp_path=tmp_path,
+            asset_library_id="lib-1",
+            project_id="proj-1",
+            task_asset_ids=["a1"],
+            voice_library_id="voice-lib-123",
+            task_id="task-1",
+            voice_ids=["voice-ids-456"],
+        )
+
+        assert audio is not None
+        mock_download_voice.assert_called_once()
+        call_args = mock_download_voice.call_args
+        assert call_args[0][0] == "voice-lib-123"  # first positional arg
+
+    @patch("worker_app.tasks.generation._download_voice_asset")
+    @patch("worker_app.tasks.generation._download_library_assets")
+    def test_fallback_to_voice_ids_when_voice_library_id_empty(
+        self, mock_download_videos, mock_download_voice, tmp_path
+    ):
+        """voice_library_id 为空时 fallback 到 voice_ids[0]。"""
+        from worker_app.tasks.generation import _download_all_assets
+
+        mock_download_videos.return_value = [tmp_path / "v1.mp4"]
+        mock_download_voice.return_value = True
+
+        videos, audio = _download_all_assets(
+            temp_path=tmp_path,
+            asset_library_id="lib-1",
+            project_id="proj-1",
+            task_asset_ids=["a1"],
+            voice_library_id="",  # 空字符串
+            task_id="task-2",
+            voice_ids=["voice-asset-789"],
+        )
+
+        assert audio is not None
+        mock_download_voice.assert_called_once()
+        call_args = mock_download_voice.call_args
+        assert call_args[0][0] == "voice-asset-789"
+
+    @patch("worker_app.tasks.generation._download_voice_asset")
+    @patch("worker_app.tasks.generation._download_library_assets")
+    def test_no_audio_when_both_empty(self, mock_download_videos, mock_download_voice, tmp_path):
+        """voice_library_id 和 voice_ids 都为空时，不下载音频。"""
+        from worker_app.tasks.generation import _download_all_assets
+
+        mock_download_videos.return_value = [tmp_path / "v1.mp4"]
+
+        videos, audio = _download_all_assets(
+            temp_path=tmp_path,
+            asset_library_id="lib-1",
+            project_id="proj-1",
+            task_asset_ids=["a1"],
+            voice_library_id="",
+            task_id="task-3",
+            voice_ids=[],
+        )
+
+        assert audio is None
+        mock_download_voice.assert_not_called()
+
+    @patch("worker_app.tasks.generation._download_voice_asset")
+    @patch("worker_app.tasks.generation._download_library_assets")
+    def test_no_audio_when_voice_ids_none(self, mock_download_videos, mock_download_voice, tmp_path):
+        """voice_ids 为 None 时，不触发 fallback。"""
+        from worker_app.tasks.generation import _download_all_assets
+
+        mock_download_videos.return_value = [tmp_path / "v1.mp4"]
+
+        videos, audio = _download_all_assets(
+            temp_path=tmp_path,
+            asset_library_id="lib-1",
+            project_id="proj-1",
+            task_asset_ids=["a1"],
+            voice_library_id="",
+            task_id="task-4",
+            voice_ids=None,
+        )
+
+        assert audio is None
+        mock_download_voice.assert_not_called()
+
+    @patch("worker_app.tasks.generation._download_voice_asset")
+    @patch("worker_app.tasks.generation._download_library_assets")
+    def test_voice_library_id_empty_string_fallback(self, mock_download_videos, mock_download_voice, tmp_path):
+        """voice_library_id 为空字符串且 voice_ids 有多个元素时，取第一个。"""
+        from worker_app.tasks.generation import _download_all_assets
+
+        mock_download_videos.return_value = [tmp_path / "v1.mp4"]
+        mock_download_voice.return_value = True
+
+        videos, audio = _download_all_assets(
+            temp_path=tmp_path,
+            asset_library_id="lib-1",
+            project_id="proj-1",
+            task_asset_ids=["a1"],
+            voice_library_id="",
+            task_id="task-5",
+            voice_ids=["first-id", "second-id", "third-id"],
+        )
+
+        assert audio is not None
+        call_args = mock_download_voice.call_args
+        assert call_args[0][0] == "first-id"
+
+    @patch("worker_app.tasks.generation._download_voice_asset")
+    @patch("worker_app.tasks.generation._download_library_assets")
+    def test_backward_compat_no_voice_ids_param(self, mock_download_videos, mock_download_voice, tmp_path):
+        """不传 voice_ids 参数时，行为与之前一致（向后兼容）。"""
+        from worker_app.tasks.generation import _download_all_assets
+
+        mock_download_videos.return_value = [tmp_path / "v1.mp4"]
+        mock_download_voice.return_value = True
+
+        # 不传 voice_ids
+        videos, audio = _download_all_assets(
+            temp_path=tmp_path,
+            asset_library_id="lib-1",
+            project_id="proj-1",
+            task_asset_ids=["a1"],
+            voice_library_id="voice-lib-999",
+            task_id="task-6",
+        )
+
+        assert audio is not None
+        mock_download_voice.assert_called_once_with("voice-lib-999", tmp_path / "voice.mp3")

tests/unit/test_race_condition_fallback_plan.py

@@ -1,98 +0,0 @@
-"""
-回归测试：验证 generation_tasks.py 中兜底关联 edit plan 在 enqueue 之前执行。
-
-根因（PR #1481 后续修复）：兜底关联逻辑原来在 safe_enqueue_generation_task 之后执行，
-导致 worker 在 enqueue 后立即读取 task 时，source_edit_plan_id 仍为空（竞态条件）。
-"""
-
-import ast
-import textwrap
-
-
-def _get_function_source(filepath, func_name):
-    """提取函数源码"""
-    with open(filepath) as f:
-        source = f.read()
-    tree = ast.parse(source)
-    for node in ast.walk(tree):
-        if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)) and node.name == func_name:
-            lines = source.splitlines()
-            start = node.lineno - 1
-            end = node.end_lineno
-            return textwrap.dedent("\n".join(lines[start:end]))
-    return None
-
-
-def _find_try_block_source(func_source):
-    """在函数源码中找到包含 safe_enqueue_generation_task 的 try 块"""
-    tree = ast.parse(textwrap.dedent(func_source))
-    for node in ast.walk(tree):
-        if isinstance(node, ast.Try):
-            # 检查 try 块中是否包含 safe_enqueue_generation_task
-            block_lines = func_source.splitlines()
-            block_text = "\n".join(block_lines[node.lineno - 1 : node.end_lineno])
-            if "safe_enqueue_generation_task" in block_text:
-                return block_text
-    return None
-
-
-def test_fallback_before_enqueue():
-    """验证兜底关联 edit plan 的代码在 safe_enqueue_generation_task 调用之前"""
-    filepath = "apps/api/app/api/routes/generation_tasks.py"
-    func_source = _get_function_source(filepath, "create_generation_task")
-    assert func_source is not None, "create_generation_task function not found"
-
-    try_block = _find_try_block_source(func_source)
-    assert try_block is not None, "try block with safe_enqueue_generation_task not found"
-
-    # 定位关键标记在 try 块中的行号
-    lines = try_block.splitlines()
-
-    fallback_line = None
-    enqueue_line = None
-    writeback_line = None
-
-    for i, line in enumerate(lines):
-        if "not task.source_edit_plan_id and request.template_id" in line and fallback_line is None:
-            fallback_line = i
-        if "safe_enqueue_generation_task(" in line and enqueue_line is None:
-            enqueue_line = i
-        if "_writeback_edit_plan_config(" in line and "def " not in line and writeback_line is None:
-            writeback_line = i
-
-    assert fallback_line is not None, "兜底关联逻辑 not found in try block"
-    assert enqueue_line is not None, "safe_enqueue_generation_task call not found in try block"
-    assert writeback_line is not None, "_writeback_edit_plan_config call not found in try block"
-
-    # 核心断言：兜底关联和回写都在 enqueue 之前
-    assert fallback_line < enqueue_line, f"兜底关联（行{fallback_line}）应在 enqueue（行{enqueue_line}）之前"
-    assert writeback_line < enqueue_line, f"回写 config（行{writeback_line}）应在 enqueue（行{enqueue_line}）之前"
-
-
-def test_fallback_sets_source_edit_plan_id():
-    """验证兜底关联逻辑会设置 task.source_edit_plan_id"""
-    filepath = "apps/api/app/api/routes/generation_tasks.py"
-    func_source = _get_function_source(filepath, "create_generation_task")
-    assert func_source is not None
-
-    try_block = _find_try_block_source(func_source)
-    assert try_block is not None
-
-    # 验证兜底逻辑包含赋值语句
-    assert "task.source_edit_plan_id = _plan_model.id" in try_block, "兜底关联逻辑应设置 task.source_edit_plan_id"
-    assert "generation_task_repository.update(task)" in try_block, "兜底关联后应持久化 task 到 DB"
-
-
-def test_writeback_uses_effective_plan_id():
-    """验证回写 config 使用的是 effective_plan_id（包含兜底结果），而非仅 request.source_edit_plan_id"""
-    filepath = "apps/api/app/api/routes/generation_tasks.py"
-    func_source = _get_function_source(filepath, "create_generation_task")
-    assert func_source is not None
-
-    try_block = _find_try_block_source(func_source)
-    assert try_block is not None
-
-    # 验证使用了 _effective_plan_id 或 task.source_edit_plan_id，而非仅 request.source_edit_plan_id
-    # 修复前用的是 request.source_edit_plan_id，修复后应该用 task.source_edit_plan_id
-    uses_effective = "_effective_plan_id" in try_block or "task.source_edit_plan_id" in try_block
-    assert uses_effective, "回写 config 应使用包含兜底结果的有效 plan_id"

tests/unit/test_render_subtitles_pure.py

@@ -280,7 +280,7 @@ class TestGenerateAssSubtitles:
         content = output.read_text(encoding="utf-8")
         assert "有字幕" in content
 
-    def test_title_color_overlay(self, tmp_path):
+    def test_custom_title_color(self, tmp_path):
         """自定义标题颜色."""
         output = tmp_path / "color.ass"
         result = generate_ass_subtitles(

tests/unit/test_replace_all_clips_transactional.py

@@ -1,147 +0,0 @@
-"""Tests for EditPlanService.replace_all_clips_transactional."""
-
-from __future__ import annotations
-
-import os
-from unittest.mock import MagicMock, PropertyMock, patch
-
-import pytest
-
-os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
-
-
-class TestReplaceAllClipsTransactional:
-    """事务性替换片段方法测试。"""
-
-    @patch("packages.adapters.sqlalchemy_impl.models.EditPlanClipModel")
-    @patch("app.services.edit_plan_service.EditPlanClip")
-    def test_success_commits_once(self, mock_clip_cls, mock_model_cls):
-        """成功时单次 commit，不 rollback。"""
-        from app.services.edit_plan_service import EditPlanService
-
-        db = MagicMock()
-        # Mock query chain for delete
-        query_mock = MagicMock()
-        query_mock.filter.return_value.delete.return_value = 3
-        db.query.return_value = query_mock
-
-        # Mock query chain for mark_ready (pending_with_asset)
-        # After the create loop, query returns empty list (no pending clips with asset)
-        ready_query = MagicMock()
-        ready_query.filter.return_value.filter.return_value.filter.return_value.all.return_value = []
-        db.query.side_effect = [query_mock, ready_query]
-
-        # Mock EditPlanClip.create to return a mock entity
-        mock_entity = MagicMock()
-        mock_entity.id = "clip-1"
-        mock_entity.plan_id = "plan-1"
-        mock_entity.clip_type = "main"
-        mock_entity.order = 0
-        mock_entity.asset_id = "asset-1"
-        mock_entity.text_content = ""
-        mock_entity.start_time = 0.0
-        mock_entity.duration = 3.0
-        mock_entity.transition_effect = "cut"
-        mock_entity.transition_duration = 0.0
-        mock_entity.playback_speed = 1.0
-        mock_entity.status.value = "pending"
-        mock_entity.config = {}
-        mock_clip_cls.create.return_value = mock_entity
-
-        # Mock the model constructor
-        mock_model_instance = MagicMock()
-        mock_model_cls.return_value = mock_model_instance
-
-        # Mock clip_repo
-        clip_repo = MagicMock()
-        clip_repo.session = db
-
-        svc = EditPlanService.__new__(EditPlanService)
-        svc._clip_repo = clip_repo
-
-        result = svc.replace_all_clips_transactional(
-            "plan-1",
-            [{"asset_id": "asset-1", "start_time": 0.0, "duration": 3.0, "order": 0}],
-        )
-
-        assert result == 1
-        db.commit.assert_called_once()
-        db.rollback.assert_not_called()
-        db.add.assert_called_once_with(mock_model_instance)
-
-    @patch("packages.adapters.sqlalchemy_impl.models.EditPlanClipModel")
-    @patch("app.services.edit_plan_service.EditPlanClip")
-    def test_failure_rolls_back(self, mock_clip_cls, mock_model_cls):
-        """异常时自动 rollback。"""
-        from app.services.edit_plan_service import EditPlanService
-
-        db = MagicMock()
-        query_mock = MagicMock()
-        query_mock.filter.return_value.delete.return_value = 0
-        db.query.return_value = query_mock
-
-        # Simulate failure during create
-        mock_clip_cls.create.side_effect = ValueError("模拟异常")
-
-        clip_repo = MagicMock()
-        clip_repo.session = db
-
-        svc = EditPlanService.__new__(EditPlanService)
-        svc._clip_repo = clip_repo
-
-        with pytest.raises(ValueError, match="模拟异常"):
-            svc.replace_all_clips_transactional(
-                "plan-1",
-                [{"asset_id": "bad", "start_time": 0.0, "duration": 1.0, "order": 0}],
-            )
-
-        db.rollback.assert_called_once()
-        db.commit.assert_not_called()
-
-    @patch("packages.adapters.sqlalchemy_impl.models.EditPlanClipModel")
-    @patch("app.services.edit_plan_service.EditPlanClip")
-    def test_order_defaults_to_index(self, mock_clip_cls, mock_model_cls):
-        """order=0 时使用索引值作为 order。"""
-        from app.services.edit_plan_service import EditPlanService
-
-        db = MagicMock()
-        query_mock = MagicMock()
-        query_mock.filter.return_value.delete.return_value = 0
-        db.query.return_value = query_mock
-
-        ready_query = MagicMock()
-        ready_query.filter.return_value.filter.return_value.filter.return_value.all.return_value = []
-        db.query.side_effect = [query_mock, ready_query]
-
-        mock_entity = MagicMock()
-        mock_entity.id = "clip-1"
-        mock_entity.plan_id = "plan-1"
-        mock_entity.clip_type = "main"
-        mock_entity.order = 0  # order=0 → 使用 i=0
-        mock_entity.asset_id = "a1"
-        mock_entity.text_content = ""
-        mock_entity.start_time = 0.0
-        mock_entity.duration = 1.0
-        mock_entity.transition_effect = "cut"
-        mock_entity.transition_duration = 0.0
-        mock_entity.playback_speed = 1.0
-        mock_entity.status.value = "pending"
-        mock_entity.config = {}
-        mock_clip_cls.create.return_value = mock_entity
-
-        mock_model_cls.return_value = MagicMock()
-
-        clip_repo = MagicMock()
-        clip_repo.session = db
-
-        svc = EditPlanService.__new__(EditPlanService)
-        svc._clip_repo = clip_repo
-
-        svc.replace_all_clips_transactional(
-            "plan-1",
-            [{"asset_id": "a1", "start_time": 0.0, "duration": 1.0, "order": 0}],
-        )
-
-        # order=0 → falsy → use index i=0
-        create_call = mock_clip_cls.create.call_args
-        assert create_call.kwargs["order"] == 0

tests/unit/test_temp_dir_cleanup_race.py

@@ -1,56 +0,0 @@
-"""回归测试：渲染产物临时目录不在 render_plan 中提前清理。
-
-根因：render_plan 的 finally 块在返回前清理了临时目录，
-但 generation.py 还需要访问其中的文件进行 OSS 上传。
-修复：将清理责任交给调用方（generation.py），render_plan 只在失败时清理。
-"""
-
-import ast
-
-
-def test_render_adapter_result_has_temp_dir_field():
-    """RenderAdapterResult 包含 temp_dir 字段"""
-    with open("apps/worker/video_processing/render_adapter.py") as f:
-        source = f.read()
-    tree = ast.parse(source)
-    for node in ast.walk(tree):
-        if isinstance(node, ast.ClassDef) and node.name == "RenderAdapterResult":
-            for item in node.body:
-                if isinstance(item, ast.AnnAssign) and isinstance(item.target, ast.Name):
-                    if item.target.id == "temp_dir":
-                        return
-    raise AssertionError("RenderAdapterResult 缺少 temp_dir 字段")
-
-
-def test_render_plan_does_not_cleanup_on_success():
-    """render_plan 成功时不在 finally 中清理临时目录（通过将 temp_dir 置为 None）"""
-    with open("apps/worker/video_processing/render_adapter.py") as f:
-        source = f.read()
-
-    # 成功路径必须将 temp_dir 置为 None，以阻止 finally 清理
-    assert "temp_dir = None" in source, "render_plan 成功时应将 temp_dir 置为 None 以阻止 finally 清理"
-
-
-def test_render_plan_passes_temp_dir_to_result():
-    """render_plan 将 temp_dir 传递给返回结果"""
-    with open("apps/worker/video_processing/render_adapter.py") as f:
-        source = f.read()
-
-    assert "result.temp_dir = temp_dir" in source, "render_plan 应将 temp_dir 设置到 result 上"
-
-
-def test_generation_cleans_up_temp_dir():
-    """generation.py 在上传完成后清理临时目录"""
-    with open("apps/worker/worker_app/tasks/generation.py") as f:
-        source = f.read()
-
-    # 验证 _render_from_edit_plan 返回 temp_dir
-    assert "render_temp_dir" in source, "generation.py 应接收 render_temp_dir"
-
-    # 验证有清理逻辑（shutil.rmtree(render_temp_dir...）
-    assert "rmtree(render_temp_dir" in source, "generation.py 应清理 render_temp_dir"
-
-    # 验证清理发生在上传之后（通过查找顺序）
-    upload_pos = source.find("_upload_and_record")
-    cleanup_pos = source.find("rmtree(render_temp_dir")
-    assert upload_pos > 0 and cleanup_pos > upload_pos, "清理临时目录应在 _upload_and_record 之后执行"

tests/unit/test_templates_editor_api.py

@@ -1,11 +1,12 @@
 """
 templates_editor.py 模板编辑器 API 端点单元测试
 
-覆盖核心端点（23个测试用例）：
+覆盖核心端点（25个测试用例）：
 - 草稿：GET/PUT/发布
 - 片段：list/create/get/update/delete/split/merge
 - BGM：GET/PUT
 - 时间线：GET
+- 生成状态查询
 - 预设：BGM预设
 """
 
@@ -394,6 +395,30 @@ class TestTimelineRoute:
         mock_plan_svc.list_clips.assert_called()
 
 
+# ---------------------------------------------------------------------------
+# 生成端点测试
+# ---------------------------------------------------------------------------
+
+
+class TestGenerationRoutes:
+    """生成端点测试"""
+
+    def test_generation_status_success(self, client):
+        c, _, mock_plan_svc = client
+        resp = c.get(BASE + "/generation-status")
+        assert resp.status_code == 200
+        data = resp.json()
+        assert "generation_task_id" in data
+        assert "clips" in data
+
+    def test_generations_list_success(self, client):
+        c, _, mock_plan_svc = client
+        resp = c.get(BASE + "/generations")
+        assert resp.status_code == 200
+        data = resp.json()
+        assert "items" in data or "tasks" in data or isinstance(data, dict)
+
+
 # ---------------------------------------------------------------------------
 # 字幕端点测试
 # ---------------------------------------------------------------------------

tests/unit/test_three_bugs_fix.py

@@ -1,401 +0,0 @@
-"""Regression tests for 3 bug fixes: flush, append_log, plan_id fallback."""
-
-from __future__ import annotations
-
-import json
-import os
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
-
-
-# ── Bug 1: db.flush() before pending query ─────────────────────────────────
-
-
-class TestReplaceAllClipsFlush:
-    """replace_all_clips_transactional must flush before querying pending clips."""
-
-    def _make_svc_and_db(self, pending_results):
-        """Helper: create service + db mock. pending_results = list returned by pending query."""
-        from app.services.edit_plan_service import EditPlanService
-
-        db = MagicMock()
-        # Delete query
-        delete_query = MagicMock()
-        delete_query.filter.return_value.delete.return_value = 0
-        # Pending query: single .filter() with multiple conditions
-        ready_query = MagicMock()
-        ready_query.filter.return_value.all.return_value = pending_results
-        db.query.side_effect = [delete_query, ready_query]
-        return db, EditPlanService
-
-    def _setup_clip_mocks(self, mock_clip_cls, mock_model_cls, asset_id="asset-1"):
-        mock_entity = MagicMock()
-        mock_entity.id = "clip-1"
-        mock_entity.plan_id = "plan-1"
-        mock_entity.clip_type = "main"
-        mock_entity.order = 0
-        mock_entity.asset_id = asset_id
-        mock_entity.text_content = ""
-        mock_entity.start_time = 0.0
-        mock_entity.duration = 3.0
-        mock_entity.transition_effect = "cut"
-        mock_entity.transition_duration = 0.0
-        mock_entity.playback_speed = 1.0
-        mock_entity.status.value = "pending"
-        mock_entity.config = {}
-        mock_clip_cls.create.return_value = mock_entity
-        mock_model_cls.return_value = MagicMock()
-        return mock_entity
-
-    @patch("packages.adapters.sqlalchemy_impl.models.EditPlanClipModel")
-    @patch("app.services.edit_plan_service.EditPlanClip")
-    def test_flush_called_between_add_and_query(self, mock_clip_cls, mock_model_cls):
-        """db.flush() must be called after db.add() and before the pending query."""
-        self._setup_clip_mocks(mock_clip_cls, mock_model_cls)
-        db, SvcClass = self._make_svc_and_db([])
-
-        clip_repo = MagicMock()
-        clip_repo.session = db
-        svc = SvcClass.__new__(SvcClass)
-        svc._clip_repo = clip_repo
-
-        svc.replace_all_clips_transactional(
-            "plan-1",
-            [{"asset_id": "asset-1", "start_time": 0.0, "duration": 3.0, "order": 0}],
-        )
-
-        db.flush.assert_called_once()
-        # Verify ordering: add → flush → query → commit
-        method_names = [c[0] for c in db.method_calls]
-        add_idx = method_names.index("add")
-        flush_idx = method_names.index("flush")
-        commit_idx = method_names.index("commit")
-        assert add_idx < flush_idx < commit_idx
-
-    @patch("packages.adapters.sqlalchemy_impl.models.EditPlanClipModel")
-    @patch("app.services.edit_plan_service.EditPlanClip")
-    def test_flush_marks_new_clips_ready(self, mock_clip_cls, mock_model_cls):
-        """After flush, new clips with asset_id are found and marked ready."""
-        self._setup_clip_mocks(mock_clip_cls, mock_model_cls)
-
-        # Use a plain object so we can verify attribute mutation
-        class FakeClip:
-            status = "pending"
-
-        pending_clip = FakeClip()
-        db, SvcClass = self._make_svc_and_db([pending_clip])
-
-        clip_repo = MagicMock()
-        clip_repo.session = db
-        svc = SvcClass.__new__(SvcClass)
-        svc._clip_repo = clip_repo
-
-        svc.replace_all_clips_transactional(
-            "plan-1",
-            [{"asset_id": "asset-1", "start_time": 0.0, "duration": 3.0, "order": 0}],
-        )
-
-        assert pending_clip.status == "ready"
-
-
-# ── Bug 2: append_log no TypeError ─────────────────────────────────────────
-
-
-class TestAppendLogNoConflict:
-    """append_log must not receive duplicate 'stage' parameter."""
-
-    def _make_task(self):
-        from packages.domain.generation_task import GenerationTask
-
-        return GenerationTask.create(
-            project_id="proj-1",
-            asset_library_id="lib-1",
-            strategy_id="one_take",
-            template_id="tpl-1",
-            asset_ids=["a1"],
-            created_by_user_id="user-1",
-        )
-
-    def test_append_log_with_stage_as_first_positional(self):
-        """append_log(stage, message, ...) works correctly."""
-        task = self._make_task()
-        task.append_log("render", "some error", level="ERROR", error_type="RuntimeError")
-
-        entries = json.loads(task.logs)
-        assert len(entries) == 1
-        assert entries[0]["stage"] == "render"
-        assert entries[0]["message"] == "some error"
-        assert entries[0]["level"] == "ERROR"
-        assert entries[0]["error_type"] == "RuntimeError"
-
-    def test_duplicate_stage_raises_type_error(self):
-        """Sanity check: passing stage both positionally and as kwarg raises TypeError."""
-        task = self._make_task()
-        with pytest.raises(TypeError):
-            task.append_log(
-                "任务失败",  # positional → stage
-                "some error",
-                level="ERROR",
-                stage="render",  # duplicate → TypeError
-            )
-
-
-# ── Bug 3: plan_id fallback in create_generation_task ──────────────────────
-
-
-class TestPlanIdFallback:
-    """Formal generation API should fallback to find plan by template_id + user_id."""
-
-    def test_fallback_code_present_in_source(self):
-        """Verify the fallback logic is present in the generation_tasks module."""
-        import inspect
-
-        from apps.api.app.api.routes import generation_tasks
-
-        source = inspect.getsource(generation_tasks.create_generation_task)
-        assert "EditPlanModel" in source
-        assert "兜底关联编辑计划" in source
-        assert "自动关联编辑计划" in source
-
-    def test_fallback_only_runs_when_source_edit_plan_id_empty(self):
-        """Verify the condition checks for empty source_edit_plan_id."""
-        import inspect
-
-        from apps.api.app.api.routes import generation_tasks
-
-        source = inspect.getsource(generation_tasks.create_generation_task)
-        assert "not task.source_edit_plan_id and request.template_id" in source
-
-    def test_list_by_template_method_exists(self):
-        """Verify SQLAlchemyEditPlanRepository.list_by_template is callable."""
-        from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
-            SQLAlchemyEditPlanRepository,
-        )
-
-        mock_db = MagicMock()
-        mock_session = MagicMock()
-        mock_db.query.return_value = mock_session
-        mock_session.filter.return_value = mock_session
-        mock_session.order_by.return_value = mock_session
-        mock_session.offset.return_value = mock_session
-        mock_session.limit.return_value.all.return_value = []
-
-        repo = SQLAlchemyEditPlanRepository(mock_db)
-        result = repo.list_by_template("tpl-1", limit=20)
-        assert result == []
-
-
-class TestPlanIdFallbackExecution:
-    """Test that the fallback logic actually executes when source_edit_plan_id is empty."""
-
-    @staticmethod
-    def _make_mock_task(source_edit_plan_id=""):
-        t = MagicMock()
-        t.id = "task-1"
-        t.project_id = "proj-1"
-        t.asset_library_id = ""
-        t.strategy_id = "one_take"
-        t.voice_library_id = ""
-        t.template_id = "tpl-1"
-        t.asset_ids = []
-        t.title_ids = []
-        t.voice_ids = []
-        t.source_edit_plan_id = source_edit_plan_id
-        t.asset_select_mode = "manual"
-        t.batch_id = ""
-        t.video_title = ""
-        t.resolution = ""
-        t.bgm_config = None
-        t.is_preview = False
-        t.source_task_id = ""
-        t.output_width = 1280
-        t.output_height = 720
-        t.cover_url = ""
-        t.title_config = {}
-        t.logs = "[]"
-        t.status = "pending"
-        t.progress = 0.0
-        t.error_message = ""
-        t.error_info = None
-        t.created_at = "2026-01-01T00:00:00Z"
-        t.updated_at = "2026-01-01T00:00:00Z"
-        t.started_at = None
-        t.completed_at = None
-        t.created_by_user_id = "user-1"
-        t.auto_retry_enabled = False
-        t.auto_retry_max = 0
-        t.auto_retry_count = 0
-        t.result_count = 0
-        return t
-
-    @staticmethod
-    def _make_request(source_edit_plan_id="", template_id="tpl-1"):
-        req = MagicMock()
-        req.template_id = template_id
-        req.source_edit_plan_id = source_edit_plan_id
-        req.asset_ids = []
-        req.asset_select_mode = "manual"
-        req.asset_select_count = 0
-        req.voice_library_id = ""
-        req.title_ids = []
-        req.voice_ids = []
-        req.strategy_id = "one_take"
-        req.count = 1
-        req.video_title = ""
-        req.resolution = ""
-        req.bgm_config = None
-        req.auto_retry_enabled = False
-        req.auto_retry_max = 0
-        req.is_preview = False
-        req.source_task_id = ""
-        req.output_width = 0
-        req.output_height = 0
-        req.cover_url = ""
-        req.title_config = {}
-        req.project_id = None
-        req.asset_library_id = None
-        return req
-
-    def _run_create_task(self, mock_task, mock_request, mock_db, mock_gen_repo):
-        """Helper to run create_generation_task with common mocks."""
-        from app.schemas.generation_task import GenerationTaskResponse
-
-        with (
-            patch(
-                "apps.api.app.api.routes.generation_tasks._resolve_project_and_library", return_value=("proj-1", None)
-            ),
-            patch("apps.api.app.api.routes.generation_tasks.CreateGenerationTaskUseCase") as mock_uc_cls,
-            patch("apps.api.app.api.routes.generation_tasks.safe_enqueue_generation_task", return_value=True),
-            patch("apps.api.app.api.routes.generation_tasks._to_generation_task_response") as mock_resp_fn,
-        ):
-            mock_uc_cls.return_value.execute.return_value = mock_task
-            mock_resp_fn.return_value = GenerationTaskResponse(
-                id="task-1",
-                project_id="proj-1",
-                asset_library_id="",
-                strategy_id="one_take",
-                voice_library_id="",
-                template_id="tpl-1",
-                asset_ids=[],
-                title_ids=[],
-                voice_ids=[],
-                source_edit_plan_id="",
-                asset_select_mode="",
-                batch_id="",
-                video_title="",
-                resolution="",
-                bgm_config={},
-                is_preview=False,
-                source_task_id="",
-                output_width=1280,
-                output_height=720,
-                cover_url="",
-                title_config={},
-                logs="[]",
-                status="pending",
-                progress=0.0,
-                error_message="",
-                created_at="2026-01-01T00:00:00Z",
-                updated_at="2026-01-01T00:00:00Z",
-                started_at=None,
-                completed_at=None,
-                created_by_user_id="user-1",
-                auto_retry_enabled=False,
-                auto_retry_max=0,
-                auto_retry_count=0,
-                result_count=0,
-            )
-
-            from apps.api.app.api.routes.generation_tasks import create_generation_task
-
-            return create_generation_task(
-                request=mock_request,
-                authenticated_user=MagicMock(user=MagicMock(id="user-1")),
-                generation_task_repository=mock_gen_repo,
-                project_repository=MagicMock(),
-                asset_library_repository=MagicMock(),
-                asset_repository=MagicMock(),
-                db=mock_db,
-            )
-
-    def test_fallback_sets_plan_id_when_empty(self):
-        """When source_edit_plan_id is empty, fallback finds plan via DB query."""
-        mock_task = self._make_mock_task(source_edit_plan_id="")
-        mock_request = self._make_request(source_edit_plan_id="", template_id="tpl-1")
-
-        # Mock DB query chain: db.query(EditPlanModel).filter(...).order_by(...).first()
-        mock_plan_model = MagicMock()
-        mock_plan_model.id = "plan-found-123"
-
-        mock_db = MagicMock()
-        query_chain = MagicMock()
-        query_chain.filter.return_value = query_chain
-        query_chain.order_by.return_value = query_chain
-        query_chain.first.return_value = mock_plan_model
-        mock_db.query.return_value = query_chain
-
-        mock_gen_repo = MagicMock()
-        mock_gen_repo.count_pending_by_user.return_value = 0
-        mock_gen_repo.count_pending_total.return_value = 0
-
-        self._run_create_task(mock_task, mock_request, mock_db, mock_gen_repo)
-
-        assert mock_task.source_edit_plan_id == "plan-found-123"
-        mock_gen_repo.update.assert_called_once_with(mock_task)
-
-    def test_no_fallback_when_plan_id_already_set(self):
-        """When source_edit_plan_id is already set, fallback should NOT run."""
-        mock_task = self._make_mock_task(source_edit_plan_id="plan-already-set")
-        mock_request = self._make_request(source_edit_plan_id="plan-already-set", template_id="tpl-1")
-
-        mock_db = MagicMock()
-        mock_gen_repo = MagicMock()
-        mock_gen_repo.count_pending_by_user.return_value = 0
-        mock_gen_repo.count_pending_total.return_value = 0
-
-        self._run_create_task(mock_task, mock_request, mock_db, mock_gen_repo)
-
-        assert mock_task.source_edit_plan_id == "plan-already-set"
-        mock_gen_repo.update.assert_not_called()
-
-    def test_fallback_no_match_leaves_plan_id_empty(self):
-        """When no plan matches, source_edit_plan_id stays empty."""
-        mock_task = self._make_mock_task(source_edit_plan_id="")
-        mock_request = self._make_request(source_edit_plan_id="", template_id="tpl-1")
-
-        mock_db = MagicMock()
-        query_chain = MagicMock()
-        query_chain.filter.return_value = query_chain
-        query_chain.order_by.return_value = query_chain
-        query_chain.first.return_value = None  # no matching plan
-        mock_db.query.return_value = query_chain
-
-        mock_gen_repo = MagicMock()
-        mock_gen_repo.count_pending_by_user.return_value = 0
-        mock_gen_repo.count_pending_total.return_value = 0
-
-        self._run_create_task(mock_task, mock_request, mock_db, mock_gen_repo)
-
-        assert mock_task.source_edit_plan_id == ""
-        mock_gen_repo.update.assert_not_called()
-
-    def test_fallback_handles_exception_gracefully(self):
-        """When DB query fails, the fallback should not break the main flow."""
-        mock_task = self._make_mock_task(source_edit_plan_id="")
-        mock_request = self._make_request(source_edit_plan_id="", template_id="tpl-1")
-
-        mock_db = MagicMock()
-        mock_db.query.side_effect = Exception("DB connection error")
-
-        mock_gen_repo = MagicMock()
-        mock_gen_repo.count_pending_by_user.return_value = 0
-        mock_gen_repo.count_pending_total.return_value = 0
-
-        self._run_create_task(mock_task, mock_request, mock_db, mock_gen_repo)
-
-        # Task should still be created (fallback error doesn't break main flow)
-        assert mock_task.source_edit_plan_id == ""
-        mock_gen_repo.update.assert_not_called()

tests/unit/test_title_overlay.py

@@ -56,34 +56,3 @@ def test_wrap_title_text_respects_explicit_newline():
     font = ImageFont.load_default()
     lines = wrap_title_text("第一行\n第二行", font, max_width=10000)
     assert lines == ["第一行", "第二行"]
-
-
-def test_apply_title_to_image_custom_color(sample_image):
-    """自定义颜色参数能正常生成图片。"""
-    result = apply_title_to_image(sample_image, "彩色标题", color="#ff0000")
-    assert result == sample_image
-    assert Path(sample_image).stat().st_size > 0
-
-
-def test_apply_title_to_image_short_hex_color(sample_image):
-    """3 位缩写 hex 颜色也能正常解析。"""
-    result = apply_title_to_image(sample_image, "短色", color="#f00")
-    assert result == sample_image
-
-
-def test_apply_title_to_image_invalid_color_fallback(sample_image):
-    """无效颜色字符串 fallback 到白色，不报错。"""
-    result = apply_title_to_image(sample_image, "异常色", color="not-a-color")
-    assert result == sample_image
-
-
-def test_parse_hex_color():
-    from packages.shared.title_overlay import _parse_hex_color
-
-    assert _parse_hex_color("#ffffff") == (255, 255, 255)
-    assert _parse_hex_color("#000000") == (0, 0, 0)
-    assert _parse_hex_color("#ff0000") == (255, 0, 0)
-    assert _parse_hex_color("#f00") == (255, 0, 0)
-    assert _parse_hex_color("") == (255, 255, 255)
-    assert _parse_hex_color("invalid") == (255, 255, 255)
-    assert _parse_hex_color("#gggggg") == (255, 255, 255)

tests/unit/test_unified_render_reuse.py

@@ -0,0 +1,287 @@
+"""统一渲染路径 — 编辑器预览产物复用逻辑单元测试。
+
+覆盖：
+- _find_reusable_preview_task: 查找可复用的预览任务
+- _get_task_output_url: 获取任务输出 URL
+- 编辑器 generate 接口复用预览产物路径
+"""
+
+from __future__ import annotations
+
+import os
+import sys
+from dataclasses import dataclass, field
+from datetime import datetime, timedelta, timezone
+from typing import Any, Optional
+from unittest.mock import MagicMock, patch
+
+os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
+os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
+
+import pytest
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "apps", "api"))
+
+from packages.domain.generation_task import GenerationTask, GenerationTaskStatus
+
+# ── Stub Repository ──────────────────────────────────────────────────────────
+
+
+class StubGenTaskRepo:
+    def __init__(self):
+        self._store = {}
+
+    def create(self, task):
+        self._store[task.id] = task
+        return task
+
+    def get(self, task_id):
+        return self._store.get(task_id)
+
+    def update(self, task):
+        self._store[task.id] = task
+        return task
+
+    def list_by_source_edit_plan(self, plan_id):
+        return [t for t in self._store.values() if (t.source_edit_plan_id or "") == plan_id]
+
+
+def _make_task(**kwargs):
+    defaults = dict(
+        id="task-001",
+        project_id="proj-1",
+        asset_library_id="lib-1",
+        strategy_id="one_take",
+        voice_library_id="",
+        template_id="tmpl-1",
+        asset_ids=["a1"],
+        title_ids=[],
+        voice_ids=[],
+        status=GenerationTaskStatus.COMPLETED,
+        progress=100.0,
+        result_count=1,
+        error_message="",
+        created_by_user_id="user-1",
+        source_edit_plan_id="plan-1",
+        asset_select_mode="all",
+        is_preview=True,
+        source_task_id="",
+        output_width=1920,
+        output_height=1080,
+        cover_url="",
+        custom_title="",
+        video_title="",
+        resolution="",
+        bgm_config={},
+        completed_at=datetime.now(timezone.utc),
+    )
+    defaults.update(kwargs)
+    return GenerationTask(**defaults)
+
+
+def _make_plan(updated_at=None):
+    plan = MagicMock()
+    plan.id = "plan-1"
+    plan.updated_at = updated_at or datetime.now(timezone.utc)
+    plan.status = MagicMock()
+    plan.status.value = "editing"
+    plan.config = {"clips": [{"id": "c1"}, {"id": "c2"}]}
+    return plan
+
+
+# ── _find_reusable_preview_task ──────────────────────────────────────────────
+
+
+class TestFindReusablePreviewTask:
+    def test_returns_completed_preview_task(self):
+        from app.api.routes.templates_editor.generation import _find_reusable_preview_task
+
+        repo = StubGenTaskRepo()
+        now = datetime.now(timezone.utc)
+        task = _make_task(
+            source_edit_plan_id="plan-1",
+            is_preview=True,
+            status=GenerationTaskStatus.COMPLETED,
+            completed_at=now - timedelta(minutes=5),
+        )
+        repo.create(task)
+
+        plan = _make_plan(updated_at=now - timedelta(minutes=10))
+        result = _find_reusable_preview_task(repo, "plan-1", plan)
+
+        assert result is not None
+        assert result.id == "task-001"
+
+    def test_returns_none_when_no_tasks(self):
+        from app.api.routes.templates_editor.generation import _find_reusable_preview_task
+
+        repo = StubGenTaskRepo()
+        plan = _make_plan()
+        result = _find_reusable_preview_task(repo, "plan-1", plan)
+        assert result is None
+
+    def test_returns_none_when_preview_not_completed(self):
+        from app.api.routes.templates_editor.generation import _find_reusable_preview_task
+
+        repo = StubGenTaskRepo()
+        task = _make_task(
+            source_edit_plan_id="plan-1",
+            is_preview=True,
+            status=GenerationTaskStatus.RUNNING,
+            completed_at=None,
+        )
+        repo.create(task)
+
+        plan = _make_plan()
+        result = _find_reusable_preview_task(repo, "plan-1", plan)
+        assert result is None
+
+    def test_returns_none_when_plan_modified_after_preview(self):
+        from app.api.routes.templates_editor.generation import _find_reusable_preview_task
+
+        repo = StubGenTaskRepo()
+        now = datetime.now(timezone.utc)
+        task = _make_task(
+            source_edit_plan_id="plan-1",
+            is_preview=True,
+            status=GenerationTaskStatus.COMPLETED,
+            completed_at=now - timedelta(minutes=10),
+        )
+        repo.create(task)
+
+        # Plan was updated AFTER preview completed
+        plan = _make_plan(updated_at=now)
+        result = _find_reusable_preview_task(repo, "plan-1", plan)
+        assert result is None
+
+    def test_skips_non_preview_tasks(self):
+        from app.api.routes.templates_editor.generation import _find_reusable_preview_task
+
+        repo = StubGenTaskRepo()
+        task = _make_task(
+            source_edit_plan_id="plan-1",
+            is_preview=False,  # not a preview task
+            status=GenerationTaskStatus.COMPLETED,
+        )
+        repo.create(task)
+
+        plan = _make_plan()
+        result = _find_reusable_preview_task(repo, "plan-1", plan)
+        assert result is None
+
+    def test_handles_repo_exception(self):
+        from app.api.routes.templates_editor.generation import _find_reusable_preview_task
+
+        repo = MagicMock()
+        repo.list_by_source_edit_plan.side_effect = Exception("db error")
+        plan = _make_plan()
+        result = _find_reusable_preview_task(repo, "plan-1", plan)
+        assert result is None
+
+
+# ── _get_task_output_url ─────────────────────────────────────────────────────
+
+
+class TestGetTaskOutputUrl:
+    def test_returns_video_url(self):
+        from app.api.routes.templates_editor.generation import _get_task_output_url
+
+        task = _make_task()
+        repo = MagicMock()
+        db = MagicMock()
+
+        mock_video = MagicMock()
+        mock_video.file_url = "https://oss.example.com/video.mp4"
+
+        mock_use_case = MagicMock()
+        mock_use_case.execute.return_value = [mock_video]
+
+        with patch(
+            "app.api.routes.templates_editor.generation.ListGeneratedVideosByTaskUseCase",
+            return_value=mock_use_case,
+        ):
+            result = _get_task_output_url(task, repo, db)
+
+        assert result == "https://oss.example.com/video.mp4"
+
+    def test_returns_empty_when_no_videos(self):
+        from app.api.routes.templates_editor.generation import _get_task_output_url
+
+        task = _make_task()
+        repo = MagicMock()
+        db = MagicMock()
+
+        mock_use_case = MagicMock()
+        mock_use_case.execute.return_value = []
+
+        with patch(
+            "app.api.routes.templates_editor.generation.ListGeneratedVideosByTaskUseCase",
+            return_value=mock_use_case,
+        ):
+            result = _get_task_output_url(task, repo, db)
+
+        assert result == ""
+
+    def test_returns_empty_on_exception(self):
+        from app.api.routes.templates_editor.generation import _get_task_output_url
+
+        task = _make_task()
+        repo = MagicMock()
+        db = MagicMock()
+
+        with patch(
+            "app.api.routes.templates_editor.generation.ListGeneratedVideosByTaskUseCase",
+            side_effect=Exception("db error"),
+        ):
+            result = _get_task_output_url(task, repo, db)
+
+        assert result == ""
+
+
+# ── mark_confirmed ───────────────────────────────────────────────────────────
+
+
+class TestMarkConfirmed:
+    def test_sets_is_preview_false(self):
+        task = _make_task(is_preview=True)
+        task.mark_confirmed()
+        assert task.is_preview is False
+
+    def test_sets_cover_url(self):
+        task = _make_task()
+        task.mark_confirmed(cover_url="https://example.com/cover.jpg")
+        assert task.cover_url == "https://example.com/cover.jpg"
+
+    def test_sets_custom_title(self):
+        task = _make_task()
+        task.mark_confirmed(custom_title="My Video")
+        assert task.custom_title == "My Video"
+
+    def test_sets_output_dimensions(self):
+        task = _make_task()
+        task.mark_confirmed(output_width=1080, output_height=1920)
+        assert task.output_width == 1080
+        assert task.output_height == 1920
+
+    def test_zero_dimensions_not_applied(self):
+        task = _make_task(output_width=1920, output_height=1080)
+        task.mark_confirmed(output_width=0, output_height=0)
+        assert task.output_width == 1920
+        assert task.output_height == 1080
+
+    def test_skips_when_plan_updated_at_is_none(self):
+        from app.api.routes.templates_editor.generation import _find_reusable_preview_task
+
+        repo = StubGenTaskRepo()
+        now = datetime.now(timezone.utc)
+        task = _make_task(
+            source_edit_plan_id="plan-1",
+            is_preview=True,
+            status=GenerationTaskStatus.COMPLETED,
+            completed_at=now - timedelta(minutes=5),
+        )
+        repo.create(task)
+
+        plan = _make_plan(updated_at=None)
+        result = _find_reusable_preview_task(repo, "plan-1", plan)
+        assert result is None

tests/unit/test_unified_render_service.py

@@ -60,17 +60,6 @@ class FakePlan:
     config: dict[str, Any] = field(default_factory=dict)
 
 
-@pytest.fixture(autouse=True)
-def _assume_source_clips_have_audio():
-    """默认假设测试中的视频素材都带音频流。
-
-    新行为：保留视频素材原声（不再无条件丢弃）。需要模拟无音频流的用例
-    自行 patch probe_has_audio=False（如 test_mix_audio_main_no_audio_stream_returns_none）。
-    """
-    with patch("video_processing.render_audio.probe_has_audio", return_value=True):
-        yield
-
-
 def _make_clip(
     clip_id: str,
     clip_type: str = "main",
@@ -987,7 +976,7 @@ class TestAudioMixing:
         assert UnifiedRenderService._clip_effective_duration(clip) == 0.0
 
     def test_mix_audio_single_main_clip(self):
-        """只有 main clip（无独立音频轨）→ 保留源视频原声，走单轨 concat。"""
+        """只有 main clip（无独立音频轨）→ 源视频音频被丢弃，返回 None。"""
         clips = [_make_clip("c1", "main", order=0, duration=5.0)]
         asset_paths = {"asset_c1.mp4": Path("/tmp/asset_c1.mp4")}
         svc = _make_service(clips, asset_paths)
@@ -1001,15 +990,14 @@ class TestAudioMixing:
             ctx = _make_ctx()
             result = mix_audio(ctx, layers, 5.0)
 
-        # 保留源视频原声
-        assert result is not None
-        mock_run.assert_called_once()
-        assert "asset_c1.mp4" in " ".join(mock_run.call_args[0][0])
+        # 源视频音频被丢弃，没有独立音频轨 → 无音频
+        assert result is None
+        mock_run.assert_not_called()
 
     def test_mix_audio_multi_main_clips(self):
-        """main 原声与独立音频轨通过 amix 混音。"""
+        """多个独立音频轨用 concat 拼接（main 图层音频被丢弃）。"""
         clips = [
-            _make_clip("c1", "main", order=0, duration=3.0),
+            _make_clip("c1", "main", order=0, duration=3.0),  # 源视频音频被丢弃
             _make_clip("tts1", "main", order=0, duration=3.0, config={"role": "audio"}),
             _make_clip("tts2", "main", order=1, duration=2.0, config={"role": "audio"}),
         ]
@@ -1033,17 +1021,15 @@ class TestAudioMixing:
         mock_run.assert_called_once()
         cmd = mock_run.call_args[0][0]
         cmd_str = " ".join(cmd)
-        # 原声 + 2 个独立音频轨 → amix 混音（3 路输入）
-        assert "amix=inputs=3" in cmd_str
-        # main 原声 c1 参与混音
-        assert "asset_c1.mp4" in cmd_str
-        assert "asset_tts1.mp4" in cmd_str
-        assert "asset_tts2.mp4" in cmd_str
+        # 2 个独立音频轨 concat
+        assert "concat=n=2:v=0:a=1" in cmd_str
+        # main 的 c1 不参与音频（源视频杂音被丢弃）
+        assert "asset_c1.mp4" not in cmd_str
 
     def test_mix_audio_with_independent_audio_track(self):
-        """main 原声与独立音频轨通过 amix 混音。"""
+        """独立音频轨生效；main 图层源视频音频被丢弃。"""
         clips = [
-            _make_clip("c1", "main", order=0, duration=5.0),
+            _make_clip("c1", "main", order=0, duration=5.0),  # 源视频音频被丢弃
             _make_clip(
                 "bgm1",
                 "main",
@@ -1071,9 +1057,9 @@ class TestAudioMixing:
         mock_run.assert_called_once()
         cmd = mock_run.call_args[0][0]
         cmd_str = " ".join(cmd)
-        # main 原声 c1 与独立音频轨 bgm1 都参与 amix
-        assert "amix=inputs=2" in cmd_str
-        assert "asset_c1.mp4" in cmd_str
+        # main 的源视频 c1 不参与音频
+        assert "asset_c1.mp4" not in cmd_str
+        # 独立音频轨 bgm1 作为最终音频生效
         assert "asset_bgm1.mp4" in cmd_str
 
     def test_mix_with_independent_audio_amix(self):
@@ -1136,7 +1122,7 @@ class TestAudioMixing:
         assert result is None
 
     def test_mix_audio_background_not_used_as_main(self):
-        """background 图层不参与主音频；main 原声与独立音频轨混音。"""
+        """main/background 图层音频都被丢弃，只有独立音频轨参与混音。"""
         clips = [
             _make_clip("bg1", "background", order=0, duration=5.0),
             _make_clip("c1", "main", order=0, duration=5.0),
@@ -1162,15 +1148,14 @@ class TestAudioMixing:
         mock_run.assert_called_once()
         cmd = mock_run.call_args[0][0]
         cmd_str = " ".join(cmd)
-        # background 图层不参与主音频
+        # 源视频（background + main）音频都被丢弃
         assert "asset_bg1.mp4" not in cmd_str
-        # main 原声 + 独立音频轨都参与
-        assert "amix=inputs=2" in cmd_str
-        assert "asset_c1.mp4" in cmd_str
+        assert "asset_c1.mp4" not in cmd_str
+        # 只有独立音频轨
         assert "asset_tts1.mp4" in cmd_str
 
     def test_mix_audio_main_priority_over_broll(self):
-        """main 图层优先作为主音频，broll 不参与；与独立音频轨 amix。"""
+        """main/broll 图层的源视频音频都被丢弃，只使用独立音频轨。"""
         clips = [
             _make_clip("b1", "b_roll", order=0, duration=5.0),
             _make_clip("c1", "main", order=0, duration=5.0),
@@ -1196,14 +1181,13 @@ class TestAudioMixing:
         mock_run.assert_called_once()
         cmd = mock_run.call_args[0][0]
         cmd_str = " ".join(cmd)
-        # main 原声 c1 优先参与；broll b1 不参与主音频
-        assert "amix=inputs=2" in cmd_str
-        assert "asset_c1.mp4" in cmd_str
+        # main 和 broll 的源视频音频都被丢弃
+        assert "asset_c1.mp4" not in cmd_str
         assert "asset_b1.mp4" not in cmd_str
         assert "asset_tts1.mp4" in cmd_str
 
     def test_mix_audio_broll_used_when_no_main(self):
-        """无 main 图层时 broll 原声作为主音频。"""
+        """broll 图层源视频音频也被丢弃；无独立音频轨 → 返回 None。"""
         clips = [_make_clip("b1", "b_roll", order=0, duration=5.0)]
         asset_paths = {"asset_b1.mp4": Path("/tmp/asset_b1.mp4")}
         svc = _make_service(clips, asset_paths)
@@ -1217,15 +1201,14 @@ class TestAudioMixing:
             ctx = _make_ctx()
             result = mix_audio(ctx, layers, 5.0)
 
-        # 保留 broll 原声
-        assert result is not None
-        mock_run.assert_called_once()
-        assert "asset_b1.mp4" in " ".join(mock_run.call_args[0][0])
+        # 源视频音频被丢弃，无独立音频轨 → 无音频
+        assert result is None
+        mock_run.assert_not_called()
 
     def test_mix_audio_single_clip_truncated_to_video_duration(self):
-        """主音频截断到 video_duration（video_duration < clip有效时长）。"""
+        """单独立音频轨截断到 video_duration（video_duration < clip有效时长）。"""
         clips = [
-            _make_clip("c1", "main", order=0, duration=10.0),
+            _make_clip("c1", "main", order=0, duration=10.0),  # 源视频音频被丢弃
             _make_clip("tts1", "main", order=0, duration=10.0, config={"role": "audio"}),
         ]
         asset_paths = {
@@ -1250,8 +1233,8 @@ class TestAudioMixing:
         # 验证截断到 3.0（-t 3.0 或 atrim=0:3.000）
         cmd_str = " ".join(cmd)
         assert "3.000" in cmd_str or "3.0" in cmd_str
-        # main 原声参与
-        assert "asset_c1.mp4" in cmd_str
+        # 源视频不参与
+        assert "asset_c1.mp4" not in cmd_str
 
     def test_merge_audio_video(self):
         """合并音视频命令正确。"""
@@ -1408,11 +1391,11 @@ class TestAudioMixing:
         mock_run.assert_not_called()
 
     def test_mix_audio_partial_clips_no_audio_filtered(self):
-        """main 原声正常保留；无音频流的 clip 被过滤。"""
+        """main 图层音频全部丢弃；独立音频轨有/无音频时按预期过滤。"""
         clips = [
-            _make_clip("c1", "main", order=0, duration=3.0),
-            _make_clip("c2", "main", order=1, duration=2.0),
-            _make_clip("tts1", "main", order=0, duration=2.0, config={"role": "audio"}),
+            _make_clip("c1", "main", order=0, duration=3.0),  # 源视频音频被丢弃
+            _make_clip("c2", "main", order=1, duration=2.0),  # 源视频音频被丢弃
+            _make_clip("tts1", "main", order=0, duration=2.0, config={"role": "audio"}),  # 独立音频轨
         ]
         asset_paths = {
             "asset_c1.mp4": Path("/tmp/asset_c1.mp4"),
@@ -1434,15 +1417,16 @@ class TestAudioMixing:
         mock_run.assert_called_once()
         cmd = mock_run.call_args[0][0]
         cmd_str = " ".join(cmd)
-        # main 原声 c1/c2 + 独立音频轨 tts1 全部参与
-        assert "asset_c1.mp4" in cmd_str
-        assert "asset_c2.mp4" in cmd_str
+        # 只有独立音频轨 tts1 参与
         assert "asset_tts1.mp4" in cmd_str
+        # main 的 c1/c2 源视频音频被丢弃
+        assert "asset_c1.mp4" not in cmd_str
+        assert "asset_c2.mp4" not in cmd_str
 
-    def test_mix_audio_main_plus_independent_amix(self):
-        """main 原声与独立音频轨 amix 混音。"""
+    def test_mix_audio_all_main_no_audio_but_independent_track(self):
+        """main 图层源视频音频全部丢弃；仅独立音频轨生效，走 concat 单轨路径。"""
         clips = [
-            _make_clip("c1", "main", order=0, duration=5.0),
+            _make_clip("c1", "main", order=0, duration=5.0),  # 源视频音频被丢弃
             _make_clip(
                 "bgm1",
                 "main",
@@ -1470,9 +1454,9 @@ class TestAudioMixing:
         mock_run.assert_called_once()
         cmd = mock_run.call_args[0][0]
         cmd_str = " ".join(cmd)
-        # main 原声 c1 与独立音频轨 bgm1 都参与 amix
-        assert "amix=inputs=2" in cmd_str
-        assert "asset_c1.mp4" in cmd_str
+        # main 的源视频 c1 不参与音频
+        assert "asset_c1.mp4" not in cmd_str
+        # 只有独立音频轨 bgm1 作为主音频走单轨拼接
         assert "asset_bgm1.mp4" in cmd_str
 
     def test_mix_audio_both_no_audio_returns_none(self):
@@ -2132,9 +2116,9 @@ class TestConcatNormalizeAudioFormat:
     """
 
     def test_multi_clip_concat_has_aformat(self):
-        """main 原声 + 独立音频轨在 concat/amix 前都有 aformat 归一化。"""
+        """多独立音频轨 concat 前，每个轨都有 aformat 归一化（main 图层源视频音频被丢弃）。"""
         clips = [
-            _make_clip("c1", "main", order=0, duration=3.0),
+            _make_clip("c1", "main", order=0, duration=3.0),  # 源视频音频被丢弃
             _make_clip("tts1", "main", order=0, duration=3.0, config={"role": "audio"}),
             _make_clip("tts2", "main", order=1, duration=2.0, config={"role": "audio"}),
         ]
@@ -2164,14 +2148,14 @@ class TestConcatNormalizeAudioFormat:
         assert "channel_layouts=stereo" in cmd_str, "声道应统一为 stereo"
         assert "sample_fmts=fltp" in cmd_str, "采样格式应统一为 fltp"
 
-        # main 原声 + 2 个独立音频轨都应有 aformat
+        # 2 个独立音频轨都应有 aformat
         aformat_count = cmd_str.count("aformat=")
-        assert aformat_count >= 3, f"3 路音频都应有 aformat，实际 {aformat_count} 个"
+        assert aformat_count >= 2, f"每个独立音频轨都应有 aformat，实际 {aformat_count} 个"
 
-        # amix 3 路输入
-        assert "amix=inputs=3" in cmd_str
-        # main 源视频原声参与
-        assert "asset_c1.mp4" in cmd_str
+        # 有 concat
+        assert "concat=n=2:v=0:a=1" in cmd_str
+        # main 源视频不参与
+        assert "asset_c1.mp4" not in cmd_str
 
     def test_aformat_before_concat(self):
         """aformat 应在 concat 之前（每个独立音频轨处理链中 aformat 在 concat 之前）。"""
@@ -2206,9 +2190,9 @@ class TestConcatNormalizeAudioFormat:
         assert aformat_before_count >= 2, f"concat 之前每个独立音频轨都应有 aformat，实际 {aformat_before_count} 个"
 
     def test_single_clip_audio_has_normalized_output(self):
-        """原声+独立音频轨输出统一格式（一致性保障）。"""
+        """单独立音频轨输出也应统一格式（一致性保障）。"""
         clips = [
-            _make_clip("c1", "main", order=0, duration=5.0),
+            _make_clip("c1", "main", order=0, duration=5.0),  # 源视频音频被丢弃
             _make_clip("tts1", "main", order=0, duration=5.0, config={"role": "audio"}),
         ]
         asset_paths = {
@@ -2228,20 +2212,21 @@ class TestConcatNormalizeAudioFormat:
 
         assert mock_run.called
         cmd = mock_run.call_args[0][0]
-        cmd_str = " ".join(cmd)
 
-        # 原声 + 独立音频轨走 amix：两路都有 aformat 归一化
-        assert "amix=inputs=2" in cmd_str
-        assert cmd_str.count("aformat=") >= 2
-        assert "sample_rates=48000" in cmd_str
-        assert "channel_layouts=stereo" in cmd_str
-        assert "asset_c1.mp4" in cmd_str
-        assert "asset_tts1.mp4" in cmd_str
+        # 单独立音频轨简单路径应有 -ar 48000 和 -ac 2
+        assert "-ar" in cmd, "单独立音频轨应指定采样率"
+        ar_idx = cmd.index("-ar")
+        assert cmd[ar_idx + 1] == "48000", "采样率应为 48000"
+        assert "-ac" in cmd, "单独立音频轨应指定声道数"
+        ac_idx = cmd.index("-ac")
+        assert cmd[ac_idx + 1] == "2", "声道数应为 2（stereo）"
+        cmd_str = " ".join(cmd)
+        assert "asset_c1.mp4" not in cmd_str
 
     def test_independent_audio_track_has_aformat(self):
-        """原声+独立音频轨输出统一格式（48000Hz + stereo + aac）。"""
+        """独立音频轨输出也应统一格式（48000Hz + stereo + aac）。"""
         clips = [
-            _make_clip("c1", "main", order=0, duration=5.0),
+            _make_clip("c1", "main", order=0, duration=5.0),  # 源视频音频被丢弃
             _make_clip(
                 "audio1",
                 "main",
@@ -2269,13 +2254,15 @@ class TestConcatNormalizeAudioFormat:
         cmd = mock_run.call_args[0][0]
         cmd_str = " ".join(cmd)
 
-        # 原声 + 独立音频轨走 amix：两路都有 aformat 归一化
-        assert "amix=inputs=2" in cmd_str
-        assert cmd_str.count("aformat=") >= 2
-        assert "sample_rates=48000" in cmd_str
-        assert "channel_layouts=stereo" in cmd_str
-        # main 原声 c1 与独立音频轨 audio1 都参与
-        assert "asset_c1.mp4" in cmd_str
+        # 单独立音频轨走 concat 单轨简单路径：-ar 48000 -ac 2
+        assert "-ar" in cmd
+        ar_idx = cmd.index("-ar")
+        assert cmd[ar_idx + 1] == "48000"
+        assert "-ac" in cmd
+        ac_idx = cmd.index("-ac")
+        assert cmd[ac_idx + 1] == "2"
+        # main 源视频 c1 不参与音频
+        assert "asset_c1.mp4" not in cmd_str
         assert "asset_audio1.mp4" in cmd_str
 
 
@@ -2312,9 +2299,9 @@ class TestConcatNormalizeAudioCodec:
         assert "-b:a" in cmd, "应指定音频码率"
 
     def test_single_clip_output_is_aac(self):
-        """原声+独立音频轨输出编码为 aac。"""
+        """单独立音频轨输出编码为 aac。"""
         clips = [
-            _make_clip("c1", "main", order=0, duration=5.0),
+            _make_clip("c1", "main", order=0, duration=5.0),  # 源视频音频被丢弃
             _make_clip("tts1", "main", order=0, duration=5.0, config={"role": "audio"}),
         ]
         asset_paths = {
@@ -2335,8 +2322,7 @@ class TestConcatNormalizeAudioCodec:
         assert mock_run.called
         cmd = mock_run.call_args[0][0]
         assert "aac" in cmd
-        # main 原声参与
-        assert "asset_c1.mp4" in " ".join(cmd)
+        assert "asset_c1.mp4" not in " ".join(cmd)
 
 
 class TestConcatNormalizeFourItemsComplete:
@@ -2386,7 +2372,7 @@ class TestConcatNormalizeFourItemsComplete:
         assert fps_count >= 3, f"3个 clip 都应有 fps=30，实际 {fps_count} 个"
 
     def test_audio_format_normalized(self):
-        """[3/4] 音频格式：3 个 main 原声 + 3 个独立音频轨都有 aformat 归一化。"""
+        """[3/4] 音频格式：3 个独立音频轨 concat 前都有 aformat 归一化（main 图层源视频音频被丢弃）。"""
         clips = self._make_one_take_clips() + [
             _make_clip("tts1", "main", order=10, duration=5.0, config={"role": "audio"}),
             _make_clip("tts2", "main", order=11, duration=4.0, config={"role": "audio"}),
@@ -2410,13 +2396,13 @@ class TestConcatNormalizeFourItemsComplete:
         cmd_str = " ".join(cmd)
 
         aformat_count = cmd_str.count("aformat=")
-        assert aformat_count >= 6, f"6 路音频（3原声+3独立轨）都应有 aformat，实际 {aformat_count} 个"
+        assert aformat_count >= 3, f"3个独立音频轨都应有 aformat，实际 {aformat_count} 个"
         assert "sample_rates=48000" in cmd_str
         assert "channel_layouts=stereo" in cmd_str
         assert "sample_fmts=fltp" in cmd_str
-        # main 图层原声参与
+        # main 图层源视频不参与
         for i in range(1, 4):
-            assert f"asset_c{i}.mp4" in cmd_str
+            assert f"asset_c{i}.mp4" not in cmd_str
 
     def test_audio_codec_aac(self):
         """[4/4] 音频编码：输出为 aac（仅独立音频轨参与）。"""
@@ -2441,7 +2427,6 @@ class TestConcatNormalizeFourItemsComplete:
         assert mock_run.called
         cmd = mock_run.call_args[0][0]
         assert "aac" in cmd
-        # 3 个 main 原声 concat 后再与独立轨 amix
         assert "concat=n=3:v=0:a=1" in " ".join(cmd)
 
 

tests/unit/test_worker_cover_meta_and_status.py

@@ -1,67 +0,0 @@
-"""防回归测试：P1 修复
-- Bug 1: gen_task 过期内存对象 _repo.update() 覆盖 DB status 为 pending
-- Bug 2: 封面模型误用 .metadata（SQLAlchemy 保留属性），应为 .extra_meta
-"""
-
-import ast
-from pathlib import Path
-
-import pytest
-
-GENERATION_FILE = Path(__file__).resolve().parents[2] / "apps" / "worker" / "worker_app" / "tasks" / "generation.py"
-
-
-def _read_source() -> str:
-    return GENERATION_FILE.read_text(encoding="utf-8")
-
-
-class TestCoverModelUsesExtraMeta:
-    """封面持久化必须使用 ORM 属性 extra_meta，而不是 SQLAlchemy 保留的 .metadata。"""
-
-    def test_no_metadata_attribute_access_on_cover_model(self):
-        source = _read_source()
-        # 禁止对 _cover_model.metadata 进行读或写
-        assert "_cover_model.metadata" not in source, (
-            "_cover_model.metadata is the SQLAlchemy reserved MetaData object, "
-            "not the JSON column. Use _cover_model.extra_meta instead."
-        )
-
-    def test_extra_meta_used_for_cover_candidates(self):
-        source = _read_source()
-        assert "_cover_model.extra_meta" in source
-        assert 'meta["cover_candidates"]' in source
-
-
-class TestAssetAnalysesDoesNotOverwriteStatus:
-    """保存 asset_analyses 时不能用过期的 gen_task 内存对象整体 _repo.update，
-    否则会把已被 _update_task_status 改为 running 的 status 覆盖回 pending。"""
-
-    def test_no_stale_repo_update_with_gen_task(self):
-        source = _read_source()
-        # 旧代码：gen_task.extra_meta = {...}; _repo.update(gen_task)
-        # 这行会把内存中的 pending status 写回 DB
-        assert "_repo.update(gen_task)" not in source, (
-            "_repo.update(gen_task) writes a stale in-memory object back to DB, "
-            "overwriting status set by _update_task_status. "
-            "Use an independent session to update only extra_meta."
-        )
-
-    def test_no_stale_repo_update(self):
-        """旧路径的 _repo.update(gen_task) 模式已随 DEPRECATED 代码一起删除。"""
-        source = _read_source()
-        assert "_repo.update(gen_task)" not in source
-
-
-class TestGenerationTaskModelOrmAttribute:
-    """确认 ORM 属性映射：Python 属性 extra_meta -> DB 列 metadata。"""
-
-    def test_orm_attribute_is_extra_meta(self):
-        from packages.adapters.sqlalchemy_impl.models import GenerationTaskModel
-
-        # ORM 属性必须存在
-        assert hasattr(GenerationTaskModel, "extra_meta")
-        # .metadata 是 SQLAlchemy 声明基类保留的 MetaData，不是列描述符
-        # 它不应该是我们的 JSON 字段
-        from sqlalchemy import MetaData
-
-        assert isinstance(GenerationTaskModel.metadata, MetaData)

tests/unit/test_worker_generate_video_task_binding.py

@@ -1,74 +0,0 @@
-"""Regression test: ensure worker.generate_video Celery task is bound to the
-real generate_video function, not a helper introduced above it.
-
-Context (P0 incident 2026-08-23): a refactor inserted helper function
-_sync_task_config_to_plan directly under the @celery_app.task decorator,
-so Celery registered the helper as "worker.generate_video". Calling the
-task with a single task_id raised TypeError and every generation job
-failed immediately. This test pins the decorator target.
-
-NOTE: CI conftest may mock Celery so that @celery_app.task does NOT return
-a fully functional Task/PromiseProxy object.  Tests therefore use multiple
-defensive strategies: source-code inspection, __wrapped__.__func__ chain
-traversal, and direct attribute checks.
-"""
-
-from __future__ import annotations
-
-import inspect
-import re
-
-
-def _get_original_function(generate_video):
-    """Walk the __wrapped__ chain to find the original function object."""
-    obj = generate_video
-    seen = set()
-    while hasattr(obj, "__wrapped__"):
-        obj_id = id(obj)
-        if obj_id in seen:
-            break
-        seen.add(obj_id)
-        obj = obj.__wrapped__
-        # __wrapped__ may be a bound method — unwrap to the underlying function
-        if hasattr(obj, "__func__"):
-            return obj.__func__
-    return obj
-
-
-def test_generate_video_task_has_bind_true():
-    """The decorator must use bind=True — verified via the original function's
-    first parameter being 'self' (bind=True convention)."""
-    from worker_app.tasks.generation import generate_video
-
-    original = _get_original_function(generate_video)
-    sig = inspect.signature(original)
-    params = list(sig.parameters)
-    assert params[0] == "self", f"bind=True requires 'self' as first param, got {params}"
-
-
-def test_generate_video_task_signature_has_task_id():
-    """The original generate_video function must accept task_id as a parameter."""
-    from worker_app.tasks.generation import generate_video
-
-    original = _get_original_function(generate_video)
-    sig = inspect.signature(original)
-    params = list(sig.parameters)
-    assert "task_id" in params, f"expected 'task_id' in params, got {params}"
-
-
-def test_generate_video_preserves_original_function():
-    """The original function wrapped by @celery_app.task must be named
-    'generate_video' — not '_sync_task_config_to_plan'."""
-    from worker_app.tasks.generation import generate_video
-
-    original = _get_original_function(generate_video)
-    assert original.__name__ == "generate_video", f"expected __name__='generate_video', got '{original.__name__}'"
-
-
-def test_sync_task_config_to_plan_is_plain_function():
-    """Helper must NOT be registered as a Celery task."""
-    from worker_app.tasks.generation import _sync_task_config_to_plan
-
-    assert not hasattr(
-        _sync_task_config_to_plan, "run"
-    ), "_sync_task_config_to_plan must be a plain function, not a Celery task"