style: auto-format with black + isort + ruff + prettier [skip ci-format-check]

- test_gpu_encoder.py: 扩展至 ~45 个用例，覆盖 encode_mezzanine_to_output happy path
  (audio/no-audio/bitrate/extra_video_args)、post_sync 错误分支(URLError/timeout/bad JSON/uploaded=false)、
  _download_to_file 非200/网络错误清理、_relay_delete 异常吞掉、
  OSS helper(import失败/bucket=None/upload失败/delete异常吞掉)、
  _build_client_from_settings 所有分支(import失败/disabled/缺endpoint/缺relay/正常配置)、
  get_gpu_encoder singleton+init异常、constructor 默认值。
- test_gpu_relay.py: 新增 30+ 个用例，覆盖 _relay_dir/_secret/_safe_key/_check_token、
  build_relay_put_url/get_url/generate_key，以及 PUT/GET/HEAD/DELETE 四个 handler
  (写入/404/401/400/写入错误清理/unlink错误)。
- infra/nginx/gpu-relay-staging.conf: 宿主机 nginx :8092 纯 HTTP vhost，
  给 P4000 通过 Tailscale 回传编码结果使用。部署命令见文件注释。

alembic/versions/083_cover_title_config.py

@@ -0,0 +1,26 @@
+"""#2001 爆款标题样式面板升级: ai_avatar_render_jobs 新增 cover_title_config
+
+Revision ID: 083_cover_title_config
+Revises: 082_atom_clip_ai_tags
+Create Date: 2026-09-20
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "083_cover_title_config"
+down_revision = "082_atom_clip_ai_tags"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "ai_avatar_render_jobs",
+        sa.Column("cover_title_config", sa.JSON(), nullable=False, server_default=sa.text("'{}'")),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("ai_avatar_render_jobs", "cover_title_config")

alembic/versions/084_lipsync_jobs_style.py

@@ -0,0 +1,26 @@
+"""lipsync_jobs 新增 style 字段（TTS 语气风格）
+
+Revision ID: 084_lipsync_jobs_style
+Revises: 083_cover_title_config
+Create Date: 2026-09-21
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "084_lipsync_jobs_style"
+down_revision = "083_cover_title_config"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "lipsync_jobs",
+        sa.Column("style", sa.String(length=32), nullable=False, server_default=""),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("lipsync_jobs", "style")

alembic/versions/085_atom_clip_caption_embedding.py

@@ -0,0 +1,33 @@
+"""asset_atom_clips 新增 caption/embedding 字段（#2035 语义标签增强）
+
+Revision ID: 085_atom_clip_caption_embedding
+Revises: 084_lipsync_jobs_style
+Create Date: 2026-09-25
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "085_atom_clip_caption_embedding"
+down_revision = "084_lipsync_jobs_style"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # caption: 中文画面描述（10-30字）
+    op.add_column(
+        "asset_atom_clips",
+        sa.Column("caption", sa.Text(), nullable=True),
+    )
+    # embedding: caption 对应的向量（豆包 embedding 接口返回，JSON 存 float 数组）
+    op.add_column(
+        "asset_atom_clips",
+        sa.Column("embedding", sa.JSON(), nullable=True),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("asset_atom_clips", "embedding")
+    op.drop_column("asset_atom_clips", "caption")

apps/api/app/api/router.py

@@ -8,6 +8,7 @@ from app.api.routes.chunked_upload import router as chunked_upload_router
 from app.api.routes.classification_jobs import router as classification_jobs_router
 from app.api.routes.clips_standalone import router as clips_standalone_router
 from app.api.routes.cover_templates import router as cover_templates_router
+from app.api.routes.drafts_standalone import router as drafts_standalone_router
 from app.api.routes.duplication import router as duplication_router
 from app.api.routes.feature_flags import router as feature_flags_router
 from app.api.routes.generation_cover import router as generation_cover_router
@@ -15,11 +16,13 @@ from app.api.routes.generation_preview import router as generation_preview_route
 from app.api.routes.generation_tasks import router as generation_tasks_router
 from app.api.routes.generation_variant_plans import router as generation_variant_plans_router
 from app.api.routes.gpu_lipsync import router as gpu_lipsync_router
+from app.api.routes.gpu_relay import router as gpu_relay_router
 from app.api.routes.health import router as health_check_router
 from app.api.routes.ingest_jobs import router as ingest_jobs_router
 from app.api.routes.internal_render import router as internal_render_router
 from app.api.routes.lipsync import router as lipsync_router
-from app.api.routes.points import points_router, usage_router
+from app.api.routes.points import router as points_router
+from app.api.routes.points import usage_router
 from app.api.routes.projects import router as projects_router
 from app.api.routes.scripts import router as scripts_router
 from app.api.routes.scripts_ai import router as scripts_ai_router
@@ -41,6 +44,19 @@ api_router = APIRouter(prefix="/api/v1")
 health_router = APIRouter()
 health_router.include_router(health_check_router)
 
+# ── /api/health 别名：部分前端/探针把 health 放在 /api 前缀下 ──────────────
+# 原来 /health 在根路径；额外加一个 /api/health 别名避免 404。
+api_health_router = APIRouter(prefix="/api")
+api_health_router.include_router(health_check_router)
+health_router.include_router(api_health_router)
+
+# ── 旧前端路径别名（无需 template_id 路径参数）────────────────────────────
+# /api/v1/clips/from-assets 已有 clips_standalone；此处额外挂 /api/v1/editor/*，
+# 解决前端调 /api/v1/editor/clips/from-assets 和 /api/v1/editor/drafts 的 404。
+editor_legacy_router = APIRouter(prefix="/editor", tags=["Editor Legacy Alias"])
+editor_legacy_router.include_router(clips_standalone_router)
+editor_legacy_router.include_router(drafts_standalone_router)
+
 api_router.include_router(
     auth_router,
     tags=["Auth"],
@@ -169,6 +185,9 @@ api_router.include_router(
     prefix="/templates/{template_id}/editor",
     tags=["TemplateEditor"],
 )
+api_router.include_router(
+    editor_legacy_router,
+)
 api_router.include_router(
     tts_router,
     prefix="/tts",
@@ -187,6 +206,10 @@ api_router.include_router(
     internal_render_router,
     tags=["Internal"],
 )
+api_router.include_router(
+    gpu_relay_router,
+    tags=["GpuRelay"],
+)
 api_router.include_router(
     scripts_router,
     prefix="/scripts",

apps/api/app/api/routes/ai_avatar_render.py

@@ -63,6 +63,7 @@ def create_render_job(
             b_roll_segments=[s.model_dump() for s in body.b_roll_segments],
             title_config=body.title_config,
             cover_config=body.cover_config,
+            cover_title_config=body.cover_title_config,
             project_id=body.project_id,
         )
     except AiAvatarRenderError as exc:

apps/api/app/api/routes/drafts_standalone.py

@@ -0,0 +1,102 @@
+"""独立的草稿端点（不依赖 template_id 路径参数，兼容旧前端路径）.
+
+提供以下别名端点，与 /api/v1/templates/{template_id}/editor/draft 功能一致：
+- GET  /api/v1/editor/drafts   获取草稿详情（template_id 从 query/body/默认模板兜底）
+- PUT  /api/v1/editor/drafts   更新草稿（兼容前端 useDraftAutoSave 调用）
+
+根因：前端 useDraftAutoSave 调用 /api/v1/editor/drafts（复数、无 template_id），
+与后端以 template_id 为路径参数的设计不一致，导致 404 并触发 10s timeout。
+本模块参照 clips_standalone.py 的模式，通过默认模板兜底复用 draft.py 的核心逻辑。
+"""
+
+from __future__ import annotations
+
+import logging
+
+from app.auth import AuthenticatedUser, get_current_user
+from app.dependencies import get_db_session
+from app.services.edit_plan_service import EditPlanService
+from app.services.edit_template_service import EditTemplateService
+from fastapi import APIRouter, Depends, HTTPException, Query, status
+from sqlalchemy.orm import Session
+
+from ._default_template import get_or_create_default_template_id
+from .templates_editor.dependencies import resolve_draft_plan_id
+from .templates_editor.draft import get_editor_draft, update_editor_draft
+from .templates_editor.schemas import EditorDraftResponse, EditorUpdateRequest
+
+logger = logging.getLogger(__name__)
+router = APIRouter(tags=["Editor Legacy Alias"])
+
+
+def _resolve_editor_services(db: Session) -> tuple[EditTemplateService, EditPlanService]:
+    return EditTemplateService(db), EditPlanService(db)
+
+
+def _resolve_template_id(
+    template_id: str | None,
+    db: Session,
+    current_user: AuthenticatedUser,
+) -> str:
+    """解析 template_id：query/body 优先，否则兜底默认模板。"""
+    tid = (template_id or "").strip()
+    if tid:
+        return tid
+    user_id = str(current_user.user.id)
+    tid = get_or_create_default_template_id(db, user_id)
+    if not tid:
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="无法自动创建默认模板，请刷新页面重试",
+        )
+    return tid
+
+
+@router.get("/drafts", response_model=EditorDraftResponse)
+def get_editor_drafts_alias(
+    template_id: str | None = Query(default=None, description="模板ID，不传则兜底默认模板"),
+    db: Session = Depends(get_db_session),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+) -> EditorDraftResponse:
+    """获取草稿详情（复数路径别名，兼容旧前端调用）。"""
+    tid = _resolve_template_id(template_id, db, current_user)
+    services = _resolve_editor_services(db)
+    plan_id = resolve_draft_plan_id(
+        template_id=tid,
+        services=services,
+        current_user=current_user,
+        db=db,
+        auto_create_default=False,
+    )
+    return get_editor_draft(
+        template_id=tid,
+        plan_id=plan_id,
+        services=services,
+        _=current_user,
+    )
+
+
+@router.put("/drafts", response_model=EditorDraftResponse)
+def update_editor_drafts_alias(
+    req: EditorUpdateRequest,
+    template_id: str | None = Query(default=None, description="模板ID，不传则兜底默认模板"),
+    db: Session = Depends(get_db_session),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+) -> EditorDraftResponse:
+    """更新草稿（复数路径别名，兼容前端 useDraftAutoSave 调用）。"""
+    tid = _resolve_template_id(template_id, db, current_user)
+    services = _resolve_editor_services(db)
+    plan_id = resolve_draft_plan_id(
+        template_id=tid,
+        services=services,
+        current_user=current_user,
+        db=db,
+        auto_create_default=False,
+    )
+    return update_editor_draft(
+        template_id=tid,
+        req=req,
+        plan_id=plan_id,
+        services=services,
+        _=current_user,
+    )

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

@@ -76,10 +76,7 @@ class GenerateCoverResponse(BaseModel):
 # ── Route ────────────────────────────────────────────────────────────────
 
 
-
-def _select_best_frame_from_snapshots(
-    snapshots: list[dict], plan_id: str
-) -> str:
+def _select_best_frame_from_snapshots(snapshots: list[dict], plan_id: str) -> str:
     """从 MediaKit 抽帧结果中，通过质量评分选出最佳帧。
 
     降级策略：cv2 不可用或评分失败时，返回第一帧。
@@ -232,7 +229,10 @@ def _persist_cover_frame(
 
 
 def _get_task_video_url(db: Session, task_id: str) -> Optional[str]:
-    """从 GenerationTask 关联的 GeneratedVideo 中获取视频 storage_key / URL."""
+    """从 GenerationTask 关联的 GeneratedVideo 中获取视频 storage_key / URL.
+
+    #2028: awaiting_cover 状态下 GeneratedVideo 尚未入库，兜底从 task.extra_meta.rendered_output.file_url 读取。
+    """
     try:
         video_repo = get_generated_video_repository(db)
         use_case = ListGeneratedVideosByTaskUseCase(video_repo)
@@ -241,6 +241,20 @@ def _get_task_video_url(db: Session, task_id: str) -> Optional[str]:
             return getattr(videos[0], "file_url", "") or ""
     except Exception:
         logger.warning("[封面生成] 获取任务视频失败: task_id=%s", task_id, exc_info=True)
+    # awaiting_cover 兜底：从 extra_meta.rendered_output 取
+    try:
+        task_repo = SQLAlchemyGenerationTaskRepository(db)
+        task = task_repo.get(task_id)
+        if task is not None:
+            _status = task.status.value if hasattr(task.status, "value") else str(task.status)
+            if _status == "awaiting_cover":
+                _meta = getattr(task, "extra_meta", {}) or {}
+                _ro = _meta.get("rendered_output") or {}
+                _url = _ro.get("file_url") or ""
+                if _url:
+                    return _url
+    except Exception:
+        logger.warning("[封面生成] awaiting_cover 兜底读取失败: task_id=%s", task_id, exc_info=True)
     return None
 
 

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

@@ -650,11 +650,26 @@ def get_preview_generation_task(
     if not getattr(task, "is_preview", False):
         raise HTTPException(status_code=404, detail=f"预览任务 {task_id} 不存在")
 
-    # 查询生成的视频（取第一个）
+    # 查询生成的视频（取第一个）。
+    # #2024: 渲染完成后先进入 awaiting_cover（未入成品库），此时预览也应可见，
+    # 从 extra_meta["rendered_output"] 读取视频 URL。
     generated_videos = []
     status_val = task.status.value if hasattr(task.status, "value") else str(task.status)
     if status_val == "completed":
         list_use_case = ListGeneratedVideosByTaskUseCase(generated_video_repository)
         generated_videos = list_use_case.execute(task_id)
+    elif status_val == "awaiting_cover":
+        # 用 extra_meta 中的渲染信息组装一个轻量视频对象给前端预览播放
+        _meta = getattr(task, "extra_meta", {}) or {}
+        _ro = _meta.get("rendered_output") or {}
+        if _ro.get("file_url"):
+
+            class _PreviewVideo:
+                def __init__(self, ro):
+                    self.file_url = ro.get("file_url", "")
+                    self.duration = float(ro.get("duration") or 0.0)
+                    self.file_size = int(ro.get("file_size") or 0)
+
+            generated_videos = [_PreviewVideo(_ro)]
 
     return _to_preview_response(task, generated_videos=generated_videos)

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

@@ -31,6 +31,8 @@ from app.schemas.generation_task import (
     BatchGenerationTaskResponse,
     ConfirmGenerationRequest,
     CreateGenerationTaskRequest,
+    FinalizeGenerationRequest,
+    FinalizeGenerationResponse,
     GenerationTaskResponse,
     ListGenerationTasksResponse,
 )
@@ -44,6 +46,37 @@ from packages.application import (
     ListGeneratedVideosByTaskUseCase,
 )
 from packages.domain.smart_match import smart_select_assets
+
+# #2035：文案关键词 → 素材分类 映射表（用于 smart_match category_match 维度）
+# AssetClassification 枚举: scenic / product / person / animal / food / tech / sport / music / other
+_CATEGORY_KEYWORDS: dict[str, set[str]] = {
+    "scenic": {"风景", "自然", "山水", "大海", "天空", "日落", "日出", "森林", "城市", "建筑", "夜景", "街道", "公园", "景区", "旅行", "旅游", "户外"},
+    "product": {"产品", "商品", "展示", "演示", "开箱", "评测", "好物", "推荐", "种草", "购物", "电商", "带货", "品牌", "广告", "包装"},
+    "person": {"人物", "人物采访", "对话", "说话", "讲解", "演讲", "采访", "聊天", "开会", "工作", "办公室", "团队", "员工", "老板", "女性", "男性", "美女", "帅哥"},
+    "animal": {"动物", "宠物", "狗", "猫", "鸟", "鱼", "马", "牛", "羊", "野生动物", "动物园"},
+    "food": {"美食", "食物", "餐饮", "餐厅", "做饭", "烹饪", "厨房", "菜品", "饮料", "水果", "甜点", "蛋糕", "咖啡", "茶", "零食", "吃"},
+    "tech": {"科技", "数码", "电脑", "手机", "屏幕", "软件", "APP", "互联网", "AI", "人工智能", "机器人", "办公", "程序员", "代码", "屏幕录制"},
+    "sport": {"运动", "健身", "跑步", "篮球", "足球", "游泳", "瑜伽", "户外", "锻炼", "体育", "比赛", "球场"},
+    "music": {"音乐", "歌曲", "演唱会", "乐器", "唱歌", "跳舞", "舞蹈", "MV", "演出", "乐队", "钢琴", "吉他", "节奏"},
+}
+
+
+def _infer_expected_categories(script_tags: set[str] | None) -> set[str] | None:
+    """从文案标签集合推断期望的素材分类（可能命中多个）。标签为空返回 None。"""
+    if not script_tags:
+        return None
+    matched: set[str] = set()
+    for cat, kws in _CATEGORY_KEYWORDS.items():
+        for tag in script_tags:
+            tag.lower()
+            for kw in kws:
+                if kw in tag or tag in kw:
+                    matched.add(cat)
+                    break
+            if cat in matched:
+                break
+    return matched or None
+
 from packages.middleware.points_gate import points_gate
 
 logger = logging.getLogger(__name__)
@@ -132,10 +165,11 @@ def _ensure_library_has_ready_video_assets(assets) -> None:
 def _select_assets_from_library(
     assets: list,
     mode: str,
-    count: int,
+    count: int = 0,
     rng=None,
     script_tags: list | None = None,
     tag_names_by_id: dict | None = None,
+    db=None,
 ) -> list[str]:
     """根据选取模式从素材库中选取 ready 状态的视频素材 ID。
 
@@ -156,6 +190,42 @@ def _select_assets_from_library(
     if not ready_video_assets:
         return []
 
+    # #2035：加载片段级 AI 标签，供叙事模式 AI 加权和 smart 模式语义匹配使用。
+    # 失败降级为空（不影响选片主流程）。
+    clip_ai_tags_by_asset: dict[str, list[dict]] = {}
+    ai_tags_by_asset: dict[str, dict] = {}  # asset_id → 聚合后的 ai_tags dict（取首个有 has_text 的片段；合并 scene/objects/action 去重）
+    try:
+        if db is not None:
+            from packages.adapters.sqlalchemy_impl.models import AssetAtomClipModel
+            ready_ids = [a.id for a in ready_video_assets]
+            clip_rows = (
+                db.query(AssetAtomClipModel.asset_id, AssetAtomClipModel.ai_tags)
+                .filter(AssetAtomClipModel.asset_id.in_(ready_ids))
+                .filter(AssetAtomClipModel.ai_tags.isnot(None))
+                .all()
+            )
+            agg: dict[str, dict] = {}
+            for asset_id, ai_tags in clip_rows:
+                if not isinstance(ai_tags, dict):
+                    continue
+                clip_ai_tags_by_asset.setdefault(asset_id, []).append(ai_tags)
+                # 聚合：合并 scene/objects/action 去重
+                agg.setdefault(asset_id, {"scene": [], "objects": [], "action": [], "shot": "", "has_text": False})
+                for key in ("scene", "objects", "action"):
+                    for v in ai_tags.get(key) or []:
+                        v = str(v).strip()
+                        if v and v not in agg[asset_id][key]:
+                            agg[asset_id][key].append(v)
+                if ai_tags.get("has_text") is True:
+                    agg[asset_id]["has_text"] = True
+                if not agg[asset_id]["shot"] and ai_tags.get("shot"):
+                    agg[asset_id]["shot"] = ai_tags["shot"]
+            ai_tags_by_asset = agg
+    except Exception:  # noqa: BLE001
+        logger.warning("[选片] 加载片段 AI 标签失败，降级不使用语义匹配", exc_info=True)
+        clip_ai_tags_by_asset = {}
+        ai_tags_by_asset = {}
+
     # 叙事模式（#1970 PR3）：文案标签命中池优先；无任何命中时完全降级为现有随机逻辑。
     if script_tags:
         from packages.domain.narrative_match import pick_narrative_assets
@@ -165,6 +235,7 @@ def _select_assets_from_library(
             ready_video_assets,
             script_tags=script_tags,
             tag_names_by_id=tag_names_by_id,
+            clip_ai_tags_by_asset=clip_ai_tags_by_asset,
             limit=limit,
             rng=rng,
         )
@@ -175,7 +246,18 @@ def _select_assets_from_library(
         # 评分维度：质量分(40%) + 时长适配(30%) + 新鲜度(20%) + 未使用加分(10%)
         # 排序注入随机噪声（#1743）：同分素材每次选出不同组合，从素材组合层面降重
         limit = count if count > 0 else None
-        results = smart_select_assets(ready_video_assets, limit=limit, kind="video", rng=rng)
+        # #2035：给 smart_select_assets 传入文案标签和 AI 标签映射，启用语义维度
+        norm_script = {t.strip().lower() for t in (script_tags or []) if t and t.strip()}
+        expected_categories = _infer_expected_categories(norm_script)
+        results = smart_select_assets(
+            ready_video_assets,
+            limit=limit,
+            kind="video",
+            rng=rng,
+            script_tags=norm_script if norm_script else None,
+            ai_tags_by_asset=ai_tags_by_asset or None,
+            expected_categories=expected_categories,
+        )
         return [r.asset.id for r in results]
 
     # 默认 all 模式：返回全部 ready 视频素材
@@ -394,6 +476,7 @@ def create_generation_task(
                 count=request.asset_select_count,
                 script_tags=narrative_script_tags or None,
                 tag_names_by_id=_tag_index,
+                db=db,
             )
     elif project_id and not resolved_asset_ids and (request.asset_select_mode in ("smart",) or narrative_script_tags):
         # 项目级模式：未指定 asset_ids 且选择了 smart 模式（或叙事模式按标签匹配）时自动选取
@@ -408,6 +491,7 @@ def create_generation_task(
                 count=request.asset_select_count,
                 script_tags=narrative_script_tags or None,
                 tag_names_by_id=_tag_index,
+                db=db,
             )
             if not resolved_asset_ids:
                 raise HTTPException(
@@ -891,8 +975,14 @@ def confirm_generation(
     if source_task.project_id:
         check_project_access(source_task.project_id, authenticated_user.user.id, project_repository)
 
-    # 3. 如果预览任务已完成，检查分辨率一致性后复用产物（秒出）
-    if source_task.is_completed and getattr(source_task, "is_preview", False):
+    # 3. 如果预览任务已完成渲染（completed 或 awaiting_cover），检查分辨率一致性后复用产物（秒出）。
+    # #2024: 渲染完成先进入 awaiting_cover（等 Step5 finalize 入库），
+    # confirm 时不再直接 finalize——仍创建 is_preview=False 的正式任务，复用预览渲染产物。
+    _preview_done = getattr(source_task, "is_preview", False) and source_task.status.value in (
+        "completed",
+        "awaiting_cover",
+    )
+    if _preview_done:
         # 校验请求的分辨率是否与预览实际渲染的分辨率一致
         req_w = request.output_width or 0
         req_h = request.output_height or 0
@@ -907,13 +997,25 @@ def confirm_generation(
                 confirmed_title_config = dict(getattr(source_task, "title_config", {}) or {})
                 confirmed_title_config["text"] = request.custom_title.strip()
 
+            # #2024: mark_confirmed 会把 is_preview 翻转为 False、同步标题/分辨率/封面，
+            # 但不再自动 mark_completed——任务停留在 awaiting_cover，等待用户 Step5 选封面后调 finalize。
             source_task.mark_confirmed(
                 cover_url=request.cover_url,
                 output_width=request.output_width,
                 output_height=request.output_height,
                 title_config=confirmed_title_config,
             )
+            # 若预览任务此时是 completed（历史数据/旧 worker），回退到 awaiting_cover 统一流程
+            if source_task.status.value == "completed":
+                try:
+                    from packages.domain.generation_task import GenerationTaskStatus
+
+                    source_task.status = GenerationTaskStatus.AWAITING_COVER
+                    source_task.completed_at = None
+                except Exception:
+                    pass
             generation_task_repository.update(source_task)
+            db.commit()
 
             # 同步标题到 EditPlan.config
             # #1970：确认生成复用预览计划，dedup_enabled 沿用计划已有值，不在此覆盖
@@ -926,7 +1028,7 @@ def confirm_generation(
                 )
 
             logger.info(
-                "[确认生成] 复用预览产物: task_id=%s, user_id=%s",
+                "[确认生成] 复用预览产物（等待 finalize）: task_id=%s, user_id=%s",
                 task_id,
                 authenticated_user.user.id,
             )
@@ -995,6 +1097,67 @@ def confirm_generation(
     )
 
 
+@router.post("/tasks/{task_id}/finalize", response_model=FinalizeGenerationResponse)
+def finalize_generation_task(
+    task_id: str,
+    request: FinalizeGenerationRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    generation_task_repository: Any = Depends(get_generation_task_repository),
+    generated_video_repository: Any = Depends(get_generated_video_repository),
+    project_repository: Any = Depends(get_project_repository),
+    storage_service: OSSStorageService = Depends(get_storage_service),
+    db: Session = Depends(get_db_session),
+) -> FinalizeGenerationResponse:
+    """#2024: Step5 点「完成」时调用——将 awaiting_cover 状态的任务正式入库+绑定封面。
+
+    - 任务必须处于 awaiting_cover 状态（渲染+上传已完成、封面候选已就绪）。
+    - cover_url 为空则使用任务自动截帧/智能封面；非空则绑定为最终封面。
+    - 幂等：已 finalize 的任务直接返回已有视频记录。
+    - 成功后任务推进到 completed，返回成品视频 ID + 可播放 URL。
+    """
+    from app.services.generation_finalize_service import (
+        GenerationFinalizeError,
+        GenerationFinalizeService,
+    )
+
+    task = generation_task_repository.get(task_id)
+    if task is None:
+        raise HTTPException(status_code=404, detail=f"GenerationTask {task_id} not found")
+    if task.project_id:
+        check_project_access(task.project_id, authenticated_user.user.id, project_repository)
+
+    service = GenerationFinalizeService(db)
+    try:
+        video = service.finalize_task(
+            task_id=task_id,
+            user_id=authenticated_user.user.id,
+            cover_url=request.cover_url or None,
+            custom_title=(request.custom_title or "").strip() or None,
+        )
+    except GenerationFinalizeError as e:
+        raise HTTPException(status_code=e.status_code, detail=str(e)) from e
+
+    try:
+        download_url = storage_service.get_download_url(video.file_url, expires_seconds=86400)
+    except Exception:
+        download_url = video.file_url
+    return FinalizeGenerationResponse(
+        video_id=video.id,
+        project_id=getattr(video, "project_id", "") or "",
+        name=getattr(video, "name", "") or "",
+        file_size=int(getattr(video, "file_size", 0) or 0),
+        duration=float(getattr(video, "duration", 0.0) or 0.0),
+        thumbnail_url=video.thumbnail_url or "",
+        cover_url=video.thumbnail_url or "",
+        file_url=download_url,
+        width=int(getattr(video, "width", 0) or 0),
+        height=int(getattr(video, "height", 0) or 0),
+        fps=float(getattr(video, "fps", 0.0) or 0.0),
+        status="success",
+        is_duplicate=bool(getattr(video, "is_duplicate", False)),
+    )
+
+
 @router.get("/tasks", response_model=ListGenerationTasksResponse)
 def list_generation_tasks(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -1042,6 +1205,44 @@ def list_generation_results(
     for item in items:
         download_url = storage_service.get_download_url(item.file_url, expires_seconds=86400)
         responses.append(_to_generated_video_response(item, download_url=download_url))
+
+    # #2024/#2028: awaiting_cover 状态下 GeneratedVideo 尚未入库，
+    # 从 extra_meta["rendered_output"] 合成一条轻量视频响应，供前端预览与智能封面使用。
+    status_val = task.status.value if hasattr(task.status, "value") else str(task.status)
+    if not responses and status_val == "awaiting_cover":
+        _meta = getattr(task, "extra_meta", {}) or {}
+        _ro = _meta.get("rendered_output") or {}
+        _file_url = _ro.get("file_url") or ""
+        if _file_url:
+            if _file_url.startswith("http"):
+                _download = _file_url
+            else:
+                try:
+                    _download = storage_service.get_download_url(_file_url, expires_seconds=86400)
+                except Exception:
+                    _download = _file_url
+            _name = _ro.get("name") or ""
+            if not _name:
+                _name = f"generated-{task_id[:8]}"
+            responses.append(
+                GeneratedVideoResponse(
+                    id=f"preview-{task_id}",
+                    project_id=getattr(task, "project_id", "") or "",
+                    generation_task_id=task_id,
+                    name=_name,
+                    file_url=_file_url,
+                    file_size=int(_ro.get("file_size") or 0),
+                    duration=float(_ro.get("duration") or 0.0),
+                    thumbnail_url=_ro.get("thumbnail_url") or getattr(task, "cover_url", "") or "",
+                    width=int(_ro.get("width") or 0),
+                    height=int(_ro.get("height") or 0),
+                    fps=float(_ro.get("fps") or 0.0),
+                    mode=_ro.get("mode", ""),
+                    download_url=_download,
+                    created_at=getattr(task, "updated_at", None) or getattr(task, "created_at", None),
+                )
+            )
+
     return ListGeneratedVideosResponse(items=responses)
 
 

apps/api/app/api/routes/gpu_lipsync.py

@@ -93,7 +93,7 @@ def register_worker(
     svc: GpuLipsyncService = Depends(_get_svc),
     _token: str = Depends(_verify_gpu_token),
 ):
-    svc.register_worker(
+    worker, cancel_task = svc.register_worker(
         worker_id=body.worker_id,
         hostname=body.hostname,
         gpu_name=body.gpu_name,
@@ -101,7 +101,7 @@ def register_worker(
         capabilities=body.capabilities,
         task_id=body.task_id,
     )
-    return GpuWorkerRegisterResponse(ok=True, server_time=datetime.now(UTC), message="ok")
+    return GpuWorkerRegisterResponse(ok=True, server_time=datetime.now(UTC), message="ok", cancel_task=cancel_task)
 
 
 # ── GET /lipsync/poll — Worker 轮询拉任务 ─────────────────────────

apps/api/app/api/routes/gpu_relay.py

@@ -0,0 +1,173 @@
+"""GPU 编码回传 relay 端点。
+
+P4000 编码完成后通过 HTTP PUT 把结果 mp4 写到这里；Worker 在发起 GPU 请求时携带
+带签名（token + 随机 key）的 URL，等待 P4000 写入后用同 URL 把文件 GET 回本地。
+
+安全：
+- 生产环境必须配置 GPU_ENCODE_RELAY_SECRET；token=xxx 查询参数必须匹配。
+- key 为随机 hex，无法被枚举。
+- 写入/读取后 worker 会调用 DELETE 主动清理；文件落地在 generated-files/gpu_relay/，
+  跟 generated-files 同卷，nginx 已对 generated-files 做静态挂载，但 gpu_relay/ 子目录
+  通过本接口走鉴权，不直接暴露为静态目录（文件名随机 + token 保护双重保险）。
+"""
+from __future__ import annotations
+
+import logging
+import os
+import secrets
+import time
+import uuid
+from pathlib import Path
+from typing import Optional
+
+from fastapi import APIRouter, HTTPException, Query, Request
+from fastapi.responses import FileResponse, Response
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/internal/gpu-relay", tags=["Internal-GpuRelay"])
+
+_DEFAULT_SECRET_LOGGED = False
+
+
+def _relay_dir() -> Path:
+    base = os.getenv("GENERATED_FILES_DIR", "/app/generated")
+    sub = os.getenv("GPU_ENCODE_RELAY_DIR", "gpu_relay")
+    p = Path(base) / sub
+    p.mkdir(parents=True, exist_ok=True)
+    return p
+
+
+def _secret() -> str:
+    global _DEFAULT_SECRET_LOGGED
+    secret = (os.getenv("GPU_ENCODE_RELAY_SECRET", "") or "").strip()
+    if not secret:
+        env = (os.getenv("APP_ENV", os.getenv("ENV", "development"))).lower()
+        if env in ("production", "prod"):
+            # Production: raise so deployment fails fast
+            raise RuntimeError("GPU_ENCODE_RELAY_SECRET must be set in production")
+        # Dev: ephemeral random secret, log once
+        secret = os.environ.setdefault("GPU_ENCODE_RELAY_SECRET", secrets.token_urlsafe(32))
+        if not _DEFAULT_SECRET_LOGGED:
+            logger.warning(
+                "[gpu-relay] GPU_ENCODE_RELAY_SECRET not set; using ephemeral dev token (%s...)",
+                secret[:8],
+            )
+            _DEFAULT_SECRET_LOGGED = True
+    return secret
+
+
+def _safe_key(key: str) -> str:
+    """只允许合法文件名字符，防 path traversal。"""
+    k = key.strip()
+    if not k or "/" in k or "\\" in k or k in (".", "..") or not all(
+        c.isalnum() or c in "-_" for c in k
+    ):
+        raise HTTPException(status_code=400, detail="invalid key")
+    return k
+
+
+def _check_token(tok: Optional[str]) -> None:
+    if not tok or tok != _secret():
+        raise HTTPException(status_code=401, detail="unauthorized")
+
+
+# ── Worker 侧：生成一个一次性 PUT URL ───────────────────────────────────
+def build_relay_put_url(base_url: str, key: str, secret: str) -> str:
+    """给 P4000 用的 PUT URL（含 token）。"""
+    return f"{base_url.rstrip('/')}/api/v1/internal/gpu-relay/{key}?token={secret}"
+
+
+def build_relay_get_url(base_url: str, key: str, secret: str) -> str:
+    """Worker 取回结果用的 GET URL。"""
+    return build_relay_put_url(base_url, key, secret)
+
+
+def generate_key() -> str:
+    return uuid.uuid4().hex
+
+
+# ── HTTP endpoints ──────────────────────────────────────────────────────
+
+
+@router.put("/{key}")
+async def put_object(
+    key: str,
+    request: Request,
+    token: Optional[str] = Query(None),
+):
+    _check_token(token)
+    safe = _safe_key(key)
+    dst = _relay_dir() / safe
+    tmp = dst.with_suffix(dst.suffix + ".part")
+    size = 0
+    t0 = time.time()
+    try:
+        with open(tmp, "wb") as f:
+            async for chunk in request.stream():
+                f.write(chunk)
+                size += len(chunk)
+        os.replace(tmp, dst)
+    except Exception as e:  # noqa: BLE001
+        if tmp.exists():
+            try:
+                tmp.unlink()
+            except OSError:
+                pass
+        logger.exception("[gpu-relay] PUT failed key=%s", safe)
+        raise HTTPException(status_code=500, detail=f"write failed: {e}") from e
+    logger.info(
+        "[gpu-relay] PUT key=%s size=%d took=%.2fs",
+        safe, size, time.time() - t0,
+    )
+    return {"ok": True, "key": safe, "size": size}
+
+
+@router.get("/{key}")
+async def get_object(
+    key: str,
+    token: Optional[str] = Query(None),
+):
+    _check_token(token)
+    safe = _safe_key(key)
+    path = _relay_dir() / safe
+    if not path.exists():
+        raise HTTPException(status_code=404, detail="not found")
+    return FileResponse(
+        path=path,
+        media_type="video/mp4",
+        filename=f"{safe}.mp4",
+    )
+
+
+@router.head("/{key}")
+async def head_object(
+    key: str,
+    token: Optional[str] = Query(None),
+):
+    _check_token(token)
+    safe = _safe_key(key)
+    path = _relay_dir() / safe
+    if not path.exists():
+        return Response(status_code=404)
+    return Response(
+        status_code=200,
+        media_type="video/mp4",
+        headers={"Content-Length": str(path.stat().st_size)},
+    )
+
+
+@router.delete("/{key}")
+async def delete_object(
+    key: str,
+    token: Optional[str] = Query(None),
+):
+    _check_token(token)
+    safe = _safe_key(key)
+    path = _relay_dir() / safe
+    try:
+        if path.exists():
+            path.unlink()
+    except OSError as e:
+        raise HTTPException(status_code=500, detail=f"delete failed: {e}") from e
+    return {"ok": True, "key": safe}

apps/api/app/api/routes/lipsync.py

@@ -111,6 +111,8 @@ def create_lipsync_job(
             voice_id=body.voice_id,
             script_text=body.script_text,
             speed=body.speed,
+            style=body.style or "",
+            volume=body.volume if body.volume is not None else 50,
             emotion=body.emotion,
             enable_video_loop=body.enable_video_loop,
             project_id=body.project_id,
@@ -211,6 +213,8 @@ def preview_tts(
             voice_id=body.voice_id,
             script_text=body.script_text,
             speed=body.speed,
+            style=body.style or "",
+            volume=body.volume if body.volume is not None else 50,
             emotion=body.emotion,
         )
     except MediaKitError as exc:
@@ -342,13 +346,13 @@ def cancel_lipsync_job(
     current_user: AuthenticatedUser = Depends(get_current_user),
     svc: LipsyncService = Depends(_get_service),
 ):
-    """取消对口型任务（仅 pending/tts_processing/submitted 状态可取消）."""
+    """取消对口型任务（仅 pending/tts_processing/submitted/processing 状态可取消）."""
     job = svc.cancel_job(job_id, current_user.user.id)
     if job is None:
         raise HTTPException(status_code=404, detail="任务不存在")
     if job.status != "cancelled":
         raise HTTPException(
             status_code=400,
-            detail=f"任务状态 {job.status} 不可取消，仅 pending/tts_processing/submitted 可取消",
+            detail=f"任务状态 {job.status} 不可取消，仅 pending/tts_processing/submitted/processing 可取消",
         )
     return job

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

@@ -63,6 +63,8 @@ def _generation_step(task) -> str:
         return "等待 Worker 执行"
     if s == "running":
         return "正在生成成片"
+    if s == "awaiting_cover":
+        return "等待确认封面"
     if s == "completed":
         return "生成完成"
     if s == "failed":
@@ -129,7 +131,7 @@ def _validate_status(status: str | None) -> str | None:
     """校验状态值合法性。"""
     if status is None:
         return None
-    valid = {"pending", "running", "completed", "failed", "cancelled"}
+    valid = {"pending", "running", "awaiting_cover", "completed", "failed", "cancelled"}
     if status not in valid:
         raise HTTPException(
             status_code=400,
@@ -151,7 +153,9 @@ def _clamp_page_size(page_size: int) -> int:
 
 @router.get("/tasks", response_model=ListTasksResponse)
 def list_user_tasks(
-    status: str | None = Query(None, description="按状态筛选：pending/running/completed/failed/cancelled"),
+    status: str | None = Query(
+        None, description="按状态筛选：pending/running/awaiting_cover/completed/failed/cancelled"
+    ),
     task_type: str | None = Query(None, description="按任务类型筛选：generation/ingest"),
     page: int = Query(1, ge=1, description="页码，从1开始"),
     page_size: int = Query(DEFAULT_PAGE_SIZE, ge=1, le=MAX_PAGE_SIZE, description="每页数量"),
@@ -248,7 +252,9 @@ def retry_task_by_id(
 @router.get("/projects/{project_id}/tasks", response_model=ListProjectTasksResponse)
 def list_project_tasks(
     project_id: str,
-    status: str | None = Query(None, description="按状态筛选：pending/running/completed/failed/cancelled"),
+    status: str | None = Query(
+        None, description="按状态筛选：pending/running/awaiting_cover/completed/failed/cancelled"
+    ),
     task_type: str | None = Query(None, description="按任务类型筛选：generation/ingest"),
     page: int = Query(1, ge=1, description="页码，从1开始"),
     page_size: int = Query(DEFAULT_PAGE_SIZE, ge=1, le=MAX_PAGE_SIZE, description="每页数量"),

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

@@ -682,17 +682,50 @@ def create_clips_from_assets_editor(
     # 素材 metadata 中缓存的场景切换点（由后台 MediaKit SceneChange 检测写入）：
     # 有缓存时片段起点从随机镜头段中选取（不同片段来自不同镜头），无缓存回退随机起点
     asset_scene_points: dict[str, list[float]] = {}
+    invalid_asset_ids: list[str] = []
+    valid_asset_ids: list[str] = []
     for asset_id in unique_asset_ids:
         asset = asset_repo.get(asset_id)
-        if asset and hasattr(asset, "duration"):
-            asset_durations[asset_id] = float(asset.duration or 0.0)
-            # 计算 smart_match 综合评分，用于候选排序
+        if asset is None:
+            logger.warning("from-assets 素材不存在或已删除，跳过: asset_id=%s", asset_id)
+            invalid_asset_ids.append(asset_id)
+            continue
+        _dur = float(getattr(asset, "duration", 0.0) or 0.0)
+        if _dur <= 0:
+            # 素材时长缺失（刚上传/分析未完成）或为0，跳过该素材——避免按兜底时长分配无效片段。
+            # 若所有素材都无效，在下面统一抛 400。
+            logger.warning("from-assets 素材时长缺失或为0，跳过: asset_id=%s", asset_id)
+            invalid_asset_ids.append(asset_id)
+            continue
+        valid_asset_ids.append(asset_id)
+        asset_durations[asset_id] = _dur
+        # 计算 smart_match 综合评分，用于候选排序
+        try:
             smart_score, _ = score_asset(asset)
             asset_smart_scores[asset_id] = smart_score
-            # 读取场景切换点缓存（新素材未检测过时为 None，走随机起点兜底）
+        except Exception:
+            asset_smart_scores[asset_id] = 0.0
+        # 读取场景切换点缓存（新素材未检测过时为 None，走随机起点兜底）
+        try:
             cached_points = extract_scene_points_from_metadata(getattr(asset, "metadata", None))
             if cached_points:
                 asset_scene_points[asset_id] = cached_points
+        except Exception:
+            pass
+    if invalid_asset_ids:
+        logger.info(
+            "from-assets %d 个素材无效（时长缺失/不存在，已跳过）: %s",
+            len(invalid_asset_ids),
+            ",".join(invalid_asset_ids[:5]),
+        )
+    # 所有素材都无效（刚上传未分析完）→ 400 让前端稍后重试，而不是用兜底时长产生错乱片段
+    if not valid_asset_ids:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="素材尚未完成分析，请稍后重试",
+        )
+    # 后续分配素材时只在 valid_asset_ids 里挑选
+    unique_asset_ids = valid_asset_ids
     logger.info(
         "from-assets 场景缓存命中: %d/%d 个素材有场景切换点",
         len(asset_scene_points),

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

@@ -207,6 +207,9 @@ def synthesize(
     synthesis_meta = {
         "speed": request.speed,
         "emotion": request.emotion or "",
+        "style": request.style or "",
+        "volume": request.volume if request.volume is not None else 50,
+        "pitch": request.pitch if request.pitch is not None else 1.0,
         "language": request.language or "zh-CN",
     }
     if request.metadata_:
@@ -654,6 +657,9 @@ def preview_tts(
             text=request.text,
             voice_id=actual_voice_id,
             speed=request.speed,
+            style=request.style or "",
+            volume=request.volume if request.volume is not None else 50,
+            pitch=request.pitch,
             emotion=request.emotion,
             language=getattr(request, "language", "zh-CN"),
         )

apps/api/app/schemas/ai_avatar_render.py

@@ -53,9 +53,14 @@ class CreateAiAvatarRenderRequest(BaseModel):
     script_id: str = Field("", description="文案 ID（选自文案库时传；手动输入文案直生场景可留空）")
     b_roll_segments: list[BRollSegment] = Field(default_factory=list, description="B-roll 片段列表")
     title_config: dict[str, Any] = Field(
-        default_factory=dict, description="标题配置（可含 title_image_dataurl：前端 Canvas 渲染的标题 PNG dataURL）"
+        default_factory=dict,
+        description="标题配置（可含 title_image_dataurl：前端 Canvas 渲染的标题 PNG dataURL；含 line_overrides 逐行样式）",
     )
     cover_config: dict[str, Any] = Field(default_factory=dict, description="封面配置")
+    cover_title_config: dict[str, Any] = Field(
+        default_factory=dict,
+        description="封面独立标题配置（#2001），结构同 title_config；为空时封面不叠标题",
+    )
     project_id: str = Field("", description="项目 ID")
 
     @field_validator("lipsync_job_id")
@@ -83,6 +88,7 @@ class AiAvatarRenderJobResponse(BaseModel):
     b_roll_segments: list[dict[str, Any]]
     title_config: dict[str, Any]
     cover_config: dict[str, Any]
+    cover_title_config: dict[str, Any] = Field(default_factory=dict, description="封面独立标题配置")
     status: str
     progress: int
     output_video_url: str

apps/api/app/schemas/generation_task.py

@@ -13,6 +13,33 @@ class ConfirmGenerationRequest(BaseModel):
     custom_title: str = Field(default="", description="用户自定义标题文本，非空时同步到任务和编辑计划")
 
 
+class FinalizeGenerationRequest(BaseModel):
+    """Step5 点「完成」请求体：用户选定封面后，正式将视频入成品库。"""
+
+    cover_url: str = Field(
+        default="", description="用户选定的封面图片 URL；为空则使用任务默认 cover_url（自动截帧/智能封面）"
+    )
+    custom_title: str = Field(default="", description="用户自定义成片标题，非空时覆盖 rendered_output.name")
+
+
+class FinalizeGenerationResponse(BaseModel):
+    """finalize 响应：返回新创建的成品库视频信息。"""
+
+    video_id: str = Field(description="新创建的成品视频 ID")
+    project_id: str = Field(default="", description="成品所属项目 ID")
+    name: str = Field(default="", description="成片名称")
+    file_size: int = Field(default=0, description="文件大小（字节）")
+    duration: float = Field(default=0.0, description="时长（秒）")
+    thumbnail_url: str = Field(default="", description="最终绑定的缩略图/封面 URL")
+    cover_url: str = Field(default="", description="最终绑定的封面 URL")
+    file_url: str = Field(default="", description="成品视频下载 URL")
+    width: int = Field(default=0)
+    height: int = Field(default=0)
+    fps: float = Field(default=0.0)
+    status: str = Field(default="success", description="success=新建成功；already_finalized=幂等返回已有记录")
+    is_duplicate: bool = Field(default=False, description="是否被判定为与历史成片重复")
+
+
 class CreateGenerationTaskRequest(BaseModel):
     """创建生成任务请求。
 

apps/api/app/schemas/gpu_lipsync.py

@@ -36,6 +36,7 @@ class GpuWorkerRegisterResponse(BaseModel):
     ok: bool = True
     server_time: datetime
     message: str = "ok"
+    cancel_task: bool = Field(False, description="当前心跳任务是否已被用户取消；为 true 时 Worker 应终止推理")
 
 
 # ── 轮询任务 ────────────────────────────────────────────────────

apps/api/app/schemas/lipsync.py

@@ -29,6 +29,7 @@ class LipsyncJobResponse(BaseModel):
     voice_id: str = ""
     script_text: str = ""
     speed: float = 1.0
+    style: str = ""
     emotion: str = ""
     mediakit_task_id: str
     status: str
@@ -67,9 +68,14 @@ class CreateLipsyncJobRequest(BaseModel):
     voice_id: str = Field("", description="音色 ID（预置音色或克隆音色 profile UUID）")
     script_text: str = Field("", description="要合成的文案（直生模式必填，最长 5000 字符）")
     speed: float = Field(1.0, ge=0.5, le=2.0, description="语速（0.5-2.0），默认 1.0")
+    style: Optional[str] = Field(
+        None,
+        description="语气风格（natural/sweet/excited/professional/news/livestream），可选；优先级高于 emotion",
+    )
+    volume: Optional[int] = Field(None, ge=0, le=100, description="音量（0-100），默认 50")
     emotion: str = Field(
         "",
-        description="情绪（英文枚举 neutral/happy/sad/angry/surprised/fearful/disgusted，或中文 中立/开心/难过/生气/惊讶/恐惧/厌恶；空为默认自然）",
+        description="[deprecated] 旧情绪参数，内部映射为 style",
     )
 
     enable_video_loop: bool = Field(
@@ -123,10 +129,15 @@ class AiAvatarTtsPreviewRequest(BaseModel):
     voice_id: str = Field(..., min_length=1, max_length=128, description="音色 ID")
     script_text: str = Field(..., min_length=1, max_length=5000, description="要合成的文案")
     speed: float = Field(1.0, ge=0.5, le=2.0, description="语速（0.5-2.0），默认 1.0")
+    style: Optional[str] = Field(
+        None,
+        description="语气风格（natural/sweet/excited/professional/news/livestream），可选；优先级高于 emotion",
+    )
+    volume: Optional[int] = Field(None, ge=0, le=100, description="音量（0-100），默认 50")
     emotion: str = Field(
         "neutral",
         max_length=32,
-        description="情绪（英文枚举 neutral/happy/sad/angry/surprised/fearful/disgusted，或中文 中立/开心/难过/生气/惊讶/恐惧/厌恶；默认 neutral）",
+        description="[deprecated] 旧情绪参数，内部映射为 style；默认 neutral",
     )
 
 

apps/api/app/schemas/tts.py

@@ -16,9 +16,15 @@ class TTSSynthesizeRequest(BaseModel):
     output_name: str = Field("", description="输出文件名")
     language: str = Field("zh-CN", description="语言")
     speed: float = Field(1.0, ge=0.5, le=2.0, description="语速")
+    style: Optional[str] = Field(
+        None,
+        description="语气风格（natural/sweet/excited/professional/news/livestream），可选；优先级高于 emotion",
+    )
+    volume: Optional[int] = Field(None, ge=0, le=100, description="音量（0-100），默认 50")
+    pitch: Optional[float] = Field(None, ge=0.5, le=2.0, description="音调（0.5-2.0），默认 1.0")
     emotion: str = Field(
         "",
-        description="情绪（中文/英文：自然/兴奋/沉稳/亲切/开心/悲伤/愤怒/惊讶/恐惧/厌恶 等；通过 instruction 自然语言指令控制）",
+        description="[deprecated] 旧情绪参数，内部映射为 style；新接入请使用 style",
     )
     voice_model: str = Field("", description="语音模型名称")
     voice_clone_profile_id: str = Field("", description="关联的音色克隆档案 ID")
@@ -113,9 +119,14 @@ class TTSPreviewRequest(BaseModel):
     text: str = Field(..., min_length=1, max_length=200, description="合成文本，限制 200 字")
     voice_id: str = Field(..., min_length=1, description="音色 ID")
     speed: float = Field(1.0, ge=0.5, le=2.0, description="语速")
-    emotion: str = Field("", description="情绪（中文/英文：自然/兴奋/沉稳/亲切/开心/悲伤/愤怒/惊讶/恐惧/厌恶 等）")
+    style: Optional[str] = Field(
+        None,
+        description="语气风格（natural/sweet/excited/professional/news/livestream），可选；优先级高于 emotion",
+    )
+    volume: Optional[int] = Field(None, ge=0, le=100, description="音量（0-100），默认 50")
+    emotion: str = Field("", description="[deprecated] 旧情绪参数，内部映射为 style")
     language: str = Field("zh-CN", description="语言（zh-CN/en-US 等）")
-    pitch: float = Field(1.0, ge=0.5, le=2.0, description="音调（预留，当前未使用）")
+    pitch: float = Field(1.0, ge=0.5, le=2.0, description="音调（0.5-2.0），默认 1.0")
 
 
 class TTSPreviewResponse(BaseModel):

apps/api/app/services/ai_avatar_render_service.py

@@ -61,6 +61,7 @@ class AiAvatarRenderService:
         b_roll_segments: list[dict[str, Any]] | None = None,
         title_config: dict[str, Any],
         cover_config: dict[str, Any],
+        cover_title_config: dict[str, Any] | None = None,
         project_id: str = "",
     ) -> AiAvatarRenderJob:
         """创建渲染任务.
@@ -112,6 +113,7 @@ class AiAvatarRenderService:
             b_roll_segments=[s if isinstance(s, dict) else s.model_dump() for s in (b_roll_segments or [])],
             title_config=title_config,
             cover_config=cover_config,
+            cover_title_config=cover_title_config or {},
             status="pending",
         )
         self.db.add(job)

apps/api/app/services/edit_plan_service.py

@@ -999,26 +999,35 @@ class EditPlanService:
 
         source_bgm_config: dict = {}
         source_plan = self.get_plan(source_plan_id)
+        # #2034：读取源 plan 的 dedup_enabled 决定变体是否注入视觉/像素扰动
+        # 默认 True；关了则保留节奏模板+BGM差异化，但跳过 visual/pixel 扰动
+        _dedup_enabled = True
         if source_plan and source_plan.config:
             source_bgm_config = source_plan.config.get("bgm", {}) or {}
+            _dedup_enabled = bool(source_plan.config.get("dedup_enabled", True))
         variant_seeds_for_bgm = [rng.randint(0, 999999) for _ in range(count)]
         bgm_pool_assignments = allocate_bgm_pool_for_variants(source_bgm_config, variant_seeds_for_bgm)
 
         def _build_variant_config_update(idx: int) -> dict:
-            """构建单个变体的 config 更新（节奏模板/BGM/视觉/像素扰动）。"""
+            """构建单个变体的 config 更新（节奏模板/BGM/视觉/像素扰动）。
+
+            #2034：dedup_enabled=False 时跳过 visual_perturbation/pixel_perturbation，
+            保留 rhythm_template 和 BGM 池分配（合理的多变体差异，不属于降重扰动）。
+            """
             upd: dict = {}
-            try:
-                perturbation = generate_visual_perturbation(rng)
-                if idx == 0:
-                    perturbation["hflip"] = False
-                upd["visual_perturbation"] = perturbation
-            except Exception:
-                logger.exception("变体 %d 视觉扰动生成失败（不阻断）", idx)
-            try:
-                pixel_pert = generate_pixel_perturbation(rng)
-                upd["pixel_perturbation"] = pixel_pert
-            except Exception:
-                logger.exception("变体 %d 像素扰动生成失败（不阻断）", idx)
+            if _dedup_enabled:
+                try:
+                    perturbation = generate_visual_perturbation(rng)
+                    if idx == 0:
+                        perturbation["hflip"] = False
+                    upd["visual_perturbation"] = perturbation
+                except Exception:
+                    logger.exception("变体 %d 视觉扰动生成失败（不阻断）", idx)
+                try:
+                    pixel_pert = generate_pixel_perturbation(rng)
+                    upd["pixel_perturbation"] = pixel_pert
+                except Exception:
+                    logger.exception("变体 %d 像素扰动生成失败（不阻断）", idx)
             rt = rhythm_templates_for_variants[idx] if idx < len(rhythm_templates_for_variants) else None
             if rt is not None:
                 upd["rhythm_template"] = rt

apps/api/app/services/generation_finalize_service.py

@@ -0,0 +1,142 @@
+"""视频生成任务 finalize 服务（#2024）。
+
+Worker 渲染+上传完成后不再自动入库，标记为 awaiting_cover；用户在 Step5 选好封面
+点「完成」时由 API 调用本服务：创建 GeneratedVideo 成品库记录（复用 worker 预计算
+的查重结果）、绑定封面、推进任务到 completed。
+
+与 AI 数字人 ``ai_avatar_render_service.finalize_job`` 模式一致，
+只是走 GenerationTask 而非 AiAvatarRenderJob。
+"""
+
+from __future__ import annotations
+
+import logging
+from datetime import UTC, datetime
+from typing import Optional
+
+from sqlalchemy.orm import Session
+
+logger = logging.getLogger(__name__)
+
+
+class GenerationFinalizeError(Exception):
+    """finalize 业务错误，code 供 API 层映射 HTTP 状态码。"""
+
+    def __init__(self, message: str, code: str = "FinalizeError", status_code: int = 400):
+        super().__init__(message)
+        self.code = code
+        self.status_code = status_code
+
+
+class GenerationFinalizeService:
+    def __init__(self, db: Session):
+        self.db = db
+
+    def finalize_task(
+        self,
+        task_id: str,
+        user_id: str,
+        cover_url: Optional[str] = None,
+        custom_title: Optional[str] = None,
+    ):
+        """执行 finalize：状态校验 → 幂等 → 绑定封面 → 入库 → 推进 completed。
+
+        Returns:
+            GeneratedVideo 领域对象
+        """
+        from packages.adapters.sqlalchemy_impl.generated_video_repository import (
+            SQLAlchemyGeneratedVideoRepository,
+        )
+        from packages.adapters.sqlalchemy_impl.generation_task_repository import (
+            SQLAlchemyGenerationTaskRepository,
+        )
+        from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
+        from packages.application.generated_video_finalize import finalize_generated_video
+
+        task_repo = SQLAlchemyGenerationTaskRepository(self.db)
+        video_repo = SQLAlchemyGeneratedVideoRepository(self.db)
+
+        task = task_repo.get(task_id)
+        if task is None:
+            raise GenerationFinalizeError(f"任务 {task_id} 不存在", "TaskNotFound", 404)
+
+        # ── 幂等：已入库直接返回 ─────────────────────────────────
+        existing = self.db.query(GeneratedVideoModel).filter(GeneratedVideoModel.generation_task_id == task_id).first()
+        if existing is not None:
+            logger.info("[finalize] 幂等命中 task=%s video=%s", task_id, existing.id)
+            _changed = False
+            if cover_url and cover_url.strip() and existing.thumbnail_url != cover_url.strip():
+                existing.thumbnail_url = cover_url.strip()
+                task.cover_url = cover_url.strip()
+                _changed = True
+            if custom_title and custom_title.strip() and (getattr(existing, "name", "") or "") != custom_title.strip():
+                existing.name = custom_title.strip()
+                _changed = True
+            if _changed:
+                self.db.commit()
+            if task.status.value != "completed":
+                try:
+                    task.mark_completed(result_count=1)
+                    if cover_url and cover_url.strip():
+                        task.cover_url = cover_url.strip()
+                    task_repo.update(task)
+                    self.db.commit()
+                except Exception as e:
+                    logger.warning("[finalize] 幂等补 mark_completed 失败: %s", e)
+                    self.db.rollback()
+            return video_repo.get(existing.id)
+
+        # ── 状态校验 ─────────────────────────────────────────────
+        if task.status.value != "awaiting_cover":
+            raise GenerationFinalizeError(
+                f"任务当前状态 {task.status.value}，无法 finalize（需 awaiting_cover）",
+                "InvalidTaskStatus",
+                400,
+            )
+
+        # ── 封面 ─────────────────────────────────────────────────
+        effective_cover = (cover_url or "").strip() if cover_url else (task.cover_url or "").strip()
+
+        # ── 入库+查重（复用 worker 预计算结果） ──────────────────
+        try:
+            result = finalize_generated_video(
+                task=task,
+                session=self.db,
+                effective_cover_url=effective_cover,
+                custom_name=custom_title,
+            )
+        except ValueError as e:
+            raise GenerationFinalizeError(str(e), "RenderedOutputMissing", 400) from e
+
+        video_id = result["video_id"]
+
+        # 应用自定义标题
+        if custom_title and custom_title.strip():
+            try:
+                _v = self.db.query(GeneratedVideoModel).filter(GeneratedVideoModel.id == video_id).first()
+                if _v is not None:
+                    _v.name = custom_title.strip()
+                    self.db.flush()
+            except Exception:
+                logger.warning("[finalize] 更新标题失败: video_id=%s", video_id, exc_info=True)
+
+        # ── 推进任务 ─────────────────────────────────────────────
+        task.mark_completed(result_count=1)
+        task.cover_url = effective_cover
+        # 清理 rendered_output（体积较大，入库后不再需要）
+        meta = dict(task.extra_meta or {})
+        meta.pop("rendered_output", None)
+        task.extra_meta = meta
+        task.updated_at = datetime.now(UTC)
+        task_repo.update(task)
+        self.db.commit()
+
+        video = video_repo.get(video_id)
+        logger.info(
+            "[finalize] task=%s finalized -> video=%s cover=%s dup=%s",
+            task_id,
+            video_id,
+            bool(effective_cover),
+            result.get("is_duplicate", False),
+        )
+        return video

apps/api/app/services/gpu_lipsync_service.py

@@ -50,13 +50,16 @@ class GpuLipsyncService:
         free_vram_mb: int = 0,
         capabilities: str = "musetalk",
         task_id: Optional[str] = None,
-    ) -> GpuWorkerModel:
+    ) -> tuple[GpuWorkerModel, bool]:
         """Worker 注册/心跳。
 
         task_id 非空时（Worker 推理期间的任务级心跳），同步把对应 processing
         任务的 last_heartbeat_at 续到当前时间，使长推理不会被
         ``_recover_timed_out_tasks`` 误回退。任务已结束 / 不属于该 worker
         （如已被超时回收重新派发）时忽略，不报错。
+
+        返回 ``(worker, cancel_task)``：当心跳任务已被用户取消时
+        ``cancel_task=True``，Worker 应尽快终止推理并释放 GPU。
         """
         now = datetime.now(UTC)
         worker = self.db.query(GpuWorkerModel).filter(GpuWorkerModel.worker_id == worker_id).one_or_none()
@@ -77,10 +80,11 @@ class GpuLipsyncService:
             worker.free_vram_mb = free_vram_mb
             worker.capabilities = capabilities or worker.capabilities
             worker.last_heartbeat_at = now
+        cancel_task = False
         if task_id:
-            self._touch_task_heartbeat(task_id, worker_id, now)
+            cancel_task = self._touch_task_heartbeat(task_id, worker_id, now)
         self.db.commit()
-        return worker
+        return worker, cancel_task
 
     # ── 轮询拉任务（Worker 调用） ──────────────────────────────────
 
@@ -166,6 +170,11 @@ class GpuLipsyncService:
             task.result_duration = duration_seconds or 0.0
             task.error_msg = ""
             task.finished_at = now
+        elif task.status == "cancelled":
+            # 用户已取消的任务，Worker 终止后上报失败，保持 cancelled 状态不回退
+            task.finished_at = now
+            task.error_msg = (error_msg or "用户取消")[:2000]
+            logger.info("GPU 任务 %s 已被用户取消，保持 cancelled 状态", task_id)
         else:
             # 失败：若仍可重试（已尝试次数 < MAX_ATTEMPTS）→ 回退 pending；否则 → failed
             if task.attempt < MAX_ATTEMPTS:
@@ -250,15 +259,21 @@ class GpuLipsyncService:
     def _result_key(self, task_id: str) -> str:
         return f"{self.RESULT_PREFIX}{task_id}.mp4"
 
-    def _touch_task_heartbeat(self, task_id: str, worker_id: str, now: datetime) -> None:
+    def _touch_task_heartbeat(self, task_id: str, worker_id: str, now: datetime) -> bool:
         """Worker 推理期间的任务级心跳：只刷新属于该 worker 且仍在 processing 的任务。
 
         任务不存在 / 已被超时回收重新派发 / 已完成 → 静默忽略（此时旧 worker 的
         结果上报会被结果接口按最终态处理）。
+
+        返回 ``cancel_task``：任务已被用户取消时为 True，Worker 应终止推理。
         """
         task = self.db.get(GpuLipsyncTaskModel, task_id)
         if task is None:
-            return
+            return False
+        # 任务已被用户取消 → 通知 Worker 终止推理
+        if task.status == "cancelled":
+            logger.info("任务心跳检测到已取消 task=%s worker=%s，通知 Worker 终止", task_id, worker_id)
+            return True
         if task.status != "processing" or task.worker_id != worker_id:
             logger.info(
                 "忽略过期任务心跳 task=%s worker=%s（status=%s owner=%s）",
@@ -267,10 +282,11 @@ class GpuLipsyncService:
                 task.status,
                 task.worker_id,
             )
-            return
+            return False
         task.last_heartbeat_at = now
         task.updated_at = now
         self.db.flush()
+        return False
 
     def _touch_worker(self, worker_id: str, now: datetime) -> None:
         if not worker_id:
@@ -371,9 +387,7 @@ class GpuLipsyncService:
             task = self.db.get(GpuLipsyncTaskModel, task_id)
             if task is None:
                 return None
-            if task.status == "done":
-                return task
-            if task.status == "failed":
+            if task.status in ("done", "failed", "cancelled"):
                 return task
             # pending/processing 继续等
             if time.monotonic() >= deadline:

apps/api/app/services/lipsync_service.py

@@ -111,6 +111,8 @@ class LipsyncService:
         script_text: str,
         speed: float,
         emotion: str,
+        style: str = "",
+        volume: int = 50,
     ) -> str:
         """TTS 直生：调 CosyVoice 合成音频并转存 OSS，返回可公网访问的音频 URL.
 
@@ -124,7 +126,9 @@ class LipsyncService:
                 text=script_text,
                 voice_id=actual_voice_id,
                 speed=speed,
-                emotion=emotion,  # normalize 在 CosyVoiceService 内部完成
+                style=style,
+                volume=volume,
+                emotion=emotion,
                 language="zh",
             )
         except CosyVoiceError as exc:
@@ -424,6 +428,8 @@ class LipsyncService:
         voice_id: str = "",
         script_text: str = "",
         speed: float = 1.0,
+        style: str = "",
+        volume: int = 50,
         emotion: str = "",
         enable_video_loop: bool = True,
         project_id: str = "",
@@ -472,6 +478,7 @@ class LipsyncService:
             voice_id=voice_id or "",
             script_text=script_text or "",
             speed=speed,
+            style=style or "",
             emotion=emotion or "",
             # 音频直传（含预合成）直接进入 pending（后续同步改为 submitted）；TTS 模式进入 tts_processing
             status="tts_processing" if is_tts_mode else "pending",
@@ -493,6 +500,8 @@ class LipsyncService:
                         voice_id,
                         script_text,
                         speed,
+                        style or "",
+                        volume,
                         emotion or "",
                     )
                 )
@@ -527,6 +536,8 @@ class LipsyncService:
         voice_id: str,
         script_text: str,
         speed: float = 1.0,
+        style: str = "",
+        volume: int = 50,
         emotion: str = "neutral",
     ) -> dict:
         """同步做 TTS 合成 + 下载 + ffprobe + 句子时间戳计算.
@@ -772,12 +783,32 @@ class LipsyncService:
     # ── 取消任务 ──────────────────────────────────────────────────────────
 
     def cancel_job(self, job_id: str, user_id: str) -> Optional[LipsyncJobModel]:
-        """取消任务（仅 pending/tts_processing/submitted 状态可取消）."""
+        """取消任务（pending/tts_processing/submitted/processing 状态可取消）.
+
+        当 job 走 GPU 路径（mediakit_task_id 以 "gpu:" 开头）且状态为 processing 时，
+        同步将关联的 GpuLipsyncTask 标记为 cancelled，以便 Worker 心跳时检测到取消信号。
+        """
         job = self.get_job(job_id, user_id)
         if job is None:
             return None
 
-        if job.status in ("pending", "tts_processing", "submitted"):
+        if job.status in ("pending", "tts_processing", "submitted", "processing"):
+            # GPU 路径：同步标记关联的 GPU 任务为 cancelled
+            if job.status == "processing" and job.mediakit_task_id and job.mediakit_task_id.startswith("gpu:"):
+                gpu_task_id = job.mediakit_task_id[4:]  # 去掉 "gpu:" 前缀
+                try:
+                    from packages.adapters.sqlalchemy_impl.models import GpuLipsyncTaskModel
+
+                    gpu_task = self.db.get(GpuLipsyncTaskModel, gpu_task_id)
+                    if gpu_task and gpu_task.status == "processing":
+                        gpu_task.status = "cancelled"
+                        gpu_task.error_msg = "用户取消"
+                        gpu_task.updated_at = datetime.now(UTC)
+                        gpu_task.finished_at = datetime.now(UTC)
+                        logger.info("GPU 任务 %s 已被用户取消（通过 job_id=%s）", gpu_task_id, job_id)
+                except Exception as exc:
+                    logger.warning("标记 GPU 任务取消失败（不影响 job 取消）: %s", exc)
+
             job.status = "cancelled"
             job.updated_at = datetime.now(UTC)
             self.db.commit()

apps/api/app/tasks/lipsync_gpu.py

@@ -98,6 +98,14 @@ def lipsync_gpu_process_async(self, job_id: str, user_id: str, gpu_task_id: str)
             _fallback_to_mediakit(db, job)
             return
 
+        if final_task.status == "cancelled":
+            # 用户已取消任务，不回退 MediaKit，直接标记 job 为 cancelled
+            job.status = "cancelled"
+            job.updated_at = datetime.now(UTC)
+            db.commit()
+            logger.info("[lipsync_gpu_async] GPU 任务已被用户取消: job_id=%s", job_id)
+            return
+
         if final_task.status != "done":
             logger.warning(
                 "[lipsync_gpu_async] GPU 失败，回退 MediaKit: job_id=%s gpu_task=%s status=%s",

apps/api/app/tasks/lipsync_tts.py

@@ -82,7 +82,9 @@ def tts_synthesize_and_submit(
     voice_id: str,
     script_text: str,
     speed: float,
-    emotion: str,
+    style: str = "",
+    volume: int = 50,
+    emotion: str = "",
 ):
     """异步执行 TTS 合成 + OSS 转存 + MediaKit 提交.
 
@@ -159,6 +161,8 @@ def tts_synthesize_and_submit(
                 text=script_text,
                 voice_id=voice_id,
                 speed=speed,
+                style=style,
+                volume=volume,
                 emotion=emotion,
                 language="zh",
             )

apps/web/e2e/core-generation.spec.ts

@@ -160,12 +160,14 @@ test.describe("Core Smart-Edit Flow (#1970)", () => {
     )
 
     await page.goto("/app/generate")
-    await expect(page.getByRole("heading", { name: "智能剪辑" })).toBeVisible({
-      timeout: 30000,
-    })
+    // ── 页面标题 ─────────────────────────────────────────────────
+    // GenerateHeader: <h2><ThunderboltOutlined />智能剪辑</h2>
+    // SVG icon 可能干扰 role=heading 的 accessible name，用文本包含兜底
+    await expect(page.getByText("智能剪辑").first()).toBeVisible({ timeout: 30000 })
 
     // ── Step 1：默认随机混剪选中，点下一步 ──────────────────────────
-    await expect(page.getByText("选择模式", { exact: true })).toBeVisible()
+    // h3 实际文案: "🎬 选择剪辑模式"（非 "选择模式"），用正则包含匹配
+    await expect(page.getByText(/选择剪辑模式/)).toBeVisible()
     await expect(page.getByText("随机混剪")).toBeVisible()
     await page.getByRole("button", { name: /下一步/ }).click()
 
@@ -180,11 +182,8 @@ test.describe("Core Smart-Edit Flow (#1970)", () => {
     await page.getByTestId("material-card").first().click()
     await page.getByRole("button", { name: /下一步/ }).click()
 
-    // ── 数量弹窗：默认 1 个 → 确认 ───────────────────────────────
-    await expect(page.getByText("要生成几个视频？")).toBeVisible({ timeout: 5000 })
-    await page.getByRole("button", { name: "生成 1 个视频" }).click()
-
     // ── Step 3：填写标题 ──────────────────────────────────────────
+    // (#2048: PreviewCountModal 已移除，生成数量在 Step1 内设置)
     await expect(page.getByText("选择标题", { exact: true })).toBeVisible({ timeout: 10000 })
     const titleInput = page.getByPlaceholder("输入或从标题库选择")
     await expect(titleInput).toBeVisible({ timeout: 5000 })
@@ -192,9 +191,10 @@ test.describe("Core Smart-Edit Flow (#1970)", () => {
     await page.getByRole("button", { name: /下一步/ }).click()
 
     // ── Step 4：确认生成 ──────────────────────────────────────────
-    await expect(page.getByText("📋 生成配置")).toBeVisible({ timeout: 10000 })
-    await expect(page.getByText("随机混剪")).toBeVisible()
+    // (#2024: Step4 不再显示"📋 生成配置"卡片，内容区仅显示进度/错误)
+    // 等待底部操作栏的「✨ 确认生成视频」按钮可见即可
     const confirmBtn = page.getByRole("button", { name: /确认生成视频/ })
+    await expect(confirmBtn).toBeVisible({ timeout: 10000 })
     await expect(confirmBtn).toBeEnabled({ timeout: 5000 })
 
     const createTask = page.waitForResponse(
@@ -324,12 +324,11 @@ test.describe("Core Smart-Edit Flow (#1970)", () => {
     )
 
     await page.goto("/app/generate")
-    await expect(page.getByRole("heading", { name: "智能剪辑" })).toBeVisible({
-      timeout: 30000,
-    })
+    // ── 页面标题 ─────────────────────────────────────────────────
+    await expect(page.getByText("智能剪辑").first()).toBeVisible({ timeout: 30000 })
 
     // ── Step 1：切到叙事剪辑 → 下一步 ────────────────────────────
-    await expect(page.getByText("选择模式", { exact: true })).toBeVisible()
+    await expect(page.getByText(/选择剪辑模式/)).toBeVisible()
     await page.getByText("叙事剪辑").click()
     await page.getByRole("button", { name: /下一步/ }).click()
 
@@ -351,11 +350,8 @@ test.describe("Core Smart-Edit Flow (#1970)", () => {
     await page.getByTestId("material-card").first().click()
     await page.getByRole("button", { name: /下一步/ }).click()
 
-    // ── 数量弹窗 ─────────────────────────────────────────────────
-    await expect(page.getByText("要生成几个视频？")).toBeVisible({ timeout: 5000 })
-    await page.getByRole("button", { name: "生成 1 个视频" }).click()
-
     // ── Step 3：填写标题（handleScriptModalConfirm 已预填 script.title，但我们再覆盖一次） ─
+    // (#2048: PreviewCountModal 已移除)
     await expect(page.getByText("选择标题", { exact: true })).toBeVisible({ timeout: 10000 })
     const titleInput2 = page.getByPlaceholder("输入或从标题库选择")
     await expect(titleInput2).toBeVisible({ timeout: 5000 })
@@ -363,9 +359,9 @@ test.describe("Core Smart-Edit Flow (#1970)", () => {
     await page.getByRole("button", { name: /下一步/ }).click()
 
     // ── Step 4：确认生成 ──────────────────────────────────────────
-    await expect(page.getByText("📋 生成配置")).toBeVisible({ timeout: 10000 })
-    await expect(page.getByText("叙事剪辑")).toBeVisible()
+    // (#2024: Step4 不再显示"📋 生成配置"卡片)
     const confirmBtn2 = page.getByRole("button", { name: /确认生成视频/ })
+    await expect(confirmBtn2).toBeVisible({ timeout: 10000 })
     await expect(confirmBtn2).toBeEnabled({ timeout: 5000 })
 
     const createTask2 = page.waitForResponse(

apps/web/e2e/core-upload.spec.ts

@@ -161,7 +161,7 @@ test.describe("Core media upload flow", () => {
           const asset = data.items.find((item) => item.name === "e2e-sample.mp4")
           return asset ? `${asset.mime_type || asset.file_type || ""}:${asset.status}` : "missing"
         },
-        { timeout: 30_000, intervals: [1_000, 2_000, 3_000] },
+        { timeout: 90_000, intervals: [3_000, 5_000, 10_000] },
       )
       .toMatch(/^(video\/quicktime|video\/mp4|video)?:ready$/)
 

apps/web/index.html

@@ -4,6 +4,13 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <!-- 标题字体（#2001 / #font-selection 修复）：Google Fonts CDN 引入中文字体，保证优设标题黑/抖音美好体/阿里普惠体等fallback可用 -->
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@400;500;700;900&family=Noto+Serif+SC:wght@400;700;900&family=ZCOOL+KuaiLe&family=ZCOOL+XiaoWei&family=ZCOOL+QingKe+HuangYou&family=Ma+Shan+Zheng&family=Long+Cang&family=Liu+Jian+Mao+Cao&family=Zhi+Mang+Xing&display=swap"
+      rel="stylesheet"
+    />
     <title>小虾 SaaS - 自动化视频剪辑平台</title>
   </head>
   <body>

apps/web/package-lock.json

@@ -12,6 +12,8 @@
         "@tanstack/react-query": "^5.45.0",
         "antd": "^5.18.0",
         "axios": "^1.7.2",
+        "classnames": "^2.5.1",
+        "dayjs": "^1.11.23",
         "mp4box": "^2.4.1",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
@@ -3005,9 +3007,9 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.21",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz",
-      "integrity": "sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==",
+      "version": "1.11.23",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.23.tgz",
+      "integrity": "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==",
       "license": "MIT"
     },
     "node_modules/debug": {

apps/web/package.json

@@ -23,6 +23,8 @@
     "@tanstack/react-query": "^5.45.0",
     "antd": "^5.18.0",
     "axios": "^1.7.2",
+    "classnames": "^2.5.1",
+    "dayjs": "^1.11.23",
     "mp4box": "^2.4.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

apps/web/pnpm-lock.yaml

@@ -18,7 +18,16 @@ importers:
         version: 5.29.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       axios:
         specifier: ^1.7.2
-        version: 1.18.1
+        version: 1.18.1(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0)
+      classnames:
+        specifier: ^2.5.1
+        version: 2.5.1
+      dayjs:
+        specifier: ^1.11.23
+        version: 1.11.23
+      mp4box:
+        specifier: ^2.4.1
+        version: 2.4.1
       react:
         specifier: ^18.3.1
         version: 18.3.1
@@ -43,7 +52,7 @@ importers:
         version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       "@testing-library/user-event":
         specifier: ^14.5.2
-        version: 14.6.1(@testing-library/dom@10.4.1)
+        version: 14.6.7(@testing-library/dom@10.4.1)
       "@types/node":
         specifier: ^20.14.9
         version: 20.19.43
@@ -55,34 +64,34 @@ importers:
         version: 18.3.7(@types/react@18.3.31)
       "@typescript-eslint/eslint-plugin":
         specifier: ^7.13.1
-        version: 7.13.1(@typescript-eslint/parser@7.13.1(eslint@8.57.0)(typescript@5.5.3))(eslint@8.57.0)(typescript@5.5.3)
+        version: 7.13.1(@typescript-eslint/parser@7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3))(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)
       "@typescript-eslint/parser":
         specifier: ^7.13.1
-        version: 7.13.1(eslint@8.57.0)(typescript@5.5.3)
+        version: 7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)
       "@vitejs/plugin-react":
         specifier: ^4.3.1
-        version: 4.3.1(vite@5.3.1(@types/node@20.19.43))
+        version: 4.3.1(supports-color@7.2.0)(vite@5.3.1(@types/node@20.19.43))
       "@vitest/coverage-v8":
         specifier: ^1.6.1
-        version: 1.6.1(vitest@1.6.0)
+        version: 1.6.1(supports-color@7.2.0)(vitest@1.6.0)
       "@vitest/ui":
         specifier: ^1.6.0
         version: 1.6.0(vitest@1.6.0)
       eslint:
         specifier: ^8.57.0
-        version: 8.57.0
+        version: 8.57.0(supports-color@7.2.0)
       eslint-config-prettier:
         specifier: ^9.1.2
-        version: 9.1.2(eslint@8.57.0)
+        version: 9.1.2(eslint@8.57.0(supports-color@7.2.0))
       eslint-plugin-react-hooks:
         specifier: ^4.6.2
-        version: 4.6.2(eslint@8.57.0)
+        version: 4.6.2(eslint@8.57.0(supports-color@7.2.0))
       eslint-plugin-react-refresh:
         specifier: ^0.4.7
-        version: 0.4.26(eslint@8.57.0)
+        version: 0.4.26(eslint@8.57.0(supports-color@7.2.0))
       jsdom:
         specifier: ^24.1.0
-        version: 24.1.0
+        version: 24.1.0(supports-color@7.2.0)
       prettier:
         specifier: ^3.9.5
         version: 3.9.5
@@ -94,7 +103,7 @@ importers:
         version: 5.3.1(@types/node@20.19.43)
       vitest:
         specifier: ^1.6.0
-        version: 1.6.0(@types/node@20.19.43)(@vitest/ui@1.6.0)(jsdom@24.1.0)
+        version: 1.6.0(@types/node@20.19.43)(@vitest/ui@1.6.0)(jsdom@24.1.0(supports-color@7.2.0))(supports-color@7.2.0)
 
 packages:
   "@adobe/css-tools@4.5.0":
@@ -1127,10 +1136,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@testing-library/user-event@14.6.1":
+  "@testing-library/user-event@14.6.7":
     resolution:
       {
-        integrity: sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==,
+        integrity: sha512-MPCpX8bxe8zS+JmmTwLp8jd0dy1rAm60Te/SL8JrQM3qvQJcBOs1d7IefJMyZzqM3EWBrDn/LWDt1BCGu4ASfg==,
       }
     engines: { node: ">=12", npm: ">=6" }
     peerDependencies:
@@ -1672,10 +1681,10 @@ packages:
       }
     engines: { node: ">=18" }
 
-  dayjs@1.11.21:
+  dayjs@1.11.23:
     resolution:
       {
-        integrity: sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==,
+        integrity: sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==,
       }
 
   debug@4.4.3:
@@ -2546,6 +2555,13 @@ packages:
         integrity: sha512-d+ObxMQFmbt10sretNDytwt85VrbkhhUA/JBGm1MPaWJ65Cl4wOgLaB1NYvJSZ0Ef03MMEU/0xpPMXUIQ29UfA==,
       }
 
+  mp4box@2.4.1:
+    resolution:
+      {
+        integrity: sha512-0HGX7nXoDIX6FKLVl4a3wtYjBlwqsN3xuQC3GXzNtKp98FXUOhDSq623azsz8DG5ptd9ZXcXodDkgbdMZOjWvw==,
+      }
+    engines: { node: ">=20.8.1" }
+
   mrmime@2.0.1:
     resolution:
       {
@@ -3861,20 +3877,20 @@ snapshots:
 
   "@babel/compat-data@7.29.7": {}
 
-  "@babel/core@7.29.7":
+  "@babel/core@7.29.7(supports-color@7.2.0)":
     dependencies:
       "@babel/code-frame": 7.29.7
       "@babel/generator": 7.29.7
       "@babel/helper-compilation-targets": 7.29.7
-      "@babel/helper-module-transforms": 7.29.7(@babel/core@7.29.7)
+      "@babel/helper-module-transforms": 7.29.7(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)
       "@babel/helpers": 7.29.7
       "@babel/parser": 7.29.7
       "@babel/template": 7.29.7
-      "@babel/traverse": 7.29.7
+      "@babel/traverse": 7.29.7(supports-color@7.2.0)
       "@babel/types": 7.29.7
       "@jridgewell/remapping": 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -3899,19 +3915,19 @@ snapshots:
 
   "@babel/helper-globals@7.29.7": {}
 
-  "@babel/helper-module-imports@7.29.7":
+  "@babel/helper-module-imports@7.29.7(supports-color@7.2.0)":
     dependencies:
-      "@babel/traverse": 7.29.7
+      "@babel/traverse": 7.29.7(supports-color@7.2.0)
       "@babel/types": 7.29.7
     transitivePeerDependencies:
       - supports-color
 
-  "@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)":
+  "@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7(supports-color@7.2.0))(supports-color@7.2.0)":
     dependencies:
-      "@babel/core": 7.29.7
-      "@babel/helper-module-imports": 7.29.7
+      "@babel/core": 7.29.7(supports-color@7.2.0)
+      "@babel/helper-module-imports": 7.29.7(supports-color@7.2.0)
       "@babel/helper-validator-identifier": 7.29.7
-      "@babel/traverse": 7.29.7
+      "@babel/traverse": 7.29.7(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -3932,14 +3948,14 @@ snapshots:
     dependencies:
       "@babel/types": 7.29.7
 
-  "@babel/plugin-transform-react-jsx-self@7.29.7(@babel/core@7.29.7)":
+  "@babel/plugin-transform-react-jsx-self@7.29.7(@babel/core@7.29.7(supports-color@7.2.0))":
     dependencies:
-      "@babel/core": 7.29.7
+      "@babel/core": 7.29.7(supports-color@7.2.0)
       "@babel/helper-plugin-utils": 7.29.7
 
-  "@babel/plugin-transform-react-jsx-source@7.29.7(@babel/core@7.29.7)":
+  "@babel/plugin-transform-react-jsx-source@7.29.7(@babel/core@7.29.7(supports-color@7.2.0))":
     dependencies:
-      "@babel/core": 7.29.7
+      "@babel/core": 7.29.7(supports-color@7.2.0)
       "@babel/helper-plugin-utils": 7.29.7
 
   "@babel/runtime@7.29.7": {}
@@ -3950,7 +3966,7 @@ snapshots:
       "@babel/parser": 7.29.7
       "@babel/types": 7.29.7
 
-  "@babel/traverse@7.29.7":
+  "@babel/traverse@7.29.7(supports-color@7.2.0)":
     dependencies:
       "@babel/code-frame": 7.29.7
       "@babel/generator": 7.29.7
@@ -3958,7 +3974,7 @@ snapshots:
       "@babel/parser": 7.29.7
       "@babel/template": 7.29.7
       "@babel/types": 7.29.7
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -4044,17 +4060,17 @@ snapshots:
   "@esbuild/win32-x64@0.21.3":
     optional: true
 
-  "@eslint-community/eslint-utils@4.9.1(eslint@8.57.0)":
+  "@eslint-community/eslint-utils@4.9.1(eslint@8.57.0(supports-color@7.2.0))":
     dependencies:
-      eslint: 8.57.0
+      eslint: 8.57.0(supports-color@7.2.0)
       eslint-visitor-keys: 3.4.3
 
   "@eslint-community/regexpp@4.12.2": {}
 
-  "@eslint/eslintrc@2.1.4":
+  "@eslint/eslintrc@2.1.4(supports-color@7.2.0)":
     dependencies:
       ajv: 6.15.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       espree: 9.6.1
       globals: 13.19.0
       ignore: 5.2.0
@@ -4067,10 +4083,10 @@ snapshots:
 
   "@eslint/js@8.57.0": {}
 
-  "@humanwhocodes/config-array@0.11.14":
+  "@humanwhocodes/config-array@0.11.14(supports-color@7.2.0)":
     dependencies:
       "@humanwhocodes/object-schema": 2.0.3
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       minimatch: 3.1.5
     transitivePeerDependencies:
       - supports-color
@@ -4360,7 +4376,7 @@ snapshots:
       "@types/react": 18.3.31
       "@types/react-dom": 18.3.7(@types/react@18.3.31)
 
-  "@testing-library/user-event@14.6.1(@testing-library/dom@10.4.1)":
+  "@testing-library/user-event@14.6.7(@testing-library/dom@10.4.1)":
     dependencies:
       "@testing-library/dom": 10.4.1
 
@@ -4420,15 +4436,15 @@ snapshots:
     dependencies:
       "@types/yargs-parser": 21.0.3
 
-  "@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@7.13.1(eslint@8.57.0)(typescript@5.5.3))(eslint@8.57.0)(typescript@5.5.3)":
+  "@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3))(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)":
     dependencies:
       "@eslint-community/regexpp": 4.12.2
-      "@typescript-eslint/parser": 7.13.1(eslint@8.57.0)(typescript@5.5.3)
+      "@typescript-eslint/parser": 7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)
       "@typescript-eslint/scope-manager": 7.13.1
-      "@typescript-eslint/type-utils": 7.13.1(eslint@8.57.0)(typescript@5.5.3)
-      "@typescript-eslint/utils": 7.13.1(eslint@8.57.0)(typescript@5.5.3)
+      "@typescript-eslint/type-utils": 7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)
+      "@typescript-eslint/utils": 7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)
       "@typescript-eslint/visitor-keys": 7.13.1
-      eslint: 8.57.0
+      eslint: 8.57.0(supports-color@7.2.0)
       graphemer: 1.4.0
       ignore: 5.3.1
       natural-compare: 1.4.0
@@ -4438,14 +4454,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  "@typescript-eslint/parser@7.13.1(eslint@8.57.0)(typescript@5.5.3)":
+  "@typescript-eslint/parser@7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)":
     dependencies:
       "@typescript-eslint/scope-manager": 7.13.1
       "@typescript-eslint/types": 7.13.1
-      "@typescript-eslint/typescript-estree": 7.13.1(typescript@5.5.3)
+      "@typescript-eslint/typescript-estree": 7.13.1(supports-color@7.2.0)(typescript@5.5.3)
       "@typescript-eslint/visitor-keys": 7.13.1
-      debug: 4.4.3
-      eslint: 8.57.0
+      debug: 4.4.3(supports-color@7.2.0)
+      eslint: 8.57.0(supports-color@7.2.0)
     optionalDependencies:
       typescript: 5.5.3
     transitivePeerDependencies:
@@ -4456,12 +4472,12 @@ snapshots:
       "@typescript-eslint/types": 7.13.1
       "@typescript-eslint/visitor-keys": 7.13.1
 
-  "@typescript-eslint/type-utils@7.13.1(eslint@8.57.0)(typescript@5.5.3)":
+  "@typescript-eslint/type-utils@7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)":
     dependencies:
-      "@typescript-eslint/typescript-estree": 7.13.1(typescript@5.5.3)
-      "@typescript-eslint/utils": 7.13.1(eslint@8.57.0)(typescript@5.5.3)
-      debug: 4.4.3
-      eslint: 8.57.0
+      "@typescript-eslint/typescript-estree": 7.13.1(supports-color@7.2.0)(typescript@5.5.3)
+      "@typescript-eslint/utils": 7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)
+      debug: 4.4.3(supports-color@7.2.0)
+      eslint: 8.57.0(supports-color@7.2.0)
       ts-api-utils: 1.3.0(typescript@5.5.3)
     optionalDependencies:
       typescript: 5.5.3
@@ -4470,11 +4486,11 @@ snapshots:
 
   "@typescript-eslint/types@7.13.1": {}
 
-  "@typescript-eslint/typescript-estree@7.13.1(typescript@5.5.3)":
+  "@typescript-eslint/typescript-estree@7.13.1(supports-color@7.2.0)(typescript@5.5.3)":
     dependencies:
       "@typescript-eslint/types": 7.13.1
       "@typescript-eslint/visitor-keys": 7.13.1
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.9
@@ -4485,13 +4501,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  "@typescript-eslint/utils@7.13.1(eslint@8.57.0)(typescript@5.5.3)":
+  "@typescript-eslint/utils@7.13.1(eslint@8.57.0(supports-color@7.2.0))(supports-color@7.2.0)(typescript@5.5.3)":
     dependencies:
-      "@eslint-community/eslint-utils": 4.9.1(eslint@8.57.0)
+      "@eslint-community/eslint-utils": 4.9.1(eslint@8.57.0(supports-color@7.2.0))
       "@typescript-eslint/scope-manager": 7.13.1
       "@typescript-eslint/types": 7.13.1
-      "@typescript-eslint/typescript-estree": 7.13.1(typescript@5.5.3)
-      eslint: 8.57.0
+      "@typescript-eslint/typescript-estree": 7.13.1(supports-color@7.2.0)(typescript@5.5.3)
+      eslint: 8.57.0(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -4503,25 +4519,25 @@ snapshots:
 
   "@ungap/structured-clone@1.3.3": {}
 
-  "@vitejs/plugin-react@4.3.1(vite@5.3.1(@types/node@20.19.43))":
+  "@vitejs/plugin-react@4.3.1(supports-color@7.2.0)(vite@5.3.1(@types/node@20.19.43))":
     dependencies:
-      "@babel/core": 7.29.7
-      "@babel/plugin-transform-react-jsx-self": 7.29.7(@babel/core@7.29.7)
-      "@babel/plugin-transform-react-jsx-source": 7.29.7(@babel/core@7.29.7)
+      "@babel/core": 7.29.7(supports-color@7.2.0)
+      "@babel/plugin-transform-react-jsx-self": 7.29.7(@babel/core@7.29.7(supports-color@7.2.0))
+      "@babel/plugin-transform-react-jsx-source": 7.29.7(@babel/core@7.29.7(supports-color@7.2.0))
       "@types/babel__core": 7.20.5
       react-refresh: 0.14.2
       vite: 5.3.1(@types/node@20.19.43)
     transitivePeerDependencies:
       - supports-color
 
-  "@vitest/coverage-v8@1.6.1(vitest@1.6.0)":
+  "@vitest/coverage-v8@1.6.1(supports-color@7.2.0)(vitest@1.6.0)":
     dependencies:
       "@ampproject/remapping": 2.3.0
       "@bcoe/v8-coverage": 0.2.3
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
-      istanbul-lib-source-maps: 5.0.6
+      istanbul-lib-source-maps: 5.0.6(supports-color@7.2.0)
       istanbul-reports: 3.2.0
       magic-string: 0.30.5
       magicast: 0.3.3
@@ -4529,7 +4545,7 @@ snapshots:
       std-env: 3.5.0
       strip-literal: 2.1.1
       test-exclude: 6.0.0
-      vitest: 1.6.0(@types/node@20.19.43)(@vitest/ui@1.6.0)(jsdom@24.1.0)
+      vitest: 1.6.0(@types/node@20.19.43)(@vitest/ui@1.6.0)(jsdom@24.1.0(supports-color@7.2.0))(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -4564,7 +4580,7 @@ snapshots:
       pathe: 1.1.2
       picocolors: 1.1.1
       sirv: 2.0.4
-      vitest: 1.6.0(@types/node@20.19.43)(@vitest/ui@1.6.0)(jsdom@24.1.0)
+      vitest: 1.6.0(@types/node@20.19.43)(@vitest/ui@1.6.0)(jsdom@24.1.0(supports-color@7.2.0))(supports-color@7.2.0)
 
   "@vitest/utils@1.6.0":
     dependencies:
@@ -4583,21 +4599,21 @@ snapshots:
 
   acorn@8.17.0: {}
 
-  agent-base@6.0.0:
+  agent-base@6.0.0(supports-color@7.2.0):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
-  agent-base@7.0.2:
+  agent-base@7.0.2(supports-color@7.2.0):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
-  agent-base@7.1.0:
+  agent-base@7.1.0(supports-color@7.2.0):
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -4632,7 +4648,7 @@ snapshots:
       "@rc-component/trigger": 2.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       classnames: 2.5.1
       copy-to-clipboard: 3.3.3
-      dayjs: 1.11.21
+      dayjs: 1.11.23
       rc-cascader: 3.34.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       rc-checkbox: 3.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       rc-collapse: 3.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -4648,7 +4664,7 @@ snapshots:
       rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       rc-notification: 5.6.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       rc-pagination: 5.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      rc-picker: 4.11.3(dayjs@1.11.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      rc-picker: 4.11.3(dayjs@1.11.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       rc-progress: 4.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       rc-rate: 2.13.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       rc-resize-observer: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -4688,11 +4704,11 @@ snapshots:
 
   asynckit@0.4.0: {}
 
-  axios@1.18.1:
+  axios@1.18.1(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0):
     dependencies:
-      follow-redirects: 1.16.0
+      follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0))
       form-data: 4.0.6
-      https-proxy-agent: 5.0.1
+      https-proxy-agent: 5.0.1(supports-color@7.2.0)
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
       - debug
@@ -4796,11 +4812,13 @@ snapshots:
       whatwg-mimetype: 4.0.0
       whatwg-url: 14.0.0
 
-  dayjs@1.11.21: {}
+  dayjs@1.11.23: {}
 
-  debug@4.4.3:
+  debug@4.4.3(supports-color@7.2.0):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 7.2.0
 
   decimal.js@10.6.0: {}
 
@@ -4883,17 +4901,17 @@ snapshots:
 
   escape-string-regexp@4.0.0: {}
 
-  eslint-config-prettier@9.1.2(eslint@8.57.0):
+  eslint-config-prettier@9.1.2(eslint@8.57.0(supports-color@7.2.0)):
     dependencies:
-      eslint: 8.57.0
+      eslint: 8.57.0(supports-color@7.2.0)
 
-  eslint-plugin-react-hooks@4.6.2(eslint@8.57.0):
+  eslint-plugin-react-hooks@4.6.2(eslint@8.57.0(supports-color@7.2.0)):
     dependencies:
-      eslint: 8.57.0
+      eslint: 8.57.0(supports-color@7.2.0)
 
-  eslint-plugin-react-refresh@0.4.26(eslint@8.57.0):
+  eslint-plugin-react-refresh@0.4.26(eslint@8.57.0(supports-color@7.2.0)):
     dependencies:
-      eslint: 8.57.0
+      eslint: 8.57.0(supports-color@7.2.0)
 
   eslint-scope@7.2.2:
     dependencies:
@@ -4902,20 +4920,20 @@ snapshots:
 
   eslint-visitor-keys@3.4.3: {}
 
-  eslint@8.57.0:
+  eslint@8.57.0(supports-color@7.2.0):
     dependencies:
-      "@eslint-community/eslint-utils": 4.9.1(eslint@8.57.0)
+      "@eslint-community/eslint-utils": 4.9.1(eslint@8.57.0(supports-color@7.2.0))
       "@eslint-community/regexpp": 4.12.2
-      "@eslint/eslintrc": 2.1.4
+      "@eslint/eslintrc": 2.1.4(supports-color@7.2.0)
       "@eslint/js": 8.57.0
-      "@humanwhocodes/config-array": 0.11.14
+      "@humanwhocodes/config-array": 0.11.14(supports-color@7.2.0)
       "@humanwhocodes/module-importer": 1.0.1
       "@nodelib/fs.walk": 1.2.8
       "@ungap/structured-clone": 1.3.3
       ajv: 6.15.0
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -5019,7 +5037,9 @@ snapshots:
 
   flatted@3.4.2: {}
 
-  follow-redirects@1.16.0: {}
+  follow-redirects@1.16.0(debug@4.4.3(supports-color@7.2.0)):
+    optionalDependencies:
+      debug: 4.4.3(supports-color@7.2.0)
 
   form-data@4.0.6:
     dependencies:
@@ -5115,24 +5135,24 @@ snapshots:
 
   html-escaper@2.0.2: {}
 
-  http-proxy-agent@7.0.2:
+  http-proxy-agent@7.0.2(supports-color@7.2.0):
     dependencies:
-      agent-base: 7.1.0
-      debug: 4.4.3
+      agent-base: 7.1.0(supports-color@7.2.0)
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
-  https-proxy-agent@5.0.1:
+  https-proxy-agent@5.0.1(supports-color@7.2.0):
     dependencies:
-      agent-base: 6.0.0
-      debug: 4.4.3
+      agent-base: 6.0.0(supports-color@7.2.0)
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
-  https-proxy-agent@7.0.4:
+  https-proxy-agent@7.0.4(supports-color@7.2.0):
     dependencies:
-      agent-base: 7.0.2
-      debug: 4.4.3
+      agent-base: 7.0.2(supports-color@7.2.0)
+      debug: 4.4.3(supports-color@7.2.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -5186,10 +5206,10 @@ snapshots:
       make-dir: 4.0.0
       supports-color: 7.2.0
 
-  istanbul-lib-source-maps@5.0.6:
+  istanbul-lib-source-maps@5.0.6(supports-color@7.2.0):
     dependencies:
       "@jridgewell/trace-mapping": 0.3.31
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
@@ -5209,15 +5229,15 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
-  jsdom@24.1.0:
+  jsdom@24.1.0(supports-color@7.2.0):
     dependencies:
       cssstyle: 4.0.1
       data-urls: 5.0.0
       decimal.js: 10.6.0
       form-data: 4.0.6
       html-encoding-sniffer: 4.0.0
-      http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.4
+      http-proxy-agent: 7.0.2(supports-color@7.2.0)
+      https-proxy-agent: 7.0.4(supports-color@7.2.0)
       is-potential-custom-element-name: 1.0.1
       nwsapi: 2.2.24
       parse5: 7.1.2
@@ -5331,6 +5351,8 @@ snapshots:
       pkg-types: 1.3.1
       ufo: 1.6.4
 
+  mp4box@2.4.1: {}
+
   mrmime@2.0.1: {}
 
   ms@2.1.3: {}
@@ -5611,7 +5633,7 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  rc-picker@4.11.3(dayjs@1.11.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  rc-picker@4.11.3(dayjs@1.11.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       "@babel/runtime": 7.29.7
       "@rc-component/trigger": 2.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -5622,7 +5644,7 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      dayjs: 1.11.21
+      dayjs: 1.11.23
 
   rc-progress@4.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
@@ -6008,10 +6030,10 @@ snapshots:
     dependencies:
       react: 18.3.1
 
-  vite-node@1.6.0(@types/node@20.19.43):
+  vite-node@1.6.0(@types/node@20.19.43)(supports-color@7.2.0):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       pathe: 1.1.2
       picocolors: 1.1.1
       vite: 5.3.1(@types/node@20.19.43)
@@ -6034,7 +6056,7 @@ snapshots:
       "@types/node": 20.19.43
       fsevents: 2.3.3
 
-  vitest@1.6.0(@types/node@20.19.43)(@vitest/ui@1.6.0)(jsdom@24.1.0):
+  vitest@1.6.0(@types/node@20.19.43)(@vitest/ui@1.6.0)(jsdom@24.1.0(supports-color@7.2.0))(supports-color@7.2.0):
     dependencies:
       "@vitest/expect": 1.6.0
       "@vitest/runner": 1.6.0
@@ -6043,7 +6065,7 @@ snapshots:
       "@vitest/utils": 1.6.0
       acorn-walk: 8.3.5
       chai: 4.3.10
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       execa: 8.0.1
       local-pkg: 0.5.0
       magic-string: 0.30.5
@@ -6054,12 +6076,12 @@ snapshots:
       tinybench: 2.5.1
       tinypool: 0.8.3
       vite: 5.3.1(@types/node@20.19.43)
-      vite-node: 1.6.0(@types/node@20.19.43)
+      vite-node: 1.6.0(@types/node@20.19.43)(supports-color@7.2.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
       "@types/node": 20.19.43
       "@vitest/ui": 1.6.0(vitest@1.6.0)
-      jsdom: 24.1.0
+      jsdom: 24.1.0(supports-color@7.2.0)
     transitivePeerDependencies:
       - less
       - lightningcss

apps/web/src/api/client.ts

@@ -11,7 +11,7 @@ import { cancelProactiveRefresh, executeTokenRefresh } from "./auth/tokenRefresh
 // 创建 Axios 实例
 const apiClient = axios.create({
   baseURL: "/api/v1",
-  timeout: 10000,
+  timeout: 30000, // 全局 30s；智能选片/封面生成/大文件上传接口单独覆盖更长超时
   headers: {
     "Content-Type": "application/json",
   },

apps/web/src/api/cover-templates.ts

@@ -3,7 +3,7 @@
  * 后端路由: /api/v1/cover-templates
  */
 import apiClient from "./client"
-import type { CoverTemplate } from "@/pages/generate/types/cover"
+import type { CoverTemplate, CoverEditorConfig } from "@/pages/generate/types/cover"
 
 export interface CoverTemplateListResponse {
   items: CoverTemplate[]
@@ -12,14 +12,7 @@ export interface CoverTemplateListResponse {
 
 export interface CoverTemplateCreateRequest {
   name: string
-  config?: {
-    background_enabled?: boolean
-    background_color?: string
-    portrait_enabled?: boolean
-    title_text?: string
-    subtitle_text?: string
-    mask_enabled?: boolean
-  }
+  config?: CoverEditorConfig
 }
 
 export type CoverTemplateUpdateRequest = Partial<CoverTemplateCreateRequest>

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

@@ -7,8 +7,19 @@ export interface GenerateCoverTitleConfig {
   font_color?: string
   position?: string
   bold?: boolean
-  stroke?: boolean
-  shadow?: boolean
+  italic?: boolean
+  stroke?: boolean | { enabled?: boolean; width?: number; color?: string }
+  shadow?:
+    | boolean
+    | { enabled?: boolean; offset_x?: number; offset_y?: number; blur?: number; color?: string }
+  line_height?: number
+  margin_top?: number
+  max_chars_per_line?: number
+  background?: { enabled?: boolean; color?: string; padding?: number; radius?: number }
+  line_overrides?: Array<Record<string, unknown>>
+  cover_title_config?: Record<string, unknown>
+  pos_x?: number
+  pos_y?: number
 }
 
 export interface GenerateCoverRequest {
@@ -40,12 +51,18 @@ export interface GenerateCoverResponse {
 
 /** AI 生成封面 — 从最终成片中抽帧（MediaKit 选帧） */
 export async function generateCover(
-  templateId: string,
+  templateId: string | undefined | null,
   data: GenerateCoverRequest,
 ): Promise<GenerateCoverResponse> {
+  // templateId 为空时不传该参数，让后端使用默认模板配置
+  // （前端此前用 "default" 作为占位符，该 id 不存在于后端模板库会 404）
+  const params: Record<string, string> = {}
+  if (templateId && templateId !== "default") {
+    params.template_id = templateId
+  }
   const response = await apiClient.post<GenerateCoverResponse>("/generation/generate-cover", data, {
     timeout: 300000,
-    params: { template_id: templateId },
+    params,
   })
   return response.data
 }

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

@@ -0,0 +1,37 @@
+import apiClient from "../client"
+
+/** #2024 Step5 「完成」入库 —— 将 awaiting_cover 任务正式写入成品库 */
+export interface FinalizeGenerationRequest {
+  /** 用户选定的封面图片 URL；为空则使用任务默认封面（自动截帧/智能封面） */
+  cover_url?: string
+  /** 用户自定义成片标题，非空时覆盖 rendered_output.name */
+  custom_title?: string
+}
+
+export interface FinalizeGenerationResponse {
+  video_id: string
+  project_id: string
+  name: string
+  file_size: number
+  duration: number
+  thumbnail_url: string
+  cover_url: string
+  file_url: string
+  width: number
+  height: number
+  fps: number
+  /** success=新建成功；already_finalized=幂等返回已有记录 */
+  status: string
+  is_duplicate: boolean
+}
+
+export const finalizeGeneration = async (
+  taskId: string,
+  params: FinalizeGenerationRequest = {},
+): Promise<FinalizeGenerationResponse> => {
+  const response = await apiClient.post<FinalizeGenerationResponse>(
+    `/generation/tasks/${taskId}/finalize`,
+    params,
+  )
+  return response.data
+}

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

@@ -81,7 +81,7 @@ export interface CreateGenerationTaskRequest {
   tts_voice_source?: "preset" | "clone"
   /** #1970：智能降重开关（默认 true） */
   dedup_enabled?: boolean
-  /** 标题烧录配置 */
+  /** 标题烧录配置（#2001 扩展：描边/阴影参数/行距/自动换行/背景/逐行/封面） */
   title_config?: {
     text?: string
     font?: string
@@ -89,8 +89,34 @@ export interface CreateGenerationTaskRequest {
     font_color?: string
     position?: string
     bold?: boolean
-    stroke?: boolean
-    shadow?: boolean
+    italic?: boolean
+    stroke?: boolean | { enabled?: boolean; width?: number; color?: string }
+    shadow?:
+      | boolean
+      | {
+          enabled?: boolean
+          offset_x?: number
+          offset_y?: number
+          blur?: number
+          color?: string
+        }
+    line_height?: number
+    margin_top?: number
+    max_chars_per_line?: number
+    background?: { enabled?: boolean; color?: string; padding?: number; radius?: number }
+    line_overrides?: Array<{
+      line_index: number
+      text?: string
+      size?: number
+      color?: string
+      bold?: boolean
+      italic?: boolean
+      stroke?: boolean
+      highlights?: Array<{ word: string; color?: string; bold?: boolean; scale?: number }>
+    }>
+    cover_title_config?: Record<string, unknown>
+    pos_x?: number
+    pos_y?: number
   }
   /** 关联的草稿 ID（编辑流程数据链路用） */
   source_edit_plan_id?: string

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

@@ -6,17 +6,20 @@ import type { EditPlan, UpdateEditPlanRequest, GeneratedVideo } from "./types"
 
 /** 获取单个模板草稿 */
 export async function getEditPlan(templateId: string): Promise<EditPlan> {
-  const response = await apiClient.get(`/templates/${templateId}/editor`)
+  const response = await apiClient.get(`/templates/${templateId}/editor`, { timeout: 30_000 })
   return response.data
 }
 
-/** 更新模板草稿（支持传入 AbortSignal 用于自动保存竞态取消） */
+/** 更新模板草稿（支持传入 AbortSignal 用于自动保存竞态取消；超时 60s 防止大 config 写入失败） */
 export async function updateEditPlan(
   templateId: string,
   data: UpdateEditPlanRequest,
   signal?: AbortSignal,
 ): Promise<EditPlan> {
-  const response = await apiClient.put(`/templates/${templateId}/editor`, data, { signal })
+  const response = await apiClient.put(`/templates/${templateId}/editor`, data, {
+    signal,
+    timeout: 60_000,
+  })
   return response.data
 }
 

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

@@ -54,6 +54,8 @@ export interface SegmentTtsConfig {
   pitch: number
   volume: number
   subtitle_sync: boolean
+  /** 配音风格预设（natural/excited/professional/sweet/news/livestream） */
+  style?: string
 }
 
 /** 片段裁剪配置 */

apps/web/src/api/tts/index.ts

@@ -18,6 +18,9 @@ export type {
   TTSPreviewResponse,
 } from "./types"
 
+export type { TtsStyle, TtsStyleOption } from "./styles"
+export { TTS_STYLE_OPTIONS, DEFAULT_TTS_STYLE, getTtsStyle } from "./styles"
+
 // API 函数
 export {
   synthesizeSpeech,

apps/web/src/api/tts/styles.ts

@@ -0,0 +1,71 @@
+/**
+ * TTS 配音风格预设（情感/语气风格）
+ * - key：传给后端的 style 标识，便于后端按策略合成
+ * - 未传 style 时后端默认自然亲切
+ *
+ * 注：与原 emotion（CosyVoice 7 种基础情绪枚举）解耦；
+ *     style 是更高层的"说话风格预设"，后端可能映射到 emotion + speed + prompt 组合。
+ */
+
+export interface TtsStyleOption {
+  /** 传给后端的风格标识 */
+  value: string
+  /** 展示名 */
+  label: string
+  /** emoji 图标 */
+  emoji: string
+  /** 给用户/后端的风格描述（prompt 风格） */
+  description: string
+}
+
+export const TTS_STYLE_OPTIONS: readonly TtsStyleOption[] = [
+  {
+    value: "natural",
+    label: "自然亲切",
+    emoji: "😊",
+    description: "亲切自然，像朋友聊天",
+  },
+  {
+    value: "excited",
+    label: "激动兴奋",
+    emoji: "🤩",
+    description: "激动兴奋，语速稍快，充满活力",
+  },
+  {
+    value: "professional",
+    label: "沉稳专业",
+    emoji: "🧑‍💼",
+    description: "沉稳专业，语速适中，正式可靠",
+  },
+  {
+    value: "sweet",
+    label: "温柔甜美",
+    emoji: "🌸",
+    description: "温柔甜美，语速轻柔",
+  },
+  {
+    value: "news",
+    label: "新闻播报",
+    emoji: "📰",
+    description: "字正腔圆，严肃正式",
+  },
+  {
+    value: "livestream",
+    label: "直播带货",
+    emoji: "🎤",
+    description: "热情有感染力，有节奏感",
+  },
+] as const
+
+export type TtsStyle = (typeof TTS_STYLE_OPTIONS)[number]["value"]
+
+/** 默认风格：自然亲切 */
+export const DEFAULT_TTS_STYLE: TtsStyle = "natural"
+
+/** 根据 value 查找风格选项（容错：找不到回退 natural） */
+export function getTtsStyle(value: string | null | undefined): TtsStyleOption {
+  return (
+    (TTS_STYLE_OPTIONS as readonly TtsStyleOption[]).find((o) => o.value === value) ??
+    (TTS_STYLE_OPTIONS as readonly TtsStyleOption[])[0]
+  )
+}

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

@@ -17,6 +17,8 @@ export interface TTSSynthesizeRequest {
   output_name?: string
   language?: string
   emotion?: string
+  /** 配音风格预设（自然亲切/激动兴奋/沉稳专业/温柔甜美/新闻播报/直播带货），不传默认 natural */
+  style?: string
   speed?: number
   voice_model?: string
   voice_clone_profile_id?: string
@@ -106,6 +108,8 @@ export interface TTSPreviewRequest {
   pitch?: number
   language?: string
   emotion?: string // 情绪参数：neutral/happy/sad/angry/surprised/fearful/disgusted（后端 normalize_emotion() 兼容旧 natural/excited/calm/friendly 与中文标签）
+  /** 配音风格预设 */
+  style?: string
 }
 
 /** TTS 试听响应 */

apps/web/src/components/cover/cover.css

@@ -0,0 +1,563 @@
+/**
+ * 共享封面编辑器样式（智能剪辑 generate + AI数字人 ai-avatar 共用）
+ * #2033：从 generate.css 抽取 xx-ce-* / xx-cover-template-* / xx-cover-modal-* 规则
+ */
+
+.xx-cover-modal-toolbar {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 20px;
+  flex-wrap: wrap;
+}
+
+.xx-cover-template-grid {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 16px;
+}
+
+.xx-cover-template-card {
+  border: 2px solid var(--border-color);
+  border-radius: var(--radius-md);
+  overflow: hidden;
+  cursor: pointer;
+  transition: border-color 0.2s;
+}
+
+.xx-cover-template-card:hover {
+  border-color: var(--primary-color);
+}
+
+.xx-cover-template-card.selected {
+  border-color: var(--primary-color);
+  box-shadow: 0 0 0 2px rgba(102, 126, 234, 0.2);
+}
+
+.xx-cover-template-thumb {
+  aspect-ratio: 9/16;
+  background: linear-gradient(135deg, #f0f0f0, #e0e0e0);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32px;
+  color: #ccc;
+  position: relative;
+}
+
+.xx-cover-template-info {
+  padding: 8px;
+}
+
+.xx-cover-template-name {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 13px;
+  font-weight: 500;
+  margin-bottom: 2px;
+}
+
+.xx-cover-template-badge {
+  font-size: 11px;
+  color: #7c3aed;
+  background: rgba(124, 58, 237, 0.1);
+  padding: 1px 6px;
+  border-radius: 4px;
+  white-space: nowrap;
+}
+
+.xx-cover-template-date {
+  font-size: 11px;
+  color: var(--text-tertiary);
+  margin-bottom: 6px;
+}
+
+.xx-cover-template-actions {
+  display: flex;
+  gap: 4px;
+}
+
+.xx-ce-header {
+  margin-bottom: 16px;
+}
+
+.xx-ce-name-input {
+  width: 100%;
+  padding: 8px 12px;
+  border: 1px solid var(--border-color, #e5e7eb);
+  border-radius: var(--radius-sm, 6px);
+  font-size: 14px;
+  margin-bottom: 12px;
+  outline: none;
+}
+
+.xx-ce-name-input:focus {
+  border-color: #7c3aed;
+}
+
+.xx-ce-header-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+}
+
+.xx-ce-layout {
+  display: flex;
+  gap: 20px;
+  min-height: 500px;
+}
+
+.xx-ce-left {
+  width: 300px;
+  flex-shrink: 0;
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+.xx-ce-right {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #f5f5f5;
+  border-radius: 8px;
+  min-height: 480px;
+}
+
+.xx-ce-section {
+  border: 1px solid var(--border-color, #e5e7eb);
+  border-radius: 6px;
+  margin-bottom: 8px;
+}
+
+.xx-ce-section-header {
+  padding: 10px 12px;
+  font-size: 13px;
+  font-weight: 600;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: #f0f4ff;
+  user-select: none;
+}
+
+.xx-ce-section-header:hover {
+  background: #e8edf8;
+}
+
+.xx-ce-section-body {
+  padding: 12px;
+  font-size: 12px;
+  color: var(--text-secondary, #666);
+}
+
+.xx-ce-header-right {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.xx-ce-status-text {
+  font-size: 11px;
+  font-weight: 400;
+  color: #3b82f6;
+}
+
+.xx-ce-row {
+  margin: 12px 0;
+}
+
+.xx-ce-label {
+  display: block;
+  font-size: 12px;
+  color: #374151;
+  margin-bottom: 4px;
+}
+
+.xx-ce-hint {
+  font-size: 11px;
+  color: #9ca3af;
+  margin-top: 4px;
+}
+
+.xx-ce-sub-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 8px;
+}
+
+.xx-ce-switch-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.xx-ce-switch-item {
+  margin-bottom: 12px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f3f4f6;
+}
+
+.xx-ce-switch-item:last-child {
+  border-bottom: none;
+  margin-bottom: 0;
+  padding-bottom: 0;
+}
+
+.xx-ce-color-picker {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.xx-ce-color-picker input[type="color"] {
+  width: 32px;
+  height: 24px;
+  padding: 0;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  cursor: pointer;
+  background: none;
+}
+
+.xx-ce-color-picker input[type="color"]::-webkit-color-swatch-wrapper {
+  padding: 1px;
+}
+
+.xx-ce-color-picker input[type="color"]::-webkit-color-swatch {
+  border: none;
+  border-radius: 2px;
+}
+
+.xx-ce-color-hex {
+  width: 70px;
+  padding: 2px 6px;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  font-size: 12px;
+  font-family: monospace;
+}
+
+.xx-ce-position {
+  display: flex;
+  gap: 8px;
+}
+
+.xx-ce-position .ant-input-number {
+  flex: 1;
+}
+
+.xx-ce-radio-group {
+  display: flex;
+  gap: 0;
+}
+
+.xx-ce-radio-btn {
+  padding: 4px 14px;
+  font-size: 12px;
+  border: 1px solid #d1d5db;
+  background: #fff;
+  color: #374151;
+  cursor: pointer;
+  transition: all 0.15s;
+}
+
+.xx-ce-radio-btn:first-child {
+  border-radius: 4px 0 0 4px;
+}
+
+.xx-ce-radio-btn:last-child {
+  border-radius: 0 4px 4px 0;
+}
+
+.xx-ce-radio-btn + .xx-ce-radio-btn {
+  border-left: none;
+}
+
+.xx-ce-radio-btn.active {
+  background: #7c3aed;
+  color: #fff;
+  border-color: #7c3aed;
+}
+
+.xx-ce-radio-btn.active + .xx-ce-radio-btn {
+  border-left: 1px solid #d1d5db;
+}
+
+.xx-ce-font-dot {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  margin-right: 6px;
+  vertical-align: middle;
+}
+
+.xx-ce-font-dot--preset {
+  background: #10b981;
+}
+
+.xx-ce-font-dot--system {
+  background: #3b82f6;
+}
+
+.xx-ce-shadow-actions {
+  display: flex;
+  gap: 8px;
+  margin-top: 4px;
+}
+
+.xx-ce-add-shadow-btn {
+  padding: 4px 10px;
+  font-size: 12px;
+  background: #7c3aed;
+  color: #fff;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.xx-ce-add-shadow-btn:hover {
+  background: #6d28d9;
+}
+
+.xx-ce-preset-shadow-btn {
+  padding: 4px 10px;
+  font-size: 12px;
+  background: #fff;
+  color: #374151;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.xx-ce-text-bg-section {
+  margin-top: 8px;
+  padding: 8px;
+  background: #fafafa;
+  border-radius: 4px;
+  border: 1px solid #f0f0f0;
+}
+
+.xx-ce-readonly-text {
+  padding: 6px 10px;
+  background: #eff6ff;
+  border-radius: 4px;
+  font-size: 13px;
+  color: #1e40af;
+  margin-bottom: 4px;
+}
+
+.xx-ce-file-row {
+  display: flex;
+  gap: 6px;
+  align-items: center;
+}
+
+.xx-ce-file-name {
+  flex: 1;
+  padding: 4px 8px;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  font-size: 12px;
+  background: #f9fafb;
+  color: #6b7280;
+}
+
+.xx-ce-file-btn {
+  padding: 4px 10px;
+  font-size: 12px;
+  background: #fff;
+  color: #374151;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.xx-ce-file-btn:hover {
+  border-color: #7c3aed;
+  color: #7c3aed;
+}
+
+.xx-ce-canvas-wrap {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.xx-ce-canvas {
+  width: 225px;
+  height: 400px;
+  background: #ddd;
+  position: relative;
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.xx-ce-anchor-dot {
+  position: absolute;
+  width: 8px;
+  height: 8px;
+  background: #ef4444;
+  border-radius: 50%;
+  z-index: 5;
+}
+
+.xx-ce-el-portrait {
+  position: absolute;
+  background: #a8d4f0;
+  border: 2px solid #333;
+  z-index: 2;
+}
+
+.xx-ce-handle {
+  position: absolute;
+  width: 8px;
+  height: 8px;
+  background: #3b82f6;
+  border: 1px solid #fff;
+  z-index: 10;
+}
+
+.xx-ce-handle--0 {
+  top: -4px;
+  left: -4px;
+}
+
+.xx-ce-handle--1 {
+  top: -4px;
+  left: 50%;
+  margin-left: -4px;
+}
+
+.xx-ce-handle--2 {
+  top: -4px;
+  right: -4px;
+}
+
+.xx-ce-handle--3 {
+  top: 50%;
+  right: -4px;
+  margin-top: -4px;
+}
+
+.xx-ce-handle--4 {
+  bottom: -4px;
+  right: -4px;
+}
+
+.xx-ce-handle--5 {
+  bottom: -4px;
+  left: 50%;
+  margin-left: -4px;
+}
+
+.xx-ce-handle--6 {
+  bottom: -4px;
+  left: -4px;
+}
+
+.xx-ce-handle--7 {
+  top: 50%;
+  left: -4px;
+  margin-top: -4px;
+}
+
+.xx-ce-el-bg {
+  position: absolute;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  z-index: 1;
+}
+
+.xx-ce-el-mask {
+  position: absolute;
+  inset: 0;
+  z-index: 4;
+  pointer-events: none;
+}
+
+.xx-ce-text-bg {
+  position: absolute;
+  z-index: -1;
+}
+
+.xx-cover-template-check {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  width: 22px;
+  height: 22px;
+  background: #7c3aed;
+  color: #fff;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  font-weight: 700;
+  z-index: 2;
+  box-shadow: 0 2px 6px rgba(124, 58, 237, 0.4);
+}
+
+.xx-cover-template-thumb {
+  position: relative;
+}
+
+.xx-ce-preview-tip {
+  text-align: center;
+  margin-top: 12px;
+  font-size: 12px;
+  color: #6b7280;
+}
+
+.xx-ce-canvas {
+  background: #1a1a2e;
+}
+
+.xx-ce-section-body .ant-slider {
+  margin: 4px 0 8px;
+}
+
+.xx-ce-section-body .ant-slider-rail {
+  background: #e5e7eb;
+}
+
+.xx-ce-section-body .ant-slider-track {
+  background: #3b82f6;
+}
+
+.xx-ce-section-body .ant-slider-handle::after {
+  box-shadow: 0 0 0 2px #3b82f6;
+}
+
+.xx-ce-section-body .ant-slider-mark-text {
+  font-size: 10px;
+}
+
+.xx-ce-font-select-dropdown .ant-select-item-option-content {
+  display: flex;
+  align-items: center;
+}
+
+.xx-ce-canvas > div {
+  pointer-events: none;
+}
+
+/* Text panel wrapper */
+.xx-ce-text-panel {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+/* Canvas base gradient layer (behind all elements) */
+.xx-ce-canvas-base {
+  position: absolute;
+  inset: 0;
+  z-index: 0;
+  background: linear-gradient(135deg, #1e3a8a 0%, #312e81 100%);
+}

apps/web/src/components/cover/index.ts

@@ -0,0 +1,2 @@
+export { useSharedCover } from "./useSharedCover"
+export type { UseSharedCoverOptions, UseSharedCoverReturn } from "./useSharedCover"

apps/web/src/components/cover/useSharedCover.ts

@@ -0,0 +1,315 @@
+/**
+ * 共享封面选择 Hook（供智能剪辑 generate 与 AI 数字人 ai-avatar 共同使用）
+ *
+ * 能力：
+ *  - 封面模板列表加载 / 选择 / 创建 / 编辑 / 删除（调用 /cover-templates 接口）
+ *  - 自动生成封面按钮点击 → 调用调用方传入的 generateFn
+ *  - 封面编辑器弹窗状态
+ *  - 本地封面上传文件选择
+ */
+import type React from "react"
+import { useCallback, useEffect, useRef, useState } from "react"
+import { message } from "antd"
+import type { CoverTemplate } from "@/pages/generate/types/cover"
+import {
+  fetchCoverTemplates,
+  createCoverTemplate,
+  updateCoverTemplate,
+  deleteCoverTemplate,
+} from "@/api/cover-templates"
+
+export interface UseSharedCoverOptions {
+  canGenerate: boolean
+  disabledHint?: string
+  generateFn: (templateId: string) => Promise<string | null | undefined>
+  initialTemplateId?: string
+}
+
+export interface UseSharedCoverReturn {
+  templates: CoverTemplate[]
+  templatesLoading: boolean
+  templatesError: string | null
+  selectedTemplateId: string
+  selectedTemplateName: string
+  handleSelectTemplate: (id: string) => void
+  reloadTemplates: () => void
+  showCoverSettings: boolean
+  setShowCoverSettings: (v: boolean) => void
+  showCoverEditor: boolean
+  setShowCoverEditor: (v: boolean) => void
+  editingTemplate: CoverTemplate | null
+  handleEditTemplate: (tpl: CoverTemplate) => void
+  handleCreateTemplate: () => void
+  handleSaveTemplate: (tpl: CoverTemplate) => Promise<void>
+  handleDeleteTemplate: (id: string) => Promise<void>
+  generating: boolean
+  generateAutoCover: () => Promise<void>
+  uploadInputRef: React.RefObject<HTMLInputElement>
+  handleUploadClick: () => void
+  handleFileInputChange: (e: React.ChangeEvent<HTMLInputElement>) => void
+  setOnUploadFile: (fn: (file: File) => Promise<string | null> | string | null) => void
+}
+
+export function useSharedCover(opts: UseSharedCoverOptions): UseSharedCoverReturn {
+  const { canGenerate, disabledHint, generateFn, initialTemplateId = "default" } = opts
+  const [generating, setGenerating] = useState(false)
+  const [showCoverSettings, setShowCoverSettings] = useState(false)
+  const [showCoverEditor, setShowCoverEditor] = useState(false)
+  const [selectedTemplateId, setSelectedTemplateId] = useState<string>(initialTemplateId)
+  const [editingTemplate, setEditingTemplate] = useState<CoverTemplate | null>(null)
+  const [templates, setTemplates] = useState<CoverTemplate[]>([])
+  const [templatesLoading, setTemplatesLoading] = useState(false)
+  const [templatesError, setTemplatesError] = useState<string | null>(null)
+  const uploadInputRef = useRef<HTMLInputElement>(null)
+  const onUploadFileRef = useRef<
+    ((file: File) => Promise<string | null> | string | null) | undefined
+  >(undefined)
+
+  const setOnUploadFile = useCallback(
+    (fn: (file: File) => Promise<string | null> | string | null) => {
+      onUploadFileRef.current = fn
+    },
+    [],
+  )
+
+  const reloadTemplates = useCallback(async () => {
+    setTemplatesLoading(true)
+    setTemplatesError(null)
+    try {
+      const res = await fetchCoverTemplates()
+      // 兼容两种响应：{items:[...]} 或直接数组
+      const rawList = (res as unknown as { items?: CoverTemplate[] }).items ?? []
+      // 确保每个模板都有 config 字段（避免编辑器打开时访问 cfg.title.text 崩溃）
+      const list: CoverTemplate[] = rawList.map((t) => ({
+        ...t,
+        config: t.config,
+      }))
+      setTemplates(list)
+      // 若当前选中 "default"（初始占位），自动解析为第一个系统模板的真实 id
+      // （"default" 不是后端真实模板 id，传过去会 404）
+      setSelectedTemplateId((prev) => {
+        if (prev !== "default") return prev
+        const firstSys = list.find((t) => t.is_system)
+        return firstSys?.id || list[0]?.id || "default"
+      })
+    } catch (err) {
+      const axiosErr = err as {
+        response?: {
+          status?: number
+          data?: { detail?: string; message?: string; error?: { message?: string } }
+        }
+        message?: string
+      }
+      const status = axiosErr?.response?.status
+      const detail =
+        axiosErr?.response?.data?.detail ||
+        axiosErr?.response?.data?.message ||
+        axiosErr?.response?.data?.error?.message ||
+        axiosErr?.message
+      console.error("[SharedCover] 加载封面模板失败:", err, "status=", status, "detail=", detail)
+      if (status === 401) {
+        setTemplatesError("登录已过期，请刷新页面重新登录")
+      } else if (status === 403) {
+        setTemplatesError(detail ? "权限不足：" + detail : "无权限访问封面模板")
+      } else {
+        setTemplatesError("加载模板失败：" + (detail || "请稍后重试"))
+      }
+    } finally {
+      setTemplatesLoading(false)
+    }
+  }, [])
+
+  useEffect(() => {
+    // 挂载时拉一次模板列表，用于把 "default" 占位符解析成真实模板 id
+    void reloadTemplates()
+  }, [reloadTemplates])
+
+  useEffect(() => {
+    if (showCoverSettings) {
+      void reloadTemplates()
+    }
+  }, [showCoverSettings, reloadTemplates])
+
+  const handleSelectTemplate = useCallback((id: string) => {
+    setSelectedTemplateId(id)
+  }, [])
+
+  const handleEditTemplate = useCallback((tpl: CoverTemplate) => {
+    // 系统模板不可修改：复制为新模板草稿，走另存为流程
+    if (tpl.is_system) {
+      setEditingTemplate({
+        ...tpl,
+        id: "",
+        name: tpl.name + " 副本",
+        is_system: false,
+        created_at: "",
+      })
+    } else {
+      setEditingTemplate(tpl)
+    }
+    setShowCoverEditor(true)
+  }, [])
+
+  const handleCreateTemplate = useCallback(() => {
+    setEditingTemplate(null)
+    setShowCoverEditor(true)
+  }, [])
+
+  const handleSaveTemplate = useCallback(
+    async (tpl: CoverTemplate) => {
+      try {
+        // 系统模板或无 id（新建/副本）→ 走创建分支；否则走更新
+        const isSystem = templates.find((t) => t.id === tpl.id)?.is_system === true
+        const shouldCreate = !tpl.id || isSystem
+        if (shouldCreate) {
+          const created = await createCoverTemplate({
+            name: tpl.name || "我的封面模板",
+            config: tpl.config,
+          })
+          setTemplates((prev) => [...prev, created])
+          setSelectedTemplateId(created.id || tpl.id)
+        } else {
+          const updated = await updateCoverTemplate(tpl.id, { name: tpl.name, config: tpl.config })
+          setTemplates((prev) => prev.map((t) => (t.id === tpl.id ? { ...t, ...updated } : t)))
+        }
+        setShowCoverEditor(false)
+        setEditingTemplate(null)
+      } catch (err) {
+        const axiosErr = err as {
+          response?: {
+            status?: number
+            data?: { detail?: string; message?: string; error?: { message?: string } }
+          }
+          message?: string
+        }
+        const status = axiosErr?.response?.status
+        const detail =
+          axiosErr?.response?.data?.detail ||
+          axiosErr?.response?.data?.message ||
+          axiosErr?.response?.data?.error?.message ||
+          axiosErr?.message
+        console.error("[SharedCover] 保存模板失败:", err, "status=", status, "detail=", detail)
+        if (status === 403) {
+          message.error("保存失败（权限不足）：" + (detail || "无权操作该模板"))
+        } else {
+          message.error("保存模板失败：" + (detail || "请稍后重试"))
+        }
+      }
+    },
+    [templates],
+  )
+
+  const handleDeleteTemplate = useCallback(
+    async (id: string) => {
+      try {
+        await deleteCoverTemplate(id)
+        setTemplates((prev) => prev.filter((t) => t.id !== id))
+        if (selectedTemplateId === id) {
+          // 删除后选中第一个系统模板作为兜底，避免 magic string "default" 传后端 404
+          setTemplates((prevAfter) => {
+            const firstSys = prevAfter.find((t) => t.is_system)
+            setSelectedTemplateId(firstSys?.id || prevAfter[0]?.id || "")
+            return prevAfter
+          })
+        }
+      } catch (err) {
+        const axiosErr = err as {
+          response?: {
+            status?: number
+            data?: { detail?: string; message?: string; error?: { message?: string } }
+          }
+          message?: string
+        }
+        const status = axiosErr?.response?.status
+        const detail =
+          axiosErr?.response?.data?.detail ||
+          axiosErr?.response?.data?.message ||
+          axiosErr?.response?.data?.error?.message ||
+          axiosErr?.message
+        console.error("[SharedCover] 删除模板失败:", err, "status=", status, "detail=", detail)
+        if (status === 403) {
+          message.error("删除失败（权限不足）：" + (detail || "无权操作该模板"))
+        } else {
+          message.error("删除模板失败：" + (detail || "请稍后重试"))
+        }
+      }
+    },
+    [selectedTemplateId],
+  )
+
+  const generateAutoCover = useCallback(async () => {
+    if (generating) {
+      message.warning("封面正在生成中，请稍候…")
+      return
+    }
+    if (!canGenerate) {
+      if (disabledHint) message.warning(disabledHint)
+      return
+    }
+    setGenerating(true)
+    try {
+      const tplId = selectedTemplateId && selectedTemplateId !== "default" ? selectedTemplateId : ""
+      const url = await generateFn(tplId)
+      if (!url) {
+        message.warning("封面生成未返回图片，请重试")
+      }
+    } catch (err) {
+      console.error("[SharedCover] 自动生成封面失败:", err)
+      const anyErr = err as { __msgShown?: boolean; message?: string }
+      if (!anyErr?.__msgShown) {
+        message.error(anyErr?.message || "封面生成失败")
+      }
+    } finally {
+      setGenerating(false)
+    }
+  }, [generating, canGenerate, disabledHint, generateFn, selectedTemplateId])
+
+  const handleUploadClick = useCallback(() => {
+    uploadInputRef.current?.click()
+  }, [])
+
+  const handleFileInputChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0]
+    e.target.value = ""
+    if (!file) return
+    if (onUploadFileRef.current) {
+      const ret = onUploadFileRef.current(file)
+      if (ret instanceof Promise) {
+        ret.catch((err) => {
+          console.error("[SharedCover] 上传封面失败:", err)
+        })
+      }
+    }
+  }, [])
+
+  const selectedTemplateName =
+    templates.find((t) => t.id === selectedTemplateId)?.name ||
+    (selectedTemplateId === "default" || !selectedTemplateId ? "默认模板" : "自定义")
+
+  return {
+    templates,
+    templatesLoading,
+    templatesError,
+    selectedTemplateId,
+    selectedTemplateName,
+    handleSelectTemplate,
+    reloadTemplates,
+    showCoverSettings,
+    setShowCoverSettings,
+    showCoverEditor,
+    setShowCoverEditor,
+    editingTemplate,
+    handleEditTemplate,
+    handleCreateTemplate,
+    handleSaveTemplate,
+    handleDeleteTemplate,
+    generating,
+    generateAutoCover,
+    uploadInputRef,
+    handleUploadClick,
+    handleFileInputChange,
+    setOnUploadFile,
+  }
+}
+
+export default useSharedCover

apps/web/src/components/title/TitleTemplate.css

@@ -0,0 +1,391 @@
+/* ============================================================
+   标题模板系统 v3（按 sketch 重构）
+   - 大卡片网格（图片背景 + 透明 Canvas 叠字 + 始终可见操作按钮）
+   - 编辑器弹窗（左竖屏预览 + 右参数 Tab）
+   ============================================================ */
+
+/* ── 面板容器（模板模式） ── */
+.ttv3-panel {
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+}
+.ttv3-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.ttv3-title {
+  font-size: 15px;
+  font-weight: 600;
+  color: var(--text-primary, #1f2937);
+}
+.ttv3-new-btn.ant-btn {
+  background: linear-gradient(135deg, #6c5ce7, #a29bfe);
+  border: none;
+  border-radius: 20px;
+  font-size: 12px;
+  height: 28px;
+  padding: 0 14px;
+  font-weight: 500;
+  box-shadow: 0 2px 8px rgba(108, 92, 231, 0.25);
+}
+.ttv3-new-btn.ant-btn:hover {
+  background: linear-gradient(135deg, #5b4cdb, #8c83f5) !important;
+  color: #fff !important;
+}
+.ttv3-section-label {
+  font-size: 12px;
+  color: #888;
+  font-weight: 500;
+  margin-bottom: 8px;
+}
+.ttv3-section {
+  margin-bottom: 6px;
+}
+
+/* ── 空状态 ── */
+.ttv3-empty {
+  background: #f8f8fc;
+  border-radius: 12px;
+  padding: 28px 16px;
+  text-align: center;
+  color: #aaa;
+}
+.ttv3-empty-icon {
+  font-size: 28px;
+  margin-bottom: 6px;
+}
+.ttv3-empty-text {
+  font-size: 12px;
+}
+
+/* ── 卡片网格：minmax(180px,1fr) 自适应 ── */
+.ttv3-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+  gap: 12px;
+}
+
+/* ── 卡片：3:4 竖版，圆角 14px ── */
+.ttv3-card {
+  background: #fff;
+  border-radius: 14px;
+  border: 3px solid #e8e8ed;
+  cursor: pointer;
+  transition: all 0.15s ease;
+  overflow: hidden;
+  padding: 0;
+  font-family: inherit;
+  text-align: left;
+}
+.ttv3-card:hover {
+  border-color: #c5c0f0;
+  transform: translateY(-2px);
+  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.1);
+}
+.ttv3-card.selected {
+  border-color: #6c5ce7;
+  box-shadow: 0 4px 16px rgba(108, 92, 231, 0.25);
+}
+
+/* ── 卡片预览区（3:4） ── */
+.ttv3-preview {
+  width: 100%;
+  aspect-ratio: 3/4;
+  position: relative;
+  overflow: hidden;
+  border-radius: 11px 11px 0 0;
+}
+.ttv3-bg {
+  position: absolute;
+  inset: 0;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  display: block;
+}
+/* 暗色渐变遮罩：顶部15%半透明黑 + 中部透明 + 底部45%黑 */
+.ttv3-vignette {
+  position: absolute;
+  inset: 0;
+  background: linear-gradient(
+    180deg,
+    rgba(0, 0, 0, 0.45) 0%,
+    rgba(0, 0, 0, 0.15) 15%,
+    transparent 30%,
+    transparent 55%,
+    rgba(0, 0, 0, 0.6) 100%
+  );
+  z-index: 1;
+  pointer-events: none;
+}
+/* 透明 Canvas 标题填充整个预览区 */
+.ttv3-preview .tt-fill-canvas-wrap {
+  position: absolute;
+  inset: 0;
+  z-index: 2;
+}
+.ttv3-preview .tt-fill-canvas-wrap canvas {
+  width: 100% !important;
+  height: 100% !important;
+  border-radius: 0;
+  display: block;
+}
+
+/* ── 左上角角标（系统/我的） ── */
+.ttv3-badge {
+  position: absolute;
+  top: 8px;
+  left: 8px;
+  font-size: 10px;
+  padding: 2px 8px;
+  border-radius: 8px;
+  font-weight: 500;
+  color: #fff;
+  z-index: 3;
+  backdrop-filter: blur(4px);
+}
+.ttv3-badge--sys {
+  background: rgba(108, 92, 231, 0.88);
+}
+.ttv3-badge--mine {
+  background: rgba(0, 184, 148, 0.88);
+}
+
+/* ── 右上角勾选圆圈 ── */
+.ttv3-check {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  background: rgba(0, 0, 0, 0.3);
+  border: 2px solid rgba(255, 255, 255, 0.7);
+  z-index: 3;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 12px;
+  color: transparent;
+  transition: all 0.15s;
+}
+.ttv3-check.on {
+  background: #6c5ce7;
+  border-color: #fff;
+  color: #fff;
+}
+
+/* ── 卡片底栏（名称 + 操作按钮） ── */
+.ttv3-footer {
+  padding: 10px 10px 12px;
+}
+.ttv3-name-row {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  margin-bottom: 8px;
+  font-size: 13px;
+  font-weight: 500;
+  white-space: nowrap;
+  overflow: hidden;
+  color: #1f2937;
+}
+.ttv3-emoji {
+  font-size: 14px;
+  flex-shrink: 0;
+}
+.ttv3-name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  flex: 1;
+  min-width: 0;
+}
+.ttv3-tag {
+  font-size: 10px;
+  padding: 1px 6px;
+  border-radius: 6px;
+  font-weight: 500;
+  flex-shrink: 0;
+}
+.ttv3-tag--sys {
+  background: #f0ecff;
+  color: #6c5ce7;
+}
+.ttv3-tag--mine {
+  background: #e6f9f4;
+  color: #00b894;
+}
+
+/* ── 操作按钮：始终可见，等宽排列 ── */
+.ttv3-actions {
+  display: flex;
+  gap: 5px;
+}
+.ttv3-act {
+  flex: 1;
+  padding: 5px 0;
+  border: 1px solid #e8e8ed;
+  background: #fff;
+  border-radius: 7px;
+  font-size: 11px;
+  cursor: pointer;
+  color: #666;
+  font-weight: 500;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 3px;
+  transition: all 0.15s;
+  font-family: inherit;
+}
+.ttv3-act:hover:not(:disabled) {
+  background: #f5f5fa;
+  border-color: #d5d3e8;
+}
+.ttv3-act--primary {
+  background: #6c5ce7;
+  color: #fff;
+  border-color: #6c5ce7;
+}
+.ttv3-act--primary:hover:not(:disabled) {
+  background: #5b4cdb;
+  border-color: #5b4cdb;
+}
+.ttv3-act--danger {
+  color: #e74c3c;
+}
+.ttv3-act--danger:hover:not(:disabled) {
+  background: #fef2f2;
+}
+.ttv3-act:disabled {
+  opacity: 0.35;
+  cursor: not-allowed;
+}
+
+/* ── FillPreview 公共容器 ── */
+.tt-fill-canvas-wrap {
+  position: relative;
+}
+
+/* ── params-only（编辑器右侧）去掉多余 margin ── */
+.ttv3-params-only {
+  padding: 0;
+}
+.ttv3-params-only .ant-tabs {
+  margin: 0;
+}
+
+/* ============================================================
+   编辑器 Modal（v3）
+   ============================================================ */
+.ttv3-modal .ant-modal-content {
+  border-radius: 16px;
+  overflow: hidden;
+  padding: 0;
+}
+.ttv3-modal .ant-modal-header {
+  padding: 16px 20px;
+  margin: 0;
+  border-bottom: 1px solid #f0f0f0;
+}
+.ttv3-modal .ant-modal-body {
+  padding: 0;
+  max-height: 75vh;
+}
+.ttv3-modal .ant-modal-footer {
+  padding: 14px 20px;
+  margin: 0;
+  border-top: 1px solid #f0f0f0;
+}
+
+/* 编辑器两栏布局 */
+.ttv3-editor {
+  display: flex;
+  min-height: 500px;
+}
+.ttv3-editor-left {
+  width: 300px;
+  padding: 20px;
+  background: #f8f8fc;
+  flex-shrink: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+  border-right: 1px solid #f0f0f0;
+}
+.ttv3-editor-canvas {
+  width: 200px;
+  aspect-ratio: 9/16;
+  border-radius: 12px;
+  overflow: hidden;
+  position: relative;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12);
+  flex-shrink: 0;
+}
+.ttv3-editor-bg {
+  position: absolute;
+  inset: 0;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+.ttv3-editor-canvas-inner {
+  position: absolute;
+  inset: 0;
+  z-index: 2;
+}
+.ttv3-editor-canvas-inner canvas {
+  width: 100% !important;
+  height: 100% !important;
+  border-radius: 0;
+  display: block;
+}
+.ttv3-editor-form {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+.ttv3-form-row {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.ttv3-form-row label {
+  font-size: 12px;
+  font-weight: 600;
+  color: #333;
+  white-space: nowrap;
+  min-width: 44px;
+}
+.ttv3-form-row--grow {
+  flex: 1;
+}
+.ttv3-form-row--grow .ant-input {
+  flex: 1;
+}
+
+.ttv3-editor-right {
+  flex: 1;
+  padding: 16px 20px;
+  overflow-y: auto;
+  min-width: 0;
+}
+
+/* 侧栏较窄时（380px 侧栏）：强制 2 列，卡片稍微紧凑 */
+@media (max-width: 540px) {
+  .ttv3-grid {
+    grid-template-columns: repeat(2, 1fr);
+    gap: 10px;
+  }
+  .ttv3-act {
+    font-size: 10px;
+    padding: 4px 0;
+  }
+  .ttv3-act .anticon {
+    display: none;
+  }
+}

apps/web/src/components/title/TitleTemplateEditor.tsx

@@ -0,0 +1,174 @@
+/**
+ * 标题模板编辑器（v3 重构）
+ *
+ * - Modal 弹窗 860px 宽
+ * - 左侧：300px 竖屏预览区（图片背景+暗色渐变遮罩+透明 Canvas 叠字）+ 模板名称输入框
+ * - 右侧：参数 Tab 面板（基础/描边/阴影/背景/排版），复用 TitleStylePanel 的 paramsOnly 模式
+ * - 底部：取消 / 保存模板 按钮
+ * - 内置模板编辑时保存会创建副本（带"副本"逻辑由 handleSave 处理）
+ */
+import React, { useEffect, useMemo, useState } from "react"
+import { Modal, Button, Input, message } from "antd"
+import TitleStylePanel from "../../pages/generate/components/title/TitleStylePanel"
+import TitleMiniPreview from "../../pages/generate/components/title/TitleMiniPreview"
+import { POSITION_OPTIONS } from "../../pages/generate/constants"
+import { FONT_OPTIONS } from "./constants"
+import type { TitleSettings } from "../../pages/generate/types"
+import { DEFAULT_TITLE_SETTINGS_FULL } from "../../pages/generate/types"
+import { titleStyleConfigToCamel, camelToTitleStyleConfig } from "./utils"
+import type { TitleTemplate } from "./template-types"
+import type { TitleStyleConfig } from "./types"
+
+interface Props {
+  open: boolean
+  template: TitleTemplate
+  onClose: () => void
+  /** 用户点击保存：将编辑结果回调给父组件（父组件统一做 CRUD，避免双 hook 实例不同步） */
+  onSave: (data: { name: string; emoji: string; style: Partial<TitleStyleConfig> }) => void
+}
+
+/** 编辑器预览用的背景图（复用卡片池第一张） */
+const EDITOR_BG = "/title-templates/portrait1.jpg"
+
+const TitleTemplateEditor: React.FC<Props> = ({ open, template, onClose, onSave }) => {
+  const [settings, setSettings] = useState<TitleSettings>(() => ({
+    ...DEFAULT_TITLE_SETTINGS_FULL,
+    ...titleStyleConfigToCamel(template.style || {}),
+    title: "预览标题文字",
+  }))
+  const [formName, setFormName] = useState(template.name || "")
+  const [formEmoji, setFormEmoji] = useState(template.emoji || "✨")
+  const [saving, setSaving] = useState(false)
+
+  useEffect(() => {
+    if (open) {
+      setSettings({
+        ...DEFAULT_TITLE_SETTINGS_FULL,
+        ...titleStyleConfigToCamel(template.style || {}),
+        title: "预览标题文字",
+      })
+      setFormName(template.name || "")
+      setFormEmoji(template.emoji || "✨")
+    }
+  }, [open, template])
+
+  const upd = (patch: Partial<TitleSettings>) => setSettings((s) => ({ ...s, ...patch }))
+
+  const handleSave = () => {
+    const name = formName.trim()
+    if (!name) {
+      message.warning("请填写模板名称")
+      return
+    }
+    setSaving(true)
+    try {
+      const snake = camelToTitleStyleConfig(settings)
+      onSave({ name, emoji: formEmoji, style: snake })
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  // 编辑器内的预览用 settings：字号适配竖屏
+  const previewSettings = useMemo<TitleSettings>(() => {
+    // 竖屏宽度 200px，按比例缩放字号，让预览看起来协调
+    return { ...settings, size: Math.round(settings.size * 0.55) }
+  }, [settings])
+
+  return (
+    <Modal
+      title={
+        !template.id
+          ? "新建模板"
+          : template.isBuiltin
+            ? `基于「${template.name}」创建模板`
+            : `编辑模板：${template.name}`
+      }
+      open={open}
+      onCancel={onClose}
+      width={860}
+      footer={
+        <div style={{ display: "flex", gap: 10, justifyContent: "flex-end" }}>
+          <Button onClick={onClose}>取消</Button>
+          <Button type="primary" loading={saving} onClick={handleSave}>
+            保存模板
+          </Button>
+        </div>
+      }
+      destroyOnClose
+      className="ttv3-modal"
+      styles={{ body: { padding: 0 } }}
+    >
+      <div className="ttv3-editor">
+        {/* 左侧：竖屏预览 + 名称 */}
+        <div className="ttv3-editor-left">
+          <div className="ttv3-editor-canvas">
+            <img className="ttv3-editor-bg" src={EDITOR_BG} alt="" />
+            <div className="ttv3-vignette" />
+            <div className="ttv3-editor-canvas-inner">
+              <TitleMiniPreview
+                settings={previewSettings}
+                width={200}
+                sampleText="预览标题文字"
+                transparent
+                portrait
+              />
+            </div>
+          </div>
+          <div className="ttv3-editor-form">
+            <div className="ttv3-form-row">
+              <label>图标</label>
+              <Input
+                value={formEmoji}
+                maxLength={2}
+                style={{ textAlign: "center", width: 64 }}
+                onChange={(e) => setFormEmoji(e.target.value)}
+              />
+            </div>
+            <div className="ttv3-form-row ttv3-form-row--grow">
+              <label>
+                模板名称<span style={{ color: "#ef4444" }}>*</span>
+              </label>
+              <Input
+                placeholder="给模板起个名字"
+                value={formName}
+                maxLength={20}
+                onChange={(e) => setFormName(e.target.value)}
+              />
+            </div>
+          </div>
+        </div>
+        {/* 右侧：参数 Tab */}
+        <div className="ttv3-editor-right">
+          <TitleStylePanel
+            settings={settings}
+            onUpdatePosition={(p) => upd({ position: p, posX: null, posY: null })}
+            onUpdateFont={(f) => upd({ font: f })}
+            onUpdateSize={(v) => upd({ size: v })}
+            onToggleBold={() => upd({ bold: !settings.bold })}
+            onToggleItalic={() => upd({ italic: !settings.italic })}
+            onToggleStroke={() =>
+              upd({
+                stroke: !settings.stroke,
+                strokeWidth:
+                  !settings.stroke && (settings.strokeWidth ?? 0) < 2 ? 4 : settings.strokeWidth,
+              })
+            }
+            onToggleShadow={() => upd({ shadow: !settings.shadow })}
+            onApplyPreset={() => {
+              /* 编辑器内不使用系统预设快捷键 */
+            }}
+            onUpdateStyle={(patch) => upd(patch)}
+            activePreset={null}
+            titlePresets={[]}
+            POSITION_OPTIONS={POSITION_OPTIONS}
+            FONT_OPTIONS={FONT_OPTIONS}
+            paramsOnly
+          />
+        </div>
+      </div>
+    </Modal>
+  )
+}
+
+export default TitleTemplateEditor

apps/web/src/components/title/constants.ts

@@ -0,0 +1,392 @@
+/**
+ * 标题样式相关常量（#2001）
+ * - 字体列表（新增4款爆款字体）
+ * - 色板（常用标题字色/描边色/背景色）
+ * - 预设样式方案（10 个，含抖音爆款黄）
+ */
+import type { TitleStyleConfig } from "./types"
+
+/* ── 字体选项（#2001：新增优设标题黑/阿里普惠体Bold/抖音美好体/思源黑体Heavy） ── */
+export interface FontOption {
+  value: string
+  label: string
+  /** CSS font-family 栈 */
+  family: string
+  /** 爆款/常用标签 */
+  tag?: "hot" | "new"
+}
+
+export const FONT_OPTIONS: FontOption[] = [
+  {
+    value: "优设标题黑",
+    label: "优设标题黑",
+    // 原版"优设标题黑"为商用字体，非开源；这里优先使用本地已安装字体，兜底用 ZCOOL QingKe HuangYou（站酷庆科黄油体，同为厚重黑体/海报风格，可从 Google Fonts 加载）
+    family:
+      '"YouSheBiaoTiHei","YouShe Title Black","ZCOOL QingKe HuangYou","Noto Sans SC","PingFang SC","Microsoft YaHei",sans-serif',
+    tag: "hot",
+  },
+  {
+    value: "阿里普惠体Bold",
+    label: "阿里普惠体Bold",
+    // 阿里普惠体需要从阿里官网下载；兜底用 Noto Sans SC 900（同等字重）
+    family:
+      '"Alibaba PuHuiTi","Alibaba PuHuiTi Bold","Alibaba Sans","Noto Sans SC",system-ui,"PingFang SC","Microsoft YaHei",sans-serif',
+    tag: "hot",
+  },
+  {
+    value: "抖音美好体",
+    label: "抖音美好体",
+    // 抖音美好体版权字体兜底 ZCOOL KuaiLe（站酷快乐体，圆润卡通风格近似）
+    family:
+      '"Douyin Sans","DouyinSans","ZCOOL KuaiLe","Noto Sans SC","PingFang SC","Microsoft YaHei",sans-serif',
+    tag: "hot",
+  },
+  {
+    value: "思源黑体Heavy",
+    label: "思源黑体Heavy",
+    family:
+      '"Noto Sans SC","Source Han Sans SC","Source Han Sans CN Heavy","PingFang SC","Microsoft YaHei",sans-serif',
+    tag: "new",
+  },
+  {
+    value: "思源黑体",
+    label: "思源黑体",
+    family: '"Noto Sans SC","Source Han Sans SC","PingFang SC","Microsoft YaHei",sans-serif',
+  },
+  {
+    value: "思源宋体",
+    label: "思源宋体",
+    family: '"Noto Serif SC","Source Han Serif SC","Songti SC","SimSun",serif',
+  },
+  {
+    value: "苹方",
+    label: "苹方",
+    family:
+      '"PingFang SC",-apple-system,blinkmacsystemfont,"Helvetica Neue","Noto Sans SC",sans-serif',
+  },
+  {
+    value: "微软雅黑",
+    label: "微软雅黑",
+    family: '"Microsoft YaHei","PingFang SC","Noto Sans SC",sans-serif',
+  },
+  {
+    value: "楷体",
+    label: "楷体",
+    family: '"KaiTi","STKaiti","DFKai-SB","Kaiti SC",serif',
+  },
+  {
+    value: "站酷小薇体",
+    label: "站酷小薇体",
+    family: '"ZCOOL XiaoWei","Noto Serif SC",serif',
+  },
+  {
+    value: "马善政毛笔",
+    label: "马善政毛笔",
+    family: '"Ma Shan Zheng","STXingkai","KaiTi",cursive',
+  },
+  {
+    value: "龙藏体",
+    label: "龙藏体",
+    family: '"Long Cang","STXingkai","KaiTi",cursive',
+  },
+  {
+    value: "流江毛笔草",
+    label: "流江毛笔草",
+    family: '"Liu Jian Mao Cao","STXingkai",cursive',
+  },
+  {
+    value: "志莽行书",
+    label: "志莽行书",
+    family: '"Zhi Mang Xing","STXingkai",cursive',
+  },
+]
+
+/** 根据中文名取 font-family 栈（找不到回退思源黑体） */
+export function getFontFamily(font: string): string {
+  const f = FONT_OPTIONS.find((x) => x.value === font)
+  if (f) return f.family
+  return FONT_OPTIONS[4].family // 思源黑体
+}
+
+/* ── 色板 ── */
+/** 标题字色（常用爆款色） */
+export const TITLE_COLOR_PALETTE: string[] = [
+  "#ffffff",
+  "#000000",
+  "#ffd700", // 抖音黄
+  "#ff2d55", // 抖音红
+  "#ff4081",
+  "#00e5ff",
+  "#d4a843",
+  "#ffa500",
+  "#52c41a",
+  "#1890ff",
+  "#7c3aed",
+  "#ff6b35",
+]
+
+/** 描边色（黑/白/灰为主） */
+export const STROKE_COLOR_PALETTE: string[] = [
+  "#000000",
+  "#ffffff",
+  "#333333",
+  "#555555",
+  "#8b0000",
+  "#001f3f",
+]
+
+/** 背景色（带透明度） */
+export const BG_COLOR_PALETTE: string[] = [
+  "rgba(0,0,0,0.5)",
+  "rgba(0,0,0,0.7)",
+  "rgba(0,0,0,0.3)",
+  "rgba(255,215,0,0.9)",
+  "rgba(255,45,85,0.85)",
+  "rgba(124,58,237,0.85)",
+  "rgba(24,144,255,0.85)",
+  "rgba(82,196,26,0.85)",
+]
+
+/* ── 预设样式方案（10 个，含抖音爆款黄） ── */
+export interface TitlePreset {
+  key: string
+  label: string
+  emoji: string
+  /** 应用时覆盖到 TitleStyleConfig 的字段（其他字段保持当前值） */
+  style: Partial<TitleStyleConfig>
+}
+
+const BASE: Partial<TitleStyleConfig> = {
+  position: "bottom",
+  line_overrides: [],
+  cover_title_config: null,
+}
+
+export const TITLE_PRESETS: TitlePreset[] = [
+  {
+    key: "douyin_hot",
+    label: "抖音爆款黄",
+    emoji: "🔥",
+    style: {
+      ...BASE,
+      font: "优设标题黑",
+      size: 80,
+      color: "#ffd700",
+      bold: true,
+      italic: false,
+      stroke: true,
+      stroke_width: 8,
+      stroke_color: "#000000",
+      shadow: true,
+      shadow_offset_x: 3,
+      shadow_offset_y: 3,
+      shadow_blur: 6,
+      shadow_color: "rgba(0,0,0,0.6)",
+      bg_enabled: false,
+      line_height: 1.25,
+      max_chars_per_line: 8,
+    },
+  },
+  {
+    key: "classic_white",
+    label: "经典白字黑描边",
+    emoji: "⚪",
+    style: {
+      ...BASE,
+      font: "思源黑体Heavy",
+      size: 56,
+      color: "#ffffff",
+      bold: true,
+      italic: false,
+      stroke: true,
+      stroke_width: 5,
+      stroke_color: "#000000",
+      shadow: false,
+      bg_enabled: false,
+      line_height: 1.2,
+      max_chars_per_line: 10,
+    },
+  },
+  {
+    key: "red_bold",
+    label: "醒目红字",
+    emoji: "🔴",
+    style: {
+      ...BASE,
+      font: "优设标题黑",
+      size: 72,
+      color: "#ff2d55",
+      bold: true,
+      italic: false,
+      stroke: true,
+      stroke_width: 6,
+      stroke_color: "#ffffff",
+      shadow: true,
+      shadow_offset_x: 2,
+      shadow_offset_y: 2,
+      shadow_blur: 5,
+      shadow_color: "rgba(0,0,0,0.5)",
+      bg_enabled: false,
+      line_height: 1.2,
+      max_chars_per_line: 9,
+    },
+  },
+  {
+    key: "black_gold",
+    label: "黑金质感",
+    emoji: "🟡",
+    style: {
+      ...BASE,
+      font: "思源宋体",
+      size: 52,
+      color: "#d4a843",
+      bold: true,
+      italic: false,
+      stroke: false,
+      shadow: true,
+      shadow_offset_x: 2,
+      shadow_offset_y: 2,
+      shadow_blur: 8,
+      shadow_color: "rgba(0,0,0,0.8)",
+      bg_enabled: false,
+      line_height: 1.25,
+      max_chars_per_line: 10,
+    },
+  },
+  {
+    key: "neon_blue",
+    label: "霓虹发光",
+    emoji: "💙",
+    style: {
+      ...BASE,
+      font: "阿里普惠体Bold",
+      size: 60,
+      color: "#00e5ff",
+      bold: true,
+      italic: false,
+      stroke: false,
+      shadow: true,
+      shadow_offset_x: 0,
+      shadow_offset_y: 0,
+      shadow_blur: 16,
+      shadow_color: "#00e5ff",
+      bg_enabled: false,
+      line_height: 1.2,
+      max_chars_per_line: 10,
+    },
+  },
+  {
+    key: "bg_black",
+    label: "黑底白字",
+    emoji: "⬛",
+    style: {
+      ...BASE,
+      font: "思源黑体Heavy",
+      size: 52,
+      color: "#ffffff",
+      bold: true,
+      italic: false,
+      stroke: false,
+      shadow: false,
+      bg_enabled: true,
+      bg_color: "rgba(0,0,0,0.7)",
+      bg_padding: 16,
+      bg_radius: 8,
+      line_height: 1.3,
+      max_chars_per_line: 10,
+    },
+  },
+  {
+    key: "bg_yellow",
+    label: "黄底黑字",
+    emoji: "🟨",
+    style: {
+      ...BASE,
+      font: "抖音美好体",
+      size: 56,
+      color: "#000000",
+      bold: true,
+      italic: false,
+      stroke: false,
+      shadow: false,
+      bg_enabled: true,
+      bg_color: "rgba(255,215,0,0.95)",
+      bg_padding: 14,
+      bg_radius: 6,
+      line_height: 1.2,
+      max_chars_per_line: 9,
+    },
+  },
+  {
+    key: "sweet_pink",
+    label: "温柔甜美粉",
+    emoji: "🌸",
+    style: {
+      ...BASE,
+      font: "阿里普惠体Bold",
+      size: 50,
+      color: "#ff4081",
+      bold: false,
+      italic: false,
+      stroke: true,
+      stroke_width: 4,
+      stroke_color: "#ffffff",
+      shadow: true,
+      shadow_offset_x: 2,
+      shadow_offset_y: 2,
+      shadow_blur: 4,
+      shadow_color: "rgba(255,64,129,0.4)",
+      bg_enabled: false,
+      line_height: 1.3,
+      max_chars_per_line: 11,
+    },
+  },
+  {
+    key: "business_dark",
+    label: "商务深色",
+    emoji: "💼",
+    style: {
+      ...BASE,
+      font: "思源黑体",
+      size: 44,
+      color: "#ffffff",
+      bold: false,
+      italic: false,
+      stroke: false,
+      shadow: true,
+      shadow_offset_x: 1,
+      shadow_offset_y: 1,
+      shadow_blur: 3,
+      shadow_color: "rgba(0,0,0,0.8)",
+      bg_enabled: true,
+      bg_color: "rgba(24,144,255,0.85)",
+      bg_padding: 12,
+      bg_radius: 4,
+      line_height: 1.3,
+      max_chars_per_line: 12,
+    },
+  },
+  {
+    key: "minimal_clean",
+    label: "极简无描边",
+    emoji: "✨",
+    style: {
+      ...BASE,
+      font: "苹方",
+      size: 48,
+      color: "#ffffff",
+      bold: true,
+      italic: false,
+      stroke: false,
+      shadow: false,
+      bg_enabled: false,
+      line_height: 1.3,
+      max_chars_per_line: 10,
+    },
+  },
+]
+
+/** 根据 key 获取预设 */
+export function getTitlePreset(key: string): TitlePreset | undefined {
+  return TITLE_PRESETS.find((p) => p.key === key)
+}

apps/web/src/components/title/template-types.ts

@@ -0,0 +1,28 @@
+/**
+ * 标题模板系统类型（#2003）
+ *
+ * 设计：
+ * - 内置系统模板（从 TITLE_PRESETS 自动派生，不可编辑/删除，可"复制为我的"）
+ * - 用户自定义模板（保存在 localStorage，可编辑/复制/导出/删除）
+ * - 模板存完整 TitleStyleConfig（snake_case），与后端契约一致
+ */
+import type { TitleStyleConfig } from "./types"
+
+export interface TitleTemplate {
+  /** 唯一 ID：系统模板 `sys:<presetKey>`，用户模板 `usr:<uuid>` */
+  id: string
+  /** 模板名称（必填，保存时校验） */
+  name: string
+  /** 模板描述（可选） */
+  description?: string
+  /** 是否为系统内置（不可删除/编辑源） */
+  isBuiltin: boolean
+  /** emoji（展示用，可选） */
+  emoji?: string
+  /** 创建时间（ISO 字符串，系统模板=固定值） */
+  createdAt: string
+  /** 更新时间 */
+  updatedAt: string
+  /** 完整样式配置（snake_case，与后端 title_config 对齐） */
+  style: Partial<TitleStyleConfig>
+}

apps/web/src/components/title/types.ts

@@ -0,0 +1,118 @@
+/**
+ * 共享标题样式配置类型（#2001 爆款标题样式配置面板升级）
+ *
+ * 设计原则：
+ * 1. 向后兼容：保留旧的 bold/stroke/shadow 布尔字段，新增细粒度字段
+ *    （stroke_width/stroke_color/shadow_offset_x-y-blur-color/bg_enabled-color-padding-radius/line_height/margin_top/max_chars_per_line）。
+ * 2. 后端契约：字段名使用 snake_case，与 title_config dict 直接对齐。
+ * 3. line_overrides 支持逐行覆盖（选中某行单独设置颜色/字号/关键词高亮/加粗/斜体）。
+ * 4. cover_title_config 为封面独立标题样式，null 表示封面沿用主标题样式。
+ */
+
+/** 关键词高亮配置 */
+export interface TitleKeywordHighlight {
+  /** 要高亮的词 */
+  word: string
+  /** 高亮颜色（可选，默认主色反转） */
+  color?: string
+  /** 是否加粗（默认 true） */
+  bold?: boolean
+  /** 额外字号放大倍数（1.0=不变，1.3=放大 30%） */
+  scale?: number
+}
+
+/** 单行覆盖配置 */
+export interface TitleLineOverride {
+  /** 行索引（0-based，按 / 或自动换行后的行序） */
+  line_index: number
+  /** 覆盖后的文字（可选，默认沿用原行） */
+  text?: string
+  /** 覆盖字号（可选） */
+  size?: number
+  /** 覆盖字色（可选） */
+  color?: string
+  /** 覆盖加粗（可选） */
+  bold?: boolean
+  /** 覆盖斜体（可选） */
+  italic?: boolean
+  /** 覆盖描边开关（可选） */
+  stroke?: boolean
+  /** 关键词高亮列表 */
+  highlights?: TitleKeywordHighlight[]
+}
+
+/**
+ * 标题样式配置（不含 title 文字本身，不含 auto_subtitle）。
+ *
+ * cover_title_config 使用 Partial<Omit<...,"cover_title_config">> 递归避免无限类型。
+ */
+export interface TitleStyleConfig {
+  /* ── 基础 ── */
+  font: string
+  size: number
+  color: string
+  bold: boolean
+  italic: boolean
+  position: "top" | "center" | "bottom" | "custom"
+  pos_x?: number
+  pos_y?: number
+
+  /* ── 排版（P0） ── */
+  /** 行距倍数（默认 1.2） */
+  line_height: number
+  /** 顶部边距（position=top 时距画面顶部距离，px @720p，默认 24） */
+  margin_top: number
+  /** 每行最大字符数（4-20，超出自动换行；0=不自动换行，使用 / 手动分行） */
+  max_chars_per_line: number
+
+  /* ── 描边参数化（P0） ── */
+  stroke: boolean
+  stroke_width: number
+  stroke_color: string
+
+  /* ── 阴影参数化（P1） ── */
+  shadow: boolean
+  shadow_offset_x: number
+  shadow_offset_y: number
+  shadow_blur: number
+  shadow_color: string
+
+  /* ── 背景色块（P1） ── */
+  bg_enabled: boolean
+  bg_color: string
+  bg_padding: number
+  bg_radius: number
+
+  /* ── 逐行独立样式（P1） ── */
+  line_overrides: TitleLineOverride[]
+
+  /* ── 封面独立标题配置（P1）：null=沿用主标题样式 ── */
+  cover_title_config: null | Partial<Omit<TitleStyleConfig, "cover_title_config">>
+}
+
+/** 默认样式（经典白字黑描边，保持老版本观感） */
+export const DEFAULT_TITLE_STYLE: TitleStyleConfig = {
+  font: "思源黑体",
+  size: 48,
+  color: "#ffffff",
+  bold: true,
+  italic: false,
+  position: "bottom",
+  line_height: 1.2,
+  margin_top: 24,
+  max_chars_per_line: 0,
+  stroke: true,
+  stroke_width: 4,
+  stroke_color: "#000000",
+  shadow: false,
+  shadow_offset_x: 2,
+  shadow_offset_y: 2,
+  shadow_blur: 4,
+  shadow_color: "rgba(0,0,0,0.8)",
+  bg_enabled: false,
+  bg_color: "rgba(0,0,0,0.5)",
+  bg_padding: 12,
+  bg_radius: 8,
+  line_overrides: [],
+  cover_title_config: null,
+}

apps/web/src/components/title/useTitleTemplates.ts

@@ -0,0 +1,213 @@
+/**
+ * 标题模板 CRUD Hook（#2003）
+ *
+ * - 内存态 + localStorage 持久化
+ * - 系统模板（来自 TITLE_PRESETS）始终前置、不可删除/编辑源
+ * - 用户模板 CRUD：新增/复制/更新/删除/导出/导入
+ */
+import { useCallback, useEffect, useMemo, useState } from "react"
+import { TITLE_PRESETS } from "./constants"
+import type { TitleStyleConfig } from "./types"
+import type { TitleTemplate } from "./template-types"
+
+const STORAGE_KEY = "xiaoxia.title.templates.v1"
+
+function uid(): string {
+  return "usr:" + Math.random().toString(36).slice(2, 10) + Date.now().toString(36)
+}
+
+/** 把 TITLE_PRESETS 转为内置 TitleTemplate 列表 */
+function buildBuiltinTemplates(): TitleTemplate[] {
+  const now = "2026-09-22T00:00:00+08:00"
+  return TITLE_PRESETS.map((p) => ({
+    id: `sys:${p.key}`,
+    name: p.label,
+    description: "系统内置模板",
+    isBuiltin: true,
+    emoji: p.emoji,
+    createdAt: now,
+    updatedAt: now,
+    style: { ...p.style },
+  }))
+}
+
+function loadUserTemplates(): TitleTemplate[] {
+  if (typeof window === "undefined") return []
+  try {
+    const raw = window.localStorage.getItem(STORAGE_KEY)
+    if (!raw) return []
+    const parsed = JSON.parse(raw)
+    if (!Array.isArray(parsed)) return []
+    return parsed.filter((t) => t && !t.isBuiltin && t.id.startsWith("usr:"))
+  } catch {
+    return []
+  }
+}
+
+function saveUserTemplates(list: TitleTemplate[]) {
+  if (typeof window === "undefined") return
+  try {
+    window.localStorage.setItem(STORAGE_KEY, JSON.stringify(list))
+  } catch {
+    /* ignore quota */
+  }
+}
+
+export interface UseTitleTemplatesResult {
+  templates: TitleTemplate[]
+  builtin: TitleTemplate[]
+  custom: TitleTemplate[]
+  /** 新建自定义模板：传入样式（snake_case），返回新建模板 id */
+  createTemplate: (input: {
+    name: string
+    description?: string
+    emoji?: string
+    style: Partial<TitleStyleConfig>
+  }) => TitleTemplate
+  /** 复制模板（内置模板也可复制，自动加"副本"后缀） */
+  duplicateTemplate: (id: string) => TitleTemplate | null
+  /** 更新自定义模板（系统模板不可改） */
+  updateTemplate: (id: string, patch: Partial<Omit<TitleTemplate, "id" | "isBuiltin">>) => void
+  /** 删除自定义模板 */
+  deleteTemplate: (id: string) => void
+  /** 导出单个模板为 JSON 字符串 */
+  exportTemplate: (id: string) => string | null
+  /** 导入 JSON 字符串作为新模板，返回新建模板 */
+  importTemplate: (json: string) => TitleTemplate | null
+  /** 根据 id 查询模板 */
+  getById: (id: string) => TitleTemplate | undefined
+}
+
+export function useTitleTemplates(): UseTitleTemplatesResult {
+  const [custom, setCustom] = useState<TitleTemplate[]>(() => loadUserTemplates())
+
+  // 跨 tab 同步
+  useEffect(() => {
+    const onStorage = (e: StorageEvent) => {
+      if (e.key === STORAGE_KEY) setCustom(loadUserTemplates())
+    }
+    window.addEventListener("storage", onStorage)
+    return () => window.removeEventListener("storage", onStorage)
+  }, [])
+
+  const builtin = useMemo(() => buildBuiltinTemplates(), [])
+  const templates = useMemo(() => [...builtin, ...custom], [builtin, custom])
+
+  const persist = useCallback((next: TitleTemplate[]) => {
+    setCustom(next)
+    saveUserTemplates(next)
+  }, [])
+
+  const getById = useCallback((id: string) => templates.find((t) => t.id === id), [templates])
+
+  const createTemplate = useCallback<UseTitleTemplatesResult["createTemplate"]>(
+    ({ name, description, emoji, style }) => {
+      const now = new Date().toISOString()
+      const t: TitleTemplate = {
+        id: uid(),
+        name: name.trim() || "未命名模板",
+        description: description?.trim() || undefined,
+        emoji: emoji || "✨",
+        isBuiltin: false,
+        createdAt: now,
+        updatedAt: now,
+        style: { ...style },
+      }
+      persist([...custom, t])
+      return t
+    },
+    [custom, persist],
+  )
+
+  const duplicateTemplate = useCallback<UseTitleTemplatesResult["duplicateTemplate"]>(
+    (id) => {
+      const src = templates.find((t) => t.id === id)
+      if (!src) return null
+      const now = new Date().toISOString()
+      const t: TitleTemplate = {
+        id: uid(),
+        name: `${src.name} 副本`,
+        description: src.description,
+        emoji: src.emoji,
+        isBuiltin: false,
+        createdAt: now,
+        updatedAt: now,
+        style: { ...src.style },
+      }
+      persist([...custom, t])
+      return t
+    },
+    [templates, custom, persist],
+  )
+
+  const updateTemplate = useCallback<UseTitleTemplatesResult["updateTemplate"]>(
+    (id, patch) => {
+      if (id.startsWith("sys:")) return
+      const next = custom.map((t) =>
+        t.id === id
+          ? { ...t, ...patch, id: t.id, isBuiltin: false, updatedAt: new Date().toISOString() }
+          : t,
+      )
+      persist(next)
+    },
+    [custom, persist],
+  )
+
+  const deleteTemplate = useCallback<UseTitleTemplatesResult["deleteTemplate"]>(
+    (id) => {
+      if (id.startsWith("sys:")) return
+      persist(custom.filter((t) => t.id !== id))
+    },
+    [custom, persist],
+  )
+
+  const exportTemplate = useCallback<UseTitleTemplatesResult["exportTemplate"]>(
+    (id) => {
+      const t = templates.find((x) => x.id === id)
+      if (!t) return null
+      return JSON.stringify(
+        {
+          name: t.name,
+          description: t.description,
+          emoji: t.emoji,
+          style: t.style,
+          exportedAt: new Date().toISOString(),
+        },
+        null,
+        2,
+      )
+    },
+    [templates],
+  )
+
+  const importTemplate = useCallback<UseTitleTemplatesResult["importTemplate"]>(
+    (json) => {
+      try {
+        const data = JSON.parse(json)
+        if (!data || typeof data !== "object" || !data.style) return null
+        return createTemplate({
+          name: data.name || "导入模板",
+          description: data.description,
+          emoji: data.emoji || "✨",
+          style: data.style,
+        })
+      } catch {
+        return null
+      }
+    },
+    [createTemplate],
+  )
+
+  return {
+    templates,
+    builtin,
+    custom,
+    createTemplate,
+    duplicateTemplate,
+    updateTemplate,
+    deleteTemplate,
+    exportTemplate,
+    importTemplate,
+    getById,
+  }
+}

apps/web/src/components/title/utils.ts

@@ -0,0 +1,125 @@
+/**
+ * 标题样式工具（#2001 / 模板系统 #2003）
+ *
+ * - snake_case TitleStyleConfig ↔ camelCase TitleSettings 互转
+ * - preset 归一化预览（修复"标题"两字大小不一）
+ */
+import type { TitleStyleConfig } from "./types"
+import type { TitleSettings } from "../../pages/generate/types"
+import { TITLE_PRESETS } from "./constants"
+import { DEFAULT_TITLE_SETTINGS_FULL } from "../../pages/generate/types"
+import type { TitleTemplate } from "./template-types"
+
+/** snake_case TitleStyleConfig → camelCase TitleSettings（仅覆盖已知字段） */
+export function titleStyleConfigToCamel(s: Partial<TitleStyleConfig>): Partial<TitleSettings> {
+  const out: Partial<TitleSettings> = {}
+  if (s.font != null) out.font = s.font
+  if (s.size != null) out.size = s.size
+  if (s.color != null) out.color = s.color
+  if (s.bold != null) out.bold = s.bold
+  if (s.italic != null) out.italic = s.italic
+  if (s.position != null) out.position = s.position as TitleSettings["position"]
+  if (s.pos_x != null) out.posX = s.pos_x
+  if (s.pos_y != null) out.posY = s.pos_y
+  if (s.line_height != null) out.lineHeight = s.line_height
+  if (s.margin_top != null) out.marginTop = s.margin_top
+  if (s.max_chars_per_line != null) out.maxCharsPerLine = s.max_chars_per_line
+  if (s.stroke != null) out.stroke = s.stroke
+  if (s.stroke_width != null) out.strokeWidth = s.stroke_width
+  if (s.stroke_color != null) out.strokeColor = s.stroke_color
+  if (s.shadow != null) out.shadow = s.shadow
+  if (s.shadow_offset_x != null) out.shadowOffsetX = s.shadow_offset_x
+  if (s.shadow_offset_y != null) out.shadowOffsetY = s.shadow_offset_y
+  if (s.shadow_blur != null) out.shadowBlur = s.shadow_blur
+  if (s.shadow_color != null) out.shadowColor = s.shadow_color
+  if (s.bg_enabled != null) out.bgEnabled = s.bg_enabled
+  if (s.bg_color != null) out.bgColor = s.bg_color
+  if (s.bg_padding != null) out.bgPadding = s.bg_padding
+  if (s.bg_radius != null) out.bgRadius = s.bg_radius
+  if (s.line_overrides != null) out.lineOverrides = s.line_overrides
+  return out
+}
+
+/** camelCase TitleSettings patch → snake_case TitleStyleConfig patch */
+export function camelToTitleStyleConfig(p: Partial<TitleSettings>): Partial<TitleStyleConfig> {
+  const out: Partial<TitleStyleConfig> = {}
+  if (p.font != null) out.font = p.font
+  if (p.size != null) out.size = p.size
+  if (p.color != null) out.color = p.color
+  if (p.bold != null) out.bold = p.bold
+  if (p.italic != null) out.italic = p.italic
+  if (p.position != null) out.position = p.position as TitleStyleConfig["position"]
+  if (p.posX != null) out.pos_x = p.posX
+  if (p.posY != null) out.pos_y = p.posY
+  if (p.lineHeight != null) out.line_height = p.lineHeight
+  if (p.marginTop != null) out.margin_top = p.marginTop
+  if (p.maxCharsPerLine != null) out.max_chars_per_line = p.maxCharsPerLine
+  if (p.stroke != null) out.stroke = p.stroke
+  if (p.strokeWidth != null) out.stroke_width = p.strokeWidth
+  if (p.strokeColor != null) out.stroke_color = p.strokeColor
+  if (p.shadow != null) out.shadow = p.shadow
+  if (p.shadowOffsetX != null) out.shadow_offset_x = p.shadowOffsetX
+  if (p.shadowOffsetY != null) out.shadow_offset_y = p.shadowOffsetY
+  if (p.shadowBlur != null) out.shadow_blur = p.shadowBlur
+  if (p.shadowColor != null) out.shadow_color = p.shadowColor
+  if (p.bgEnabled != null) out.bg_enabled = p.bgEnabled
+  if (p.bgColor != null) out.bg_color = p.bgColor
+  if (p.bgPadding != null) out.bg_padding = p.bgPadding
+  if (p.bgRadius != null) out.bg_radius = p.bgRadius
+  if (p.lineOverrides != null) out.line_overrides = p.lineOverrides
+  return out
+}
+
+/**
+ * 把 preset style（snake_case）归一化为固定字号的 TitleSettings，
+ * 用于"预设卡片"缩略预览——所有卡片视觉上"标题"两字大小一致，便于辨识。
+ * 描边/阴影/背景padding 按 fixedSize / 原始 size 比例缩放，避免粗描边爆框。
+ */
+export function buildPresetPreviewSettings(
+  base: TitleSettings,
+  presetKey: string,
+  fixedSize = 56,
+): TitleSettings {
+  const preset = TITLE_PRESETS.find((p) => p.key === presetKey)
+  if (!preset) return base
+  const origSize = preset.style.size ?? fixedSize
+  const ratio = fixedSize / origSize
+  const scale = (v: number | undefined, fallback: number): number =>
+    v != null ? Math.round(v * ratio) : fallback
+  return {
+    ...base,
+    ...titleStyleConfigToCamel(preset.style),
+    size: fixedSize,
+    strokeWidth: scale(preset.style.stroke_width, base.strokeWidth) ?? base.strokeWidth,
+    shadowOffsetX: scale(preset.style.shadow_offset_x, base.shadowOffsetX) ?? base.shadowOffsetX,
+    shadowOffsetY: scale(preset.style.shadow_offset_y, base.shadowOffsetY) ?? base.shadowOffsetY,
+    shadowBlur: scale(preset.style.shadow_blur, base.shadowBlur) ?? base.shadowBlur,
+    bgPadding: scale(preset.style.bg_padding, base.bgPadding) ?? base.bgPadding,
+    lineOverrides: [],
+  }
+}
+
+/**
+ * 把 TitleTemplate 渲染为完整 TitleSettings（带默认值），用于卡片预览。
+ * 与模板选择器中保持一致，抽出共用。
+ */
+export function templateToPreviewSettings(t: TitleTemplate, fixedSize = 48): TitleSettings {
+  const base: TitleSettings = {
+    ...DEFAULT_TITLE_SETTINGS_FULL,
+    ...titleStyleConfigToCamel(t.style),
+  }
+  // 预览时用固定字号保证所有卡片字大小一致；描边/阴影/padding按比例缩放
+  const origSize = t.style.size ?? base.size
+  if (origSize && origSize !== fixedSize) {
+    const ratio = fixedSize / origSize
+    base.size = fixedSize
+    if (base.strokeWidth != null)
+      base.strokeWidth = Math.max(1, Math.round(base.strokeWidth * ratio))
+    if (base.shadowOffsetX != null) base.shadowOffsetX = Math.round(base.shadowOffsetX * ratio)
+    if (base.shadowOffsetY != null) base.shadowOffsetY = Math.round(base.shadowOffsetY * ratio)
+    if (base.shadowBlur != null) base.shadowBlur = Math.round(base.shadowBlur * ratio)
+    if (base.bgPadding != null) base.bgPadding = Math.round(base.bgPadding * ratio)
+  }
+  base.lineOverrides = []
+  return base
+}

apps/web/src/components/voice/TtsStyleSelector/index.tsx

@@ -0,0 +1,151 @@
+/**
+ * TTS 配音风格选择器
+ * - 6 种预设风格卡片（自然亲切 / 激动兴奋 / 沉稳专业 / 温柔甜美 / 新闻播报 / 直播带货）
+ * - 卡片单选，选中高亮紫色
+ * - 默认 natural
+ *
+ * 复用方式：
+ *   <TtsStyleSelector value={style} onChange={setStyle} />
+ *   <TtsStyleSelector value={style} onChange={setStyle} compact />  // 紧凑模式（小尺寸）
+ */
+import React from "react"
+import { TTS_STYLE_OPTIONS, DEFAULT_TTS_STYLE, type TtsStyle } from "@/api/tts/styles"
+
+export interface TtsStyleSelectorProps {
+  value?: TtsStyle | string
+  onChange: (style: TtsStyle) => void
+  /** 紧凑模式（小卡片），适合与其他参数并排 */
+  compact?: boolean
+  /** 是否显示"配音风格"标签 */
+  showLabel?: boolean
+}
+
+const TtsStyleSelector: React.FC<TtsStyleSelectorProps> = ({
+  value,
+  onChange,
+  compact = false,
+  showLabel = true,
+}) => {
+  const current = value || DEFAULT_TTS_STYLE
+
+  if (compact) {
+    return (
+      <div>
+        {showLabel && (
+          <div
+            style={{
+              fontSize: 13,
+              color: "var(--text-secondary, #6b7280)",
+              marginBottom: 6,
+            }}
+          >
+            配音风格
+          </div>
+        )}
+        <div
+          style={{
+            display: "grid",
+            gridTemplateColumns: "repeat(3, 1fr)",
+            gap: 6,
+          }}
+        >
+          {TTS_STYLE_OPTIONS.map((opt) => {
+            const selected = current === opt.value
+            return (
+              <button
+                type="button"
+                key={opt.value}
+                onClick={() => onChange(opt.value as TtsStyle)}
+                title={opt.description}
+                style={{
+                  padding: "6px 4px",
+                  borderRadius: 6,
+                  border: selected ? "2px solid #7c3aed" : "1px solid #e5e7eb",
+                  background: selected ? "#faf5ff" : "#fff",
+                  color: selected ? "#6d28d9" : "#374151",
+                  cursor: "pointer",
+                  fontSize: 12,
+                  fontWeight: selected ? 600 : 400,
+                  textAlign: "center",
+                  transition: "all 0.15s",
+                  lineHeight: 1.3,
+                }}
+              >
+                <span style={{ marginRight: 3 }}>{opt.emoji}</span>
+                {opt.label}
+              </button>
+            )
+          })}
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div>
+      {showLabel && (
+        <div
+          style={{
+            fontSize: 13,
+            color: "var(--text-secondary, #6b7280)",
+            marginBottom: 8,
+            fontWeight: 500,
+          }}
+        >
+          配音风格
+        </div>
+      )}
+      <div
+        style={{
+          display: "grid",
+          gridTemplateColumns: "repeat(3, 1fr)",
+          gap: 8,
+        }}
+      >
+        {TTS_STYLE_OPTIONS.map((opt) => {
+          const selected = current === opt.value
+          return (
+            <button
+              type="button"
+              key={opt.value}
+              onClick={() => onChange(opt.value as TtsStyle)}
+              title={opt.description}
+              style={{
+                padding: "10px 8px",
+                borderRadius: 8,
+                border: selected ? "2px solid #7c3aed" : "1px solid #e5e7eb",
+                background: selected ? "#faf5ff" : "#fff",
+                color: selected ? "#6d28d9" : "#111",
+                cursor: "pointer",
+                textAlign: "center",
+                transition: "all 0.15s",
+                display: "flex",
+                flexDirection: "column",
+                alignItems: "center",
+                gap: 4,
+              }}
+            >
+              <span style={{ fontSize: 22, lineHeight: 1 }}>{opt.emoji}</span>
+              <span style={{ fontSize: 13, fontWeight: selected ? 600 : 500 }}>{opt.label}</span>
+              <span
+                style={{
+                  fontSize: 10,
+                  color: "#9ca3af",
+                  lineHeight: 1.2,
+                  maxWidth: "100%",
+                  overflow: "hidden",
+                  textOverflow: "ellipsis",
+                  whiteSpace: "nowrap",
+                }}
+              >
+                {opt.description}
+              </span>
+            </button>
+          )
+        })}
+      </div>
+    </div>
+  )
+}
+
+export default TtsStyleSelector

apps/web/src/pages/ai-avatar/AiAvatarPage.tsx

@@ -30,11 +30,7 @@ import {
 } from "./api/aiAvatar"
 import { getOrCreateDefaultProject } from "@/api/projects"
 import type { RenderJob, SentenceTiming } from "./types"
-import {
-  normalizeEmotion,
-  buildTitleConfigPayload,
-  buildCoverConfigPayload,
-} from "./utils/contract"
+import { buildTitleConfigPayload, buildCoverConfigPayload } from "./utils/contract"
 import { renderTitleToPngDataUrl, getVideoResolution } from "./utils/titleCanvas"
 
 /** 面板折叠状态 */
@@ -65,6 +61,10 @@ const AiAvatarPage: React.FC = () => {
     "generating",
   )
   const [lipsyncErrorMessage, setLipsyncErrorMessage] = useState("")
+  /* ── 对口型耗时计时（秒） ── */
+  const [lipsyncElapsed, setLipsyncElapsed] = useState(0)
+  const lipsyncStartAtRef = useRef<number>(0)
+  const lipsyncTickRef = useRef<ReturnType<typeof setInterval> | null>(null)
   /* ── 渲染进度弹窗 ── */
   const [showRenderModal, setShowRenderModal] = useState(false)
   const [renderStatus, setRenderStatus] = useState<"generating" | "completed" | "failed">(
@@ -94,7 +94,7 @@ const AiAvatarPage: React.FC = () => {
       state.resetTtsPreview()
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [state.scriptText, state.selectedVoice?.voice_id, state.speed, state.emotion])
+  }, [state.scriptText, state.selectedVoice?.voice_id, state.speed, state.style])
 
   const _clearTtsProgressTimer = useCallback(() => {
     if (ttsProgressTimerRef.current) {
@@ -148,7 +148,7 @@ const AiAvatarPage: React.FC = () => {
         voice_id: state.selectedVoice!.voice_id,
         script_text: state.scriptText,
         speed: state.speed,
-        emotion: normalizeEmotion(state.emotion),
+        style: state.style,
       })
       _clearTtsProgressTimer()
       setTtsProgress(100)
@@ -175,7 +175,7 @@ const AiAvatarPage: React.FC = () => {
       })
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [state.selectedVideo, state.selectedVoice, state.scriptText, state.speed, state.emotion])
+  }, [state.selectedVideo, state.selectedVoice, state.scriptText, state.speed, state.style])
 
   const handleRetryTts = useCallback(() => {
     handleGenerateTts()
@@ -226,6 +226,13 @@ const AiAvatarPage: React.FC = () => {
       setShowLipsyncModal(true)
       setLipsyncStatus("generating")
       setLipsyncErrorMessage("")
+      // 启动计时器
+      lipsyncStartAtRef.current = Date.now()
+      setLipsyncElapsed(0)
+      if (lipsyncTickRef.current) clearInterval(lipsyncTickRef.current)
+      lipsyncTickRef.current = setInterval(() => {
+        setLipsyncElapsed(Math.floor((Date.now() - lipsyncStartAtRef.current) / 1000))
+      }, 1000)
 
       const asset = await getAssetById(video.id)
       const videoUrl = asset?.file_url
@@ -254,7 +261,7 @@ const AiAvatarPage: React.FC = () => {
           script_text: state.scriptText,
           video_url: videoUrl,
           speed: state.speed,
-          emotion: normalizeEmotion(state.emotion),
+          style: state.style,
         }
       }
       const job = await createLipsyncJob(payload)
@@ -269,6 +276,11 @@ const AiAvatarPage: React.FC = () => {
           state.setLipsyncJob(updated)
           if (updated.status === "completed") {
             if (lipsyncTimerRef.current) clearInterval(lipsyncTimerRef.current)
+            if (lipsyncTickRef.current) {
+              clearInterval(lipsyncTickRef.current)
+              lipsyncTickRef.current = null
+            }
+            setLipsyncElapsed(Math.floor((Date.now() - lipsyncStartAtRef.current) / 1000))
             setLipsyncStatus("completed")
             setTimeout(() => {
               setShowLipsyncModal(false)
@@ -276,6 +288,10 @@ const AiAvatarPage: React.FC = () => {
             }, 1000)
           } else if (updated.status === "failed") {
             if (lipsyncTimerRef.current) clearInterval(lipsyncTimerRef.current)
+            if (lipsyncTickRef.current) {
+              clearInterval(lipsyncTickRef.current)
+              lipsyncTickRef.current = null
+            }
             setLipsyncStatus("failed")
             setLipsyncErrorMessage(updated.error_message || "对口型生成失败")
           }
@@ -289,6 +305,10 @@ const AiAvatarPage: React.FC = () => {
         data: (err as { response?: { data?: unknown } })?.response?.data,
         message: err instanceof Error ? err.message : String(err),
       })
+      if (lipsyncTickRef.current) {
+        clearInterval(lipsyncTickRef.current)
+        lipsyncTickRef.current = null
+      }
       setShowLipsyncModal(false)
       message.error(err instanceof Error ? err.message : "对口型任务提交失败，请重试")
     }
@@ -298,7 +318,8 @@ const AiAvatarPage: React.FC = () => {
     state.selectedVoice,
     state.scriptText,
     state.speed,
-    state.emotion,
+
+    state.style,
     state.ttsPreview,
   ])
 
@@ -308,15 +329,21 @@ const AiAvatarPage: React.FC = () => {
       clearInterval(lipsyncTimerRef.current)
       lipsyncTimerRef.current = null
     }
+    if (lipsyncTickRef.current) {
+      clearInterval(lipsyncTickRef.current)
+      lipsyncTickRef.current = null
+    }
     setShowLipsyncModal(false)
     setLipsyncStatus("generating")
     setLipsyncErrorMessage("")
+    setLipsyncElapsed(0)
   }, [])
 
   // 清理轮询
   useEffect(() => {
     return () => {
       if (lipsyncTimerRef.current) clearInterval(lipsyncTimerRef.current)
+      if (lipsyncTickRef.current) clearInterval(lipsyncTickRef.current)
       if (renderTimerRef.current) clearInterval(renderTimerRef.current)
     }
   }, [])
@@ -598,8 +625,8 @@ const AiAvatarPage: React.FC = () => {
                   onVoiceSourceChange={state.setVoiceSource}
                   selectedVoice={state.selectedVoice}
                   onSelectVoice={state.setSelectedVoice}
-                  emotion={state.emotion}
-                  onEmotionChange={state.setEmotion}
+                  style={state.style}
+                  onStyleChange={state.setStyle}
                   speed={state.speed}
                   onSpeedChange={state.setSpeed}
                   language={state.language}
@@ -699,17 +726,11 @@ const AiAvatarPage: React.FC = () => {
               <div className="aa-panel__body">
                 {currentRenderJob?.status !== "completed" ? (
                   <PanelCoverAndGenerate
-                    variant="setup"
-                    coverConfig={state.coverConfig}
-                    onCoverConfigChange={(partial) =>
-                      state.setCoverConfig((prev) => ({ ...prev, ...partial }))
-                    }
-                    renderJob={currentRenderJob}
-                    onGenerateRenderSmartCover={handleGenerateRenderSmartCover}
                     resolution={state.resolution}
                     onResolutionChange={state.setResolution}
                     isGenerating={state.isGenerating}
                     onGenerate={handleGenerate}
+                    renderJob={currentRenderJob}
                     summary={summary}
                   />
                 ) : (
@@ -966,6 +987,19 @@ const AiAvatarPage: React.FC = () => {
                   <div style={{ marginTop: 20, fontSize: 15, color: "#1a1a2e" }}>
                     对口型视频生成中…
                   </div>
+                  <div
+                    style={{
+                      marginTop: 12,
+                      fontSize: 28,
+                      fontWeight: 700,
+                      fontVariantNumeric: "tabular-nums",
+                      color: "#7c3aed",
+                    }}
+                  >
+                    {`${Math.floor(lipsyncElapsed / 60)
+                      .toString()
+                      .padStart(2, "0")}:${(lipsyncElapsed % 60).toString().padStart(2, "0")}`}
+                  </div>
                   <div style={{ marginTop: 8, fontSize: 13, color: "#8c8ca1" }}>
                     请勿关闭页面，完成后将自动提示
                   </div>
@@ -977,6 +1011,20 @@ const AiAvatarPage: React.FC = () => {
                   <div style={{ marginTop: 16, fontSize: 15, color: "#1a1a2e" }}>
                     对口型视频生成完成
                   </div>
+                  <div
+                    style={{
+                      marginTop: 8,
+                      fontSize: 13,
+                      color: "#10b981",
+                      fontVariantNumeric: "tabular-nums",
+                    }}
+                  >
+                    总耗时{" "}
+                    {Math.floor(lipsyncElapsed / 60)
+                      .toString()
+                      .padStart(2, "0")}
+                    :{(lipsyncElapsed % 60).toString().padStart(2, "0")}
+                  </div>
                 </>
               )}
               {lipsyncStatus === "failed" && (

apps/web/src/pages/ai-avatar/api/aiAvatar.ts

@@ -41,6 +41,8 @@ export const createLipsyncJob = async (data: {
   speed?: number
   /** 情绪英文枚举：neutral/happy/sad/angry/surprised/fearful/disgusted（TTS 直生模式用；前端经 normalizeEmotion 归一化） */
   emotion?: string
+  /** 配音风格预设（natural/excited/professional/sweet/news/livestream） */
+  style?: string
   enable_video_loop?: boolean
   project_id?: string
 }): Promise<LipsyncJob> => {
@@ -55,6 +57,7 @@ export const previewTts = async (data: {
   script_text: string
   speed?: number
   emotion?: string
+  style?: string
 }): Promise<{
   audio_url: string
   duration: number
@@ -96,15 +99,18 @@ export const cancelRenderJob = async (jobId: string): Promise<void> => {
   await apiClient.post(`/ai-avatar/render/${jobId}/cancel`)
 }
 
-/* ── 从最终渲染成片智能抽封面（POST /ai-avatar/renders/{job_id}/smart-cover） ── */
+/* ── 从最终渲染成片智能抽封面（POST /ai-avatar/render/{job_id}/smart-cover） ──
+ * #2033 共享封面组件：支持传 template_id（模板ID，传 default 走默认智能抽帧）
+ */
 export const generateRenderSmartCover = async (
   jobId: string,
+  templateId: string = "default",
 ): Promise<{ cover_url: string; status: string; message: string }> => {
   const response = await apiClient.post<{ cover_url: string; status: string; message: string }>(
     `/ai-avatar/render/${jobId}/smart-cover`,
-    {},
-    // 抽帧+评分+转存 OSS 链路较长，120s 超时
-    { timeout: 120000 },
+    templateId && templateId !== "default" ? { template_id: templateId } : {},
+    // 抽帧+评分+转存 OSS 链路较长，120s 超时；使用模板时叠加文字渲染再加 60s
+    { timeout: templateId && templateId !== "default" ? 180000 : 120000 },
   )
   return response.data
 }

apps/web/src/pages/ai-avatar/components/ModalCoverSelect.tsx

@@ -1,11 +1,25 @@
 /**
- * AI数字人 — 封面选择弹窗
- * 渲染完成后由主页面唤起，内部用 PanelCoverAndGenerate（select-cover 变体）提供
- * 智能抽帧 + 自定义上传 + 预览 + 确定按钮。
+ * AI数字人 — 封面选择弹窗（#2033 共享封面组件重构）
+ *
+ * 复用智能剪辑的 CoverSettingsModal（模板选择）+ CoverEditorModal（7 面板自定义编辑器）
+ * + 智能生成 / 本地上传 / 封面预览，与智能剪辑侧 UI 一致。
+ *
+ * 父组件仍维持 AiAvatarCoverConfig { mode, smart_cover_url, upload_url, thumbnail_url } 结构：
+ * - 智能生成封面：mode="auto_frame"，thumbnail_url/smart_cover_url 指向后端返回的 cover_url
+ * - 本地上传封面：mode="upload"，upload_url/thumbnail_url 指向 blob 预览 URL
+ *
+ * 模板 CRUD 通过 @/api/cover-templates 统一接口（智能剪辑与 AI数字人共享同一套模板库）。
  */
-import React from "react"
+import React, { useCallback, useEffect, useMemo } from "react"
+import { Modal as AntModal, Spin, message } from "antd"
+import { LoadingOutlined } from "@ant-design/icons"
+import Modal from "@/components/ui/Modal"
+import Button from "@/components/ui/Button"
+import CoverSettingsModal from "@/pages/generate/components/cover-settings/CoverSettingsModal"
+import CoverEditorModal from "@/pages/generate/components/cover-settings/CoverEditorModal"
+import { useSharedCover } from "@/components/cover/useSharedCover"
+import { generateRenderSmartCover as apiGenerateSmartCover } from "../api/aiAvatar"
 import type { AiAvatarCoverConfig, RenderJob } from "../types"
-import PanelCoverAndGenerate from "./PanelCoverAndGenerate"
 
 interface ModalCoverSelectProps {
   open: boolean
@@ -13,7 +27,13 @@ interface ModalCoverSelectProps {
   renderJob: RenderJob | null
   coverConfig: AiAvatarCoverConfig
   onCoverConfigChange: (partial: Partial<AiAvatarCoverConfig>) => void
-  onGenerateRenderSmartCover: (renderId: string) => Promise<{ cover_url: string; message?: string }>
+  /**
+   * 【保留兼容】老接口：单参 renderId；新接口支持 templateId 由本组件内部直接调用，不再需要父层传入
+   * 如果父层传了该回调，本组件的"自动生成封面"按钮会调用它；否则走本组件内部 apiGenerateSmartCover。
+   */
+  onGenerateRenderSmartCover?: (
+    renderId: string,
+  ) => Promise<{ cover_url: string; message?: string }>
   onUploadCover?: (file: File) => void
   onCoverSelected: (coverUrl: string) => void
 }
@@ -28,31 +48,302 @@ const ModalCoverSelect: React.FC<ModalCoverSelectProps> = ({
   onUploadCover,
   onCoverSelected,
 }) => {
+  const isRenderCompleted = renderJob?.status === "completed" && !!renderJob?.id
+
+  const generateFn = useCallback(
+    async (templateId: string): Promise<string | null> => {
+      if (!renderJob || !isRenderCompleted) return null
+      try {
+        let coverUrl = ""
+        if (onGenerateRenderSmartCover) {
+          const res = await onGenerateRenderSmartCover(renderJob.id)
+          coverUrl = res.cover_url
+        } else {
+          const res = await apiGenerateSmartCover(renderJob.id, templateId)
+          coverUrl = res.cover_url
+          if (!coverUrl && res.message) {
+            const err = new Error(res.message) as Error & { __msgShown?: boolean }
+            err.__msgShown = true
+            message.error(res.message)
+            throw err
+          }
+        }
+        if (coverUrl) {
+          onCoverConfigChange({
+            mode: "auto_frame",
+            thumbnail_url: coverUrl,
+            smart_cover_url: coverUrl,
+          })
+          onCoverSelected(coverUrl)
+          message.success("智能封面已生成")
+        }
+        return coverUrl || null
+      } catch (err) {
+        const anyErr = err as { __msgShown?: boolean; message?: string }
+        if (!anyErr?.__msgShown) {
+          message.error(anyErr?.message || "智能封面生成失败")
+        }
+        throw err
+      }
+    },
+    [
+      renderJob,
+      isRenderCompleted,
+      onGenerateRenderSmartCover,
+      onCoverConfigChange,
+      onCoverSelected,
+    ],
+  )
+
+  const shared = useSharedCover({
+    canGenerate: isRenderCompleted,
+    disabledHint: "请先完成视频生成再选择封面",
+    initialTemplateId: "default",
+    generateFn,
+  })
+
+  // 父层 onUploadCover 走 onUploadFile 回调（兼容老父组件）
+  useEffect(() => {
+    shared.setOnUploadFile((file: File) => {
+      if (onUploadCover) {
+        onUploadCover(file)
+      } else {
+        const url = URL.createObjectURL(file)
+        onCoverConfigChange({
+          mode: "upload",
+          upload_url: url,
+          thumbnail_url: url,
+        })
+        onCoverSelected(url)
+      }
+      return null
+    })
+  }, [shared, onUploadCover, onCoverConfigChange, onCoverSelected])
+
+  // 打开时同步刷新模板列表
+  useEffect(() => {
+    if (open) void shared.reloadTemplates()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open])
+
+  /** 当前预览 URL：智能封面 > 自定义上传 */
+  const previewUrl = useMemo(
+    () => coverConfig.smart_cover_url || coverConfig.thumbnail_url || coverConfig.upload_url || "",
+    [coverConfig.smart_cover_url, coverConfig.thumbnail_url, coverConfig.upload_url],
+  )
+
   if (!open) return null
 
   return (
-    <div className="aa-modal-overlay" onClick={onClose}>
-      <div className="aa-modal" onClick={(e) => e.stopPropagation()} style={{ maxWidth: 480 }}>
-        <div className="aa-modal__header">
-          <span className="aa-modal__title">选择封面</span>
-          <button type="button" className="aa-modal__close" onClick={onClose} aria-label="关闭">
-            ×
-          </button>
+    <Modal
+      open={open}
+      onCancel={onClose}
+      title="选择封面"
+      width={560}
+      footer={
+        <div style={{ display: "flex", justifyContent: "flex-end", gap: 8 }}>
+          <Button buttonType="ghost" onClick={onClose}>
+            取消
+          </Button>
+          <Button buttonType="primary" onClick={onClose}>
+            确定
+          </Button>
         </div>
-        <div className="aa-modal__body" style={{ padding: 20 }}>
-          <PanelCoverAndGenerate
-            variant="select-cover"
-            coverConfig={coverConfig}
-            onCoverConfigChange={onCoverConfigChange}
-            renderJob={renderJob}
-            onGenerateRenderSmartCover={onGenerateRenderSmartCover}
-            onUploadCover={onUploadCover}
-            onClose={onClose}
-            onCoverSelected={onCoverSelected}
-          />
+      }
+    >
+      <div style={{ padding: "8px 0" }}>
+        {renderJob && (
+          <div
+            style={{
+              padding: "8px 12px",
+              background: "rgba(16, 185, 129, 0.08)",
+              borderRadius: 8,
+              marginBottom: 12,
+              fontSize: 13,
+              color: "var(--text-secondary, #666)",
+            }}
+          >
+            🎬 从渲染成片中智能选帧
+            {shared.selectedTemplateId && shared.selectedTemplateId !== "default" && (
+              <>
+                {" "}
+                · 当前模板：<strong>{shared.selectedTemplateName}</strong>
+              </>
+            )}
+          </div>
+        )}
+
+        <div
+          style={{
+            display: "flex",
+            gap: 12,
+            alignItems: "flex-start",
+          }}
+        >
+          {/* 左：封面预览 */}
+          <div
+            style={{
+              width: 180,
+              flexShrink: 0,
+            }}
+          >
+            <div
+              className="xx-ce-canvas"
+              style={{
+                position: "relative",
+                width: "100%",
+                aspectRatio: "9 / 16",
+                borderRadius: 8,
+                overflow: "hidden",
+                background: "linear-gradient(135deg, #1e3a8a 0%, #312e81 100%)",
+                border: previewUrl ? "none" : "1px dashed #d9d9d9",
+              }}
+            >
+              {previewUrl ? (
+                <img
+                  src={previewUrl}
+                  alt="封面预览"
+                  style={{
+                    width: "100%",
+                    height: "100%",
+                    objectFit: "cover",
+                  }}
+                />
+              ) : (
+                <div
+                  style={{
+                    position: "absolute",
+                    inset: 0,
+                    display: "flex",
+                    flexDirection: "column",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    color: "#fff",
+                    fontSize: 12,
+                    gap: 6,
+                    opacity: 0.7,
+                  }}
+                >
+                  <span style={{ fontSize: 28 }}>🖼️</span>
+                  <span>
+                    {isRenderCompleted ? "点击下方按钮生成/上传" : "视频生成后可选择封面"}
+                  </span>
+                </div>
+              )}
+              {shared.generating && (
+                <div
+                  style={{
+                    position: "absolute",
+                    inset: 0,
+                    background: "rgba(0,0,0,0.5)",
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    color: "#fff",
+                    fontSize: 12,
+                    flexDirection: "column",
+                    gap: 8,
+                  }}
+                >
+                  <Spin indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />} />
+                  <span>AI 选帧中…</span>
+                </div>
+              )}
+            </div>
+            <div
+              style={{
+                marginTop: 6,
+                textAlign: "center",
+                fontSize: 11,
+                color: "#8c8ca1",
+              }}
+            >
+              9:16 竖版封面
+            </div>
+          </div>
+
+          {/* 右：操作按钮 */}
+          <div style={{ flex: 1, display: "flex", flexDirection: "column", gap: 8 }}>
+            <Button
+              buttonType="primary"
+              onClick={() => void shared.generateAutoCover()}
+              disabled={!isRenderCompleted || shared.generating}
+              loading={shared.generating}
+              style={{ width: "100%" }}
+            >
+              ✨ 自动生成封面
+            </Button>
+            <Button
+              buttonType="ghost"
+              onClick={() => shared.setShowCoverSettings(true)}
+              style={{ width: "100%" }}
+            >
+              ⚙️ 封面模板
+            </Button>
+            <Button
+              buttonType="ghost"
+              onClick={shared.handleUploadClick}
+              disabled={!isRenderCompleted || shared.generating}
+              style={{ width: "100%" }}
+            >
+              📷 本地上传
+            </Button>
+            <input
+              ref={shared.uploadInputRef}
+              type="file"
+              accept="image/*"
+              style={{ display: "none" }}
+              onChange={shared.handleFileInputChange}
+            />
+            <div
+              style={{
+                fontSize: 11,
+                color: "#8c8ca1",
+                lineHeight: 1.5,
+                marginTop: 4,
+                padding: "6px 8px",
+                background: "#f7f8fa",
+                borderRadius: 6,
+              }}
+            >
+              💡 选择模板后点击"自动生成封面"会按模板样式渲染；"本地上传"使用本地图片作为封面。
+            </div>
+          </div>
         </div>
       </div>
-    </div>
+
+      {/* 模板选择弹窗 */}
+      <CoverSettingsModal
+        open={shared.showCoverSettings}
+        onClose={() => shared.setShowCoverSettings(false)}
+        templates={shared.templates}
+        loading={shared.templatesLoading}
+        error={shared.templatesError}
+        selectedTemplateId={shared.selectedTemplateId}
+        onSelectTemplate={shared.handleSelectTemplate}
+        onEditTemplate={shared.handleEditTemplate}
+        onDeleteTemplate={shared.handleDeleteTemplate}
+        onCreateNew={shared.handleCreateTemplate}
+      />
+
+      {/* 自定义编辑器弹窗 */}
+      <CoverEditorModal
+        open={shared.showCoverEditor}
+        onClose={() => shared.setShowCoverEditor(false)}
+        template={shared.editingTemplate}
+        onSave={shared.handleSaveTemplate}
+      />
+
+      {/* 自动生成 loading 兜底弹窗（shared.generating 时按钮已自带 loading，这里保险） */}
+      <AntModal open={shared.generating} closable={false} footer={null} centered width={320}>
+        <div style={{ textAlign: "center", padding: "24px 0" }}>
+          <Spin size="large" />
+          <p style={{ marginTop: 16, fontSize: 14, color: "#666" }}>
+            AI 正在从最终成片选帧，请稍候...
+          </p>
+        </div>
+      </AntModal>
+    </Modal>
   )
 }
 

apps/web/src/pages/ai-avatar/components/PanelCoverAndGenerate.tsx

@@ -1,36 +1,19 @@
 /**
- * AI数字人 — 面板5 / 封面选择弹窗内容：
- * - variant="setup"（默认）：分辨率 / 配置摘要 / 「开始生成视频」按钮，用于主页面步骤2配置阶段；
- *   渲染完成后仍内嵌封面预览与按钮，方便不打开弹窗直接操作。
- * - variant="select-cover"：只渲染封面选择区（智能获取封面 + 自定义上传 + 预览），
- *   用于 ModalCoverSelect 弹窗中；传 onClose 时底部显示「确定」按钮。
- *
- * 封面一律从最终成片（已叠加标题/B-roll）抽帧，本面板不再叠加标题。
+ * AI数字人 — 面板5 / 生成配置面板（渲染前）
+ * #2033 重构后：只保留 setup 变体（分辨率/配置摘要/生成按钮）
+ * 封面相关功能已迁移到 ModalCoverSelect（复用智能剪辑共享封面组件）
  */
-import React, { useRef, useState } from "react"
-import type { AiAvatarCoverConfig, RenderJob } from "../types"
-
-type PanelVariant = "setup" | "select-cover"
+import React from "react"
+import type { RenderJob } from "../types"
 
 interface PanelCoverAndGenerateProps {
-  variant?: PanelVariant
-  coverConfig: AiAvatarCoverConfig
-  onCoverConfigChange: (partial: Partial<AiAvatarCoverConfig>) => void
   resolution?: string
   onResolutionChange?: (r: string) => void
   isGenerating?: boolean
   onGenerate?: () => void
-  /** 当前渲染任务（渲染完成后才有 output_video_url，才能抽封面） */
+  /** 当前渲染任务 */
   renderJob: RenderJob | null
-  /** 从最终成片智能抽帧（参数 renderId），返回 { cover_url } */
-  onGenerateRenderSmartCover: (renderId: string) => Promise<{ cover_url: string; message?: string }>
-  /** 自定义上传封面（选择本地文件后由父组件处理实际上传） */
-  onUploadCover?: (file: File) => void
-  /** 弹窗关闭回调（传入则表示在弹窗中使用，底部显示「确定」按钮） */
-  onClose?: () => void
-  /** 封面选好（智能抽帧/自定义上传成功）后通知父组件，参数为封面 URL */
-  onCoverSelected?: (coverUrl: string) => void
-  /** 配置汇总信息（仅 variant="setup" 使用） */
+  /** 配置汇总信息 */
   summary?: {
     videoName: string | null
     voiceName: string | null
@@ -38,7 +21,6 @@ interface PanelCoverAndGenerateProps {
     lipsyncStatus: string | null
     brollCount: number
     hasTitle: boolean
-    /** 封面状态：'not_ready'(视频未生成) / 'pending'(视频生成了但未选) / 'selected'(已选) */
     coverStatus: "not_ready" | "pending" | "selected"
   }
 }
@@ -58,89 +40,15 @@ const LIPSYNC_STATUS_LABEL: Record<string, { text: string; cls: string }> = {
 }
 
 const PanelCoverAndGenerate: React.FC<PanelCoverAndGenerateProps> = ({
-  variant = "setup",
-  coverConfig,
-  onCoverConfigChange,
   resolution = "720p",
   onResolutionChange,
   isGenerating = false,
   onGenerate,
-  renderJob,
-  onGenerateRenderSmartCover,
-  onUploadCover,
-  onClose,
-  onCoverSelected,
+  renderJob: _renderJob,
   summary,
 }) => {
-  const uploadInputRef = useRef<HTMLInputElement>(null)
-  // 内部维护智能封面加载态（修复点 2 次 bug：不依赖外层异步 setState 顺序）
-  const [smartCoverLoading, setSmartCoverLoading] = useState(false)
-
-  /** 自定义上传封面 */
-  const handleUploadClick = () => {
-    uploadInputRef.current?.click()
-  }
-
-  const _applyCoverUrl = (url: string, mode: "upload" | "auto_frame") => {
-    const partial: Partial<AiAvatarCoverConfig> = {
-      mode,
-      thumbnail_url: url,
-    }
-    if (mode === "auto_frame") {
-      partial.smart_cover_url = url
-    } else {
-      partial.upload_url = url
-    }
-    onCoverConfigChange(partial)
-    onCoverSelected?.(url)
-  }
-
-  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0]
-    if (!file) return
-    if (onUploadCover) {
-      onUploadCover(file)
-      e.target.value = ""
-      return
-    }
-    // 本地预览兜底（实际上传由父级处理；blob URL 仅作本地展示）
-    const url = URL.createObjectURL(file)
-    _applyCoverUrl(url, "upload")
-    e.target.value = ""
-  }
-
-  /** 智能获取封面（从最终成片抽帧；必须等 render 完成） */
-  const handleSmartCover = async () => {
-    if (!renderJob || renderJob.status !== "completed" || !renderJob.id) return
-    setSmartCoverLoading(true)
-    try {
-      const res = await onGenerateRenderSmartCover(renderJob.id)
-      if (res.cover_url) {
-        _applyCoverUrl(res.cover_url, "auto_frame")
-      } else {
-        // 失败由父组件 message 提示，这里不重复弹窗
-        console.warn("[智能封面] 返回空 cover_url:", res.message)
-      }
-    } catch (err) {
-      console.error("[智能封面] 调用失败:", err)
-    } finally {
-      setSmartCoverLoading(false)
-    }
-  }
-
   const lipsync = summary?.lipsyncStatus ? LIPSYNC_STATUS_LABEL[summary.lipsyncStatus] : null
   const canGenerate = summary?.lipsyncStatus === "completed" && !isGenerating
-  // 渲染已完成 → 封面区可用
-  const isRenderCompleted = renderJob?.status === "completed"
-  const canSmartCover = isRenderCompleted && !smartCoverLoading
-
-  /** 封面图实际展示的 url：智能封面 > 自定义上传 > 空 */
-  const coverUrl =
-    coverConfig.smart_cover_url || coverConfig.thumbnail_url || coverConfig.upload_url
-  const hasCoverImage = Boolean(coverUrl)
-
-  /** 封面区占位文字 */
-  const coverPlaceholder = isRenderCompleted ? "暂无封面" : "视频生成后可选择封面"
 
   /** 配置摘要中的封面状态标签 */
   const coverSummaryNode = (() => {
@@ -154,69 +62,6 @@ const PanelCoverAndGenerate: React.FC<PanelCoverAndGenerateProps> = ({
     return <span className="aa-config-summary__empty">生成视频后可选</span>
   })()
 
-  // ── 封面选择区（两种 variant 共用） ─────────────────────────────────
-  const coverSection = (
-    <div className="aa-cover-section" style={{ marginTop: variant === "select-cover" ? 0 : 16 }}>
-      <div className="aa-label" style={{ marginBottom: 8 }}>
-        {variant === "select-cover" ? "选择封面" : "封面"}
-      </div>
-      {/* 封面预览（竖屏 9:16）——成片帧已经通过 Canvas PNG overlay 带有标题，直接展示原图即可 */}
-      <div className="aa-cover-preview" style={{ opacity: isRenderCompleted ? 1 : 0.5 }}>
-        {hasCoverImage ? (
-          <img src={coverUrl!} alt="封面预览" draggable={false} />
-        ) : (
-          <span className="aa-cover-preview__placeholder">{coverPlaceholder}</span>
-        )}
-        {smartCoverLoading && <div className="aa-cover-preview__loading">⏳ 智能选帧中…</div>}
-      </div>
-
-      <div className="aa-cover-actions">
-        <button
-          type="button"
-          className={`aa-btn aa-btn--ghost${coverConfig.mode === "auto_frame" ? " active" : ""}`}
-          onClick={handleSmartCover}
-          disabled={!canSmartCover}
-          title={isRenderCompleted ? "从成片智能选帧" : "请先生成视频"}
-        >
-          {smartCoverLoading ? "⏳ 智能选帧中…" : "🎬 智能获取封面"}
-        </button>
-        <button
-          type="button"
-          className={`aa-btn aa-btn--ghost${coverConfig.mode === "upload" ? " active" : ""}`}
-          onClick={handleUploadClick}
-          disabled={!isRenderCompleted || smartCoverLoading}
-          title={isRenderCompleted ? "自定义上传封面" : "请先生成视频"}
-        >
-          📷 自定义上传
-        </button>
-        <input
-          ref={uploadInputRef}
-          type="file"
-          accept="image/*"
-          style={{ display: "none" }}
-          onChange={handleFileChange}
-        />
-      </div>
-    </div>
-  )
-
-  // ── select-cover 变体：只渲染封面区 + 弹窗确定按钮 ──
-  if (variant === "select-cover") {
-    return (
-      <div className="aa-cover-generate">
-        {coverSection}
-        {onClose && (
-          <div style={{ marginTop: 16, display: "flex", justifyContent: "flex-end" }}>
-            <button type="button" className="aa-btn aa-btn--primary" onClick={onClose}>
-              确定
-            </button>
-          </div>
-        )}
-      </div>
-    )
-  }
-
-  // ── setup 变体：分辨率 / 配置摘要 / 生成按钮（渲染完成后内嵌封面区） ──
   return (
     <div className="aa-cover-generate">
       {/* 分辨率选择 */}

apps/web/src/pages/ai-avatar/components/PanelLipsyncPreview.tsx

@@ -29,15 +29,7 @@ function formatTime(seconds: number): string {
   return `${m}:${s.toString().padStart(2, "0")}`
 }
 
-/** 字体名 → CSS font-family 映射（与 titleCanvas 字体链对齐） */
-const FONT_FAMILY_MAP: Record<string, string> = {
-  思源黑体:
-    "'Noto Sans CJK SC', 'Source Han Sans CN', 'PingFang SC', 'Microsoft YaHei', sans-serif",
-  思源宋体: "'Noto Serif SC', 'Source Han Serif SC', 'SimSun', serif",
-  楷体: "KaiTi, 'STKaiti', serif",
-  黑体: "'Heiti SC', 'SimHei', 'Microsoft YaHei', sans-serif",
-}
-const getFontFamily = (font: string): string => FONT_FAMILY_MAP[font] || FONT_FAMILY_MAP["思源黑体"]
+import { getFontFamily as getFontFamilyByKey } from "@/components/title/constants"
 
 export function PanelLipsyncPreview({
   lipsyncJob,
@@ -83,63 +75,105 @@ export function PanelLipsyncPreview({
   const previewScale = containerWidth > 0 ? containerWidth / 720 : 0.35
   const ps = useCallback((v: number) => Math.round(v * previewScale * 100) / 100, [previewScale])
 
-  /** 标题叠加样式（字号/padding/描边/阴影均按 previewScale 缩放，保持与成片视觉一致） */
-  const titleOverlayStyle: React.CSSProperties | null =
+  /** 标题叠加样式（新字段全支持：描边宽色/阴影参数化/背景块/行距/顶部边距/自动换行） */
+  const titleOverlayData =
     titleConfig?.title && containerWidth > 0
       ? (() => {
+          const c = titleConfig as AiAvatarTitleConfig & {
+            stroke_width?: number
+            stroke_color?: string
+            shadow_offset_x?: number
+            shadow_offset_y?: number
+            shadow_blur?: number
+            shadow_color?: string
+            line_height?: number
+            margin_top?: number
+            max_chars_per_line?: number
+            bg_enabled?: boolean
+            bg_color?: string
+            bg_padding?: number
+            bg_radius?: number
+            cover_title_config?: Record<string, unknown> | null
+            line_overrides?: unknown[]
+          }
           const baseSize = titleConfig.size || 48
           const fontSize = ps(baseSize)
-          // 描边宽度基准 ≈ size * 0.06，最小 1.5px @720p
-          const strokeW = Math.max(ps(1.5), +(baseSize * 0.06 * previewScale).toFixed(2))
-          // 阴影按比例缩放
-          const shadowBlur = ps(4)
-          const shadowOffsetY = ps(2)
-          // padding / top 边距按比例（基准 8px 对应预览小窗，成片基准 16px，这里 8px 对应约 0.33 缩放）
-          const padV = ps(16) * 0.5 // ≈ 8px in ~240px container
-          const padH = ps(24) * 0.5
-
+          const strokeW = c.stroke ? ps(c.stroke_width ?? 4) : 0
+          const strokeC = c.stroke_color || "#000000"
+          const shBlur = ps(c.shadow_blur ?? 4)
+          const shOffX = ps(c.shadow_offset_x ?? 2)
+          const shOffY = ps(c.shadow_offset_y ?? 2)
+          const shColor = c.shadow_color || "rgba(0,0,0,0.8)"
+          const lh = c.line_height ?? 1.2
+          const mTop = ps(c.margin_top ?? 24)
+          const bgPad = ps(c.bg_padding ?? 12)
+          const bgR = ps(c.bg_radius ?? 8)
+          const maxChars = c.max_chars_per_line ?? 0
+          const rawText = titleConfig.title || ""
+          const lines = (() => {
+            const manual = rawText
+              .split(/[/／]/)
+              .map((l) => l.trim())
+              .filter(Boolean)
+            if (!maxChars || maxChars <= 0) return manual
+            const out: string[] = []
+            manual.forEach((seg) => {
+              for (let i = 0; i < seg.length; i += maxChars) out.push(seg.slice(i, i + maxChars))
+            })
+            return out
+          })()
+          const padV = ps(16) * 0.5
+          const textShadow = titleConfig.shadow
+            ? `${shOffX}px ${shOffY}px ${shBlur}px ${shColor}`
+            : undefined
           const style: React.CSSProperties = {
             position: "absolute",
             color: titleConfig.color || "#ffffff",
-            fontFamily: getFontFamily(titleConfig.font || "思源黑体"),
+            fontFamily: getFontFamilyByKey(titleConfig.font || "source_sans_sc"),
             fontSize: `${fontSize}px`,
             fontWeight: titleConfig.bold ? 700 : 400,
             fontStyle: titleConfig.italic ? "italic" : "normal",
             textAlign: "center",
-            width: "90%",
-            lineHeight: 1.2,
-            padding: `${ps(4)}px ${padH}px`,
-            textShadow: titleConfig.shadow
-              ? `0 ${shadowOffsetY}px ${shadowBlur}px rgba(0,0,0,0.8), 0 0 ${ps(2)}px rgba(0,0,0,0.5)`
-              : undefined,
-            WebkitTextStroke: titleConfig.stroke ? `${strokeW}px #000` : undefined,
-            boxSizing: "border-box",
-            wordBreak: "break-word",
+            lineHeight: lh,
+            WebkitTextStroke:
+              titleConfig.stroke && strokeW > 0 ? `${strokeW}px ${strokeC}` : undefined,
+            paintOrder: "stroke fill",
+            textShadow,
             whiteSpace: "pre-wrap",
+            padding: c.bg_enabled ? `${bgPad}px ${bgPad}px` : 0,
+            background: c.bg_enabled ? c.bg_color || "rgba(0,0,0,0.5)" : "transparent",
+            borderRadius: c.bg_enabled ? `${bgR}px` : 0,
+            boxSizing: "border-box",
+            display: "inline-block",
+            maxWidth: "94%",
+          }
+          const wrap: React.CSSProperties = {
+            position: "absolute",
+            left: "50%",
+            width: "100%",
+            display: "flex",
+            justifyContent: "center",
+            pointerEvents: onTitlePositionChange ? "auto" : "none",
           }
-
           if (
             titleConfig.position === "custom" &&
             titleConfig.pos_x != null &&
             titleConfig.pos_y != null
           ) {
-            style.left = `${titleConfig.pos_x}%`
-            style.top = `${titleConfig.pos_y}%`
-            style.transform = "translateX(-50%) translateY(-50%)"
+            wrap.left = `${titleConfig.pos_x}%`
+            wrap.top = `${titleConfig.pos_y}%`
+            wrap.transform = "translate(-50%, -50%)"
           } else if (titleConfig.position === "top") {
-            style.left = "50%"
-            style.top = padV
-            style.transform = "translateX(-50%)"
+            wrap.top = `${padV + mTop}px`
+            wrap.transform = "translateX(-50%)"
           } else if (titleConfig.position === "bottom") {
-            style.left = "50%"
-            style.bottom = padV
-            style.transform = "translateX(-50%)"
+            wrap.bottom = `${padV}px`
+            wrap.transform = "translateX(-50%)"
           } else {
-            style.left = "50%"
-            style.top = "50%"
-            style.transform = "translateX(-50%) translateY(-50%)"
+            wrap.top = "50%"
+            wrap.transform = "translate(-50%, -50%)"
           }
-          return style
+          return { style, wrap, lines }
         })()
       : null
 
@@ -252,25 +286,23 @@ export function PanelLipsyncPreview({
           {isDone && lipsyncJob?.output_video_url ? (
             <div style={{ position: "relative", width: "100%", height: "100%" }}>
               <video src={lipsyncJob.output_video_url} controls />
-              {titleOverlayStyle && (
+              {titleOverlayData && (
                 <div
                   ref={titleDragRef}
                   style={{
-                    ...titleOverlayStyle,
+                    ...titleOverlayData.wrap,
                     cursor: onTitlePositionChange ? "grab" : "default",
-                    pointerEvents: onTitlePositionChange ? "auto" : "none",
                   }}
                   onPointerDown={handleTitlePointerDown}
                   onPointerMove={handleTitlePointerMove}
                   onPointerUp={handleTitlePointerUp}
                   onPointerCancel={handleTitlePointerUp}
                 >
-                  {titleConfig!.title.split(/[/／]/).map((part, i) => (
-                    <span key={i}>
-                      {i > 0 && <br />}
-                      {part}
-                    </span>
-                  ))}
+                  <div style={titleOverlayData.style}>
+                    {titleOverlayData.lines.map((part: string, i: number) => (
+                      <div key={i}>{part}</div>
+                    ))}
+                  </div>
                 </div>
               )}
             </div>

apps/web/src/pages/ai-avatar/components/PanelTitleConfig.tsx

@@ -10,10 +10,13 @@
 import React, { useMemo, useState, useEffect } from "react"
 import { Input } from "antd"
 import TitleStylePanel from "@/pages/generate/components/title/TitleStylePanel"
+import type { TitleTemplate } from "@/components/title/template-types"
+
 import TitleLibraryAutoComplete from "@/pages/generate/components/title/TitleLibraryAutoComplete"
 import type { TitleOption } from "@/pages/generate/components/title/TitleLibraryAutoComplete"
 import type { TitleSettings } from "@/pages/generate/types"
-import { POSITION_OPTIONS, FONT_OPTIONS, TITLE_PRESETS } from "@/pages/generate/constants"
+import { POSITION_OPTIONS } from "@/pages/generate/constants"
+import { FONT_OPTIONS, TITLE_PRESETS } from "@/components/title/constants"
 import type { AiAvatarTitleConfig } from "../types"
 // #1894: 标题数据源切换到文案库，取 script.title 作为候选
 import { getScripts } from "@/api/scripts"
@@ -28,6 +31,7 @@ interface PanelTitleConfigProps {
 const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpdate }) => {
   /** TitleStylePanel 内部高亮的预设 key（面板本地状态） */
   const [activePreset, setActivePreset] = useState<string | null>(null)
+  const [selectedTemplateId, setSelectedTemplateId] = useState<string | null>(null)
 
   /** 标题库选项（#1894：从文案库 scripts[].title 取候选） */
   const [titleOptions, setTitleOptions] = useState<TitleOption[]>([])
@@ -49,9 +53,60 @@ const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpda
       .catch(() => setTitleOptions([]))
   }, [])
 
-  /** AiAvatarTitleConfig → TitleSettings（补齐 aiAutoSelect / 自由坐标字段） */
-  const titleSettings: TitleSettings = useMemo(
-    () => ({
+  /** AiAvatarTitleConfig (snake_case) → TitleSettings (camelCase) */
+  const titleSettings: TitleSettings = useMemo(() => {
+    const c = titleConfig as AiAvatarTitleConfig & {
+      stroke_width?: number
+      stroke_color?: string
+      shadow_offset_x?: number
+      shadow_offset_y?: number
+      shadow_blur?: number
+      shadow_color?: string
+      line_height?: number
+      margin_top?: number
+      max_chars_per_line?: number
+      bg_enabled?: boolean
+      bg_color?: string
+      bg_padding?: number
+      bg_radius?: number
+      cover_title_config?: {
+        title?: string
+        font?: string
+        size?: number
+        font_size?: number
+        color?: string
+        font_color?: string
+        bold?: boolean
+        italic?: boolean
+        position?: string
+        stroke?: { enabled: boolean; width?: number; color?: string } | boolean
+        stroke_width?: number
+        stroke_color?: string
+        shadow?:
+          | {
+              enabled: boolean
+              offset_x?: number
+              offset_y?: number
+              blur?: number
+              color?: string
+            }
+          | boolean
+        shadow_offset_x?: number
+        shadow_offset_y?: number
+        shadow_blur?: number
+        shadow_color?: string
+        background?: { enabled: boolean; color?: string; padding?: number; radius?: number }
+        bg_enabled?: boolean
+        bg_color?: string
+        bg_padding?: number
+        bg_radius?: number
+        line_height?: number
+        margin_top?: number
+        max_chars_per_line?: number
+      } | null
+      line_overrides?: unknown[]
+    }
+    return {
       aiAutoSelect: false,
       title: titleConfig.title,
       position: titleConfig.position,
@@ -64,21 +119,250 @@ const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpda
       color: titleConfig.color,
       posX: null,
       posY: null,
-    }),
-    [titleConfig],
-  )
+      lineHeight: c.line_height ?? 1.2,
+      marginTop: c.margin_top ?? 24,
+      maxCharsPerLine: c.max_chars_per_line ?? 0,
+      strokeWidth: c.stroke_width ?? 4,
+      strokeColor: c.stroke_color ?? "#000000",
+      shadowOffsetX: c.shadow_offset_x ?? 2,
+      shadowOffsetY: c.shadow_offset_y ?? 2,
+      shadowBlur: c.shadow_blur ?? 4,
+      shadowColor: c.shadow_color ?? "rgba(0,0,0,0.8)",
+      bgEnabled: !!c.bg_enabled,
+      bgColor: c.bg_color ?? "rgba(0,0,0,0.5)",
+      bgPadding: c.bg_padding ?? 12,
+      bgRadius: c.bg_radius ?? 8,
+      lineOverrides: Array.isArray(c.line_overrides) ? c.line_overrides : [],
+      coverTitle: (() => {
+        const ct = c.cover_title_config as
+          | null
+          | (AiAvatarTitleConfig & {
+              font_size?: number
+              font_color?: string
+              stroke?: { enabled?: boolean; width?: number; color?: string } | boolean
+              stroke_width?: number
+              stroke_color?: string
+              shadow?:
+                | {
+                    enabled?: boolean
+                    offset_x?: number
+                    offset_y?: number
+                    blur?: number
+                    color?: string
+                  }
+                | boolean
+              shadow_offset_x?: number
+              shadow_offset_y?: number
+              shadow_blur?: number
+              shadow_color?: string
+              background?: { enabled?: boolean; color?: string; padding?: number; radius?: number }
+              bg_enabled?: boolean
+              bg_color?: string
+              bg_padding?: number
+              bg_radius?: number
+            })
+        if (!ct) return null
+        const ctStroke = ct.stroke as
+          { enabled?: boolean; width?: number; color?: string } | boolean | undefined
+        const ctShadow = ct.shadow as
+          | {
+              enabled?: boolean
+              offset_x?: number
+              offset_y?: number
+              blur?: number
+              color?: string
+            }
+          | boolean
+          | undefined
+        const ctBg = ct.background as
+          { enabled?: boolean; color?: string; padding?: number; radius?: number } | undefined
+        return {
+          title: ct.title,
+          font: ct.font,
+          size: ct.font_size ?? ct.size,
+          color: ct.font_color ?? ct.color,
+          bold: ct.bold,
+          italic: ct.italic,
+          position: ct.position,
+          stroke:
+            typeof ctStroke === "object" && ctStroke ? ctStroke.enabled !== false : !!ctStroke,
+          strokeWidth:
+            (typeof ctStroke === "object" && ctStroke ? ctStroke.width : undefined) ??
+            ct.stroke_width ??
+            4,
+          strokeColor:
+            (typeof ctStroke === "object" && ctStroke ? ctStroke.color : undefined) ??
+            ct.stroke_color ??
+            "#000000",
+          shadow:
+            typeof ctShadow === "object" && ctShadow ? ctShadow.enabled !== false : !!ctShadow,
+          shadowOffsetX:
+            (typeof ctShadow === "object" && ctShadow ? ctShadow.offset_x : undefined) ??
+            ct.shadow_offset_x ??
+            2,
+          shadowOffsetY:
+            (typeof ctShadow === "object" && ctShadow ? ctShadow.offset_y : undefined) ??
+            ct.shadow_offset_y ??
+            2,
+          shadowBlur:
+            (typeof ctShadow === "object" && ctShadow ? ctShadow.blur : undefined) ??
+            ct.shadow_blur ??
+            4,
+          shadowColor:
+            (typeof ctShadow === "object" && ctShadow ? ctShadow.color : undefined) ??
+            ct.shadow_color ??
+            "rgba(0,0,0,0.8)",
+          bgEnabled: ctBg?.enabled ?? !!ct.bg_enabled,
+          bgColor: ctBg?.color ?? ct.bg_color ?? "rgba(0,0,0,0.5)",
+          bgPadding: ctBg?.padding ?? ct.bg_padding ?? 12,
+          bgRadius: ctBg?.radius ?? ct.bg_radius ?? 8,
+        }
+      })(),
+    }
+  }, [titleConfig])
 
-  /** 应用预设：与智能剪辑一致，只覆盖 color/bold/italic/stroke/shadow，不改变字号 */
+  /** 应用预设：覆盖新细粒度字段（颜色/描边/阴影/字号/字体等） */
   const handleApplyPreset = (presetKey: string) => {
     const preset = TITLE_PRESETS.find((p) => p.key === presetKey)
     if (!preset) return
     setActivePreset(presetKey)
+    const st = preset.style || {}
     onUpdate({
-      color: preset.style.color,
-      bold: preset.style.bold,
-      italic: preset.style.italic,
-      stroke: preset.style.stroke,
-      shadow: preset.style.shadow,
+      font: st.font,
+      size: st.size,
+      color: st.color,
+      bold: st.bold,
+      italic: st.italic,
+      stroke: st.stroke,
+      stroke_width: st.stroke_width,
+      stroke_color: st.stroke_color,
+      shadow: st.shadow,
+      shadow_offset_x: st.shadow_offset_x,
+      shadow_offset_y: st.shadow_offset_y,
+      shadow_blur: st.shadow_blur,
+      shadow_color: st.shadow_color,
+      bg_enabled: st.bg_enabled,
+      bg_color: st.bg_color,
+      bg_padding: st.bg_padding,
+      bg_radius: st.bg_radius,
+      line_overrides: [],
+      cover_title_config: null,
+    })
+  }
+
+  /** 字段 patch 透传：TitleStylePanel 的 onUpdateStyle（camelCase → snake_case） */
+  const handleUpdateStyle = (patch: Partial<TitleSettings>) => {
+    const snake: Record<string, unknown> = {}
+    const map: Record<string, string> = {
+      lineHeight: "line_height",
+      marginTop: "margin_top",
+      maxCharsPerLine: "max_chars_per_line",
+      strokeWidth: "stroke_width",
+      strokeColor: "stroke_color",
+      shadowOffsetX: "shadow_offset_x",
+      shadowOffsetY: "shadow_offset_y",
+      shadowBlur: "shadow_blur",
+      shadowColor: "shadow_color",
+      bgEnabled: "bg_enabled",
+      bgColor: "bg_color",
+      bgPadding: "bg_padding",
+      bgRadius: "bg_radius",
+      lineOverrides: "line_overrides",
+      coverTitle: "cover_title_config",
+    }
+    Object.entries(patch).forEach(([k, v]) => {
+      if (k === "coverTitle" && v && typeof v === "object") {
+        const ct = v as {
+          title?: string
+          font?: string
+          size?: number
+          color?: string
+          bold?: boolean
+          italic?: boolean
+          position?: string
+          stroke?: boolean
+          strokeWidth?: number
+          strokeColor?: string
+          shadow?: boolean
+          shadowOffsetX?: number
+          shadowOffsetY?: number
+          shadowBlur?: number
+          shadowColor?: string
+          bgEnabled?: boolean
+          bgColor?: string
+          bgPadding?: number
+          bgRadius?: number
+          lineHeight?: number
+          marginTop?: number
+          maxCharsPerLine?: number
+        }
+        snake.cover_title_config = {
+          title: ct.title,
+          font: ct.font,
+          font_size: ct.size,
+          font_color: ct.color,
+          bold: ct.bold,
+          italic: ct.italic,
+          position: ct.position,
+          stroke: ct.stroke
+            ? { enabled: true, width: ct.strokeWidth ?? 4, color: ct.strokeColor ?? "#000" }
+            : { enabled: false },
+          shadow: ct.shadow
+            ? {
+                enabled: true,
+                offset_x: ct.shadowOffsetX ?? 2,
+                offset_y: ct.shadowOffsetY ?? 2,
+                blur: ct.shadowBlur ?? 4,
+                color: ct.shadowColor ?? "rgba(0,0,0,0.8)",
+              }
+            : { enabled: false },
+          background: ct.bgEnabled
+            ? { enabled: true, color: ct.bgColor, padding: ct.bgPadding, radius: ct.bgRadius }
+            : { enabled: false },
+          line_height: ct.lineHeight,
+          margin_top: ct.marginTop,
+          max_chars_per_line: ct.maxCharsPerLine,
+        }
+      } else if (map[k]) {
+        snake[map[k]] = v
+      } else {
+        snake[k] = v
+      }
+    })
+    onUpdate(snake)
+  }
+
+  /** 应用模板（来自内联网格 onApplyTemplate）：camelCase TitleSettings → snake_case AiAvatarTitleConfig */
+  const handleApplyTemplate = (settings: TitleSettings, tpl: TitleTemplate) => {
+    setActivePreset(null)
+    setSelectedTemplateId(tpl.id)
+    onUpdate({
+      title: titleConfig.title,
+      font: settings.font,
+      size: settings.size,
+      color: settings.color,
+      bold: settings.bold,
+      italic: settings.italic,
+      position: settings.position,
+      stroke: settings.stroke,
+      stroke_width: settings.strokeWidth,
+      stroke_color: settings.strokeColor,
+      shadow: settings.shadow,
+      shadow_offset_x: settings.shadowOffsetX,
+      shadow_offset_y: settings.shadowOffsetY,
+      shadow_blur: settings.shadowBlur,
+      shadow_color: settings.shadowColor,
+      bg_enabled: settings.bgEnabled,
+      bg_color: settings.bgColor,
+      bg_padding: settings.bgPadding,
+      bg_radius: settings.bgRadius,
+      line_height: settings.lineHeight,
+      margin_top: settings.marginTop,
+      max_chars_per_line: settings.maxCharsPerLine,
+      line_overrides: [],
+      pos_x: settings.posX ?? undefined,
+      pos_y: settings.posY ?? undefined,
+      cover_title_config: null,
     })
   }
 
@@ -125,8 +409,16 @@ const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpda
         onToggleStroke={() => onUpdate({ stroke: !titleConfig.stroke })}
         onToggleShadow={() => onUpdate({ shadow: !titleConfig.shadow })}
         onApplyPreset={handleApplyPreset}
+        onUpdateStyle={handleUpdateStyle}
+        showCoverToggle
+        previewWidth={280}
+        enableTemplates={false}
+        selectedTemplateId={selectedTemplateId}
+        onApplyTemplate={handleApplyTemplate}
         activePreset={activePreset}
-        titlePresets={TITLE_PRESETS}
+        titlePresets={
+          TITLE_PRESETS as unknown as React.ComponentProps<typeof TitleStylePanel>["titlePresets"]
+        }
         POSITION_OPTIONS={POSITION_OPTIONS}
         FONT_OPTIONS={FONT_OPTIONS}
       />

apps/web/src/pages/ai-avatar/components/PanelVoiceSelector.tsx

@@ -1,18 +1,17 @@
 /**
  * AI数字人 — 配音库面板（面板3）
- * 音色来源切换（系统预设 / 我的音色）、音色选择与试听、情绪/语速/语言参数
+ * 音色来源切换（系统预设 / 我的音色）、音色选择与试听、风格/语速/语言参数
  */
 import { useEffect, useRef, useState } from "react"
 import { message } from "antd"
 import { fetchVoices } from "@/api/voices/voices"
 import { previewTts } from "@/api/tts"
-import { normalizeEmotion } from "../utils/contract"
+import TtsStyleSelector from "@/components/voice/TtsStyleSelector"
+import type { TtsStyle } from "@/api/tts/styles"
 import type { UnifiedVoiceItem } from "@/api/voices/types"
 import {
   type VoiceSource,
-  type VoiceEmotion,
   type VoiceLanguage,
-  VOICE_EMOTION_OPTIONS,
   PRESET_VOICE_LANGUAGE_OPTIONS,
   CLONE_VOICE_LANGUAGE_OPTIONS,
 } from "../types"
@@ -22,8 +21,8 @@ interface PanelVoiceSelectorProps {
   onVoiceSourceChange: (source: VoiceSource) => void
   selectedVoice: UnifiedVoiceItem | null
   onSelectVoice: (voice: UnifiedVoiceItem) => void
-  emotion: VoiceEmotion
-  onEmotionChange: (e: VoiceEmotion) => void
+  style: TtsStyle
+  onStyleChange: (s: TtsStyle) => void
   speed: number
   onSpeedChange: (s: number) => void
   language: VoiceLanguage
@@ -35,8 +34,8 @@ export function PanelVoiceSelector({
   onVoiceSourceChange,
   selectedVoice,
   onSelectVoice,
-  emotion,
-  onEmotionChange,
+  style,
+  onStyleChange,
   speed,
   onSpeedChange,
   language,
@@ -139,31 +138,30 @@ export function PanelVoiceSelector({
     /* 克隆音色：preview_url/audio_url 通常为空，需走 POST /tts/preview
      * 现合成示例文案再播放，对齐配音库 useAudioPlayer 行为 */
     if (voice.type === "clone") {
-      const cached = previewCacheRef.current.get(voice.voice_clone_profile_id || voice.id)
+      const cacheKey = `${voice.voice_clone_profile_id || voice.id}::${style}`
+      const cached = previewCacheRef.current.get(cacheKey)
       if (cached) {
         playAudioUrl(voice.id, cached)
         return
       }
       const targetId = voice.voice_clone_profile_id || voice.id
-      // DEBUG: 打印请求参数，帮助定位 /tts/preview 失败原因
       setPreviewingId(voice.id)
       try {
         const res = await previewTts({
           text: VOICE_PREVIEW_TEXT,
           voice_id: targetId,
           speed: speed, // 透传用户选择的语速（#1822）
-          emotion: normalizeEmotion(emotion), // 情绪中文→英文枚举
+          style,
         })
         if (!res.audio_url) {
           setPreviewingId(null)
           message.error("合成试听失败：未返回音频")
           return
         }
-        previewCacheRef.current.set(targetId, res.audio_url)
+        previewCacheRef.current.set(cacheKey, res.audio_url)
         playAudioUrl(voice.id, res.audio_url)
       } catch (err) {
         setPreviewingId(null)
-        // DEBUG: 打印详细错误信息
         console.error("[AI数字人-克隆试听] previewTts 失败:", {
           status: (err as { response?: { status?: number } })?.response?.status,
           data: (err as { response?: { data?: unknown } })?.response?.data,
@@ -272,23 +270,6 @@ export function PanelVoiceSelector({
       {/* 配音参数 */}
       <div className="aa-voice-params">
         <div className="aa-voice-params__row">
-          <div className="aa-voice-params__field">
-            <label className="aa-label" htmlFor="aa-voice-emotion">
-              情绪
-            </label>
-            <select
-              id="aa-voice-emotion"
-              className="aa-select"
-              value={emotion}
-              onChange={(e) => onEmotionChange(e.target.value as VoiceEmotion)}
-            >
-              {VOICE_EMOTION_OPTIONS.map((opt) => (
-                <option key={opt.value} value={opt.value}>
-                  {opt.label}
-                </option>
-              ))}
-            </select>
-          </div>
           <div className="aa-voice-params__field">
             <label className="aa-label" htmlFor="aa-voice-language">
               语言
@@ -324,6 +305,9 @@ export function PanelVoiceSelector({
             onChange={(e) => handleSpeedChange(e.target.value)}
           />
         </div>
+        <div className="aa-voice-params__field">
+          <TtsStyleSelector value={style} onChange={onStyleChange} compact />
+        </div>
       </div>
     </div>
   )

apps/web/src/pages/ai-avatar/hooks/useAiAvatar.ts

@@ -6,7 +6,6 @@ import type { AssetItem } from "@/api/assets"
 import type { UnifiedVoiceItem } from "@/api/voices/types"
 import {
   type VoiceSource,
-  type VoiceEmotion,
   type VoiceLanguage,
   type Script,
   type LipsyncJob,
@@ -17,6 +16,7 @@ import {
   DEFAULT_TITLE_CONFIG,
   DEFAULT_COVER_CONFIG,
 } from "../types"
+import { DEFAULT_TTS_STYLE, type TtsStyle } from "@/api/tts/styles"
 
 const DEFAULT_TTS_PREVIEW: TtsPreviewResult = {
   audioUrl: null,
@@ -34,7 +34,7 @@ export function useAiAvatar() {
   /* ── 面板2：配音库 ── */
   const [voiceSource, setVoiceSource] = useState<VoiceSource>("preset")
   const [selectedVoice, setSelectedVoice] = useState<UnifiedVoiceItem | null>(null)
-  const [emotion, setEmotion] = useState<VoiceEmotion>("neutral")
+  const [style, setStyle] = useState<TtsStyle>(DEFAULT_TTS_STYLE)
   const [speed, setSpeed] = useState(1.0)
   const [language, setLanguage] = useState<VoiceLanguage>("zh")
 
@@ -113,8 +113,8 @@ export function useAiAvatar() {
     setVoiceSource,
     selectedVoice,
     setSelectedVoice,
-    emotion,
-    setEmotion,
+    style,
+    setStyle,
     speed,
     setSpeed,
     language,

apps/web/src/pages/ai-avatar/types.ts

@@ -100,7 +100,7 @@ export interface BRollSegment {
   pip_scale: number
 }
 
-/* ── 标题配置 ── */
+/* ── 标题配置（#2001 升级：细粒度描边/阴影/背景/排版/逐行/封面独立标题） ── */
 export interface AiAvatarTitleConfig {
   title: string
   position: string
@@ -115,6 +115,42 @@ export interface AiAvatarTitleConfig {
   /** 自定义位置坐标（position=custom 时生效，百分比 0-100） */
   pos_x?: number
   pos_y?: number
+
+  /* ── 排版 ── */
+  line_height: number
+  margin_top: number
+  max_chars_per_line: number
+
+  /* ── 描边参数化 ── */
+  stroke_width: number
+  stroke_color: string
+
+  /* ── 阴影参数化 ── */
+  shadow_offset_x: number
+  shadow_offset_y: number
+  shadow_blur: number
+  shadow_color: string
+
+  /* ── 背景色块 ── */
+  bg_enabled: boolean
+  bg_color: string
+  bg_padding: number
+  bg_radius: number
+
+  /* ── 逐行覆盖 ── */
+  line_overrides: Array<{
+    line_index: number
+    text?: string
+    size?: number
+    color?: string
+    bold?: boolean
+    italic?: boolean
+    stroke?: boolean
+    highlights?: Array<{ word: string; color?: string; bold?: boolean; scale?: number }>
+  }>
+
+  /* ── 封面独立标题（null=沿用主标题） ── */
+  cover_title_config: null | Partial<AiAvatarTitleConfig>
 }
 
 /* ── 封面配置 ── */
@@ -149,12 +185,27 @@ export const DEFAULT_TITLE_CONFIG: AiAvatarTitleConfig = {
   size: 48,
   bold: true,
   italic: false,
-  stroke: false,
+  stroke: true,
   shadow: false,
   color: "#ffffff",
   auto_subtitle: true,
   pos_x: undefined,
   pos_y: undefined,
+  line_height: 1.2,
+  margin_top: 24,
+  max_chars_per_line: 0,
+  stroke_width: 4,
+  stroke_color: "#000000",
+  shadow_offset_x: 2,
+  shadow_offset_y: 2,
+  shadow_blur: 4,
+  shadow_color: "rgba(0,0,0,0.8)",
+  bg_enabled: false,
+  bg_color: "rgba(0,0,0,0.5)",
+  bg_padding: 12,
+  bg_radius: 8,
+  line_overrides: [],
+  cover_title_config: null,
 }
 
 export const DEFAULT_COVER_CONFIG: AiAvatarCoverConfig = {

apps/web/src/pages/ai-avatar/utils/contract.ts

@@ -67,6 +67,37 @@ export function buildTitleConfigPayload(
   const text = (cfg.title || "").trim()
   if (!text) return {}
   const position = cfg.position || "bottom"
+  const anyCfg = cfg as AiAvatarTitleConfig & {
+    stroke_width?: number
+    stroke_color?: string
+    shadow_offset_x?: number
+    shadow_offset_y?: number
+    shadow_blur?: number
+    shadow_color?: string
+    line_height?: number
+    margin_top?: number
+    max_chars_per_line?: number
+    bg_enabled?: boolean
+    bg_color?: string
+    bg_padding?: number
+    bg_radius?: number
+    line_overrides?: unknown[]
+    cover_title_config?: Record<string, unknown> | null
+  }
+  const strokeWidth = anyCfg.stroke_width != null ? anyCfg.stroke_width : 4
+  const strokeColor = anyCfg.stroke_color || "#000000"
+  const shadowOffsetX = anyCfg.shadow_offset_x != null ? anyCfg.shadow_offset_x : 2
+  const shadowOffsetY = anyCfg.shadow_offset_y != null ? anyCfg.shadow_offset_y : 2
+  const shadowBlur = anyCfg.shadow_blur != null ? anyCfg.shadow_blur : 4
+  const shadowColor = anyCfg.shadow_color || "rgba(0,0,0,0.8)"
+  const lineHeight = anyCfg.line_height != null ? anyCfg.line_height : 1.2
+  const marginTop = anyCfg.margin_top != null ? anyCfg.margin_top : 24
+  const maxCharsPerLine = anyCfg.max_chars_per_line ?? 0
+  const bgEnabled = !!anyCfg.bg_enabled
+  const bgColor = anyCfg.bg_color || "rgba(0,0,0,0.5)"
+  const bgPadding = anyCfg.bg_padding != null ? anyCfg.bg_padding : 12
+  const bgRadius = anyCfg.bg_radius != null ? anyCfg.bg_radius : 8
+
   const payload: Record<string, unknown> = {
     text,
     enabled: true,
@@ -75,16 +106,68 @@ export function buildTitleConfigPayload(
     font_color: cfg.color || "#ffffff",
     position,
     bold: !!cfg.bold,
-    stroke: cfg.stroke ? { enabled: true, width: 2, color: "#000000" } : { enabled: false },
-    shadow: cfg.shadow
-      ? { enabled: true, color: "#000000", offset_x: 2, offset_y: 2 }
+    italic: !!cfg.italic,
+    stroke: cfg.stroke
+      ? { enabled: true, width: strokeWidth, color: strokeColor }
       : { enabled: false },
+    shadow: cfg.shadow
+      ? {
+          enabled: true,
+          color: shadowColor,
+          offset_x: shadowOffsetX,
+          offset_y: shadowOffsetY,
+          blur: shadowBlur,
+        }
+      : { enabled: false },
+    line_height: lineHeight,
+    margin_top: marginTop,
+    max_chars_per_line: maxCharsPerLine,
+    background: bgEnabled
+      ? { enabled: true, color: bgColor, padding: bgPadding, radius: bgRadius }
+      : { enabled: false },
+    line_overrides: Array.isArray(anyCfg.line_overrides) ? anyCfg.line_overrides : [],
   }
   // 自定义坐标（custom 位置）
   if (position === "custom" && typeof cfg.pos_x === "number" && typeof cfg.pos_y === "number") {
     payload.pos_x = cfg.pos_x
     payload.pos_y = cfg.pos_y
   }
+  // 封面独立标题配置
+  if (anyCfg.cover_title_config) {
+    const ctc = anyCfg.cover_title_config
+    payload.cover_title_config = {
+      title: ctc.title,
+      font: ctc.font,
+      font_size: ctc.size,
+      font_color: ctc.color,
+      position: ctc.position,
+      bold: ctc.bold,
+      italic: ctc.italic,
+      stroke: ctc.stroke
+        ? { enabled: true, width: ctc.stroke_width ?? 4, color: ctc.stroke_color ?? "#000000" }
+        : { enabled: false },
+      shadow: ctc.shadow
+        ? {
+            enabled: true,
+            color: ctc.shadow_color ?? shadowColor,
+            offset_x: ctc.shadow_offset_x ?? 2,
+            offset_y: ctc.shadow_offset_y ?? 2,
+            blur: ctc.shadow_blur ?? 4,
+          }
+        : { enabled: false },
+      line_height: ctc.line_height ?? lineHeight,
+      margin_top: ctc.margin_top ?? marginTop,
+      max_chars_per_line: ctc.max_chars_per_line ?? maxCharsPerLine,
+      background: ctc.bg_enabled
+        ? {
+            enabled: true,
+            color: ctc.bg_color ?? bgColor,
+            padding: ctc.bg_padding ?? bgPadding,
+            radius: ctc.bg_radius ?? bgRadius,
+          }
+        : { enabled: false },
+    }
+  }
   // 前端 Canvas 渲染好的 PNG dataURL（所见即所得，后端优先 overlay 此图片图层）
   if (titleImageDataUrl) {
     payload.title_image_dataurl = titleImageDataUrl

apps/web/src/pages/ai-avatar/utils/titleCanvas.ts

@@ -9,37 +9,78 @@
  *       按 videoWidth / 720 得到 scale，所有长度类参数乘以 scale，
  *       保证 1080p / 4K 成片里标题视觉大小与预览一致。
  */
+import { getFontFamily } from "@/components/title/constants"
 import type { AiAvatarTitleConfig } from "../types"
 
 export interface RenderTitlePngOptions {
-  /** 标题配置 */
   titleConfig: AiAvatarTitleConfig
-  /** 视频宽度（像素），默认 720 */
   videoWidth?: number
-  /** 视频高度（像素），默认 1280 */
   videoHeight?: number
+  useCoverTitle?: boolean
 }
 
-/**
- * 将标题渲染为透明背景 PNG 的 dataURL（data:image/png;base64,...）
- * Canvas 尺寸与视频一致，保证叠加时 1:1 像素对齐。
- *
- * 标题为空时返回 null。
- */
-export function renderTitleToPngDataUrl(opts: RenderTitlePngOptions): string | null {
-  const { titleConfig, videoWidth = 720, videoHeight = 1280 } = opts
-  if (!titleConfig) return null
-  const rawTitle = (titleConfig.title || "").trim()
-  if (!rawTitle) return null
-
-  // 按 / 或 ／ 分割为多行
-  const lines = rawTitle
+function autoWrapLines(rawTitle: string, maxCharsPerLine: number): string[] {
+  const manual = rawTitle
     .split(/[/／]/)
     .map((l) => l.trim())
     .filter((l) => l.length > 0)
+  if (!maxCharsPerLine || maxCharsPerLine <= 0) return manual
+  const out: string[] = []
+  manual.forEach((seg) => {
+    for (let i = 0; i < seg.length; i += maxCharsPerLine) {
+      out.push(seg.slice(i, i + maxCharsPerLine))
+    }
+  })
+  return out
+}
+
+export function renderTitleToPngDataUrl(opts: RenderTitlePngOptions): string | null {
+  const { titleConfig, videoWidth = 720, videoHeight = 1280, useCoverTitle } = opts
+  if (!titleConfig) return null
+
+  type TitleCfgExt = AiAvatarTitleConfig & {
+    stroke_width?: number
+    stroke_color?: string
+    shadow_offset_x?: number
+    shadow_offset_y?: number
+    shadow_blur?: number
+    shadow_color?: string
+    line_height?: number
+    margin_top?: number
+    max_chars_per_line?: number
+    bg_enabled?: boolean
+    bg_color?: string
+    bg_padding?: number
+    bg_radius?: number
+    line_overrides?: Array<{
+      line_index: number
+      text?: string
+      size?: number
+      color?: string
+      bold?: boolean
+      italic?: boolean
+      stroke?: boolean
+      highlights?: Array<{ word: string; color?: string; bold?: boolean; scale?: number }>
+    }>
+    cover_title_config?: Partial<AiAvatarTitleConfig> | null
+    pos_x?: number
+    pos_y?: number
+  }
+  const cfg: TitleCfgExt =
+    useCoverTitle && titleConfig.cover_title_config
+      ? ({
+          ...(titleConfig as TitleCfgExt),
+          ...(titleConfig.cover_title_config as object),
+        } as TitleCfgExt)
+      : (titleConfig as TitleCfgExt)
+
+  const rawTitle = (cfg.title || "").trim()
+  if (!rawTitle) return null
+
+  const maxCharsPerLine = cfg.max_chars_per_line ?? 0
+  const lines = autoWrapLines(rawTitle, maxCharsPerLine)
   if (lines.length === 0) return null
 
-  // 分辨率缩放系数：基准 720p，所有长度类参数乘以 scale
   const scale = videoWidth / 720
   const r = (v: number) => Math.round(v * scale)
 
@@ -49,86 +90,183 @@ export function renderTitleToPngDataUrl(opts: RenderTitlePngOptions): string | n
   const ctx = canvas.getContext("2d")
   if (!ctx) return null
 
-  const baseSize = Math.max(12, Math.round(titleConfig.size || 48))
+  const baseSize = Math.max(12, Math.round(cfg.size || 48))
   const size = r(baseSize)
-  const bold = !!titleConfig.bold
-  const italic = !!titleConfig.italic
-  const color = titleConfig.color || "#ffffff"
-  const stroke = !!titleConfig.stroke
-  const shadow = !!titleConfig.shadow
+  const bold = !!cfg.bold
+  const italic = !!cfg.italic
+  const color = cfg.color || "#ffffff"
+  const stroke = !!cfg.stroke
+  const shadow = !!cfg.shadow
 
-  // 字体族 fallback 链：优先中文字体
-  const fontFamily =
-    '"Noto Sans CJK SC","Source Han Sans CN","PingFang SC","Microsoft YaHei",sans-serif'
-  const fontParts: string[] = []
-  if (italic) fontParts.push("italic")
-  if (bold) fontParts.push("bold")
-  fontParts.push(`${size}px`, fontFamily)
-  ctx.font = fontParts.join(" ")
+  const strokeWidthBase = cfg.stroke_width != null ? cfg.stroke_width : 4
+  const strokeColor = cfg.stroke_color || "#000000"
+  const shadowOffsetXBase = cfg.shadow_offset_x != null ? cfg.shadow_offset_x : 2
+  const shadowOffsetYBase = cfg.shadow_offset_y != null ? cfg.shadow_offset_y : 2
+  const shadowBlurBase = cfg.shadow_blur != null ? cfg.shadow_blur : 4
+  const shadowColor = cfg.shadow_color || "rgba(0,0,0,0.8)"
+  const lineHeightScale = cfg.line_height != null ? cfg.line_height : 1.2
+  const marginTopBase = cfg.margin_top != null ? cfg.margin_top : 24
+  const bgEnabled = !!cfg.bg_enabled
+  const bgColor = cfg.bg_color || "rgba(0,0,0,0.5)"
+  const bgPaddingBase = cfg.bg_padding != null ? cfg.bg_padding : 12
+  const bgRadiusBase = cfg.bg_radius != null ? cfg.bg_radius : 8
+
+  const fontKey = cfg.font || "思源黑体"
+  const fontFamily = getFontFamily(fontKey)
+  const setFont = (sz: number, bd: boolean, it: boolean) => {
+    const parts: string[] = []
+    if (it) parts.push("italic")
+    if (bd) parts.push("bold")
+    parts.push(`${sz}px`, fontFamily)
+    ctx.font = parts.join(" ")
+  }
+  setFont(size, bold, italic)
   ctx.fillStyle = color
   ctx.textAlign = "center"
   ctx.textBaseline = "middle"
 
-  // 阴影（shadow=true 时开启）——按 scale 缩放
-  if (shadow) {
-    ctx.shadowColor = "rgba(0,0,0,0.8)"
-    ctx.shadowBlur = r(4)
-    ctx.shadowOffsetX = 0
-    ctx.shadowOffsetY = r(2)
-  }
+  const lineGap = size * lineHeightScale
+  const totalTextH = lines.length * lineGap - (lineGap - size)
+  let maxLineW = 0
+  lines.forEach((l: string) => {
+    const m = ctx.measureText(l).width
+    if (m > maxLineW) maxLineW = m
+  })
 
-  // 位置计算：与 PanelLipsyncPreview 的 CSS 对齐（按 scale 缩放 PAD）
   const PAD = r(16)
   let centerX = videoWidth / 2
-  const position = titleConfig.position || "bottom"
-  const lineGap = size * 1.2
-  const totalTextH = lines.length * lineGap - (lineGap - size) // 所有行的总高度
-  // 文本块顶部 y（textBaseline=middle 时首行基线）
+  const position = cfg.position || "bottom"
   let firstLineY: number
-  if (
-    position === "custom" &&
-    typeof titleConfig.pos_x === "number" &&
-    typeof titleConfig.pos_y === "number"
-  ) {
-    centerX = (Math.max(0, Math.min(100, titleConfig.pos_x)) / 100) * videoWidth
-    const centerY = (Math.max(0, Math.min(100, titleConfig.pos_y)) / 100) * videoHeight
+  if (position === "custom" && typeof cfg.pos_x === "number" && typeof cfg.pos_y === "number") {
+    centerX = (Math.max(0, Math.min(100, cfg.pos_x)) / 100) * videoWidth
+    const centerY = (Math.max(0, Math.min(100, cfg.pos_y)) / 100) * videoHeight
     firstLineY = centerY - totalTextH / 2 + size / 2
   } else if (position === "top") {
-    // 顶部：y = size/2 + PAD
-    firstLineY = size / 2 + PAD
+    firstLineY = size / 2 + PAD + r(marginTopBase)
   } else if (position === "center") {
     firstLineY = videoHeight / 2 - totalTextH / 2 + size / 2
   } else {
-    // bottom（默认）
     firstLineY = videoHeight - totalTextH - PAD + size / 2
   }
 
-  // 描边参数：描边 lineWidth 按 scale 缩放（基准 size * 0.06，最小 2px @720p）
-  const doStroke = stroke
-  const strokeWidth = Math.max(r(2), Math.round(size * 0.06))
-  // 逐行绘制
-  lines.forEach((line, idx) => {
+  if (shadow) {
+    ctx.shadowColor = shadowColor
+    ctx.shadowBlur = r(shadowBlurBase)
+    ctx.shadowOffsetX = r(shadowOffsetXBase)
+    ctx.shadowOffsetY = r(shadowOffsetYBase)
+  } else {
+    ctx.shadowColor = "rgba(0,0,0,0)"
+    ctx.shadowBlur = 0
+    ctx.shadowOffsetX = 0
+    ctx.shadowOffsetY = 0
+  }
+
+  const bgPad = r(bgPaddingBase)
+  const bgR = r(bgRadiusBase)
+  const bgW = maxLineW + bgPad * 2
+  const bgH = totalTextH + bgPad * 2
+  const bgX = centerX - bgW / 2
+  const bgY = firstLineY - size / 2 - bgPad
+
+  if (bgEnabled) {
+    ctx.save()
+    ctx.shadowColor = "rgba(0,0,0,0)"
+    ctx.shadowBlur = 0
+    ctx.shadowOffsetX = 0
+    ctx.shadowOffsetY = 0
+    ctx.fillStyle = bgColor
+    if (
+      bgR > 0 &&
+      (
+        ctx as CanvasRenderingContext2D & {
+          roundRect?: (x: number, y: number, w: number, h: number, r: number) => void
+        }
+      ).roundRect
+    ) {
+      ;(
+        ctx as CanvasRenderingContext2D & {
+          roundRect?: (x: number, y: number, w: number, h: number, r: number) => void
+        }
+      ).roundRect(bgX, bgY, bgW, bgH, bgR)
+      ctx.fill()
+    } else {
+      ctx.fillRect(bgX, bgY, bgW, bgH)
+    }
+    ctx.restore()
+  }
+
+  const sw = stroke ? Math.max(r(1), r(strokeWidthBase)) : 0
+  const lineOverrides = cfg.line_overrides || []
+  lines.forEach((line: string, idx: number) => {
     const y = firstLineY + idx * lineGap
-    if (doStroke) {
-      const prevShadowColor = ctx.shadowColor
-      const prevShadowBlur = ctx.shadowBlur
-      // 描边不要带阴影（避免黑色描边发虚）
+    const override = lineOverrides.find((lo) => lo.line_index === idx)
+    const lineSize = override?.size ? r(Math.max(12, Math.round(override.size))) : size
+    const lineColor = override?.color || color
+    const lineBold = override?.bold != null ? !!override.bold : bold
+    const lineItalic = override?.italic != null ? !!override.italic : italic
+    const lineStroke = override?.stroke != null ? !!override.stroke : stroke
+
+    setFont(lineSize, lineBold, lineItalic)
+    ctx.fillStyle = lineColor
+
+    if (shadow) {
+      ctx.shadowColor = shadowColor
+      ctx.shadowBlur = r(shadowBlurBase)
+      ctx.shadowOffsetX = r(shadowOffsetXBase)
+      ctx.shadowOffsetY = r(shadowOffsetYBase)
+    } else {
       ctx.shadowColor = "rgba(0,0,0,0)"
       ctx.shadowBlur = 0
-      ctx.lineWidth = strokeWidth
-      ctx.strokeStyle = "#000000"
+      ctx.shadowOffsetX = 0
+      ctx.shadowOffsetY = 0
+    }
+
+    const lineSw = override?.size
+      ? Math.max(r(1), Math.round(lineSize * (strokeWidthBase / baseSize)))
+      : sw
+
+    if (lineStroke && lineSw > 0) {
+      ctx.save()
+      ctx.shadowColor = "rgba(0,0,0,0)"
+      ctx.shadowBlur = 0
+      ctx.shadowOffsetX = 0
+      ctx.shadowOffsetY = 0
+      ctx.lineWidth = lineSw
+      ctx.strokeStyle = strokeColor
       ctx.lineJoin = "round"
       ctx.strokeText(line, centerX, y)
-      // 恢复阴影
-      if (shadow) {
-        ctx.shadowColor = "rgba(0,0,0,0.8)"
-        ctx.shadowBlur = r(4)
-      } else {
-        ctx.shadowColor = prevShadowColor
-        ctx.shadowBlur = prevShadowBlur
-      }
+      ctx.restore()
     }
+
     ctx.fillText(line, centerX, y)
+
+    if (override?.highlights?.length) {
+      const fullW = ctx.measureText(line).width
+      const charW = line.length > 0 ? fullW / line.length : lineSize
+      override.highlights.forEach((hl) => {
+        if (!hl.word) return
+        const pos = line.indexOf(hl.word)
+        if (pos < 0) return
+        const hlX = centerX - fullW / 2 + pos * charW + (charW * hl.word.length) / 2
+        const hlColor = hl.color || "#ffd700"
+        const hlScale = hl.scale || 1
+        const hlSize = lineSize * hlScale
+        const hlBold = hl.bold != null ? !!hl.bold : true
+        ctx.save()
+        ctx.shadowColor = "rgba(0,0,0,0)"
+        ctx.shadowBlur = 0
+        setFont(hlSize, hlBold, lineItalic)
+        ctx.fillStyle = hlColor
+        if (lineStroke && lineSw > 0) {
+          ctx.lineWidth = Math.max(r(1), Math.round(hlSize * (strokeWidthBase / baseSize)))
+          ctx.strokeStyle = strokeColor
+          ctx.lineJoin = "round"
+          ctx.strokeText(hl.word, hlX, y)
+        }
+        ctx.fillText(hl.word, hlX, y)
+        ctx.restore()
+      })
+    }
   })
 
   try {
@@ -138,9 +276,6 @@ export function renderTitleToPngDataUrl(opts: RenderTitlePngOptions): string | n
   }
 }
 
-/**
- * 获取视频真实分辨率（HTMLVideoElement + loadedmetadata，超时 3 秒兜底 720×1280）。
- */
 export function getVideoResolution(
   videoUrl: string,
   timeoutMs = 3000,

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

@@ -8,29 +8,22 @@ import React, { useMemo, useState, useEffect, useRef, useCallback } from "react"
 import { 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 CloneModal from "@/components/voice/CloneModal"
 import VoiceSelectModal from "./components/VoiceSelectModal"
 import ScriptSelectModal from "./components/ScriptSelectModal"
 import TtsVoiceModal from "./components/TtsVoiceModal"
 import GenerateHeader from "./components/GenerateHeader"
-import FrontendPreviewPlayer from "./components/FrontendPreviewPlayer"
-import CanvasPreviewGrid from "./components/CanvasPreviewGrid"
-import PreviewCountModal from "./components/PreviewCountModal"
 import GenerateStepsBar from "./components/GenerateStepsBar"
 import GenerateStepContent from "./components/GenerateStepContent"
 import GenerateStepActions from "./components/GenerateStepActions"
 import { useGenerateFormState } from "./hooks/useGenerateFormState"
 import { useStepNavigation } from "./hooks/useStepNavigation"
 import { useGenerateVideo } from "./hooks/useGenerateVideo"
+import { finalizeGeneration } from "@/api/generation/finalize"
 
-import { usePreviewAssets } from "./hooks/usePreviewAssets"
 import { useBatchVariantPlans } from "./hooks/useBatchVariantPlans"
-import { useVariantVoicePreview } from "./hooks/useVariantVoicePreview"
 import { useTitleStyleUpdaters } from "./hooks/useStep4Title/useTitleStyleUpdaters"
-import { getAssetsByKind } from "@/api/assets"
-import { previewTts } from "@/api/tts"
 import { usePointsStore } from "@/store/pointsStore"
 import { hasEnoughPoints } from "./hooks/pointsCost"
 import { ENABLE_CREDIT_SYSTEM } from "@/config/features"
@@ -42,6 +35,9 @@ const GeneratePage: React.FC = () => {
 
   /* ── 表单状态 ── */
   const formState = useGenerateFormState()
+  /* ── 标题模板（#2003）当前选中模板 id ── */
+  const [selectedTitleTemplateId, setSelectedTitleTemplateId] = useState<string | null>(null)
+
   /* ── 积分状态 ── */
   const { balance, dailyUsage, rules, init: initPoints } = usePointsStore()
   useEffect(() => {
@@ -77,6 +73,8 @@ const GeneratePage: React.FC = () => {
     setTtsVoiceId,
     ttsVoiceSource,
     setTtsVoiceSource,
+    ttsStyle,
+    setTtsStyle,
     ttsVoiceAssetId,
     setTtsVoiceAssetId,
     dedupEnabled,
@@ -96,8 +94,6 @@ const GeneratePage: React.FC = () => {
     setPreviewTaskId,
     storedSourceEditPlanId,
     setStoredSourceEditPlanId,
-    serverClips,
-    setServerClips,
     previewCount,
     setPreviewCount,
     previewTitles,
@@ -110,6 +106,7 @@ const GeneratePage: React.FC = () => {
     setPreviewCovers,
     selectedVariantIds,
     setSelectedVariantIds,
+    setSelectedTemplate,
   } = formState
 
   const isBatch = previewCount > 1
@@ -140,8 +137,11 @@ const GeneratePage: React.FC = () => {
     }
   }, [selectedVoice, isBatch, voiceModePerVideo, setVoiceLibraryIds])
 
-  /* ── 数量选择弹窗 ── */
-  const [countModalOpen, setCountModalOpen] = useState(false)
+  /* ── 标题面板模式：默认展示样式参数（false）；需要大卡片模板网格时再切 true ── */
+  const enableTemplates = false
+
+  /* ── Step5 保存中状态 ── */
+  const [finishing, setFinishing] = useState(false)
 
   /* ── #1970 流程重构：分支弹窗 ── */
   const [voiceModalOpen, setVoiceModalOpen] = useState(false)
@@ -154,62 +154,6 @@ const GeneratePage: React.FC = () => {
     onTitleSettingsChange: setTitleSettings,
   })
 
-  /* ── 配音素材库（TTS 试听）── */
-  const { data: voiceMaterials = [] } = useQuery({
-    queryKey: ["assets", "voice"],
-    queryFn: () => getAssetsByKind("voice", { limit: 50 }),
-  })
-
-  const [previewVoiceAudioUrl, setPreviewVoiceAudioUrl] = useState<string | null>(null)
-  const ttsAbortRef = useRef<AbortController | null>(null)
-  const variant0Title = isBatch ? previewTitles?.[0] || "" : ""
-
-  useEffect(() => {
-    if (isBatch) return
-    const voiceAsset = voiceMaterials.find((m) => m.id === selectedVoice)
-    if (voiceAsset?.file_url) {
-      setPreviewVoiceAudioUrl(voiceAsset.file_url)
-      return
-    }
-
-    const ttsTitle = titleSettings.title
-    const voiceId = selectedClonedVoice || selectedVoice
-    if (!voiceId || !ttsTitle) {
-      setPreviewVoiceAudioUrl(null)
-      return
-    }
-
-    ttsAbortRef.current?.abort()
-    const controller = new AbortController()
-    ttsAbortRef.current = controller
-    let cancelled = false
-
-    previewTts({ text: ttsTitle, voice_id: voiceId })
-      .then((res) => {
-        if (!cancelled && res.audio_url) {
-          setPreviewVoiceAudioUrl(res.audio_url)
-        }
-      })
-      .catch((err) => {
-        if (!cancelled) {
-          console.warn("[预览配音生成失败]", err)
-          setPreviewVoiceAudioUrl(null)
-        }
-      })
-
-    return () => {
-      cancelled = true
-      controller.abort()
-    }
-  }, [
-    selectedVoice,
-    selectedClonedVoice,
-    titleSettings.title,
-    variant0Title,
-    isBatch,
-    voiceMaterials,
-  ])
-
   /* ── 克隆声音 ── */
   const { addClone } = useCloneProgress()
 
@@ -234,30 +178,11 @@ const GeneratePage: React.FC = () => {
     [bgm],
   )
 
-  /* ── 加载素材详情 ── */
-  const previewAssetsEnabled = previewAssetIds.length > 0
-  const {
-    assets: previewAssets,
-    ready: previewAssetsReady,
-    ensureAssets,
-  } = usePreviewAssets(previewAssetIds, previewAssetsEnabled)
-
-  /* ── 预览就绪 ── */
-  // #1899: 不再依赖 currentTemplate，素材加载完即可预览
-  const previewReady = previewAssetsReady
-
   /* ── 批量变体真实片段（#1744） ── */
   const batchVoiceLibraryId =
     voiceMode === "clone" ? selectedClonedVoice || selectedVoice || "" : selectedVoice || ""
-  const {
-    clipsByVariant: variantClips,
-    planIdsByVariant: variantPlanIds,
-    voiceDurationsByVariant: variantVoiceDurations,
-    loading: variantClipsLoading,
-    error: variantClipsError,
-    retry: retryVariantClips,
-  } = useBatchVariantPlans({
-    enabled: isBatch && currentStep === 3 && previewAssetsReady,
+  const { planIdsByVariant: variantPlanIds } = useBatchVariantPlans({
+    enabled: isBatch && currentStep === 3,
     count: previewCount,
     templateId: selectedTemplate || "",
     assetIds: previewAssetIds,
@@ -267,39 +192,6 @@ const GeneratePage: React.FC = () => {
     voiceModePerVideo,
   })
 
-  /* ── 批量变体配音预览 URL ── */
-  const variantVoiceAudioUrls = useVariantVoicePreview({
-    enabled: isBatch,
-    count: previewCount,
-    perVideo: voiceModePerVideo,
-    sharedVoiceId: selectedVoice || "",
-    clonedVoiceId: selectedClonedVoice || "",
-    variantVoiceIds: voiceLibraryIds || [],
-    titles: previewTitles || [],
-  })
-
-  /* ── 变体 clips 引用素材补拉 ── */
-  const clipAssetIds = useMemo(() => {
-    if (!isBatch || !variantClips?.length) return []
-    const ids = new Set<string>()
-    variantClips.forEach((list) => list.forEach((c) => c.asset_id && ids.add(c.asset_id)))
-    return Array.from(ids)
-  }, [isBatch, variantClips])
-  useEffect(() => {
-    if (clipAssetIds.length > 0) void ensureAssets(clipAssetIds)
-  }, [clipAssetIds, ensureAssets])
-
-  /* ── 勾选变体 ── */
-  const toggleVariantSelect = useCallback(
-    (index: number) => {
-      setSelectedVariantIds((prev) => {
-        const list = prev || []
-        return list.includes(index) ? list.filter((i) => i !== index) : [...list, index].sort()
-      })
-    },
-    [setSelectedVariantIds],
-  )
-
   /* ── 视频生成核心逻辑 ── */
   const {
     generating,
@@ -307,6 +199,7 @@ const GeneratePage: React.FC = () => {
     generated,
     generateError,
     generatedVideos,
+    currentTaskId,
     batchTasks,
     generate: handleGenerate,
     retry: handleRetryGenerate,
@@ -329,6 +222,7 @@ const GeneratePage: React.FC = () => {
     selectedScript,
     ttsVoiceId,
     ttsVoiceSource,
+    ttsStyle,
     ttsVoiceAssetId,
     dedupEnabled,
     style,
@@ -351,38 +245,37 @@ const GeneratePage: React.FC = () => {
     },
   })
 
-  /* ── 数量弹窗确认 ── */
-  const handleCountConfirm = useCallback(
-    (count: number) => {
-      setPreviewCount(count)
-      setCountModalOpen(false)
-      setPreviewTitles((prev) => {
-        const list = prev || []
-        const base = list[0] || titleSettings.title || ""
-        return Array.from({ length: count }, (_, i) => list[i] ?? (i === 0 ? base : ""))
-      })
-      setVoiceLibraryIds((prev) => {
-        const list = prev || []
-        return Array.from({ length: count }, (_, i) => list[i] ?? selectedVoice ?? "")
-      })
-      setPreviewCovers((prev) => {
-        const list = prev || []
-        return Array.from({ length: count }, (_, i) => list[i] ?? "")
-      })
-      setSelectedVariantIds(Array.from({ length: count }, (_, i) => i))
-      setCurrentStep(3)
-    },
-    [
-      setPreviewCount,
-      setPreviewTitles,
-      setVoiceLibraryIds,
-      setPreviewCovers,
-      setSelectedVariantIds,
-      setCurrentStep,
-      titleSettings.title,
-      selectedVoice,
-    ],
-  )
+  /* ── 对齐批量数组长度到 previewCount（用于进入 Step3 时） ── */
+  const ensureArraysAligned = useCallback(() => {
+    setPreviewTitles((prev) => {
+      const list = prev || []
+      if (list.length === previewCount) return list
+      const base = list[0] || titleSettings.title || ""
+      return Array.from({ length: previewCount }, (_, i) => list[i] ?? (i === 0 ? base : ""))
+    })
+    setVoiceLibraryIds((prev) => {
+      const list = prev || []
+      if (list.length === previewCount) return list
+      return Array.from({ length: previewCount }, (_, i) => list[i] ?? selectedVoice ?? "")
+    })
+    setPreviewCovers((prev) => {
+      const list = prev || []
+      if (list.length === previewCount) return list
+      return Array.from({ length: previewCount }, (_, i) => list[i] ?? "")
+    })
+    setSelectedVariantIds((prev) => {
+      if (prev && prev.length === previewCount) return prev
+      return Array.from({ length: previewCount }, (_, i) => i)
+    })
+  }, [
+    previewCount,
+    setPreviewTitles,
+    setVoiceLibraryIds,
+    setPreviewCovers,
+    setSelectedVariantIds,
+    titleSettings.title,
+    selectedVoice,
+  ])
 
   /* ── #1970：Step1 弹窗回调 ── */
   const handleVoiceModalConfirm = useCallback(
@@ -410,9 +303,15 @@ const GeneratePage: React.FC = () => {
   )
 
   const handleTtsSynthesized = useCallback(
-    (payload: { voiceAssetId: string; ttsVoiceId: string; ttsVoiceSource: "preset" | "clone" }) => {
+    (payload: {
+      voiceAssetId: string
+      ttsVoiceId: string
+      ttsVoiceSource: "preset" | "clone"
+      ttsStyle?: string
+    }) => {
       setTtsVoiceId(payload.ttsVoiceId)
       setTtsVoiceSource(payload.ttsVoiceSource)
+      if (payload.ttsStyle) setTtsStyle(payload.ttsStyle)
       setTtsVoiceAssetId(payload.voiceAssetId)
       if (payload.ttsVoiceSource === "clone") {
         setSelectedClonedVoice(payload.ttsVoiceId)
@@ -428,6 +327,7 @@ const GeneratePage: React.FC = () => {
     [
       setTtsVoiceId,
       setTtsVoiceSource,
+      setTtsStyle,
       setTtsVoiceAssetId,
       setSelectedVoice,
       setSelectedClonedVoice,
@@ -471,10 +371,6 @@ const GeneratePage: React.FC = () => {
         return
       }
     }
-    if (!previewReady) {
-      message.warning("预览素材正在加载，请稍候")
-      return
-    }
     const ok = await handleGenerate()
     if (ok) {
       setCurrentStep(4)
@@ -485,7 +381,6 @@ const GeneratePage: React.FC = () => {
     previewTitles,
     titleSettings.aiAutoSelect,
     titleSettings.title,
-    previewReady,
     handleGenerate,
     setCurrentStep,
     balance,
@@ -503,7 +398,7 @@ const GeneratePage: React.FC = () => {
     smartSelectedIds,
     titleSettings,
     generated,
-    onOpenCountModal: () => setCountModalOpen(true),
+    onBeforeEnterStep3: ensureArraysAligned,
     onOpenStep1Modal: () => {
       if (editMode === "random") {
         setVoiceModalOpen(true)
@@ -513,14 +408,86 @@ const GeneratePage: React.FC = () => {
     },
   })
 
-  /* ── 最终成片 ── */
+  /* ── 最终成片（单视频） ── */
   const finalVideo = generatedVideos[0]
 
+  /* ── Step5 完成：先 confirm（同步标题/封面到任务）再 finalize（正式入库成品库） ── */
+  const handleFinish = useCallback(async () => {
+    if (finishing) return
+    // 校验：单视频必须已生成；批量必须所有已选视频有封面或确认跳过
+    if (isBatch) {
+      if (generatedVideos.length === 0) {
+        message.warning("请等待视频生成完成")
+        return
+      }
+    } else {
+      if (!finalVideo) {
+        message.warning("请等待视频生成完成")
+        return
+      }
+    }
+    setFinishing(true)
+    const hide = message.loading("正在保存到视频库...", 0)
+    try {
+      // 收集需要 finalize 的任务 ID：批量用 batchTasks；单视频优先用 finalVideo.generation_task_id，兜底 currentTaskId
+      const singleTaskId = finalVideo?.generation_task_id || currentTaskId || ""
+
+      // 单视频/批量：为每个任务调用 finalize（入库 + 绑定封面 + 自定义标题）
+      // 批量时必须按 batchTasks[i].variantIndex 对齐 previewCovers/previewTitles（taskIds 顺序不一定按变体序号）
+      if (isBatch && batchTasks.length > 0) {
+        await Promise.all(
+          batchTasks.map(async (task) => {
+            const vi = task.variantIndex
+            const coverUrl = previewCovers[vi] || ""
+            const title = previewTitles[vi] || titleSettings.title || ""
+            return finalizeGeneration(task.taskId, {
+              cover_url: coverUrl || undefined,
+              custom_title: title,
+            })
+          }),
+        )
+      } else if (singleTaskId) {
+        const coverUrl = coverSettings.thumbnail_url || coverSettings.upload_url || ""
+        await finalizeGeneration(singleTaskId, {
+          cover_url: coverUrl || undefined,
+          custom_title: titleSettings.title || "",
+        })
+      } else {
+        console.warn("[handleFinish] 未找到任务 ID，跳过 finalize 直接跳转")
+      }
+
+      hide()
+      message.success("已保存到视频库")
+      navigate("/app/products")
+    } catch (err) {
+      hide()
+      console.error("[保存失败]", err)
+      const detail =
+        (err as { response?: { data?: { detail?: string; message?: string } } })?.response?.data
+          ?.detail ||
+        (err as { response?: { data?: { detail?: string; message?: string } } })?.response?.data
+          ?.message ||
+        "保存失败，请稍后在任务历史查看"
+      message.error(detail)
+    } finally {
+      setFinishing(false)
+    }
+  }, [
+    finishing,
+    isBatch,
+    finalVideo,
+    generatedVideos,
+    batchTasks,
+    previewCovers,
+    previewTitles,
+    titleSettings.title,
+    coverSettings,
+    currentTaskId,
+    navigate,
+  ])
+
   /* ── 布局 class ── */
-  const layoutClassName = useMemo(() => {
-    if (currentStep === 3) return "xx-generate-layout step4-layout"
-    return "xx-generate-layout full-width"
-  }, [currentStep])
+  const layoutClassName = "xx-generate-layout full-width"
 
   /* ── 积分消耗估算（步骤3确认生成展示用） ── */
   const unitsForCost = isBatch ? Math.max(selectedVariantIds.length, 1) : 1
@@ -548,66 +515,7 @@ const GeneratePage: React.FC = () => {
       <GenerateStepsBar currentStep={currentStep} onStepClick={setCurrentStep} />
 
       <div className={layoutClassName}>
-        {/* ════ 步骤3：左侧预览大区域 ════ */}
-        {currentStep === 3 && (
-          <div className="xx-generate-preview-col">
-            {!isBatch ? (
-              <FrontendPreviewPlayer
-                assets={previewAssets}
-                videoRatio={videoRatio as "9:16" | "16:9"}
-                ready={previewAssets.length > 0}
-                serverClips={serverClips}
-                voiceAudioUrl={previewVoiceAudioUrl || undefined}
-                titleSettings={{
-                  title: titleSettings.title,
-                  size: titleSettings.size,
-                  font: titleSettings.font,
-                  color: titleSettings.color,
-                  position: titleSettings.position as "top" | "center" | "bottom" | "custom",
-                  bold: titleSettings.bold,
-                  italic: titleSettings.italic,
-                  stroke: titleSettings.stroke,
-                  shadow: titleSettings.shadow,
-                  posX: titleSettings.posX,
-                  posY: titleSettings.posY,
-                }}
-                onTitlePositionChange={styleUpdaters.updateTitlePosition}
-              />
-            ) : (
-              <div className="xx-form-section">
-                <div className="xx-preview-header">
-                  <h3>🎬 {previewCount} 个视频预览</h3>
-                  <span
-                    style={{
-                      fontSize: 13,
-                      color: "var(--text-secondary, #666)",
-                    }}
-                  >
-                    实时预览，勾选要生成的视频
-                  </span>
-                </div>
-                <CanvasPreviewGrid
-                  count={previewCount}
-                  assets={previewAssets}
-                  videoRatio={videoRatio as "9:16" | "16:9"}
-                  titles={previewTitles}
-                  titleSettings={titleSettings}
-                  voiceAudioUrls={variantVoiceAudioUrls}
-                  voiceDurations={variantVoiceDurations}
-                  variantClips={variantClips}
-                  clipsLoading={variantClipsLoading}
-                  clipsError={variantClipsError}
-                  onRetryClips={retryVariantClips}
-                  selectedIds={selectedVariantIds}
-                  onToggleSelect={toggleVariantSelect}
-                  selectable={!generating}
-                />
-              </div>
-            )}
-          </div>
-        )}
-
-        {/* ════ 右侧：步骤1~2 表单 / 步骤3 标题边栏 / 步骤4 确认生成进度 / 步骤5 封面 ════ */}
+        {/* ════ 步骤1~2 表单 / 步骤3 标题设置 / 步骤4 确认生成进度 / 步骤5 封面 ════ */}
         <div className="xx-generate-form">
           <GenerateStepContent
             currentStep={currentStep}
@@ -630,8 +538,15 @@ const GeneratePage: React.FC = () => {
             onToggleStroke={styleUpdaters.toggleStroke}
             onToggleShadow={styleUpdaters.toggleShadow}
             onApplyPreset={styleUpdaters.applyPreset}
+            onUpdateStyle={styleUpdaters.updateStyle}
             activePreset={styleUpdaters.activePreset}
             titlePresets={styleUpdaters.titlePresets}
+            enableTemplates={enableTemplates}
+            selectedTemplateId={selectedTitleTemplateId}
+            onApplyTemplate={(settings, tpl) => {
+              styleUpdaters.applyTemplate(settings)
+              setSelectedTitleTemplateId(tpl.id)
+            }}
             bgm={bgm}
             bgmConfig={bgmConfig}
             coverSettings={coverSettings}
@@ -644,16 +559,14 @@ const GeneratePage: React.FC = () => {
             onPreviewCountChange={setPreviewCount}
             videoRatio={videoRatio as "9:16" | "16:9"}
             onVideoRatioChange={(r) => setVideoRatio(r)}
-            selectedScript={selectedScript}
-            ttsVoiceId={ttsVoiceId}
-            ttsVoiceSource={ttsVoiceSource}
             onSelectedVoiceChange={setSelectedVoice}
-            onServerClipsChange={setServerClips}
             generating={generating}
             generated={generated}
             generateError={generateError}
             progress={progress}
             generatedVideos={generatedVideos}
+
+            currentTaskId={currentTaskId}
             onRetry={handleRetryGenerate}
             onRetryBatchTask={handleRetryBatchTask}
             onDismissError={handleDismissError}
@@ -668,6 +581,9 @@ const GeneratePage: React.FC = () => {
             previewCovers={previewCovers}
             onPreviewCoversChange={setPreviewCovers}
             selectedVariantIds={selectedVariantIds}
+            selectedCoverTemplate={selectedTemplate}
+            onSelectedCoverTemplateChange={setSelectedTemplate}
+            onConfirmGenerate={handleConfirmGenerate}
           />
 
           {/* ════ 步骤4（单视频）：成片播放器 ════ */}
@@ -730,12 +646,6 @@ const GeneratePage: React.FC = () => {
                   <button className="xx-btn xx-btn-ghost xx-btn-sm" onClick={handleShare}>
                     🔗 分享
                   </button>
-                  <button
-                    className="xx-btn xx-btn-ghost xx-btn-sm"
-                    onClick={() => navigate("/app/products")}
-                  >
-                    📁 前往成片库
-                  </button>
                 </div>
               </div>
             </div>
@@ -755,18 +665,12 @@ const GeneratePage: React.FC = () => {
             pointsInsufficient={insufficientPoints}
             insufficientReason={pointsEstimate.reason}
             onRecharge={() => navigate("/app/points/recharge")}
+            onFinish={handleFinish}
+            finishing={finishing}
           />
         </div>
       </div>
 
-      {/* 数量选择弹窗 */}
-      <PreviewCountModal
-        open={countModalOpen}
-        defaultCount={1}
-        onConfirm={handleCountConfirm}
-        onCancel={() => setCountModalOpen(false)}
-      />
-
       {/* 音色克隆弹窗 */}
       <CloneModal
         open={cloneModalOpen}
@@ -791,6 +695,8 @@ const GeneratePage: React.FC = () => {
         open={ttsModalOpen}
         scriptText={selectedScript?.content ?? ""}
         scriptTitle={selectedScript?.title ?? ""}
+        style={ttsStyle}
+        onStyleChange={setTtsStyle}
         onCancel={() => setTtsModalOpen(false)}
         onSynthesized={handleTtsSynthesized}
       />

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

@@ -37,7 +37,9 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
       <div className="xx-preview-header">
         <h3>🎬 正在生成 {tasks.length} 个视频</h3>
         <span style={{ fontSize: 13, color: "var(--text-secondary, #666)" }}>
-          完成 {tasks.filter((t) => t.status === "completed").length} / {tasks.length}
+          完成{" "}
+          {tasks.filter((t) => t.status === "completed" || t.status === "awaiting_cover").length} /{" "}
+          {tasks.length}
         </span>
       </div>
       {/* #1800: grid 列宽 / gap / justify 全部交由 .xx-batch-gen-grid CSS 控制 */}
@@ -49,7 +51,7 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
             <div key={task.taskId} className={`xx-batch-gen-card status-${task.status}`}>
               <div className="xx-batch-gen-card-head">
                 <span className="xx-batch-gen-card-title" title={title}>
-                  {task.status === "completed" ? (
+                  {task.status === "completed" || task.status === "awaiting_cover" ? (
                     <CheckCircleFilled
                       className="xx-batch-gen-card-icon"
                       style={{ color: "#52c41a" }}
@@ -83,7 +85,7 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
                     <div className="xx-batch-gen-card-pct">{Math.round(task.progress)}%</div>
                   </>
                 )}
-                {task.status === "completed" && video && (
+                {(task.status === "completed" || task.status === "awaiting_cover") && video && (
                   // 竖屏自适应容器（#1750）：成片固定 1080×1920（9:16），
                   // 视频按真实宽高比 contain 显示，黑底居中，杜绝横屏播放器左右大黑边
                   <div
@@ -111,7 +113,7 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
                     />
                   </div>
                 )}
-                {task.status === "completed" && !video && (
+                {(task.status === "completed" || task.status === "awaiting_cover") && !video && (
                   <div className="xx-batch-gen-card-done">✅ 已完成（成片可在下一步选择封面）</div>
                 )}
                 {task.status === "failed" && (

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

@@ -1,156 +0,0 @@
-/**
- * 批量前端 Canvas 实时预览网格（Issue #1677 起，#1750 对齐基线：只播放后端真实计划）
- *
- * N 个 FrontendPreviewPlayer 网格排列：
- * - 纯前端 Canvas + video 元素实时播放素材片段，不调任何后端渲染接口；
- * - #1744/#1750：片段只来自后端变体计划接口（POST /generation/variant-plans）的真实
- *   clips，与正式批量生成同源自 reselect_plan_for_variant，预览即成片；
- *   接口失败/数据不完整 → 整网格显示错误态+重试（严禁本地假数据冒充预览）；
- *   加载中 → 9:16 占位防塌陷；
- * - 各自叠加独立标题浮层（variantTitle），标题样式全局共用；
- * - 勾选框决定提交时生成哪些变体；
- * - 每个变体挂载各自配音 URL（独立模式 #1750）或共用同一条；播放互斥：
- *   点击某卡片播放时其他卡片自动暂停，同一时刻只有一路声音（#1741）。
- */
-import React, { useState } from "react"
-import type { AssetItem } from "@/api/assets"
-import type { EditPlanClip } from "@/api/template-editor"
-import { LoadingOutlined, ReloadOutlined } from "@ant-design/icons"
-import { Button } from "antd"
-import type { TitleSettings } from "../types"
-import FrontendPreviewPlayer from "./FrontendPreviewPlayer"
-
-interface CanvasPreviewGridProps {
-  count: number
-  assets: AssetItem[]
-  videoRatio: string
-  titles: string[]
-  titleSettings: TitleSettings
-  /**
-   * 各变体配音预览音频 URL（#1750：独立配音模式每变体一条；共用模式全为同一条；
-   * 元素为 null 表示该变体暂无音频（AI 音色 TTS 合成中））
-   */
-  voiceAudioUrls?: (string | null)[]
-  /**
-   * 各变体配音时长（秒）：后端返回 voice_duration 优先；未返回则为 undefined，
-   * 由 FrontendPreviewPlayer 在 audio loadedmetadata 时自测兜底。
-   * 长度=count，undefined 项表示该变体未提供后端时长。
-   */
-  voiceDurations?: (number | undefined)[]
-  /**
-   * 各变体的后端真实片段（#1744/#1750）：长度=count。
-   * 仅 clipsLoading=false 且 clipsError=false 时才会传给播放器。
-   */
-  variantClips?: EditPlanClip[][]
-  /** 是否正在向后端申请变体计划 */
-  clipsLoading?: boolean
-  /** 申请变体计划失败（端点未上线/网络错误/数据不完整）：显示错误态，严禁假数据 */
-  clipsError?: boolean
-  /** 用户点击错误态「重试」 */
-  onRetryClips?: () => void
-  /** 勾选的变体序号 */
-  selectedIds: number[]
-  onToggleSelect: (index: number) => void
-  /** 生成中禁止勾选 */
-  selectable?: boolean
-}
-
-const CanvasPreviewGrid: React.FC<CanvasPreviewGridProps> = ({
-  count,
-  assets,
-  videoRatio,
-  titles,
-  titleSettings,
-  voiceAudioUrls,
-  voiceDurations,
-  variantClips,
-  clipsLoading = false,
-  clipsError = false,
-  onRetryClips,
-  selectedIds,
-  onToggleSelect,
-  selectable = true,
-}) => {
-  // ── 播放互斥（#1741）：同一时刻只有一个卡片持有播放权（token = 变体序号，0 起，#1750） ──
-  const [activePlayToken, setActivePlayToken] = useState<number | null>(null)
-
-  // count 上限已在源头 PreviewCountModal 的数量选择（1~MAX_PREVIEW_COUNT=10）clamp，
-  // 这里完整渲染所有变体，保证每个变体都有勾选/预览入口，UI 与数据不脱节
-  return (
-    <div className="xx-canvas-grid">
-      {Array.from({ length: count }, (_, i) => {
-        const checked = selectedIds.includes(i)
-        return (
-          <div
-            key={i}
-            className={`xx-canvas-grid-card${checked ? " selected" : ""}`}
-            data-variant={i}
-          >
-            <div className="xx-canvas-grid-card-bar">
-              <label className="xx-canvas-grid-check">
-                <input
-                  type="checkbox"
-                  checked={checked}
-                  disabled={!selectable}
-                  onChange={() => onToggleSelect(i)}
-                />
-                <span>视频 {i + 1}</span>
-              </label>
-            </div>
-            {clipsError ? (
-              // ── 错误态（#1750）：9:16 占位防塌陷，不渲染任何播放器（严禁假数据） ──
-              <div className="xx-variant-clips-status" role="alert">
-                <span className="xx-variant-clips-error-text">预览加载失败，请重试</span>
-                {i === 0 && onRetryClips ? (
-                  <Button
-                    size="small"
-                    icon={<ReloadOutlined />}
-                    onClick={onRetryClips}
-                    style={{ marginTop: 12 }}
-                  >
-                    重试
-                  </Button>
-                ) : null}
-              </div>
-            ) : clipsLoading || !variantClips?.[i]?.length ? (
-              // ── 加载态：9:16 占位防塌陷 ──
-              <div className="xx-variant-clips-status" aria-label={`变体${i + 1}片段加载中`}>
-                <LoadingOutlined />
-                <span style={{ marginTop: 8 }}>独立选片中…</span>
-              </div>
-            ) : (
-              <FrontendPreviewPlayer
-                assets={assets}
-                videoRatio={videoRatio}
-                ready={assets.length > 0}
-                playToken={i}
-                serverClips={variantClips[i]}
-                variantTitle={titles[i] || ""}
-                voiceAudioUrl={voiceAudioUrls?.[i] || undefined}
-                voiceDurationHint={voiceDurations?.[i]}
-                activePlayToken={activePlayToken}
-                onPlayTokenChange={setActivePlayToken}
-                compact
-                titleSettings={{
-                  title: titles[i] || "",
-                  size: titleSettings.size,
-                  font: titleSettings.font,
-                  color: titleSettings.color,
-                  position: titleSettings.position as "top" | "center" | "bottom" | "custom",
-                  bold: titleSettings.bold,
-                  italic: titleSettings.italic,
-                  stroke: titleSettings.stroke,
-                  shadow: titleSettings.shadow,
-                  posX: titleSettings.posX,
-                  posY: titleSettings.posY,
-                }}
-              />
-            )}
-          </div>
-        )
-      })}
-    </div>
-  )
-}
-
-export default CanvasPreviewGrid

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

@@ -1,602 +0,0 @@
-/**
- * 前端预览播放器 — 原生 Video 元素方案（浏览器硬件解码，独立线程，不阻塞 UI）
- *
- * 架构：
- * - 默认走原生 video 元素多片段切换播放（useSegmentScheduler 调度），
- *   叠加标题 CSS 浮层、配音音轨（usePreviewAudio）、尾段冻结看门狗、批量播放互斥 token。
- *   UI 拆分为 PreviewControls（控制条/按钮） + PreviewProgressBar（进度条）两个子组件。
- * - WebCodecs 路径已废弃（原 useWebCodecs 常量恒为 false，相关死代码已移除），
- *   保留 useCanvasPlayer hook 文件供未来兜底（不影响当前打包体积）。
- *
- * 对外 API 完全不变：assets / videoRatio / ready / voiceAudioUrl / serverClips 等。
- */
-import React, { useMemo, useCallback, useState, useRef, useEffect } from "react"
-import { PlayCircleOutlined, SoundOutlined } from "@ant-design/icons"
-import type { AssetItem } from "@/api/assets"
-import type { EditPlanClip } from "@/api/template-editor"
-import { useSegmentScheduler, type PlaybackSegment } from "../hooks/useSegmentScheduler"
-import { usePreviewAudio } from "../hooks/usePreviewAudio"
-import { PreviewControls } from "./PreviewControls"
-import { getFontFamily } from "../constants"
-
-interface FrontendPreviewPlayerProps {
-  assets: AssetItem[]
-  videoRatio: string
-  ready: boolean
-  /** 服务端变体计划真实片段（#1750：必填，无 fallback；批量网格传入各变体自己的 clips） */
-  serverClips?: EditPlanClip[]
-  voiceAudioUrl?: string
-  titleSettings?: {
-    title: string
-    size: number
-    font: string
-    color: string
-    position: "top" | "center" | "bottom" | "custom"
-    bold?: boolean
-    italic?: boolean
-    stroke?: boolean
-    shadow?: boolean
-    posX?: number | null
-    posY?: number | null
-  }
-  onTitlePositionChange?: (posX: number, posY: number) => void
-  /**
-   * 播放互斥 token（#1750）：批量网格中为变体序号（0 起），单视频不传。
-   * 持有播放权的实例播放，其余自动暂停。
-   */
-  playToken?: number
-  /** 变体标题文字（批量时每个预览独立标题，叠加在画面上）；不传用 titleSettings.title */
-  variantTitle?: string
-  /** 紧凑模式（批量网格中使用，缩小内边距/标题尺寸） */
-  compact?: boolean
-  /**
-   * 批量网格播放互斥（#1741/#1750）：当前持有播放权的实例 token（变体序号）。
-   * 持有权变化且不等于自身时，本实例自动暂停（视频+配音）。单视频模式不传。
-   */
-  activePlayToken?: number | null
-  /** 播放权变化回调：本实例请求播放时传自身 playToken，暂停时传 null */
-  onPlayTokenChange?: (token: number | null) => void
-  /**
-   * 后端返回的配音时长（秒）P0 对齐：优先以该值作为音画时长锚点；
-   * 未提供则在 audio loadedmetadata 后自测兜底。
-   */
-  voiceDurationHint?: number
-}
-
-/**
- * 将后端变体计划 clips 映射为播放片段（#1750：唯一数据来源，无本地模拟 fallback）
- *
- * 预览不渲染：浏览器按后端真实计划即时播放素材原片，预览即成片。
- * 模板片段数固定、成片时长=配音时长（后端等比分配），前端不再有任何时长假设。
- */
-function buildPlaybackSegments(
-  assets: AssetItem[],
-  serverClips?: EditPlanClip[],
-  /** #1754 前端兜底：配音时长≠clips 总时长时，按比例缩放每段播放时长并调速 */
-  speedFactor = 1,
-): PlaybackSegment[] {
-  if (!assets.length || !serverClips || serverClips.length === 0) return []
-
-  const assetMap = new Map(assets.map((a) => [a.id, a]))
-  const segments: PlaybackSegment[] = []
-  // speedFactor > 1 表示 clips 偏短需加速；< 1 表示 clips 偏长需减速
-  const invSpeed = speedFactor > 0 && Math.abs(speedFactor - 1) > 0.01 ? 1 / speedFactor : 1
-  for (const clip of serverClips) {
-    const asset = assetMap.get(clip.asset_id)
-    if (!asset) continue
-    const assetDuration = asset.duration || asset.metadata?.duration || 0
-    const startTime = clip.start_time || 0
-    // 片段时长以后端计划为准（配音时长等比分配）；素材时长仅用于兜底钳制边界
-    const rawClipDuration = clip.duration || 0
-    // #1754：按 speedFactor 缩放片段时长，使总时长匹配配音
-    const clipDuration = invSpeed !== 1 ? rawClipDuration * invSpeed : rawClipDuration
-    const endTime =
-      assetDuration > 0
-        ? Math.min(startTime + clipDuration, assetDuration)
-        : startTime + clipDuration
-    const videoUrl = asset.file_url || asset.storage_key
-    segments.push({
-      assetId: asset.id,
-      videoUrl,
-      startTime,
-      endTime,
-      order: clip.order,
-      playbackRate: invSpeed !== 1 ? speedFactor : undefined,
-    })
-  }
-  return segments.sort((a, b) => a.order - b.order)
-}
-
-const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
-  assets,
-  videoRatio,
-  ready,
-  serverClips,
-  voiceAudioUrl,
-  voiceDurationHint,
-  titleSettings,
-  onTitlePositionChange,
-  playToken,
-  variantTitle,
-  compact = false,
-  activePlayToken = null,
-  onPlayTokenChange,
-}) => {
-  // #1754→P0：配音时长作为音画时长锚点。
-  // 优先使用后端返回的 voiceDurationHint；音频 loadedmetadata 后再以自测值覆盖（更精确）。
-  const [voiceDuration, setVoiceDuration] = useState<number>(() =>
-    voiceDurationHint && voiceDurationHint > 0 ? voiceDurationHint : 0,
-  )
-
-  // #1756：clips 原始总时长 + 转场时长（后端等比分配配音时包含转场占位）
-  const rawClipsDuration = useMemo(() => {
-    if (!serverClips?.length) return 0
-    return serverClips.reduce((sum, c) => sum + (c.duration || 0) + (c.transition_duration || 0), 0)
-  }, [serverClips])
-
-  // #1754→#1756：配音时长可用且与 clips+转场 总时长偏差 > 5% 时，按比例调速
-  const speedFactor = useMemo(() => {
-    if (!voiceDuration || voiceDuration <= 0 || rawClipsDuration <= 0) return 1
-    const ratio = rawClipsDuration / voiceDuration
-    return Math.abs(ratio - 1) > 0.05 ? ratio : 1
-  }, [voiceDuration, rawClipsDuration])
-
-  const segments = useMemo(
-    () => buildPlaybackSegments(assets, serverClips, speedFactor),
-    [assets, serverClips, speedFactor],
-  )
-  // 批量变体：标题文字取 variantTitle，样式仍由全局 titleSettings 控制
-  const effectiveTitle = variantTitle ?? titleSettings?.title
-
-  // ── ASS 坐标系参数（与后端 ass_subtitle_builder.py 一致） ──
-  const TITLE_MARGIN_TOP = 180
-  const TITLE_MARGIN_BOTTOM = 100
-  const TITLE_MARGIN_SIDE = 40
-  const playRes = (() => {
-    switch (videoRatio) {
-      case "16:9":
-        return { width: 1920, height: 1080 }
-      case "1:1":
-        return { width: 1080, height: 1080 }
-      case "9:16":
-      default:
-        return { width: 1080, height: 1920 }
-    }
-  })()
-  const customTitleXPct =
-    titleSettings?.posX != null && playRes.width > 0
-      ? (titleSettings.posX / playRes.width) * 100
-      : null
-  const customTitleYPct =
-    titleSettings?.posY != null && playRes.height > 0
-      ? (titleSettings.posY / playRes.height) * 100
-      : null
-
-  // ── 标题拖拽（用 ref 避免每帧触发 React 重渲染）──
-  const draggingTitleRef = useRef(false)
-  const titleDragRef = useRef<HTMLDivElement>(null)
-  const playerContainerRef = useRef<HTMLDivElement>(null)
-  const handleTitlePointerDown = useCallback(
-    (e: React.PointerEvent<HTMLDivElement>) => {
-      if (!onTitlePositionChange || !playerContainerRef.current) return
-      e.preventDefault()
-      e.stopPropagation()
-      ;(e.target as Element).setPointerCapture(e.pointerId)
-      draggingTitleRef.current = true
-      ;(e.currentTarget as HTMLDivElement).style.cursor = "grabbing"
-    },
-    [onTitlePositionChange],
-  )
-  const handleTitlePointerMove = useCallback((e: React.PointerEvent<HTMLDivElement>) => {
-    if (!draggingTitleRef.current || !playerContainerRef.current) return
-    e.preventDefault()
-    e.stopPropagation()
-    if (titleDragRef.current) {
-      const rect = playerContainerRef.current.getBoundingClientRect()
-      const relX = Math.max(0, Math.min(rect.width, e.clientX - rect.left))
-      const relY = Math.max(0, Math.min(rect.height, e.clientY - rect.top))
-      const xpct = (relX / rect.width) * 100
-      const ypct = (relY / rect.height) * 100
-      titleDragRef.current.style.left = `${xpct}%`
-      titleDragRef.current.style.top = `${ypct}%`
-    }
-  }, [])
-  const handleTitlePointerUp = useCallback(
-    (e: React.PointerEvent<HTMLDivElement>) => {
-      if (!draggingTitleRef.current) return
-      draggingTitleRef.current = false
-      if (onTitlePositionChange && playerContainerRef.current) {
-        const rect = playerContainerRef.current.getBoundingClientRect()
-        const relX = Math.max(0, Math.min(rect.width, e.clientX - rect.left))
-        const relY = Math.max(0, Math.min(rect.height, e.clientY - rect.top))
-        const posX = Math.round((relX / rect.width) * playRes.width)
-        const posY = Math.round((relY / rect.height) * playRes.height)
-        onTitlePositionChange(posX, posY)
-      }
-      ;(e.currentTarget as HTMLDivElement).style.cursor = "grab"
-      try {
-        if ((e.currentTarget as Element).hasPointerCapture(e.pointerId)) {
-          ;(e.currentTarget as Element).releasePointerCapture(e.pointerId)
-        }
-      } catch {
-        /* ignore */
-      }
-    },
-    [onTitlePositionChange, playRes.width, playRes.height],
-  )
-
-  const [containerHeight, setContainerHeight] = useState(0)
-  useEffect(() => {
-    const el = playerContainerRef.current
-    if (!el) return
-    const ro = new ResizeObserver((entries) => {
-      for (const entry of entries) {
-        const h = entry.contentRect.height
-        if (h > 0) setContainerHeight(h)
-      }
-    })
-    ro.observe(el)
-    const rect = el.getBoundingClientRect()
-    if (rect.height > 0) setContainerHeight(rect.height)
-    return () => ro.disconnect()
-  }, [])
-
-  // 标题字号按容器高度与 PlayResY 的比例缩放
-  const titleFontSizePx =
-    containerHeight > 0
-      ? ((titleSettings?.size ?? 36) / playRes.height) * containerHeight
-      : (titleSettings?.size ?? 36)
-  const titleSidePct = (TITLE_MARGIN_SIDE / playRes.width) * 100
-  const titleTopPct = (TITLE_MARGIN_TOP / playRes.height) * 100
-  const titleBottomPct = (TITLE_MARGIN_BOTTOM / playRes.height) * 100
-  const titleScale = containerHeight > 0 ? containerHeight / playRes.height : 1
-  const titleStrokeWidth = Math.max(1, 2 * titleScale)
-  const titleShadowBlur = 4 * titleScale
-  const titleShadowOffset = 2 * titleScale
-
-  // ── Video 播放器（默认路径，浏览器原生硬件解码） ──
-  const {
-    isPlaying,
-    currentTime,
-    totalDuration,
-    currentSegmentIndex,
-    canPlay,
-    togglePlayPause,
-    seekTo,
-    pause,
-    videoRefs,
-  } = useSegmentScheduler(segments)
-
-  // P0 fix：以配音时长为音画同步锚点。
-  // 有配音时总时长 = 配音时长（短则末帧冻结，长则硬停）；无配音时沿用视频总时长（素材原声兜底）。
-  const effectiveTotalDuration =
-    !!voiceAudioUrl && voiceDuration > 0 ? voiceDuration : totalDuration
-
-  // 本卡片静音开关（#1741）：默认有声，用户可点喇叭单独静音某张卡片
-  const [muted, setMuted] = useState(false)
-  // 有配音时 video 素材保持静音（避免原声与配音混音）；无配音时取消静音，素材原声兜底
-  const hasVoice = !!voiceAudioUrl
-
-  // 音频 ended：兜底触发暂停与释放播放权
-  const handleAudioEnded = useCallback(() => {
-    if (!isPlaying) return
-    pause()
-    if (playToken != null) onPlayTokenChange?.(null)
-  }, [isPlaying, pause, playToken, onPlayTokenChange])
-
-  const {
-    seekTo: audioSeekTo,
-    ensurePlayingAt: audioEnsurePlayingAt,
-    pause: audioPause,
-  } = usePreviewAudio({
-    voiceAudioUrl,
-    voiceDurationHint,
-    muted,
-    isPlaying,
-    currentTime,
-    onVoiceDurationChange: setVoiceDuration,
-    onEnded: handleAudioEnded,
-  })
-
-  // 片段切换时同步音频时间（video fallback）
-  useEffect(() => {
-    if (!isPlaying) return
-    audioSeekTo(currentTime)
-    // 注意：不要把 currentTime 放进依赖数组，否则每200ms会重置音频位置导致卡顿
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [currentSegmentIndex, isPlaying])
-
-  // P0 fix：视频比配音短时的「末帧冻结+音频续播」模式。
-  // 视频调度器播完最后一段自动 pause，此时若配音仍在播，用 rAF 虚拟时钟推进 currentTime 直到配音结束。
-  const [tailCurrentTime, setTailCurrentTime] = useState<number | null>(null)
-  const tailStartRef = useRef<number>(0)
-  const tailBaseRef = useRef<number>(0)
-  const tailAudioRef = useRef({ ensurePlayingAt: audioEnsurePlayingAt, pause: audioPause })
-  tailAudioRef.current = { ensurePlayingAt: audioEnsurePlayingAt, pause: audioPause }
-
-  useEffect(() => {
-    const needTail =
-      !!voiceAudioUrl &&
-      voiceDuration > 0 &&
-      !isPlaying &&
-      typeof currentTime === "number" &&
-      currentTime >= totalDuration - 0.1 &&
-      currentTime < voiceDuration - 0.1
-    if (needTail && tailCurrentTime === null) {
-      tailBaseRef.current = currentTime
-      tailStartRef.current = performance.now()
-      setTailCurrentTime(currentTime)
-      tailAudioRef.current.ensurePlayingAt(currentTime)
-      return
-    }
-    if (!needTail && tailCurrentTime !== null) {
-      setTailCurrentTime(null)
-    }
-  }, [isPlaying, currentTime, totalDuration, voiceDuration, voiceAudioUrl, tailCurrentTime])
-
-  useEffect(() => {
-    if (tailCurrentTime === null) return
-    let raf = 0
-    const tick = () => {
-      const elapsed = (performance.now() - tailStartRef.current) / 1000
-      const t = Math.min(tailBaseRef.current + elapsed, voiceDuration || tailBaseRef.current)
-      setTailCurrentTime(t)
-      tailAudioRef.current.ensurePlayingAt(t)
-      if (t >= (voiceDuration || 0) - 0.05) {
-        tailAudioRef.current.pause()
-        if (playToken != null) onPlayTokenChange?.(null)
-        setTailCurrentTime(null)
-        return
-      }
-      raf = requestAnimationFrame(tick)
-    }
-    raf = requestAnimationFrame(tick)
-    return () => cancelAnimationFrame(raf)
-  }, [tailCurrentTime, voiceDuration, playToken, onPlayTokenChange])
-
-  // 呈现给 UI/进度条的「当前时间」：尾段用虚拟时间，否则用视频时间
-  const displayCurrentTime = tailCurrentTime !== null ? tailCurrentTime : currentTime
-
-  const handleSeekTo = useCallback(
-    (time: number) => {
-      setTailCurrentTime(null)
-      seekTo(time)
-      audioSeekTo(time)
-    },
-    [seekTo, audioSeekTo],
-  )
-
-  // ── 批量网格播放互斥（#1741）：播放权属于其他实例时，本实例自动暂停 ──
-  useEffect(() => {
-    if (activePlayToken == null || playToken == null || activePlayToken === playToken) return
-    if (isPlaying) {
-      pause()
-    }
-    // isPlaying 不放依赖：只在 token 变化时执行一次暂停
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [activePlayToken, playToken])
-
-  const handleTogglePlay = useCallback(() => {
-    if (playToken != null) onPlayTokenChange?.(isPlaying ? null : playToken)
-    togglePlayPause()
-  }, [togglePlayPause, isPlaying, playToken, onPlayTokenChange])
-
-  // P0 fix：音画同步看门狗——有配音时播放时间达到配音时长立即暂停视频+音频（末帧冻结）
-  useEffect(() => {
-    if (!isPlaying) return
-    if (!voiceAudioUrl || voiceDuration <= 0) return
-    if (displayCurrentTime < voiceDuration - 0.08) return
-    pause()
-    audioPause()
-    if (playToken != null) onPlayTokenChange?.(null)
-  }, [
-    isPlaying,
-    displayCurrentTime,
-    voiceAudioUrl,
-    voiceDuration,
-    pause,
-    audioPause,
-    playToken,
-    onPlayTokenChange,
-  ])
-
-  // ── 未就绪 ──
-  if (!ready || !assets.length) {
-    return (
-      <div
-        style={{
-          position: "relative",
-          width: "100%",
-          maxWidth: 280,
-          aspectRatio: "9 / 16",
-          background: "#0a0a0a",
-          borderRadius: 24,
-          overflow: "hidden",
-          boxShadow:
-            "0 4px 6px -1px rgba(0,0,0,0.3), 0 20px 50px -12px rgba(0,0,0,0.5), inset 0 0 0 1px rgba(255,255,255,0.06)",
-          display: "flex",
-          flexDirection: "column",
-          alignItems: "center",
-          justifyContent: "center",
-        }}
-      >
-        <SoundOutlined style={{ fontSize: 40, color: "rgba(255,255,255,0.3)", marginBottom: 12 }} />
-        <p style={{ color: "rgba(255,255,255,0.6)", fontSize: 14, margin: "0 0 4px" }}>
-          准备预览素材...
-        </p>
-        <p style={{ color: "rgba(255,255,255,0.35)", fontSize: 12, margin: 0 }}>
-          加载素材后即可预览播放
-        </p>
-      </div>
-    )
-  }
-
-  // ── 无播放片段 ──
-  if (!canPlay) {
-    return (
-      <div
-        style={{
-          position: "relative",
-          width: "100%",
-          maxWidth: 280,
-          aspectRatio: "9 / 16",
-          background: "#0a0a0a",
-          borderRadius: 24,
-          overflow: "hidden",
-          boxShadow:
-            "0 4px 6px -1px rgba(0,0,0,0.3), 0 20px 50px -12px rgba(0,0,0,0.5), inset 0 0 0 1px rgba(255,255,255,0.06)",
-          display: "flex",
-          flexDirection: "column",
-          alignItems: "center",
-          justifyContent: "center",
-          padding: 24,
-        }}
-      >
-        <PlayCircleOutlined
-          style={{ fontSize: 40, color: "rgba(255,255,255,0.3)", marginBottom: 12 }}
-        />
-        <p style={{ color: "rgba(255,255,255,0.6)", fontSize: 14, margin: "0 0 4px" }}>
-          暂无可播放素材
-        </p>
-        <p style={{ color: "rgba(255,255,255,0.35)", fontSize: 12, margin: 0 }}>
-          请先在左侧选择素材
-        </p>
-      </div>
-    )
-  }
-
-  return (
-    <div
-      ref={playerContainerRef}
-      style={{
-        position: "relative",
-        width: "100%",
-        maxWidth: compact ? "100%" : 280,
-        margin: compact ? 0 : "0 auto",
-        aspectRatio: "9 / 16",
-        background: compact ? "transparent" : "#0a0a0a",
-        borderRadius: compact ? 10 : 24,
-        overflow: "hidden",
-        boxShadow: compact
-          ? "inset 0 0 0 1px rgba(255,255,255,0.06)"
-          : "0 4px 6px -1px rgba(0,0,0,0.3), 0 20px 50px -12px rgba(0,0,0,0.5), inset 0 0 0 1px rgba(255,255,255,0.06)",
-      }}
-    >
-      {/* ── Video 渲染层（默认路径，浏览器原生硬件解码） ── */}
-      {segments.map((seg, i) => (
-        <video
-          key={seg.assetId}
-          ref={(el) => {
-            videoRefs.current[i] = el
-          }}
-          preload="auto"
-          src={seg.videoUrl}
-          style={{
-            position: "absolute",
-            inset: 0,
-            width: "100%",
-            height: "100%",
-            objectFit: "cover",
-            background: "#000",
-            zIndex: 1,
-            opacity: i === currentSegmentIndex ? 1 : 0,
-            pointerEvents: i === currentSegmentIndex ? "auto" : "none",
-          }}
-          muted={hasVoice || muted}
-          playsInline
-        />
-      ))}
-
-      {/* 标题CSS叠加层 — 与后端 ASS 烧录坐标系 1:1 对齐 */}
-      {titleSettings?.title && (
-        <div
-          style={{
-            position: "absolute",
-            inset: 0,
-            zIndex: 5,
-            pointerEvents: "none",
-            overflow: "hidden",
-          }}
-        >
-          <div
-            style={{
-              position: "absolute",
-              width: `${100 - 2 * titleSidePct}%`,
-              maxWidth: `${100 - 2 * titleSidePct}%`,
-              ...(customTitleXPct != null && customTitleYPct != null
-                ? {
-                    left: `${customTitleXPct}%`,
-                    top: `${customTitleYPct}%`,
-                    transform: "translate(-50%, -50%)",
-                    textAlign: "center" as const,
-                  }
-                : {
-                    left: "50%",
-                    transform: "translateX(-50%)",
-                    textAlign: "center" as const,
-                    ...(titleSettings.position === "top"
-                      ? { top: `${titleTopPct}%` }
-                      : titleSettings.position === "center"
-                        ? { top: "50%", transform: "translate(-50%, -50%)" }
-                        : { bottom: `${titleBottomPct}%` }),
-                  }),
-              pointerEvents: onTitlePositionChange && playToken == null ? "auto" : "none",
-              cursor: onTitlePositionChange && playToken == null ? "grab" : "default",
-              touchAction: "none",
-              userSelect: "none",
-              WebkitUserSelect: "none",
-              padding: "8px 12px",
-              boxShadow: "inset 0 0 0 16px transparent",
-            }}
-            ref={titleDragRef}
-            onPointerDown={handleTitlePointerDown}
-            onPointerMove={handleTitlePointerMove}
-            onPointerUp={handleTitlePointerUp}
-            onPointerCancel={handleTitlePointerUp}
-          >
-            <span
-              style={{
-                fontSize: `${titleFontSizePx}px`,
-                fontFamily: getFontFamily(titleSettings.font || "思源黑体"),
-                color: titleSettings.color || "#ffffff",
-                fontWeight: titleSettings.bold ? 700 : 400,
-                fontStyle: titleSettings.italic ? "italic" : "normal",
-                lineHeight: 1.05,
-                wordBreak: "break-word",
-                WebkitTextStroke: titleSettings.stroke
-                  ? `${titleStrokeWidth}px #000000`
-                  : undefined,
-                textShadow: titleSettings.shadow
-                  ? `${titleShadowOffset}px ${titleShadowOffset}px ${titleShadowBlur}px rgba(0,0,0,0.8)`
-                  : undefined,
-              }}
-            >
-              {(effectiveTitle || "").split(/[/／]/).map((part, i) => (
-                <span key={i}>
-                  {i > 0 && <br />}
-                  {part}
-                </span>
-              ))}
-            </span>
-          </div>
-        </div>
-      )}
-
-      <PreviewControls
-        isPlaying={isPlaying}
-        onTogglePlay={handleTogglePlay}
-        muted={muted}
-        onToggleMute={() => setMuted((m) => !m)}
-        hasSegments={segments.length > 0}
-        segmentIndex={currentSegmentIndex}
-        segmentCount={segments.length}
-        currentTime={displayCurrentTime}
-        totalDuration={effectiveTotalDuration}
-        onSeek={handleSeekTo}
-        compact={compact}
-      />
-    </div>
-  )
-}
-
-export default FrontendPreviewPlayer

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

@@ -5,7 +5,7 @@
  * 步骤 1~3：上一步 / 下一步
  * 步骤 4（确认生成/进度）：未开始 →「✨ 确认生成视频」；生成中 →「⏳ 视频渲染中…」；
  *                       失败 →「🔄 重新生成」；全部完成 →「下一步：选择封面 →」
- * 步骤 5（选择封面）：仅上一步，无主按钮
+ * 步骤 5（选择封面）：上一步 + 完成按钮
  */
 import React from "react"
 import { Tooltip } from "antd"
@@ -32,6 +32,10 @@ export interface GenerateStepActionsProps {
   freeClipsUsedThisTime?: number
   /** 前往充值 */
   onRecharge?: () => void
+  /** Step5 点击完成（保存入库并跳转） */
+  onFinish?: () => void | Promise<void>
+  /** Step5 保存中 */
+  finishing?: boolean
 }
 
 const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
@@ -48,6 +52,8 @@ const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
   insufficientReason,
   freeClipsUsedThisTime,
   onRecharge,
+  onFinish,
+  finishing,
 }) => {
   const renderPrimaryButton = () => {
     /* 步骤 1~3：上一步 / 下一步 */
@@ -126,8 +132,18 @@ const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
       )
     }
 
-    /* 步骤 5（封面，最后一步）：无主按钮 */
-    return null
+    /* 步骤 5（封面，最后一步）：完成按钮 */
+    return (
+      <button
+        className="xx-btn xx-btn-primary"
+        onClick={() => {
+          if (onFinish && !finishing) void onFinish()
+        }}
+        disabled={finishing}
+      >
+        {finishing ? "⏳ 保存中…" : "✅ 完成"}
+      </button>
+    )
   }
 
   return (

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

@@ -4,10 +4,8 @@
  * 原步骤"选择配音"已从主流程移除，改为 Step1 下一步分支弹窗（VoiceSelectModal / ScriptSelectModal → TtsVoiceModal）。
  */
 import React from "react"
-import type { EditPlanClip } from "@/api/template-editor"
 import type { CoverConfig } from "../types/cover"
 import type { TitleSettings } from "../types"
-import type { ScriptItem } from "@/api/scripts"
 import Step1EditMode from "./Step1EditMode"
 import type { EditMode } from "./Step1EditMode"
 import Step2MaterialSelect from "../components/Step2MaterialSelect"
@@ -16,6 +14,7 @@ import Step6CoverSettings from "../components/Step6CoverSettings"
 import BatchGenerationGrid from "./BatchGenerationGrid"
 import type { BatchTaskState } from "../hooks/generate-video/useGenerationPolling"
 import type { GeneratedVideo } from "@/api/template-editor"
+import type { TitleTemplate } from "@/components/title/template-types"
 
 export interface GenerateStepContentProps {
   currentStep: number
@@ -51,15 +50,23 @@ export interface GenerateStepContentProps {
   onToggleStroke: () => void
   onToggleShadow: () => void
   onApplyPreset: (presetKey: string) => void
+  onUpdateStyle?: (patch: Partial<TitleSettings>) => void
   activePreset: string | null
-  titlePresets: { key: string; label: string; previewStyle: React.CSSProperties }[]
+  titlePresets: Array<{
+    key: string
+    label: string
+    emoji?: string
+    style: Record<string, unknown>
+  }>
+  enableTemplates?: boolean
+  selectedTemplateId?: string | null
+  onApplyTemplate?: (settings: import("../types").TitleSettings, template: TitleTemplate) => void
   /* ── 封面 ── */
   coverSettings: CoverConfig
   onCoverSettingsChange: (settings: CoverConfig) => void
   /* ── 配音 ── */
   selectedVoice: string
   onSelectedVoiceChange: (id: string) => void
-  onServerClipsChange: (clips: EditPlanClip[]) => void
   /* ── 生成 ── */
   generating: boolean
   generated: boolean
@@ -82,10 +89,12 @@ export interface GenerateStepContentProps {
   previewCovers: string[]
   onPreviewCoversChange: (urls: string[]) => void
   selectedVariantIds?: number[]
-  /* ── 摘要信息（#1970 Step4 展示用） ── */
-  selectedScript: ScriptItem | null
-  ttsVoiceId: string
-  ttsVoiceSource: "preset" | "clone"
+  selectedCoverTemplate?: string
+  onSelectedCoverTemplateChange?: (templateId: string) => void
+  /** 单视频任务 ID（兜底，awaiting_cover 状态下 results 接口未入库时用） */
+  currentTaskId?: string
+  /** Step3 右上角确认生成按钮 */
+  onConfirmGenerate?: () => void | Promise<void>
 }
 
 export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) => {
@@ -119,11 +128,14 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
     onToggleStroke,
     onToggleShadow,
     onApplyPreset,
+    onUpdateStyle,
+    enableTemplates,
+    selectedTemplateId,
+    onApplyTemplate,
     activePreset,
     titlePresets,
     coverSettings,
     onCoverSettingsChange,
-    onServerClipsChange,
     generating,
     generateError,
     progress,
@@ -136,18 +148,11 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
     previewCovers,
     onPreviewCoversChange,
     selectedVariantIds,
-    selectedScript,
-    ttsVoiceId,
-    ttsVoiceSource,
+    selectedCoverTemplate,
+    onSelectedCoverTemplateChange,
+    onConfirmGenerate,
   } = props
 
-  const handleClipsChange = React.useCallback(
-    (clips: EditPlanClip[], _templateId?: string) => {
-      onServerClipsChange(clips)
-    },
-    [onServerClipsChange],
-  )
-
   switch (currentStep) {
     case 1:
       return (
@@ -175,7 +180,6 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           clipCount={clipCount}
           onClipCountChange={onClipCountChange}
           selectedTemplate={selectedTemplate}
-          onServerClipsChange={handleClipsChange}
         />
       )
     case 3:
@@ -191,50 +195,25 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           onToggleStroke={onToggleStroke}
           onToggleShadow={onToggleShadow}
           onApplyPreset={onApplyPreset}
+          onUpdateStyle={onUpdateStyle}
           activePreset={activePreset}
           titlePresets={titlePresets}
+          enableTemplates={enableTemplates}
+          selectedTemplateId={selectedTemplateId}
+          onApplyTemplate={onApplyTemplate}
           previewCount={previewCount}
           previewTitles={previewTitles}
           onPreviewTitlesChange={onPreviewTitlesChange}
+          onConfirmGenerate={onConfirmGenerate}
+          generating={props.generating}
+          selectedCount={
+            props.previewCount && props.previewCount > 1 ? props.selectedVariantIds?.length || 1 : 1
+          }
         />
       )
     case 4:
       return (
         <div className="xx-form-section">
-          {/* 配置摘要（#1970） */}
-          <div
-            style={{
-              padding: 14,
-              background: "#f9fafb",
-              borderRadius: 8,
-              marginBottom: 16,
-              fontSize: 13,
-              lineHeight: 1.8,
-              color: "#374151",
-            }}
-          >
-            <div style={{ fontWeight: 600, fontSize: 14, marginBottom: 6, color: "#111" }}>
-              📋 生成配置
-            </div>
-            <div>🎬 剪辑模式：{editMode === "random" ? "🎲 随机混剪" : "📖 叙事剪辑"}</div>
-            {editMode === "random" ? (
-              <div>🎙️ 配音来源：配音库音频</div>
-            ) : (
-              <>
-                <div>📝 文案：{selectedScript?.title ?? "未选择"}</div>
-                <div>
-                  🎙️ 合成配音音色：
-                  {ttsVoiceId
-                    ? `${ttsVoiceSource === "clone" ? "克隆音色" : "系统音色"}（${ttsVoiceId.slice(0, 8)}...）`
-                    : "未选择"}
-                </div>
-              </>
-            )}
-            <div>📱 视频比例：{videoRatio}</div>
-            <div>🎯 智能降重：{dedupEnabled ? "已开启" : "已关闭"}</div>
-            {previewCount > 1 && <div>📦 生成数量：{previewCount} 个</div>}
-          </div>
-
           {previewCount > 1 ? (
             <BatchGenerationGrid
               tasks={batchTasks}
@@ -285,6 +264,9 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           previewCovers={previewCovers}
           onPreviewCoversChange={onPreviewCoversChange}
           selectedVariantIndexes={selectedVariantIds}
+          selectedTemplate={selectedCoverTemplate}
+          onTemplateChange={onSelectedCoverTemplateChange}
+          currentTaskId={props.currentTaskId}
         />
       )
     default:

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

@@ -1,195 +0,0 @@
-import React from "react"
-import {
-  PlayCircleOutlined,
-  PauseCircleOutlined,
-  AudioOutlined,
-  AudioMutedOutlined,
-} from "@ant-design/icons"
-import { PreviewProgressBar } from "./PreviewProgressBar"
-
-interface PreviewControlsProps {
-  isPlaying: boolean
-  onTogglePlay: () => void
-  muted: boolean
-  onToggleMute: () => void
-  hasSegments: boolean
-  segmentIndex: number
-  segmentCount: number
-  currentTime: number
-  totalDuration: number
-  onSeek: (time: number) => void
-  compact?: boolean
-}
-
-/**
- * 播放控制 UI 组件（静音按钮 / 片段指示器 / 中央播放按钮 / 底部毛玻璃控制条）
- */
-export const PreviewControls: React.FC<PreviewControlsProps> = ({
-  isPlaying,
-  onTogglePlay,
-  muted,
-  onToggleMute,
-  hasSegments,
-  segmentIndex,
-  segmentCount,
-  currentTime,
-  totalDuration,
-  onSeek,
-  compact = false,
-}) => {
-  return (
-    <>
-      {/* 静音/有声切换（#1741）：左上角 */}
-      {hasSegments && (
-        <button
-          type="button"
-          aria-label={muted ? "取消静音" : "静音"}
-          title={muted ? "取消静音" : "静音"}
-          onClick={onToggleMute}
-          style={{
-            position: "absolute",
-            top: 8,
-            left: 8,
-            width: compact ? 26 : 30,
-            height: compact ? 26 : 30,
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            background: "rgba(0,0,0,0.45)",
-            backdropFilter: "blur(8px)",
-            WebkitBackdropFilter: "blur(8px)",
-            border: "1px solid rgba(255,255,255,0.1)",
-            borderRadius: "50%",
-            color: muted ? "rgba(255,255,255,0.45)" : "rgba(255,255,255,0.92)",
-            fontSize: compact ? 13 : 15,
-            cursor: "pointer",
-            zIndex: 10,
-            padding: 0,
-            transition: "background 0.15s, color 0.15s",
-          }}
-          onMouseEnter={(e) => {
-            e.currentTarget.style.background = "rgba(0,0,0,0.65)"
-          }}
-          onMouseLeave={(e) => {
-            e.currentTarget.style.background = "rgba(0,0,0,0.45)"
-          }}
-        >
-          {muted ? <AudioMutedOutlined /> : <AudioOutlined />}
-        </button>
-      )}
-
-      {/* 片段指示器 — 右上角胶囊 */}
-      <div
-        style={{
-          position: "absolute",
-          top: 8,
-          right: 8,
-          background: "rgba(0,0,0,0.45)",
-          backdropFilter: "blur(8px)",
-          WebkitBackdropFilter: "blur(8px)",
-          color: "rgba(255,255,255,0.9)",
-          fontSize: compact ? 9 : 10,
-          fontWeight: 500,
-          padding: compact ? "1px 6px" : "2px 8px",
-          borderRadius: 999,
-          zIndex: 10,
-          border: "1px solid rgba(255,255,255,0.1)",
-          letterSpacing: 0.3,
-        }}
-      >
-        {`${segmentIndex + 1} / ${segmentCount}`}
-      </div>
-
-      {/* 中央播放按钮 */}
-      {!isPlaying && (
-        <button
-          onClick={onTogglePlay}
-          style={{
-            position: "absolute",
-            top: "50%",
-            left: "50%",
-            transform: "translate(-50%, -50%)",
-            background: "rgba(0,0,0,0.45)",
-            backdropFilter: "blur(12px)",
-            WebkitBackdropFilter: "blur(12px)",
-            border: "1px solid rgba(255,255,255,0.15)",
-            borderRadius: "50%",
-            width: 52,
-            height: 52,
-            cursor: "pointer",
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            color: "#fff",
-            fontSize: 26,
-            zIndex: 10,
-            transition: "transform 0.2s ease, background 0.2s ease",
-            boxShadow: "0 4px 20px rgba(0,0,0,0.4)",
-          }}
-          onMouseEnter={(e) => {
-            e.currentTarget.style.transform = "translate(-50%, -50%) scale(1.08)"
-            e.currentTarget.style.background = "rgba(0,0,0,0.6)"
-          }}
-          onMouseLeave={(e) => {
-            e.currentTarget.style.transform = "translate(-50%, -50%) scale(1)"
-            e.currentTarget.style.background = "rgba(0,0,0,0.45)"
-          }}
-        >
-          <PlayCircleOutlined />
-        </button>
-      )}
-
-      {/* 控制条 — 手机风格毛玻璃 */}
-      <div
-        style={{
-          position: "absolute",
-          bottom: 0,
-          left: 0,
-          right: 0,
-          display: "flex",
-          alignItems: "center",
-          gap: compact ? 6 : 10,
-          padding: compact ? "8px 10px 10px" : "12px 16px 16px",
-          background: "linear-gradient(transparent, rgba(0,0,0,0.7))",
-          backdropFilter: "blur(4px)",
-          WebkitBackdropFilter: "blur(4px)",
-          zIndex: 10,
-        }}
-      >
-        <button
-          onClick={onTogglePlay}
-          style={{
-            background: "rgba(255,255,255,0.15)",
-            border: "none",
-            color: "#fff",
-            fontSize: compact ? 14 : 16,
-            cursor: "pointer",
-            width: compact ? 26 : 32,
-            height: compact ? 26 : 32,
-            borderRadius: "50%",
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            flexShrink: 0,
-            transition: "background 0.15s",
-          }}
-          onMouseEnter={(e) => {
-            e.currentTarget.style.background = "rgba(255,255,255,0.25)"
-          }}
-          onMouseLeave={(e) => {
-            e.currentTarget.style.background = "rgba(255,255,255,0.15)"
-          }}
-        >
-          {isPlaying ? <PauseCircleOutlined /> : <PlayCircleOutlined />}
-        </button>
-
-        <PreviewProgressBar
-          currentTime={currentTime}
-          totalDuration={totalDuration}
-          onSeek={onSeek}
-          compact={compact}
-        />
-      </div>
-    </>
-  )
-}

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

@@ -1,127 +0,0 @@
-/**
- * 生成数量选择弹窗（Issue #1677）
- * Step1 选完模板点「下一步」时弹出：要生成几个视频？（1~10）
- * 默认 1，回车 = 1（零额外操作）
- */
-import React, { useState, useEffect, useRef } from "react"
-import { MAX_PREVIEW_COUNT } from "../constants"
-
-interface PreviewCountModalProps {
-  open: boolean
-  /** 默认值（上次选择，默认1） */
-  defaultCount?: number
-  onConfirm: (count: number) => void
-  onCancel: () => void
-}
-
-const PreviewCountModal: React.FC<PreviewCountModalProps> = ({
-  open,
-  defaultCount = 1,
-  onConfirm,
-  onCancel,
-}) => {
-  const [count, setCount] = useState(defaultCount)
-  const inputRef = useRef<HTMLInputElement>(null)
-
-  useEffect(() => {
-    if (open) {
-      setCount(defaultCount)
-      // 弹窗打开后聚焦并选中，方便直接回车=默认1
-      setTimeout(() => inputRef.current?.focus(), 50)
-    }
-  }, [open, defaultCount])
-
-  const clamp = (n: number) => Math.max(1, Math.min(MAX_PREVIEW_COUNT, n || 1))
-
-  const handleConfirm = () => {
-    onConfirm(clamp(count))
-  }
-
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === "Enter") {
-      e.preventDefault()
-      handleConfirm()
-    }
-    if (e.key === "Escape") {
-      onCancel()
-    }
-  }
-
-  if (!open) return null
-
-  return (
-    <div className="xx-modal-mask" onClick={onCancel}>
-      <div className="xx-modal-box xx-count-modal" onClick={(e) => e.stopPropagation()}>
-        <h3 style={{ margin: "0 0 8px", fontSize: 18 }}>要生成几个视频？</h3>
-        <p style={{ margin: "0 0 20px", fontSize: 13, color: "var(--text-secondary, #666)" }}>
-          素材共用，AI 随机剪辑出不同版本，每个视频可独立设置标题、配音和封面
-        </p>
-
-        <div className="xx-count-selector">
-          <button
-            type="button"
-            className="xx-count-btn"
-            onClick={() => setCount((c) => clamp(c - 1))}
-            disabled={count <= 1}
-            aria-label="减少"
-          >
-            −
-          </button>
-          <input
-            ref={inputRef}
-            type="number"
-            min={1}
-            max={MAX_PREVIEW_COUNT}
-            value={count}
-            onChange={(e) => setCount(clamp(parseInt(e.target.value, 10) || 1))}
-            onKeyDown={handleKeyDown}
-            className="xx-count-input"
-          />
-          <button
-            type="button"
-            className="xx-count-btn"
-            onClick={() => setCount((c) => clamp(c + 1))}
-            disabled={count >= MAX_PREVIEW_COUNT}
-            aria-label="增加"
-          >
-            +
-          </button>
-        </div>
-
-        <div className="xx-count-quick">
-          {[1, 3, 5, 10].map((n) => (
-            <button
-              key={n}
-              type="button"
-              className={`xx-count-chip ${count === n ? "active" : ""}`}
-              onClick={() => setCount(n)}
-            >
-              {n} 个
-            </button>
-          ))}
-        </div>
-
-        <div className="xx-count-actions">
-          <button type="button" className="xx-btn xx-btn-ghost" onClick={onCancel}>
-            取消
-          </button>
-          <button type="button" className="xx-btn xx-btn-primary" onClick={handleConfirm}>
-            {count === 1 ? "生成 1 个视频" : `生成 ${count} 个视频`}
-          </button>
-        </div>
-        <p
-          style={{
-            margin: "12px 0 0",
-            fontSize: 12,
-            color: "var(--text-tertiary, #999)",
-            textAlign: "center",
-          }}
-        >
-          直接按回车 = 生成 1 个
-        </p>
-      </div>
-    </div>
-  )
-}
-
-export default PreviewCountModal

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

@@ -1,108 +0,0 @@
-import React, { useCallback, useEffect, useRef, useState } from "react"
-import { formatDuration } from "../utils/formatDuration"
-
-interface PreviewProgressBarProps {
-  currentTime: number
-  totalDuration: number
-  onSeek: (time: number) => void
-  compact?: boolean
-}
-
-/**
- * 进度条组件：点击/拖拽 seek
- */
-export const PreviewProgressBar: React.FC<PreviewProgressBarProps> = ({
-  currentTime,
-  totalDuration,
-  onSeek,
-  compact = false,
-}) => {
-  const progressRef = useRef<HTMLDivElement>(null)
-  const [isDragging, setIsDragging] = useState(false)
-
-  const seekByClientX = useCallback(
-    (clientX: number) => {
-      if (!progressRef.current || totalDuration <= 0) return
-      const rect = progressRef.current.getBoundingClientRect()
-      const ratio = Math.max(0, Math.min(1, (clientX - rect.left) / rect.width))
-      onSeek(ratio * totalDuration)
-    },
-    [totalDuration, onSeek],
-  )
-
-  const handleMouseDown = useCallback(
-    (e: React.MouseEvent<HTMLDivElement>) => {
-      setIsDragging(true)
-      seekByClientX(e.clientX)
-    },
-    [seekByClientX],
-  )
-
-  useEffect(() => {
-    if (!isDragging) return
-    const handleMouseMove = (e: MouseEvent) => seekByClientX(e.clientX)
-    const handleMouseUp = () => setIsDragging(false)
-    window.addEventListener("mousemove", handleMouseMove)
-    window.addEventListener("mouseup", handleMouseUp)
-    return () => {
-      window.removeEventListener("mousemove", handleMouseMove)
-      window.removeEventListener("mouseup", handleMouseUp)
-    }
-  }, [isDragging, seekByClientX])
-
-  const progressPercent = totalDuration > 0 ? (currentTime / totalDuration) * 100 : 0
-
-  return (
-    <>
-      <span
-        style={{
-          fontSize: compact ? 10 : 11,
-          color: "rgba(255,255,255,0.85)",
-          minWidth: compact ? 58 : 72,
-          fontVariantNumeric: "tabular-nums",
-          letterSpacing: 0.2,
-        }}
-      >
-        {formatDuration(currentTime)} / {formatDuration(totalDuration)}
-      </span>
-
-      <div
-        ref={progressRef}
-        onMouseDown={handleMouseDown}
-        style={{
-          flex: 1,
-          height: 3,
-          background: "rgba(255,255,255,0.2)",
-          borderRadius: 2,
-          cursor: "pointer",
-          position: "relative",
-        }}
-      >
-        <div
-          style={{
-            height: "100%",
-            width: `${progressPercent}%`,
-            background: "#fff",
-            borderRadius: 2,
-            transition: isDragging ? "none" : "width 0.1s linear",
-          }}
-        />
-        <div
-          style={{
-            position: "absolute",
-            top: "50%",
-            left: `${progressPercent}%`,
-            transform: "translate(-50%, -50%)",
-            width: 10,
-            height: 10,
-            borderRadius: "50%",
-            background: "#fff",
-            boxShadow: "0 0 6px rgba(255,255,255,0.5)",
-            opacity: isDragging ? 1 : 0,
-            transition: "opacity 0.15s",
-          }}
-        />
-      </div>
-    </>
-  )
-}

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

@@ -1,23 +1,19 @@
 /**
  * Step 4 选择标题（Issue #1677 批量生成）
  *
- * 布局（由 GeneratePage 编排）：左侧大区域实时预览（单=大播放器，批量=Canvas 网格），
- * 右侧边栏标题设置。本组件渲染在右侧边栏：
- * - 单视频：AI 标题生成器 + AutoComplete 标题库（与旧版完全一致，零回归）
- * - 批量：N 个独立标题输入框（AutoComplete 支持标题库选择）+ 批量 AI 生成
- *   （一次生成 N 个标题，分别填入各变体，可单独换一个）
+ * 布局：全宽区域，标题输入 + 标题模板卡片网格。
+ * - 单视频：TitleLibraryAutoComplete 标题库输入
+ * - 批量：N 个独立标题输入框（AutoComplete 支持标题库选择）
  * - 标题样式（字体/颜色/位置/大小/粗斜描边/预设）：全局统一
  */
-import React, { useMemo, useState } from "react"
-import { Input, message } from "antd"
-import { LoadingOutlined } from "@ant-design/icons"
+import React, { useMemo } from "react"
 import type { TitleSettings } from "../types"
-import { POSITION_OPTIONS, FONT_OPTIONS } from "../constants"
+import { POSITION_OPTIONS } from "../constants"
+import { FONT_OPTIONS } from "@/components/title/constants"
 import { useStep4Title } from "../hooks/useStep4Title"
-import AiTitleGenerator from "./title/AiTitleGenerator"
 import TitleLibraryAutoComplete from "./title/TitleLibraryAutoComplete"
 import TitleStylePanel from "./title/TitleStylePanel"
-import { AI_TITLE_TEMPLATES } from "../constants"
+import type { TitleTemplate } from "@/components/title/template-types"
 
 interface Step4TitleSettingsProps {
   titleSettings: TitleSettings
@@ -33,44 +29,30 @@ interface Step4TitleSettingsProps {
   onToggleStroke: () => void
   onToggleShadow: () => void
   onApplyPreset: (presetKey: string) => void
+  onUpdateStyle?: (patch: Partial<TitleSettings>) => void
   activePreset: string | null
-  titlePresets: { key: string; label: string; previewStyle: React.CSSProperties }[]
+  titlePresets: Array<{
+    key: string
+    label: string
+    emoji?: string
+    style?: Record<string, unknown>
+    previewStyle?: React.CSSProperties
+  }>
   /* ── 批量生成（#1677）── */
   /** 生成数量 */
   previewCount?: number
   /** 每个变体的标题文字（长度=previewCount） */
   previewTitles?: string[]
   onPreviewTitlesChange?: (titles: string[]) => void
-}
-
-/** 从本地 AI 标题模板池按主题词生成 N 个不同标题（与单视频 AI 生成同源） */
-function buildBatchAiTitles(topic: string, count: number): string[] {
-  const styles: Array<"catchy" | "emotional" | "informative"> = [
-    "catchy",
-    "emotional",
-    "informative",
-  ]
-  const pool: string[] = []
-  styles.forEach((style) => {
-    const templates = AI_TITLE_TEMPLATES[style] || []
-    templates.forEach((tpl) => pool.push(tpl.replace(/\{topic\}/g, topic)))
-  })
-  // 洗牌后取前 count 个；不足则轮转补齐
-  const shuffled = [...pool].sort(() => Math.random() - 0.5)
-  const out: string[] = []
-  for (let i = 0; i < count; i++) {
-    out.push(shuffled[i % shuffled.length] || "")
-  }
-  return out
-}
-
-function extractTopic(text: string): string {
-  const keywords = text
-    .replace(/[，。！？、,.!?]/g, " ")
-    .split(/\s+/)
-    .filter(Boolean)
-  if (keywords.length === 0) return "这个话题"
-  return keywords.slice(0, 3).join("")
+  enableTemplates?: boolean
+  selectedTemplateId?: string | null
+  onApplyTemplate?: (settings: TitleSettings, template: TitleTemplate) => void
+  /** Step3 右上角「🎬 确认生成」主按钮 */
+  onConfirmGenerate?: () => void | Promise<void>
+  /** 是否生成中 */
+  generating?: boolean
+  /** 批量模式下勾选数量 */
+  selectedCount?: number
 }
 
 const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
@@ -84,16 +66,21 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
     onToggleStroke,
     onToggleShadow,
     onApplyPreset,
+    onUpdateStyle,
     activePreset,
     titlePresets,
     previewCount = 1,
     previewTitles,
     onPreviewTitlesChange,
+    enableTemplates,
+    selectedTemplateId,
+    onApplyTemplate,
+    onConfirmGenerate,
+    generating,
+    selectedCount = 1,
   } = props
 
   const isBatch = previewCount > 1
-  const [batchAiLoading, setBatchAiLoading] = useState(false)
-  const [batchAiTopic, setBatchAiTopic] = useState("")
 
   /** 更新单个变体标题；变体0同步写回 titleSettings.title（全局样式面板/草稿/TTS 链路依赖） */
   const updateVariantTitle = (index: number, val: string) => {
@@ -106,117 +93,71 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
     }
   }
 
-  /** 批量 AI 生成：按主题词生成标题，分别填入 N 个变体 */
-  const handleBatchAiGenerate = async (onlyEmpty = false) => {
-    if (!onPreviewTitlesChange || !previewTitles) return
-    const topic = (batchAiTopic || t.aiTitleInput || "").trim()
-    if (!topic) {
-      message.warning("请先输入主题词，例如：萌宠日常、旅行vlog")
-      return
-    }
-    setBatchAiLoading(true)
-    try {
-      // 与单视频一致：本地模板模拟 AI 生成（1200ms 体验延迟）
-      await new Promise((resolve) => setTimeout(resolve, 800))
-      const picked = buildBatchAiTitles(extractTopic(topic), previewCount)
-      const next = [...previewTitles]
-      for (let i = 0; i < previewCount; i++) {
-        if (onlyEmpty && next[i]?.trim()) continue
-        if (picked[i]) next[i] = picked[i]
-      }
-      onPreviewTitlesChange(next)
-      if (next[0]) t.updateTitle(next[0])
-      message.success(`已为 ${previewCount} 个视频生成标题，可单独修改`)
-    } finally {
-      setBatchAiLoading(false)
-    }
-  }
-
   const titleOptions = useMemo(
     () => t.userTitles.map((ut) => ({ label: ut.content, value: ut.content })),
     [t.userTitles],
   )
 
   return (
-    <div className="xx-form-section xx-title-sidebar">
+    <div className="xx-form-section" style={{ position: "relative" }}>
+      {/* ── 右上角「🎬 确认生成」主按钮 ── */}
+      {onConfirmGenerate && (
+        <button
+          type="button"
+          onClick={() => {
+            if (generating) return
+            void onConfirmGenerate()
+          }}
+          disabled={generating}
+          style={{
+            position: "absolute",
+            top: 0,
+            right: 0,
+            background: generating ? "#a78bfa" : "#7c3aed",
+            color: "#fff",
+            border: "none",
+            borderRadius: 10,
+            padding: "12px 24px",
+            fontSize: 15,
+            fontWeight: 600,
+            cursor: generating ? "not-allowed" : "pointer",
+            boxShadow: "0 4px 14px rgba(124,58,237,0.4)",
+            transition: "all .2s",
+            zIndex: 5,
+            whiteSpace: "nowrap",
+          }}
+          onMouseEnter={(e) => {
+            if (!generating) (e.currentTarget as HTMLButtonElement).style.background = "#6d28d9"
+          }}
+          onMouseLeave={(e) => {
+            if (!generating) (e.currentTarget as HTMLButtonElement).style.background = "#7c3aed"
+          }}
+        >
+          {generating
+            ? "⏳ 生成中..."
+            : selectedCount > 1
+              ? `🎬 确认生成 ${selectedCount} 个视频`
+              : "🎬 确认生成"}
+        </button>
+      )}
       <h3>📝 选择标题</h3>
 
       {!isBatch ? (
-        /* ── 单视频：原有 AI 标题 + 输入框（保持不变，零回归） ── */
-        <>
-          {t.titleSettings.aiAutoSelect ? (
-            <>
-              <div className="xx-title-ai-toggle">
-                <span className="xx-toggle-label">AI 自动选择标题</span>
-                <div className="xx-switch active" onClick={t.toggleAiAutoSelect}>
-                  <div className="xx-switch-knob" />
-                </div>
-              </div>
-              <div className="xx-form-field">
-                <label>当前 AI 选定标题</label>
-                <div
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    gap: 10,
-                    padding: "8px 12px",
-                    background: "var(--bg-secondary, rgba(0,0,0,0.04))",
-                    borderRadius: 8,
-                    fontSize: 14,
-                    color: "var(--text-primary, #333)",
-                  }}
-                >
-                  <span style={{ flex: 1 }}>
-                    {(previewTitles?.[0] ?? t.titleSettings.title) || "AI 将自动为你选择标题"}
-                  </span>
-                  <button
-                    type="button"
-                    className="xx-btn xx-btn-primary"
-                    style={{ flexShrink: 0, fontSize: 13, padding: "4px 12px" }}
-                    onClick={t.autoGenerateTitle}
-                  >
-                    🔄 换一个
-                  </button>
-                </div>
-              </div>
-            </>
-          ) : (
-            <>
-              <AiTitleGenerator
-                inputValue={t.aiTitleInput}
-                onInputChange={t.setAiTitleInput}
-                generating={t.aiTitleGenerating}
-                onGenerate={t.handleGenerateAiTitles}
-                results={t.aiTitleResults}
-                hasGenerated={t.hasGeneratedTitles}
-                onSelect={t.handleSelectAiTitle}
-                selectedTitle={t.titleSettings.title}
-                onRefresh={t.handleRefreshAiTitles}
-              />
-
-              <div className="xx-title-ai-toggle">
-                <span className="xx-toggle-label">AI 自动选择标题</span>
-                <div className="xx-switch" onClick={t.toggleAiAutoSelect}>
-                  <div className="xx-switch-knob" />
-                </div>
-              </div>
-              <div className="xx-form-field">
-                <label>标题</label>
-                <TitleLibraryAutoComplete
-                  placeholder="输入或从标题库选择"
-                  value={previewTitles?.[0] ?? t.titleSettings.title}
-                  onChange={(val) => {
-                    t.updateTitle(val || "")
-                    onPreviewTitlesChange?.([val || ""])
-                  }}
-                  options={titleOptions}
-                />
-              </div>
-            </>
-          )}
-        </>
+        /* ── 单视频：标题输入框 ── */
+        <div className="xx-form-field" style={{ maxWidth: 640 }}>
+          <label>标题</label>
+          <TitleLibraryAutoComplete
+            placeholder="输入或从标题库选择"
+            value={previewTitles?.[0] ?? t.titleSettings.title}
+            onChange={(val) => {
+              t.updateTitle(val || "")
+              onPreviewTitlesChange?.([val || ""])
+            }}
+            options={titleOptions}
+          />
+        </div>
       ) : (
-        /* ── 批量：AI 批量生成 + N 个独立标题输入框（AutoComplete 支持标题库） ── */
+        /* ── 批量：N 个独立标题输入框 ── */
         <div className="xx-batch-titles">
           <div
             style={{
@@ -226,42 +167,11 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
               lineHeight: 1.6,
             }}
           >
-            为每个视频输入独立标题，修改会实时叠加到左侧对应视频上。标题样式（字体/颜色/位置）全局统一。
-          </div>
-
-          {/* 批量 AI 标题 */}
-          <div className="xx-batch-ai-row">
-            <Input
-              placeholder="主题词，如：萌宠日常、旅行vlog"
-              value={batchAiTopic || t.aiTitleInput}
-              onChange={(e) => {
-                setBatchAiTopic(e.target.value)
-                t.setAiTitleInput(e.target.value)
-              }}
-              maxLength={30}
-              size="small"
-              style={{ flex: 1 }}
-            />
-            <button
-              type="button"
-              className="xx-btn xx-btn-primary xx-btn-sm"
-              disabled={batchAiLoading}
-              onClick={() => handleBatchAiGenerate(false)}
-            >
-              {batchAiLoading ? <LoadingOutlined /> : "✨"} 一键生成 {previewCount} 个标题
-            </button>
-            <button
-              type="button"
-              className="xx-btn xx-btn-ghost xx-btn-sm"
-              disabled={batchAiLoading}
-              onClick={() => handleBatchAiGenerate(true)}
-            >
-              补填空标题
-            </button>
+            为每个视频输入独立标题。标题样式（字体/颜色/位置）全局统一。
           </div>
 
           {Array.from({ length: previewCount }, (_, i) => (
-            <div className="xx-form-field" key={i}>
+            <div className="xx-form-field" key={i} style={{ maxWidth: 640 }}>
               <label>视频 {i + 1} 标题</label>
               <TitleLibraryAutoComplete
                 placeholder={`输入或选择视频 ${i + 1} 的标题`}
@@ -285,10 +195,15 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
         onToggleStroke={onToggleStroke}
         onToggleShadow={onToggleShadow}
         onApplyPreset={onApplyPreset}
+        onUpdateStyle={onUpdateStyle}
+        showCoverToggle
         activePreset={activePreset}
         titlePresets={titlePresets}
         POSITION_OPTIONS={POSITION_OPTIONS}
         FONT_OPTIONS={FONT_OPTIONS}
+        enableTemplates={enableTemplates}
+        selectedTemplateId={selectedTemplateId}
+        onApplyTemplate={onApplyTemplate}
       />
     </div>
   )

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

@@ -1,84 +1,192 @@
 /**
- * Step 5 选择封面（Issue #1677 批量生成改造）
- * - 单视频：保留原封面流程（自动生成/封面设置模板/封面预览）
- * - N 个视频：N 张封面卡片，每张带对应视频标题，可逐个自动生成或上传
+ * Step 5/6 选择封面（Issue #1677 批量生成改造 + #2033 封面bug修复 + #2044 批量模板选择）
+ * - 单视频：保留原封面流程（自动生成/封面设置模板/封面预览/自定义上传）
+ * - N 个视频：N 张封面卡片，每张带对应视频标题，支持统一选择封面模板、逐个自动生成或上传
+ *
+ * 模板 CRUD + 编辑器弹窗 + 自动生成 + 上传 复用 components/cover/useSharedCover
  */
-import React, { useRef } from "react"
+import React, { useEffect, useMemo } from "react"
 import { Modal, Spin } from "antd"
 import { LoadingOutlined } from "@ant-design/icons"
 import type { CoverConfig } from "../types/cover"
 import type { GeneratedVideo } from "@/api/template-editor"
 import type { TitleSettings } from "../types"
-import { useStep6Cover } from "../hooks/useStep6Cover"
 import { useBatchCovers } from "../hooks/useBatchCovers"
 import Button from "@/components/ui/Button"
 import CoverSettingsModal from "./cover-settings/CoverSettingsModal"
 import CoverEditorModal from "./cover-settings/CoverEditorModal"
+import { useSharedCover } from "@/components/cover/useSharedCover"
+import { generateCover as apiGenerateCover } from "@/api/generation"
 
 interface Step6CoverSettingsProps {
   coverSettings: CoverConfig
   onCoverSettingsChange: (settings: CoverConfig) => void
-  /** 当前选中的模板 ID */
   selectedTemplate?: string
-  /** Step4 标题设置，用于封面叠加标题 */
   titleSettings?: TitleSettings
-  /** 确认生成步骤产出的最终视频列表 */
   generatedVideos: GeneratedVideo[]
-  /* ── 批量生成（#1677）── */
   previewCount?: number
-  /** 每个变体的标题文字 */
   previewTitles?: string[]
-  /** 每个变体的封面URL（按变体索引） */
   previewCovers?: string[]
   onPreviewCoversChange?: (urls: string[]) => void
-  /** 勾选的变体索引（批量封面按此顺序展示，与最终成片顺序一致） */
   selectedVariantIndexes?: number[]
+  onTemplateChange?: (templateId: string) => void
+  /** 单视频任务 ID（awaiting_cover 阶段 results 接口可能返回 preview-xxx 合成对象，兜底用） */
+  currentTaskId?: string
 }
 
 const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
-  const {
-    coverSettings,
-    generating,
-    generateAutoCover,
-    finalVideo,
-    showCoverSettings,
-    setShowCoverSettings,
-    showCoverEditor,
-    setShowCoverEditor,
-    selectedTemplateId,
-    editingTemplate,
-    coverTemplates,
-    templatesLoading,
-    templatesError,
-    handleSelectTemplate,
-    handleEditTemplate,
-    handleSaveTemplate,
-    handleDeleteTemplate,
-  } = useStep6Cover({
-    coverSettings: props.coverSettings,
-    onCoverSettingsChange: props.onCoverSettingsChange,
-    selectedTemplate: props.selectedTemplate,
-    titleSettings: props.titleSettings,
-    generatedVideos: props.generatedVideos,
-  })
-
   const previewCount = props.previewCount || 1
   const isBatch = previewCount > 1
   const previewTitles = props.previewTitles || []
   const previewCovers = props.previewCovers || []
-  /** 卡片展示的变体索引顺序：批量=勾选顺序（与成片顺序一致），单视频=[0] */
   const cardIndexes =
     isBatch && props.selectedVariantIndexes?.length
       ? props.selectedVariantIndexes
       : Array.from({ length: previewCount }, (_, i) => i)
-  const uploadInputRef = useRef<HTMLInputElement>(null)
-  const uploadTargetRef = useRef<number>(0)
 
-  const completedVideos = props.generatedVideos.filter((v) => v.status === "completed")
+  /** 最终成片：取第一个已完成视频（单视频场景） */
+  const finalVideo =
+    props.generatedVideos.find((v) => v.status === "completed" || v.status === "awaiting_cover") ||
+    props.generatedVideos[0]
+
+  /**
+   * 兜底任务/视频 ID：awaiting_cover 阶段后端 /results 可能还没有入库 GeneratedVideo，
+   * 只返回合成的 preview-{taskId} 轻量对象；此时用 currentTaskId 兜底让后端能找到任务。
+   * 同时统一抽取 taskId（generation_task_id 优先）用于日志/错误提示。
+   */
+  const effectiveTaskId =
+    (finalVideo as { generation_task_id?: string } | undefined)?.generation_task_id ||
+    props.currentTaskId ||
+    ""
+  const _rawVideoId =
+    (finalVideo as { id?: string; video_id?: string } | undefined)?.id ||
+    (finalVideo as { video_id?: string } | undefined)?.video_id ||
+    ""
+  // preview-{taskId} 是后端合成的临时 id，gv_repo.get 查不到 → 不传 generated_video_id，
+  // 让后端走 plan.config.generation_task_id / rendered_storage_key 兜底路径。
+  const effectiveVideoId = _rawVideoId && !_rawVideoId.startsWith("preview-") ? _rawVideoId : ""
+  const effectiveVideoUrl = finalVideo?.file_url || finalVideo?.download_url || ""
+
+  /** 按钮可用：非批量 且 （有 finalVideo 对象或兜底 taskId） 且 视频状态已完成/等待封面/未设置 */
+  const isVideoReady =
+    !finalVideo ||
+    finalVideo.status === "completed" ||
+    finalVideo.status === "awaiting_cover" ||
+    !finalVideo.status
+  const canGenerateCover = !isBatch && (!!finalVideo || !!effectiveTaskId) && isVideoReady
+
+  const completedVideos = useMemo(
+    () =>
+      props.generatedVideos.filter(
+        (v) => v.status === "completed" || v.status === "awaiting_cover",
+      ),
+    [props.generatedVideos],
+  )
+
+  /**
+   * 单视频自动生成（点击"自动生成封面"按钮）：使用当前选中的模板
+   * 批量场景 canGenerate=false，避免 shared.generateAutoCover 被误触发
+   */
+  const shared = useSharedCover({
+    canGenerate: canGenerateCover,
+    disabledHint: isBatch
+      ? "批量场景请在上方操作卡片"
+      : !finalVideo && !effectiveTaskId
+        ? "请先生成视频再选择封面"
+        : "视频尚未就绪，请稍候",
+    initialTemplateId: "default", // 封面模板独立于编辑模板，默认用 default
+    generateFn: async (tplId) => {
+      if (isBatch) return null
+      if (!finalVideo && !effectiveTaskId) {
+        console.warn("[Cover] generateAutoCover: no finalVideo and no taskId")
+        return null
+      }
+      // 请求体：generated_video_id 仅在后端已入库（非 preview-xxx 合成id）时传；
+      // video_url 兜底让后端能直接下载视频抽帧；generation_task_id 后端已从 plan.config 自动读取。
+      const requestBody: {
+        generated_video_id?: string
+        video_url?: string
+        cover_type: "ai_frame"
+        title_config?: Record<string, unknown>
+      } = {
+        cover_type: "ai_frame",
+      }
+      if (effectiveVideoId) {
+        requestBody.generated_video_id = effectiveVideoId
+      }
+      if (effectiveVideoUrl) {
+        requestBody.video_url = effectiveVideoUrl
+      }
+      if (props.titleSettings?.title) {
+        requestBody.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,
+        }
+      }
+      console.log("[Cover] auto-generate request:", { tplId, ...requestBody })
+      const response = await apiGenerateCover(tplId, requestBody)
+      const url = response.cover?.image_url || response.cover?.thumbnail_url || ""
+      if (url) {
+        props.onCoverSettingsChange({
+          ...props.coverSettings,
+          thumbnail_url: url,
+          ai_suggested_time: response.cover?.frame_time ?? null,
+        })
+      } else {
+        console.warn("[Cover] generate returned empty url:", response)
+      }
+      return url
+    },
+  })
+
+  // 选中模板变化时通知父组件（用于批量生成时透传 template_id）
+  const { onTemplateChange, selectedTemplate: parentSelectedTemplate } = props
+  // 父组件 selectedTemplate 变化时同步到子（例如从 Step1/Step4 切换到 Step6 时）
+  useEffect(() => {
+    if (parentSelectedTemplate && parentSelectedTemplate !== shared.selectedTemplateId) {
+      shared.handleSelectTemplate(parentSelectedTemplate)
+    }
+  }, [parentSelectedTemplate]) // eslint-disable-line react-hooks/exhaustive-deps
+  useEffect(() => {
+    if (isBatch && onTemplateChange && shared.selectedTemplateId !== parentSelectedTemplate) {
+      onTemplateChange(shared.selectedTemplateId)
+    }
+  }, [isBatch, shared.selectedTemplateId, parentSelectedTemplate, onTemplateChange])
+
+  useEffect(() => {
+    shared.setOnUploadFile(() => null)
+  }, [shared])
+
+  const batchUploadRef = React.useRef<HTMLInputElement>(null)
+  const [batchUploadCard, setBatchUploadCard] = React.useState<number | null>(null)
+  const handleBatchUploadClick = (cardPos: number) => {
+    setBatchUploadCard(cardPos)
+    batchUploadRef.current?.click()
+  }
+  const handleBatchUploadChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0]
+    e.target.value = ""
+    const cardPos = batchUploadCard
+    setBatchUploadCard(null)
+    if (!file || cardPos == null) return
+    void batchCovers.uploadOne(cardPos, file)
+  }
+
   const batchTitles = cardIndexes.map((vi) => previewTitles[vi] || "")
   const batchCoversList = cardIndexes.map((vi) => previewCovers[vi] || "")
+
+  /**
+   * 批量生成：selectedTemplateId 来自用户在 CoverSettingsModal 中选择的模板，
+   * 透传给 useBatchCovers，由其在 generateOne/generateAll 中发给后端。
+   */
   const batchCovers = useBatchCovers({
-    selectedTemplate: props.selectedTemplate || "",
+    selectedTemplate: shared.selectedTemplateId,
     generatedVideos: props.generatedVideos,
     titles: batchTitles,
     titleStyle: {
@@ -92,7 +200,6 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
     },
     covers: batchCoversList,
     onCoversChange: (updater) => {
-      // 按卡片顺序写回对应变体索引；支持函数式 updater（#1750：串行回写避免闭包覆盖）
       const prevCardView = cardIndexes.map((vi) => (props.previewCovers || [])[vi] || "")
       const nextCardView = typeof updater === "function" ? updater(prevCardView) : updater
       const next = [...(props.previewCovers || [])]
@@ -103,22 +210,7 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
     },
   })
 
-  const previewUrl = coverSettings.thumbnail_url || coverSettings.upload_url
-
-  const handleUploadClick = (variantIndex: number) => {
-    uploadTargetRef.current = variantIndex
-    uploadInputRef.current?.click()
-  }
-
-  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0]
-    e.target.value = ""
-    if (file) {
-      const variantIndex = uploadTargetRef.current
-      const cardPos = cardIndexes.indexOf(variantIndex)
-      if (cardPos >= 0) void batchCovers.uploadOne(cardPos, file)
-    }
-  }
+  const previewUrl = props.coverSettings.thumbnail_url || props.coverSettings.upload_url
 
   /* ── 批量封面 ── */
   if (isBatch) {
@@ -138,17 +230,32 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
           }}
         >
           🎬 共 {completedVideos.length} 个成片，封面将从对应成片中智能选帧并叠加该视频的标题
+          {shared.selectedTemplateId && shared.selectedTemplateId !== "default" && (
+            <>
+              {" · "}当前模板：<strong>{shared.selectedTemplateName}</strong>
+            </>
+          )}
         </div>
 
-        <div style={{ display: "flex", gap: 8, marginBottom: 16 }}>
+        <div style={{ display: "flex", gap: 8, marginBottom: 16, flexWrap: "wrap" }}>
           <Button
             buttonType="primary"
             onClick={() => void batchCovers.generateAll()}
             disabled={completedVideos.length === 0 || batchCovers.busyIndexes.length > 0}
             style={{ whiteSpace: "nowrap", flexShrink: 0 }}
+            loading={batchCovers.busyIndexes.length > 0}
           >
             ✨ 一键全部自动生成
           </Button>
+          <Button buttonType="ghost" onClick={() => shared.setShowCoverSettings(true)}>
+            ⚙️ 封面模板
+            {shared.selectedTemplateId && shared.selectedTemplateId !== "default"
+              ? `：${shared.selectedTemplateName}`
+              : ""}
+          </Button>
+          <Button buttonType="ghost" onClick={shared.handleCreateTemplate}>
+            ➕ 新建模板
+          </Button>
         </div>
 
         <div className="xx-cover-grid">
@@ -209,7 +316,7 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
                     type="button"
                     className="xx-btn xx-btn-ghost xx-btn-sm"
                     style={{ flex: 1, fontSize: 12, padding: "4px 8px" }}
-                    onClick={() => handleUploadClick(variantIndex)}
+                    onClick={() => handleBatchUploadClick(cardPos)}
                     disabled={isLoading || isUploading}
                   >
                     📤 上传
@@ -220,24 +327,44 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
           })}
         </div>
 
+        {/* 隐藏的文件选择 input，批量上传复用 */}
         <input
-          ref={uploadInputRef}
+          ref={batchUploadRef}
           type="file"
           accept="image/*"
           style={{ display: "none" }}
-          onChange={handleFileChange}
+          onChange={handleBatchUploadChange}
+        />
+
+        <CoverSettingsModal
+          open={shared.showCoverSettings}
+          onClose={() => shared.setShowCoverSettings(false)}
+          templates={shared.templates}
+          loading={shared.templatesLoading}
+          error={shared.templatesError}
+          selectedTemplateId={shared.selectedTemplateId}
+          onSelectTemplate={shared.handleSelectTemplate}
+          onEditTemplate={shared.handleEditTemplate}
+          onDeleteTemplate={shared.handleDeleteTemplate}
+          onCreateNew={shared.handleCreateTemplate}
+        />
+
+        <CoverEditorModal
+          open={shared.showCoverEditor}
+          onClose={() => shared.setShowCoverEditor(false)}
+          template={shared.editingTemplate}
+          onSave={shared.handleSaveTemplate}
         />
       </div>
     )
   }
 
-  /* ── 单视频：原有流程保持不变 ── */
+  /* ── 单视频 ── */
   return (
     <div className="xx-form-section">
       <h3>🖼️ 选择封面</h3>
 
-      {/* 最终成片信息 */}
-      {finalVideo && (
+      {(finalVideo || effectiveTaskId) && (
         <div
           style={{
             padding: "10px 14px",
@@ -249,17 +376,57 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
             color: "var(--text-secondary, #666)",
           }}
         >
-          🎬 封面将从最终成片「{finalVideo.name}」中智能选帧
+          🎬 封面将从最终成片{finalVideo?.name ? `「${finalVideo.name}」` : ""}中智能选帧
+          {shared.selectedTemplateId && shared.selectedTemplateId !== "default" && (
+            <>
+              {" "}
+              · 当前模板：<strong>{shared.selectedTemplateName}</strong>
+            </>
+          )}
         </div>
       )}
 
       <div className="xx-cover-actions">
-        <Button buttonType="primary" onClick={generateAutoCover} disabled={!finalVideo}>
+        <Button
+          buttonType="primary"
+          onClick={() => void shared.generateAutoCover()}
+          disabled={!canGenerateCover || shared.generating}
+          loading={shared.generating}
+          title={!canGenerateCover ? "请先完成视频生成" : ""}
+        >
           ✨ 自动生成封面
         </Button>
-        <Button buttonType="ghost" onClick={() => setShowCoverSettings(true)}>
-          ⚙️ 封面设置
+        <Button buttonType="ghost" onClick={() => shared.setShowCoverSettings(true)}>
+          ⚙️ 封面模板
         </Button>
+        <Button buttonType="ghost" onClick={shared.handleUploadClick}>
+          📷 本地上传
+        </Button>
+        <input
+          ref={shared.uploadInputRef}
+          type="file"
+          accept="image/*"
+          style={{ display: "none" }}
+          onChange={(e) => {
+            const file = e.target.files?.[0]
+            e.target.value = ""
+            if (!file) return
+            const url = URL.createObjectURL(file)
+            props.onCoverSettingsChange({
+              ...props.coverSettings,
+              upload_url: url,
+              thumbnail_url: url,
+              mode: "upload",
+            })
+          }}
+        />
+        <input
+          ref={batchUploadRef}
+          type="file"
+          accept="image/*"
+          style={{ display: "none" }}
+          onChange={handleBatchUploadChange}
+        />
       </div>
 
       <div className="xx-section-title">封面预览</div>
@@ -276,30 +443,26 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
       </div>
 
       <CoverSettingsModal
-        open={showCoverSettings}
-        onClose={() => setShowCoverSettings(false)}
-        templates={coverTemplates}
-        loading={templatesLoading}
-        error={templatesError}
-        selectedTemplateId={selectedTemplateId}
-        onSelectTemplate={handleSelectTemplate}
-        onEditTemplate={handleEditTemplate}
-        onDeleteTemplate={handleDeleteTemplate}
-        onCreateNew={() => {
-          setShowCoverSettings(false)
-          setShowCoverEditor(true)
-        }}
+        open={shared.showCoverSettings}
+        onClose={() => shared.setShowCoverSettings(false)}
+        templates={shared.templates}
+        loading={shared.templatesLoading}
+        error={shared.templatesError}
+        selectedTemplateId={shared.selectedTemplateId}
+        onSelectTemplate={shared.handleSelectTemplate}
+        onEditTemplate={shared.handleEditTemplate}
+        onDeleteTemplate={shared.handleDeleteTemplate}
+        onCreateNew={shared.handleCreateTemplate}
       />
 
       <CoverEditorModal
-        open={showCoverEditor}
-        onClose={() => setShowCoverEditor(false)}
-        template={editingTemplate}
-        onSave={handleSaveTemplate}
+        open={shared.showCoverEditor}
+        onClose={() => shared.setShowCoverEditor(false)}
+        template={shared.editingTemplate}
+        onSave={shared.handleSaveTemplate}
       />
 
-      {/* AI 生成封面进度弹窗 */}
-      <Modal open={generating} closable={false} footer={null} centered>
+      <Modal open={shared.generating} closable={false} footer={null} centered>
         <div style={{ textAlign: "center", padding: "24px 0" }}>
           <Spin size="large" />
           <p style={{ marginTop: 16, fontSize: 14, color: "#666" }}>
@@ -311,4 +474,6 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
   )
 }
 
+Step6CoverSettings.displayName = "Step6CoverSettings"
+
 export default Step6CoverSettings

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

@@ -19,6 +19,8 @@ import { synthesizeSpeech, getTTSJobStatus, saveTtsToLibrary } from "@/api/tts"
 import type { PresetVoiceItem } from "@/api/voices"
 import type { VoiceClone } from "@/api/voice-clone"
 import { VOICE_GENDER_ICON } from "../constants"
+import TtsStyleSelector from "@/components/voice/TtsStyleSelector"
+import { DEFAULT_TTS_STYLE, type TtsStyle } from "@/api/tts/styles"
 
 interface TtsVoiceModalProps {
   open: boolean
@@ -31,7 +33,11 @@ interface TtsVoiceModalProps {
     voiceAssetId: string
     ttsVoiceId: string
     ttsVoiceSource: "preset" | "clone"
+    ttsStyle: TtsStyle
   }) => void
+  /** 当前风格 */
+  style?: TtsStyle
+  onStyleChange?: (s: TtsStyle) => void
 }
 
 type TtsSynthStatus = "idle" | "synthesizing" | "saving" | "done" | "error"
@@ -42,7 +48,15 @@ const TtsVoiceModal: React.FC<TtsVoiceModalProps> = ({
   scriptTitle,
   onCancel,
   onSynthesized,
+  style: externalStyle,
+  onStyleChange,
 }) => {
+  const [internalStyle, setInternalStyle] = useState<TtsStyle>(DEFAULT_TTS_STYLE)
+  const currentStyle: TtsStyle = externalStyle ?? internalStyle
+  const handleStyleChange = (s: TtsStyle) => {
+    setInternalStyle(s)
+    onStyleChange?.(s)
+  }
   const [activeTab, setActiveTab] = useState<"preset" | "clone">("preset")
   const [selectedVoiceId, setSelectedVoiceId] = useState<string>("")
   const [status, setStatus] = useState<TtsSynthStatus>("idle")
@@ -77,6 +91,7 @@ const TtsVoiceModal: React.FC<TtsVoiceModalProps> = ({
       setStatus("idle")
       setError(null)
       setActiveTab("preset")
+      setInternalStyle(externalStyle ?? DEFAULT_TTS_STYLE)
     } else {
       if (timerRef.current) {
         clearInterval(timerRef.current)
@@ -91,6 +106,7 @@ const TtsVoiceModal: React.FC<TtsVoiceModalProps> = ({
     return () => {
       if (timerRef.current) clearInterval(timerRef.current)
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [open])
 
   const handlePreview = useCallback(
@@ -143,6 +159,7 @@ const TtsVoiceModal: React.FC<TtsVoiceModalProps> = ({
         text: textToSynth,
         speed: 1.0,
         language: "zh-CN",
+        style: currentStyle,
       }
       if (isClone) {
         payload.voice_clone_profile_id = selectedVoiceId
@@ -187,13 +204,14 @@ const TtsVoiceModal: React.FC<TtsVoiceModalProps> = ({
         voiceAssetId: jobId,
         ttsVoiceId: selectedVoiceId,
         ttsVoiceSource: isClone ? "clone" : "preset",
+        ttsStyle: currentStyle,
       })
     } catch (err: unknown) {
       setStatus("error")
       const msg = err instanceof Error ? err.message : "合成失败，请稍后重试"
       setError(msg)
     }
-  }, [selectedVoiceId, textToSynth, activeTab, scriptTitle, onSynthesized])
+  }, [selectedVoiceId, textToSynth, activeTab, scriptTitle, onSynthesized, currentStyle])
 
   const renderVoiceCard = (v: {
     id: string
@@ -393,6 +411,10 @@ const TtsVoiceModal: React.FC<TtsVoiceModalProps> = ({
           {textToSynth.length} 字
         </div>
 
+        <div style={{ marginBottom: 12 }}>
+          <TtsStyleSelector value={currentStyle} onChange={handleStyleChange} compact />
+        </div>
+
         <Tabs
           activeKey={activeTab}
           onChange={(k) => {

apps/web/src/pages/generate/components/cover-settings/CoverSettingsModal.tsx

@@ -1,7 +1,8 @@
-import React from "react"
+import React, { useMemo, useState } from "react"
 import type { CoverTemplate } from "../../types/cover"
 import Modal from "@/components/ui/Modal"
 import Button from "@/components/ui/Button"
+import "@/components/cover/cover.css"
 
 interface CoverSettingsModalProps {
   open: boolean
@@ -16,15 +17,58 @@ interface CoverSettingsModalProps {
   onCreateNew: () => void
 }
 
-const GRADIENT_MAP: Record<string, string> = {
-  default: "linear-gradient(135deg, #e0e0e0, #c0c0c0)",
-  "bold-red": "linear-gradient(135deg, #ef4444, #b91c1c)",
-  "elegant-black": "linear-gradient(135deg, #374151, #111827)",
-  "gradient-blue": "linear-gradient(135deg, #3b82f6, #1d4ed8)",
-  "gradient-purple": "linear-gradient(135deg, #8b5cf6, #6d28d9)",
-  "warm-orange": "linear-gradient(135deg, #f97316, #ea580c)",
-  "fresh-green": "linear-gradient(135deg, #22c55e, #15803d)",
-  "tech-blue": "linear-gradient(135deg, #06b6d4, #0e7490)",
+/** 模板缩略图：优先渲染 thumbnail_url；加载失败/无图时展示占位 */
+const TemplateThumb: React.FC<{ tpl: CoverTemplate; isSelected: boolean }> = ({
+  tpl,
+  isSelected,
+}) => {
+  const [errored, setErrored] = useState(false)
+  const url = tpl.thumbnail_url && !errored ? tpl.thumbnail_url : ""
+  // 随机柔和渐变做占位，保证卡片不会灰成一片
+  const placeholderBg = useMemo(() => {
+    const palettes = [
+      ["#e0e0e0", "#c0c0c0"],
+      ["#ef4444", "#b91c1c"],
+      ["#374151", "#111827"],
+      ["#3b82f6", "#1d4ed8"],
+      ["#8b5cf6", "#6d28d9"],
+      ["#f97316", "#ea580c"],
+      ["#22c55e", "#15803d"],
+      ["#06b6d4", "#0e7490"],
+    ]
+    let h = 0
+    for (const ch of tpl.id || tpl.name || "") h = (h * 31 + ch.charCodeAt(0)) >>> 0
+    const [a, b] = palettes[h % palettes.length]
+    return `linear-gradient(135deg, ${a}, ${b})`
+  }, [tpl.id, tpl.name])
+
+  return (
+    <div
+      className="xx-cover-template-thumb"
+      style={{
+        background: url ? "#000" : placeholderBg,
+        position: "relative",
+        overflow: "hidden",
+      }}
+    >
+      {isSelected && <span className="xx-cover-template-check">✓</span>}
+      {url ? (
+        <img
+          src={url}
+          alt={tpl.name}
+          onError={() => setErrored(true)}
+          style={{
+            width: "100%",
+            height: "100%",
+            objectFit: "cover",
+            display: "block",
+          }}
+        />
+      ) : (
+        <span style={{ fontSize: 28, opacity: 0.5 }}>🖼️</span>
+      )}
+    </div>
+  )
 }
 
 const CoverSettingsModal: React.FC<CoverSettingsModalProps> = ({
@@ -40,12 +84,26 @@ const CoverSettingsModal: React.FC<CoverSettingsModalProps> = ({
   onCreateNew,
 }) => {
   return (
-    <Modal open={open} onCancel={onClose} width={800} title="封面设置" centered footer={null}>
+    <Modal
+      open={open}
+      onCancel={onClose}
+      width={800}
+      title="封面设置"
+      centered
+      footer={
+        <div style={{ display: "flex", justifyContent: "flex-end", gap: 8 }}>
+          <Button buttonType="ghost" onClick={onClose}>
+            取消
+          </Button>
+          <Button buttonType="primary" onClick={onClose}>
+            确认应用
+          </Button>
+        </div>
+      }
+    >
       <div className="xx-cover-modal-toolbar">
-        <Button buttonType="primary">选择素材文件</Button>
-        <Button buttonType="ghost">导出全部</Button>
         <Button buttonType="primary" onClick={onCreateNew}>
-          创建新模板
+          + 创建新模板
         </Button>
       </div>
 
@@ -59,52 +117,77 @@ const CoverSettingsModal: React.FC<CoverSettingsModalProps> = ({
         <div style={{ textAlign: "center", padding: "40px 0", color: "#ef4444" }}>{error}</div>
       )}
 
-      {!loading && !error && (
+      {!loading && !error && templates.length === 0 && (
+        <div
+          style={{
+            textAlign: "center",
+            padding: "40px 0",
+            color: "var(--text-secondary)",
+            fontSize: 13,
+          }}
+        >
+          暂无封面模板，点击右上角「创建新模板」可自定义封面样式
+        </div>
+      )}
+
+      {!loading && !error && templates.length > 0 && (
         <div className="xx-cover-template-grid">
-          {templates.map((tpl) => (
-            <div
-              key={tpl.id}
-              className={`xx-cover-template-card${selectedTemplateId === tpl.id ? " selected" : ""}`}
-              onClick={() => onSelectTemplate(tpl.id)}
-            >
+          {templates.map((tpl) => {
+            const isSelected = selectedTemplateId === tpl.id
+            return (
               <div
-                className="xx-cover-template-thumb"
-                style={{ background: GRADIENT_MAP[tpl.id] || GRADIENT_MAP.default }}
+                key={tpl.id}
+                className={`xx-cover-template-card${isSelected ? " selected" : ""}`}
+                onClick={() => onSelectTemplate(tpl.id)}
               >
-                🖼️
-              </div>
-              <div className="xx-cover-template-info">
-                <div className="xx-cover-template-name">
-                  {tpl.name}
-                  {tpl.is_system && <span className="xx-cover-template-badge">✨ 系统模板</span>}
-                </div>
-                <div className="xx-cover-template-date">{tpl.created_at}</div>
-                <div className="xx-cover-template-actions" onClick={(e) => e.stopPropagation()}>
-                  <Button buttonType="ghost" buttonSize="sm" onClick={() => onEditTemplate(tpl)}>
-                    编辑
-                  </Button>
-                  {!tpl.is_system && (
+                <TemplateThumb tpl={tpl} isSelected={isSelected} />
+                <div className="xx-cover-template-info">
+                  <div className="xx-cover-template-name">
+                    {tpl.name}
+                    {tpl.is_system && <span className="xx-cover-template-badge">✨ 系统</span>}
+                  </div>
+                  <div className="xx-cover-template-actions" onClick={(e) => e.stopPropagation()}>
                     <Button
                       buttonType="ghost"
                       buttonSize="sm"
-                      onClick={() => {
-                        if (confirm("确定删除此模板？")) {
-                          onDeleteTemplate(tpl.id)
-                        }
-                      }}
+                      onClick={() => onEditTemplate(tpl)}
+                      title={tpl.is_system ? "基于此模板新建自定义模板" : "编辑模板"}
                     >
-                      删除
+                      编辑
                     </Button>
-                  )}
-                  <Button buttonType="ghost" buttonSize="sm">
-                    导出
-                  </Button>
+                    {!tpl.is_system && (
+                      <Button
+                        buttonType="ghost"
+                        buttonSize="sm"
+                        onClick={() => {
+                          if (confirm("确定删除此模板？")) {
+                            onDeleteTemplate(tpl.id)
+                          }
+                        }}
+                      >
+                        删除
+                      </Button>
+                    )}
+                  </div>
                 </div>
               </div>
-            </div>
-          ))}
+            )
+          })}
         </div>
       )}
+
+      <div
+        style={{
+          marginTop: 12,
+          padding: "8px 12px",
+          background: "rgba(124,58,237,0.06)",
+          borderRadius: 6,
+          fontSize: 12,
+          color: "#6d28d9",
+        }}
+      >
+        💡 点击卡片选中模板后，点击右下角「确认应用」即可使用该模板生成封面
+      </div>
     </Modal>
   )
 }

apps/web/src/pages/generate/components/title/AiTitleCard.tsx

@@ -1,35 +0,0 @@
-/**
- * 单个 AI 标题卡片
- */
-import React from "react"
-import { CheckCircleFilled } from "@ant-design/icons"
-
-interface AiTitleCardProps {
-  title: string
-  highlight: string
-  style: "catchy" | "emotional" | "informative"
-  selected: boolean
-  onClick: () => void
-}
-
-const AiTitleCard: React.FC<AiTitleCardProps> = ({
-  title,
-  highlight,
-  style,
-  selected,
-  onClick,
-}) => {
-  return (
-    <div className={`xx-ai-title-card ${selected ? "selected" : ""} ${style}`} onClick={onClick}>
-      <div className="xx-ai-title-card-text">{title}</div>
-      <div className="xx-ai-title-card-tag">{highlight}</div>
-      {selected && (
-        <div className="xx-ai-title-card-check">
-          <CheckCircleFilled style={{ color: "#fff", fontSize: 14 }} />
-        </div>
-      )}
-    </div>
-  )
-}
-
-export default AiTitleCard

apps/web/src/pages/generate/components/title/AiTitleGenerator.tsx

@@ -1,105 +0,0 @@
-/**
- * AI 智能生成标题
- * 输入框 + 生成按钮 + 结果列表 + 加载状态
- */
-import React from "react"
-import { LoadingOutlined } from "@ant-design/icons"
-import AiTitleCard from "./AiTitleCard"
-
-interface AiTitleItem {
-  title: string
-  highlight: string
-  style: "catchy" | "emotional" | "informative"
-}
-
-interface AiTitleGeneratorProps {
-  inputValue: string
-  onInputChange: (value: string) => void
-  generating: boolean
-  onGenerate: () => void
-  results: AiTitleItem[]
-  hasGenerated: boolean
-  onSelect: (title: string) => void
-  selectedTitle: string
-  onRefresh: () => void
-}
-
-const AiTitleGenerator: React.FC<AiTitleGeneratorProps> = ({
-  inputValue,
-  onInputChange,
-  generating,
-  onGenerate,
-  results,
-  hasGenerated,
-  onSelect,
-  selectedTitle,
-  onRefresh,
-}) => {
-  return (
-    <div className="xx-ai-title-section">
-      <div className="xx-ai-title-header">
-        <span className="xx-ai-title-label">✨ AI 智能生成标题</span>
-      </div>
-      <div className="xx-ai-title-input-row">
-        <input
-          className="xx-ai-title-input"
-          placeholder="输入视频内容描述或关键词，如：职场成长、副业赚钱…"
-          value={inputValue}
-          onChange={(e) => onInputChange(e.target.value)}
-          onKeyDown={(e) => {
-            if (e.key === "Enter") onGenerate()
-          }}
-        />
-        <button
-          type="button"
-          className="xx-btn xx-btn-primary"
-          onClick={onGenerate}
-          disabled={generating || !inputValue.trim()}
-        >
-          {generating ? (
-            <>
-              <LoadingOutlined style={{ marginRight: 6 }} />
-              生成中
-            </>
-          ) : (
-            "生成标题"
-          )}
-        </button>
-      </div>
-
-      {/* 生成结果 */}
-      {hasGenerated && !generating && results.length > 0 && (
-        <div className="xx-ai-title-results">
-          <div className="xx-ai-title-results-header">
-            <span className="xx-ai-title-results-count">为你生成 {results.length} 个标题</span>
-            <button type="button" className="xx-link-btn" onClick={onRefresh} disabled={generating}>
-              🔄 换一批
-            </button>
-          </div>
-          <div className="xx-ai-title-list">
-            {results.map((item, idx) => (
-              <AiTitleCard
-                key={idx}
-                title={item.title}
-                highlight={item.highlight}
-                style={item.style}
-                selected={selectedTitle === item.title}
-                onClick={() => onSelect(item.title)}
-              />
-            ))}
-          </div>
-        </div>
-      )}
-
-      {/* 生成中 */}
-      {generating && (
-        <div className="xx-ai-title-loading">
-          <LoadingOutlined style={{ color: "var(--primary-color)", marginRight: 8 }} />
-          AI 正在为你创作标题…
-        </div>
-      )}
-    </div>
-  )
-}
-
-export default AiTitleGenerator

apps/web/src/pages/generate/components/title/TitleMiniPreview.tsx

@@ -0,0 +1,246 @@
+/**
+ * 标题迷你 Canvas 预览（#2001）
+ *
+ * 渲染一张指定宽度的小 Canvas 预览标题效果，用于：
+ * - 预设卡片缩略图
+ * - 样式面板顶部的实时预览
+ *
+ * 与 titleCanvas.ts 渲染逻辑保持一致，但：
+ * - 固定分辨率（width × 宽高比约 2:1）
+ * - 不调用 ffmpeg，只做视觉预览
+ * - 支持背景色块、描边宽度/颜色、阴影参数化、行距、自动换行
+ */
+import React, { useEffect, useRef } from "react"
+import type { TitleSettings } from "../../types"
+import { getFontFamily } from "@/components/title/constants"
+
+interface Props {
+  settings: TitleSettings
+  width?: number
+  sampleText?: string
+  /** 背景（预览用，默认深色渐变模拟视频底），transparent=true 时忽略 */
+  background?: string
+  /** 高度（可选，默认按 portrait 选比例） */
+  height?: number
+  /** 透明背景（卡片/编辑器预览叠加在图片上时使用） */
+  transparent?: boolean
+  /** 纵向竖屏预览（9:16），true 时 aspect=16/9 适配手机视频比例 */
+  portrait?: boolean
+}
+
+/** 按 maxCharsPerLine 自动换行 */
+function wrapLines(text: string, maxChars: number): string[] {
+  const manual = text
+    .split(/[/／\n]/)
+    .map((l) => l.trim())
+    .filter(Boolean)
+  if (!maxChars || maxChars <= 0) return manual
+  const out: string[] = []
+  for (const line of manual) {
+    if (line.length <= maxChars) {
+      out.push(line)
+      continue
+    }
+    let cur = ""
+    for (const ch of line) {
+      cur += ch
+      if (cur.length >= maxChars) {
+        out.push(cur)
+        cur = ""
+      }
+    }
+    if (cur) out.push(cur)
+  }
+  return out
+}
+
+const TitleMiniPreview: React.FC<Props> = ({
+  settings,
+  width = 200,
+  sampleText,
+  background = "linear-gradient(135deg,#1f2937,#111827)",
+  height,
+  transparent = false,
+  portrait = false,
+}) => {
+  const canvasRef = useRef<HTMLCanvasElement>(null)
+  const h = height ?? Math.round(width * (portrait ? 16 / 9 : 1 / 1.8))
+  const text = (sampleText || settings.title || "预览标题").trim() || "预览标题"
+
+  useEffect(() => {
+    let cancelled = false
+    const draw = () => {
+      if (cancelled) return
+      const cvs = canvasRef.current
+      if (!cvs) return
+      const dpr = window.devicePixelRatio || 1
+      cvs.width = width * dpr
+      cvs.height = h * dpr
+      cvs.style.width = `${width}px`
+      cvs.style.height = `${h}px`
+      const ctx = cvs.getContext("2d")
+      if (!ctx) return
+      ctx.scale(dpr, dpr)
+      ctx.clearRect(0, 0, width, h)
+
+      // 背景（transparent 时跳过，用于叠加在图片上）
+      if (!transparent) {
+        ctx.fillStyle = "#111827"
+        ctx.fillRect(0, 0, width, h)
+      }
+
+      // 分辨率缩放：以 360 宽为基准（对应 720p 的一半）
+      const scale = width / 360
+      const r = (v: number) => Math.round(v * scale)
+
+      // 字体
+      const size = r(settings.size)
+      const ff = getFontFamily(settings.font)
+      const parts: string[] = []
+      if (settings.italic) parts.push("italic")
+      if (settings.bold) parts.push("bold")
+      parts.push(`${size}px`, ff)
+      ctx.font = parts.join(" ")
+      ctx.textAlign = "center"
+      ctx.textBaseline = "middle"
+      ctx.fillStyle = settings.color
+      ctx.lineJoin = "round"
+
+      // 阴影
+      const shadowEnabled = !!settings.shadow
+      const prevShadow = {
+        c: ctx.shadowColor,
+        b: ctx.shadowBlur,
+        ox: ctx.shadowOffsetX,
+        oy: ctx.shadowOffsetY,
+      }
+      if (shadowEnabled) {
+        ctx.shadowColor = settings.shadowColor ?? "rgba(0,0,0,0.8)"
+        ctx.shadowBlur = r(settings.shadowBlur ?? 4)
+        ctx.shadowOffsetX = r(settings.shadowOffsetX ?? 2)
+        ctx.shadowOffsetY = r(settings.shadowOffsetY ?? 2)
+      }
+
+      // 换行
+      const lines = wrapLines(text, settings.maxCharsPerLine ?? 0)
+      const lineH = size * (settings.lineHeight ?? 1.2)
+      const totalH = lines.length * lineH
+      let startY: number
+      if (settings.position === "top") {
+        startY = size / 2 + r(settings.marginTop ?? 24)
+      } else if (settings.position === "center") {
+        startY = h / 2 - totalH / 2 + size / 2
+      } else {
+        // bottom
+        const botMargin = portrait ? r(24) : r(16)
+        startY = h - totalH - botMargin + size / 2
+      }
+      let centerX = width / 2
+      if (settings.position === "custom" && settings.posX != null) {
+        centerX = (settings.posX / 100) * width
+      }
+
+      // 背景块
+      if (settings.bgEnabled) {
+        const pad = r(settings.bgPadding ?? 12)
+        const rad = r(settings.bgRadius ?? 8)
+        let maxLineW = 0
+        for (const l of lines) {
+          const m = ctx.measureText(l)
+          if (m.width > maxLineW) maxLineW = m.width
+        }
+        const bw = maxLineW + pad * 2
+        const bh = totalH + pad * 2
+        const bx = centerX - bw / 2
+        const by = startY - size / 2 - pad + (size - lineH) / 2
+        ctx.shadowColor = "rgba(0,0,0,0)"
+        ctx.shadowBlur = 0
+        ctx.fillStyle = settings.bgColor ?? "rgba(0,0,0,0.5)"
+        roundRect(ctx, bx, by, bw, bh, rad)
+        ctx.fill()
+        // 恢复阴影
+        if (shadowEnabled) {
+          ctx.shadowColor = settings.shadowColor ?? "rgba(0,0,0,0.8)"
+          ctx.shadowBlur = r(settings.shadowBlur ?? 4)
+          ctx.shadowOffsetX = r(settings.shadowOffsetX ?? 2)
+          ctx.shadowOffsetY = r(settings.shadowOffsetY ?? 2)
+        }
+      }
+
+      // 描边（先画，再画填充）
+      const strokeEnabled = !!settings.stroke && (settings.strokeWidth ?? 0) > 0
+      lines.forEach((line, i) => {
+        const y = startY + i * lineH
+        if (strokeEnabled) {
+          ctx.shadowColor = "rgba(0,0,0,0)"
+          ctx.shadowBlur = 0
+          ctx.lineWidth = r(settings.strokeWidth ?? 4)
+          ctx.strokeStyle = settings.strokeColor ?? "#000000"
+          ctx.strokeText(line, centerX, y)
+          // 恢复阴影
+          if (shadowEnabled) {
+            ctx.shadowColor = settings.shadowColor ?? "rgba(0,0,0,0.8)"
+            ctx.shadowBlur = r(settings.shadowBlur ?? 4)
+            ctx.shadowOffsetX = r(settings.shadowOffsetX ?? 2)
+            ctx.shadowOffsetY = r(settings.shadowOffsetY ?? 2)
+          }
+        }
+        ctx.fillText(line, centerX, y)
+      })
+
+      // 恢复
+      ctx.shadowColor = prevShadow.c
+      ctx.shadowBlur = prevShadow.b
+      ctx.shadowOffsetX = prevShadow.ox
+      ctx.shadowOffsetY = prevShadow.oy
+    }
+    // Web fonts (Google Fonts 等) 加载需要时间，等 fonts.ready 后再画，
+    // 避免第一次渲染用 sans-serif 画完再切字体造成「字体选择没反应」的错觉
+    if (typeof document !== "undefined" && document.fonts && document.fonts.ready) {
+      document.fonts.ready.then(() => {
+        if (cancelled) return
+        draw()
+      })
+    }
+    draw()
+    return () => {
+      cancelled = true
+    }
+  }, [settings, width, h, text, transparent, portrait, background])
+
+  return (
+    <canvas
+      ref={canvasRef}
+      style={{
+        borderRadius: 6,
+        display: "block",
+        maxWidth: "100%",
+        background: transparent ? "transparent" : background,
+      }}
+    />
+  )
+}
+
+function roundRect(
+  ctx: CanvasRenderingContext2D,
+  x: number,
+  y: number,
+  w: number,
+  h: number,
+  r: number,
+) {
+  const rr = Math.min(r, w / 2, h / 2)
+  ctx.beginPath()
+  ctx.moveTo(x + rr, y)
+  ctx.lineTo(x + w - rr, y)
+  ctx.quadraticCurveTo(x + w, y, x + w, y + rr)
+  ctx.lineTo(x + w, y + h - rr)
+  ctx.quadraticCurveTo(x + w, y + h, x + w - rr, y + h)
+  ctx.lineTo(x + rr, y + h)
+  ctx.quadraticCurveTo(x, y + h, x, y + h - rr)
+  ctx.lineTo(x, y + rr)
+  ctx.quadraticCurveTo(x, y, x + rr, y)
+  ctx.closePath()
+}
+
+export default TitleMiniPreview

apps/web/src/pages/generate/components/title/TitlePresetsGrid.tsx

@@ -4,7 +4,7 @@
  * 避免 -webkit-text-stroke 在 Chromium 中吞掉填充色的问题
  */
 import React from "react"
-import { getFontFamily } from "../../constants"
+import { getFontFamily } from "@/components/title/constants"
 
 interface TitlePresetItem {
   key: string

apps/web/src/pages/generate/components/title/TitleStylePanel.css

@@ -190,3 +190,269 @@
   border-color: var(--primary-color);
   color: #fff;
 }
+
+/* ============================================================
+   #2001 爆款标题样式面板升级 — 新增样式（ts- 前缀）
+   ============================================================ */
+
+.ts-panel {
+  position: relative;
+}
+
+/* 预览 */
+.ts-preview-wrap {
+  margin-bottom: 14px;
+  display: flex;
+  justify-content: center;
+  padding: 10px;
+  background: #0f172a;
+  border-radius: 8px;
+}
+
+/* 表单字段 */
+.ts-form-field {
+  margin-bottom: 12px;
+}
+.ts-form-field label {
+  display: block;
+  font-weight: 600;
+  margin-bottom: 6px;
+  font-size: 12px;
+  color: var(--text-primary, #1f2937);
+}
+.ts-field-label-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 6px;
+}
+.ts-field-value {
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--primary-color, #7c3aed);
+}
+.ts-row-2 {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 10px;
+}
+.ts-half {
+  margin-bottom: 0;
+}
+
+.ts-select {
+  width: 100%;
+  height: 34px;
+  border: 1px solid var(--border-color, #e5e7eb);
+  border-radius: 6px;
+  background: var(--bg-primary, #fff);
+  padding: 0 10px;
+  font-size: 13px;
+  outline: 0;
+  color: var(--text-primary, #1f2937);
+}
+.ts-select:focus {
+  border-color: var(--primary-color, #7c3aed);
+  box-shadow: 0 0 0 2px rgba(124, 58, 237, 0.1);
+}
+.ts-input {
+  width: 100%;
+  height: 34px;
+  border: 1px solid var(--border-color, #e5e7eb);
+  border-radius: 6px;
+  padding: 0 10px;
+  font-size: 13px;
+  outline: 0;
+}
+
+.ts-slider {
+  width: 100%;
+  height: 4px;
+  -webkit-appearance: none;
+  appearance: none;
+  background: #e5e7eb;
+  border-radius: 2px;
+  outline: none;
+}
+.ts-slider::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  appearance: none;
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  background: #7c3aed;
+  cursor: pointer;
+  border: 2px solid #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+}
+.ts-slider::-moz-range-thumb {
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  background: #7c3aed;
+  cursor: pointer;
+  border: 2px solid #fff;
+}
+
+/* 样式按钮 B/I/S/☁ */
+.ts-style-btns {
+  display: flex;
+  gap: 6px;
+}
+.ts-style-btn {
+  width: 34px;
+  height: 34px;
+  border-radius: 6px;
+  border: 1px solid #e5e7eb;
+  background: #fff;
+  cursor: pointer;
+  font-size: 14px;
+  transition: 0.15s;
+  color: #374151;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+.ts-style-btn:hover {
+  border-color: #7c3aed;
+  color: #7c3aed;
+}
+.ts-style-btn.active {
+  background: #faf5ff;
+  color: #6d28d9;
+  border-color: #7c3aed;
+  font-weight: 700;
+}
+
+/* 色板 */
+.ts-color-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+  align-items: center;
+}
+.ts-color-swatch {
+  width: 24px;
+  height: 24px;
+  border-radius: 4px;
+  border: 2px solid #fff;
+  box-shadow: 0 0 0 1px #e5e7eb;
+  cursor: pointer;
+  padding: 0;
+  transition: 0.15s;
+}
+.ts-color-swatch:hover {
+  transform: scale(1.1);
+}
+.ts-color-swatch.active {
+  box-shadow: 0 0 0 2px #7c3aed;
+  transform: scale(1.1);
+}
+.ts-color-custom {
+  background: repeating-conic-gradient(#ccc 0% 25%, #fff 0% 50%) 50%/8px 8px;
+  color: #666;
+  font-size: 14px;
+  line-height: 20px;
+}
+.ts-color-native {
+  width: 0;
+  height: 0;
+  border: 0;
+  padding: 0;
+}
+
+/* 预设网格 10个 - 5列 */
+.ts-presets-grid {
+  display: grid;
+  grid-template-columns: repeat(5, 1fr);
+  gap: 6px;
+}
+.ts-preset-card {
+  border: 1px solid #e5e7eb;
+  border-radius: 6px;
+  background: #fff;
+  padding: 4px;
+  cursor: pointer;
+  transition: 0.15s;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+.ts-preset-card:hover {
+  border-color: #7c3aed;
+}
+.ts-preset-card.active {
+  border-color: #7c3aed;
+  background: #faf5ff;
+  box-shadow: 0 0 0 1px #7c3aed;
+}
+.ts-preset-preview {
+  height: 34px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  border-radius: 4px;
+  background: #0f172a;
+}
+.ts-preset-preview canvas {
+  max-width: 100%;
+  max-height: 100%;
+}
+.ts-preset-meta {
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  font-size: 10px;
+  color: #4b5563;
+  justify-content: center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 0 2px 2px;
+}
+.ts-preset-emoji {
+  font-size: 11px;
+}
+.ts-preset-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.ts-toggle-row label {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 13px;
+  font-weight: 500;
+  cursor: pointer;
+  margin-bottom: 10px;
+}
+.ts-toggle-row input[type="checkbox"] {
+  width: 16px;
+  height: 16px;
+  accent-color: #7c3aed;
+}
+
+/* Tabs 紧凑样式 */
+.xx-title-style-section .ant-tabs-nav {
+  margin-bottom: 10px;
+}
+.xx-title-style-section .ant-tabs-tab {
+  font-size: 12px !important;
+  padding: 6px 8px !important;
+}
+
+/* 标题模板入口按钮（#2003） */
+.ts-template-btn {
+  border: none;
+  background: transparent;
+  color: var(--primary-color, #7c3aed);
+  font-size: 12px;
+  cursor: pointer;
+  padding: 2px 0;
+  font-weight: 500;
+}
+.ts-template-btn:hover {
+  text-decoration: underline;
+}

apps/web/src/pages/generate/components/title/TitleStylePanel.tsx

@@ -1,23 +1,61 @@
 /**
- * 标题样式设置区
- * 位置/字体/字号/样式按钮/预设
+ * 标题样式设置面板（v3 重构）
+ *
+ * 三种模式（mode）：
+ * - 「默认」（不传）：顶部实时预览 + 爆款预设网格 + 参数 Tab（基础/描边/阴影/背景/排版/封面）
+ * - 「模板网格」（enableTemplates=true, paramsOnly=false）：
+ *     仅显示顶部标题栏「标题模板」+ 我的模板/系统模板两个分组的大卡片网格，
+ *     卡片用图片背景 + 真实标题渲染（Canvas 叠加透明渲染），底部始终可见
+ *     编辑/复制/导出/删除 4 个按钮，选中卡片紫边紫影。
+ * - 「仅参数」（paramsOnly=true）：仅渲染参数 Tab（给编辑器右侧用，不显示预览/预设/模板网格）
+ *
+ * 历史：#2001 6 Tab 参数面板；#2003 初版内联模板网格；v3 按 sketch 重写大卡片 + 图片背景
  */
-import React from "react"
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react"
+import { Tabs, Button, message, Popconfirm } from "antd"
+import {
+  PlusOutlined,
+  EditOutlined,
+  CopyOutlined,
+  DeleteOutlined,
+  ExportOutlined,
+  CheckOutlined,
+} from "@ant-design/icons"
 import type { TitleSettings } from "../../types"
-import TitlePresetsGrid from "./TitlePresetsGrid"
-// 标题样式面板共用样式（#1809 ⑦）：智能剪辑与 AI数字人复用同一组件，
-// 由组件自带样式，避免 AI数字人页面重复引入整个 generate.css
+import {
+  FONT_OPTIONS as NEW_FONT_OPTIONS,
+  TITLE_PRESETS,
+  TITLE_COLOR_PALETTE,
+  STROKE_COLOR_PALETTE,
+  BG_COLOR_PALETTE,
+} from "@/components/title/constants"
+import { buildPresetPreviewSettings } from "@/components/title/utils"
+
+import TitleMiniPreview from "./TitleMiniPreview"
+import TitleTemplateEditor from "@/components/title/TitleTemplateEditor"
+import { useTitleTemplates } from "@/components/title/useTitleTemplates"
+import {
+  titleStyleConfigToCamel,
+  templateToPreviewSettings,
+  camelToTitleStyleConfig,
+} from "@/components/title/utils"
+import { DEFAULT_TITLE_SETTINGS_FULL } from "../../types"
+import type { TitleTemplate } from "@/components/title/template-types"
+import type { TitleStyleConfig } from "@/components/title/types"
 import "./TitleStylePanel.css"
+import "@/components/title/TitleTemplate.css"
 
 interface PositionOption {
   value: string
   label: string
 }
 
-interface TitlePresetItem {
+interface LegacyPreset {
   key: string
   label: string
-  previewStyle: React.CSSProperties
+  emoji?: string
+  style?: Record<string, unknown>
+  previewStyle?: React.CSSProperties
 }
 
 interface TitleStylePanelProps {
@@ -31,11 +69,151 @@ interface TitleStylePanelProps {
   onToggleShadow: () => void
   onApplyPreset: (presetKey: string) => void
   activePreset: string | null
-  titlePresets: TitlePresetItem[]
+  titlePresets: LegacyPreset[]
   POSITION_OPTIONS: PositionOption[]
-  FONT_OPTIONS: string[]
+  FONT_OPTIONS?: Array<{ value: string; label: string; family?: string; tag?: string }>
+  onUpdateStyle?: (patch: Partial<TitleSettings>) => void
+  showCoverToggle?: boolean
+  previewWidth?: number
+  /** 启用「标题模板」模式：显示大卡片网格，隐藏参数 Tab 和旧预览 */
+  enableTemplates?: boolean
+  /** 当前选中模板 id */
+  selectedTemplateId?: string | null
+  /** 应用模板回调（父组件负责合并到 state） */
+  onApplyTemplate?: (settings: TitleSettings, template: TitleTemplate) => void
+  /** 仅渲染参数 Tab（编辑器右侧用，不显示预览/预设/模板网格） */
+  paramsOnly?: boolean
+  /** 编辑器模式下，模板编辑器组件不在这里渲染（由父组件承载） */
+  hideEditor?: boolean
 }
 
+/* ── Slider 行 ── */
+const SliderRow: React.FC<{
+  label: string
+  value: number
+  min: number
+  max: number
+  step?: number
+  unit?: string
+  onChange: (v: number) => void
+}> = ({ label, value, min, max, step = 1, unit = "px", onChange }) => (
+  <div className="ts-form-field">
+    <div className="ts-field-label-row">
+      <label>{label}</label>
+      <span className="ts-field-value">
+        {value}
+        {unit}
+      </span>
+    </div>
+    <input
+      type="range"
+      className="ts-slider"
+      min={min}
+      max={max}
+      step={step}
+      value={value}
+      onChange={(e) => onChange(Number(e.target.value))}
+    />
+  </div>
+)
+
+/* ── 色板 ── */
+const ColorPicker: React.FC<{
+  label?: string
+  value: string
+  palette: string[]
+  onChange: (c: string) => void
+}> = ({ label, value, palette, onChange }) => {
+  const [customOpen, setCustomOpen] = useState(false)
+  return (
+    <div className="ts-form-field">
+      {label && <label>{label}</label>}
+      <div className="ts-color-row">
+        {palette.map((c) => (
+          <button
+            key={c}
+            type="button"
+            className={`ts-color-swatch${value.toLowerCase() === c.toLowerCase() ? " active" : ""}`}
+            style={{ background: c }}
+            onClick={() => onChange(c)}
+            title={c}
+          />
+        ))}
+        <button
+          type="button"
+          className="ts-color-swatch ts-color-custom"
+          onClick={() => setCustomOpen((v) => !v)}
+          title="自定义颜色"
+        >
+          +
+        </button>
+        <input
+          type="color"
+          className="ts-color-native"
+          value={value.startsWith("rgba") ? "#000000" : value}
+          onChange={(e) => {
+            onChange(e.target.value)
+            setCustomOpen(false)
+          }}
+          style={{
+            opacity: customOpen ? 1 : 0,
+            position: customOpen ? "static" : "absolute",
+            pointerEvents: customOpen ? "auto" : "none",
+            width: customOpen ? 28 : 0,
+            height: customOpen ? 28 : 0,
+            border: "none",
+            padding: 0,
+            cursor: "pointer",
+            background: "transparent",
+          }}
+        />
+      </div>
+      <div style={{ fontSize: 11, color: "#9ca3af", marginTop: 2 }}>
+        当前：<code style={{ fontSize: 11 }}>{value}</code>
+      </div>
+    </div>
+  )
+}
+
+/* ── 卡片预览：用 ref 测量容器宽度后再渲染透明 Canvas，保证文字清晰 ── */
+const FillPreview: React.FC<{
+  settings: TitleSettings
+  sampleText: string
+  portrait?: boolean
+}> = ({ settings, sampleText, portrait }) => {
+  const wrapRef = useRef<HTMLDivElement>(null)
+  const [w, setW] = useState(0)
+  useEffect(() => {
+    const el = wrapRef.current
+    if (!el) return
+    const update = () => setW(Math.floor(el.clientWidth))
+    update()
+    const ro = new ResizeObserver(update)
+    ro.observe(el)
+    return () => ro.disconnect()
+  }, [])
+  return (
+    <div ref={wrapRef} className="tt-fill-canvas-wrap">
+      {w > 0 && (
+        <TitleMiniPreview
+          settings={settings}
+          width={w}
+          sampleText={sampleText}
+          transparent
+          portrait={portrait}
+        />
+      )}
+    </div>
+  )
+}
+
+/* ── 模板卡片预览背景图池：按 index 轮换 ── */
+const PREVIEW_BG_IMAGES = [
+  "/title-templates/portrait1.jpg",
+  "/title-templates/portrait2.jpg",
+  "/title-templates/scene1.jpg",
+]
+
 const TitleStylePanel: React.FC<TitleStylePanelProps> = ({
   settings,
   onUpdatePosition,
@@ -47,107 +225,658 @@ const TitleStylePanel: React.FC<TitleStylePanelProps> = ({
   onToggleShadow,
   onApplyPreset,
   activePreset,
-  titlePresets,
+  titlePresets: _titlePresets,
   POSITION_OPTIONS,
-  FONT_OPTIONS,
+  showCoverToggle = false,
+  previewWidth = 220,
+  enableTemplates = false,
+  selectedTemplateId,
+  onApplyTemplate,
+  onUpdateStyle,
+  paramsOnly = false,
+  hideEditor = false,
 }) => {
+  const upd = (patch: Partial<TitleSettings>) => {
+    onUpdateStyle?.(patch)
+  }
+
+  const [coverOpen, setCoverOpen] = useState(!!settings.coverTitle)
+
+  /* ── 模板相关 hook + 编辑器 state ── */
+  const {
+    templates,
+    createTemplate,
+    duplicateTemplate,
+    updateTemplate,
+    deleteTemplate,
+    exportTemplate,
+  } = useTitleTemplates()
+  const [editingTemplate, setEditingTemplate] = useState<TitleTemplate | null>(null)
+  const [editorOpen, setEditorOpen] = useState(false)
+
+  const grouped = useMemo(
+    () => ({
+      builtin: templates.filter((t) => t.isBuiltin),
+      custom: templates.filter((t) => !t.isBuiltin),
+    }),
+    [templates],
+  )
+
+  const handleRequestCreate = useCallback(() => {
+    // 新建模板：若已有选中模板，以其样式为起点；否则以当前 settings 为起点
+    // 注意：这里只构造「草稿」对象（不写入 localStorage），保存时再由 handleEditorSave 真正 createTemplate
+    let base: TitleSettings = settings
+    if (selectedTemplateId) {
+      const sel = templates.find((t) => t.id === selectedTemplateId)
+      if (sel) {
+        base = {
+          ...DEFAULT_TITLE_SETTINGS_FULL,
+          ...titleStyleConfigToCamel(sel.style),
+          title: settings.title,
+          aiAutoSelect: settings.aiAutoSelect,
+          coverTitle: settings.coverTitle,
+        }
+      }
+    }
+    const draft: TitleTemplate = {
+      id: "", // 空 id 表示新建草稿
+      name: "我的标题模板",
+      emoji: "✨",
+      isBuiltin: false,
+      style: camelToTitleStyleConfig({
+        ...base,
+        position: base.position === "custom" ? "bottom" : base.position,
+      } as TitleSettings),
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    }
+    setEditingTemplate(draft)
+    setEditorOpen(true)
+  }, [settings, selectedTemplateId, templates])
+
+  const handleRequestEdit = useCallback((tpl: TitleTemplate) => {
+    setEditingTemplate(tpl)
+    setEditorOpen(true)
+  }, [])
+
+  const handleDuplicate = useCallback(
+    (t: TitleTemplate) => {
+      const dup = duplicateTemplate(t.id)
+      if (dup) message.success(`已复制：${dup.name}`)
+    },
+    [duplicateTemplate],
+  )
+  const handleDelete = useCallback(
+    (t: TitleTemplate) => {
+      deleteTemplate(t.id)
+      message.success("已删除模板")
+    },
+    [deleteTemplate],
+  )
+  const handleExport = useCallback(
+    (t: TitleTemplate) => {
+      const json = exportTemplate(t.id)
+      if (!json) return
+      const blob = new Blob([json], { type: "application/json" })
+      const url = URL.createObjectURL(blob)
+      const a = document.createElement("a")
+      a.href = url
+      a.download = `${t.name}.title-template.json`
+      a.click()
+      URL.revokeObjectURL(url)
+    },
+    [exportTemplate],
+  )
+
+  const handleSelectTemplate = useCallback(
+    (tpl: TitleTemplate) => {
+      const full: TitleSettings = {
+        ...DEFAULT_TITLE_SETTINGS_FULL,
+        ...titleStyleConfigToCamel(tpl.style),
+        title: settings.title,
+        aiAutoSelect: settings.aiAutoSelect,
+        coverTitle: settings.coverTitle,
+      }
+      onApplyTemplate?.(full, tpl)
+    },
+    [onApplyTemplate, settings],
+  )
+
+  const handleEditorSave = useCallback(
+    (data: { name: string; emoji: string; style: Partial<TitleStyleConfig> }) => {
+      if (!editingTemplate) return
+      let saved: TitleTemplate
+      if (editingTemplate.isBuiltin || !editingTemplate.id) {
+        // 系统模板编辑 → 创建副本；新草稿（空 id）→ 新建
+        saved = createTemplate({ name: data.name, emoji: data.emoji, style: data.style })
+      } else {
+        // 已有自定义模板 → 更新
+        updateTemplate(editingTemplate.id, {
+          name: data.name,
+          emoji: data.emoji,
+          style: data.style,
+        })
+        saved = {
+          ...editingTemplate,
+          name: data.name,
+          emoji: data.emoji,
+          style: data.style,
+          updatedAt: new Date().toISOString(),
+        }
+      }
+      setEditorOpen(false)
+      setEditingTemplate(null)
+      message.success(`已保存：${data.name}`)
+      handleSelectTemplate(saved)
+    },
+    [editingTemplate, createTemplate, updateTemplate, handleSelectTemplate],
+  )
+
+  /* ── 渲染模板大卡片（v3：图片背景 + 透明 Canvas 叠字 + 底栏始终可见操作按钮） ── */
+  const renderTemplateCard = (t: TitleTemplate, idx: number, section: "mine" | "sys") => {
+    const isSelected = selectedTemplateId === t.id
+    const bgIdx = idx % PREVIEW_BG_IMAGES.length
+    const bgImg = PREVIEW_BG_IMAGES[bgIdx]
+    // 卡片用的预览 settings：字号按 3:4 竖版比例缩放
+    const preview = templateToPreviewSettings(t, 42)
+    return (
+      <div
+        key={t.id}
+        className={`ttv3-card${isSelected ? " selected" : ""}`}
+        onClick={() => handleSelectTemplate(t)}
+      >
+        <div className="ttv3-preview">
+          <img className="ttv3-bg" src={bgImg} alt="" />
+          <div className="ttv3-vignette" />
+          <FillPreview settings={preview} sampleText="预览标题文字" portrait />
+          <span className={`ttv3-badge ttv3-badge--${section}`}>
+            {section === "sys" ? "系统" : "我的"}
+          </span>
+          <span className={`ttv3-check${isSelected ? " on" : ""}`}>
+            {isSelected && <CheckOutlined />}
+          </span>
+        </div>
+        <div className="ttv3-footer">
+          <div className="ttv3-name-row">
+            <span className="ttv3-emoji">{t.emoji || "✨"}</span>
+            <span className="ttv3-name" title={t.name}>
+              {t.name}
+            </span>
+            <span className={`ttv3-tag ttv3-tag--${section}`}>
+              {section === "sys" ? "系统" : "我的"}
+            </span>
+          </div>
+          <div className="ttv3-actions" onClick={(e) => e.stopPropagation()}>
+            <button
+              type="button"
+              className="ttv3-act ttv3-act--primary"
+              disabled={t.isBuiltin}
+              onClick={() => handleRequestEdit(t)}
+              title={t.isBuiltin ? "系统模板不可编辑，点击复制后可编辑" : "编辑"}
+            >
+              <EditOutlined /> 编辑
+            </button>
+            <button
+              type="button"
+              className="ttv3-act"
+              onClick={() => handleDuplicate(t)}
+              title="复制"
+            >
+              <CopyOutlined /> 复制
+            </button>
+            <button type="button" className="ttv3-act" onClick={() => handleExport(t)} title="导出">
+              <ExportOutlined /> 导出
+            </button>
+            <Popconfirm title="删除该模板？" onConfirm={() => handleDelete(t)}>
+              <button
+                type="button"
+                className="ttv3-act ttv3-act--danger"
+                disabled={t.isBuiltin}
+                title={t.isBuiltin ? "系统模板不可删除" : "删除"}
+              >
+                <DeleteOutlined /> 删除
+              </button>
+            </Popconfirm>
+          </div>
+        </div>
+      </div>
+    )
+  }
+
+  /* ── 旧爆款预设网格（paramsOnly 或 enableTemplates 时不显示） ── */
+  const renderPresetGrid = () => (
+    <div className="ts-presets-grid">
+      {TITLE_PRESETS.map((p) => {
+        const isActive = activePreset === p.key
+        const previewStyle = buildPresetPreviewSettings(settings, p.key, 56)
+        return (
+          <button
+            key={p.key}
+            type="button"
+            className={`ts-preset-card${isActive ? " active" : ""}`}
+            onClick={() => onApplyPreset(p.key)}
+            title={p.label}
+          >
+            <div className="ts-preset-preview">
+              <TitleMiniPreview settings={previewStyle} width={120} sampleText="标题" />
+            </div>
+            <div className="ts-preset-meta">
+              <span className="ts-preset-emoji">{p.emoji}</span>
+              <span className="ts-preset-label">{p.label}</span>
+            </div>
+          </button>
+        )
+      })}
+    </div>
+  )
+
+  /* ── 参数 Tab 面板（编辑器右侧复用） ── */
+  const renderParamsTabs = () => (
+    <Tabs
+      size="small"
+      defaultActiveKey="basic"
+      items={[
+        {
+          key: "basic",
+          label: "基础",
+          children: (
+            <>
+              <div className="ts-row-2">
+                <div className="ts-form-field ts-half">
+                  <label>位置</label>
+                  <select
+                    className="ts-select"
+                    value={settings.position}
+                    onChange={(e) => onUpdatePosition(e.target.value)}
+                  >
+                    {POSITION_OPTIONS.map((o) => (
+                      <option key={o.value} value={o.value}>
+                        {o.label}
+                      </option>
+                    ))}
+                  </select>
+                </div>
+                <div className="ts-form-field ts-half">
+                  <label>字体</label>
+                  <select
+                    className="ts-select"
+                    value={settings.font}
+                    onChange={(e) => onUpdateFont(e.target.value)}
+                  >
+                    {NEW_FONT_OPTIONS.map((f) => (
+                      <option key={f.value} value={f.value}>
+                        {f.tag === "hot" ? "🔥 " : f.tag === "new" ? "🆕 " : ""}
+                        {f.label}
+                      </option>
+                    ))}
+                  </select>
+                </div>
+              </div>
+
+              <SliderRow
+                label="字号"
+                value={settings.size}
+                min={16}
+                max={120}
+                onChange={onUpdateSize}
+              />
+
+              <div className="ts-form-field">
+                <label>样式</label>
+                <div className="ts-style-btns">
+                  <button
+                    type="button"
+                    className={`ts-style-btn${settings.bold ? " active" : ""}`}
+                    onClick={onToggleBold}
+                  >
+                    <b>B</b>
+                  </button>
+                  <button
+                    type="button"
+                    className={`ts-style-btn${settings.italic ? " active" : ""}`}
+                    onClick={onToggleItalic}
+                  >
+                    <i>I</i>
+                  </button>
+                  <button
+                    type="button"
+                    className={`ts-style-btn${settings.stroke ? " active" : ""}`}
+                    onClick={() => {
+                      onToggleStroke()
+                      if (!settings.stroke && (settings.strokeWidth ?? 0) < 2)
+                        upd({ strokeWidth: 4 })
+                    }}
+                    title="描边"
+                  >
+                    S
+                  </button>
+                  <button
+                    type="button"
+                    className={`ts-style-btn${settings.shadow ? " active" : ""}`}
+                    onClick={() => {
+                      onToggleShadow()
+                      if (!settings.shadow) {
+                        upd({
+                          shadowOffsetX: 2,
+                          shadowOffsetY: 2,
+                          shadowBlur: 4,
+                          shadowColor: "rgba(0,0,0,0.8)",
+                        })
+                      }
+                    }}
+                    title="阴影"
+                  >
+                    ☁
+                  </button>
+                </div>
+              </div>
+
+              <ColorPicker
+                label="字色"
+                value={settings.color}
+                palette={TITLE_COLOR_PALETTE}
+                onChange={(c) => upd({ color: c })}
+              />
+            </>
+          ),
+        },
+        {
+          key: "stroke",
+          label: "描边",
+          children: (
+            <>
+              <div className="ts-toggle-row">
+                <label>
+                  <input type="checkbox" checked={settings.stroke} onChange={onToggleStroke} />
+                  启用描边
+                </label>
+              </div>
+              {settings.stroke && (
+                <>
+                  <SliderRow
+                    label="描边宽度"
+                    value={settings.strokeWidth ?? 4}
+                    min={0}
+                    max={20}
+                    onChange={(v) => upd({ strokeWidth: v })}
+                  />
+                  <ColorPicker
+                    label="描边颜色"
+                    value={settings.strokeColor ?? "#000000"}
+                    palette={STROKE_COLOR_PALETTE}
+                    onChange={(c) => upd({ strokeColor: c })}
+                  />
+                </>
+              )}
+            </>
+          ),
+        },
+        {
+          key: "shadow",
+          label: "阴影",
+          children: (
+            <>
+              <div className="ts-toggle-row">
+                <label>
+                  <input type="checkbox" checked={settings.shadow} onChange={onToggleShadow} />
+                  启用阴影
+                </label>
+              </div>
+              {settings.shadow && (
+                <>
+                  <SliderRow
+                    label="X偏移"
+                    value={settings.shadowOffsetX ?? 2}
+                    min={-20}
+                    max={20}
+                    onChange={(v) => upd({ shadowOffsetX: v })}
+                  />
+                  <SliderRow
+                    label="Y偏移"
+                    value={settings.shadowOffsetY ?? 2}
+                    min={-20}
+                    max={20}
+                    onChange={(v) => upd({ shadowOffsetY: v })}
+                  />
+                  <SliderRow
+                    label="模糊半径"
+                    value={settings.shadowBlur ?? 4}
+                    min={0}
+                    max={30}
+                    onChange={(v) => upd({ shadowBlur: v })}
+                  />
+                  <div className="ts-form-field">
+                    <label>阴影颜色</label>
+                    <input
+                      type="text"
+                      className="ts-input"
+                      value={settings.shadowColor ?? "rgba(0,0,0,0.8)"}
+                      onChange={(e) => upd({ shadowColor: e.target.value })}
+                      placeholder="rgba(0,0,0,0.8)"
+                    />
+                  </div>
+                </>
+              )}
+            </>
+          ),
+        },
+        {
+          key: "bg",
+          label: "背景",
+          children: (
+            <>
+              <div className="ts-toggle-row">
+                <label>
+                  <input
+                    type="checkbox"
+                    checked={settings.bgEnabled}
+                    onChange={() => upd({ bgEnabled: !settings.bgEnabled })}
+                  />
+                  启用背景色块
+                </label>
+              </div>
+              {settings.bgEnabled && (
+                <>
+                  <ColorPicker
+                    label="背景颜色（含透明度）"
+                    value={settings.bgColor}
+                    palette={BG_COLOR_PALETTE}
+                    onChange={(c) => upd({ bgColor: c })}
+                  />
+                  <SliderRow
+                    label="内边距"
+                    value={settings.bgPadding}
+                    min={0}
+                    max={40}
+                    onChange={(v) => upd({ bgPadding: v })}
+                  />
+                  <SliderRow
+                    label="圆角"
+                    value={settings.bgRadius}
+                    min={0}
+                    max={30}
+                    onChange={(v) => upd({ bgRadius: v })}
+                  />
+                </>
+              )}
+            </>
+          ),
+        },
+        {
+          key: "layout",
+          label: "排版",
+          children: (
+            <>
+              <SliderRow
+                label="每行最大字符数"
+                value={settings.maxCharsPerLine ?? 0}
+                min={0}
+                max={20}
+                unit=""
+                onChange={(v) => upd({ maxCharsPerLine: v })}
+              />
+              <div
+                className="ts-form-field"
+                style={{ fontSize: 11, color: "#9ca3af", marginTop: -4 }}
+              >
+                0 = 不自动换行（按 / 手动分行）
+              </div>
+              <SliderRow
+                label="行距倍数"
+                value={Math.round((settings.lineHeight ?? 1.2) * 100) / 100}
+                min={1}
+                max={2}
+                step={0.05}
+                unit=""
+                onChange={(v) => upd({ lineHeight: Number(v.toFixed(2)) })}
+              />
+              <SliderRow
+                label="顶部边距"
+                value={settings.marginTop ?? 24}
+                min={0}
+                max={200}
+                onChange={(v) => upd({ marginTop: v })}
+              />
+            </>
+          ),
+        },
+        ...(showCoverToggle
+          ? [
+              {
+                key: "cover",
+                label: "封面",
+                children: (
+                  <>
+                    <div className="ts-toggle-row">
+                      <label>
+                        <input
+                          type="checkbox"
+                          checked={coverOpen}
+                          onChange={(e) => {
+                            setCoverOpen(e.target.checked)
+                            if (!e.target.checked) {
+                              upd({ coverTitle: null })
+                            } else {
+                              upd({
+                                coverTitle: {
+                                  font: settings.font,
+                                  size: Math.round(settings.size * 0.9),
+                                  color: settings.color,
+                                  bold: settings.bold,
+                                },
+                              })
+                            }
+                          }}
+                        />
+                        封面使用独立标题样式
+                      </label>
+                    </div>
+                    {coverOpen && settings.coverTitle && (
+                      <div style={{ fontSize: 12, color: "#6b7280", lineHeight: 1.6 }}>
+                        封面样式已开启。可在「封面设置」面板单独调整封面标题的字体/字号/颜色。
+                      </div>
+                    )}
+                  </>
+                ),
+              },
+            ]
+          : []),
+      ]}
+    />
+  )
+
+  /* ── 模板模式：只显示网格 ── */
+  if (enableTemplates && !paramsOnly) {
+    return (
+      <div className="xx-title-style-section ttv3-panel">
+        <div className="ttv3-header">
+          <span className="ttv3-title">标题模板</span>
+          <Button
+            type="primary"
+            size="small"
+            icon={<PlusOutlined />}
+            onClick={handleRequestCreate}
+            className="ttv3-new-btn"
+          >
+            新建模板
+          </Button>
+        </div>
+
+        <div className="ttv3-section">
+          <div className="ttv3-section-label">我的模板</div>
+          {grouped.custom.length === 0 ? (
+            <div className="ttv3-empty">
+              <div className="ttv3-empty-icon">✨</div>
+              <div className="ttv3-empty-text">还没有自定义模板，点右上角「新建模板」创建</div>
+            </div>
+          ) : (
+            <div className="ttv3-grid">
+              {grouped.custom.map((t, i) => renderTemplateCard(t, i, "mine"))}
+            </div>
+          )}
+        </div>
+
+        <div className="ttv3-section">
+          <div className="ttv3-section-label">系统模板</div>
+          <div className="ttv3-grid">
+            {grouped.builtin.map((t, i) => renderTemplateCard(t, i, "sys"))}
+          </div>
+        </div>
+
+        {!hideEditor && editorOpen && editingTemplate && (
+          <TitleTemplateEditor
+            open={editorOpen}
+            template={editingTemplate}
+            onClose={() => {
+              setEditorOpen(false)
+              setEditingTemplate(null)
+            }}
+            onSave={handleEditorSave}
+          />
+        )}
+      </div>
+    )
+  }
+
+  /* ── paramsOnly：仅参数 Tab ── */
+  if (paramsOnly) {
+    return <div className="xx-title-style-section ttv3-params-only">{renderParamsTabs()}</div>
+  }
+
+  /* ── 默认模式：顶部预览 + 预设 + 参数 Tab ── */
   return (
-    <div className="xx-title-style-section">
-      <h4 className="xx-section-subtitle">标题样式</h4>
-
-      {/* 位置 + 字体 一行 */}
-      <div className="xx-title-style-row">
-        <div className="xx-form-field xx-half-field">
-          <label>位置</label>
-          <select
-            className="xx-form-select"
-            value={settings.position}
-            onChange={(e) => onUpdatePosition(e.target.value)}
-          >
-            {POSITION_OPTIONS.map((opt) => (
-              <option key={opt.value} value={opt.value}>
-                {opt.label}
-              </option>
-            ))}
-          </select>
-        </div>
-        <div className="xx-form-field xx-half-field">
-          <label>字体</label>
-          <select
-            className="xx-form-select"
-            value={settings.font}
-            onChange={(e) => onUpdateFont(e.target.value)}
-          >
-            {FONT_OPTIONS.map((f) => (
-              <option key={f} value={f}>
-                {f}
-              </option>
-            ))}
-          </select>
-        </div>
-      </div>
-
-      {/* 字号滑块 */}
-      <div className="xx-form-field">
-        <div className="xx-field-label-row">
-          <label>字号</label>
-          <span className="xx-field-value">{settings.size}px</span>
-        </div>
-        <input
-          className="xx-slider"
-          type="range"
-          min={12}
-          max={128}
-          value={settings.size}
-          onChange={(e) => onUpdateSize(Number(e.target.value))}
+    <div className="xx-title-style-section ts-panel">
+      {/* 实时迷你预览 */}
+      <div className="ts-preview-wrap">
+        <TitleMiniPreview
+          settings={settings}
+          width={previewWidth}
+          sampleText={settings.title || "预览标题文字"}
         />
       </div>
 
-      {/* 预设样式 */}
-      <div className="xx-form-field">
-        <label>预设样式</label>
-        <TitlePresetsGrid
-          presets={titlePresets}
-          activePreset={activePreset}
-          onApply={onApplyPreset}
-          fontFamily={settings.font}
-        />
+      {/* 爆款预设 */}
+      <div className="ts-form-field">
+        <div className="ts-field-label-row">
+          <label>爆款预设</label>
+          {activePreset && <span className="ts-field-value">已选</span>}
+        </div>
+        {renderPresetGrid()}
       </div>
 
-      {/* 样式按钮：粗体/斜体/描边/阴影 */}
-      <div className="xx-form-field">
-        <label>样式</label>
-        <div className="xx-style-btns">
-          <button
-            className={`xx-style-btn ${settings.bold ? "active" : ""}`}
-            onClick={onToggleBold}
-            title="粗体"
-          >
-            <b>B</b>
-          </button>
-          <button
-            className={`xx-style-btn ${settings.italic ? "active" : ""}`}
-            onClick={onToggleItalic}
-            title="斜体"
-          >
-            <i>I</i>
-          </button>
-          <button
-            className={`xx-style-btn ${settings.stroke ? "active" : ""}`}
-            onClick={onToggleStroke}
-            title="描边"
-          >
-            S
-          </button>
-          <button
-            className={`xx-style-btn ${settings.shadow ? "active" : ""}`}
-            onClick={onToggleShadow}
-            title="阴影"
-          >
-            ☁
-          </button>
-        </div>
-      </div>
+      {renderParamsTabs()}
+
+      {!hideEditor && editorOpen && editingTemplate && (
+        <TitleTemplateEditor
+          open={editorOpen}
+          template={editingTemplate}
+          onClose={() => {
+            setEditorOpen(false)
+            setEditingTemplate(null)
+          }}
+          onSave={handleEditorSave}
+        />
+      )}
     </div>
   )
 }

apps/web/src/pages/generate/constants.ts

@@ -54,22 +54,8 @@ export const POSITION_OPTIONS = [
   { value: "custom", label: "自定义" },
 ]
 
-/* ── 标题字体选项 ── */
-export const FONT_OPTIONS = ["思源黑体", "思源宋体", "苹方", "微软雅黑", "楷体"]
-
-/* ── 标题字体 CSS font-family 映射（中文显示名 → 浏览器可识别的字体栈） ── */
-export const FONT_FAMILY_MAP: Record<string, string> = {
-  思源黑体: '"Source Han Sans SC", "Noto Sans SC", "PingFang SC", "Microsoft YaHei", sans-serif',
-  思源宋体: '"Source Han Serif SC", "Noto Serif SC", "Songti SC", "SimSun", serif',
-  苹方: '"PingFang SC", -apple-system, "Helvetica Neue", sans-serif',
-  PingFang: '"PingFang SC", -apple-system, "Helvetica Neue", sans-serif',
-  微软雅黑: '"Microsoft YaHei", "PingFang SC", sans-serif',
-  楷体: '"KaiTi", "STKaiti", "DFKai-SB", serif',
-}
-
-export function getFontFamily(font: string): string {
-  return FONT_FAMILY_MAP[font] || FONT_FAMILY_MAP["思源黑体"]
-}
+/* ── 标题字体：统一使用公共层定义（#2001） ── */
+export { getFontFamily } from "@/components/title/constants"
 
 /* ── 标题样式预设 ── */
 export const TITLE_PRESETS = [
@@ -549,31 +535,6 @@ export const SMART_MATCH_REASONS = [
   "人物表情生动",
 ]
 
-/* ── AI 标题模板 ── */
-export const AI_TITLE_TEMPLATES: Record<string, string[]> = {
-  catchy: [
-    "震惊！{topic}居然还能这样操作",
-    "99%的人都不知道的{topic}秘诀",
-    "{topic}的终极指南，看完直接封神",
-    "别再走弯路了！{topic}看这一篇就够",
-    "一个视频讲透{topic}，建议收藏",
-  ],
-  emotional: [
-    "致每一个在{topic}路上坚持的人",
-    "关于{topic}，我想说句真心话",
-    "{topic}背后的故事，看完沉默了",
-    "为什么我劝你一定要了解{topic}",
-    "这才是{topic}最动人的样子",
-  ],
-  informative: [
-    "{topic}完整科普：从入门到精通",
-    "深度解析{topic}的核心原理",
-    "{topic}行业趋势报告｜2026最新版",
-    "三分钟带你全面了解{topic}",
-    "{topic}常见问题与解决方案汇总",
-  ],
-}
-
 /* ── 默认封面设置 ── */
 export const DEFAULT_COVER_SETTINGS: CoverConfig = {
   enabled: true,

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

@@ -2739,6 +2739,7 @@
   justify-content: center;
   font-size: 32px;
   color: #ccc;
+  position: relative;
 }
 
 /* 卡片信息区 */
@@ -2880,27 +2881,6 @@
    Issue #1677 多视频批量生成
    ================================================================ */
 
-/* ── Step4 布局对调：左侧预览大区域，右侧标题边栏 ── */
-.xx-generate-layout.step4-layout {
-  grid-template-columns: 1fr 380px;
-  align-items: start;
-}
-
-.xx-generate-preview-col {
-  min-width: 0;
-  position: sticky;
-  top: 16px;
-}
-
-.xx-generate-preview-col .xx-form-section {
-  margin: 0;
-}
-
-.xx-title-sidebar {
-  max-height: calc(100vh - 140px);
-  overflow-y: auto;
-}
-
 /* ── 数量选择弹窗 ── */
 .xx-modal-mask {
   position: fixed;
@@ -3240,135 +3220,6 @@
   border-radius: 4px;
 }
 
-/* ── 响应式：窄屏 Step4 回退单列 ── */
-@media (max-width: 960px) {
-  .xx-generate-layout.step4-layout {
-    grid-template-columns: 1fr;
-  }
-
-  .xx-generate-preview-col {
-    position: static;
-  }
-
-  .xx-title-sidebar {
-    max-height: none;
-  }
-}
-
-/* ============================================================
-   批量前端 Canvas 预览网格（Issue #1677 修正：纯前端实时预览）
-   ============================================================ */
-/* #1741：卡片整体缩小至约 3/5——宽屏排 3 列（卡片限宽 220px 居中），
-   中屏自动回退 2 列，窄屏 1 列（见下方媒体查询）；卡片保持 9:16 比例不变形 */
-.xx-canvas-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(160px, 180px));
-  justify-content: center;
-  gap: 14px;
-}
-
-/* 窄屏单列时卡片限宽居中，避免 1fr 拉伸导致卡片过高 */
-@media (max-width: 960px) {
-  .xx-canvas-grid {
-    grid-template-columns: minmax(0, 320px);
-  }
-}
-
-.xx-canvas-grid-card {
-  position: relative;
-  border: 2px solid var(--border-primary, #e2e8f0);
-  border-radius: 12px;
-  overflow: hidden;
-  background: transparent;
-  transition: border-color 0.2s ease;
-  min-width: 0;
-}
-
-.xx-canvas-grid-card.selected {
-  border-color: var(--primary-color, #1677ff);
-  box-shadow: 0 0 0 2px rgba(22, 119, 255, 0.15);
-}
-
-.xx-canvas-grid-card-bar {
-  position: relative;
-  z-index: 2;
-  display: flex;
-  align-items: center;
-  padding: 6px 10px;
-  background: var(--bg-surface, #fff);
-  border-bottom: 1px solid var(--border-primary, #e2e8f0);
-}
-
-.xx-canvas-grid-check {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  font-size: 13px;
-  font-weight: 500;
-  color: var(--text-primary, #1a1a1a);
-  cursor: pointer;
-  user-select: none;
-}
-
-.xx-canvas-grid-check input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-  cursor: pointer;
-  accent-color: var(--primary-color, #1677ff);
-}
-
-/* #1750：批量变体片段加载/错误占位（9:16 竖屏比例，与播放器卡片同尺寸防塌陷） */
-.xx-variant-clips-status {
-  position: relative;
-  width: 100%;
-  aspect-ratio: 9 / 16;
-  max-height: 70vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: 4px;
-  font-size: 13px;
-  color: rgba(255, 255, 255, 0.75);
-  background: #0a0a0a;
-  border-radius: 16px;
-  overflow: hidden;
-  box-shadow:
-    0 4px 6px -1px rgba(0, 0, 0, 0.3),
-    0 20px 50px -12px rgba(0, 0, 0, 0.5),
-    inset 0 0 0 1px rgba(255, 255, 255, 0.06);
-}
-
-.xx-variant-clips-status .anticon {
-  font-size: 22px;
-}
-
-.xx-variant-clips-error-text {
-  color: rgba(255, 255, 255, 0.85);
-  font-size: 13px;
-}
-
-/* ============================================================
-   批量标题：AI 一键生成行（Issue #1677）
-   ============================================================ */
-.xx-batch-ai-row {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: 8px;
-  padding: 10px 12px;
-  margin-bottom: 12px;
-  background: var(--bg-secondary, #f7f8fa);
-  border: 1px dashed var(--border-primary, #d9d9d9);
-  border-radius: 10px;
-}
-
-.xx-batch-ai-row .xx-form-field {
-  margin: 0;
-  flex: 1;
-  min-width: 140px;
-}
-
 .xx-batch-titles {
   display: flex;
   flex-direction: column;
@@ -3485,3 +3336,465 @@
     grid-template-columns: minmax(0, 360px);
   }
 }
+
+/* ================================================================
+   自定义封面编辑器 (Cover Editor Modal) — xx-ce-*
+   ================================================================ */
+
+/* Header */
+.xx-ce-header {
+  margin-bottom: 16px;
+}
+.xx-ce-name-input {
+  width: 100%;
+  padding: 8px 12px;
+  border: 1px solid var(--border-color, #e5e7eb);
+  border-radius: var(--radius-sm, 6px);
+  font-size: 14px;
+  margin-bottom: 12px;
+  outline: none;
+}
+.xx-ce-name-input:focus {
+  border-color: #7c3aed;
+}
+.xx-ce-header-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+}
+
+/* Layout */
+.xx-ce-layout {
+  display: flex;
+  gap: 20px;
+  min-height: 500px;
+}
+.xx-ce-left {
+  width: 300px;
+  flex-shrink: 0;
+  max-height: 70vh;
+  overflow-y: auto;
+}
+.xx-ce-right {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #f5f5f5;
+  border-radius: 8px;
+  min-height: 480px;
+}
+
+/* Section / collapsible panels */
+.xx-ce-section {
+  border: 1px solid var(--border-color, #e5e7eb);
+  border-radius: 6px;
+  margin-bottom: 8px;
+}
+.xx-ce-section-header {
+  padding: 10px 12px;
+  font-size: 13px;
+  font-weight: 600;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: #f0f4ff;
+  user-select: none;
+}
+.xx-ce-section-header:hover {
+  background: #e8edf8;
+}
+.xx-ce-section-body {
+  padding: 12px;
+  font-size: 12px;
+  color: var(--text-secondary, #666);
+}
+.xx-ce-header-right {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.xx-ce-status-text {
+  font-size: 11px;
+  font-weight: 400;
+  color: #3b82f6;
+}
+
+/* Rows / labels */
+.xx-ce-row {
+  margin: 12px 0;
+}
+.xx-ce-label {
+  display: block;
+  font-size: 12px;
+  color: #374151;
+  margin-bottom: 4px;
+}
+.xx-ce-hint {
+  font-size: 11px;
+  color: #9ca3af;
+  margin-top: 4px;
+}
+.xx-ce-sub-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 8px;
+}
+.xx-ce-switch-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.xx-ce-switch-item {
+  margin-bottom: 12px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f3f4f6;
+}
+.xx-ce-switch-item:last-child {
+  border-bottom: none;
+  margin-bottom: 0;
+  padding-bottom: 0;
+}
+
+/* Color picker */
+.xx-ce-color-picker {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.xx-ce-color-picker input[type="color"] {
+  width: 32px;
+  height: 24px;
+  padding: 0;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  cursor: pointer;
+  background: none;
+}
+.xx-ce-color-picker input[type="color"]::-webkit-color-swatch-wrapper {
+  padding: 1px;
+}
+.xx-ce-color-picker input[type="color"]::-webkit-color-swatch {
+  border: none;
+  border-radius: 2px;
+}
+.xx-ce-color-hex {
+  width: 70px;
+  padding: 2px 6px;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  font-size: 12px;
+  font-family: monospace;
+}
+
+/* Position pair */
+.xx-ce-position {
+  display: flex;
+  gap: 8px;
+}
+.xx-ce-position .ant-input-number {
+  flex: 1;
+}
+
+/* Radio button group */
+.xx-ce-radio-group {
+  display: flex;
+  gap: 0;
+}
+.xx-ce-radio-btn {
+  padding: 4px 14px;
+  font-size: 12px;
+  border: 1px solid #d1d5db;
+  background: #fff;
+  color: #374151;
+  cursor: pointer;
+  transition: all 0.15s;
+}
+.xx-ce-radio-btn:first-child {
+  border-radius: 4px 0 0 4px;
+}
+.xx-ce-radio-btn:last-child {
+  border-radius: 0 4px 4px 0;
+}
+.xx-ce-radio-btn + .xx-ce-radio-btn {
+  border-left: none;
+}
+.xx-ce-radio-btn.active {
+  background: #7c3aed;
+  color: #fff;
+  border-color: #7c3aed;
+}
+.xx-ce-radio-btn.active + .xx-ce-radio-btn {
+  border-left: 1px solid #d1d5db;
+}
+
+/* Font select dots */
+.xx-ce-font-dot {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  margin-right: 6px;
+  vertical-align: middle;
+}
+.xx-ce-font-dot--preset {
+  background: #10b981; /* 绿：预置爆款中文字体 */
+}
+.xx-ce-font-dot--hand {
+  background: #f59e0b; /* 橙：手写/书法字体 */
+}
+.xx-ce-font-dot--serif {
+  background: #8b5cf6; /* 紫：衬线字体 */
+}
+.xx-ce-font-dot--mono {
+  background: #6b7280; /* 灰：等宽字体 */
+}
+.xx-ce-font-dot--system {
+  background: #3b82f6; /* 蓝：系统无衬线 */
+}
+
+/* Shadow actions */
+.xx-ce-shadow-actions {
+  display: flex;
+  gap: 8px;
+  margin-top: 4px;
+}
+.xx-ce-add-shadow-btn {
+  padding: 4px 10px;
+  font-size: 12px;
+  background: #7c3aed;
+  color: #fff;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+}
+.xx-ce-add-shadow-btn:hover {
+  background: #6d28d9;
+}
+.xx-ce-preset-shadow-btn {
+  padding: 4px 10px;
+  font-size: 12px;
+  background: #fff;
+  color: #374151;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+/* Text background sub-section */
+.xx-ce-text-bg-section {
+  margin-top: 8px;
+  padding: 8px;
+  background: #fafafa;
+  border-radius: 4px;
+  border: 1px solid #f0f0f0;
+}
+
+/* Readonly text display */
+.xx-ce-readonly-text {
+  padding: 6px 10px;
+  background: #eff6ff;
+  border-radius: 4px;
+  font-size: 13px;
+  color: #1e40af;
+  margin-bottom: 4px;
+}
+
+/* Mask file row */
+.xx-ce-file-row {
+  display: flex;
+  gap: 6px;
+  align-items: center;
+}
+.xx-ce-file-name {
+  flex: 1;
+  padding: 4px 8px;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  font-size: 12px;
+  background: #f9fafb;
+  color: #6b7280;
+}
+.xx-ce-file-btn {
+  padding: 4px 10px;
+  font-size: 12px;
+  background: #fff;
+  color: #374151;
+  border: 1px solid #d1d5db;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+.xx-ce-file-btn:hover {
+  border-color: #7c3aed;
+  color: #7c3aed;
+}
+
+/* ── Canvas / Preview ── */
+.xx-ce-canvas-wrap {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.xx-ce-canvas {
+  width: 225px;
+  height: 400px;
+  background: #ddd;
+  position: relative;
+  border-radius: 8px;
+  overflow: hidden;
+}
+.xx-ce-anchor-dot {
+  position: absolute;
+  width: 8px;
+  height: 8px;
+  background: #ef4444;
+  border-radius: 50%;
+  z-index: 5;
+}
+
+/* Portrait element */
+.xx-ce-el-portrait {
+  position: absolute;
+  background: #a8d4f0;
+  border: 2px solid #333;
+  z-index: 2;
+}
+
+/* 8 handles: 0=TL 1=T 2=TR 3=R 4=BR 5=B 6=BL 7=L */
+.xx-ce-handle {
+  position: absolute;
+  width: 8px;
+  height: 8px;
+  background: #3b82f6;
+  border: 1px solid #fff;
+  z-index: 10;
+}
+.xx-ce-handle--0 {
+  top: -4px;
+  left: -4px;
+}
+.xx-ce-handle--1 {
+  top: -4px;
+  left: 50%;
+  margin-left: -4px;
+}
+.xx-ce-handle--2 {
+  top: -4px;
+  right: -4px;
+}
+.xx-ce-handle--3 {
+  top: 50%;
+  right: -4px;
+  margin-top: -4px;
+}
+.xx-ce-handle--4 {
+  bottom: -4px;
+  right: -4px;
+}
+.xx-ce-handle--5 {
+  bottom: -4px;
+  left: 50%;
+  margin-left: -4px;
+}
+.xx-ce-handle--6 {
+  bottom: -4px;
+  left: -4px;
+}
+.xx-ce-handle--7 {
+  top: 50%;
+  left: -4px;
+  margin-top: -4px;
+}
+
+/* Background element */
+.xx-ce-el-bg {
+  position: absolute;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  z-index: 1;
+}
+
+/* Mask overlay */
+.xx-ce-el-mask {
+  position: absolute;
+  inset: 0;
+  z-index: 4;
+  pointer-events: none;
+}
+
+/* Text background shape in canvas */
+.xx-ce-text-bg {
+  position: absolute;
+  z-index: -1;
+}
+
+/* Cover template selected check */
+.xx-cover-template-check {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  width: 22px;
+  height: 22px;
+  background: #7c3aed;
+  color: #fff;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  font-weight: 700;
+  z-index: 2;
+  box-shadow: 0 2px 6px rgba(124, 58, 237, 0.4);
+}
+.xx-cover-template-thumb {
+  position: relative;
+}
+
+/* Preview tip */
+.xx-ce-preview-tip {
+  text-align: center;
+  margin-top: 12px;
+  font-size: 12px;
+  color: #6b7280;
+}
+
+/* Cover editor modal base gradient */
+.xx-ce-canvas {
+  background: #1a1a2e;
+}
+
+/* Antd Slider overrides for editor */
+.xx-ce-section-body .ant-slider {
+  margin: 4px 0 8px;
+}
+.xx-ce-section-body .ant-slider-rail {
+  background: #e5e7eb;
+}
+.xx-ce-section-body .ant-slider-track {
+  background: #3b82f6;
+}
+.xx-ce-section-body .ant-slider-handle::after {
+  box-shadow: 0 0 0 2px #3b82f6;
+}
+.xx-ce-section-body .ant-slider-mark-text {
+  font-size: 10px;
+}
+
+/* Antd Select dropdown font dots */
+.xx-ce-font-select-dropdown .ant-select-item-option-content {
+  display: flex;
+  align-items: center;
+}
+
+/* Canvas 装饰层（背景/装饰/遮罩/底色/人物/文字背景色块）不接收鼠标事件，
+   但拖拽的标题/副标题文字（内联 cursor:grab）需要接收 mousedown。
+   已通过 renderTextStyle 显式设 pointer-events 以外的样式，因此此处只关掉纯装饰层。 */
+.xx-ce-canvas-base,
+.xx-ce-el-bg,
+.xx-ce-el-portrait,
+.xx-ce-el-mask {
+  pointer-events: none;
+}

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

@@ -22,6 +22,8 @@ export interface UseGenerateVideoProps {
   ttsVoiceId?: string
   /** TTS 音色来源 */
   ttsVoiceSource?: "preset" | "clone"
+  /** TTS 配音风格 */
+  ttsStyle?: string
   /** 合成后保存到配音库的 asset id / job id（叙事模式） */
   ttsVoiceAssetId?: string
   /** 智能降重开关（默认 true） */

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

@@ -10,7 +10,7 @@ export interface BatchTaskState {
   taskId: string
   /** 变体序号（0-based，与标题/封面数组对齐） */
   variantIndex: number
-  status: "running" | "completed" | "failed"
+  status: "running" | "completed" | "awaiting_cover" | "failed"
   progress: number
   error: string | null
   /** 完成后的成片视频 */
@@ -96,7 +96,7 @@ export function useGenerationPolling({
       runId: number,
       callbacks?: {
         onTaskProgress?: (pct: number) => void
-        onTaskCompleted?: (videos: unknown[]) => void
+        onTaskCompleted?: (videos: unknown[], taskStatus?: "completed" | "awaiting_cover") => void
         onTaskFailed?: (msg: string) => void
       },
     ): Promise<unknown[]> => {
@@ -111,7 +111,7 @@ export function useGenerationPolling({
             if (cancelledRef.current || done) return
             consecutiveErrors = 0
 
-            if (task.status === "completed") {
+            if (task.status === "completed" || task.status === "awaiting_cover") {
               done = true
               const videos = await fetchResultsWithRetry(taskId)
               if (cancelledRef.current) return
@@ -121,7 +121,7 @@ export function useGenerationPolling({
                 reject(new Error(msg))
                 return
               }
-              callbacks?.onTaskCompleted?.(videos)
+              callbacks?.onTaskCompleted?.(videos, task.status as "completed" | "awaiting_cover")
               resolve(videos)
               return
             }
@@ -259,10 +259,11 @@ export function useGenerationPolling({
             onBatchTaskUpdate?.(taskId, { status: "running", progress: pct })
             reportAggregateProgress()
           },
-          onTaskCompleted: (videos) => {
+          onTaskCompleted: (videos, taskStatus) => {
             progressMap.set(taskId, 100)
             resultMap.set(taskId, videos)
-            onBatchTaskUpdate?.(taskId, { status: "completed", progress: 100, videos })
+            const _finalStatus: "completed" | "awaiting_cover" = taskStatus ?? "completed"
+            onBatchTaskUpdate?.(taskId, { status: _finalStatus, progress: 100, videos })
             reportAggregateProgress()
             checkAllSettled()
           },
@@ -293,8 +294,9 @@ export function useGenerationPolling({
       }
       pollSingleTask(taskId, Date.now(), {
         onTaskProgress: (pct) => onBatchTaskUpdate?.(taskId, { status: "running", progress: pct }),
-        onTaskCompleted: (videos) => {
-          onBatchTaskUpdate?.(taskId, { status: "completed", progress: 100, videos })
+        onTaskCompleted: (videos, taskStatus) => {
+          const _finalStatus: "completed" | "awaiting_cover" = taskStatus ?? "completed"
+          onBatchTaskUpdate?.(taskId, { status: _finalStatus, progress: 100, videos })
           message.success(`视频 ${variantIndex + 1} 重试成功`)
         },
         onTaskFailed: (msg) => onBatchTaskUpdate?.(taskId, { status: "failed", error: msg }),

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

@@ -30,8 +30,23 @@ interface UseBatchCoversOptions {
     color: string
     position: string
     bold: boolean
+    italic?: boolean
     stroke: boolean
+    strokeWidth?: number
+    strokeColor?: string
     shadow: boolean
+    shadowOffsetX?: number
+    shadowOffsetY?: number
+    shadowBlur?: number
+    shadowColor?: string
+    lineHeight?: number
+    marginTop?: number
+    maxCharsPerLine?: number
+    bgEnabled?: boolean
+    bgColor?: string
+    bgPadding?: number
+    bgRadius?: number
+    lineOverrides?: unknown[]
   }
   covers: string[]
   onCoversChange: CoversChangeFn
@@ -78,7 +93,12 @@ export function useBatchCovers({
   /** 为第 index 个视频自动生成封面；返回是否成功（供 generateAll 统计） */
   const generateOne = useCallback(
     async (index: number): Promise<boolean> => {
-      const finalVideos = generatedVideos.filter((v) => v.status === "completed")
+      const finalVideos = generatedVideos.filter(
+        (v) =>
+          v.status === "completed" ||
+          v.status === "awaiting_cover" ||
+          v.status === "awaiting_cover",
+      )
       const target = finalVideos[index] || generatedVideos[index]
       if (!target) {
         message.warning("该视频尚未生成完成")
@@ -87,25 +107,57 @@ export function useBatchCovers({
       addBusy(index)
       try {
         const titleText = titles[index] || ""
-        const response = await generateCover(selectedTemplate, {
-          generated_video_id: target.id,
-          video_url: target.file_url || target.download_url || "",
-          cover_type: "ai_frame",
-          ...(titleText
-            ? {
-                title_config: {
-                  text: titleText,
-                  font: titleStyle.font,
-                  font_size: titleStyle.size,
-                  font_color: titleStyle.color,
-                  position: titleStyle.position,
-                  bold: titleStyle.bold,
-                  stroke: titleStyle.stroke,
-                  shadow: titleStyle.shadow,
-                },
-              }
-            : {}),
-        })
+        const response = await generateCover(
+          selectedTemplate && selectedTemplate !== "default" ? selectedTemplate : undefined,
+          {
+            generated_video_id: target.id,
+            video_url: target.file_url || target.download_url || "",
+            cover_type: "ai_frame",
+            ...(titleText
+              ? {
+                  title_config: {
+                    text: titleText,
+                    font: titleStyle.font,
+                    font_size: titleStyle.size,
+                    font_color: titleStyle.color,
+                    position: titleStyle.position,
+                    bold: titleStyle.bold,
+                    italic: titleStyle.italic,
+                    stroke: titleStyle.stroke
+                      ? {
+                          enabled: true,
+                          width: titleStyle.strokeWidth ?? 4,
+                          color: titleStyle.strokeColor ?? "#000000",
+                        }
+                      : { enabled: false },
+                    shadow: titleStyle.shadow
+                      ? {
+                          enabled: true,
+                          offset_x: titleStyle.shadowOffsetX ?? 2,
+                          offset_y: titleStyle.shadowOffsetY ?? 2,
+                          blur: titleStyle.shadowBlur ?? 4,
+                          color: titleStyle.shadowColor ?? "rgba(0,0,0,0.8)",
+                        }
+                      : { enabled: false },
+                    line_height: titleStyle.lineHeight ?? 1.2,
+                    margin_top: titleStyle.marginTop ?? 24,
+                    max_chars_per_line: titleStyle.maxCharsPerLine ?? 0,
+                    background: titleStyle.bgEnabled
+                      ? {
+                          enabled: true,
+                          color: titleStyle.bgColor,
+                          padding: titleStyle.bgPadding,
+                          radius: titleStyle.bgRadius,
+                        }
+                      : { enabled: false },
+                    line_overrides: (titleStyle.lineOverrides ?? []) as Array<
+                      Record<string, unknown>
+                    >,
+                  },
+                }
+              : {}),
+          },
+        )
         const url = response.cover?.image_url || response.cover?.thumbnail_url || ""
         if (url) {
           patchCover(index, url)
@@ -159,7 +211,10 @@ export function useBatchCovers({
 
   /** 一键全部自动生成（串行，避免队列限流；单个失败不阻塞，结束后分级提示） */
   const generateAll = useCallback(async () => {
-    const finalVideos = generatedVideos.filter((v) => v.status === "completed")
+    const finalVideos = generatedVideos.filter(
+      (v) =>
+        v.status === "completed" || v.status === "awaiting_cover" || v.status === "awaiting_cover",
+    )
     const total = finalVideos.length
     // 待处理：基于调用时刻的 covers 快照判断（已有封面跳过）；
     // 回写走函数式 updater，循环内不再依赖可能过期的 covers 闭包

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

@@ -13,6 +13,7 @@ import type { EditPlanClip } from "@/api/template-editor"
 import type { CoverConfig } from "../../types/cover"
 import type { PresetVoiceItem } from "@/api/voices"
 import type { ScriptItem } from "@/api/scripts"
+import { DEFAULT_TTS_STYLE, type TtsStyle } from "@/api/tts/styles"
 import { DEFAULT_COVER_SETTINGS, DEFAULT_CLIP_COUNT } from "../../constants"
 import type { TitleSettings } from "../../types"
 import { usePlanConfigLoader } from "./usePlanConfigLoader"
@@ -33,6 +34,21 @@ const DEFAULT_TITLE_SETTINGS: TitleSettings = {
   color: "#ffffff",
   posX: null,
   posY: null,
+  lineHeight: 1.2,
+  marginTop: 24,
+  maxCharsPerLine: 0,
+  strokeWidth: 4,
+  strokeColor: "#000000",
+  shadowOffsetX: 2,
+  shadowOffsetY: 2,
+  shadowBlur: 4,
+  shadowColor: "rgba(0,0,0,0.8)",
+  bgEnabled: false,
+  bgColor: "rgba(0,0,0,0.5)",
+  bgPadding: 12,
+  bgRadius: 8,
+  lineOverrides: [],
+  coverTitle: null,
 }
 
 export interface GenerateFormState {
@@ -95,6 +111,9 @@ export interface GenerateFormState {
   /** TTS 音色来源：preset 系统 / clone 克隆 */
   ttsVoiceSource: "preset" | "clone"
   setTtsVoiceSource: (src: "preset" | "clone") => void
+  /** TTS 配音风格 */
+  ttsStyle: TtsStyle
+  setTtsStyle: (s: TtsStyle) => void
   /** 合成后配音库 asset id（叙事模式保存到库后获得；随机模式 = selectedVoice） */
   ttsVoiceAssetId: string
   setTtsVoiceAssetId: (id: string) => void
@@ -234,6 +253,7 @@ export const useGenerateFormState = (): GenerateFormState => {
   const [selectedScript, setSelectedScript] = useState<ScriptItem | null>(null)
   const [ttsVoiceId, setTtsVoiceId] = useState<string>("")
   const [ttsVoiceSource, setTtsVoiceSource] = useState<"preset" | "clone">("preset")
+  const [ttsStyle, setTtsStyle] = useState<TtsStyle>(DEFAULT_TTS_STYLE)
   const [ttsVoiceAssetId, setTtsVoiceAssetId] = useState<string>("")
   const [dedupEnabled, setDedupEnabled] = useState<boolean>(true)
 
@@ -311,6 +331,8 @@ export const useGenerateFormState = (): GenerateFormState => {
     setTtsVoiceId,
     ttsVoiceSource,
     setTtsVoiceSource,
+    ttsStyle,
+    setTtsStyle,
     ttsVoiceAssetId,
     setTtsVoiceAssetId,
     dedupEnabled,

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

@@ -1,6 +1,7 @@
 import { useEffect } from "react"
 import type { CoverConfig } from "../../types/cover"
 import type { TitleSettings } from "../../types"
+import type { TitleLineOverride } from "@/components/title/types"
 import type { TitleConfig } from "@/api/template-editor"
 import { getEditPlan } from "@/api/template-editor"
 
@@ -12,6 +13,156 @@ interface UsePlanConfigLoaderOptions {
   setSelectedMaterials: (ids: string[]) => void
 }
 
+/** #2001：统一归一化 title_config snake_case -> camelCase TitleSettings */
+function mapTitleCfgToSettings(
+  prev: TitleSettings,
+  tc: TitleConfig & Record<string, unknown>,
+): TitleSettings {
+  const stroke = tc.stroke as
+    boolean | { enabled?: boolean; width?: number; color?: string } | undefined
+  const strokeEnabled: boolean | undefined =
+    typeof stroke === "object" && stroke ? stroke.enabled !== false : !!stroke || undefined
+  const strokeW: number | undefined =
+    typeof stroke === "object" && stroke
+      ? (stroke.width ?? (tc.stroke_width as number | undefined))
+      : (tc.stroke_width as number | undefined)
+  const strokeC: string | undefined =
+    typeof stroke === "object" && stroke
+      ? (stroke.color ?? (tc.stroke_color as string | undefined))
+      : (tc.stroke_color as string | undefined)
+
+  const shadow = tc.shadow as
+    | boolean
+    | { enabled?: boolean; offset_x?: number; offset_y?: number; blur?: number; color?: string }
+    | undefined
+  const shadowEnabled: boolean | undefined =
+    typeof shadow === "object" && shadow ? shadow.enabled !== false : !!shadow || undefined
+  const shOffX: number | undefined =
+    typeof shadow === "object" && shadow
+      ? (shadow.offset_x ?? (tc.shadow_offset_x as number | undefined))
+      : (tc.shadow_offset_x as number | undefined)
+  const shOffY: number | undefined =
+    typeof shadow === "object" && shadow
+      ? (shadow.offset_y ?? (tc.shadow_offset_y as number | undefined))
+      : (tc.shadow_offset_y as number | undefined)
+  const shBlur: number | undefined =
+    typeof shadow === "object" && shadow
+      ? (shadow.blur ?? (tc.shadow_blur as number | undefined))
+      : (tc.shadow_blur as number | undefined)
+  const shColor: string | undefined =
+    typeof shadow === "object" && shadow
+      ? (shadow.color ?? (tc.shadow_color as string | undefined))
+      : (tc.shadow_color as string | undefined)
+
+  const bg = tc.background as
+    { enabled?: boolean; color?: string; padding?: number; radius?: number } | undefined
+  const bgEnabled: boolean | undefined =
+    (bg && typeof bg === "object" ? bg.enabled : undefined) ??
+    (tc.bg_enabled as boolean | undefined)
+  const bgColor: string | undefined =
+    (bg && typeof bg === "object" ? bg.color : undefined) ?? (tc.bg_color as string | undefined)
+  const bgPadding: number | undefined =
+    (bg && typeof bg === "object" ? bg.padding : undefined) ?? (tc.bg_padding as number | undefined)
+  const bgRadius: number | undefined =
+    (bg && typeof bg === "object" ? bg.radius : undefined) ?? (tc.bg_radius as number | undefined)
+
+  const ct = (tc.cover_title_config ?? null) as null | Record<string, unknown>
+  let coverTitle: TitleSettings["coverTitle"] = prev.coverTitle
+  if (ct) {
+    const ctStroke = ct.stroke as
+      boolean | { enabled?: boolean; width?: number; color?: string } | undefined
+    const ctShadow = ct.shadow as
+      | boolean
+      | { enabled?: boolean; offset_x?: number; offset_y?: number; blur?: number; color?: string }
+      | undefined
+    const ctBg = ct.background as
+      { enabled?: boolean; color?: string; padding?: number; radius?: number } | undefined
+    coverTitle = {
+      title: (ct.title as string | undefined) ?? prev.coverTitle?.title ?? "",
+      font: (ct.font as string | undefined) ?? prev.coverTitle?.font,
+      size:
+        (ct.font_size as number | undefined) ??
+        (ct.size as number | undefined) ??
+        prev.coverTitle?.size,
+      color:
+        (ct.font_color as string | undefined) ??
+        (ct.color as string | undefined) ??
+        prev.coverTitle?.color,
+      bold: (ct.bold as boolean | undefined) ?? prev.coverTitle?.bold,
+      italic: (ct.italic as boolean | undefined) ?? prev.coverTitle?.italic,
+      position: (ct.position as string | undefined) ?? prev.coverTitle?.position,
+      stroke:
+        typeof ctStroke === "object" && ctStroke
+          ? ctStroke.enabled !== false
+          : ((ctStroke as boolean | undefined) ?? prev.coverTitle?.stroke),
+      strokeWidth:
+        (typeof ctStroke === "object" && ctStroke ? ctStroke.width : undefined) ??
+        (ct.stroke_width as number | undefined) ??
+        prev.coverTitle?.strokeWidth,
+      strokeColor:
+        (typeof ctStroke === "object" && ctStroke ? ctStroke.color : undefined) ??
+        (ct.stroke_color as string | undefined) ??
+        prev.coverTitle?.strokeColor,
+      shadow:
+        typeof ctShadow === "object" && ctShadow
+          ? ctShadow.enabled !== false
+          : ((ctShadow as boolean | undefined) ?? prev.coverTitle?.shadow),
+      shadowOffsetX:
+        (typeof ctShadow === "object" && ctShadow ? ctShadow.offset_x : undefined) ??
+        (ct.shadow_offset_x as number | undefined) ??
+        prev.coverTitle?.shadowOffsetX,
+      shadowOffsetY:
+        (typeof ctShadow === "object" && ctShadow ? ctShadow.offset_y : undefined) ??
+        (ct.shadow_offset_y as number | undefined) ??
+        prev.coverTitle?.shadowOffsetY,
+      shadowBlur:
+        (typeof ctShadow === "object" && ctShadow ? ctShadow.blur : undefined) ??
+        (ct.shadow_blur as number | undefined) ??
+        prev.coverTitle?.shadowBlur,
+      shadowColor:
+        (typeof ctShadow === "object" && ctShadow ? ctShadow.color : undefined) ??
+        (ct.shadow_color as string | undefined) ??
+        prev.coverTitle?.shadowColor,
+      bgEnabled:
+        ctBg?.enabled ?? (ct.bg_enabled as boolean | undefined) ?? prev.coverTitle?.bgEnabled,
+      bgColor: ctBg?.color ?? (ct.bg_color as string | undefined) ?? prev.coverTitle?.bgColor,
+      bgPadding:
+        ctBg?.padding ?? (ct.bg_padding as number | undefined) ?? prev.coverTitle?.bgPadding,
+      bgRadius: ctBg?.radius ?? (ct.bg_radius as number | undefined) ?? prev.coverTitle?.bgRadius,
+    }
+  }
+
+  const result: TitleSettings = {
+    ...prev,
+    title: (tc.content as string | undefined) || prev.title,
+    aiAutoSelect: (tc.ai_auto_select as boolean | undefined) || false,
+    position: prev.position,
+    font: (tc.font_preset as string | undefined) || prev.font,
+    size: (tc.font_size as number | undefined) || prev.size,
+    color: (tc.font_color as string | undefined) || prev.color,
+    bold: (tc.bold as boolean | undefined) ?? prev.bold,
+    italic: (tc.italic as boolean | undefined) ?? prev.italic,
+    stroke: strokeEnabled ?? prev.stroke,
+    strokeWidth: strokeW ?? prev.strokeWidth,
+    strokeColor: strokeC ?? prev.strokeColor,
+    shadow: shadowEnabled ?? prev.shadow,
+    shadowOffsetX: shOffX ?? prev.shadowOffsetX,
+    shadowOffsetY: shOffY ?? prev.shadowOffsetY,
+    shadowBlur: shBlur ?? prev.shadowBlur,
+    shadowColor: shColor ?? prev.shadowColor,
+    lineHeight: (tc.line_height as number | undefined) ?? prev.lineHeight,
+    marginTop: (tc.margin_top as number | undefined) ?? prev.marginTop,
+    maxCharsPerLine: (tc.max_chars_per_line as number | undefined) ?? prev.maxCharsPerLine,
+    bgEnabled: bgEnabled ?? prev.bgEnabled,
+    bgColor: bgColor ?? prev.bgColor,
+    bgPadding: bgPadding ?? prev.bgPadding,
+    bgRadius: bgRadius ?? prev.bgRadius,
+    lineOverrides: ((tc.line_overrides as unknown[] | undefined) ?? []) as TitleLineOverride[],
+    coverTitle,
+  }
+  return result
+}
+
 /**
  * 从 URL 参数或编辑计划 ID 加载表单配置
  */
@@ -27,14 +178,7 @@ export function usePlanConfigLoader({
     if (!planConfigStr) return
     try {
       const config = JSON.parse(planConfigStr) as {
-        title_config?: {
-          content?: string
-          ai_auto_select?: boolean
-          position?: string
-          font_preset?: string
-          font_size?: number
-          font_color?: string
-        }
+        title_config?: Record<string, unknown>
         subtitle_config?: { enabled?: boolean }
         bgm_config?: { enabled?: boolean; music_id?: string }
         mode?: string
@@ -43,16 +187,8 @@ export function usePlanConfigLoader({
       }
 
       if (config.title_config) {
-        const tc = config.title_config as TitleConfig
-        setTitleSettings((prev: TitleSettings) => ({
-          ...prev,
-          title: tc.content || "",
-          aiAutoSelect: tc.ai_auto_select || false,
-          position: prev.position, // 强制保留默认/用户选择，不从草稿配置同步位置
-          font: tc.font_preset || prev.font,
-          size: tc.font_size || prev.size,
-          color: tc.font_color || prev.color,
-        }))
+        const tc = config.title_config as TitleConfig & Record<string, unknown>
+        setTitleSettings((prev: TitleSettings) => mapTitleCfgToSettings(prev, tc))
       }
       if (config.segments && config.segments.length > 0) {
         const assetIds = config.segments
@@ -76,15 +212,8 @@ export function usePlanConfigLoader({
         if (plan.name) setTitleSettings((prev: TitleSettings) => ({ ...prev, title: plan.name }))
         const cfg = plan.config
         if (cfg?.title_config) {
-          setTitleSettings((prev: TitleSettings) => ({
-            ...prev,
-            aiAutoSelect: cfg.title_config!.ai_auto_select,
-            title: cfg.title_config!.content || prev.title,
-            position: prev.position, // 强制保留默认/用户选择，不从远程草稿同步位置
-            font: cfg.title_config!.font_preset || prev.font,
-            size: cfg.title_config!.font_size || prev.size,
-            color: cfg.title_config!.font_color || prev.color,
-          }))
+          const tc2 = cfg.title_config as unknown as TitleConfig & Record<string, unknown>
+          setTitleSettings((prev: TitleSettings) => mapTitleCfgToSettings(prev, tc2))
         }
         if (cfg?.cover_config) {
           const cc = cfg.cover_config as CoverConfig

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

@@ -22,6 +22,8 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
   const [generated, setGenerated] = useState(false)
   const [generateError, setGenerateError] = useState<string | null>(null)
   const [generatedVideos, setGeneratedVideos] = useState<GeneratedVideo[]>([])
+  /** 单视频模式：当前任务 ID（封面 finalize 需要） */
+  const [currentTaskId, setCurrentTaskId] = useState<string>("")
   /** 批量模式：每个正式生成任务的独立状态（第5步逐卡片展示） */
   const [batchTasks, setBatchTasks] = useState<BatchTaskState[]>([])
 
@@ -58,7 +60,7 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
       // 批量：成功任务的 videos 已通过 onBatchTaskUpdate 写入，这里同步兜底
       setBatchTasks((prev) =>
         (prev || []).map((t) =>
-          t.status === "completed" && t.videos.length === 0
+          t.status === "completed" || (t.status === "awaiting_cover" && t.videos.length === 0)
             ? {
                 ...t,
                 videos: (videos as GeneratedVideo[]).filter(
@@ -83,7 +85,10 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
     if (batchTasks.length === 0) return
     const byVariant = new Map<number, GeneratedVideo>()
     batchTasks.forEach((t) => {
-      if (t.status === "completed" && t.videos && t.videos.length > 0) {
+      if (
+        t.status === "completed" ||
+        (t.status === "awaiting_cover" && t.videos && t.videos.length > 0)
+      ) {
         byVariant.set(t.variantIndex, t.videos[0] as GeneratedVideo)
       }
     })
@@ -117,6 +122,8 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
     setGenerated(false)
     setGenerateError(null)
     setBatchTasks([])
+    setGeneratedVideos([])
+    setCurrentTaskId("")
     clearTimer()
 
     try {
@@ -208,6 +215,7 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
                 script_id: props.selectedScript.id,
                 tts_voice_id: props.ttsVoiceId || undefined,
                 tts_voice_source: props.ttsVoiceSource || undefined,
+                tts_style: props.ttsStyle || undefined,
               }
             : {}),
           dedup_enabled: dedupEnabled,
@@ -240,8 +248,91 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
                       }
                     : {}),
                   bold: props.titleSettings.bold,
-                  stroke: props.titleSettings.stroke,
-                  shadow: props.titleSettings.shadow,
+                  italic: props.titleSettings.italic,
+                  stroke: props.titleSettings.stroke
+                    ? {
+                        enabled: true,
+                        width: props.titleSettings.strokeWidth ?? 4,
+                        color: props.titleSettings.strokeColor ?? "#000000",
+                      }
+                    : { enabled: false },
+                  shadow: props.titleSettings.shadow
+                    ? {
+                        enabled: true,
+                        offset_x: props.titleSettings.shadowOffsetX ?? 2,
+                        offset_y: props.titleSettings.shadowOffsetY ?? 2,
+                        blur: props.titleSettings.shadowBlur ?? 4,
+                        color: props.titleSettings.shadowColor ?? "rgba(0,0,0,0.8)",
+                      }
+                    : { enabled: false },
+                  line_height: props.titleSettings.lineHeight ?? 1.2,
+                  margin_top: props.titleSettings.marginTop ?? 24,
+                  max_chars_per_line: props.titleSettings.maxCharsPerLine ?? 0,
+                  ...(props.titleSettings.bgEnabled
+                    ? {
+                        background: {
+                          enabled: true,
+                          color: props.titleSettings.bgColor,
+                          padding: props.titleSettings.bgPadding,
+                          radius: props.titleSettings.bgRadius,
+                        },
+                      }
+                    : { background: { enabled: false } }),
+                  line_overrides: (props.titleSettings.lineOverrides ?? []).map((lo) => ({
+                    line_index: lo.line_index,
+                    text: lo.text,
+                    size: lo.size,
+                    color: lo.color,
+                    bold: lo.bold,
+                    italic: lo.italic,
+                    stroke: lo.stroke,
+                    highlights: lo.highlights?.map((h) => ({
+                      word: h.word,
+                      color: h.color,
+                      bold: h.bold,
+                      scale: h.scale,
+                    })),
+                  })),
+                  ...(props.titleSettings.coverTitle
+                    ? {
+                        cover_title_config: {
+                          title: props.titleSettings.coverTitle.title,
+                          font: props.titleSettings.coverTitle.font,
+                          font_size: props.titleSettings.coverTitle.size,
+                          font_color: props.titleSettings.coverTitle.color,
+                          bold: props.titleSettings.coverTitle.bold,
+                          italic: props.titleSettings.coverTitle.italic,
+                          position: props.titleSettings.coverTitle.position,
+                          stroke: props.titleSettings.coverTitle.stroke
+                            ? {
+                                enabled: true,
+                                width: props.titleSettings.coverTitle.strokeWidth ?? 4,
+                                color: props.titleSettings.coverTitle.strokeColor ?? "#000000",
+                              }
+                            : { enabled: false },
+                          shadow: props.titleSettings.coverTitle.shadow
+                            ? {
+                                enabled: true,
+                                offset_x: props.titleSettings.coverTitle.shadowOffsetX ?? 2,
+                                offset_y: props.titleSettings.coverTitle.shadowOffsetY ?? 2,
+                                blur: props.titleSettings.coverTitle.shadowBlur ?? 4,
+                                color:
+                                  props.titleSettings.coverTitle.shadowColor ?? "rgba(0,0,0,0.8)",
+                              }
+                            : { enabled: false },
+                          ...(props.titleSettings.coverTitle.bgEnabled
+                            ? {
+                                background: {
+                                  enabled: true,
+                                  color: props.titleSettings.coverTitle.bgColor,
+                                  padding: props.titleSettings.coverTitle.bgPadding,
+                                  radius: props.titleSettings.coverTitle.bgRadius,
+                                },
+                              }
+                            : { background: { enabled: false } }),
+                        },
+                      }
+                    : {}),
                 },
               }
             : {}),
@@ -254,8 +345,10 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
         }
         if (taskIds.length > 1) {
           // 批量：任务按创建顺序与勾选变体一一对应（后端按 count 顺序创建）
+          setCurrentTaskId("")
           startPollingBatch(taskIds.map((taskId, i) => ({ taskId, variantIndex: indexes[i] ?? i })))
         } else {
+          setCurrentTaskId(taskIds[0])
           startPolling(taskIds[0])
         }
       } catch (err) {
@@ -330,6 +423,7 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
     generated,
     generateError,
     generatedVideos,
+    currentTaskId,
     generate,
     retry,
     retryBatchTask,

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

@@ -1,155 +0,0 @@
-/**
- * 预览素材加载 Hook
- * 根据选中的素材 ID 列表，逐个获取素材详情（含 file_url、duration 等）
- * 供前端预览播放器使用
- *
- * 注意：后端没有批量接口（/assets/batch 返回 405），
- * 因此直接使用 Promise.allSettled 并发请求单个 GET /assets/{id}
- */
-import { useState, useEffect, useCallback, useRef } from "react"
-import type { AssetItem } from "@/api/assets"
-import type { AxiosResponse } from "axios"
-
-/**
- * 通过 ID 列表逐个获取素材（并发）
- * 使用 Promise.allSettled 确保单个失败不影响整体
- */
-async function fetchAssetsByIds(ids: string[]): Promise<AssetItem[]> {
-  // 防御：过滤空值/undefined/非字符串 id，避免发出 /assets/undefined 请求
-  const validIds = ids.filter((id): id is string => typeof id === "string" && id.length > 0)
-  if (!validIds.length) return []
-
-  try {
-    const { default: apiClient } = await import("@/api/client")
-    const results = await Promise.allSettled(
-      validIds.map((id) => apiClient.get<AssetItem>(`/assets/${id}`)),
-    )
-    return results
-      .filter(
-        (r): r is PromiseFulfilledResult<AxiosResponse<AssetItem>> =>
-          r.status === "fulfilled" && !!r.value?.data,
-      )
-      .map((r) => r.value.data)
-  } catch {
-    return []
-  }
-}
-
-interface UsePreviewAssetsReturn {
-  /** 加载后的素材列表 */
-  assets: AssetItem[]
-  /** 是否正在加载 */
-  loading: boolean
-  /** 是否已就绪（加载完成） */
-  ready: boolean
-  /** 手动触发重新加载 */
-  reload: () => void
-  /**
-   * 差集补拉（#1750）：后端变体计划 clips 可能引用不在用户已选列表中的素材
-   * （跨素材库选片/素材池扩展），发现 assets 中缺失的 asset_id 时补拉详情并合并，
-   * 保证预览播放器拿得到素材文件 URL，而不是静默丢片段。
-   */
-  ensureAssets: (ids: string[]) => Promise<void>
-}
-
-/**
- * usePreviewAssets — 加载选中素材的视频文件信息
- */
-export function usePreviewAssets(assetIds: string[], enabled: boolean): UsePreviewAssetsReturn {
-  const [assets, setAssets] = useState<AssetItem[]>([])
-  const [loading, setLoading] = useState(false)
-  const [ready, setReady] = useState(false)
-  const requestIdRef = useRef(0)
-
-  // 稳定化 assetIds：只有内容真正变化时才更新引用
-  const stableAssetIds = useStableArray(assetIds)
-
-  const load = useCallback(async () => {
-    const validIds = stableAssetIds.filter(
-      (id): id is string => typeof id === "string" && id.length > 0,
-    )
-    if (!validIds.length || !enabled) {
-      setAssets([])
-      setReady(false)
-      return
-    }
-
-    const thisRequestId = ++requestIdRef.current
-    setLoading(true)
-    setReady(false)
-
-    try {
-      const result = await fetchAssetsByIds(validIds)
-      // 防止竞态：只保留最新请求的结果
-      if (requestIdRef.current === thisRequestId) {
-        setAssets(result)
-        setReady(result.length > 0)
-      }
-    } catch {
-      if (requestIdRef.current === thisRequestId) {
-        setAssets([])
-        setReady(false)
-      }
-    } finally {
-      if (requestIdRef.current === thisRequestId) {
-        setLoading(false)
-      }
-    }
-  }, [stableAssetIds, enabled])
-
-  // 补拉用独立序号：不干扰主 load 的竞态守卫
-  const ensureSeqRef = useRef(0)
-  const assetsRef = useRef<AssetItem[]>([])
-  useEffect(() => {
-    assetsRef.current = assets
-  }, [assets])
-
-  /**
-   * 差集补拉（#1750）：变体计划 clips 引用的 asset_id 不在当前素材列表时，
-   * 补拉素材详情并去重合并（不静默丢片段、不用假数据冒充）。
-   */
-  const ensureAssets = useCallback(async (ids: string[]) => {
-    const validIds = ids.filter((id): id is string => typeof id === "string" && id.length > 0)
-    if (!validIds.length) return
-    const seq = ++ensureSeqRef.current
-    const missing = Array.from(new Set(validIds)).filter(
-      (id) => !assetsRef.current.some((a) => a.id === id),
-    )
-    if (!missing.length) return
-    const fetched = await fetchAssetsByIds(missing)
-    if (seq !== ensureSeqRef.current || !fetched.length) return
-    const existing = new Set(assetsRef.current.map((a) => a.id))
-    const additions = fetched.filter((a) => !existing.has(a.id))
-    if (!additions.length) return
-    const merged = [...assetsRef.current, ...additions]
-    assetsRef.current = merged
-    setAssets(merged)
-    setReady(merged.length > 0)
-  }, [])
-
-  useEffect(() => {
-    load()
-  }, [load])
-
-  return { assets, loading, ready, reload: load, ensureAssets }
-}
-
-/**
- * useStableArray — 数组内容稳定化 Hook
- * 只有数组内容真正变化时才返回新的引用，避免父组件 re-render 导致的无效更新
- */
-function useStableArray<T>(array: T[]): T[] {
-  const ref = useRef<T[]>(array)
-
-  // 比较数组内容是否真正变化
-  const hasChanged =
-    array.length !== ref.current.length || array.some((item, index) => item !== ref.current[index])
-
-  if (hasChanged) {
-    ref.current = array
-  }
-
-  return ref.current
-}
-
-export default usePreviewAssets

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

@@ -1,131 +0,0 @@
-import { useCallback, useEffect, useRef } from "react"
-
-interface UsePreviewAudioOptions {
-  voiceAudioUrl: string | undefined
-  voiceDurationHint: number | undefined
-  muted: boolean
-  isPlaying: boolean
-  currentTime: number
-  onVoiceDurationChange: (d: number) => void
-  onEnded: () => void
-}
-
-interface UsePreviewAudioReturn {
-  seekTo: (time: number) => void
-  ensurePlayingAt: (time: number) => void
-  pause: () => void
-}
-
-/**
- * 配音音频管理 hook：加载配音、loadedmetadata 自测时长、play/pause 同步、
- * ended 事件回调、seek 同步、末帧冻结期间续播。
- */
-export function usePreviewAudio({
-  voiceAudioUrl,
-  voiceDurationHint,
-  muted,
-  isPlaying,
-  currentTime,
-  onVoiceDurationChange,
-  onEnded,
-}: UsePreviewAudioOptions): UsePreviewAudioReturn {
-  const audioRef = useRef<HTMLAudioElement | null>(null)
-  const prevIsPlayingRef = useRef(false)
-
-  // 外部 hint 初始化（自测值前的兜底）
-  useEffect(() => {
-    if (voiceDurationHint && voiceDurationHint > 0) {
-      onVoiceDurationChange(voiceDurationHint)
-    }
-  }, [voiceDurationHint, onVoiceDurationChange])
-
-  // 创建/替换 audio 元素，加载 metadata 时自测时长并监听 ended
-  useEffect(() => {
-    if (!voiceAudioUrl) {
-      if (audioRef.current) {
-        audioRef.current.pause()
-        audioRef.current.src = ""
-        audioRef.current = null
-      }
-      return
-    }
-    if (!audioRef.current) {
-      audioRef.current = new Audio()
-      audioRef.current.preload = "auto"
-    }
-    if (audioRef.current.src !== voiceAudioUrl) {
-      audioRef.current.src = voiceAudioUrl
-    }
-    audioRef.current.muted = muted
-
-    const audio = audioRef.current
-    const onLoaded = () => {
-      if (audio.duration && isFinite(audio.duration) && audio.duration > 0) {
-        onVoiceDurationChange(audio.duration)
-      }
-    }
-    const onEndedHandler = () => onEnded()
-    audio.addEventListener("loadedmetadata", onLoaded)
-    audio.addEventListener("ended", onEndedHandler)
-    return () => {
-      audio.removeEventListener("loadedmetadata", onLoaded)
-      audio.removeEventListener("ended", onEndedHandler)
-    }
-  }, [voiceAudioUrl, muted, onVoiceDurationChange, onEnded])
-
-  // mute 变化即时同步
-  useEffect(() => {
-    if (audioRef.current) audioRef.current.muted = muted
-  }, [muted])
-
-  // 播放/暂停同步（跟随视频 isPlaying）
-  useEffect(() => {
-    const audio = audioRef.current
-    if (!audio || !audio.src) return
-    if (isPlaying && !prevIsPlayingRef.current) {
-      if (Math.abs(audio.currentTime - currentTime) > 0.3) {
-        try {
-          audio.currentTime = currentTime
-        } catch {
-          /* ignore */
-        }
-      }
-      audio.play().catch(() => {})
-    } else if (!isPlaying && prevIsPlayingRef.current) {
-      audio.pause()
-    }
-    prevIsPlayingRef.current = isPlaying
-  }, [isPlaying, currentTime])
-
-  const seekTo = useCallback((time: number) => {
-    const audio = audioRef.current
-    if (audio && audio.src) {
-      try {
-        audio.currentTime = time
-      } catch {
-        /* ignore */
-      }
-    }
-  }, [])
-
-  const ensurePlayingAt = useCallback((time: number) => {
-    const audio = audioRef.current
-    if (!audio || !audio.src) return
-    try {
-      if (Math.abs(audio.currentTime - time) > 0.5) audio.currentTime = time
-      if (audio.paused) audio.play().catch(() => {})
-    } catch {
-      /* ignore */
-    }
-  }, [])
-
-  const pause = useCallback(() => {
-    try {
-      audioRef.current?.pause()
-    } catch {
-      /* ignore */
-    }
-  }, [])
-
-  return { seekTo, ensurePlayingAt, pause }
-}

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

@@ -1,384 +0,0 @@
-/**
- * 素材片段调度器 Hook（多 video 元素方案 v3）
- *
- * v3 修复：
- * - 所有动态状态存入 ref，tick 为稳定函数，彻底消除 RAF 闭包陷阱
- * - 片段切换时先启动下一个 video 再切可见性，消除冻屏间隔
- * - 进度更新 200ms 节流
- */
-
-import { useState, useRef, useCallback, useEffect, useMemo } from "react"
-
-export interface PlaybackSegment {
-  assetId: string
-  videoUrl: string
-  startTime: number
-  endTime: number
-  order: number
-  /** #1754 兜底：配音时长≠clips 总时长时按比例调速，1.0 = 原速 */
-  playbackRate?: number
-}
-
-export interface SegmentSchedulerState {
-  isPlaying: boolean
-  currentTime: number
-  totalDuration: number
-  currentSegmentIndex: number
-  segmentLocalTime: number
-  isEnded: boolean
-  canPlay: boolean
-  play: () => void
-  pause: () => void
-  togglePlayPause: () => void
-  seekTo: (time: number) => void
-  videoRefs: React.MutableRefObject<(HTMLVideoElement | null)[]>
-}
-
-function findSegmentAtTime(
-  segments: PlaybackSegment[],
-  globalTime: number,
-): { index: number; localTime: number } {
-  let accumulated = 0
-  for (let i = 0; i < segments.length; i++) {
-    const seg = segments[i]
-    const segDuration = seg.endTime - seg.startTime
-    if (globalTime < accumulated + segDuration || i === segments.length - 1) {
-      return { index: i, localTime: seg.startTime + (globalTime - accumulated) }
-    }
-    accumulated += segDuration
-  }
-  return { index: segments.length - 1, localTime: segments[segments.length - 1].endTime }
-}
-
-function buildTimeline(segments: PlaybackSegment[]): number[] {
-  const starts: number[] = []
-  let acc = 0
-  for (const seg of segments) {
-    starts.push(acc)
-    acc += seg.endTime - seg.startTime
-  }
-  return starts
-}
-
-export function useSegmentScheduler(segments: PlaybackSegment[]): SegmentSchedulerState {
-  const videoRefs = useRef<(HTMLVideoElement | null)[]>([])
-  const [isPlaying, setIsPlaying] = useState(false)
-  const [currentTime, setCurrentTime] = useState(0)
-  const [currentSegmentIndex, setCurrentSegmentIndex] = useState(0)
-  const [isEnded, setIsEnded] = useState(false)
-  const rafRef = useRef(0)
-  const isSeekingRef = useRef(false)
-  const lastTimeUpdateRef = useRef(0)
-
-  // 所有动态值存入 ref，tick 始终读取最新值，不依赖闭包
-  const segIdxRef = useRef(0)
-  const segmentsRef = useRef(segments)
-  const timelineStartsData = useMemo(() => buildTimeline(segments), [segments])
-  const totalDurationData = useMemo(
-    () => segments.reduce((sum, seg) => sum + (seg.endTime - seg.startTime), 0),
-    [segments],
-  )
-  const timelineStartsRef = useRef(timelineStartsData)
-  const totalDurationRef = useRef(totalDurationData)
-  const isPlayingRef = useRef(false)
-
-  segmentsRef.current = segments
-  timelineStartsRef.current = timelineStartsData
-  totalDurationRef.current = totalDurationData
-
-  const canPlay = segments.length > 0
-
-  useEffect(() => {
-    segIdxRef.current = currentSegmentIndex
-  }, [currentSegmentIndex])
-
-  useEffect(() => {
-    isPlayingRef.current = isPlaying
-  }, [isPlaying])
-
-  const waitForReady = useCallback((video: HTMLVideoElement, timeout = 3000): Promise<void> => {
-    if (video.readyState >= 3) return Promise.resolve()
-    return new Promise((resolve) => {
-      const onCanPlay = () => {
-        video.removeEventListener("canplay", onCanPlay)
-        clearTimeout(timer)
-        resolve()
-      }
-      const timer = setTimeout(() => {
-        video.removeEventListener("canplay", onCanPlay)
-        resolve()
-      }, timeout)
-      video.addEventListener("canplay", onCanPlay)
-    })
-  }, [])
-
-  const switchToSegment = useCallback(
-    async (index: number, seekToLocalTime?: number) => {
-      const segs = segmentsRef.current
-      const video = videoRefs.current[index]
-      if (!video || index >= segs.length) return
-
-      const seg = segs[index]
-      const localTime = seekToLocalTime ?? seg.startTime
-      const oldIdx = segIdxRef.current
-      const oldVideo = videoRefs.current[oldIdx]
-
-      if (oldVideo && oldVideo !== video) oldVideo.pause()
-
-      if (!video.src && seg.videoUrl) {
-        video.src = seg.videoUrl
-        video.load()
-      }
-
-      if (Math.abs(video.currentTime - localTime) > 0.05) {
-        video.currentTime = localTime
-      }
-      // #1754：按比例调速（配音时长≠clips 总时长时的前端兜底）
-      const rate = seg.playbackRate || 1
-      if (Math.abs(video.playbackRate - rate) > 0.01) {
-        video.playbackRate = rate
-      }
-
-      segIdxRef.current = index
-      setCurrentSegmentIndex(index)
-
-      await waitForReady(video)
-    },
-    [waitForReady],
-  )
-
-  // 稳定的 tick 函数，空依赖，所有值从 ref 读取
-  const tick = useCallback(() => {
-    const segs = segmentsRef.current
-    const idx = segIdxRef.current
-    const video = videoRefs.current[idx]
-
-    if (!video || isSeekingRef.current) {
-      rafRef.current = requestAnimationFrame(tick)
-      return
-    }
-
-    const seg = segs[idx]
-    if (!seg) return
-
-    // 预加载下一个片段
-    const nextIndex = idx + 1
-    if (nextIndex < segs.length) {
-      const nextVideo = videoRefs.current[nextIndex]
-      if (nextVideo) {
-        const timeToEnd = seg.endTime - video.currentTime
-        if (timeToEnd <= 2 && nextVideo.readyState < 3) {
-          const nextSeg = segs[nextIndex]
-          if (Math.abs(nextVideo.currentTime - nextSeg.startTime) > 0.5) {
-            nextVideo.currentTime = nextSeg.startTime
-          }
-        }
-      }
-    }
-
-    // 检测片段边界
-    if (video.currentTime >= seg.endTime - 0.1) {
-      if (nextIndex < segs.length) {
-        const nextVideo = videoRefs.current[nextIndex]
-        const nextSeg = segs[nextIndex]
-        const accumulatedTime =
-          (timelineStartsRef.current[idx] || 0) + (seg.endTime - seg.startTime)
-
-        if (nextVideo) {
-          if (Math.abs(nextVideo.currentTime - nextSeg.startTime) > 0.1) {
-            nextVideo.currentTime = nextSeg.startTime
-          }
-          // 先启动下一个视频（muted，可安全同时播放）
-          nextVideo
-            .play()
-            .catch((e) => console.warn("[useSegmentScheduler] next segment play failed:", e))
-        }
-
-        // 立即切换可见性
-        segIdxRef.current = nextIndex
-        setCurrentSegmentIndex(nextIndex)
-        setCurrentTime(accumulatedTime)
-        lastTimeUpdateRef.current = 0
-        setIsPlaying(true)
-
-        // 下一帧暂停旧视频（让新视频先渲染，避免冻屏）
-        const oldVideo = video
-        requestAnimationFrame(() => {
-          oldVideo.pause()
-        })
-
-        rafRef.current = requestAnimationFrame(tick)
-        return
-      } else {
-        video.pause()
-        setIsPlaying(false)
-        setIsEnded(true)
-        setCurrentTime(totalDurationRef.current)
-        return
-      }
-    }
-
-    const globalTime = (timelineStartsRef.current[idx] || 0) + (video.currentTime - seg.startTime)
-    const now = performance.now()
-    if (now - lastTimeUpdateRef.current >= 200) {
-      lastTimeUpdateRef.current = now
-      setCurrentTime(Math.max(0, Math.min(globalTime, totalDurationRef.current)))
-    }
-
-    rafRef.current = requestAnimationFrame(tick)
-  }, [])
-
-  const play = useCallback(async () => {
-    if (!canPlay) return
-    setIsEnded(false)
-    const idx = segIdxRef.current
-    const video = videoRefs.current[idx]
-    if (!video) return
-
-    if (idx === 0 && video.readyState < 2) {
-      if (!video.src && segmentsRef.current[0]?.videoUrl) {
-        video.src = segmentsRef.current[0].videoUrl
-        video.load()
-      }
-      await waitForReady(video)
-    }
-
-    // 播放前 seek 到片段起始时间，确保 progress 计算正确
-    const seg = segmentsRef.current[idx]
-    if (seg && Math.abs(video.currentTime - seg.startTime) > 0.1) {
-      video.currentTime = seg.startTime
-    }
-
-    // #1754：调速
-    const rate = seg?.playbackRate || 1
-    if (Math.abs(video.playbackRate - rate) > 0.01) {
-      video.playbackRate = rate
-    }
-
-    try {
-      await video.play()
-      setIsPlaying(true)
-      cancelAnimationFrame(rafRef.current)
-      rafRef.current = requestAnimationFrame(tick)
-    } catch (err) {
-      console.warn("[useSegmentScheduler] 播放失败:", err)
-    }
-  }, [canPlay, waitForReady, tick])
-
-  const pause = useCallback(() => {
-    const video = videoRefs.current[segIdxRef.current]
-    if (video) video.pause()
-    setIsPlaying(false)
-    cancelAnimationFrame(rafRef.current)
-  }, [])
-
-  const togglePlayPause = useCallback(() => {
-    if (isPlayingRef.current) {
-      pause()
-    } else {
-      if (isEnded) {
-        setIsEnded(false)
-        lastTimeUpdateRef.current = 0
-        const firstVideo = videoRefs.current[0]
-        if (firstVideo) {
-          videoRefs.current.forEach((v, i) => {
-            if (v && i !== 0) v.pause()
-          })
-          firstVideo.currentTime = segmentsRef.current[0]?.startTime || 0
-          segIdxRef.current = 0
-          setCurrentSegmentIndex(0)
-          setCurrentTime(0)
-          firstVideo
-            .play()
-            .then(() => {
-              setIsPlaying(true)
-              cancelAnimationFrame(rafRef.current)
-              rafRef.current = requestAnimationFrame(tick)
-            })
-            .catch((e) => console.warn("[useSegmentScheduler] restart failed:", e))
-        }
-      } else {
-        play()
-      }
-    }
-  }, [isEnded, pause, play, tick])
-
-  const seekTo = useCallback(
-    async (time: number) => {
-      if (!canPlay) return
-      const clampedTime = Math.max(0, Math.min(time, totalDurationRef.current))
-      const { index, localTime } = findSegmentAtTime(segmentsRef.current, clampedTime)
-
-      isSeekingRef.current = true
-      cancelAnimationFrame(rafRef.current)
-
-      if (index !== segIdxRef.current) {
-        await switchToSegment(index, localTime)
-      } else {
-        const video = videoRefs.current[index]
-        if (video) video.currentTime = localTime
-      }
-
-      setCurrentTime(clampedTime)
-      setIsEnded(false)
-      lastTimeUpdateRef.current = 0
-
-      if (isPlayingRef.current) {
-        const video = videoRefs.current[index]
-        if (video) {
-          video.play().catch(() => {})
-        }
-        rafRef.current = requestAnimationFrame(tick)
-      }
-
-      setTimeout(() => {
-        isSeekingRef.current = false
-      }, 200)
-    },
-    [canPlay, switchToSegment, tick],
-  )
-
-  useEffect(() => {
-    videoRefs.current = videoRefs.current.slice(0, segments.length)
-    while (videoRefs.current.length < segments.length) {
-      videoRefs.current.push(null)
-    }
-  }, [segments])
-
-  useEffect(() => {
-    return () => {
-      cancelAnimationFrame(rafRef.current)
-    }
-  }, [])
-
-  useEffect(() => {
-    cancelAnimationFrame(rafRef.current)
-    segIdxRef.current = 0
-    setIsPlaying(false)
-    setCurrentTime(0)
-    setCurrentSegmentIndex(0)
-    setIsEnded(false)
-  }, [segments])
-
-  const currentSegment = segments[currentSegmentIndex] || null
-  const segmentLocalTime = currentSegment
-    ? currentTime - (timelineStartsRef.current[currentSegmentIndex] || 0) + currentSegment.startTime
-    : 0
-
-  return {
-    isPlaying,
-    currentTime,
-    totalDuration: totalDurationData,
-    currentSegmentIndex,
-    segmentLocalTime,
-    isEnded,
-    canPlay,
-    play,
-    pause,
-    togglePlayPause,
-    seekTo,
-    videoRefs,
-  }
-}
-
-export default useSegmentScheduler

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

@@ -1,9 +1,8 @@
-import { useEffect, useRef } from "react"
+import { useEffect } from "react"
 import { useQuery } from "@tanstack/react-query"
 // #1894: 标题候选从文案库 scripts[].title 获取，不再调用废弃的 /api/titles
 import { getScripts } from "@/api/scripts"
 import type { TitleSettings } from "../../types"
-import { useAiTitleGenerator } from "./useAiTitleGenerator"
 import { useTitleStyleUpdaters } from "./useTitleStyleUpdaters"
 import { useDraftAutoSave } from "../useDraftAutoSave"
 
@@ -16,7 +15,7 @@ interface UseStep4TitleProps {
 
 /**
  * Step 4 标题设置 Hook
- * 封装 AI 标题生成、标题样式设置等逻辑
+ * 封装标题样式设置等逻辑
  */
 export function useStep4Title({
   titleSettings,
@@ -34,26 +33,9 @@ export function useStep4Title({
     staleTime: 30_000,
   })
 
-  // AI 标题生成
-  const {
-    aiTitleInput,
-    setAiTitleInput,
-    aiTitleGenerating,
-    aiTitleResults,
-    hasGeneratedTitles,
-    handleGenerateAiTitles,
-    handleSelectAiTitle,
-    handleRefreshAiTitles,
-    autoGenerateTitle,
-  } = useAiTitleGenerator({ titleSettings, onTitleSettingsChange })
-
   // 样式更新
   const styleUpdaters = useTitleStyleUpdaters({ titleSettings, onTitleSettingsChange })
 
-  // 追踪 AI 自动选择开关的上一次值 & 是否首次挂载
-  const prevAiAutoSelect = useRef(titleSettings.aiAutoSelect)
-  const isFirstMount = useRef(true)
-
   /* ── Step4 标题内容/样式变化后自动保存草稿（防抖 800ms，失败静默） ── */
   const { scheduleSave: scheduleTitleSave } = useDraftAutoSave(selectedTemplate)
   useEffect(() => {
@@ -86,40 +68,12 @@ export function useStep4Title({
     scheduleTitleSave,
   ])
 
-  // 当 AI 自动选择开关打开时，自动生成/选择一个标题填入
-  // 首次挂载时如果开关已经是 true 且无标题，也需要触发
-  useEffect(() => {
-    if (isFirstMount.current) {
-      isFirstMount.current = false
-      if (titleSettings.aiAutoSelect && !titleSettings.title) {
-        autoGenerateTitle()
-      }
-      prevAiAutoSelect.current = titleSettings.aiAutoSelect
-      return
-    }
-    if (titleSettings.aiAutoSelect && !prevAiAutoSelect.current && !titleSettings.title) {
-      autoGenerateTitle()
-    }
-    prevAiAutoSelect.current = titleSettings.aiAutoSelect
-  }, [titleSettings.aiAutoSelect, titleSettings.title, autoGenerateTitle])
-
   return {
     // 数据
     userTitles,
     titleSettings,
-    // AI 标题状态
-    aiTitleInput,
-    setAiTitleInput,
-    aiTitleGenerating,
-    aiTitleResults,
-    hasGeneratedTitles,
     activePreset: styleUpdaters.activePreset,
     titlePresets: styleUpdaters.titlePresets,
-    // AI 标题操作
-    handleGenerateAiTitles,
-    handleSelectAiTitle,
-    handleRefreshAiTitles,
-    autoGenerateTitle,
     // 标题设置操作
     updateTitle: styleUpdaters.updateTitle,
     toggleAiAutoSelect: styleUpdaters.toggleAiAutoSelect,