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

Upload videos may contain unwanted noise; the final video should only
keep TTS/dubbing + BGM.

mix_audio():
- Force main_clips = [] after layer collection so source video audio
  from main/broll/overlay/corner_voice layers is never extracted.
- audio_clips (role=audio, TTS/dubbing) become the effective main audio
  and are concat'd as the primary track.
- BGM and multi-track mixing still apply afterwards.
- Noise reduction post-processing is unchanged.

Tests: adapt unit tests to the new behavior (main layer audio ignored),
and add one direct mix_with_independent_audio amix coverage test.
Full unit suite: 13588 passed, 12 skipped.

.gitea/workflows/ci-pipeline.yml

@@ -21,8 +21,9 @@ on:
 permissions:
   contents: read
 concurrency:
-  group: ci-pipeline-${{ gitea.ref }}
-  cancel-in-progress: true
+  group: ci-pipeline-${{ gitea.event_name }}-${{ gitea.ref }}
+  # PR事件取消进行中的旧run，push事件不取消（确保完整CI跑完）
+  cancel-in-progress: ${{ gitea.event_name == 'pull_request' }}
 jobs:
   check-frontend-only:
     name: Check if frontend-only change
@@ -1086,7 +1087,26 @@ jobs:
     - name: Run Playwright E2E on staging
       shell: bash
       run: |
-        bash scripts/ci/run_staging_tests.sh e2e
+        set -eu
+        # DooD模式下不能用-v挂载（宿主机路径与CI容器路径不一致）
+        # 改用 docker create + docker cp 方式把代码拷进容器
+        CONTAINER_NAME="staging-e2e-$$"
+        # 强制清理可能残留的同名容器（上一次异常退出时未清理）
+        docker rm -f "$CONTAINER_NAME" 2>/dev/null || true
+        docker create --name "$CONTAINER_NAME" --ipc=host \
+          -e E2E_BASE_URL=https://staging.xiaoxiajianji.com \
+          -e E2E_API_BASE=https://staging-api.xiaoxiajianji.com/api/v1 \
+          -e E2E_BROWSER_CHANNEL=chromium \
+          -e PLAYWRIGHT_HEADLESS=1 \
+          -w /workspace/apps/web \
+          git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
+          sh -lc "npm ci && npx playwright test --reporter=line --project=chromium e2e/auth.spec.ts e2e/auth-guard.spec.ts e2e/core-upload.spec.ts e2e/core-generation.spec.ts"
+        docker cp apps "$CONTAINER_NAME:/workspace/"
+        docker cp package-lock.json "$CONTAINER_NAME:/workspace/" 2>/dev/null || true
+        docker start -a "$CONTAINER_NAME"
+        EXIT_CODE=$(docker wait "$CONTAINER_NAME")
+        docker rm "$CONTAINER_NAME" 2>/dev/null || true
+        exit $EXIT_CODE
 
     - name: Job duration summary
       if: always()
@@ -1133,7 +1153,22 @@ jobs:
     - name: Run API integration tests on staging
       shell: bash
       run: |
-        bash scripts/ci/run_staging_tests.sh api
+        set -eu
+        # DooD模式下不能用-v挂载（宿主机路径与CI容器路径不一致）
+        # 改用 docker create + docker cp 方式把代码拷进容器
+        CONTAINER_NAME="staging-api-tests-$$"
+        docker create --name "$CONTAINER_NAME" \
+          -e E2E_BASE_URL=https://staging.xiaoxiajianji.com \
+          -e E2E_API_BASE=https://staging-api.xiaoxiajianji.com/api/v1 \
+          -w /workspace/apps/web \
+          git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
+          sh -lc 'npm ci && npx playwright test --reporter=line e2e/test_auth.spec.ts e2e/test_asset.spec.ts e2e/test_project.spec.ts'
+        docker cp apps "$CONTAINER_NAME:/workspace/"
+        docker cp package-lock.json "$CONTAINER_NAME:/workspace/" 2>/dev/null || true
+        docker start -a "$CONTAINER_NAME"
+        EXIT_CODE=$(docker wait "$CONTAINER_NAME")
+        docker rm "$CONTAINER_NAME" 2>/dev/null || true
+        exit $EXIT_CODE
 
     - name: Job duration summary
       if: always()
@@ -1460,8 +1495,9 @@ jobs:
       shell: sh
       run: bash scripts/ci/step_timer_start.sh
     - name: Run production browser E2E
-      shell: bash
+      shell: sh
       run: |
+        set -eu
         docker run --rm --ipc=host \
           -e E2E_BASE_URL=https://saas.xiaoxiajianji.com \
           -e E2E_API_BASE=https://api.xiaoxiajianji.com/api/v1 \
@@ -1470,7 +1506,7 @@ jobs:
           -v "$PWD:/workspace" \
           -w /workspace/apps/web \
           git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
-          bash -c 'for i in 1 2 3; do npm ci --registry=https://registry.npmmirror.com && break; echo "npm ci attempt $i failed, retrying..."; sleep 15; done && npx playwright test --reporter=line --project=chromium e2e/auth.spec.ts e2e/auth-guard.spec.ts e2e/core-upload.spec.ts e2e/core-generation.spec.ts e2e/core-titles.spec.ts'
+          sh -lc 'npm ci && npx playwright test --reporter=line --project=chromium e2e/auth.spec.ts e2e/auth-guard.spec.ts e2e/core-upload.spec.ts e2e/core-generation.spec.ts e2e/core-titles.spec.ts'
 
     - name: Job duration summary
       if: always()
@@ -1826,4 +1862,4 @@ jobs:
           [ "${{ steps.gate.outputs.gate_result }}" = "success" ] || STATUS="error"
           START_TIME=""
           [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
-          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
+          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true

.gitea/workflows/preview-deploy.yml

@@ -95,9 +95,12 @@ jobs:
         set -eu
         cd apps/web
 
+        # Config npm mirror for speed
+        npm config set registry https://registry.npmmirror.com
+
         # Install dependencies with retry
         for i in 1 2 3; do
-          npm ci --registry=https://registry.npmmirror.com --no-audit --no-fund && break
+          npm ci --no-audit --no-fund && break
           echo "npm install failed, retry $i/3..."
           [ $i -eq 3 ] && exit 1
           rm -rf node_modules
@@ -106,12 +109,12 @@ jobs:
 
         # TypeScript check
         echo "=== TypeScript check ==="
-        ./node_modules/.bin/tsc --noEmit
+        npx --no-install tsc --noEmit
 
         # Vite build
         echo "=== Vite build ==="
         export VITE_API_URL=https://staging-api.xiaoxiajianji.com
-        ./node_modules/.bin/vite build
+        npx --no-install vite build
 
         echo "=== Build completed ==="
         ls -la dist/

alembic/versions/054_confirm_gen_fields.py

@@ -1,82 +0,0 @@
-"""确认生成 API 改造：为 generation_tasks 表添加 source_task_id、output_width、output_height、cover_url、custom_title 字段
-
-Revision ID: 054_confirm_gen_fields
-Revises: 053_generation_task_is_preview
-Create Date: 2026-08-16
-
-Changes:
-1. generation_tasks 表新增 source_task_id（来源预览任务 ID，带索引）
-2. generation_tasks 表新增 output_width / output_height（动态输出分辨率）
-3. generation_tasks 表新增 cover_url / custom_title（自定义封面和标题）
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "054_confirm_gen_fields"
-down_revision = "053_generation_task_is_preview"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    is_pg = conn.dialect.name == "postgresql"
-
-    if is_pg:
-        # 幂等检查：source_task_id 列是否已存在
-        result = conn.execute(
-            sa.text(
-                "SELECT column_name FROM information_schema.columns "
-                "WHERE table_name = 'generation_tasks' AND column_name = 'source_task_id'"
-            )
-        )
-        if result.scalar() is not None:
-            return
-
-    # source_task_id
-    op.add_column(
-        "generation_tasks",
-        sa.Column("source_task_id", sa.String(32), nullable=False, server_default=""),
-    )
-
-    # output_width
-    op.add_column(
-        "generation_tasks",
-        sa.Column("output_width", sa.Integer, nullable=False, server_default=sa.text("1280")),
-    )
-
-    # output_height
-    op.add_column(
-        "generation_tasks",
-        sa.Column("output_height", sa.Integer, nullable=False, server_default=sa.text("720")),
-    )
-
-    # cover_url
-    op.add_column(
-        "generation_tasks",
-        sa.Column("cover_url", sa.String(1000), nullable=False, server_default=""),
-    )
-
-    # custom_title
-    op.add_column(
-        "generation_tasks",
-        sa.Column("custom_title", sa.String(500), nullable=False, server_default=""),
-    )
-
-    # 索引
-    op.create_index(
-        "ix_generation_tasks_source_task_id",
-        "generation_tasks",
-        ["source_task_id"],
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("ix_generation_tasks_source_task_id", table_name="generation_tasks")
-    op.drop_column("generation_tasks", "custom_title")
-    op.drop_column("generation_tasks", "cover_url")
-    op.drop_column("generation_tasks", "output_height")
-    op.drop_column("generation_tasks", "output_width")
-    op.drop_column("generation_tasks", "source_task_id")

alembic/versions/055_cover_templates.py

@@ -1,84 +0,0 @@
-"""封面模板表 cover_templates
-
-Revision ID: 055_cover_templates
-Revises: 054_confirm_gen_fields
-Create Date: 2026-08-09
-
-Changes:
-1. 新建 cover_templates 表，支持系统预置和用户自定义封面模板
-2. user_id 为 NULL 表示系统模板，is_system 标记区分
-3. config 为 JSON 字段，存储封面配置信息
-"""
-
-import json
-
-import sqlalchemy as sa
-
-from alembic import context, op
-
-revision = "055_cover_templates"
-down_revision = "054_confirm_gen_fields"
-branch_labels = None
-depends_on = None
-
-SYSTEM_TEMPLATES = [
-    ("a8b0120fd98e44788f5a6590f983d327", "默认模板", {}),
-    ("6d8c501b11424432b3df3a45ae89b1a9", "大胆红", {"background_color": "#ef4444"}),
-    ("04937fb57fea4bad95e7883e71a6b246", "优雅黑", {"background_color": "#111827"}),
-    ("3ff9cc821174437ca53931073e7f536e", "渐变蓝", {"background_color": "#3b82f6"}),
-    ("db51b3ea8f1a4f4caa94bf2d51f27d11", "渐变紫", {"background_color": "#8b5cf6"}),
-    ("5027d113432a4f798a3b4ee1644d66af", "暖橙", {"background_color": "#f97316"}),
-    ("0e10def2b5a148d686416494474726c2", "清新绿", {"background_color": "#22c55e"}),
-    ("38ea98ac00c04bada064006d880546f0", "科技蓝", {"background_color": "#06b6d4"}),
-]
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    if context.get_context().dialect.name == "postgresql":
-        result = conn.execute(sa.text("SELECT to_regclass('public.cover_templates')"))
-        if result.scalar() is not None:
-            return
-
-    op.create_table(
-        "cover_templates",
-        sa.Column("id", sa.String(36), primary_key=True),
-        sa.Column("user_id", sa.String(36), nullable=True, index=True),
-        sa.Column("name", sa.String(200), nullable=False),
-        sa.Column("thumbnail_url", sa.String(1000), nullable=False, server_default=""),
-        sa.Column("is_system", sa.Boolean, nullable=False, server_default=sa.false(), index=True),
-        sa.Column("config", sa.JSON, nullable=False, server_default="{}"),
-        sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
-        sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
-    )
-
-    # 预置系统模板 seed 数据
-    cover_templates = sa.table(
-        "cover_templates",
-        sa.column("id", sa.String),
-        sa.column("user_id", sa.String),
-        sa.column("name", sa.String),
-        sa.column("thumbnail_url", sa.String),
-        sa.column("is_system", sa.Boolean),
-        sa.column("config", sa.JSON),
-        sa.column("created_at", sa.DateTime),
-        sa.column("updated_at", sa.DateTime),
-    )
-
-    for tid, name, config in SYSTEM_TEMPLATES:
-        conn.execute(
-            cover_templates.insert().values(
-                id=tid,
-                user_id=None,
-                name=name,
-                thumbnail_url="",
-                is_system=True,
-                config=json.dumps(config),
-                created_at=sa.func.now(),
-                updated_at=sa.func.now(),
-            )
-        )
-
-
-def downgrade() -> None:
-    op.drop_table("cover_templates")

apps/api/app/api/router.py

@@ -5,7 +5,6 @@ from app.api.routes.assets import router as assets_router
 from app.api.routes.auth import router as auth_router
 from app.api.routes.chunked_upload import router as chunked_upload_router
 from app.api.routes.classification_jobs import router as classification_jobs_router
-from app.api.routes.cover_templates import router as cover_templates_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_preview import router as generation_preview_router
@@ -46,10 +45,6 @@ api_router.include_router(
     prefix="/tags",
     tags=["Tag"],
 )
-api_router.include_router(
-    cover_templates_router,
-    tags=["CoverTemplate"],
-)
 api_router.include_router(
     task_center_router,
     tags=["TaskCenter"],

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

@@ -671,28 +671,20 @@ def create_asset(
     asset_library_repository: Any = Depends(get_asset_library_repository),
     project_repository: Any = Depends(get_project_repository),
 ) -> AssetResponse:
-    # 先获取素材库，用于推导 project_id（前端可能不传）
-    library = asset_library_repository.get(request.library_id)
-    if library is None:
-        raise HTTPException(status_code=404, detail=f"AssetLibrary {request.library_id} not found")
-
-    # project_id 自动推导：优先用请求值，否则从 library 关联的项目获取
-    project_id = request.project_id or library.project_id
-
-    project = project_repository.find_by_id(project_id)
+    project = project_repository.find_by_id(request.project_id)
     if project is None:
-        raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
+        raise HTTPException(status_code=404, detail=f"Project {request.project_id} not found")
     if not project.can_access(authenticated_user.user.id):
         raise HTTPException(status_code=403, detail="Access denied to project")
 
-    # 确保 library 和 project 归属一致
-    if library.project_id != project_id:
-        raise HTTPException(status_code=400, detail="AssetLibrary does not belong to the specified project")
+    library = asset_library_repository.get(request.library_id)
+    if library is None or library.project_id != request.project_id:
+        raise HTTPException(status_code=404, detail=f"AssetLibrary {request.library_id} not found")
 
     use_case = CreateAssetUseCase(asset_repository)
     item = use_case.execute(
         CreateAssetCommand(
-            project_id=project_id,
+            project_id=request.project_id,
             library_id=request.library_id,
             name=request.name,
             storage_key=request.storage_key,

apps/api/app/api/routes/cover_templates.py

@@ -1,154 +0,0 @@
-"""封面模板 CRUD 路由。
-
-API:
-  GET    /api/v1/cover-templates       - 列出当前用户可见的模板
-  POST   /api/v1/cover-templates       - 创建自定义模板
-  PUT    /api/v1/cover-templates/{id}  - 更新模板
-  DELETE /api/v1/cover-templates/{id}  - 删除自定义模板（系统模板不可删）
-"""
-
-
-import logging
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_cover_template_repository
-from app.schemas.cover_template import (
-    CoverTemplateResponse,
-    CreateCoverTemplateRequest,
-    ListCoverTemplatesResponse,
-    UpdateCoverTemplateRequest,
-)
-from fastapi import APIRouter, Depends, HTTPException, Response
-from sqlalchemy.exc import OperationalError, ProgrammingError
-
-from packages.domain.cover_template import CoverTemplate
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter(prefix="/cover-templates", tags=["CoverTemplate"])
-
-
-@router.get("", response_model=ListCoverTemplatesResponse)
-def list_cover_templates(
-    skip: int = 0,
-    limit: int = 100,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repo: Any = Depends(get_cover_template_repository),
-) -> ListCoverTemplatesResponse:
-    """列出当前用户可见的封面模板（系统模板 + 用户自定义模板）。
-
-    当数据库表不存在时（迁移未执行），降级返回空列表而非 500。
-    """
-    user_id = authenticated_user.user.id
-    try:
-        items = repo.list_for_user(user_id, skip=skip, limit=limit)
-        total = repo.count_for_user(user_id)
-    except (OperationalError, ProgrammingError) as exc:
-        logger.warning("cover_templates 表查询失败（可能未迁移），返回空列表: %s", exc)
-        return ListCoverTemplatesResponse(items=[], total=0)
-    return ListCoverTemplatesResponse(
-        items=[
-            CoverTemplateResponse(
-                id=t.id,
-                name=t.name,
-                thumbnail_url=t.thumbnail_url,
-                is_system=t.is_system,
-                created_at=t.created_at,
-                config=t.config,
-            )
-            for t in items
-        ],
-        total=total,
-    )
-
-
-@router.post("", response_model=CoverTemplateResponse, status_code=201)
-def create_cover_template(
-    request: CreateCoverTemplateRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repo: Any = Depends(get_cover_template_repository),
-) -> CoverTemplateResponse:
-    """创建用户自定义封面模板。"""
-    user_id = authenticated_user.user.id
-    config_dict = request.config.model_dump() if request.config else {}
-    template = CoverTemplate.create_user(
-        user_id=user_id,
-        name=request.name,
-        config=config_dict,
-        thumbnail_url=request.thumbnail_url,
-    )
-    try:
-        created = repo.create(template)
-    except (OperationalError, ProgrammingError) as exc:
-        logger.warning("cover_templates 表不可用（可能未迁移）: %s", exc)
-        raise HTTPException(status_code=503, detail="封面模板服务暂不可用，请稍后重试") from None
-    return CoverTemplateResponse(
-        id=created.id,
-        name=created.name,
-        thumbnail_url=created.thumbnail_url,
-        is_system=created.is_system,
-        created_at=created.created_at,
-        config=created.config,
-    )
-
-
-@router.put("/{template_id}", response_model=CoverTemplateResponse)
-def update_cover_template(
-    template_id: str,
-    request: UpdateCoverTemplateRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repo: Any = Depends(get_cover_template_repository),
-) -> CoverTemplateResponse:
-    """更新封面模板（仅允许更新自己的模板）。"""
-    user_id = authenticated_user.user.id
-    try:
-        template = repo.get(template_id)
-    except (OperationalError, ProgrammingError) as exc:
-        logger.warning("cover_templates 表不可用: %s", exc)
-        raise HTTPException(status_code=503, detail="封面模板服务暂不可用，请稍后重试") from None
-    if template is None:
-        raise HTTPException(status_code=404, detail="模板不存在")
-    if template.is_system:
-        raise HTTPException(status_code=403, detail="系统模板不可修改")
-    if template.user_id != user_id:
-        raise HTTPException(status_code=403, detail="无权修改该模板")
-
-    if request.name is not None:
-        template.update(name=request.name)
-    if request.config is not None:
-        template.update(config=request.config.model_dump())
-    if request.thumbnail_url is not None:
-        template.update(thumbnail_url=request.thumbnail_url)
-
-    updated = repo.update(template)
-    return CoverTemplateResponse(
-        id=updated.id,
-        name=updated.name,
-        thumbnail_url=updated.thumbnail_url,
-        is_system=updated.is_system,
-        created_at=updated.created_at,
-        config=updated.config,
-    )
-
-
-@router.delete("/{template_id}", status_code=204, response_class=Response)
-def delete_cover_template(
-    template_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repo: Any = Depends(get_cover_template_repository),
-) -> None:
-    """删除用户自定义封面模板（系统模板不可删除）。"""
-    user_id = authenticated_user.user.id
-    try:
-        template = repo.get(template_id)
-    except (OperationalError, ProgrammingError) as exc:
-        logger.warning("cover_templates 表不可用: %s", exc)
-        raise HTTPException(status_code=503, detail="封面模板服务暂不可用，请稍后重试") from None
-    if template is None:
-        raise HTTPException(status_code=404, detail="模板不存在")
-    if template.is_system:
-        raise HTTPException(status_code=403, detail="系统模板不可删除")
-    if template.user_id != user_id:
-        raise HTTPException(status_code=403, detail="无权删除该模板")
-    repo.delete(template_id)

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

@@ -17,7 +17,6 @@ from app.core.task_enqueue import (
     safe_enqueue_generation_task,
 )
 from app.dependencies import (
-    get_asset_repository,
     get_db_session,
     get_generated_video_repository,
     get_generation_task_repository,
@@ -46,6 +45,7 @@ logger = logging.getLogger(__name__)
 
 router = APIRouter()
 
+PREVIEW_RESOLUTION = "854x480"
 
 # 模板 mode → 视频比例映射
 _TEMPLATE_MODE_TO_RATIO = {
@@ -55,7 +55,24 @@ _TEMPLATE_MODE_TO_RATIO = {
 }
 
 
-def _infer_video_ratio_from_template(template_id: str, db: Session, user_id: str = "") -> str:
+def _calc_preview_resolution(video_ratio: str = "") -> str:
+    """根据视频比例计算预览分辨率（短边 480，长边按比例）。
+
+    支持的比例：16:9, 9:16, 1:1, 4:3, 3:4, 其他默认 16:9。
+    """
+    ratio_map = {
+        "16:9": "854x480",
+        "9:16": "480x854",
+        "1:1": "480x480",
+        "4:3": "640x480",
+        "3:4": "480x640",
+    }
+    return ratio_map.get(video_ratio.strip(), PREVIEW_RESOLUTION)
+
+
+def _infer_video_ratio_from_template(
+    template_id: str, db: Session, user_id: str = ""
+) -> str:
     """从模板 mode 推断视频比例，前端未传 video_ratio 时使用。
 
     Returns:
@@ -85,7 +102,9 @@ def _infer_video_ratio_from_template(template_id: str, db: Session, user_id: str
     return ""
 
 
-def _resolve_strategy_id_from_template(template_id: str, db: Session, user_id: str = "") -> str:
+def _resolve_strategy_id_from_template(
+    template_id: str, db: Session, user_id: str = ""
+) -> str:
     """从模板读取 editing_mode / mode 作为 strategy_id。
 
     优先查新模板系统（EditTemplate.editing_mode），fallback 旧模板（Template.mode）。
@@ -155,6 +174,29 @@ def _mark_task_failed(repo, task, reason: str) -> None:
         logger.exception("[预览生成] 标记任务失败时异常: task_id=%s", task.id)
 
 
+def _sign_video_url(raw_url: str) -> str:
+    """为私有 OSS bucket 的视频 URL 生成预签名下载链接。
+
+    有效期 2 小时，签名失败时降级返回原始 URL。
+    """
+    if not raw_url:
+        return ""
+    try:
+        storage = get_storage_service()
+        signed = storage.get_download_url(raw_url, expires_seconds=7200)
+        # 如果返回的 URL 与原始 URL 完全不同且不是签名 URL（说明 bucket 未配置），
+        # 降级返回原始 URL
+        if signed and signed != raw_url:
+            return signed
+        if signed == raw_url:
+            return raw_url
+        # signed 为空或与 raw_url 无关，返回原始
+        return raw_url
+    except Exception:
+        logger.warning("[预览] URL签名失败，降级返回原始URL: %s", raw_url[:100], exc_info=True)
+        return raw_url
+
+
 def _to_preview_response(task, generated_videos: list | None = None) -> PreviewGenerationTaskResponse:
     """将领域任务对象转换为预览响应 DTO。
 
@@ -171,12 +213,8 @@ def _to_preview_response(task, generated_videos: list | None = None) -> PreviewG
     if generated_videos:
         first_video = generated_videos[0]
         raw_url = getattr(first_video, "file_url", "") or ""
-        # rendered/* 已配置公开读，直接用裸 URL
-        if raw_url.startswith("http"):
-            video_url = raw_url
-        else:
-            storage = get_storage_service()
-            video_url = storage.get_url(raw_url)
+        # P0 修复：私有 bucket 需要预签名 URL，否则前端 403 → 黑屏
+        video_url = _sign_video_url(raw_url)
         duration = float(getattr(first_video, "duration", 0.0) or 0.0)
         file_size = int(getattr(first_video, "file_size", 0) or 0)
 
@@ -198,7 +236,7 @@ def _to_preview_response(task, generated_videos: list | None = None) -> PreviewG
         status=task.status.value if hasattr(task.status, "value") else str(task.status),
         progress=float(task.progress or 0.0),
         is_preview=bool(getattr(task, "is_preview", True)),
-        resolution=getattr(task, "resolution", "") or "",
+        resolution=getattr(task, "resolution", PREVIEW_RESOLUTION) or PREVIEW_RESOLUTION,
         video_url=video_url,
         duration=duration,
         file_size=file_size,
@@ -219,11 +257,10 @@ def create_preview_generation_task(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     generation_task_repository=Depends(get_generation_task_repository),
     db: Session = Depends(get_db_session),
-    asset_repo=Depends(get_asset_repository),
 ) -> PreviewGenerationTaskResponse:
     """创建预览生成任务。
 
-    预览渲染品质与正式生成一致（1080p, CRF 23, medium preset），确认生成时可直接复用预览产物。
+    预览为完整时长的低清版（480p + 低码率），效果与正式生成一致，仅清晰度降低。
 
     Args:
         request: 预览任务创建请求（template_id + asset_ids 等）
@@ -233,11 +270,10 @@ def create_preview_generation_task(
     """
     user_id = authenticated_user.user.id
     logger.info(
-        "[预览生成] 接收请求: user_id=%s, template_id=%s, asset_count=%d, preview_count=%d",
+        "[预览生成] 接收请求: user_id=%s, template_id=%s, asset_count=%d",
         user_id,
         request.template_id,
         len(request.asset_ids),
-        request.preview_count,
     )
 
     # 预检查队列限流
@@ -275,17 +311,17 @@ def create_preview_generation_task(
                 project_id="",
                 asset_library_id="",
                 strategy_id=strategy_id,
-                voice_library_id=request.voice_library_id,
+                voice_library_id="",
                 template_id=request.template_id,
                 asset_ids=list(request.asset_ids),
                 title_ids=list(request.title_ids),
                 voice_ids=list(request.voice_ids),
                 created_by_user_id=user_id,
-                source_edit_plan_id=request.source_edit_plan_id,
+                source_edit_plan_id="",
                 asset_select_mode="",
                 batch_id="",
                 video_title=request.video_title,
-                resolution="",
+                resolution=_calc_preview_resolution(video_ratio),
                 bgm_config=request.bgm_config or {},
                 auto_retry_enabled=False,
                 auto_retry_max=0,

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

@@ -26,7 +26,6 @@ from app.schemas.generated_video import (
 )
 from app.schemas.generation_task import (
     BatchGenerationTaskResponse,
-    ConfirmGenerationRequest,
     CreateGenerationTaskRequest,
     GenerationTaskResponse,
     ListGenerationTasksResponse,
@@ -63,12 +62,6 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
         video_title=getattr(task, "video_title", ""),
         resolution=getattr(task, "resolution", ""),
         bgm_config=getattr(task, "bgm_config", {}) or {},
-        is_preview=getattr(task, "is_preview", False),
-        source_task_id=getattr(task, "source_task_id", ""),
-        output_width=getattr(task, "output_width", 1280),
-        output_height=getattr(task, "output_height", 720),
-        cover_url=getattr(task, "cover_url", ""),
-        custom_title=getattr(task, "custom_title", ""),
         logs=getattr(task, "logs", "[]"),
         status=task.status,
         progress=task.progress,
@@ -298,12 +291,6 @@ def create_generation_task(
                     bgm_config=request.bgm_config,
                     auto_retry_enabled=request.auto_retry_enabled,
                     auto_retry_max=request.auto_retry_max,
-                    is_preview=request.is_preview,
-                    source_task_id=request.source_task_id,
-                    output_width=request.output_width,
-                    output_height=request.output_height,
-                    cover_url=request.cover_url,
-                    custom_title=request.custom_title,
                 )
             )
             try:
@@ -344,120 +331,6 @@ def create_generation_task(
     return BatchGenerationTaskResponse(items=items, total=len(items))
 
 
-@router.post("/tasks/{task_id}/confirm", response_model=BatchGenerationTaskResponse)
-def confirm_generation(
-    task_id: str,
-    request: ConfirmGenerationRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    generation_task_repository: Any = Depends(get_generation_task_repository),
-    project_repository: Any = Depends(get_project_repository),
-) -> BatchGenerationTaskResponse:
-    """确认生成 -- 复用预览渲染产物（预览与正式品质一致）。
-
-    预览已使用 1080p / CRF 23 / medium 渲染，品质与正式生成一致。
-    确认时直接将预览任务标记为正式产出，无需重新渲染，实现秒出。
-    仅当预览任务未完成时，才创建新的正式任务走渲染流程。
-    """
-    # 1. 查找源预览任务
-    source_task = generation_task_repository.get(task_id)
-    if source_task is None:
-        raise HTTPException(status_code=404, detail=f"Preview task {task_id} not found")
-
-    # 2. 权限检查
-    if source_task.created_by_user_id and source_task.created_by_user_id != authenticated_user.user.id:
-        raise HTTPException(status_code=403, detail="Access denied to this task")
-    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):
-        # 校验请求的分辨率是否与预览实际渲染的分辨率一致
-        req_w = request.output_width or 0
-        req_h = request.output_height or 0
-        src_w = getattr(source_task, "output_width", 0) or 0
-        src_h = getattr(source_task, "output_height", 0) or 0
-        resolution_match = (req_w == 0 or req_w == src_w) and (req_h == 0 or req_h == src_h)
-
-        if resolution_match:
-            source_task.mark_confirmed(
-                cover_url=request.cover_url,
-                custom_title=request.custom_title,
-                output_width=request.output_width,
-                output_height=request.output_height,
-            )
-            generation_task_repository.update(source_task)
-            logger.info(
-                "[确认生成] 复用预览产物: task_id=%s, user_id=%s",
-                task_id,
-                authenticated_user.user.id,
-            )
-            return BatchGenerationTaskResponse(
-                items=[_to_generation_task_response(source_task)],
-                total=1,
-            )
-        # 分辨率不一致，跳过复用，走新建任务流程
-        logger.info(
-            "[确认生成] 分辨率不一致，跳过复用: task_id=%s, src=%sx%s, req=%sx%s",
-            task_id,
-            src_w,
-            src_h,
-            req_w,
-            req_h,
-        )
-
-    # 4. 预览任务未完成，创建新的正式任务走渲染流程
-    use_case = CreateGenerationTaskUseCase(generation_task_repository)
-    new_task = use_case.execute(
-        CreateGenerationTaskCommand(
-            project_id=source_task.project_id,
-            asset_library_id=source_task.asset_library_id,
-            strategy_id=source_task.strategy_id,
-            voice_library_id=source_task.voice_library_id,
-            template_id=source_task.template_id,
-            asset_ids=source_task.asset_ids,
-            title_ids=source_task.title_ids,
-            voice_ids=source_task.voice_ids,
-            created_by_user_id=authenticated_user.user.id,
-            source_edit_plan_id=source_task.source_edit_plan_id or "",
-            asset_select_mode=source_task.asset_select_mode,
-            video_title=getattr(source_task, "video_title", ""),
-            resolution=getattr(source_task, "resolution", ""),
-            is_preview=False,
-            source_task_id=task_id,
-            output_width=request.output_width,
-            output_height=request.output_height,
-            cover_url=request.cover_url,
-            custom_title=request.custom_title,
-        )
-    )
-
-    # 5. 调度 worker
-    try:
-        if not safe_enqueue_generation_task(
-            new_task,
-            generation_task_repository,
-            user_id=authenticated_user.user.id,
-            log_prefix="[确认生成]",
-            log_task_status=True,
-        ):
-            logger.warning("[确认生成] 入队失败: task_id=%s", new_task.id)
-    except UserPendingLimitExceeded:
-        raise HTTPException(
-            status_code=429,
-            detail="您的待处理任务过多，请等待完成后再提交",
-        ) from None
-    except GlobalQueueFull:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from None
-
-    return BatchGenerationTaskResponse(
-        items=[_to_generation_task_response(new_task)],
-        total=1,
-    )
-
-
 @router.get("/tasks", response_model=ListGenerationTasksResponse)
 def list_generation_tasks(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -555,12 +428,6 @@ def retry_generation_task(
             asset_select_mode=getattr(task, "asset_select_mode", ""),
             video_title=getattr(task, "video_title", ""),
             resolution=getattr(task, "resolution", ""),
-            is_preview=getattr(task, "is_preview", False),
-            source_task_id=getattr(task, "source_task_id", ""),
-            output_width=getattr(task, "output_width", 1280),
-            output_height=getattr(task, "output_height", 720),
-            cover_url=getattr(task, "cover_url", ""),
-            custom_title=getattr(task, "custom_title", ""),
         )
     )
     try:

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

@@ -27,14 +27,18 @@ from packages.domain.edit_plan import EditPlanStatus
 logger = logging.getLogger(__name__)
 
 
-def _auto_fallback_draft_to_editing(svc: EditPlanService, plan_id: str, plan_check) -> None:
+def _auto_fallback_draft_to_editing(
+    svc: EditPlanService, plan_id: str, plan_check
+) -> None:
     """自动兜底 1: draft → editing"""
     if plan_check.status == EditPlanStatus.DRAFT:
         logger.info("模板编辑器自动兜底: plan=%s draft→editing", plan_id)
         svc.transition_status(plan_id, EditPlanStatus.EDITING)
 
 
-def _auto_fallback_copy_template_clips(svc: EditPlanService, plan_id: str, plan_check, db: Session) -> None:
+def _auto_fallback_copy_template_clips(
+    svc: EditPlanService, plan_id: str, plan_check, db: Session
+) -> None:
     """自动兜底 2: 无片段 + 有 template_id → 从模板复制片段配置"""
     existing_clips = svc.count_clips(plan_id)
     if existing_clips == 0 and plan_check.template_id:
@@ -49,15 +53,15 @@ def _auto_fallback_copy_template_clips(svc: EditPlanService, plan_id: str, plan_
             for cfg in configs:
                 svc.create_clip(
                     plan_id=plan_id,
-                    clip_type=cfg.clip_type.value if hasattr(cfg.clip_type, "value") else cfg.clip_type,
+                    clip_type=cfg.clip_type.value
+                    if hasattr(cfg.clip_type, "value")
+                    else cfg.clip_type,
                     order=cfg.order,
                     template_clip_config_id=cfg.id,
                     duration=cfg.default_duration,
-                    transition_effect=(
-                        cfg.transition_effect.value
-                        if hasattr(cfg.transition_effect, "value")
-                        else cfg.transition_effect
-                    ),
+                    transition_effect=cfg.transition_effect.value
+                    if hasattr(cfg.transition_effect, "value")
+                    else cfg.transition_effect,
                 )
             logger.info(
                 "模板编辑器自动兜底: plan=%s 从 template_clip_configs 复制了 %d 个片段",
@@ -86,20 +90,14 @@ def _auto_fallback_copy_template_clips(svc: EditPlanService, plan_id: str, plan_
             )
 
 
-def _auto_fallback_assign_assets(svc: EditPlanService, plan_id: str, plan_check) -> list:
+def _auto_fallback_assign_assets(
+    svc: EditPlanService, plan_id: str, plan_check
+) -> list:
     """自动兜底 3: 为没有素材的片段分配素材。返回剩余无素材片段列表。"""
     all_clips = svc.list_clips(plan_id)
     clips_without_asset = [c for c in all_clips if not c.asset_id]
     config_asset_ids = (plan_check.config or {}).get("asset_ids", [])
 
-    logger.info(
-        "模板编辑器自动兜底3 诊断: plan=%s total_clips=%d " "clips_without_asset=%d config_asset_ids=%r",
-        plan_id,
-        len(all_clips),
-        len(clips_without_asset),
-        config_asset_ids[:5] if config_asset_ids else [],
-    )
-
     if clips_without_asset and config_asset_ids:
         logger.info(
             "模板编辑器自动兜底3: plan=%s 为 %d 个无素材片段分配 %d 个指定素材",
@@ -107,42 +105,11 @@ def _auto_fallback_assign_assets(svc: EditPlanService, plan_id: str, plan_check)
             len(clips_without_asset),
             len(config_asset_ids),
         )
-        assigned = 0
         for i, clip in enumerate(clips_without_asset):
             asset_idx = i % len(config_asset_ids)
-            try:
-                svc.assign_asset(clip.id, config_asset_ids[asset_idx])
-                assigned += 1
-            except Exception as exc:
-                logger.error(
-                    "模板编辑器自动兜底3: plan=%s clip=%s 分配素材 %s 失败: %s",
-                    plan_id,
-                    clip.id,
-                    config_asset_ids[asset_idx],
-                    exc,
-                )
-        logger.info(
-            "模板编辑器自动兜底3: plan=%s 素材分配完成 assigned=%d/%d",
-            plan_id,
-            assigned,
-            len(clips_without_asset),
-        )
-        # 重新检查剩余无素材片段
-        all_clips_after = svc.list_clips(plan_id)
-        clips_without_asset = [c for c in all_clips_after if not c.asset_id]
-        if clips_without_asset:
-            logger.warning(
-                "模板编辑器自动兜底3: plan=%s 仍有 %d 个片段无素材",
-                plan_id,
-                len(clips_without_asset),
-            )
-    elif not clips_without_asset:
-        logger.info("模板编辑器自动兜底3: plan=%s 所有片段已有素材，跳过", plan_id)
-    elif not config_asset_ids:
-        logger.info(
-            "模板编辑器自动兜底3: plan=%s config.asset_ids 为空，跳过分配",
-            plan_id,
-        )
+            svc.assign_asset(clip.id, config_asset_ids[asset_idx])
+        logger.info("模板编辑器自动兜底3: plan=%s 素材分配完成", plan_id)
+        clips_without_asset = []
 
     return clips_without_asset
 
@@ -154,74 +121,43 @@ def _auto_fallback_auto_material_mode(
     clips_without_asset: list,
     asset_library_repo: Any,
     asset_repo: Any,
-    user_id: str = "",
 ) -> None:
-    """自动兜底 4: 自动选素材分配给无素材片段
-
-    查找策略（按优先级）：
-    1. plan 有 project_id → 从项目素材库查找
-    2. plan 无 project_id 但有 user_id → 从用户上传的素材中查找
-    """
+    """自动兜底 4: 项目有视频素材库时自动选素材"""
     if not clips_without_asset:
         return
-
-    ready_videos: list = []
-    source_desc = ""
-
-    # 策略 1: 通过 project_id 查找项目素材库
-    if plan_check.project_id:
-        libs = asset_library_repo.find_by_project(plan_check.project_id)
-        video_lib = None
-        for lib in libs:
-            lib_kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
-            if lib_kind == "video":
-                video_lib = lib
-                break
-        if video_lib:
-            assets = asset_repo.find_by_library(video_lib.id)
-            ready_videos = [
-                a
-                for a in assets
-                if (a.status.value if hasattr(a.status, "value") else a.status) == "ready"
-                and a.mime_type
-                and a.mime_type.startswith("video")
-            ]
-            source_desc = f"素材库 {video_lib.name}"
-
-    # 策略 2: 通过 user_id 查找用户上传的素材
-    if not ready_videos and user_id and hasattr(asset_repo, "find_ready_videos_by_user"):
-        logger.info(
-            "模板编辑器自动兜底4: plan=%s project_id 为空，尝试通过 user_id=%s 查找素材",
-            plan_id,
-            user_id,
-        )
-        ready_videos = asset_repo.find_ready_videos_by_user(user_id)
-        source_desc = f"用户上传 (user_id={user_id[:8]}...)"
-
-    if not ready_videos:
-        logger.warning(
-            "模板编辑器自动兜底4: plan=%s 未找到可用素材 (project_id=%s, user_id=%s)",
-            plan_id,
-            plan_check.project_id or "(empty)",
-            user_id[:8] + "..." if user_id else "(empty)",
-        )
+    if not plan_check.project_id:
         return
 
     logger.info(
-        "模板编辑器自动兜底4: plan=%s 自动选素材分配给 %d 个无素材片段 (来源: %s, 共 %d 个)",
+        "模板编辑器自动兜底4: plan=%s 自动选素材分配给 %d 个无素材片段",
         plan_id,
         len(clips_without_asset),
-        source_desc,
-        len(ready_videos),
-    )
-    random.shuffle(ready_videos)
-    for i, clip in enumerate(clips_without_asset):
-        asset = ready_videos[i % len(ready_videos)]
-        svc.assign_asset(clip.id, asset.id)
-    logger.info(
-        "模板编辑器自动兜底4: plan=%s 从 %s 分配了 %d 个素材给 %d 个片段",
-        plan_id,
-        source_desc,
-        len(ready_videos),
-        len(clips_without_asset),
     )
+    libs = asset_library_repo.find_by_project(plan_check.project_id)
+    video_lib = None
+    for lib in libs:
+        lib_kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
+        if lib_kind == "video":
+            video_lib = lib
+            break
+
+    if video_lib:
+        assets = asset_repo.find_by_library(video_lib.id)
+        ready_videos = [
+            a
+            for a in assets
+            if (a.status.value if hasattr(a.status, "value") else a.status) == "ready"
+            and a.mime_type
+            and a.mime_type.startswith("video")
+        ]
+        if ready_videos:
+            random.shuffle(ready_videos)
+            for i, clip in enumerate(clips_without_asset):
+                asset = ready_videos[i % len(ready_videos)]
+                svc.assign_asset(clip.id, asset.id)
+            logger.info(
+                "模板编辑器自动兜底4: plan=%s 从素材库 %s 分配了 %d 个素材",
+                plan_id,
+                video_lib.name,
+                len(ready_videos),
+            )

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

@@ -1,7 +1,11 @@
 """封面管理路由.
 
 端点：
-- POST /generate-cover     AI 生成封面（从预览视频中抽帧）
+- GET  /cover              封面配置
+- PUT  /cover              更新封面
+- POST /cover/extract      抽帧生成封面
+- POST /cover/smart        智能选帧
+- POST /generate-cover     AI 生成封面
 """
 
 from __future__ import annotations
@@ -9,20 +13,19 @@ from __future__ import annotations
 import logging
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session, get_generated_video_repository
 from app.services.edit_plan_service import EditPlanService
 from app.services.edit_template_service import EditTemplateService
 from fastapi import APIRouter, Depends, HTTPException
-from sqlalchemy.orm import Session
 
-from packages.adapters.sqlalchemy_impl.generation_task_repository import (
-    SQLAlchemyGenerationTaskRepository,
-)
-from packages.application import ListGeneratedVideosByTaskUseCase
 from packages.domain.config_schemas import normalize_plan_config
 
 from .dependencies import get_draft_plan_id, get_editor_services
 from .schemas import (
+    CoverConfigResponse,
+    CoverExtractRequest,
+    CoverGenerateResponse,
+    CoverSmartRequest,
+    CoverUpdateRequest,
     GenerateCoverRequest,
     GenerateCoverResponse,
 )
@@ -31,126 +34,188 @@ logger = logging.getLogger(__name__)
 router = APIRouter(tags=["Template Editor"])
 
 
+@router.get("/cover", response_model=CoverConfigResponse)
+def get_editor_cover(
+    template_id: str,
+    plan_id: str = Depends(get_draft_plan_id),
+    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
+    _: AuthenticatedUser = Depends(get_current_user),
+) -> CoverConfigResponse:
+    """获取草稿封面配置"""
+    _, plan_svc = services
+    plan = plan_svc.get_plan_or_raise(plan_id)
+    config = plan.config or {}
+    cover_config = config.get("cover", {})
+
+    return CoverConfigResponse(
+        type=cover_config.get("cover_type", "auto"),
+        image_url=cover_config.get("cover_image_url", ""),
+        frame_time=cover_config.get("frame_time", 0.0),
+    )
+
+
+@router.put("/cover", response_model=CoverConfigResponse)
+def update_editor_cover(
+    template_id: str,
+    body: CoverUpdateRequest,
+    plan_id: str = Depends(get_draft_plan_id),
+    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
+    _: AuthenticatedUser = Depends(get_current_user),
+) -> CoverConfigResponse:
+    """更新草稿封面配置"""
+    _, plan_svc = services
+    plan = plan_svc.get_plan_or_raise(plan_id)
+
+    config = dict(plan.config) if plan.config else {}
+    current_cover = dict(config.get("cover", {}))
+    update_data = body.model_dump(exclude_none=True)
+    current_cover.update(update_data)
+
+    config["cover"] = current_cover
+    normalized = normalize_plan_config(config)
+    plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
+
+    return CoverConfigResponse(
+        type=current_cover.get("cover_type", "auto"),
+        image_url=current_cover.get("cover_image_url", ""),
+        frame_time=current_cover.get("frame_time", 0.0),
+    )
+
+
+@router.post("/cover/extract", response_model=CoverGenerateResponse)
+def extract_editor_cover(
+    template_id: str,
+    body: CoverExtractRequest,
+    plan_id: str = Depends(get_draft_plan_id),
+    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+) -> CoverGenerateResponse:
+    """从指定片段抽帧生成封面"""
+    _, plan_svc = services
+    plan = plan_svc.get_plan_or_raise(plan_id)
+
+    clip = plan_svc.get_clip(body.clip_id)
+    if not clip or clip.plan_id != plan_id:
+        raise HTTPException(status_code=400, detail="片段不存在或不属于当前草稿")
+
+    cover_url = f"cover/extract/{plan_id}_{body.clip_id}_{body.frame_time}.jpg"
+
+    config = dict(plan.config) if plan.config else {}
+    cover_config = dict(config.get("cover", {}))
+    cover_config.update(
+        {
+            "cover_type": "extract",
+            "cover_image_url": cover_url,
+            "clip_id": body.clip_id,
+            "frame_time": body.frame_time,
+        }
+    )
+    config["cover"] = cover_config
+    normalized = normalize_plan_config(config)
+    plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
+
+    logger.info(
+        "模板编辑器封面抽帧: template_id=%s plan_id=%s clip_id=%s by user=%s",
+        template_id,
+        plan_id,
+        body.clip_id,
+        current_user.user.id,
+    )
+
+    return CoverGenerateResponse(
+        type="extract",
+        image_url=cover_url,
+        frame_time=body.frame_time,
+    )
+
+
+@router.post("/cover/smart", response_model=CoverGenerateResponse)
+def smart_editor_cover(
+    template_id: str,
+    body: CoverSmartRequest,
+    plan_id: str = Depends(get_draft_plan_id),
+    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+) -> CoverGenerateResponse:
+    """智能选帧生成封面"""
+    _, plan_svc = services
+    plan = plan_svc.get_plan_or_raise(plan_id)
+
+    cover_url = f"cover/smart/{plan_id}_smart.jpg"
+    strategy = getattr(body, "strategy", "auto")
+
+    config = dict(plan.config) if plan.config else {}
+    cover_config = dict(config.get("cover", {}))
+    cover_config.update(
+        {
+            "cover_type": "smart",
+            "cover_image_url": cover_url,
+            "strategy": strategy,
+        }
+    )
+    config["cover"] = cover_config
+    normalized = normalize_plan_config(config)
+    plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
+
+    logger.info(
+        "模板编辑器智能封面: template_id=%s plan_id=%s strategy=%s by user=%s",
+        template_id,
+        plan_id,
+        strategy,
+        current_user.user.id,
+    )
+
+    return CoverGenerateResponse(
+        type="smart",
+        image_url=cover_url,
+        frame_time=None,
+    )
+
+
 @router.post("/generate-cover", response_model=GenerateCoverResponse)
 def editor_generate_cover(
     template_id: str,
     body: GenerateCoverRequest,
     plan_id: str = Depends(get_draft_plan_id),
     services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    db: Session = Depends(get_db_session),
     current_user: AuthenticatedUser = Depends(get_current_user),
 ) -> GenerateCoverResponse:
-    """AI 生成封面 — 从预览视频中抽帧.
-
-    流程（串行）：
-    1. 预览视频已渲染完成（通过 3 步查找获取 URL）
-    2. 用裸 URL 让 MediaKit 下载视频并抽帧
-    3. 帧图下载后上传到 OSS covers/ 路径
-    """
+    """AI 生成封面"""
     _, plan_svc = services
     plan = plan_svc.get_plan_or_raise(plan_id)
 
-    # ── 3 步查找预览视频 URL ──────────────────────────────────────────
-    # 第一步：从 plan.config 读取
-    rendered_storage_key = (plan.config or {}).get("rendered_storage_key", "")
-
-    # 第二步：如果还没有，通过 generation_task_id 查找预览任务的产物
-    if not rendered_storage_key:
-        generation_task_id = (plan.config or {}).get("generation_task_id", "")
-        if generation_task_id:
-            try:
-                gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-                task = gen_task_repo.get(generation_task_id)
-                if task:
-                    video_repo = get_generated_video_repository(db)
-                    use_case = ListGeneratedVideosByTaskUseCase(video_repo)
-                    videos = use_case.execute(task.id)
-                    if videos:
-                        rendered_storage_key = getattr(videos[0], "file_url", "") or ""
-                        logger.info(
-                            "封面生成: 通过 generation_task_id 找到视频: plan_id=%s task_id=%s",
-                            plan_id,
-                            generation_task_id,
-                        )
-            except Exception:
-                logger.warning(
-                    "封面生成: 通过 generation_task_id 查找视频失败: plan_id=%s",
-                    plan_id,
-                    exc_info=True,
-                )
-
-    # 第三步：按 user + template 查找最近的已完成预览任务（兜底）
-    if not rendered_storage_key:
-        try:
-            gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-            preview_tasks = gen_task_repo.list_latest_completed_preview(
-                user_id=str(current_user.user.id),
-                template_id=template_id,
-            )
-            if preview_tasks:
-                completed_preview = preview_tasks[0]
-                video_repo = get_generated_video_repository(db)
-                use_case = ListGeneratedVideosByTaskUseCase(video_repo)
-                videos = use_case.execute(completed_preview.id)
-                if videos:
-                    rendered_storage_key = getattr(videos[0], "file_url", "") or ""
-                    logger.info(
-                        "封面视频: 通过 user+template 找到预览任务: plan_id=%s template_id=%s task_id=%s",
-                        plan_id,
-                        template_id,
-                        completed_preview.id,
-                    )
-        except Exception:
-            logger.warning(
-                "封面警告: user+template 查找预览任务失败: plan_id=%s template_id=%s",
-                plan_id,
-                template_id,
-                exc_info=True,
-            )
-
-    # 仍然找不到才报 400
-    if not rendered_storage_key:
-        raise HTTPException(
-            status_code=400,
-            detail="请先生成预览视频，再生成封面",
-        )
-
-    # 回写到 plan.config
-    plan_svc.update_plan_config(plan_id, {"rendered_storage_key": rendered_storage_key})
-
-    # 使用裸 URL（rendered/* 已配置公开读）
+    # 获取第一个视频的下载 URL（用于 MediaKit 抽帧）
     primary_video_url = None
-    try:
-        if rendered_storage_key.startswith("http"):
-            primary_video_url = rendered_storage_key
-        else:
+    if body.asset_ids and body.cover_type in ("ai_frame", "ai_regenerate"):
+        try:
+            from app.database import get_db_session
+
+            from packages.adapters.sqlalchemy_impl.asset_repository import SQLAlchemyAssetRepository
             from packages.shared.storage import get_shared_storage_service
 
-            storage_svc = get_shared_storage_service()
-            primary_video_url = storage_svc.get_url(rendered_storage_key)
-        logger.info(
-            "获取预览视频URL用于封面生成: plan_id=%s url=%s",
-            plan_id,
-            primary_video_url[:80] if primary_video_url else "",
-        )
-    except Exception as e:
-        raise HTTPException(
-            status_code=500,
-            detail=f"获取预览视频URL失败: {e}",
-        ) from e
+            with get_db_session() as session:
+                asset_repo = SQLAlchemyAssetRepository(session)
+                first_asset = asset_repo.get(body.asset_ids[0])
+                if first_asset and first_asset.storage_key:
+                    storage_svc = get_shared_storage_service()
+                    primary_video_url = storage_svc.get_download_url(first_asset.storage_key)
+                    logger.info(
+                        "获取视频URL用于封面生成: asset_id=%s url=%s",
+                        body.asset_ids[0],
+                        primary_video_url[:80] if primary_video_url else None,
+                    )
+        except Exception as e:
+            logger.warning("获取视频URL失败，将使用stub封面: %s", str(e))
 
     from packages.shared.ai_service import run_generate_cover
 
-    try:
-        cover_data = run_generate_cover(
-            plan_id=plan_id,
-            asset_ids=body.asset_ids,
-            cover_type=body.cover_type,
-            frame_time=body.frame_time,
-            primary_video_url=primary_video_url,
-        )
-    except RuntimeError as e:
-        raise HTTPException(status_code=500, detail=str(e)) from e
+    cover_data = run_generate_cover(
+        plan_id=plan_id,
+        asset_ids=body.asset_ids,
+        cover_type=body.cover_type,
+        frame_time=body.frame_time,
+        primary_video_url=primary_video_url,
+    )
 
     current_config = dict(plan.config) if plan.config else {}
     current_config["cover"] = cover_data
@@ -158,7 +223,7 @@ def editor_generate_cover(
     plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
 
     logger.info(
-        "封面生成完成: template_id=%s plan_id=%s type=%s by user=%s",
+        "模板编辑器封面生成: template_id=%s plan_id=%s type=%s by user=%s",
         template_id,
         plan_id,
         body.cover_type,

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

@@ -18,7 +18,6 @@ from app.dependencies import (
     get_asset_library_repository,
     get_asset_repository,
     get_db_session,
-    get_generated_video_repository,
 )
 from app.schemas.generation_task import GenerationTaskResponse
 from app.services.edit_plan_service import EditPlanService
@@ -29,7 +28,6 @@ from sqlalchemy.orm import Session
 from packages.adapters.sqlalchemy_impl.generation_task_repository import (
     SQLAlchemyGenerationTaskRepository,
 )
-from packages.application.generated_videos import ListGeneratedVideosByTaskUseCase
 from packages.application.generation_tasks import (
     CreateGenerationTaskCommand,
     CreateGenerationTaskUseCase,
@@ -73,60 +71,25 @@ def generate_editor_draft(
     _auto_fallback_copy_template_clips(plan_svc, plan_id, plan_check, db)
     clips_without_asset = _auto_fallback_assign_assets(plan_svc, plan_id, plan_check)
     _auto_fallback_auto_material_mode(
-        plan_svc,
-        plan_id,
-        plan_check,
-        clips_without_asset,
-        asset_library_repo,
-        asset_repo,
-        user_id=str(current_user.user.id),
+        plan_svc, plan_id, plan_check, clips_without_asset, asset_library_repo, asset_repo
     )
 
-    # 检查是否可复用已完成的预览产物（预览品质已与正式一致）
-    gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-    reusable_task = _find_reusable_preview_task(gen_task_repo, plan_id, plan_check)
-    if reusable_task:
-        # 复用预览产物：标记为正式产出，跳过渲染
-        reusable_task.mark_confirmed()
-        gen_task_repo.update(reusable_task)
-
-        # 将产物 URL 写入 plan config
-        rendered_url = _get_task_output_url(reusable_task, gen_task_repo, db)
-        plan_svc.update_plan_config(
-            plan_id,
-            {
-                "generation_task_id": reusable_task.id,
-                "rendered_storage_key": rendered_url,  # 统一用 rendered_storage_key
-            },
-        )
-        plan_svc.transition_status(plan_id, EditPlanStatus.COMPLETED)
-
-        updated_plan = plan_svc.get_plan_or_raise(plan_id)
-        logger.info(
-            "模板编辑器复用预览产物: template_id=%s plan_id=%s task_id=%s by user=%s",
-            template_id,
-            plan_id,
-            reusable_task.id,
-            current_user.user.id,
-        )
-        return EditPlanGenerateResponse(
-            plan_id=plan_id,
-            plan_status=updated_plan.status.value if hasattr(updated_plan.status, "value") else updated_plan.status,
-            generation_task_id=reusable_task.id,
-            clip_count=len((plan_check.config or {}).get("clips", [])),
-        )
-
-    # 检查是否可生成（含最后防线自动修复 + 诊断日志）
+    # 检查是否可生成
     try:
         can_gen, reason = plan_svc.can_generate(plan_id)
     except ValueError as exc:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)
+        ) from exc
     if not can_gen:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=reason)
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST, detail=reason
+        )
 
     try:
         clip_count = plan_svc.mark_clips_ready(plan_id)
 
+        gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
         user_id = current_user.user.id
         _check_queue_limits(gen_task_repo, user_id)
 
@@ -160,7 +123,9 @@ def generate_editor_draft(
 
         return EditPlanGenerateResponse(
             plan_id=plan_id,
-            plan_status=updated_plan.status.value if hasattr(updated_plan.status, "value") else updated_plan.status,
+            plan_status=updated_plan.status.value
+            if hasattr(updated_plan.status, "value")
+            else updated_plan.status,
             generation_task_id=gen_task.id,
             clip_count=clip_count,
         )
@@ -182,53 +147,6 @@ def generate_editor_draft(
         ) from _e
 
 
-def _find_reusable_preview_task(gen_task_repo, plan_id: str, plan) -> "object | None":
-    """查找该 plan 关联的已完成预览任务，判断是否可复用。
-
-    复用条件：
-    1. 存在 source_edit_plan_id == plan_id 的已完成预览任务
-    2. plan 在预览完成后未被修改（updated_at <= 预览完成时间）
-
-    Returns:
-        可复用的 GenerationTask，或 None
-    """
-    try:
-        tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
-    except Exception:
-        return None
-
-    for task in tasks:
-        if not getattr(task, "is_preview", False):
-            continue
-        if not task.is_completed:
-            continue
-        # 检查 plan 是否在预览完成后被修改
-        completed_at = getattr(task, "completed_at", None)
-        if completed_at and hasattr(plan, "updated_at"):
-            plan_updated = plan.updated_at
-            # 如果 plan.updated_at 为空，无法判断是否修改过，跳过
-            if plan_updated is None:
-                continue
-            # 如果 plan 在预览完成后又被修改了，不能复用
-            if plan_updated > completed_at:
-                continue
-        return task
-    return None
-
-
-def _get_task_output_url(task, gen_task_repo, db) -> str:
-    """获取任务的输出视频 URL。"""
-    try:
-        video_repo = get_generated_video_repository(db)
-        use_case = ListGeneratedVideosByTaskUseCase(video_repo)
-        videos = use_case.execute(task.id)
-        if videos:
-            return getattr(videos[0], "file_url", "") or ""
-    except Exception:
-        pass
-    return ""
-
-
 @router.get("/generation-status", response_model=EditPlanGenerationStatusResponse)
 def get_editor_generation_status(
     template_id: str,
@@ -242,7 +160,9 @@ def get_editor_generation_status(
     try:
         gen_status = plan_svc.get_generation_status(plan_id)
     except ValueError as exc:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)
+        ) from exc
 
     plan = gen_status["plan"]
     clips = gen_status["clips"]
@@ -260,22 +180,25 @@ def get_editor_generation_status(
         for c in clips
     ]
 
-    raw_video_url = (plan.config or {}).get("rendered_storage_key", "") or (plan.config or {}).get("rendered_url", "")
+    raw_video_url = (plan.config or {}).get("rendered_url", "")
     video_url = ""
     if raw_video_url:
-        if raw_video_url.startswith("http"):
-            video_url = raw_video_url  # 已经是完整 URL
-        else:
-            try:
-                video_url = storage_service.get_url(raw_video_url)  # storage_key -> 完整 URL
-            except Exception as e:
-                logger.warning("生成视频URL获取失败: template_id=%s error=%s", template_id, e)
-                video_url = raw_video_url
+        try:
+            video_url = storage_service.get_download_url(
+                raw_video_url, expires_seconds=86400
+            )
+        except Exception as e:
+            logger.warning(
+                "生成视频签名URL失败: template_id=%s error=%s", template_id, e
+            )
+            video_url = raw_video_url
 
     progress = gen_status.get("progress", 0.0)
     error_message = gen_status.get("error_message", "")
     gen_task_status = gen_status.get("generation_task_status")
-    plan_status_val = plan.status.value if hasattr(plan.status, "value") else plan.status
+    plan_status_val = (
+        plan.status.value if hasattr(plan.status, "value") else plan.status
+    )
     if plan_status_val == "completed" and progress < 100:
         progress = 100.0
 

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

@@ -257,6 +257,43 @@ class ClipsFromAssetsResponse(BaseModel):
 # ── 封面配置 ────────────────────────────────────────────────────────────────
 
 
+class CoverConfigResponse(BaseModel):
+    """封面配置响应"""
+
+    type: str = Field(..., description="封面类型: ai_frame / manual / upload")
+    image_url: str = Field(default="", description="封面图片 URL")
+    frame_time: Optional[float] = Field(default=None, description="抽帧时间点（秒）")
+
+
+class CoverUpdateRequest(BaseModel):
+    """更新封面配置请求"""
+
+    type: Optional[str] = Field(default=None, description="封面类型")
+    image_url: Optional[str] = Field(default=None, description="封面图片 URL")
+    frame_time: Optional[float] = Field(default=None, ge=0.0, description="抽帧时间点（秒）")
+
+
+class CoverExtractRequest(BaseModel):
+    """从片段抽帧生成封面请求"""
+
+    clip_id: str = Field(..., description="片段 ID")
+    frame_time: float = Field(1.0, ge=0.0, description="抽帧时间点（秒）")
+
+
+class CoverSmartRequest(BaseModel):
+    """智能选帧请求"""
+
+    clip_id: Optional[str] = Field(default=None, description="指定片段 ID（不传则用第一个视频片段）")
+
+
+class CoverGenerateResponse(BaseModel):
+    """封面生成响应"""
+
+    type: str = Field(..., description="封面类型")
+    image_url: str = Field(..., description="封面图片 URL")
+    frame_time: Optional[float] = Field(default=None, description="抽帧时间点（秒）")
+
+
 # ── 导出配置 ────────────────────────────────────────────────────────────────
 
 

apps/api/app/dependencies.py

@@ -22,9 +22,6 @@ from packages.adapters.sqlalchemy_impl.asset_repository import SQLAlchemyAssetRe
 from packages.adapters.sqlalchemy_impl.classification_job_repository import (
     SQLAlchemyClassificationJobRepository,
 )
-from packages.adapters.sqlalchemy_impl.cover_template_repository import (
-    SQLAlchemyCoverTemplateRepository,
-)
 from packages.adapters.sqlalchemy_impl.duplication_repository import (
     SQLAlchemyDuplicationRecordRepository,
 )
@@ -131,13 +128,6 @@ def get_project_repository(
     return SQLAlchemyProjectRepository(session)
 
 
-def get_cover_template_repository(
-    session: Session = Depends(get_db_session),
-) -> SQLAlchemyCoverTemplateRepository:
-    """Provide the SQLAlchemy cover template repository implementation."""
-    return SQLAlchemyCoverTemplateRepository(session)
-
-
 def get_tag_repository(
     session: Session = Depends(get_db_session),
 ) -> TagRepository:

apps/api/app/schemas/asset.py

@@ -2,7 +2,7 @@ from pydantic import BaseModel, Field
 
 
 class CreateAssetRequest(BaseModel):
-    project_id: str | None = Field(default=None, description="可选，不传时从 library.project_id 自动推导")
+    project_id: str = Field(..., min_length=1)
     library_id: str = Field(..., min_length=1)
     name: str = Field(..., min_length=1, max_length=100)
     storage_key: str = Field(..., min_length=1, max_length=255)

apps/api/app/schemas/cover_template.py

@@ -1,54 +0,0 @@
-"""封面模板 Schema。"""
-
-from datetime import datetime
-from typing import Any
-
-from pydantic import BaseModel, Field
-
-
-class CoverTemplateConfig(BaseModel):
-    """封面模板配置。"""
-
-    background_enabled: bool = Field(default=True, description="是否启用背景")
-    background_color: str = Field(default="#000000", description="背景颜色")
-    portrait_enabled: bool = Field(default=True, description="是否显示人像")
-    title_text: str = Field(default="", description="主标题文字")
-    subtitle_text: str = Field(default="", description="副标题文字")
-    mask_enabled: bool = Field(default=False, description="是否启用蒙版")
-
-
-class CreateCoverTemplateRequest(BaseModel):
-    """创建封面模板请求。"""
-
-    name: str = Field(..., min_length=1, max_length=200, description="模板名称")
-    thumbnail_url: str = Field(default="", description="缩略图 URL")
-    config: CoverTemplateConfig | None = Field(default=None, description="模板配置")
-
-
-class UpdateCoverTemplateRequest(BaseModel):
-    """更新封面模板请求。"""
-
-    name: str | None = Field(default=None, min_length=1, max_length=200, description="模板名称")
-    thumbnail_url: str | None = Field(default=None, description="缩略图 URL")
-    config: CoverTemplateConfig | None = Field(default=None, description="模板配置")
-
-
-class CoverTemplateResponse(BaseModel):
-    """封面模板响应。"""
-
-    id: str
-    name: str
-    thumbnail_url: str
-    is_system: bool
-    created_at: datetime
-    config: dict[str, Any] = Field(default_factory=dict)
-
-    class Config:
-        from_attributes = True
-
-
-class ListCoverTemplatesResponse(BaseModel):
-    """封面模板列表响应。"""
-
-    items: list[CoverTemplateResponse]
-    total: int = Field(default=0, ge=0)

apps/api/app/schemas/generation_task.py

@@ -4,15 +4,6 @@ from datetime import datetime
 from pydantic import BaseModel, Field, field_validator, model_validator
 
 
-class ConfirmGenerationRequest(BaseModel):
-    """确认生成请求体 — 基于预览任务创建正式生成任务"""
-
-    output_width: int = Field(default=1080, description="输出视频宽度")
-    output_height: int = Field(default=1920, description="输出视频高度")
-    cover_url: str = Field(default="", description="自定义封面图片 URL")
-    custom_title: str = Field(default="", description="自定义视频标题")
-
-
 class CreateGenerationTaskRequest(BaseModel):
     """创建生成任务请求。
 
@@ -66,13 +57,6 @@ class CreateGenerationTaskRequest(BaseModel):
         default_factory=dict,
         description="自定义BGM配置，覆盖模板BGM设置。支持 enabled/source/asset_id/preset_id/audio_url/volume 等字段",
     )
-    # ── 预览 / 确认生成 ──
-    is_preview: bool = Field(default=False, description="是否为预览任务")
-    source_task_id: str = Field(default="", description="来源预览任务 ID（确认生成时传入）")
-    output_width: int = Field(default=1280, description="输出视频宽度")
-    output_height: int = Field(default=720, description="输出视频高度")
-    cover_url: str = Field(default="", description="封面图片 URL")
-    custom_title: str = Field(default="", description="自定义视频标题")
 
     @model_validator(mode="after")
     def _check_at_least_one_mode(self) -> "CreateGenerationTaskRequest":
@@ -103,12 +87,6 @@ class GenerationTaskResponse(BaseModel):
     video_title: str = ""
     resolution: str = ""
     bgm_config: dict = Field(default_factory=dict)
-    is_preview: bool = False
-    source_task_id: str = ""
-    output_width: int = 1280
-    output_height: int = 720
-    cover_url: str = ""
-    custom_title: str = ""
     status: str
     progress: float
     result_count: int
@@ -154,16 +132,13 @@ class CreatePreviewGenerationTaskRequest(BaseModel):
     """创建预览生成任务请求。
 
     仅支持模板模式：template_id + asset_ids 等素材 ID 列表。
-    预览渲染品质与正式生成一致（1080p, CRF 23, medium preset）。
+    预览为完整时长低清版（480p + 低码率）。
     """
 
     template_id: str
     asset_ids: list[str] = Field(default_factory=list)
     title_ids: list[str] = Field(default_factory=list)
     voice_ids: list[str] = Field(default_factory=list)
-    voice_library_id: str = Field(
-        default="", description="配音素材库ID（用户上传的音频或AI配音），对应配音选择页面选择的配音素材"
-    )
     video_title: str = Field(default="", description="生成视频的标题/名称，为空则使用默认命名")
     duration: float = Field(default=0.0, ge=0, description="期望视频时长（秒），0 表示由模板决定")
     video_ratio: str = Field(default="", description="视频比例，如 16:9 / 9:16，为空使用模板默认")
@@ -171,16 +146,6 @@ class CreatePreviewGenerationTaskRequest(BaseModel):
         default_factory=dict,
         description="自定义BGM配置，覆盖模板BGM设置。支持 enabled/source/asset_id/preset_id/audio_url/volume 等字段",
     )
-    preview_count: int = Field(
-        default=1,
-        ge=1,
-        le=10,
-        description="预览视频生成数量，范围 1-10，默认 1",
-    )
-    source_edit_plan_id: str = Field(
-        default="",
-        description="关联的编辑计划ID（可选），用于确认生成时复用预览产物",
-    )
 
     @model_validator(mode="after")
     def _check_template_id(self) -> "CreatePreviewGenerationTaskRequest":

apps/api/app/services/cover_service.py

@@ -215,7 +215,7 @@ class CoverService:
         import subprocess
 
         # scale + crop 实现 cover 裁剪
-        vf = f"scale={width}:{height}:force_original_aspect_ratio=increase," f"crop={width}:{height},format=yuvj420p"
+        vf = f"scale={width}:{height}:force_original_aspect_ratio=increase," f"crop={width}:{height}"
 
         command = [
             "ffmpeg",
@@ -258,8 +258,6 @@ class CoverService:
                     "1",
                     "-q:v",
                     str(quality),
-                    "-pix_fmt",
-                    "yuvj420p",
                     "-f",
                     "mjpeg",
                     str(output_path),

apps/api/app/services/edit_plan_service.py

@@ -571,10 +571,6 @@ class EditPlanService:
     def can_generate(self, plan_id: str) -> tuple[bool, str]:
         """检查是否可以触发渲染
 
-        包含最后一道防线的自动修复：
-        - 如果 clips 存在但都没有 asset_id，且 config.asset_ids 非空，
-          直接在内部执行素材分配，不再依赖前置 fallback 链路。
-
         Returns:
             tuple: (can_generate, reason)
         """
@@ -589,69 +585,10 @@ class EditPlanService:
         if not clips:
             return False, "请先添加片段后再生成视频"
 
-        # 检查是否至少有一个片段分配了素材
-        has_asset = any(c.asset_id for c in clips)
-        config_asset_ids_count = len((plan.config or {}).get("asset_ids", []))
-        clips_with_asset_count = sum(1 for c in clips if c.asset_id)
-        logger.info(
-            "can_generate 诊断: plan=%s status=%s total_clips=%d " "clips_with_asset=%d config_asset_ids_count=%d",
-            plan_id,
-            plan.status,
-            len(clips),
-            clips_with_asset_count,
-            config_asset_ids_count,
-        )
-        if not has_asset:
-            # ── 最后防线：自动从 config.asset_ids 分配素材 ──
-            config_asset_ids = (plan.config or {}).get("asset_ids", [])
-            if config_asset_ids:
-                logger.warning(
-                    "can_generate 最后防线触发: plan=%s clips=%d 均无素材，" "从 config.asset_ids(%d个) 自动分配",
-                    plan_id,
-                    len(clips),
-                    len(config_asset_ids),
-                )
-                clips_without_asset = [c for c in clips if not c.asset_id]
-                assigned_count = 0
-                for i, clip in enumerate(clips_without_asset):
-                    asset_idx = i % len(config_asset_ids)
-                    try:
-                        self.assign_asset(clip.id, config_asset_ids[asset_idx])
-                        assigned_count += 1
-                    except Exception as exc:
-                        logger.warning(
-                            "can_generate 最后防线: plan=%s clip=%s 分配素材 %s 失败: %s",
-                            plan_id,
-                            clip.id,
-                            config_asset_ids[asset_idx],
-                            exc,
-                        )
-                logger.info(
-                    "can_generate 最后防线: plan=%s 已为 %d/%d 个片段分配素材",
-                    plan_id,
-                    assigned_count,
-                    len(clips_without_asset),
-                )
-                # 重新加载 clips 验证分配结果
-                clips = self._clip_repo.list_by_plan(plan_id)
-                if not any(c.asset_id for c in clips):
-                    return False, "没有可渲染的就绪片段，自动修复后仍未分配素材"
-            else:
-                logger.warning(
-                    "can_generate 失败: plan=%s clips=%d 均无素材，" "且 config.asset_ids 为空，无法自动修复",
-                    plan_id,
-                    len(clips),
-                )
-                return False, "没有可渲染的就绪片段，请确保已选择素材"
-
         return True, ""
 
     def mark_clips_ready(self, plan_id: str) -> int:
-        """将已分配素材的 pending 片段标记为 ready
-
-        只标记同时满足以下条件的片段：
-        - status == PENDING
-        - asset_id 非空（已分配素材）
+        """将所有 pending 状态的片段标记为 ready
 
         Returns:
             int: 标记的片段数量
@@ -662,16 +599,10 @@ class EditPlanService:
         )
         count = 0
         for clip in clips:
-            if clip.asset_id:
-                clip.mark_ready()
-                self._clip_repo.update(clip)
-                count += 1
-        logger.info(
-            "标记片段就绪: plan_id=%s marked=%d total_pending=%d",
-            plan_id,
-            count,
-            len(clips),
-        )
+            clip.mark_ready()
+            self._clip_repo.update(clip)
+            count += 1
+        logger.info("标记片段就绪: plan_id=%s count=%d", plan_id, count)
         return count
 
     def update_plan_config(self, plan_id: str, config_updates: Dict[str, Any]) -> EditPlan:

apps/api/app/services/plan_generator_service.py

@@ -49,10 +49,9 @@ class PlanGeneratorService:
     基于模板 + 素材，自动生成 EditPlan 及 EditPlanClip 列表。
     """
 
-    def __init__(self, db: Session, asset_repo=None) -> None:
+    def __init__(self, db: Session) -> None:
         self._plan_repo = SQLAlchemyEditPlanRepository(db)
         self._clip_repo = SQLAlchemyEditPlanClipRepository(db)
-        self._asset_repo = asset_repo
 
     # ── 公开接口 ─────────────────────────────────────────────────────────────
 
@@ -65,7 +64,6 @@ class PlanGeneratorService:
         project_id: str = "",
         created_by_user_id: str = "",
         name: str = "",
-        random_preview: bool = False,
     ) -> dict[str, Any]:
         """基于模板+素材生成剪辑计划
 
@@ -76,7 +74,6 @@ class PlanGeneratorService:
             project_id: 所属项目 ID
             created_by_user_id: 创建者用户 ID
             name: 计划名称（为空则自动取模板名）
-            random_preview: 是否启用随机预览模式（随机选素材+随机截取片段）
 
         Returns:
             dict: {"plan": EditPlan, "clips": List[EditPlanClip]}
@@ -118,17 +115,7 @@ class PlanGeneratorService:
 
         # 4. 按 editing_mode 分配素材
         if asset_ids:
-            # 如果是随机预览模式，获取素材时长信息
-            asset_durations = None
-            if random_preview and self._asset_repo:
-                asset_durations = self._fetch_asset_durations(asset_ids)
-            self._distribute_assets(
-                clips,
-                asset_ids,
-                editing_mode,
-                random_selection=random_preview,
-                asset_durations=asset_durations,
-            )
+            self._distribute_assets(clips, asset_ids, editing_mode)
 
         # 5. 持久化所有 clips 并计算总时长
         created_clips: List[EditPlanClip] = []
@@ -212,34 +199,9 @@ class PlanGeneratorService:
         clips: List[EditPlanClip],
         asset_ids: List[str],
         editing_mode: str,
-        *,
-        random_selection: bool = False,
-        asset_durations: dict[str, float] | None = None,
     ) -> None:
         """按 editing_mode 将素材分配到 clips（就地修改，未持久化）.
 
         委托给 plan_generator_utils.distribute_assets 纯函数。
         """
-        distribute_assets(
-            clips,
-            asset_ids,
-            editing_mode,
-            random_selection=random_selection,
-            asset_durations=asset_durations,
-        )
-
-    def _fetch_asset_durations(self, asset_ids: List[str]) -> dict[str, float]:
-        """从数据库获取素材时长信息.
-
-        Args:
-            asset_ids: 素材 ID 列表
-
-        Returns:
-            dict: 素材 ID -> 时长（秒）映射
-        """
-        durations: dict[str, float] = {}
-        for asset_id in asset_ids:
-            asset = self._asset_repo.get(asset_id)
-            if asset and hasattr(asset, "duration"):
-                durations[asset_id] = float(asset.duration or 0.0)
-        return durations
+        distribute_assets(clips, asset_ids, editing_mode)

apps/api/app/services/video_compose_service.py

@@ -374,7 +374,7 @@ class VideoComposeService:
                 EditPlanStatus.EDITING,
                 EditPlanStatus.RENDERING,
             ),
-            "rendered_url": plan.config.get("rendered_storage_key", "") or plan.config.get("rendered_url", ""),
+            "rendered_url": plan.config.get("rendered_url", ""),
         }
 
     # ── 内部方法 ──────────────────────────────────────────────────────────

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

@@ -50,10 +50,10 @@ type AssetListResponse = {
 }
 
 test.describe("Core generation flow", () => {
-  test.describe.configure({ timeout: 360_000 })
+  test.describe.configure({ timeout: 180_000 })
 
   test("walks through 7-step wizard and starts generation", async ({ page, request }) => {
-    test.setTimeout(360_000)
+    test.setTimeout(180_000)
 
     await routeBrowserApiToTestApi(page)
     const suffix = Date.now().toString(36)
@@ -196,50 +196,41 @@ test.describe("Core generation flow", () => {
     await materialLabel.locator("input[type='checkbox']").check()
     await page.getByRole("button", { name: "下一步" }).click()
 
-    // Step 3: voice (可选步骤，新注册用户无配音素材，直接跳过)
-    await expect(page.getByRole("heading", { name: /选择配音/ })).toBeVisible({ timeout: 15000 })
-    await page.getByRole("button", { name: "下一步" }).click()
-
-    // Step 4: preview — 需要先生成预览视频，才能进入下一步
-    await expect(page.getByRole("heading", { name: /生成预览/ })).toBeVisible({ timeout: 15000 })
+    // Step 3: preview — 需要先生成预览视频，才能进入下一步
+    await expect(page.getByRole("heading", { name: /生成预览/ })).toBeVisible()
     // 点击"生成预览"按钮触发预览生成
     await page.locator(".xx-preview-generate-btn").click()
     // 等待预览生成完成（后端渲染，可能需要较长时间）
-    await expect(page.getByText("预览生成成功")).toBeVisible({ timeout: 300_000 })
+    await expect(page.getByText("预览生成成功")).toBeVisible({ timeout: 120_000 })
     await page.getByRole("button", { name: "下一步" }).click()
 
-    // Step 5: title
+    // Step 4: title
     await expect(page.getByRole("heading", { name: /选择标题/ })).toBeVisible({ timeout: 15000 })
-    // 等待组件完全渲染
-    await page.waitForTimeout(2000)
-
-    // Antd AutoComplete 的 placeholder 渲染在 span 上，input 无 placeholder 属性
-    // 使用 Antd AutoComplete 特有的 class 定位输入框
-    const titleInput = page.locator(".ant-select-auto-complete input")
-    await expect(titleInput).toBeVisible({ timeout: 5000 })
-
     const titleText = `E2E Test ${suffix}`
-    await titleInput.fill(titleText)
+    await page.getByPlaceholder("输入自定义标题…").fill(titleText)
+    await page.getByRole("button", { name: "下一步" }).click()
+
+    // Step 5: voice
+    await expect(page.getByRole("heading", { name: /选择配音/ })).toBeVisible()
+    const firstVoiceCard = page.locator(".xx-voice-choice-item").first()
+    await firstVoiceCard.click()
     await page.getByRole("button", { name: "下一步" }).click()
 
     // Step 6: cover (默认 AI 智能选帧模式，直接下一步)
-    await expect(page.getByRole("heading", { name: /选择封面/ })).toBeVisible({ timeout: 15000 })
+    await expect(page.getByRole("heading", { name: /选择封面/ })).toBeVisible()
     await page.getByRole("button", { name: "下一步" }).click()
 
     // Step 7: confirm and generate
     await expect(page.getByRole("heading", { name: /确认生成/ })).toBeVisible()
 
     // Wait for generation API to be called
-    // 确认生成走新流程：POST /tasks/{taskId}/confirm（复用预览产物）
-    // 或旧流程：POST /editor/generate（向后兼容）
+    // 新架构：GET 草稿自动创建 → PUT 更新内容 → POST /generate 触发生成
+    // 等 generate 接口返回，确认生成流程启动
     const generatePromise = page.waitForResponse(
       (response) => {
         const url = response.url()
         const path = new URL(url).pathname
-        return (
-          response.request().method() === "POST" &&
-          (path.endsWith("/confirm") || path.endsWith("/editor/generate"))
-        )
+        return response.request().method() === "POST" && path.endsWith("/editor/generate")
       },
       { timeout: 30_000 },
     )
@@ -255,15 +246,10 @@ test.describe("Core generation flow", () => {
         `[E2E DEBUG] 触发生成接口失败: status=${genResp.status()} url=${genResp.url()} body=${body.slice(0, 500)}`,
       )
     }
-    // Generate API may return 400 in test env if template has no ready segments
-    // That is OK for a wizard flow smoke test
-    if (genResp.ok()) {
-      const genData = (await genResp.json()) as { plan_id: string; generation_task_id: string }
-      expect(genData.plan_id).toBeTruthy()
-      expect(genData.generation_task_id).toBeTruthy()
-    } else {
-      console.log(`[E2E] Generate API returned ${genResp.status()}, wizard flow test still passes`)
-    }
+    expect(genResp.ok()).toBeTruthy()
+    const genData = (await genResp.json()) as { plan_id: string; generation_task_id: string }
+    expect(genData.plan_id).toBeTruthy()
+    expect(genData.generation_task_id).toBeTruthy()
 
     // Generation may fail in test env (no worker), that's OK
     // Just verify the flow started - check page shows generation-related UI

apps/web/package-lock.json

@@ -1847,7 +1847,7 @@
     },
     "node_modules/@testing-library/dom": {
       "version": "10.4.1",
-      "resolved": "https://registry.npmmirror.com/@testing-library/dom/-/dom-10.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
       "dev": true,
       "license": "MIT",
@@ -1937,7 +1937,7 @@
     },
     "node_modules/@types/aria-query": {
       "version": "5.0.4",
-      "resolved": "https://registry.npmmirror.com/@types/aria-query/-/aria-query-5.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
       "dev": true,
       "license": "MIT",
@@ -3112,7 +3112,7 @@
     },
     "node_modules/dom-accessibility-api": {
       "version": "0.5.16",
-      "resolved": "https://registry.npmmirror.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
       "dev": true,
       "license": "MIT",
@@ -4028,6 +4028,18 @@
         "node": ">= 4"
       }
     },
+    "node_modules/immer": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.2.0.tgz",
+      "integrity": "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
     "node_modules/import-fresh": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
@@ -4456,7 +4468,7 @@
     },
     "node_modules/lz-string": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmmirror.com/lz-string/-/lz-string-1.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
       "license": "MIT",
@@ -4998,7 +5010,7 @@
     },
     "node_modules/pretty-format": {
       "version": "27.5.1",
-      "resolved": "https://registry.npmmirror.com/pretty-format/-/pretty-format-27.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dev": true,
       "license": "MIT",
@@ -5014,7 +5026,7 @@
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
@@ -5026,6 +5038,14 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/pretty-format/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/proxy-from-env": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
@@ -5723,14 +5743,6 @@
         "react": "^18.3.1"
       }
     },
-    "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmmirror.com/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/react-refresh": {
       "version": "0.17.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",

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

@@ -1,53 +0,0 @@
-/**
- * 封面模板 CRUD API
- * 后端路由: /api/v1/cover-templates
- */
-import apiClient from "./client"
-import type { CoverTemplate } from "@/pages/editing-planner/types"
-
-export interface CoverTemplateListResponse {
-  items: CoverTemplate[]
-  total: number
-}
-
-export interface CoverTemplateCreateRequest {
-  name: string
-  config?: {
-    background_enabled?: boolean
-    background_color?: string
-    portrait_enabled?: boolean
-    title_text?: string
-    subtitle_text?: string
-    mask_enabled?: boolean
-  }
-}
-
-export type CoverTemplateUpdateRequest = Partial<CoverTemplateCreateRequest>
-
-/** 获取封面模板列表 */
-export async function fetchCoverTemplates(): Promise<CoverTemplateListResponse> {
-  const response = await apiClient.get<CoverTemplateListResponse>("/cover-templates")
-  return response.data
-}
-
-/** 创建封面模板 */
-export async function createCoverTemplate(
-  data: CoverTemplateCreateRequest,
-): Promise<CoverTemplate> {
-  const response = await apiClient.post<CoverTemplate>("/cover-templates", data)
-  return response.data
-}
-
-/** 更新封面模板 */
-export async function updateCoverTemplate(
-  id: string,
-  data: CoverTemplateUpdateRequest,
-): Promise<CoverTemplate> {
-  const response = await apiClient.put<CoverTemplate>(`/cover-templates/${id}`, data)
-  return response.data
-}
-
-/** 删除封面模板（系统模板不可删） */
-export async function deleteCoverTemplate(id: string): Promise<void> {
-  await apiClient.delete(`/cover-templates/${id}`)
-}

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

@@ -1,14 +0,0 @@
-import apiClient from "../client"
-import type { ConfirmGenerationRequest, ConfirmGenerationResponse } from "./types"
-
-/** 确认生成 — 基于预览任务创建正式生成任务 */
-export const confirmGeneration = async (
-  taskId: string,
-  params: ConfirmGenerationRequest,
-): Promise<ConfirmGenerationResponse> => {
-  const response = await apiClient.post<ConfirmGenerationResponse>(
-    `/tasks/${taskId}/confirm`,
-    params,
-  )
-  return response.data
-}

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

@@ -3,10 +3,6 @@ export type {
   CreatePreviewRequest,
   CreatePreviewResponse,
   PreviewTaskResponse,
-  ConfirmGenerationRequest,
-  ConfirmGenerationResponse,
-  ConfirmGenerationTaskItem,
 } from "./types"
 
 export { createPreview, getPreviewStatus } from "./preview"
-export { confirmGeneration } from "./confirm"

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

@@ -5,11 +5,8 @@ export type PreviewStatus = "pending" | "generating" | "completed" | "failed" |
 export interface CreatePreviewRequest {
   template_id: string
   asset_ids: string[]
-  source_edit_plan_id?: string
   title_ids?: string[]
   voice_ids?: string[]
-  /** 配音素材库ID（用户上传的音频或AI配音），对应配音选择页面选择的配音素材 */
-  voice_library_id?: string
   video_title?: string
   duration?: number
   video_ratio?: string
@@ -48,47 +45,3 @@ export interface PreviewTaskResponse {
   finished_at?: string
   generate_duration?: number
 }
-
-/** 确认生成请求体 — 基于预览任务创建正式生成任务 */
-export interface ConfirmGenerationRequest {
-  /** 输出视频宽度，默认 1080 */
-  output_width?: number
-  /** 输出视频高度，默认 1920 */
-  output_height?: number
-  /** 自定义封面图片 URL */
-  cover_url?: string
-  /** 自定义视频标题 */
-  custom_title?: string
-}
-
-/** 确认生成响应 */
-export interface ConfirmGenerationResponse {
-  items: ConfirmGenerationTaskItem[]
-  total: number
-}
-
-/** 确认生成返回的任务项 */
-export interface ConfirmGenerationTaskItem {
-  id: string
-  project_id: string
-  asset_library_id: string
-  strategy_id: string
-  voice_library_id: string
-  template_id: string
-  asset_ids: string[]
-  title_ids: string[]
-  voice_ids: string[]
-  source_edit_plan_id: string
-  asset_select_mode: string
-  batch_id: string
-  is_preview: boolean
-  source_task_id: string
-  output_width: number
-  output_height: number
-  cover_url: string
-  custom_title: string
-  status: string
-  progress: number
-  result_count: number
-  error_message: string
-}

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

@@ -23,8 +23,6 @@ export async function generateCover(
   templateId: string,
   data: GenerateCoverRequest,
 ): Promise<GenerateCoverResponse> {
-  const response = await apiClient.post(`/templates/${templateId}/editor/generate-cover`, data, {
-    timeout: 180000, // 封面生成涉及 MediaKit 抽帧，最长 180 秒
-  })
+  const response = await apiClient.post(`/templates/${templateId}/editor/generate-cover`, data)
   return response.data
 }

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

@@ -288,7 +288,6 @@ export interface CoverResult {
   scheme?: string
   asset_id?: string
   frame_time?: number
-  image_url?: string
   thumbnail_url?: string
 }
 

apps/web/src/components/ui/Modal.tsx

@@ -22,10 +22,10 @@ interface ModalComponent extends React.FC<ModalProps> {
   warning: (config: ModalFuncProps) => ReturnType<typeof AntModal.warning>
 }
 
-const Modal: ModalComponent = ({ className, v21 = true, centered = true, children, ...rest }) => {
+const Modal: ModalComponent = ({ className, v21 = true, children, ...rest }) => {
   const v21Class = classNames(v21 && "xx-modal", className)
   return (
-    <AntModal className={v21Class} centered={centered} {...rest}>
+    <AntModal className={v21Class} {...rest}>
       {children}
     </AntModal>
   )

apps/web/src/pages/assets/assets.css

@@ -21,7 +21,6 @@
   grid-template-columns: 260px 1fr;
   gap: 20px;
   align-items: start;
-  overflow: visible;
 }
 
 /* ============================================================
@@ -33,7 +32,6 @@
   gap: var(--space-sm);
   position: sticky;
   top: var(--space-md);
-  align-self: start;
 }
 
 .xx-asset-library-item {

apps/web/src/pages/assets/components/BatchClassifyModal.tsx

@@ -1,6 +1,5 @@
 import React from "react"
-import { Select as AntSelect } from "antd"
-import Modal from "@/components/ui/Modal"
+import { Modal as AntModal, Select as AntSelect } from "antd"
 import { CATEGORY_OPTIONS } from "@/pages/assets/constants"
 
 /* ============================================================
@@ -25,7 +24,7 @@ const BatchClassifyModal: React.FC<BatchClassifyModalProps> = ({
   onCategoryChange,
   confirmLoading,
 }) => (
-  <Modal
+  <AntModal
     title={`批量改分类（${selectedCount} 个素材）`}
     open={open}
     onCancel={onCancel}
@@ -44,7 +43,7 @@ const BatchClassifyModal: React.FC<BatchClassifyModalProps> = ({
         options={CATEGORY_OPTIONS}
       />
     </div>
-  </Modal>
+  </AntModal>
 )
 
 export default BatchClassifyModal

apps/web/src/pages/assets/components/PlayModal.tsx

@@ -1,5 +1,5 @@
 import React from "react"
-import Modal from "@/components/ui/Modal"
+import { Modal as AntModal } from "antd"
 import type { AssetItem } from "@/pages/assets/types"
 
 /* ============================================================
@@ -12,7 +12,7 @@ export interface PlayModalProps {
 }
 
 const PlayModal: React.FC<PlayModalProps> = ({ open, asset, onClose }) => (
-  <Modal
+  <AntModal
     title={asset?.name ?? "播放"}
     open={open}
     onCancel={onClose}
@@ -28,7 +28,7 @@ const PlayModal: React.FC<PlayModalProps> = ({ open, asset, onClose }) => (
         <p className="xx-asset-empty-fallback-id">素材 ID: {asset?.id}</p>
       </div>
     )}
-  </Modal>
+  </AntModal>
 )
 
 export default PlayModal

apps/web/src/pages/assets/components/ResultDrawer.tsx

@@ -14,13 +14,7 @@ export interface ResultDrawerProps {
 }
 
 const ResultDrawer: React.FC<ResultDrawerProps> = ({ open, title, result, onClose }) => (
-  <Drawer
-    title={`${title} — 操作结果`}
-    open={open}
-    onClose={onClose}
-    width={420}
-    styles={{ wrapper: { maxWidth: "100vw" } }}
-  >
+  <Drawer title={`${title} — 操作结果`} open={open} onClose={onClose} width={420}>
     {result && (
       <div className="xx-batch-result">
         <div className="xx-batch-result-summary">

apps/web/src/pages/editing-planner/EditingPlanner.css

@@ -14,7 +14,7 @@
 .ep-v8-root {
   display: flex;
   flex-direction: column;
-  height: calc(100vh - 68px);
+  height: 100vh;
   background: var(--bg-secondary, #f8fafc);
   color: var(--text-primary, #1e293b);
   font-family: "PingFang SC", "Microsoft YaHei", sans-serif;
@@ -6408,35 +6408,3 @@
   padding: 16px;
   text-align: center;
 }
-
-/* ═══ 封面 AI 生成按钮 ═══ */
-.cover-generate-section {
-  padding: 0 16px 12px;
-}
-
-.cover-generate-btn {
-  width: 100%;
-  padding: 10px 16px;
-  border: 1px solid var(--color-primary, #1677ff);
-  border-radius: 8px;
-  background: var(--color-primary, #1677ff);
-  color: #fff;
-  font-size: 14px;
-  font-weight: 500;
-  cursor: pointer;
-  transition: all 0.2s;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-}
-
-.cover-generate-btn:hover:not(:disabled) {
-  background: var(--color-primary-hover, #4096ff);
-  border-color: var(--color-primary-hover, #4096ff);
-}
-
-.cover-generate-btn:disabled {
-  opacity: 0.6;
-  cursor: not-allowed;
-}

apps/web/src/pages/editing-planner/EditingPlanner.tsx

@@ -243,7 +243,6 @@ const EditingPlanner: React.FC = () => {
           onOpenFilterDrawer={() => drawers.setFilterDrawerOpen(true)}
           onOpenGreenScreenDrawer={() => drawers.setChromaKeyDrawerOpen(true)}
           onOpenStickerDrawer={() => drawers.setStickerDrawerOpen(true)}
-          onOpenCoverDrawer={() => drawers.setCoverDrawerOpen(true)}
           clips={clips}
           selectedClipId={clipOps.selectedClipId}
           onClipSelect={clipOps.handleClipSelect}
@@ -336,11 +335,6 @@ const EditingPlanner: React.FC = () => {
         stickerSettings={stickerSettings}
         onStickerChange={setStickerSettings}
         onCloseStickerDrawer={() => drawers.setStickerDrawerOpen(false)}
-        coverDrawerOpen={drawers.coverDrawerOpen}
-        onCloseCoverDrawer={() => drawers.setCoverDrawerOpen(false)}
-        coverConfig={coverConfig}
-        setCoverConfig={setCoverConfig}
-        templateId={urlTemplateId}
       />
     </div>
   )

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

@@ -35,7 +35,6 @@ const ClipPropertiesPanel: React.FC<ClipPropertiesPanelProps> = ({
   onOpenFilterDrawer,
   onOpenGreenScreenDrawer,
   onOpenStickerDrawer,
-  onOpenCoverDrawer,
 }) => {
   const { previewingId, handlePreviewVoice, stopPreview } = useVoicePreview()
 
@@ -141,21 +140,6 @@ const ClipPropertiesPanel: React.FC<ClipPropertiesPanelProps> = ({
         )}
       </div>
 
-      {/* ═══ 封面设置 ═══ */}
-      <div className="ep-settings-section">
-        <div className="ep-section-title">
-          <span className="ep-section-icon">🖼️</span>
-          封面设置
-        </div>
-        {onOpenCoverDrawer && (
-          <button className="ep-advanced-btn" onClick={onOpenCoverDrawer}>
-            <span className="ep-advanced-btn-icon">🖼️</span>
-            <span className="ep-advanced-btn-label">配置视频封面</span>
-            <span className="ep-advanced-btn-arrow">›</span>
-          </button>
-        )}
-      </div>
-
       {/* ═══ 片段详情（选中时显示） ═══ */}
       {selectedClip && (
         <ClipDetailSection

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

@@ -10,7 +10,6 @@ import PipConfigPanel from "./PipConfigPanel"
 import FilterPanel from "./FilterPanel"
 import GreenScreenPanel from "./GreenScreenPanel"
 import StickerPanel from "./StickerPanel"
-import CoverSelector from "./CoverSelector"
 import type {
   ClipData,
   TransitionConfig,
@@ -24,7 +23,6 @@ import type {
   StickerConfig,
 } from "../types"
 import type { SubtitleStyleConfig } from "../types/subtitle"
-import type { CoverConfig } from "../types/cover"
 import type { BgmMixConfig } from "@/api/bgm"
 import { DEFAULT_TRANSITION, DEFAULT_SPEED, DEFAULT_TTS_CONFIG } from "../types"
 
@@ -87,12 +85,6 @@ interface EditorDrawersProps {
   stickerSettings: StickerConfig
   onStickerChange: (config: StickerConfig) => void
   onCloseStickerDrawer: () => void
-  // 封面
-  coverDrawerOpen: boolean
-  onCloseCoverDrawer: () => void
-  coverConfig: CoverConfig
-  setCoverConfig: (config: CoverConfig | ((prev: CoverConfig) => CoverConfig)) => void
-  templateId: string
 }
 
 const EditorDrawers: React.FC<EditorDrawersProps> = ({
@@ -143,11 +135,6 @@ const EditorDrawers: React.FC<EditorDrawersProps> = ({
   stickerSettings,
   onStickerChange,
   onCloseStickerDrawer,
-  coverDrawerOpen,
-  onCloseCoverDrawer,
-  coverConfig,
-  setCoverConfig,
-  templateId,
 }) => {
   const transitionConfig = transitionTargetClipId
     ? (clips.find((c) => c.id === transitionTargetClipId)?.transition ?? DEFAULT_TRANSITION)
@@ -252,16 +239,6 @@ const EditorDrawers: React.FC<EditorDrawersProps> = ({
         onChange={onStickerChange}
         totalDuration={totalDuration}
       />
-
-      {/* 封面选择器 Drawer */}
-      <CoverSelector
-        open={coverDrawerOpen}
-        onClose={onCloseCoverDrawer}
-        config={coverConfig}
-        onChange={setCoverConfig}
-        totalDuration={totalDuration}
-        templateId={templateId}
-      />
     </>
   )
 }

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

@@ -56,7 +56,6 @@ const FilterPanel: React.FC<FilterPanelProps> = ({ open, onClose, config, onChan
       title="滤镜调色"
       placement="right"
       width={420}
-      styles={{ wrapper: { maxWidth: "100vw" } }}
       open={open}
       onClose={onClose}
       className="filter-panel-drawer"

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

@@ -48,7 +48,6 @@ const GreenScreenPanel: React.FC<GreenScreenPanelProps> = ({ open, onClose, conf
       title="绿幕抠像"
       placement="right"
       width={420}
-      styles={{ wrapper: { maxWidth: "100vw" } }}
       open={open}
       onClose={onClose}
       className="green-screen-panel-drawer"

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

@@ -63,7 +63,6 @@ const IntroOutroPanel: React.FC<IntroOutroPanelProps> = ({ open, onClose, config
       title="🎬 片头片尾设置"
       placement="right"
       width={420}
-      styles={{ wrapper: { maxWidth: "100vw" } }}
       open={open}
       onClose={onClose}
       className="intro-outro-panel-drawer"

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

@@ -35,7 +35,6 @@ interface RightPanelProps {
   onOpenFilterDrawer: () => void
   onOpenGreenScreenDrawer: () => void
   onOpenStickerDrawer: () => void
-  onOpenCoverDrawer: () => void
   // 片段 tab
   clips: ClipData[]
   selectedClipId: string | null
@@ -73,7 +72,6 @@ const RightPanel: React.FC<RightPanelProps> = ({
   onOpenFilterDrawer,
   onOpenGreenScreenDrawer,
   onOpenStickerDrawer,
-  onOpenCoverDrawer,
   clips,
   selectedClipId,
   onClipSelect,
@@ -144,7 +142,6 @@ const RightPanel: React.FC<RightPanelProps> = ({
                 onOpenFilterDrawer={onOpenFilterDrawer}
                 onOpenGreenScreenDrawer={onOpenGreenScreenDrawer}
                 onOpenStickerDrawer={onOpenStickerDrawer}
-                onOpenCoverDrawer={onOpenCoverDrawer}
               />
             )
           })()}

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

@@ -74,7 +74,6 @@ const SpeedPanel: React.FC<SpeedPanelProps> = ({ open, onClose, config, onChange
       title="⚡ 片段调速"
       placement="right"
       width={380}
-      styles={{ wrapper: { maxWidth: "100vw" } }}
       open={open}
       onClose={onClose}
       className="speed-panel-drawer"

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

@@ -34,7 +34,6 @@ const SubtitleStylePanel: React.FC<SubtitleStylePanelProps> = ({
       title="💬 字幕样式配置"
       placement="right"
       width={380}
-      styles={{ wrapper: { maxWidth: "100vw" } }}
       open={open}
       onClose={onClose}
       className="subtitle-style-drawer"

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

@@ -53,7 +53,6 @@ const TransitionSelector: React.FC<TransitionSelectorProps> = ({
       title={`🎬 ${title}`}
       placement="right"
       width={480}
-      styles={{ wrapper: { maxWidth: "100vw" } }}
       open={open}
       onClose={onClose}
       className="transition-selector-drawer"

apps/web/src/pages/editing-planner/components/TtsPanel/hooks/useTtsPanel.ts

@@ -60,6 +60,7 @@ export const useTtsPanel = ({ open, config, onChange, onClose }: UseTtsPanelOpti
     return () => {
       active = false
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [open])
 
   /* ── 组件卸载时清理音频资源 ── */

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

@@ -42,7 +42,6 @@ const WatermarkPanel: React.FC<WatermarkPanelProps> = ({ open, onClose, config,
       title="🔖 水印设置"
       placement="right"
       width={400}
-      styles={{ wrapper: { maxWidth: "100vw" } }}
       open={open}
       onClose={onClose}
       className="watermark-panel-drawer"

apps/web/src/pages/editing-planner/components/cover-selector/index.tsx

@@ -2,9 +2,8 @@
  * 封面选择器
  * 抽帧选封面 + 上传自定义封面 + 智能封面推荐
  */
-import React, { useState } from "react"
-import { Drawer, Modal, Spin, message } from "antd"
-import { generateCover } from "@/api/template-editor/aiFeatures"
+import React from "react"
+import { Drawer } from "antd"
 import type { CoverConfig, CoverMode } from "../../types"
 import { useCoverSelector, MODE_LABELS, MODE_ICONS } from "./useCoverSelector"
 import { CoverAutoMode, CoverFrameMode, CoverUploadMode } from "./CoverModePanels"
@@ -15,7 +14,6 @@ interface CoverSelectorProps {
   config: CoverConfig
   onChange: (config: CoverConfig) => void
   totalDuration: number
-  templateId: string
 }
 
 const CoverSelector: React.FC<CoverSelectorProps> = ({
@@ -24,7 +22,6 @@ const CoverSelector: React.FC<CoverSelectorProps> = ({
   config,
   onChange,
   totalDuration,
-  templateId,
 }) => {
   const {
     fileInputRef,
@@ -39,31 +36,6 @@ const CoverSelector: React.FC<CoverSelectorProps> = ({
     formatTime,
   } = useCoverSelector({ config, onChange })
 
-  const [generating, setGenerating] = useState(false)
-
-  const handleGenerateCover = async () => {
-    if (!templateId) {
-      message.error("请先保存模板")
-      return
-    }
-    setGenerating(true)
-    try {
-      const res = await generateCover(templateId, {
-        asset_ids: [],
-        cover_type: "ai_frame",
-      })
-      const imageUrl = res.cover?.image_url || res.cover?.thumbnail_url || ""
-      if (imageUrl) {
-        update({ upload_url: imageUrl, thumbnail_url: imageUrl })
-      }
-      message.success("封面生成成功")
-    } catch (err: any) {
-      message.error("封面生成失败: " + (err?.message || "未知错误"))
-    } finally {
-      setGenerating(false)
-    }
-  }
-
   return (
     <Drawer
       title="封面选择"
@@ -161,33 +133,12 @@ const CoverSelector: React.FC<CoverSelectorProps> = ({
         </div>
       </div>
 
-      {/* AI 生成封面按钮 */}
-      {config.enabled && config.mode === "auto" && (
-        <div className="cover-generate-section">
-          <button
-            className="cover-generate-btn"
-            onClick={handleGenerateCover}
-            disabled={generating}
-          >
-            {generating ? "生成中..." : "🤖 AI 生成封面"}
-          </button>
-        </div>
-      )}
-
       {/* 底部 */}
       <div className="cover-footer">
         <button className="cover-reset-btn" onClick={handleReset}>
           重置封面
         </button>
       </div>
-
-      {/* 生成进度弹窗 */}
-      <Modal open={generating} closable={false} footer={null} centered>
-        <div style={{ textAlign: "center", padding: "24px 0" }}>
-          <Spin size="large" />
-          <p style={{ marginTop: 16, fontSize: 14, color: "#666" }}>AI 正在生成封面，请稍候...</p>
-        </div>
-      </Modal>
     </Drawer>
   )
 }

apps/web/src/pages/editing-planner/hooks/useEditorDrawers.ts

@@ -17,7 +17,6 @@ export const useEditorDrawers = () => {
   const [filterDrawerOpen, setFilterDrawerOpen] = useState(false)
   const [chromaKeyDrawerOpen, setChromaKeyDrawerOpen] = useState(false)
   const [stickerDrawerOpen, setStickerDrawerOpen] = useState(false)
-  const [coverDrawerOpen, setCoverDrawerOpen] = useState(false)
 
   /* ── 目标片段 ID ── */
   /** 当前正在编辑转场的片段 ID（null = 全局默认转场） */
@@ -67,8 +66,6 @@ export const useEditorDrawers = () => {
     setChromaKeyDrawerOpen,
     stickerDrawerOpen,
     setStickerDrawerOpen,
-    coverDrawerOpen,
-    setCoverDrawerOpen,
     // 目标 ID
     transitionTargetClipId,
     speedTargetClipId,

apps/web/src/pages/editing-planner/types/clipProperties.ts

@@ -68,5 +68,4 @@ export interface ClipPropertiesPanelProps {
   /** 打开贴纸面板 Drawer */
   onOpenStickerDrawer?: () => void
   /** 打开封面选择器 Drawer */
-  onOpenCoverDrawer?: () => void
 }

apps/web/src/pages/editing-planner/types/cover.ts

@@ -30,20 +30,3 @@ export const DEFAULT_COVER_CONFIG: CoverConfig = {
   ai_suggested_time: null,
   thumbnail_url: "",
 }
-
-/** 封面模板 */
-export interface CoverTemplate {
-  id: string
-  name: string
-  thumbnail_url: string
-  is_system: boolean
-  created_at: string
-  config?: {
-    background_enabled?: boolean
-    background_color?: string
-    portrait_enabled?: boolean
-    title_text?: string
-    subtitle_text?: string
-    mask_enabled?: boolean
-  }
-}

apps/web/src/pages/editing-planner/types/index.ts

@@ -72,7 +72,7 @@ export {
 } from "./sticker"
 
 /* 封面 */
-export { type CoverMode, type CoverConfig, DEFAULT_COVER_CONFIG, type CoverTemplate } from "./cover"
+export { type CoverMode, type CoverConfig, DEFAULT_COVER_CONFIG } from "./cover"
 
 /* 片段数据 */
 export { type ClipType, type ClipData } from "./clip"

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

@@ -1,6 +1,6 @@
 /**
- * 智能剪辑页面 — V22 多预览 + 配音前置
- * 7 步向导：选择模板 → 选择素材 → 选择配音 → 生成预览 → 选择标题 → 选择封面 → 确认生成
+ * 智能剪辑页面 — V21 原型 1:1 还原
+ * 7 步向导：选择模板 → 选择素材 → 生成预览 → 选择标题 → 选择配音 → 选择封面 → 确认生成
  * 左右布局：左侧 generate-form + 右侧 generate-preview
  * 主组件仅保留整体布局与事件编排
  * 状态管理 → hooks/useGenerateFormState
@@ -9,7 +9,7 @@
  * 底部按钮 → components/GenerateStepActions
  * 生成核心逻辑 → hooks/useGenerateVideo
  */
-import React, { useState, useMemo } from "react"
+import React from "react"
 import { Modal, message } from "antd"
 import { useNavigate } from "react-router-dom"
 import type { VoiceClone } from "@/api/voice-clone"
@@ -24,7 +24,7 @@ import GenerateStepActions from "./components/GenerateStepActions"
 import { useGenerateFormState } from "./hooks/useGenerateFormState"
 import { useStepNavigation } from "./hooks/useStepNavigation"
 import { useGenerateVideo } from "./hooks/useGenerateVideo"
-import { useStep4Preview } from "./hooks/useStep4Preview"
+import { useStep3Preview } from "./hooks/useStep3Preview"
 import "./generate.css"
 
 const GeneratePage: React.FC = () => {
@@ -80,24 +80,8 @@ const GeneratePage: React.FC = () => {
     message.success("音色克隆成功！")
   }
 
-  /* ── 预览数量（多预览） ── */
-  const [previewCount, setPreviewCount] = useState(1)
-
-  /* ── 根据 voiceMode 构建 voiceIds 传给预览接口 ── */
-  /* selectedVoice / selectedClonedVoice 均为 string 类型（voice ID），
-     见 useGenerateFormState 返回值类型定义 */
-  const previewVoiceIds = useMemo((): string[] => {
-    if (voiceMode === "clone") {
-      const id: string = selectedClonedVoice
-      return id ? [id] : []
-    }
-    // preset / custom 模式
-    const id: string = selectedVoice
-    return id ? [id] : []
-  }, [voiceMode, selectedVoice, selectedClonedVoice])
-
-  /* ── Step4 预览生成（多预览 + voice_ids） ── */
-  const step4Preview = useStep4Preview({
+  /* ── Step3 预览生成 ── */
+  const step3Preview = useStep3Preview({
     templates: userTemplates,
     selectedTemplate,
     materialMode,
@@ -105,9 +89,6 @@ const GeneratePage: React.FC = () => {
     smartSelectedIds,
     duration,
     videoRatio,
-    voiceIds: previewVoiceIds,
-    voiceLibraryId: selectedVoice || undefined,
-    previewCount,
   })
 
   /* ── 步骤导航 ── */
@@ -119,7 +100,7 @@ const GeneratePage: React.FC = () => {
     selectedMaterials,
     smartSelectedIds,
     titleSettings,
-    previewReady: step4Preview.canProceed,
+    previewReady: step3Preview.canProceed,
   })
 
   /* ── 视频生成核心逻辑 ── */
@@ -150,7 +131,6 @@ const GeneratePage: React.FC = () => {
     autoSubtitles,
     bgm,
     generateCount,
-    previewTaskId: step4Preview.selectedTaskId,
   })
 
   /* ================================================================
@@ -207,20 +187,14 @@ const GeneratePage: React.FC = () => {
             onDismissError={handleDismissError}
             presetVoices={presetVoices}
             videoRatio={videoRatio}
-            /* Step4 多预览 */
-            previewCount={previewCount}
-            onPreviewCountChange={setPreviewCount}
-            previewItems={step4Preview.items}
-            previewSelectedIndex={step4Preview.selectedIndex}
-            onSelectPreview={step4Preview.setSelectedIndex}
-            previewOverallStatus={step4Preview.previewStatus}
-            previewOverallError={step4Preview.previewError}
-            previewOverallProgress={step4Preview.progress}
-            previewAnyGenerating={step4Preview.anyGenerating}
-            previewTemplateName={step4Preview.templateName}
-            previewMaterialCount={step4Preview.materialCount}
-            onGeneratePreview={step4Preview.generatePreview}
-            onRegeneratePreview={step4Preview.regeneratePreview}
+            previewStatus={step3Preview.previewStatus}
+            previewResult={step3Preview.previewResult}
+            previewError={step3Preview.previewError}
+            previewTemplateName={step3Preview.templateName}
+            previewMaterialCount={step3Preview.materialCount}
+            previewProgress={step3Preview.progress}
+            onGeneratePreview={step3Preview.generatePreview}
+            onRegeneratePreview={step3Preview.regeneratePreview}
           />
 
           <GenerateStepActions
@@ -236,37 +210,35 @@ const GeneratePage: React.FC = () => {
 
         {/* ════ 右侧：预览 + 生成结果 ════ */}
         <div className="xx-generate-right-col">
-          {/* 预览视频面板（Step4+ 常驻，展示选中的预览） */}
-          {currentStep >= 4 && (
+          {/* 预览视频面板（Step3+ 常驻） */}
+          {currentStep >= 3 && (
             <PreviewVideoPanel
-              previewStatus={step4Preview.previewStatus}
-              previewResult={step4Preview.previewResult}
-              previewError={step4Preview.previewError}
-              progress={step4Preview.progress}
+              previewStatus={step3Preview.previewStatus}
+              previewResult={step3Preview.previewResult}
+              previewError={step3Preview.previewError}
+              progress={step3Preview.progress}
               videoRatio={videoRatio}
-              onRegenerate={step4Preview.regeneratePreview}
+              onRegenerate={step3Preview.regeneratePreview}
               titleText={titleSettings.title}
-              titleSettings={currentStep >= 5 ? titleSettings : undefined}
+              titleSettings={titleSettings}
             />
           )}
 
-          {/* 正式生成结果（Step5+ 才显示） */}
-          {currentStep >= 5 && (
-            <GenerateResultPanel
-              generated={generated}
-              generating={generating}
-              progress={progress}
-              generateError={generateError}
-              generatedVideos={generatedVideos}
-              onVideoPreview={(video) => {
-                setPreviewVideo(video)
-                setPreviewModalOpen(true)
-              }}
-              onDownload={handleDownload}
-              onShare={handleShare}
-              onGoToLibrary={() => navigate("/app/products")}
-            />
-          )}
+          {/* 正式生成结果 */}
+          <GenerateResultPanel
+            generated={generated}
+            generating={generating}
+            progress={progress}
+            generateError={generateError}
+            generatedVideos={generatedVideos}
+            onVideoPreview={(video) => {
+              setPreviewVideo(video)
+              setPreviewModalOpen(true)
+            }}
+            onDownload={handleDownload}
+            onShare={handleShare}
+            onGoToLibrary={() => navigate("/app/products")}
+          />
         </div>
       </div>
 

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

@@ -1,7 +1,6 @@
 /**
  * GeneratePage 步骤内容渲染
  * 根据当前步骤渲染对应的 Step 组件
- * 步骤顺序：模板(1) → 素材(2) → 配音(3) → 预览(4) → 标题(5) → 封面(6) → 确认(7)
  */
 import React from "react"
 import type { EditingTemplate } from "@/api/editing-planner"
@@ -9,12 +8,12 @@ import type { PresetVoiceItem } from "@/api/voices"
 import type { VoiceClone } from "@/api/voice-clone"
 import type { CoverConfig } from "../../editing-planner/types"
 import type { TitleSettings } from "../types"
-import type { PreviewItem, PreviewStatus } from "../hooks/useStep4Preview"
+import type { PreviewResult, PreviewStatus } from "../hooks/useStep3Preview"
 import Step1TemplateSelect from "../components/Step1TemplateSelect"
 import Step2MaterialSelect from "../components/Step2MaterialSelect"
-import Step3VoiceSelect from "../components/Step5VoiceSelect"
-import Step4GeneratePreview from "../components/Step4GeneratePreview"
-import Step5TitleSettings from "../components/Step4TitleSettings"
+import Step3GeneratePreview from "../components/Step3GeneratePreview"
+import Step4TitleSettings from "../components/Step4TitleSettings"
+import Step5VoiceSelect from "../components/Step5VoiceSelect"
 import Step6CoverSettings from "../components/Step6CoverSettings"
 import Step7ConfirmGenerate from "../components/Step7ConfirmGenerate"
 import type { GeneratedVideo } from "@/api/template-editor"
@@ -64,18 +63,13 @@ export interface GenerateStepContentProps {
   /* 其他 */
   presetVoices: PresetVoiceItem[]
   videoRatio: string
-  /* Step4 预览（多预览） */
-  previewCount: number
-  onPreviewCountChange: (count: number) => void
-  previewItems: PreviewItem[]
-  previewSelectedIndex: number
-  onSelectPreview: (index: number) => void
-  previewOverallStatus: PreviewStatus
-  previewOverallError: string
-  previewOverallProgress: number
-  previewAnyGenerating: boolean
+  /* Step3 预览 */
+  previewStatus: PreviewStatus
+  previewResult: PreviewResult | null
+  previewError: string
   previewTemplateName: string
   previewMaterialCount: string
+  previewProgress: number
   onGeneratePreview: () => void
   onRegeneratePreview: () => void
 }
@@ -100,8 +94,14 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
     selectedVoice,
     onSelectedVoiceChange,
     voiceMode,
+    onVoiceModeChange,
     selectedClonedVoice,
+    onSelectedClonedVoiceChange,
     clonedVoices,
+    addClone,
+    hasProcessing,
+    cloneModalOpen,
+    onCloneModalOpenChange,
     generateCount,
     onGenerateCountChange,
     generating,
@@ -113,17 +113,12 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
     onDismissError,
     presetVoices,
     videoRatio,
-    previewCount,
-    onPreviewCountChange,
-    previewItems,
-    previewSelectedIndex,
-    onSelectPreview,
-    previewOverallStatus,
-    previewOverallError,
-    previewOverallProgress,
-    previewAnyGenerating,
+    previewStatus,
+    previewResult,
+    previewError,
     previewTemplateName,
     previewMaterialCount,
+    previewProgress,
     onGeneratePreview,
     onRegeneratePreview,
   } = props
@@ -150,46 +145,49 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
       )
     case 3:
       return (
-        <Step3VoiceSelect
-          selectedVoice={selectedVoice}
-          onSelectedVoiceChange={onSelectedVoiceChange}
-        />
-      )
-    case 4:
-      return (
-        <Step4GeneratePreview
+        <Step3GeneratePreview
           templateName={previewTemplateName}
           materialCount={previewMaterialCount}
           duration={duration}
           videoRatio={videoRatio}
-          previewCount={previewCount}
-          onPreviewCountChange={onPreviewCountChange}
-          items={previewItems}
-          selectedIndex={previewSelectedIndex}
-          onSelectPreview={onSelectPreview}
-          overallStatus={previewOverallStatus}
-          overallError={previewOverallError}
-          overallProgress={previewOverallProgress}
-          anyGenerating={previewAnyGenerating}
+          previewStatus={previewStatus}
+          previewResult={previewResult}
+          previewError={previewError}
+          progress={previewProgress}
           onGeneratePreview={onGeneratePreview}
           onRegeneratePreview={onRegeneratePreview}
         />
       )
-    case 5:
+    case 4:
       return (
-        <Step5TitleSettings
+        <Step4TitleSettings
           titleSettings={titleSettings}
           onTitleSettingsChange={onTitleSettingsChange}
         />
       )
+    case 5:
+      return (
+        <Step5VoiceSelect
+          selectedVoice={selectedVoice}
+          onSelectedVoiceChange={onSelectedVoiceChange}
+          voiceMode={voiceMode}
+          onVoiceModeChange={onVoiceModeChange}
+          selectedClonedVoice={selectedClonedVoice}
+          onSelectedClonedVoiceChange={onSelectedClonedVoiceChange}
+          clonedVoices={clonedVoices}
+          addClone={addClone}
+          hasProcessing={hasProcessing}
+          cloneModalOpen={cloneModalOpen}
+          onCloneModalOpenChange={onCloneModalOpenChange}
+          titleText={titleSettings.title}
+        />
+      )
     case 6:
       return (
         <Step6CoverSettings
           coverSettings={coverSettings}
           onCoverSettingsChange={onCoverSettingsChange}
           duration={duration}
-          assetIds={materialMode === "auto" ? smartSelectedIds : selectedMaterials}
-          selectedTemplate={selectedTemplate}
         />
       )
     case 7:

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

@@ -1,19 +1,14 @@
 /**
  * 右侧预览视频面板
- * Step4 生成预览后常驻显示预览视频
- * Step5+ 用 Canvas 绘制标题预览（替代 CSS overlay，与 ASS 渲染行为一致）
+ * Step3 生成预览后常驻显示预览视频
+ * Step4+ 用 Canvas 绘制标题预览（替代 CSS overlay，与 ASS 渲染行为一致）
  *
  * 设计说明：标题预览仅在有视频时显示（叠加在视频画面上方）。
  * 无视频状态（idle/loading/error）下不再单独显示标题预览，这是有意为之的设计简化。
- *
- * Canvas 居中修复说明：
- * Canvas 的 CSS 位置和尺寸直接匹配视频实际渲染区域（通过 getBoundingClientRect），
- * 绘制坐标系基于 Canvas 自身尺寸，x = w/2 即可实现水平居中，
- * 避免容器与视频尺寸不一致时浏览器拉伸 Canvas 导致居中偏移。
  */
 import React, { useRef, useEffect, useCallback } from "react"
 import { PlayCircleOutlined, LoadingOutlined } from "@ant-design/icons"
-import type { PreviewResult, PreviewStatus } from "../hooks/useStep4Preview"
+import type { PreviewResult, PreviewStatus } from "../hooks/useStep3Preview"
 import type { TitleSettings } from "../types"
 
 interface PreviewVideoPanelProps {
@@ -23,9 +18,9 @@ interface PreviewVideoPanelProps {
   progress: number
   videoRatio: string
   onRegenerate: () => void
-  /** 标题文字（Step5 起传入） */
+  /** 标题文字（Step4 起传入） */
   titleText?: string
-  /** 标题样式设置（Step5 起传入） */
+  /** 标题样式设置（Step4 起传入） */
   titleSettings?: TitleSettings
 }
 
@@ -53,30 +48,32 @@ function wrapText(ctx: CanvasRenderingContext2D, text: string, maxWidth: number)
 
 /**
  * 在 canvas 上绘制标题文字（含描边/阴影/多行居中）
- *
- * Canvas 已通过 CSS 定位到视频实际渲染位置，
- * 坐标系基于 Canvas 自身尺寸，居中直接使用 w/2。
- *
  * @param ctx canvas 上下文
- * @param w canvas CSS 宽度（= 视频渲染宽度）
- * @param h canvas CSS 高度（= 视频渲染高度）
+ * @param canvasWidth canvas CSS 宽度（绘制区域宽度）
+ * @param canvasHeight canvas CSS 高度（绘制区域高度）
  * @param text 标题文字
  * @param settings 标题样式
  * @param paddingX 左右边距（px），与 ASS 的 MarginL/MarginR 对应
  * @param position "top" | "center" | "bottom"
  * @param topOffset 顶部/底部偏移量
+ * @param offsetX 绘制区域左边缘相对于 canvas 的偏移（用于 video 居中时补偿）
+ * @param offsetY 绘制区域上边缘相对于 canvas 的偏移（用于 video 居中时补偿）
  */
 function drawTitleOnCanvas(
   ctx: CanvasRenderingContext2D,
-  w: number,
-  h: number,
+  canvasWidth: number,
+  canvasHeight: number,
   text: string,
   settings: TitleSettings,
   paddingX: number,
   position: string,
   topOffset: number,
+  offsetX = 0,
+  offsetY = 0,
 ) {
   const dpr = window.devicePixelRatio || 1
+  const w = canvasWidth
+  const h = canvasHeight
 
   // 设置 canvas 物理像素尺寸（高清屏适配）
   ctx.canvas.width = Math.round(w * dpr)
@@ -136,10 +133,10 @@ function drawTitleOnCanvas(
       break
   }
 
-  // 居中 x = w/2（Canvas 已定位到视频位置，无需额外偏移）
-  const x = w / 2
+  // 逐行绘制（offsetX/offsetY 补偿 video 在容器内的居中偏移）
+  const x = offsetX + w / 2
   lines.forEach((line, i) => {
-    const y = startY + i * lineHeight
+    const y = offsetY + startY + i * lineHeight
     if (settings.stroke) ctx.strokeText(line, x, y)
     ctx.fillText(line, x, y)
   })
@@ -169,7 +166,6 @@ export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
   const isLoading = previewStatus === "pending" || previewStatus === "generating"
   const isError = previewStatus === "error"
   const showTitlePreview = !!titleSettings
-  const videoAspectStyle = { aspectRatio: (videoRatio || "16:9").replace(":", "/") }
 
   // video 模式 refs
   const canvasRef = useRef<HTMLCanvasElement>(null)
@@ -207,13 +203,6 @@ export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
       offsetY = videoRect.top - containerRect.top
     }
 
-    // 更新 Canvas CSS 位置和尺寸，使其与视频实际渲染区域完全对齐
-    canvas.style.left = `${offsetX}px`
-    canvas.style.top = `${offsetY}px`
-    canvas.style.width = `${drawW}px`
-    canvas.style.height = `${drawH}px`
-
-    // 绘制时，坐标系基于 Canvas 自身尺寸，无需额外偏移
     drawTitleOnCanvas(
       ctx,
       drawW,
@@ -223,6 +212,8 @@ export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
       40,
       titleSettings.position,
       60,
+      offsetX,
+      offsetY,
     )
   }, [titleText, titleSettings])
 
@@ -311,7 +302,7 @@ export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
       {/* 生成中 */}
       {isLoading && (
         <div className="xx-preview-loading-panel">
-          <div className="xx-preview-video" style={videoAspectStyle}>
+          <div className="xx-preview-video">
             <div className="xx-preview-loading-center">
               <LoadingOutlined style={{ fontSize: 36, color: "#fff" }} spin />
               <p style={{ marginTop: 12, color: "rgba(255,255,255,0.8)", fontSize: 14 }}>
@@ -328,7 +319,7 @@ export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
       {/* 生成失败 */}
       {isError && (
         <div className="xx-preview-error-panel">
-          <div className="xx-preview-video xx-preview-video--error" style={videoAspectStyle}>
+          <div className="xx-preview-video xx-preview-video--error">
             <p style={{ color: "rgba(255,255,255,0.8)", fontSize: 14 }}>预览生成失败</p>
           </div>
           <p className="xx-preview-error-msg">
@@ -343,7 +334,7 @@ export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
       {/* 预览成功 + Canvas 标题叠加 */}
       {hasPreview && (
         <div ref={containerRef} style={{ position: "relative" }}>
-          <div className="xx-preview-video" style={videoAspectStyle}>
+          <div className="xx-preview-video">
             <video
               ref={videoRef}
               src={previewResult.videoUrl}

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

@@ -0,0 +1,170 @@
+/**
+ * Step 3 生成预览组件
+ * 调用后端预览生成接口，展示真实视频预览
+ */
+import React from "react"
+import {
+  CheckCircleFilled,
+  LoadingOutlined,
+  ReloadOutlined,
+  PlayCircleOutlined,
+  ExclamationCircleFilled,
+  ClockCircleOutlined,
+} from "@ant-design/icons"
+import type { PreviewResult, PreviewStatus } from "../hooks/useStep3Preview"
+
+interface Step3GeneratePreviewProps {
+  templateName: string
+  materialCount: string
+  duration: number
+  videoRatio: string
+  previewStatus: PreviewStatus
+  previewResult: PreviewResult | null
+  previewError: string
+  progress: number
+  onGeneratePreview: () => void
+  onRegeneratePreview: () => void
+}
+
+const Step3GeneratePreview: React.FC<Step3GeneratePreviewProps> = ({
+  templateName,
+  materialCount,
+  videoRatio,
+  previewStatus,
+  previewResult,
+  previewError,
+  progress,
+  onGeneratePreview,
+  onRegeneratePreview,
+}) => {
+  return (
+    <div className="xx-form-section">
+      <h3>🎬 生成预览</h3>
+
+      {/* 预览生成按钮 */}
+      {previewStatus === "idle" && (
+        <div className="xx-preview-generate-section">
+          <div className="xx-preview-generate-hint">
+            <PlayCircleOutlined style={{ fontSize: 32, color: "#3b82f6", marginBottom: 12 }} />
+            <p className="xx-preview-generate-title">一键生成剪辑预览</p>
+            <p className="xx-preview-generate-desc">
+              AI 将根据您选择的模板和素材，智能生成完整视频预览（480p 低清版）
+            </p>
+          </div>
+          <button
+            className="xx-btn xx-btn-primary xx-preview-generate-btn"
+            onClick={onGeneratePreview}
+          >
+            ✨ 生成预览
+          </button>
+        </div>
+      )}
+
+      {/* 排队中 */}
+      {previewStatus === "pending" && (
+        <div className="xx-preview-loading">
+          <ClockCircleOutlined style={{ fontSize: 32, color: "#faad14" }} spin />
+          <p className="xx-preview-loading-text">预览排队中...</p>
+          <p className="xx-preview-loading-desc">正在等待渲染资源，请稍候</p>
+        </div>
+      )}
+
+      {/* 生成中 */}
+      {previewStatus === "generating" && (
+        <div className="xx-preview-loading">
+          <LoadingOutlined style={{ fontSize: 32, color: "#3b82f6" }} spin />
+          <p className="xx-preview-loading-text">正在生成预览视频... {progress}%</p>
+          <p className="xx-preview-loading-desc">AI 正在剪辑素材并合成预览视频</p>
+          <div className="xx-preview-progress-bar">
+            <div className="xx-preview-progress-fill" style={{ width: `${progress}%` }} />
+          </div>
+        </div>
+      )}
+
+      {/* 生成失败 */}
+      {previewStatus === "error" && (
+        <div className="xx-preview-error">
+          <ExclamationCircleFilled style={{ fontSize: 28, color: "#ef4444" }} />
+          <p className="xx-preview-error-text">预览生成失败</p>
+          <p className="xx-preview-error-desc">
+            {typeof previewError === "string" && previewError ? previewError : "请稍后重试"}
+          </p>
+          <button className="xx-btn xx-btn-primary" onClick={onRegeneratePreview}>
+            <ReloadOutlined /> 重新生成
+          </button>
+        </div>
+      )}
+
+      {/* 生成成功 - 视频预览 */}
+      {previewStatus === "ready" && previewResult && (
+        <>
+          <div className="xx-preview-tip">
+            <CheckCircleFilled style={{ color: "#52c41a", marginRight: 8 }} />
+            <span>预览生成成功，确认效果后进入下一步</span>
+            <button
+              className="xx-preview-regenerate-btn"
+              onClick={onRegeneratePreview}
+              title="重新生成"
+            >
+              <ReloadOutlined /> 重新生成
+            </button>
+          </div>
+
+          {/* 视频播放器 */}
+          <div className="xx-preview-video-wrapper">
+            <video
+              className="xx-preview-video"
+              src={previewResult.videoUrl}
+              controls
+              preload="metadata"
+            />
+          </div>
+
+          {/* 剪辑方案信息 */}
+          <div className="xx-preview-plan-card">
+            <div className="xx-preview-plan-title">剪辑方案信息</div>
+            <div className="xx-preview-plan-info">
+              <div className="xx-preview-plan-row">
+                <span className="xx-preview-plan-label">模板</span>
+                <span className="xx-preview-plan-value">{templateName}</span>
+              </div>
+              <div className="xx-preview-plan-row">
+                <span className="xx-preview-plan-label">素材数量</span>
+                <span className="xx-preview-plan-value">{materialCount}</span>
+              </div>
+              <div className="xx-preview-plan-row">
+                <span className="xx-preview-plan-label">片段数</span>
+                <span className="xx-preview-plan-value">{previewResult.clipCount} 段</span>
+              </div>
+              <div className="xx-preview-plan-row">
+                <span className="xx-preview-plan-label">转场次数</span>
+                <span className="xx-preview-plan-value">{previewResult.transitionCount} 次</span>
+              </div>
+              <div className="xx-preview-plan-row">
+                <span className="xx-preview-plan-label">素材使用率</span>
+                <span className="xx-preview-plan-value">{previewResult.materialUsage}%</span>
+              </div>
+              <div className="xx-preview-plan-row">
+                <span className="xx-preview-plan-label">实际时长</span>
+                <span className="xx-preview-plan-value">
+                  {(typeof previewResult.duration === "number"
+                    ? previewResult.duration
+                    : 0
+                  ).toFixed(1)}{" "}
+                  秒
+                </span>
+              </div>
+              <div className="xx-preview-plan-row">
+                <span className="xx-preview-plan-label">视频比例</span>
+                <span className="xx-preview-plan-value">{videoRatio}</span>
+              </div>
+            </div>
+            <div className="xx-preview-plan-hint">💡 这是 480p 预览版，正式生成将输出高清视频</div>
+          </div>
+        </>
+      )}
+    </div>
+  )
+}
+
+export default Step3GeneratePreview

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

@@ -1,294 +0,0 @@
-/**
- * Step 4 生成预览组件（支持多预览）
- * 调用后端预览生成接口，展示多个真实视频预览（网格布局）
- */
-import React from "react"
-import {
-  CheckCircleFilled,
-  LoadingOutlined,
-  ReloadOutlined,
-  PlayCircleOutlined,
-  ExclamationCircleFilled,
-  ClockCircleOutlined,
-} from "@ant-design/icons"
-import { InputNumber } from "antd"
-import type { PreviewItem, PreviewStatus } from "../hooks/useStep4Preview"
-
-interface Step4GeneratePreviewProps {
-  templateName: string
-  materialCount: string
-  duration: number
-  videoRatio: string
-  previewCount: number
-  onPreviewCountChange: (count: number) => void
-  items: PreviewItem[]
-  selectedIndex: number
-  onSelectPreview: (index: number) => void
-  overallStatus: PreviewStatus
-  overallError: string
-  overallProgress: number
-  anyGenerating: boolean
-  onGeneratePreview: () => void
-  onRegeneratePreview: () => void
-}
-
-/** 预览数量选项 */
-const PREVIEW_COUNT_OPTIONS = [
-  { value: 1, label: "1个" },
-  { value: 2, label: "2个" },
-  { value: 3, label: "3个" },
-]
-
-const Step4GeneratePreview: React.FC<Step4GeneratePreviewProps> = ({
-  templateName: _templateName,
-  materialCount: _materialCount,
-  videoRatio,
-  previewCount,
-  onPreviewCountChange,
-  items,
-  selectedIndex,
-  onSelectPreview,
-  overallStatus,
-  overallError,
-  overallProgress,
-  anyGenerating,
-  onGeneratePreview,
-  onRegeneratePreview,
-}) => {
-  const aspectRatio = (videoRatio || "16:9").replace(":", "/") // "9:16" → "9/16", "16:9" → "16/9"
-  const isIdle = overallStatus === "idle"
-  const isError = overallStatus === "error" && !items.some((it) => it.status === "ready")
-
-  return (
-    <div className="xx-form-section">
-      <h3>🎬 生成预览</h3>
-
-      {/* 预览数量选择器（仅在 idle 状态显示） */}
-      {isIdle && (
-        <div style={{ marginBottom: 16, display: "flex", alignItems: "center", gap: 12 }}>
-          <span style={{ fontSize: 14, color: "#666" }}>预览数量：</span>
-          <div style={{ display: "flex", gap: 8, alignItems: "center" }}>
-            {PREVIEW_COUNT_OPTIONS.map((opt) => (
-              <button
-                key={opt.value}
-                type="button"
-                onClick={() => onPreviewCountChange(opt.value)}
-                style={{
-                  padding: "4px 12px",
-                  borderRadius: 6,
-                  border: previewCount === opt.value ? "1px solid #1677ff" : "1px solid #d9d9d9",
-                  background: previewCount === opt.value ? "#e6f4ff" : "#fff",
-                  color: previewCount === opt.value ? "#1677ff" : "#666",
-                  cursor: "pointer",
-                  fontSize: 13,
-                  fontWeight: previewCount === opt.value ? 600 : 400,
-                }}
-              >
-                {opt.label}
-              </button>
-            ))}
-            <InputNumber
-              min={1}
-              max={10}
-              value={previewCount}
-              onChange={(val) => val && onPreviewCountChange(val)}
-              style={{ width: 70 }}
-              placeholder="自定义"
-            />
-            <span style={{ fontSize: 12, color: "#999", marginLeft: 4 }}>（1~10）</span>
-          </div>
-          {previewCount > 1 && (
-            <span style={{ fontSize: 12, color: "#999" }}>生成多个预览可对比不同剪辑效果</span>
-          )}
-        </div>
-      )}
-
-      {/* 预览生成按钮（idle 状态） */}
-      {isIdle && (
-        <div className="xx-preview-generate-section">
-          <div className="xx-preview-generate-hint">
-            <PlayCircleOutlined style={{ fontSize: 32, color: "#3b82f6", marginBottom: 12 }} />
-            <p className="xx-preview-generate-title">一键生成剪辑预览</p>
-            <p className="xx-preview-generate-desc">
-              AI 将根据您选择的模板、素材和配音，智能生成
-              {previewCount > 1 ? `${previewCount}个不同版本的` : ""}视频预览（480p 低清版）
-            </p>
-          </div>
-          <button
-            className="xx-btn xx-btn-primary xx-preview-generate-btn"
-            onClick={onGeneratePreview}
-          >
-            ✨ 生成预览{previewCount > 1 ? `（${previewCount}个）` : ""}
-          </button>
-        </div>
-      )}
-
-      {/* 整体排队中（所有都在 pending） */}
-      {anyGenerating && items.every((it) => it.status === "pending") && (
-        <div className="xx-preview-loading">
-          <ClockCircleOutlined style={{ fontSize: 32, color: "#faad14" }} spin />
-          <p className="xx-preview-loading-text">预览排队中...</p>
-          <p className="xx-preview-loading-desc">正在等待渲染资源，请稍候</p>
-        </div>
-      )}
-
-      {/* 多预览网格（生成中/完成/部分完成） */}
-      {(anyGenerating || overallStatus === "ready") && items.length > 0 && (
-        <div
-          className="xx-preview-grid"
-          style={{
-            display: "grid",
-            gridTemplateColumns: `repeat(${Math.min(items.length, 3)}, 1fr)`,
-            gap: 12,
-            maxWidth: `${Math.min(items.length, 3) * 280 + (Math.min(items.length, 3) - 1) * 12}px`,
-            margin: "0 auto 16px",
-          }}
-        >
-          {items.map((item) => {
-            const isSelected = item.index === selectedIndex
-            return (
-              <div
-                key={item.index}
-                onClick={() => {
-                  if (item.status === "ready") onSelectPreview(item.index)
-                }}
-                style={{
-                  borderRadius: 8,
-                  border: isSelected ? "2px solid #1677ff" : "1px solid #e8e8e8",
-                  overflow: "hidden",
-                  cursor: item.status === "ready" ? "pointer" : "default",
-                  opacity: item.status === "error" ? 0.6 : 1,
-                  transition: "all 0.2s",
-                }}
-              >
-                {/* 缩略图/状态区域 */}
-                <div
-                  style={{
-                    aspectRatio,
-                    background: "#000",
-                    display: "flex",
-                    alignItems: "center",
-                    justifyContent: "center",
-                    position: "relative",
-                  }}
-                >
-                  {item.status === "ready" && item.result && (
-                    <video
-                      src={item.result.videoUrl}
-                      controls
-                      autoPlay
-                      muted
-                      loop
-                      preload="metadata"
-                      style={{
-                        width: "100%",
-                        height: "100%",
-                        objectFit: "cover",
-                      }}
-                    />
-                  )}
-                  {(item.status === "pending" || item.status === "generating") && (
-                    <div style={{ textAlign: "center" }}>
-                      <LoadingOutlined style={{ fontSize: 24, color: "#fff" }} spin />
-                      <p style={{ color: "rgba(255,255,255,0.8)", fontSize: 12, marginTop: 8 }}>
-                        {item.status === "pending" ? "排队中..." : `生成中 ${item.progress}%`}
-                      </p>
-                    </div>
-                  )}
-                  {item.status === "error" && (
-                    <div style={{ textAlign: "center", padding: 8 }}>
-                      <ExclamationCircleFilled style={{ fontSize: 20, color: "#ef4444" }} />
-                      <p
-                        style={{
-                          color: "rgba(255,255,255,0.7)",
-                          fontSize: 11,
-                          marginTop: 4,
-                        }}
-                      >
-                        生成失败
-                      </p>
-                    </div>
-                  )}
-                  {/* 选中角标 */}
-                  {isSelected && item.status === "ready" && (
-                    <div
-                      style={{
-                        position: "absolute",
-                        top: 4,
-                        right: 4,
-                        background: "#1677ff",
-                        color: "#fff",
-                        fontSize: 10,
-                        padding: "2px 6px",
-                        borderRadius: 4,
-                      }}
-                    >
-                      预览 #{item.index + 1}
-                    </div>
-                  )}
-                </div>
-                {/* 底部信息 */}
-                {item.status === "ready" && item.result && (
-                  <div
-                    style={{
-                      padding: "6px 8px",
-                      background: "#fafafa",
-                      fontSize: 11,
-                      color: "#666",
-                      display: "flex",
-                      justifyContent: "space-between",
-                    }}
-                  >
-                    <span>{item.result.duration.toFixed(1)}秒</span>
-                    <span>{item.result.clipCount}段</span>
-                  </div>
-                )}
-              </div>
-            )
-          })}
-        </div>
-      )}
-
-      {/* 整体进度条（多预览生成中） */}
-      {anyGenerating && (
-        <div className="xx-preview-progress-bar" style={{ marginBottom: 12 }}>
-          <div className="xx-preview-progress-fill" style={{ width: `${overallProgress}%` }} />
-        </div>
-      )}
-
-      {/* 全部完成提示 */}
-      {overallStatus === "ready" && (
-        <div className="xx-preview-tip">
-          <CheckCircleFilled style={{ color: "#52c41a", marginRight: 8 }} />
-          <span>
-            {items.filter((it) => it.status === "ready").length} 个预览生成成功
-            {items.length > 1 ? "，点击选择要查看的版本" : "，确认效果后进入下一步"}
-          </span>
-          <button
-            className="xx-preview-regenerate-btn"
-            onClick={onRegeneratePreview}
-            title="重新生成"
-          >
-            <ReloadOutlined /> 重新生成
-          </button>
-        </div>
-      )}
-
-      {/* 全部失败 */}
-      {isError && (
-        <div className="xx-preview-error">
-          <ExclamationCircleFilled style={{ fontSize: 28, color: "#ef4444" }} />
-          <p className="xx-preview-error-text">预览生成失败</p>
-          <p className="xx-preview-error-desc">
-            {typeof overallError === "string" && overallError ? overallError : "请稍后重试"}
-          </p>
-          <button className="xx-btn xx-btn-primary" onClick={onRegeneratePreview}>
-            <ReloadOutlined /> 重新生成
-          </button>
-        </div>
-      )}
-    </div>
-  )
-}
-
-export default Step4GeneratePreview

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

@@ -2,7 +2,7 @@
  * Step 4 标题设置组件
  */
 import React from "react"
-import { AutoComplete } from "antd"
+import { Select } from "antd"
 import { POSITION_OPTIONS, FONT_OPTIONS } from "../constants"
 import type { TitleSettings } from "../types"
 import { useStep4Title } from "../hooks/useStep4Title"
@@ -75,6 +75,10 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
             onRefresh={t.handleRefreshAiTitles}
           />
 
+          <div className="xx-divider">
+            <span>或手动选择</span>
+          </div>
+
           <div className="xx-title-ai-toggle">
             <span className="xx-toggle-label">AI 自动选择标题</span>
             <div className="xx-switch" onClick={t.toggleAiAutoSelect}>
@@ -83,11 +87,11 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
           </div>
 
           <div className="xx-form-field">
-            <label>标题</label>
-            <AutoComplete
-              placeholder="输入或从标题库选择…"
+            <label>从标题库选择</label>
+            <Select
+              placeholder="请选择标题…"
               allowClear
-              maxLength={50}
+              showSearch
               style={{ width: "100%" }}
               value={t.titleSettings.title || undefined}
               onChange={(val) => t.updateTitle(val || "")}
@@ -95,10 +99,9 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
                 label: ut.content,
                 value: ut.content,
               }))}
-              filterOption={(inputValue, option) => {
-                const title = (option?.label || option?.value || "") as string
-                return title.toLowerCase().includes((inputValue || "").toLowerCase())
-              }}
+              filterOption={(input, option) =>
+                ((option?.label as string) || "").toLowerCase().includes(input.toLowerCase())
+              }
               notFoundContent={
                 t.userTitles.length === 0 ? (
                   <span style={{ color: "var(--text-tertiary)", fontSize: 13 }}>
@@ -108,6 +111,15 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
               }
             />
           </div>
+          <div className="xx-form-field" style={{ marginTop: 14 }}>
+            <label>或手动输入</label>
+            <input
+              placeholder="输入自定义标题…"
+              value={t.titleSettings.title}
+              onChange={(e) => t.updateTitle(e.target.value)}
+              maxLength={50}
+            />
+          </div>
         </>
       )}
 

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

@@ -1,252 +1,137 @@
 /**
  * Step 5 配音选择组件
- * 展示用户已上传的配音素材，支持选中、预览播放
  */
-import React, { useState, useRef, useCallback } from "react"
-import { useNavigate } from "react-router-dom"
-import { useQuery } from "@tanstack/react-query"
-import { AudioOutlined, SoundOutlined } from "@ant-design/icons"
-import { getAssetsByKind } from "@/api/assets"
-import type { AssetItem } from "@/api/assets"
+import React from "react"
+import type { VoiceClone } from "@/api/voice-clone"
+import { useStep5Voice } from "../hooks/useStep5Voice"
+import VoiceRecommendSection from "./voice/VoiceRecommendSection"
+import VoiceChoiceCard from "./voice/VoiceChoiceCard"
+import PresetVoiceDetail from "./voice/PresetVoiceDetail"
+import CustomVoicePanel from "./voice/CustomVoicePanel"
+import SaveVoiceModal from "./voice/SaveVoiceModal"
+import CloneVoiceSection from "./voice/CloneVoiceSection"
 
 interface Step5VoiceSelectProps {
   selectedVoice: string
-  onSelectedVoiceChange: (id: string) => void
+  onSelectedVoiceChange: (voiceId: string) => void
+  voiceMode: "preset" | "custom" | "clone"
+  onVoiceModeChange: (mode: "preset" | "custom" | "clone") => void
+  selectedClonedVoice: string
+  onSelectedClonedVoiceChange: (voiceId: string) => void
+  clonedVoices: VoiceClone[]
+  addClone: (voice: VoiceClone) => void
+  hasProcessing: boolean
+  cloneModalOpen: boolean
+  onCloneModalOpenChange: (open: boolean) => void
+  titleText: string
 }
 
-/** 格式化时长 mm:ss */
-const formatDuration = (seconds?: number): string => {
-  if (!seconds || seconds <= 0) return "00:00"
-  const m = Math.floor(seconds / 60)
-  const s = Math.floor(seconds % 60)
-  return `${String(m).padStart(2, "0")}:${String(s).padStart(2, "0")}`
-}
-
-/** 格式化文件大小 */
-const formatFileSize = (bytes?: number): string => {
-  if (!bytes || bytes <= 0) return "未知"
-  if (bytes < 1024) return `${bytes} B`
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
-  if (bytes < 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
-  return `${(bytes / (1024 * 1024 * 1024)).toFixed(1)} GB`
-}
-
-const Step5VoiceSelect: React.FC<Step5VoiceSelectProps> = ({
-  selectedVoice,
-  onSelectedVoiceChange,
-}) => {
-  const navigate = useNavigate()
-  const [playingId, setPlayingId] = useState<string | null>(null)
-  const audioRef = useRef<HTMLAudioElement | null>(null)
-
-  // 获取用户上传的配音素材
-  const { data: materials = [], isLoading } = useQuery({
-    queryKey: ["assets", "voice"],
-    queryFn: () => getAssetsByKind("voice", { limit: 50 }),
-  })
-
-  /** 切换播放/暂停 */
-  const togglePlay = useCallback(
-    (material: AssetItem) => {
-      // 如果当前正在播放同一个素材，则暂停
-      if (playingId === material.id && audioRef.current) {
-        audioRef.current.pause()
-        setPlayingId(null)
-        return
-      }
-
-      // 停止之前的播放
-      if (audioRef.current) {
-        audioRef.current.pause()
-      }
-
-      // 创建新的 audio 元素播放
-      const audio = new Audio(material.file_url)
-      audioRef.current = audio
-      setPlayingId(material.id)
-
-      audio.onended = () => {
-        setPlayingId(null)
-        audioRef.current = null
-      }
-
-      audio.play().catch(() => {
-        setPlayingId(null)
-        audioRef.current = null
-      })
-    },
-    [playingId],
-  )
-
-  /** 选中素材 */
-  const handleSelect = useCallback(
-    (id: string) => {
-      onSelectedVoiceChange(id)
-    },
-    [onSelectedVoiceChange],
-  )
-
-  /** 跳转到配音库上传 */
-  const handleGoToUpload = useCallback(() => {
-    navigate("/app/voices")
-  }, [navigate])
-
-  // 加载中状态
-  if (isLoading) {
-    return (
-      <div className="xx-form-section">
-        <h3>🎙️ 选择配音</h3>
-        <div style={{ textAlign: "center", padding: "40px 0", color: "#999" }}>
-          加载配音素材中...
-        </div>
-      </div>
-    )
-  }
-
-  // 空状态
-  if (materials.length === 0) {
-    return (
-      <div className="xx-form-section">
-        <h3>🎙️ 选择配音</h3>
-        <div
-          style={{
-            textAlign: "center",
-            padding: "60px 0",
-            color: "#999",
-          }}
-        >
-          <AudioOutlined style={{ fontSize: 48, color: "#d9d9d9", marginBottom: 16 }} />
-          <p style={{ fontSize: 16, marginBottom: 16 }}>暂无配音素材</p>
-          <button
-            type="button"
-            onClick={handleGoToUpload}
-            style={{
-              padding: "8px 24px",
-              background: "#1677ff",
-              color: "#fff",
-              border: "none",
-              borderRadius: 6,
-              cursor: "pointer",
-              fontSize: 14,
-            }}
-          >
-            去配音库上传
-          </button>
-        </div>
-      </div>
-    )
-  }
+const Step5VoiceSelect: React.FC<Step5VoiceSelectProps> = (props) => {
+  const v = useStep5Voice(props)
 
   return (
     <div className="xx-form-section">
       <h3>🎙️ 选择配音</h3>
-      <p style={{ color: "#666", marginBottom: 16, fontSize: 14 }}>
-        从配音库中选择已上传的素材，点击卡片可预览播放
-      </p>
-      <div
-        style={{
-          display: "grid",
-          gridTemplateColumns: "repeat(auto-fill, minmax(220px, 1fr))",
-          gap: 12,
-        }}
-      >
-        {materials.map((item) => {
-          const isSelected = selectedVoice === item.id
-          const isPlaying = playingId === item.id
 
-          return (
-            <div
-              key={item.id}
-              onClick={() => handleSelect(item.id)}
-              style={{
-                padding: 16,
-                borderRadius: 8,
-                border: isSelected ? "2px solid #1677ff" : "1px solid #e8e8e8",
-                background: isSelected ? "#e6f4ff" : "#fff",
-                cursor: "pointer",
-                transition: "all 0.2s",
-                display: "flex",
-                flexDirection: "column",
-                gap: 8,
-              }}
-            >
-              {/* 顶部：图标 + 播放按钮 */}
-              <div
-                style={{ display: "flex", alignItems: "center", justifyContent: "space-between" }}
-              >
-                <div
-                  style={{
-                    width: 40,
-                    height: 40,
-                    borderRadius: 8,
-                    background: isSelected
-                      ? "linear-gradient(135deg, #1677ff, #4096ff)"
-                      : "linear-gradient(135deg, #f0f0f0, #e8e8e8)",
-                    display: "flex",
-                    alignItems: "center",
-                    justifyContent: "center",
-                  }}
-                >
-                  <AudioOutlined style={{ fontSize: 20, color: isSelected ? "#fff" : "#666" }} />
-                </div>
-                {item.file_url && (
-                  <button
-                    type="button"
-                    onClick={(e) => {
-                      e.stopPropagation()
-                      togglePlay(item)
-                    }}
-                    style={{
-                      width: 32,
-                      height: 32,
-                      borderRadius: "50%",
-                      border: "none",
-                      background: isPlaying ? "#ff4d4f" : "#1677ff",
-                      color: "#fff",
-                      cursor: "pointer",
-                      display: "flex",
-                      alignItems: "center",
-                      justifyContent: "center",
-                      fontSize: 14,
-                    }}
-                    title={isPlaying ? "暂停" : "播放"}
-                  >
-                    <SoundOutlined />
-                  </button>
-                )}
-              </div>
+      <VoiceRecommendSection
+        presetVoices={v.presetVoices}
+        voiceRecommendLoading={v.voiceRecommendLoading}
+        voiceRecommendations={v.voiceRecommendations}
+        hasVoiceRecommend={v.hasVoiceRecommend}
+        onRecommend={v.handleVoiceRecommend}
+        onSelectVoice={v.handleSelectRecommendedVoice}
+        selectedVoiceId={v.selectedVoice}
+        voiceMode={v.voiceMode}
+        VOICE_GENDER_ICON={v.VOICE_GENDER_ICON}
+      />
 
-              {/* 名称 */}
-              <div
-                style={{
-                  fontSize: 14,
-                  fontWeight: 500,
-                  color: "#333",
-                  overflow: "hidden",
-                  textOverflow: "ellipsis",
-                  whiteSpace: "nowrap",
-                }}
-                title={item.name}
-              >
-                {item.name}
-              </div>
-
-              {/* 时长 + 大小 */}
-              <div
-                style={{
-                  display: "flex",
-                  justifyContent: "space-between",
-                  fontSize: 12,
-                  color: "#999",
-                }}
-              >
-                <span>{formatDuration(item.duration)}</span>
-                <span>{formatFileSize(item.file_size)}</span>
-              </div>
-            </div>
-          )
-        })}
+      <div className="xx-divider">
+        <span>全部音色</span>
       </div>
+
+      <div className="xx-voice-choice-list" style={{ marginBottom: 16 }}>
+        {v.presetVoices.slice(0, 3).map((pv) => (
+          <VoiceChoiceCard
+            key={pv.voice_id}
+            selected={v.voiceMode === "preset" && v.selectedVoice === pv.voice_id}
+            onClick={() => v.handleSelectPresetVoice(pv.voice_id)}
+            avatar={v.VOICE_GENDER_ICON[pv.gender] ?? "✨"}
+            title={pv.name}
+            description={pv.description}
+          />
+        ))}
+        {v.presetVoicesLoading && (
+          <VoiceChoiceCard
+            selected={false}
+            onClick={() => {}}
+            avatar="⏳"
+            title="加载中…"
+            loading
+          />
+        )}
+        <VoiceChoiceCard
+          selected={v.voiceMode === "clone"}
+          onClick={v.handleSelectCloneVoice}
+          avatar="🎤"
+          title="克隆我的声音"
+          description="上传语音样本克隆"
+          avatarStyle={{ background: "linear-gradient(135deg, #10b981, #059669)" }}
+        />
+      </div>
+
+      {v.voiceMode === "preset" && (
+        <PresetVoiceDetail
+          presetVoices={v.presetVoices}
+          selectedVoice={v.selectedVoice}
+          onSelect={v.handleSelectPresetVoice}
+          playingVoice={v.playingVoice}
+          onTogglePlay={v.toggleVoicePlay}
+          presetVoicesLoading={v.presetVoicesLoading}
+        />
+      )}
+
+      {v.voiceMode === "custom" && (
+        <>
+          <CustomVoicePanel
+            customVoiceText={v.customVoiceText}
+            onTextChange={v.setCustomVoiceText}
+            synthesizePending={v.synthesizeMutation.isPending}
+            onSynthesize={v.handleSynthesizeVoice}
+            ttsError={v.ttsError}
+            customAudioUrl={v.customAudioUrl}
+            completedTtsJobId={v.completedTtsJobId}
+            onOpenSaveModal={v.handleOpenSaveModal}
+          />
+          <SaveVoiceModal
+            open={v.saveModalOpen}
+            onClose={() => v.setSaveModalOpen(false)}
+            saveName={v.saveName}
+            onNameChange={v.setSaveName}
+            saveTagIds={v.saveTagIds}
+            onTagIdsChange={v.setSaveTagIds}
+            saveNewTag={v.saveNewTag}
+            onNewTagChange={v.setSaveNewTag}
+            onAddTag={v.handleAddTagInModal}
+            allTags={v.allTags}
+            savePending={v.saveToLibraryMutation.isPending}
+            onConfirm={v.handleConfirmSave}
+          />
+        </>
+      )}
+
+      {v.voiceMode === "clone" && (
+        <CloneVoiceSection
+          clonedVoices={v.clonedVoices}
+          hasProcessing={v.hasProcessing}
+          selectedClonedVoice={v.selectedClonedVoice}
+          onSelect={v.handleSelectClonedVoice}
+          onOpenCloneModal={v.handleOpenCloneModal}
+          playingVoiceId={v.playingCloneVoice}
+          onPlaySample={v.handlePlayCloneSample}
+          CLONE_STATUS_CONFIG={v.CLONE_STATUS_CONFIG}
+          formatDuration={v.formatDuration}
+        />
+      )}
     </div>
   )
 }

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

@@ -1,100 +1,100 @@
 import React from "react"
 import type { CoverConfig } from "../../editing-planner/types"
 import { useStep6Cover } from "../hooks/useStep6Cover"
-import Button from "@/components/ui/Button"
-import CoverSettingsModal from "./cover-settings/CoverSettingsModal"
-import CoverEditorModal from "./cover-settings/CoverEditorModal"
+import { CoverModeSelector } from "./cover-settings/CoverModeSelector"
+import { FrameCoverPicker } from "./cover-settings/FrameCoverPicker"
+import { UploadCoverPicker } from "./cover-settings/UploadCoverPicker"
 
 interface Step6CoverSettingsProps {
   coverSettings: CoverConfig
   onCoverSettingsChange: (settings: CoverConfig) => void
   duration: number
-  /** 当前素材 ID 列表，用于智能封面生成 */
-  assetIds?: string[]
-  /** 当前选中的模板 ID */
-  selectedTemplate?: string
 }
 
 const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
   const {
     coverSettings,
-    generateAutoCover,
-    showCoverSettings,
-    setShowCoverSettings,
-    showCoverEditor,
-    setShowCoverEditor,
-    selectedTemplateId,
-    editingTemplate,
-    coverTemplates,
-    templatesLoading,
-    templatesError,
-    handleSelectTemplate,
-    handleEditTemplate,
-    handleSaveTemplate,
-    handleDeleteTemplate,
-  } = useStep6Cover({
-    coverSettings: props.coverSettings,
-    onCoverSettingsChange: props.onCoverSettingsChange,
-    duration: props.duration,
-    assetIds: props.assetIds,
-    selectedTemplate: props.selectedTemplate,
-  })
-
-  const handleAutoGenerate = () => {
-    generateAutoCover()
-  }
-
-  // 预览图：优先 thumbnail_url，其次 upload_url
-  const previewUrl = coverSettings.thumbnail_url || coverSettings.upload_url
+    formatTime,
+    toggleEnabled,
+    setMode,
+    setFrameTime,
+    handleUpload,
+    totalDuration,
+    COVER_MODE_LABELS,
+    COVER_MODE_ICONS,
+  } = useStep6Cover(props)
 
   return (
     <div className="xx-form-section">
       <h3>🖼️ 选择封面</h3>
 
-      <div className="xx-cover-actions">
-        <Button buttonType="primary" onClick={handleAutoGenerate}>
-          ✨ 自动生成封面
-        </Button>
-        <Button buttonType="ghost" onClick={() => setShowCoverSettings(true)}>
-          ⚙️ 封面设置
-        </Button>
+      <div className="xx-cover-header">
+        <span className="xx-cover-header-label">启用自定义封面</span>
+        <label className="xx-switch">
+          <input
+            type="checkbox"
+            checked={coverSettings.enabled}
+            onChange={(e) => toggleEnabled(e.target.checked)}
+          />
+          <span className="xx-switch-slider" />
+        </label>
       </div>
 
-      <div className="xx-section-title">封面预览</div>
-      <div className="xx-cover-preview-box">
-        {previewUrl ? (
-          <img src={previewUrl} alt="封面预览" className="xx-cover-preview-img" />
-        ) : (
-          <div className="xx-cover-preview-placeholder">
-            <span style={{ fontSize: 28 }}>🖼️</span>
-            <span>点击"自动生成封面"或选择模板</span>
+      {coverSettings.enabled && (
+        <>
+          <div className="xx-section-title">封面来源</div>
+          <CoverModeSelector
+            mode={coverSettings.mode}
+            onModeChange={setMode}
+            modeLabels={COVER_MODE_LABELS}
+            modeIcons={COVER_MODE_ICONS}
+          />
+
+          {coverSettings.mode === "auto" && (
+            <div className="xx-cover-auto">
+              <div className="xx-cover-auto-desc">
+                AI 将分析视频内容，自动选择最具吸引力的画面作为封面。
+              </div>
+              <div className="xx-cover-auto-badge">
+                <span style={{ fontSize: 24 }}>🤖</span>
+                <span>AI 智能选帧</span>
+              </div>
+            </div>
+          )}
+
+          {coverSettings.mode === "frame" && (
+            <FrameCoverPicker
+              frameTime={coverSettings.frame_time}
+              totalDuration={totalDuration}
+              formatTime={formatTime}
+              onFrameTimeChange={setFrameTime}
+            />
+          )}
+
+          {coverSettings.mode === "upload" && (
+            <UploadCoverPicker uploadUrl={coverSettings.upload_url} onUpload={handleUpload} />
+          )}
+
+          <div className="xx-section-title">封面预览</div>
+          <div className="xx-cover-preview-box">
+            {coverSettings.upload_url ? (
+              <img src={coverSettings.upload_url} alt="封面预览" className="xx-cover-preview-img" />
+            ) : (
+              <div className="xx-cover-preview-placeholder">
+                <span style={{ fontSize: 28 }}>🖼️</span>
+                <span>
+                  {coverSettings.mode === "auto"
+                    ? "AI 智能选择"
+                    : coverSettings.mode === "frame"
+                      ? `帧 ${formatTime(coverSettings.frame_time)}`
+                      : "未上传封面"}
+                </span>
+              </div>
+            )}
+            <div className="xx-cover-preview-ratio">16:9</div>
           </div>
-        )}
-        <div className="xx-cover-preview-ratio">9:16</div>
-      </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)
-        }}
-      />
-
-      <CoverEditorModal
-        open={showCoverEditor}
-        onClose={() => setShowCoverEditor(false)}
-        template={editingTemplate}
-        onSave={handleSaveTemplate}
-      />
+        </>
+      )}
     </div>
   )
 }

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

@@ -1,125 +0,0 @@
-import React, { useState } from "react"
-import type { CoverTemplate } from "../../../editing-planner/types"
-import Modal from "@/components/ui/Modal"
-import Button from "@/components/ui/Button"
-
-interface CoverEditorModalProps {
-  open: boolean
-  onClose: () => void
-  template: CoverTemplate | null
-  onSave: (template: CoverTemplate) => void
-}
-
-interface SectionState {
-  basic: boolean
-  portrait: boolean
-  background: boolean
-  title: boolean
-  subtitle: boolean
-  mask: boolean
-}
-
-const CoverEditorModal: React.FC<CoverEditorModalProps> = ({ open, onClose, template, onSave }) => {
-  const [name, setName] = useState(template?.name || "")
-  const [sections, setSections] = useState<SectionState>({
-    basic: true,
-    portrait: false,
-    background: false,
-    title: true,
-    subtitle: true,
-    mask: false,
-  })
-
-  const toggleSection = (key: keyof SectionState) => {
-    setSections((prev) => ({ ...prev, [key]: !prev[key] }))
-  }
-
-  const handleSave = () => {
-    if (!template) return
-    onSave({ ...template, name })
-    onClose()
-  }
-
-  return (
-    <Modal
-      open={open}
-      onCancel={onClose}
-      width={1000}
-      title="自定义封面编辑器"
-      centered
-      footer={null}
-    >
-      <div className="xx-cover-editor-header">
-        <input
-          className="xx-cover-editor-name-input"
-          value={name}
-          onChange={(e) => setName(e.target.value)}
-          placeholder="输入模板名称"
-        />
-        <div className="xx-cover-editor-header-actions">
-          <Button buttonType="ghost" onClick={onClose}>
-            取消
-          </Button>
-          <Button buttonType="primary" onClick={handleSave}>
-            保存模板
-          </Button>
-        </div>
-      </div>
-
-      <div className="xx-cover-editor-layout">
-        {/* 左侧折叠面板 */}
-        <div className="xx-cover-editor-left">
-          {[
-            { key: "basic" as const, label: "基础设置" },
-            { key: "portrait" as const, label: "人像设置" },
-            { key: "background" as const, label: "背景设置", toggle: true },
-            { key: "title" as const, label: "主标题" },
-            { key: "subtitle" as const, label: "副标题" },
-            { key: "mask" as const, label: "蒙版", toggle: true },
-          ].map((item) => (
-            <div key={item.key} className="xx-cover-editor-section">
-              <div
-                className="xx-cover-editor-section-header"
-                onClick={() => toggleSection(item.key)}
-              >
-                <span>{item.label}</span>
-                <span>{sections[item.key] ? "▾" : "▸"}</span>
-              </div>
-              {sections[item.key] && (
-                <div className="xx-cover-editor-section-body">
-                  {item.toggle ? (
-                    <label style={{ display: "flex", alignItems: "center", gap: 6 }}>
-                      <input type="checkbox" defaultChecked={false} />
-                      已开启
-                    </label>
-                  ) : (
-                    <span style={{ color: "var(--text-tertiary)" }}>暂无配置项</span>
-                  )}
-                </div>
-              )}
-            </div>
-          ))}
-        </div>
-
-        {/* 右侧画布预览 */}
-        <div className="xx-cover-editor-right">
-          <div className="xx-cover-editor-canvas">
-            {/* 人像占位 */}
-            <div className="xx-cover-editor-portrait">
-              {/* 四角拖拽手柄 */}
-              <span className="xx-cover-editor-handle" style={{ top: -4, left: -4 }} />
-              <span className="xx-cover-editor-handle" style={{ top: -4, right: -4 }} />
-              <span className="xx-cover-editor-handle" style={{ bottom: -4, left: -4 }} />
-              <span className="xx-cover-editor-handle" style={{ bottom: -4, right: -4 }} />
-            </div>
-            {/* 文字占位 */}
-            <div className="xx-cover-editor-title-placeholder">主标题文字</div>
-            <div className="xx-cover-editor-subtitle-placeholder">副标题文字</div>
-          </div>
-        </div>
-      </div>
-    </Modal>
-  )
-}
-
-export default CoverEditorModal

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

@@ -1,112 +0,0 @@
-import React from "react"
-import type { CoverTemplate } from "../../../editing-planner/types"
-import Modal from "@/components/ui/Modal"
-import Button from "@/components/ui/Button"
-
-interface CoverSettingsModalProps {
-  open: boolean
-  onClose: () => void
-  templates: CoverTemplate[]
-  loading?: boolean
-  error?: string | null
-  selectedTemplateId: string
-  onSelectTemplate: (id: string) => void
-  onEditTemplate: (template: CoverTemplate) => void
-  onDeleteTemplate: (id: string) => void
-  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)",
-}
-
-const CoverSettingsModal: React.FC<CoverSettingsModalProps> = ({
-  open,
-  onClose,
-  templates,
-  loading = false,
-  error = null,
-  selectedTemplateId,
-  onSelectTemplate,
-  onEditTemplate,
-  onDeleteTemplate,
-  onCreateNew,
-}) => {
-  return (
-    <Modal open={open} onCancel={onClose} width={800} title="封面设置" centered footer={null}>
-      <div className="xx-cover-modal-toolbar">
-        <Button buttonType="primary">选择素材文件</Button>
-        <Button buttonType="ghost">导出全部</Button>
-        <Button buttonType="primary" onClick={onCreateNew}>
-          创建新模板
-        </Button>
-      </div>
-
-      {loading && (
-        <div style={{ textAlign: "center", padding: "40px 0", color: "var(--text-secondary)" }}>
-          加载中...
-        </div>
-      )}
-
-      {error && !loading && (
-        <div style={{ textAlign: "center", padding: "40px 0", color: "#ef4444" }}>{error}</div>
-      )}
-
-      {!loading && !error && (
-        <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)}
-            >
-              <div
-                className="xx-cover-template-thumb"
-                style={{ background: GRADIENT_MAP[tpl.id] || GRADIENT_MAP.default }}
-              >
-                🖼️
-              </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 && (
-                    <Button
-                      buttonType="ghost"
-                      buttonSize="sm"
-                      onClick={() => {
-                        if (confirm("确定删除此模板？")) {
-                          onDeleteTemplate(tpl.id)
-                        }
-                      }}
-                    >
-                      删除
-                    </Button>
-                  )}
-                  <Button buttonType="ghost" buttonSize="sm">
-                    导出
-                  </Button>
-                </div>
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-    </Modal>
-  )
-}
-
-export default CoverSettingsModal

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

@@ -31,9 +31,9 @@ export const VOICE_GENDER_ICON: Record<string, string> = {
 export const STEPS = [
   { key: 1, label: "选择模板" },
   { key: 2, label: "选择素材" },
-  { key: 3, label: "选择配音" },
-  { key: 4, label: "生成预览" },
-  { key: 5, label: "选择标题" },
+  { key: 3, label: "生成预览" },
+  { key: 4, label: "选择标题" },
+  { key: 5, label: "选择配音" },
   { key: 6, label: "选择封面" },
   { key: 7, label: "确认生成" },
 ]

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

@@ -891,7 +891,7 @@
 
 /* ── 视频预览 ── */
 .xx-preview-video {
-  aspect-ratio: 16 / 9;
+  aspect-ratio: 9 / 16;
   max-height: 400px;
   border-radius: var(--radius-md);
   background: linear-gradient(135deg, var(--color-gray-900), var(--color-primary-900));
@@ -2356,8 +2356,6 @@
   background: var(--bg-tertiary);
   border-radius: var(--radius-lg);
   border: 2px dashed var(--border-color);
-  max-width: 320px;
-  margin: 0 auto;
 }
 
 .xx-preview-generate-hint {
@@ -2390,8 +2388,6 @@
   background: var(--bg-tertiary);
   border-radius: var(--radius-lg);
   border: 1px solid var(--border-color);
-  max-width: 320px;
-  margin: 0 auto;
 }
 
 .xx-preview-loading-text {
@@ -2407,15 +2403,13 @@
   margin: 0;
 }
 
-/* ── 错误状态（手机屏尺寸）── */
+/* ── 错误状态 ── */
 .xx-preview-error {
   text-align: center;
   padding: 32px 20px;
   background: rgba(239, 68, 68, 0.06);
   border-radius: var(--radius-lg);
   border: 1px solid rgba(239, 68, 68, 0.2);
-  max-width: 320px;
-  margin: 0 auto;
 }
 
 .xx-preview-error-text {
@@ -2462,9 +2456,6 @@
   margin-bottom: 20px;
   font-size: 13px;
   color: var(--text-primary);
-  max-width: 320px;
-  margin-left: auto;
-  margin-right: auto;
 }
 
 .xx-preview-plan-card {
@@ -2579,16 +2570,6 @@
   z-index: 2;
 }
 
-/* ── 整体进度条（手机屏尺寸）── */
-.xx-preview-progress-bar {
-  max-width: 320px;
-  margin: 12px auto;
-  height: 6px;
-  background: var(--bg-tertiary);
-  border-radius: 3px;
-  overflow: hidden;
-}
-
 .xx-preview-progress-bar-wrap {
   width: 100%;
   height: 4px;
@@ -2666,7 +2647,7 @@
 .xx-preview-video-wrapper .xx-preview-video {
   max-width: 300px;
   width: 100%;
-  aspect-ratio: 16 / 9;
+  aspect-ratio: 9 / 16;
   margin-bottom: 0;
 }
 
@@ -2888,196 +2869,3 @@
 .ant-modal-close {
   color: #fff !important;
 }
-
-/* ── 封面设置区域改造样式 ── */
-
-/* 封面操作按钮区 */
-.xx-cover-actions {
-  display: flex;
-  gap: 12px;
-  margin-bottom: 12px;
-}
-
-/* 已选模板文字 */
-.xx-cover-selected-template {
-  font-size: 13px;
-  color: var(--text-secondary);
-  margin-bottom: 16px;
-}
-
-/* 封面设置弹窗 - 工具栏 */
-.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;
-}
-
-/* 卡片信息区 */
-.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-cover-editor-layout {
-  display: flex;
-  gap: 20px;
-  min-height: 500px;
-}
-.xx-cover-editor-left {
-  width: 280px;
-  flex-shrink: 0;
-}
-.xx-cover-editor-right {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: #f5f5f5;
-  border-radius: var(--radius-md);
-}
-.xx-cover-editor-canvas {
-  width: 225px;
-  height: 400px;
-  background: #ddd;
-  position: relative;
-  border-radius: 8px;
-  overflow: hidden;
-}
-.xx-cover-editor-portrait {
-  position: absolute;
-  top: 20%;
-  left: 15%;
-  width: 70%;
-  height: 45%;
-  background: #a8d4f0;
-  border: 2px solid #333;
-}
-.xx-cover-editor-handle {
-  position: absolute;
-  width: 8px;
-  height: 8px;
-  background: #333;
-  border: 1px solid white;
-}
-
-/* 编辑器折叠面板 */
-.xx-cover-editor-section {
-  border: 1px solid var(--border-color);
-  border-radius: var(--radius-sm);
-  margin-bottom: 8px;
-}
-.xx-cover-editor-section-header {
-  padding: 10px 12px;
-  font-size: 13px;
-  font-weight: 500;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background: var(--bg-tertiary);
-}
-.xx-cover-editor-section-body {
-  padding: 12px;
-  font-size: 12px;
-  color: var(--text-secondary);
-}
-
-/* 编辑器顶部 */
-.xx-cover-editor-header {
-  margin-bottom: 16px;
-}
-.xx-cover-editor-name-input {
-  width: 100%;
-  padding: 8px 12px;
-  border: 1px solid var(--border-color);
-  border-radius: var(--radius-sm);
-  font-size: 14px;
-  margin-bottom: 12px;
-}
-.xx-cover-editor-header-actions {
-  display: flex;
-  justify-content: flex-end;
-  gap: 8px;
-}
-
-/* 编辑器画布内文字占位 */
-.xx-cover-editor-title-placeholder {
-  position: absolute;
-  top: 72%;
-  left: 50%;
-  transform: translateX(-50%);
-  font-size: 16px;
-  font-weight: 700;
-  color: #fff;
-  text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.6);
-  white-space: nowrap;
-}
-.xx-cover-editor-subtitle-placeholder {
-  position: absolute;
-  top: 82%;
-  left: 50%;
-  transform: translateX(-50%);
-  font-size: 11px;
-  color: rgba(255, 255, 255, 0.85);
-  white-space: nowrap;
-}

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

@@ -1,27 +1,74 @@
 import type { UseGenerateVideoProps } from "./types"
+import { buildVoiceConfig } from "./voiceConfig"
+
+/**
+ * 构建 updateEditPlan 的 payload
+ * 从 props 中提取需要的字段，组装成 API 所需的 config 结构
+ */
+export const buildEditPlanPayload = (props: UseGenerateVideoProps) => {
+  const {
+    titleSettings,
+    selectedMaterials,
+    materialMode,
+    smartSelectedIds,
+    voiceMode,
+    selectedVoice,
+    selectedClonedVoice,
+    coverSettings,
+    videoRatio,
+    style,
+    duration,
+    autoSubtitles,
+    bgm,
+    generateCount,
+  } = props
+
+  const voiceConfig = buildVoiceConfig({
+    voiceMode,
+    selectedVoice,
+    selectedClonedVoice,
+  })
+
+  return {
+    name: titleSettings.title.trim(),
+    config: {
+      asset_ids: materialMode === "auto" ? smartSelectedIds : selectedMaterials,
+      title_config: {
+        ai_auto_select: titleSettings.aiAutoSelect,
+        content: titleSettings.title,
+        position: titleSettings.position,
+        font_preset: titleSettings.font,
+        font_color: titleSettings.color,
+        font_size: titleSettings.size,
+      },
+      cover_config: coverSettings,
+      ...voiceConfig,
+      ratio: videoRatio,
+      style,
+      duration,
+      auto_subtitles: autoSubtitles,
+      bgm,
+      generate_count: generateCount,
+      material_mode: materialMode,
+    },
+    total_duration: duration,
+    status: "editing" as const,
+  }
+}
 
 /**
  * 生成前置校验
  * 返回错误信息，通过则返回 null
  */
 export const validateGenerateInputs = (props: UseGenerateVideoProps): string | null => {
-  const {
-    titleSettings,
-    materialMode,
-    selectedMaterials,
-    smartSelectedIds,
-    voiceMode,
-    selectedClonedVoice,
-  } = props
+  const { titleSettings, materialMode, selectedMaterials, voiceMode, selectedClonedVoice } = props
 
   // AI 自动选择模式下，标题可以为空（后端会自行生成）
   if (!titleSettings.aiAutoSelect && !titleSettings.title?.trim()) {
     return "请先选择或输入标题"
   }
-  // 无论手动还是自动模式，都必须有素材
-  const materialIds = materialMode === "auto" ? smartSelectedIds || [] : selectedMaterials || []
-  if (materialIds.length === 0) {
-    return materialMode === "auto" ? "AI 未匹配到素材，请手动选择素材后重试" : "请至少选择一个素材"
+  if (materialMode === "manual" && selectedMaterials.length === 0) {
+    return "请至少选择一个素材"
   }
   if (voiceMode === "clone" && !selectedClonedVoice) {
     return "请先选择一个克隆音色"

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

@@ -19,8 +19,6 @@ export interface UseGenerateVideoProps {
   autoSubtitles: boolean
   bgm: boolean
   generateCount: number
-  /** 预览任务的 task_id（用于新确认生成 API） */
-  previewTaskId: string
 }
 
 /** 生成阶段 */

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

@@ -5,11 +5,11 @@
 import { useState, useCallback } from "react"
 import { message } from "antd"
 import type { GeneratedVideo } from "@/api/template-editor"
-import { confirmGeneration } from "@/api/generation"
+import { generateEditPlan, updateEditPlan, getEditPlan } from "@/api/template-editor"
 import type { UseGenerateVideoProps } from "./generate-video/types"
 import { getGenerationPhase } from "./generate-video/phase"
 import { useGenerationPolling } from "./generate-video/useGenerationPolling"
-import { validateGenerateInputs } from "./generate-video/buildPayload"
+import { buildEditPlanPayload, validateGenerateInputs } from "./generate-video/buildPayload"
 import { extractBackendError, translateError } from "./generate-video/errorUtils"
 
 export function useGenerateVideo(props: UseGenerateVideoProps) {
@@ -55,19 +55,15 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
     clearTimer()
 
     try {
-      // 使用确认生成 API（基于预览任务）
-      // 解析分辨率
-      const [widthStr, heightStr] = (props.videoRatio || "1080x1920").split("x")
-      const outputWidth = parseInt(widthStr, 10) || 1080
-      const outputHeight = parseInt(heightStr, 10) || 1920
+      const payload = buildEditPlanPayload(props)
 
-      await confirmGeneration(props.previewTaskId, {
-        output_width: outputWidth,
-        output_height: outputHeight,
-        cover_url: props.coverSettings.upload_url || "",
-        custom_title: props.titleSettings.title || "",
-      })
+      // 获取或创建草稿
+      await getEditPlan(selectedTemplate)
 
+      // 更新草稿内容 + 切换到 editing 状态
+      await updateEditPlan(selectedTemplate, payload)
+
+      await generateEditPlan(selectedTemplate)
       startPolling()
     } catch (err: unknown) {
       console.error("[handleGenerate] 生成失败:", err)

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

@@ -2,7 +2,7 @@
  * Step 2 素材选择 Hook
  * 组合素材库加载 + 智能匹配两个子 Hook
  */
-import { useCallback, useEffect, useRef } from "react"
+import { useCallback } from "react"
 import { formatDuration } from "../utils/formatDuration"
 import { useMaterialLibrary } from "./step2-materials/useMaterialLibrary"
 import { useSmartMatch } from "./step2-materials/useSmartMatch"
@@ -34,25 +34,6 @@ export function useStep2Materials({
     onSmartSelectedIdsChange,
   })
 
-  /* ── 自动触发智能匹配：选择视频库后自动调用 ── */
-  const autoTriggeredRef = useRef<string>("")
-  const { handleSmartMatch } = smartMatch
-  useEffect(() => {
-    // 离开 auto 模式时重置，确保下次进入 auto 模式能重新触发
-    if (materialMode !== "auto") {
-      autoTriggeredRef.current = ""
-      return
-    }
-    if (!selectedLibraryId) return
-    if (materialsLoading) return
-    if (materials.items.length === 0) return
-    // 防止同一视频库重复触发
-    if (autoTriggeredRef.current === selectedLibraryId) return
-
-    autoTriggeredRef.current = selectedLibraryId
-    handleSmartMatch()
-  }, [selectedLibraryId, materialMode, materialsLoading, materials.items, handleSmartMatch])
-
   /* ── 手动选择素材 ── */
   const handleToggleMaterial = useCallback(
     (materialId: string) => {

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

@@ -0,0 +1,308 @@
+/**
+ * Step 3 生成预览 Hook
+ * 调用 /generation/preview 接口创建预览任务，轮询状态直到完成
+ */
+import { useState, useCallback, useMemo, useEffect, useRef } from "react"
+import { createPreview, getPreviewStatus } from "@/api/generation"
+import type { PreviewTaskResponse, PreviewStatus as ApiPreviewStatus } from "@/api/generation"
+import type { EditingTemplate } from "@/api/editing-planner"
+import { safeExtractError } from "./generate-video/errorUtils"
+
+/** 安全地将值转为字符串，防止对象被直接渲染导致 React Error #31 */
+const safeString = (val: unknown, fallback: string): string => {
+  if (val == null) return fallback
+  const s = safeExtractError(val)
+  return s || fallback
+}
+
+/** 安全地将值转为数字，防止非数字值进入渲染 */
+const safeNumber = (val: unknown, fallback = 0): number => {
+  if (typeof val === "number" && !Number.isNaN(val)) return val
+  if (typeof val === "string") {
+    const n = Number(val)
+    return Number.isNaN(n) ? fallback : n
+  }
+  return fallback
+}
+
+interface UseStep3PreviewProps {
+  templates: EditingTemplate[]
+  selectedTemplate: string
+  materialMode: "manual" | "auto"
+  selectedMaterials: string[]
+  smartSelectedIds: string[]
+  duration: number
+  videoRatio: string
+  titleText?: string
+  voiceId?: string
+}
+
+export type PreviewStatus = "idle" | "pending" | "generating" | "ready" | "error"
+
+/** 预览生成结果 */
+export interface PreviewResult {
+  taskId: string
+  videoUrl: string
+  clipCount: number
+  transitionCount: number
+  materialUsage: number
+  duration: number
+  fileSize: number
+  generateDuration: number
+  progress: number
+}
+
+// 轮询超时时间（10 分钟）
+const POLL_TIMEOUT_MS = 10 * 60 * 1000
+export function useStep3Preview({
+  templates,
+  selectedTemplate,
+  materialMode,
+  selectedMaterials,
+  smartSelectedIds,
+  duration,
+  videoRatio,
+}: UseStep3PreviewProps) {
+  const templateName = useMemo(
+    () => templates.find((t) => t.id === selectedTemplate)?.name ?? "未选择",
+    [templates, selectedTemplate],
+  )
+
+  const materialCount = useMemo(() => {
+    if (materialMode === "auto") {
+      return `${smartSelectedIds.length} 个素材（智能匹配）`
+    }
+    return `${selectedMaterials.length} 个素材`
+  }, [materialMode, selectedMaterials.length, smartSelectedIds.length])
+
+  const materialTotal = materialMode === "auto" ? smartSelectedIds.length : selectedMaterials.length
+
+  /* ── 预览生成状态 ── */
+  const [previewStatus, setPreviewStatus] = useState<PreviewStatus>("idle")
+  const [previewResult, setPreviewResult] = useState<PreviewResult | null>(null)
+  const [previewError, setPreviewError] = useState<string>("")
+  const [progress, setProgress] = useState(0)
+
+  // 任务 ID + 轮询定时器，用于防止竞态条件
+  const currentTaskIdRef = useRef<string | null>(null)
+  const pollTimerRef = useRef<ReturnType<typeof setTimeout>>()
+  const startTimeRef = useRef<number>(0)
+
+  const clearPollTimer = useCallback(() => {
+    if (pollTimerRef.current) {
+      clearTimeout(pollTimerRef.current)
+      pollTimerRef.current = undefined
+    }
+  }, [])
+
+  /* ── 参数变化时重置预览状态 ── */
+  const prevDepsRef = useRef({
+    selectedTemplate,
+    materialMode,
+    selectedMaterials: [...selectedMaterials].sort().join(","),
+    smartSelectedIds: [...smartSelectedIds].sort().join(","),
+    duration,
+    videoRatio,
+  })
+
+  useEffect(() => {
+    const currentKey = [
+      selectedTemplate,
+      materialMode,
+      [...selectedMaterials].sort().join(","),
+      [...smartSelectedIds].sort().join(","),
+      duration,
+      videoRatio,
+    ].join("|")
+
+    const prevKey = [
+      prevDepsRef.current.selectedTemplate,
+      prevDepsRef.current.materialMode,
+      prevDepsRef.current.selectedMaterials,
+      prevDepsRef.current.smartSelectedIds,
+      prevDepsRef.current.duration,
+      prevDepsRef.current.videoRatio,
+    ].join("|")
+
+    if (prevKey !== currentKey && previewStatus !== "idle") {
+      // 参数变化，作废当前任务
+      currentTaskIdRef.current = null
+      clearPollTimer()
+      setPreviewStatus("idle")
+      setPreviewResult(null)
+      setPreviewError("")
+      setProgress(0)
+    }
+
+    prevDepsRef.current = {
+      selectedTemplate,
+      materialMode,
+      selectedMaterials: [...selectedMaterials].sort().join(","),
+      smartSelectedIds: [...smartSelectedIds].sort().join(","),
+      duration,
+      videoRatio,
+    }
+  }, [
+    selectedTemplate,
+    materialMode,
+    selectedMaterials,
+    smartSelectedIds,
+    duration,
+    videoRatio,
+    previewStatus,
+    clearPollTimer,
+  ])
+
+  // 组件卸载时清理轮询
+  useEffect(() => {
+    return () => {
+      clearPollTimer()
+    }
+  }, [clearPollTimer])
+
+  /** 轮询预览任务状态 */
+  const pollPreviewStatus = useCallback((taskId: string) => {
+    const poll = async () => {
+      // 检查是否已被取消（参数变化或重新生成）
+      if (currentTaskIdRef.current !== taskId) return
+
+      // 超时检查
+      if (Date.now() - startTimeRef.current > POLL_TIMEOUT_MS) {
+        setPreviewError("预览生成超时，请重试")
+        setPreviewStatus("error")
+        return
+      }
+
+      try {
+        const data: PreviewTaskResponse = await getPreviewStatus(taskId)
+
+        if (currentTaskIdRef.current !== taskId) return
+
+        const status = data.status as ApiPreviewStatus
+
+        if (status === "completed") {
+          setProgress(100)
+          setPreviewResult({
+            taskId: safeString(data.task_id, ""),
+            videoUrl: safeString(data.video_url, ""),
+            clipCount: safeNumber(data.clip_count),
+            transitionCount: safeNumber(data.transition_count),
+            materialUsage: safeNumber(data.material_usage),
+            duration: safeNumber(data.duration),
+            fileSize: safeNumber(data.file_size),
+            generateDuration: safeNumber(data.generate_duration),
+            progress: 100,
+          })
+          setPreviewStatus("ready")
+          return
+        }
+
+        if (status === "failed") {
+          setPreviewError(safeString(data.error_message, "预览生成失败，请重试"))
+          setPreviewStatus("error")
+          return
+        }
+
+        if (status === "cancelled") {
+          setPreviewError("预览任务已取消")
+          setPreviewStatus("error")
+          return
+        }
+
+        // pending / generating 状态继续轮询
+        setProgress(safeNumber(data.progress))
+        if (status === "pending") {
+          setPreviewStatus("pending")
+          pollTimerRef.current = setTimeout(poll, 5000)
+        } else {
+          setPreviewStatus("generating")
+          pollTimerRef.current = setTimeout(poll, 2000)
+        }
+      } catch (pollErr) {
+        if (currentTaskIdRef.current !== taskId) return
+        // 轮询出错，延迟后重试
+        pollTimerRef.current = setTimeout(poll, 3000)
+      }
+    }
+
+    // 首次延迟 1 秒开始轮询
+    pollTimerRef.current = setTimeout(poll, 1000)
+  }, [])
+
+  /** 生成预览 */
+  const generatePreview = useCallback(async () => {
+    if (!selectedTemplate) {
+      setPreviewError("请先选择模板")
+      setPreviewStatus("error")
+      return
+    }
+    if (materialTotal === 0) {
+      setPreviewError("请先选择素材")
+      setPreviewStatus("error")
+      return
+    }
+
+    // 取消之前的轮询
+    clearPollTimer()
+
+    setPreviewStatus("pending")
+    setPreviewError("")
+    setProgress(0)
+    setPreviewResult(null)
+    startTimeRef.current = Date.now()
+
+    try {
+      const assetIds = materialMode === "auto" ? smartSelectedIds : selectedMaterials
+      const response = await createPreview({
+        template_id: selectedTemplate,
+        asset_ids: assetIds,
+        duration: duration || undefined,
+        video_ratio: videoRatio,
+      })
+
+      // 竞态检查
+      if (startTimeRef.current === 0) return // 已被重置
+
+      currentTaskIdRef.current = response.task_id
+      pollPreviewStatus(response.task_id)
+    } catch (e) {
+      setPreviewError(safeString(e instanceof Error ? e.message : e, "预览生成失败"))
+      setPreviewStatus("error")
+    }
+  }, [
+    selectedTemplate,
+    materialTotal,
+    materialMode,
+    smartSelectedIds,
+    selectedMaterials,
+    duration,
+    videoRatio,
+    clearPollTimer,
+    pollPreviewStatus,
+  ])
+
+  /** 重新生成预览 */
+  const regeneratePreview = useCallback(() => {
+    generatePreview()
+  }, [generatePreview])
+
+  /** 是否可以下一步（预览已生成） */
+  const canProceed = previewStatus === "ready"
+
+  return {
+    templateName,
+    materialCount,
+    duration,
+    videoRatio,
+    // 预览生成状态
+    previewStatus,
+    previewResult,
+    previewError,
+    progress,
+    canProceed,
+    generatePreview,
+    regeneratePreview,
+  }
+}
+
+export default useStep3Preview

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

@@ -1,440 +0,0 @@
-/**
- * Step 4 生成预览 Hook（支持多预览 + voice_ids）
- * 调用 /generation/preview 接口创建多个预览任务，轮询状态直到全部完成
- */
-import { useState, useCallback, useMemo, useEffect, useRef } from "react"
-import { createPreview, getPreviewStatus } from "@/api/generation"
-import type { PreviewTaskResponse, PreviewStatus as ApiPreviewStatus } from "@/api/generation"
-import type { EditingTemplate } from "@/api/editing-planner"
-import { safeExtractError } from "./generate-video/errorUtils"
-
-/** 安全地将值转为字符串，防止对象被直接渲染导致 React Error #31 */
-const safeString = (val: unknown, fallback: string): string => {
-  if (val == null) return fallback
-  const s = safeExtractError(val)
-  return s || fallback
-}
-
-/** 安全地将值转为数字，防止非数字值进入渲染 */
-const safeNumber = (val: unknown, fallback = 0): number => {
-  if (typeof val === "number" && !Number.isNaN(val)) return val
-  if (typeof val === "string") {
-    const n = Number(val)
-    return Number.isNaN(n) ? fallback : n
-  }
-  return fallback
-}
-
-interface UseStep4PreviewProps {
-  templates: EditingTemplate[]
-  selectedTemplate: string
-  materialMode: "manual" | "auto"
-  selectedMaterials: string[]
-  smartSelectedIds: string[]
-  duration: number
-  videoRatio: string
-  /** 配音 voice_ids（传给后端，让预览包含配音音频） */
-  voiceIds?: string[]
-  /** 配音素材库ID（用户选择的上传音频或AI配音素材） */
-  voiceLibraryId?: string
-  /** 要生成的预览数量 */
-  previewCount?: number
-}
-
-export type PreviewStatus = "idle" | "pending" | "generating" | "ready" | "error"
-
-/** 单个预览生成结果 */
-export interface PreviewResult {
-  taskId: string
-  videoUrl: string
-  clipCount: number
-  transitionCount: number
-  materialUsage: number
-  duration: number
-  fileSize: number
-  generateDuration: number
-  progress: number
-}
-
-/** 单个预览项的完整状态（用于多预览） */
-export interface PreviewItem {
-  index: number
-  status: PreviewStatus
-  result: PreviewResult | null
-  error: string
-  progress: number
-}
-
-// 轮询超时时间（10 分钟）
-const POLL_TIMEOUT_MS = 10 * 60 * 1000
-
-/** 初始单项状态 */
-const createInitialItem = (index: number): PreviewItem => ({
-  index,
-  status: "idle",
-  result: null,
-  error: "",
-  progress: 0,
-})
-
-export function useStep4Preview({
-  templates,
-  selectedTemplate,
-  materialMode,
-  selectedMaterials,
-  smartSelectedIds,
-  duration,
-  videoRatio,
-  voiceIds,
-  voiceLibraryId,
-  previewCount = 1,
-}: UseStep4PreviewProps) {
-  const templateName = useMemo(
-    () => templates.find((t) => t.id === selectedTemplate)?.name ?? "未选择",
-    [templates, selectedTemplate],
-  )
-
-  const materialCount = useMemo(() => {
-    if (materialMode === "auto") {
-      return `${smartSelectedIds.length} 个素材（智能匹配）`
-    }
-    return `${selectedMaterials.length} 个素材`
-  }, [materialMode, selectedMaterials.length, smartSelectedIds.length])
-
-  const materialTotal = materialMode === "auto" ? smartSelectedIds.length : selectedMaterials.length
-
-  /* ── 多预览状态 ── */
-  const [items, setItems] = useState<PreviewItem[]>(() =>
-    Array.from({ length: previewCount }, (_, i) => createInitialItem(i)),
-  )
-  const [selectedIndex, setSelectedIndex] = useState(0)
-
-  // 每个任务 ID + 轮询定时器，用于防止竞态条件（按 index 存储）
-  const taskIdsRef = useRef<Map<number, string>>(new Map())
-  const pollTimersRef = useRef<Map<number, ReturnType<typeof setTimeout>>>(new Map())
-  const startTimeRef = useRef<number>(0)
-
-  const clearPollTimer = useCallback((index?: number) => {
-    if (index !== undefined) {
-      const timer = pollTimersRef.current.get(index)
-      if (timer) {
-        clearTimeout(timer)
-        pollTimersRef.current.delete(index)
-      }
-    } else {
-      pollTimersRef.current.forEach((timer) => clearTimeout(timer))
-      pollTimersRef.current.clear()
-    }
-  }, [])
-
-  // 同步 previewCount 变化（增减项）
-  useEffect(() => {
-    setItems((prev) => {
-      if (prev.length === previewCount) return prev
-      if (prev.length > previewCount) return prev.slice(0, previewCount)
-      return [
-        ...prev,
-        ...Array.from({ length: previewCount - prev.length }, (_, i) =>
-          createInitialItem(prev.length + i),
-        ),
-      ]
-    })
-    // 如果 selectedIndex 超出范围，重置
-    setSelectedIndex((prev) => Math.min(prev, previewCount - 1))
-  }, [previewCount])
-
-  /* ── 参数变化时重置所有预览状态 ── */
-  const prevDepsRef = useRef({
-    selectedTemplate,
-    materialMode,
-    selectedMaterials: [...selectedMaterials].sort().join(","),
-    smartSelectedIds: [...smartSelectedIds].sort().join(","),
-    duration,
-    videoRatio,
-    voiceIds: [...(voiceIds || [])].sort().join(","),
-  })
-
-  useEffect(() => {
-    const currentKey = [
-      selectedTemplate,
-      materialMode,
-      [...selectedMaterials].sort().join(","),
-      [...smartSelectedIds].sort().join(","),
-      duration,
-      videoRatio,
-      [...(voiceIds || [])].sort().join(","),
-    ].join("|")
-
-    const prevKey = [
-      prevDepsRef.current.selectedTemplate,
-      prevDepsRef.current.materialMode,
-      prevDepsRef.current.selectedMaterials,
-      prevDepsRef.current.smartSelectedIds,
-      prevDepsRef.current.duration,
-      prevDepsRef.current.videoRatio,
-      prevDepsRef.current.voiceIds,
-    ].join("|")
-
-    if (prevKey !== currentKey && items.some((it) => it.status !== "idle")) {
-      taskIdsRef.current.clear()
-      clearPollTimer()
-      setItems(Array.from({ length: previewCount }, (_, i) => createInitialItem(i)))
-      setSelectedIndex(0)
-    }
-
-    prevDepsRef.current = {
-      selectedTemplate,
-      materialMode,
-      selectedMaterials: [...selectedMaterials].sort().join(","),
-      smartSelectedIds: [...smartSelectedIds].sort().join(","),
-      duration,
-      videoRatio,
-      voiceIds: [...(voiceIds || [])].sort().join(","),
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    selectedTemplate,
-    materialMode,
-    selectedMaterials,
-    smartSelectedIds,
-    duration,
-    videoRatio,
-    voiceIds,
-    previewCount,
-  ])
-
-  // 组件卸载时清理所有轮询
-  useEffect(() => {
-    return () => {
-      clearPollTimer()
-    }
-  }, [clearPollTimer])
-
-  /** 轮询单个预览任务状态 */
-  const pollPreviewStatus = useCallback((index: number, taskId: string) => {
-    const poll = async () => {
-      // 竞态检查
-      if (taskIdsRef.current.get(index) !== taskId) return
-
-      // 超时检查
-      if (Date.now() - startTimeRef.current > POLL_TIMEOUT_MS) {
-        setItems((prev) =>
-          prev.map((it) =>
-            it.index === index ? { ...it, status: "error", error: "预览生成超时，请重试" } : it,
-          ),
-        )
-        return
-      }
-
-      try {
-        const data: PreviewTaskResponse = await getPreviewStatus(taskId)
-
-        if (taskIdsRef.current.get(index) !== taskId) return
-
-        const status = data.status as ApiPreviewStatus
-
-        if (status === "completed") {
-          const result: PreviewResult = {
-            taskId: safeString(data.task_id, ""),
-            videoUrl: safeString(data.video_url, ""),
-            clipCount: safeNumber(data.clip_count),
-            transitionCount: safeNumber(data.transition_count),
-            materialUsage: safeNumber(data.material_usage),
-            duration: safeNumber(data.duration),
-            fileSize: safeNumber(data.file_size),
-            generateDuration: safeNumber(data.generate_duration),
-            progress: 100,
-          }
-          setItems((prev) =>
-            prev.map((it) =>
-              it.index === index ? { ...it, status: "ready", result, progress: 100 } : it,
-            ),
-          )
-          return
-        }
-
-        if (status === "failed") {
-          setItems((prev) =>
-            prev.map((it) =>
-              it.index === index
-                ? {
-                    ...it,
-                    status: "error",
-                    error: safeString(data.error_message, "预览生成失败，请重试"),
-                  }
-                : it,
-            ),
-          )
-          return
-        }
-
-        if (status === "cancelled") {
-          setItems((prev) =>
-            prev.map((it) =>
-              it.index === index ? { ...it, status: "error", error: "预览任务已取消" } : it,
-            ),
-          )
-          return
-        }
-
-        // pending / generating 状态继续轮询
-        const prog = safeNumber(data.progress)
-        const nextStatus: PreviewStatus = status === "pending" ? "pending" : "generating"
-        setItems((prev) =>
-          prev.map((it) =>
-            it.index === index ? { ...it, status: nextStatus, progress: prog } : it,
-          ),
-        )
-        const delay = status === "pending" ? 5000 : 2000
-        pollTimersRef.current.set(index, setTimeout(poll, delay))
-      } catch {
-        if (taskIdsRef.current.get(index) !== taskId) return
-        pollTimersRef.current.set(index, setTimeout(poll, 3000))
-      }
-    }
-
-    pollTimersRef.current.set(index, setTimeout(poll, 1000))
-  }, [])
-
-  /** 生成所有预览 */
-  const generatePreview = useCallback(async () => {
-    if (!selectedTemplate) {
-      setItems((prev) => prev.map((it) => ({ ...it, status: "error", error: "请先选择模板" })))
-      return
-    }
-    if (materialTotal === 0) {
-      setItems((prev) => prev.map((it) => ({ ...it, status: "error", error: "请先选择素材" })))
-      return
-    }
-
-    // 取消之前的所有轮询
-    clearPollTimer()
-    taskIdsRef.current.clear()
-
-    // 初始化所有项为 pending
-    setItems(
-      Array.from({ length: previewCount }, (_, i) => ({
-        index: i,
-        status: "pending" as PreviewStatus,
-        result: null,
-        error: "",
-        progress: 0,
-      })),
-    )
-    setSelectedIndex(0)
-    startTimeRef.current = Date.now()
-
-    const assetIds = materialMode === "auto" ? smartSelectedIds : selectedMaterials
-
-    // 并发创建所有预览任务（Promise.all 并行请求，减少串行等待）
-    const createTasks = Array.from({ length: previewCount }, async (_, i) => {
-      try {
-        const response = await createPreview({
-          template_id: selectedTemplate,
-          asset_ids: assetIds,
-          duration: duration || undefined,
-          video_ratio: videoRatio,
-          voice_ids: voiceIds && voiceIds.length > 0 ? voiceIds : undefined,
-          voice_library_id: voiceLibraryId || undefined,
-        })
-
-        if (startTimeRef.current === 0) return
-
-        taskIdsRef.current.set(i, response.task_id)
-        pollPreviewStatus(i, response.task_id)
-      } catch (e) {
-        const errMsg = safeString(e instanceof Error ? e.message : e, "预览生成失败")
-        setItems((prev) =>
-          prev.map((it) => (it.index === i ? { ...it, status: "error", error: errMsg } : it)),
-        )
-      }
-    })
-    await Promise.all(createTasks)
-  }, [
-    selectedTemplate,
-    materialTotal,
-    materialMode,
-    smartSelectedIds,
-    selectedMaterials,
-    duration,
-    videoRatio,
-    voiceIds,
-    voiceLibraryId,
-    previewCount,
-    clearPollTimer,
-    pollPreviewStatus,
-  ])
-
-  /** 重新生成所有预览 */
-  const regeneratePreview = useCallback(() => {
-    generatePreview()
-  }, [generatePreview])
-
-  /** 是否所有预览都已完成 */
-  const allReady = items.length > 0 && items.every((it) => it.status === "ready")
-  /** 是否至少有一个预览已完成 */
-  const anyReady = items.some((it) => it.status === "ready")
-  /** 是否有任一正在生成中 */
-  const anyGenerating = items.some((it) => it.status === "pending" || it.status === "generating")
-
-  /** 当前选中的预览结果 */
-  const selectedResult = items[selectedIndex]?.result ?? null
-
-  /** 综合状态（兼容旧逻辑） */
-  const previewStatus: PreviewStatus = useMemo(() => {
-    if (items.every((it) => it.status === "idle")) return "idle"
-    if (items.some((it) => it.status === "pending" || it.status === "generating"))
-      return "generating"
-    if (allReady) return "ready"
-    if (items.every((it) => it.status === "error")) return "error"
-    // 部分完成部分出错
-    if (anyReady) return "ready"
-    return "error"
-  }, [items, allReady, anyReady])
-
-  /** 综合进度（取平均） */
-  const progress = useMemo(() => {
-    if (items.length === 0) return 0
-    return Math.round(items.reduce((sum, it) => sum + it.progress, 0) / items.length)
-  }, [items])
-
-  /** 综合错误信息 */
-  const previewError = useMemo(() => {
-    const errorItems = items.filter((it) => it.status === "error" && it.error)
-    if (errorItems.length === 0) return ""
-    if (errorItems.length === 1) return errorItems[0].error
-    return `${errorItems.length} 个预览生成失败`
-  }, [items])
-
-  const canProceed = anyReady
-
-  /** 当前选中预览的 taskId（用于确认生成时复用预览产物） */
-  const selectedTaskId = selectedResult?.taskId ?? ""
-
-  return {
-    templateName,
-    materialCount,
-    duration,
-    videoRatio,
-    // 多预览状态
-    items,
-    selectedIndex,
-    setSelectedIndex,
-    previewCount,
-    // 综合状态
-    previewStatus,
-    previewResult: selectedResult,
-    previewError,
-    progress,
-    canProceed,
-    allReady,
-    anyReady,
-    anyGenerating,
-    generatePreview,
-    regeneratePreview,
-    // 确认生成复用预览产物
-    selectedTaskId,
-  }
-}
-
-export default useStep4Preview

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

@@ -1,188 +1,80 @@
 /**
  * Step 6 封面设置 Hook
- * 封装封面设置的交互逻辑，对接后端封面模板 CRUD API
+ * 封装封面设置的交互逻辑
  */
-import { useCallback, useEffect, useRef, useState } from "react"
-import { message } from "antd"
-import type { CoverConfig, CoverTemplate } from "../../editing-planner/types"
-import { generateCover } from "@/api/template-editor"
-import {
-  fetchCoverTemplates,
-  createCoverTemplate,
-  updateCoverTemplate,
-  deleteCoverTemplate,
-} from "@/api/cover-templates"
+import { useCallback } from "react"
+import type { CoverConfig } from "../../editing-planner/types"
+import { COVER_MODE_LABELS, COVER_MODE_ICONS, DEFAULT_COVER_SETTINGS } from "../constants"
 
 interface UseStep6CoverProps {
   coverSettings: CoverConfig
   onCoverSettingsChange: (settings: CoverConfig) => void
   duration: number
-  /** 当前素材 ID 列表，用于智能封面生成 */
-  assetIds?: string[]
-  /** 当前选中的模板 ID */
-  selectedTemplate?: string
 }
 
 export function useStep6Cover({
   coverSettings,
   onCoverSettingsChange,
   duration,
-  assetIds = [],
-  selectedTemplate = "",
 }: UseStep6CoverProps) {
-  const generatingRef = useRef(false)
-
-  // ── 封面设置弹窗状态 ──
-  const [showCoverSettings, setShowCoverSettings] = useState(false)
-  const [showCoverEditor, setShowCoverEditor] = useState(false)
-  const [selectedTemplateId, setSelectedTemplateId] = useState("default")
-  const [editingTemplate, setEditingTemplate] = useState<CoverTemplate | null>(null)
-  const [coverTemplates, setCoverTemplates] = useState<CoverTemplate[]>([])
-
-  // ── API 加载状态 ──
-  const [templatesLoading, setTemplatesLoading] = useState(false)
-  const [templatesError, setTemplatesError] = useState<string | null>(null)
-
-  /** 从后端加载封面模板列表 */
-  const loadTemplates = useCallback(async () => {
-    setTemplatesLoading(true)
-    setTemplatesError(null)
-    try {
-      const res = await fetchCoverTemplates()
-      setCoverTemplates(res.items || [])
-    } catch (err) {
-      console.error("[Step6] 加载封面模板失败:", err)
-      setTemplatesError("加载模板失败，请稍后重试")
-    } finally {
-      setTemplatesLoading(false)
-    }
+  const formatTime = useCallback((seconds: number) => {
+    const m = Math.floor(seconds / 60)
+    const s = Math.floor(seconds % 60)
+    const ms = Math.floor((seconds % 1) * 10)
+    return `${m.toString().padStart(2, "0")}:${s.toString().padStart(2, "0")}.${ms}`
   }, [])
 
-  /** 弹窗打开时加载模板列表 */
-  useEffect(() => {
-    if (showCoverSettings) {
-      loadTemplates()
-    }
-  }, [showCoverSettings, loadTemplates])
+  const toggleEnabled = useCallback(
+    (enabled: boolean) => {
+      onCoverSettingsChange({ ...coverSettings, enabled })
+    },
+    [coverSettings, onCoverSettingsChange],
+  )
 
-  /** 调用后端智能封面 API，生成封面并更新预览 */
-  const generateAutoCover = useCallback(async () => {
-    if (generatingRef.current) {
-      message.warning("封面正在生成中，请稍候...")
-      return
-    }
+  const setMode = useCallback(
+    (mode: CoverConfig["mode"]) => {
+      onCoverSettingsChange({ ...coverSettings, mode })
+    },
+    [coverSettings, onCoverSettingsChange],
+  )
 
-    if (!selectedTemplate) {
-      message.error("请先选择模板")
-      return
-    }
+  const setFrameTime = useCallback(
+    (frameTime: number) => {
+      onCoverSettingsChange({ ...coverSettings, frame_time: frameTime })
+    },
+    [coverSettings, onCoverSettingsChange],
+  )
 
-    if (assetIds.length === 0) {
-      message.error("请先选择素材")
-      return
-    }
-
-    generatingRef.current = true
-    try {
-      const response = await generateCover(selectedTemplate, {
-        asset_ids: assetIds,
-        cover_type: "ai_frame",
-      })
-      const thumbnailUrl = response.cover?.image_url || ""
-      if (thumbnailUrl) {
+  const handleUpload = useCallback(
+    (file: File) => {
+      const reader = new FileReader()
+      reader.onload = (ev) => {
+        const url = ev.target?.result as string
         onCoverSettingsChange({
           ...coverSettings,
-          thumbnail_url: thumbnailUrl,
-          ai_suggested_time: response.cover?.frame_time ?? null,
+          upload_url: url,
+          thumbnail_url: url,
+          mode: "upload",
         })
-        message.success("封面生成成功")
-      } else {
-        message.warning("封面生成未返回图片，请重试")
-      }
-    } catch (err) {
-      console.warn("[Step6] 智能封面生成失败:", err)
-      message.error("封面生成失败，请稍后重试")
-    } finally {
-      generatingRef.current = false
-    }
-  }, [selectedTemplate, assetIds, coverSettings, onCoverSettingsChange])
-
-  // ── 模板操作方法 ──
-  const handleSelectTemplate = useCallback((id: string) => {
-    setSelectedTemplateId(id)
-  }, [])
-
-  const handleEditTemplate = useCallback((tpl: CoverTemplate) => {
-    setEditingTemplate(tpl)
-    setShowCoverEditor(true)
-  }, [])
-
-  /** 保存模板（创建或更新） */
-  const handleSaveTemplate = useCallback(
-    async (tpl: CoverTemplate) => {
-      try {
-        if (tpl.id && coverTemplates.some((t) => t.id === tpl.id)) {
-          const updated = await updateCoverTemplate(tpl.id, {
-            name: tpl.name,
-            config: tpl.config,
-          })
-          setCoverTemplates((prev) => prev.map((t) => (t.id === tpl.id ? { ...t, ...updated } : t)))
-        } else {
-          const created = await createCoverTemplate({
-            name: tpl.name,
-            config: tpl.config,
-          })
-          setCoverTemplates((prev) => [...prev, created])
-        }
-        setShowCoverEditor(false)
-      } catch (err) {
-        console.error("[Step6] 保存模板失败:", err)
       }
+      reader.readAsDataURL(file)
     },
-    [coverTemplates],
+    [coverSettings, onCoverSettingsChange],
   )
 
-  /** 删除模板 */
-  const handleDeleteTemplate = useCallback(
-    async (id: string) => {
-      try {
-        await deleteCoverTemplate(id)
-        setCoverTemplates((prev) => prev.filter((t) => t.id !== id))
-        if (selectedTemplateId === id) {
-          setSelectedTemplateId("default")
-        }
-      } catch (err) {
-        console.error("[Step6] 删除模板失败:", err)
-      }
-    },
-    [selectedTemplateId],
-  )
-
-  const selectedTemplateName =
-    coverTemplates.find((t) => t.id === selectedTemplateId)?.name || "默认"
-
   const totalDuration = duration || 30
 
   return {
     coverSettings,
-    generateAutoCover,
+    formatTime,
+    toggleEnabled,
+    setMode,
+    setFrameTime,
+    handleUpload,
     totalDuration,
-    showCoverSettings,
-    setShowCoverSettings,
-    showCoverEditor,
-    setShowCoverEditor,
-    selectedTemplateId,
-    setSelectedTemplateId,
-    editingTemplate,
-    coverTemplates,
-    templatesLoading,
-    templatesError,
-    selectedTemplateName,
-    handleSelectTemplate,
-    handleEditTemplate,
-    handleSaveTemplate,
-    handleDeleteTemplate,
-    loadTemplates,
+    COVER_MODE_LABELS,
+    COVER_MODE_ICONS,
+    DEFAULT_COVER_SETTINGS,
   }
 }
 

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

@@ -3,13 +3,11 @@
  * 封装生成确认页的展示逻辑
  */
 import { useMemo } from "react"
-import { useQuery } from "@tanstack/react-query"
 import type { EditingTemplate } from "@/api/editing-planner"
 import type { GeneratedVideo } from "@/api/template-editor"
 import type { CoverConfig } from "../../editing-planner/types"
 import type { VoiceClone } from "@/api/voice-clone"
 import type { PresetVoiceItem } from "@/api/voices"
-import { getAssetsByKind } from "@/api/assets"
 import { COVER_MODE_LABELS } from "../constants"
 
 interface UseStep7GenerateProps {
@@ -41,11 +39,11 @@ export function useStep7Generate({
   selectedMaterials,
   smartSelectedIds,
   title,
-  voiceMode: _voiceMode,
+  voiceMode,
   selectedVoice,
-  selectedClonedVoice: _selectedClonedVoice,
-  presetVoices: _presetVoices,
-  clonedVoices: _clonedVoices,
+  selectedClonedVoice,
+  presetVoices,
+  clonedVoices,
   coverSettings,
   generateCount,
   onGenerateCountChange,
@@ -67,16 +65,14 @@ export function useStep7Generate({
     return `${selectedMaterials.length} 个素材`
   }, [materialMode, selectedMaterials.length, smartSelectedIds.length])
 
-  // 从配音素材库中查找 voiceName
-  const { data: voiceMaterials = [] } = useQuery({
-    queryKey: ["assets", "voice"],
-    queryFn: () => getAssetsByKind("voice", { limit: 50 }),
-  })
-
   const voiceName = useMemo(() => {
-    const asset = voiceMaterials.find((v) => v.id === selectedVoice)
-    return asset ? asset.name : "未选择"
-  }, [voiceMaterials, selectedVoice])
+    if (voiceMode === "clone") {
+      const cv = clonedVoices.find((v) => v.id === selectedClonedVoice)
+      return cv ? cv.name : "未选择"
+    }
+    const pv = presetVoices.find((v) => v.voice_id === selectedVoice)
+    return pv ? pv.name : "未选择"
+  }, [voiceMode, selectedVoice, selectedClonedVoice, presetVoices, clonedVoices])
 
   const coverSummary = useMemo(() => {
     if (!coverSettings.enabled) return "不使用"

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

@@ -1,7 +1,6 @@
 /**
  * GeneratePage 步骤导航
  * 管理步骤切换与各步骤的前置校验
- * 步骤顺序：模板(1) → 素材(2) → 配音(3) → 预览(4) → 标题(5) → 封面(6) → 确认(7)
  */
 import { message } from "antd"
 import type { TitleSettings } from "../types"
@@ -14,7 +13,7 @@ export interface UseStepNavigationOptions {
   selectedMaterials: string[]
   smartSelectedIds: string[]
   titleSettings: TitleSettings
-  /** Step4 是否已生成预览 */
+  /** Step3 是否已生成预览（Step3校验用） */
   previewReady: boolean
 }
 
@@ -48,12 +47,11 @@ export const useStepNavigation = (options: UseStepNavigationOptions): UseStepNav
       message.warning("请先进行智能匹配并选择素材")
       return
     }
-    // Step3 配音：配音为可选项，不强制校验，用户可跳过
-    if (currentStep === 4 && !previewReady) {
+    if (currentStep === 3 && !previewReady) {
       message.warning("请先生成剪辑预览")
       return
     }
-    if (currentStep === 5 && !titleSettings.title.trim()) {
+    if (currentStep === 4 && !titleSettings.title.trim()) {
       message.warning("请选择或输入标题")
       return
     }

apps/web/src/pages/products/products.css

@@ -991,17 +991,19 @@
 /* ============================================================
    响应式
    ============================================================ */
-@media (max-width: 1200px) {
+@media (max-width: 1400px) {
   .xx-products-grid {
     grid-template-columns: repeat(3, 1fr);
   }
 }
 
-@media (max-width: 768px) {
+@media (max-width: 992px) {
   .xx-products-grid {
     grid-template-columns: repeat(2, 1fr);
   }
+}
 
+@media (max-width: 768px) {
   .xx-products-page {
     padding: var(--space-md);
   }

apps/web/src/pages/tasks/tasks.css

@@ -31,9 +31,9 @@
   justify-content: space-between;
   margin-bottom: var(--space-lg);
   padding: var(--space-md);
-  background: var(--bg-primary);
+  background: var(--bg-surface);
   border-radius: var(--radius-lg);
-  border: 1px solid var(--border-color);
+  border: 1px solid var(--border-primary);
 }
 
 .task-status-tabs {
@@ -56,10 +56,10 @@
 
 /* 表格 */
 .task-table {
-  background: var(--bg-primary);
+  background: var(--bg-surface);
   border-radius: var(--radius-lg);
   overflow: hidden;
-  border: 1px solid var(--border-color);
+  border: 1px solid var(--border-primary);
 }
 
 .task-table .ant-table {
@@ -68,7 +68,7 @@
 
 .task-table .ant-table-thead > tr > th {
   background: var(--bg-secondary);
-  border-bottom: 1px solid var(--border-color);
+  border-bottom: 1px solid var(--border-primary);
   font-weight: var(--font-weight-semibold);
   font-size: var(--font-size-sm);
   color: var(--text-secondary);
@@ -79,7 +79,7 @@
 }
 
 .task-table .ant-table-tbody > tr:hover > td {
-  background: var(--bg-tertiary);
+  background: var(--bg-hover);
 }
 
 /* 任务 ID */
@@ -122,7 +122,7 @@
 
 /* 操作按钮 */
 .task-retry-btn {
-  color: var(--color-primary-500);
+  color: var(--primary-500);
 }
 
 .task-retry-btn:hover {
@@ -139,7 +139,7 @@
   padding: var(--space-md);
   background: var(--bg-secondary);
   border-radius: var(--radius-md);
-  border: 1px solid var(--border-color);
+  border: 1px solid var(--border-primary);
 }
 
 .task-error-header {
@@ -148,7 +148,7 @@
   gap: var(--space-sm);
   margin-bottom: var(--space-md);
   font-weight: var(--font-weight-semibold);
-  color: var(--error);
+  color: var(--error-500, #ef4444);
 }
 
 .task-error-icon {
@@ -175,7 +175,7 @@
 }
 
 .task-error-message {
-  color: var(--error);
+  color: var(--error-500, #ef4444);
   word-break: break-all;
 }
 
@@ -186,7 +186,7 @@
 .task-error-stack pre {
   margin: var(--space-xs) 0 0 0;
   padding: var(--space-sm);
-  background: var(--bg-primary);
+  background: var(--bg-surface);
   border-radius: var(--radius-sm);
   font-size: var(--font-size-xs);
   color: var(--text-secondary);
@@ -224,7 +224,7 @@
 .task-error {
   padding: var(--space-2xl);
   text-align: center;
-  color: var(--error);
+  color: var(--error-500, #ef4444);
 }
 
 .task-error .anticon {

apps/web/src/pages/templates/templates.css

@@ -439,7 +439,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  z-index: var(--z-modal);
+  z-index: 1000;
   padding: 20px;
   animation: fadeIn 0.2s ease;
 }
@@ -717,13 +717,13 @@
 /* ============================================================
    响应式
    ============================================================ */
-@media (max-width: 1400px) {
+@media (max-width: 1200px) {
   .xx-templates-grid {
     grid-template-columns: repeat(3, 1fr);
   }
 }
 
-@media (max-width: 1024px) {
+@media (max-width: 768px) {
   .xx-templates-page {
     padding: var(--space-md);
   }

apps/web/src/pages/titles/components/title-library/AIGenerateModal.tsx

@@ -1,5 +1,5 @@
 import React from "react"
-import Modal from "@/components/ui/Modal"
+import { Modal as AntModal } from "antd"
 import { CopyOutlined, CheckOutlined } from "@ant-design/icons"
 import { Button, Input } from "@/components/ui"
 import { AI_KEYWORD_MAX_LENGTH } from "../../constants/titleLibrary"
@@ -28,7 +28,7 @@ export const AIGenerateModal: React.FC<AIGenerateModalProps> = ({
   onAdopt,
 }) => {
   return (
-    <Modal
+    <AntModal
       title="AI 生成标题"
       open={open}
       onCancel={onCancel}
@@ -116,6 +116,6 @@ export const AIGenerateModal: React.FC<AIGenerateModalProps> = ({
           </div>
         )}
       </div>
-    </Modal>
+    </AntModal>
   )
 }

apps/web/src/pages/titles/components/title-library/CreateTitleModal.tsx

@@ -1,5 +1,5 @@
 import React from "react"
-import Modal from "@/components/ui/Modal"
+import { Modal as AntModal } from "antd"
 import { Input, Select } from "@/components/ui"
 import type { TitleType } from "../../types/titleLibrary"
 import { TITLE_MAX_LENGTH } from "../../constants/titleLibrary"
@@ -30,7 +30,7 @@ export const CreateTitleModal: React.FC<CreateTitleModalProps> = ({
   onSubmit,
 }) => {
   return (
-    <Modal
+    <AntModal
       title="新建标题"
       open={open}
       onCancel={onCancel}
@@ -84,6 +84,6 @@ export const CreateTitleModal: React.FC<CreateTitleModalProps> = ({
           />
         </div>
       </div>
-    </Modal>
+    </AntModal>
   )
 }

apps/web/src/pages/titles/titles.css

@@ -21,7 +21,6 @@
   grid-template-columns: 220px 1fr;
   gap: 20px;
   align-items: start;
-  overflow: visible;
 }
 
 /* ============================================================
@@ -33,7 +32,6 @@
   gap: var(--space-sm);
   position: sticky;
   top: var(--space-md);
-  align-self: start;
 }
 
 .xx-title-category-item {

apps/web/src/pages/voice-clone/voice-clone.css

@@ -264,7 +264,7 @@
   position: fixed;
   top: 80px;
   right: 20px;
-  z-index: var(--z-toast);
+  z-index: 1000;
   display: flex;
   flex-direction: column;
   gap: 8px;
@@ -310,7 +310,7 @@
 .vc-edit-overlay {
   position: fixed;
   inset: 0;
-  z-index: var(--z-modal);
+  z-index: 1000;
   display: grid;
   place-items: center;
   background: var(--overlay-bg);

apps/web/src/pages/voice-materials/voice-materials.css

@@ -351,19 +351,18 @@
 .vmat-list {
   display: flex;
   flex-direction: column;
-  border: 1px solid var(--border-color);
+  border: 1px solid var(--border-primary);
   border-radius: var(--radius-lg);
-  overflow-x: auto;
+  overflow: hidden;
 }
 
 .vmat-list-header {
   display: grid;
   grid-template-columns: 48px 1fr 80px 160px 120px 60px 70px 80px;
-  min-width: 700px;
   align-items: center;
   padding: 10px 16px;
   background: var(--bg-secondary);
-  border-bottom: 1px solid var(--border-color);
+  border-bottom: 1px solid var(--border-primary);
   font-size: 12px;
   font-weight: 600;
   color: var(--text-secondary);
@@ -374,7 +373,6 @@
 .vmat-row {
   display: grid;
   grid-template-columns: 48px 1fr 80px 160px 120px 60px 70px 80px;
-  min-width: 700px;
   align-items: center;
   padding: 12px 16px;
   border-bottom: 1px solid var(--border-light);
@@ -1064,7 +1062,6 @@
 .vmat-list.batch-mode .vmat-list-header,
 .vmat-list.batch-mode .vmat-row {
   grid-template-columns: 30px 48px 1fr 80px 160px 120px 60px 70px 80px;
-  min-width: 730px;
 }
 
 /* ─── 标签筛选药丸条 ─────────────────────────────────────── */

apps/web/src/pages/voices/VoiceLibrary.tsx

@@ -117,9 +117,11 @@ const VoiceLibrary: React.FC = () => {
     uploadOpen,
     uploadFile,
     uploadName,
+    uploadGender,
     uploadDesc,
     uploadProgress,
     setUploadName,
+    setUploadGender,
     setUploadDesc,
     setUploadOpen,
     handleFileSelect,
@@ -250,12 +252,14 @@ const VoiceLibrary: React.FC = () => {
         uploadOpen={uploadOpen}
         uploadFile={uploadFile}
         uploadName={uploadName}
+        uploadGender={uploadGender}
         uploadDesc={uploadDesc}
         uploadProgress={uploadProgress}
         onUploadClose={handleUploadClose}
         onFileSelect={handleFileSelect}
         onFileRemove={handleFileRemove}
         onNameChange={setUploadName}
+        onGenderChange={setUploadGender}
         onDescChange={setUploadDesc}
         onUpload={handleUpload}
         ttsOpen={ttsOpen}

apps/web/src/pages/voices/components/UploadVoiceModal.tsx

@@ -14,12 +14,14 @@ const UploadVoiceModal: React.FC<UploadVoiceModalProps> = ({
   open,
   uploadFile,
   uploadName,
+  uploadGender,
   uploadDesc,
   uploadProgress,
   onClose,
   onFileSelect,
   onFileRemove,
   onNameChange,
+  onGenderChange,
   onDescChange,
   onUpload,
 }) => {
@@ -28,7 +30,7 @@ const UploadVoiceModal: React.FC<UploadVoiceModalProps> = ({
 
   return (
     <Modal
-      title={<span style={{ fontSize: 16, fontWeight: 600 }}>上传配音素材</span>}
+      title="上传音频"
       open={open}
       onCancel={() => {
         if (uploading) return // 上传中不可关闭
@@ -43,7 +45,7 @@ const UploadVoiceModal: React.FC<UploadVoiceModalProps> = ({
           display: "flex",
           flexDirection: "column",
           gap: 16,
-          padding: "12px 0 4px",
+          padding: "8px 0",
         }}
       >
         {/* 拖拽上传区 */}
@@ -62,9 +64,11 @@ const UploadVoiceModal: React.FC<UploadVoiceModalProps> = ({
         {/* 表单字段 */}
         <FormFields
           name={uploadName}
+          gender={uploadGender}
           desc={uploadDesc}
           disabled={uploading}
           onNameChange={onNameChange}
+          onGenderChange={onGenderChange}
           onDescChange={onDescChange}
         />
 

apps/web/src/pages/voices/components/VoiceModals.tsx

@@ -2,7 +2,7 @@
  * VoiceLibrary 弹窗集合
  */
 import React from "react"
-import type { ClonedVoiceDisplay, PresetVoiceDisplay } from "../types"
+import type { ClonedVoiceDisplay, PresetVoiceDisplay, VoiceGender } from "../types"
 import type { VoiceClone } from "@/api/voice-clone"
 import type { TtsStatus } from "./TtsModal"
 import CloneModal from "@/components/voice/CloneModal"
@@ -27,12 +27,14 @@ export interface VoiceModalsProps {
   uploadOpen: boolean
   uploadFile: File | null
   uploadName: string
+  uploadGender: VoiceGender
   uploadDesc: string
   uploadProgress: number | null
   onUploadClose: () => void
   onFileSelect: (file: File) => void
   onFileRemove: () => void
   onNameChange: (name: string) => void
+  onGenderChange: (gender: VoiceGender) => void
   onDescChange: (desc: string) => void
   onUpload: () => void
 
@@ -65,12 +67,14 @@ export const VoiceModals: React.FC<VoiceModalsProps> = ({
   uploadOpen,
   uploadFile,
   uploadName,
+  uploadGender,
   uploadDesc,
   uploadProgress,
   onUploadClose,
   onFileSelect,
   onFileRemove,
   onNameChange,
+  onGenderChange,
   onDescChange,
   onUpload,
   ttsOpen,
@@ -109,12 +113,14 @@ export const VoiceModals: React.FC<VoiceModalsProps> = ({
         open={uploadOpen}
         uploadFile={uploadFile}
         uploadName={uploadName}
+        uploadGender={uploadGender}
         uploadDesc={uploadDesc}
         uploadProgress={uploadProgress}
         onClose={onUploadClose}
         onFileSelect={onFileSelect}
         onFileRemove={onFileRemove}
         onNameChange={onNameChange}
+        onGenderChange={onGenderChange}
         onDescChange={onDescChange}
         onUpload={onUpload}
       />

apps/web/src/pages/voices/components/upload-voice-modal/ActionButtons.tsx

@@ -1,5 +1,4 @@
 import React from "react"
-import { Button } from "antd"
 
 interface ActionButtonsProps {
   uploading: boolean
@@ -14,6 +13,12 @@ const ActionButtons: React.FC<ActionButtonsProps> = ({
   onCancel,
   onUpload,
 }) => {
+  const disabled = uploading || !canUpload
+
+  const handleUpload = () => {
+    onUpload()
+  }
+
   return (
     <div
       style={{
@@ -23,32 +28,39 @@ const ActionButtons: React.FC<ActionButtonsProps> = ({
         paddingTop: 4,
       }}
     >
-      <Button
+      <button
+        type="button"
         onClick={onCancel}
         disabled={uploading}
         style={{
-          height: 36,
+          padding: "8px 20px",
           borderRadius: 8,
+          border: "1px solid var(--border-color)",
+          background: "transparent",
           fontSize: 13,
+          cursor: uploading ? "not-allowed" : "pointer",
+          color: "var(--text-secondary)",
         }}
       >
         取消
-      </Button>
-      <Button
-        type="primary"
-        onClick={onUpload}
-        disabled={!canUpload}
-        loading={uploading}
+      </button>
+      <button
+        type="button"
+        onClick={handleUpload}
+        disabled={disabled}
         style={{
-          height: 36,
+          padding: "8px 20px",
           borderRadius: 8,
+          border: "none",
+          background: disabled ? "var(--text-tertiary)" : "var(--primary-color)",
+          color: "#fff",
           fontSize: 13,
           fontWeight: 600,
-          minWidth: 100,
+          cursor: disabled ? "not-allowed" : "pointer",
         }}
       >
-        {uploading ? "上传中" : "开始上传"}
-      </Button>
+        {uploading ? "上传中..." : "开始上传"}
+      </button>
     </div>
   )
 }

apps/web/src/pages/voices/components/upload-voice-modal/FileInfoCard.tsx

@@ -10,55 +10,28 @@ const FileInfoCard: React.FC<FileInfoCardProps> = ({ file }) => {
   return (
     <div
       style={{
-        padding: "10px 14px",
+        padding: "10px 12px",
         background: "var(--bg-secondary)",
-        borderRadius: 10,
+        borderRadius: 8,
         display: "flex",
         alignItems: "center",
-        gap: 12,
-        border: "1px solid var(--border-color)",
-        boxShadow: "0 1px 3px rgba(0, 0, 0, 0.04)",
+        gap: 10,
       }}
     >
-      {/* 文件图标圆形底托 */}
-      <div
-        style={{
-          width: 36,
-          height: 36,
-          borderRadius: "50%",
-          background: "var(--primary-soft, rgba(22, 119, 255, 0.1))",
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "center",
-          flexShrink: 0,
-        }}
-      >
-        <SoundOutlined style={{ fontSize: 16, color: "var(--primary-color)" }} />
-      </div>
-
-      {/* 文件信息 */}
+      <SoundOutlined style={{ fontSize: 18, color: "var(--primary-color)" }} />
       <div style={{ flex: 1, minWidth: 0 }}>
         <div
           style={{
             fontSize: 13,
             fontWeight: 500,
-            color: "var(--text-primary)",
             overflow: "hidden",
             textOverflow: "ellipsis",
             whiteSpace: "nowrap",
-            lineHeight: 1.4,
           }}
         >
           {file.name}
         </div>
-        <div
-          style={{
-            fontSize: 12,
-            color: "var(--text-secondary)",
-            marginTop: 2,
-            lineHeight: 1.3,
-          }}
-        >
+        <div style={{ fontSize: 11, color: "var(--text-secondary)" }}>
           {formatFileSize(file.size)}
         </div>
       </div>

apps/web/src/pages/voices/components/upload-voice-modal/FileUploadZone.tsx

@@ -14,8 +14,6 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
   onFileSelect,
   onFileRemove,
 }) => {
-  const [isHovered, setIsHovered] = React.useState(false)
-
   return (
     <Upload.Dragger
       accept={UPLOAD_CONFIG.accept}
@@ -30,73 +28,25 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
       showUploadList={false}
       disabled={disabled}
     >
-      <div
+      <p
         style={{
-          display: "flex",
-          flexDirection: "column",
-          alignItems: "center",
-          justifyContent: "center",
-          padding: "20px 16px",
-          borderRadius: 12,
-          background: isHovered
-            ? "var(--primary-soft, rgba(22, 119, 255, 0.08))"
-            : "var(--primary-soft, rgba(22, 119, 255, 0.03))",
-          border: `2px dashed ${isHovered ? "var(--primary-color)" : "var(--border-color)"}`,
-          transition: "all 0.25s ease",
-          cursor: disabled ? "not-allowed" : "pointer",
-          opacity: disabled ? 0.6 : 1,
+          fontSize: 32,
+          color: "var(--primary-color)",
+          marginBottom: 8,
         }}
-        onMouseEnter={() => setIsHovered(true)}
-        onMouseLeave={() => setIsHovered(false)}
       >
-        {/* 图标圆形底托 */}
-        <div
-          style={{
-            width: 44,
-            height: 44,
-            borderRadius: "50%",
-            background: "var(--primary-soft, rgba(22, 119, 255, 0.1))",
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            marginBottom: 10,
-            transition: "transform 0.2s ease",
-            transform: isHovered ? "scale(1.08)" : "scale(1)",
-          }}
-        >
-          <UploadOutlined
-            style={{
-              fontSize: 20,
-              color: "var(--primary-color)",
-            }}
-          />
-        </div>
-
-        {/* 主文案 */}
-        <p
-          style={{
-            fontSize: 14,
-            fontWeight: 500,
-            color: "var(--text-primary)",
-            margin: "0 0 6px",
-            lineHeight: 1.4,
-          }}
-        >
-          点击或拖拽音频文件到此处
-        </p>
-
-        {/* 副文案 */}
-        <p
-          style={{
-            fontSize: 12,
-            color: "var(--text-secondary)",
-            margin: 0,
-            lineHeight: 1.4,
-          }}
-        >
-          支持 MP3、WAV、AAC、FLAC 等格式，最大 {UPLOAD_CONFIG.maxSizeMB}MB
-        </p>
-      </div>
+        <UploadOutlined />
+      </p>
+      <p style={{ fontSize: 14, fontWeight: 500, margin: "0 0 4px" }}>点击或拖拽音频文件到此处</p>
+      <p
+        style={{
+          fontSize: 12,
+          color: "var(--text-secondary)",
+          margin: 0,
+        }}
+      >
+        支持 MP3、WAV、AAC、FLAC 等格式，最大 {UPLOAD_CONFIG.maxSizeMB}MB
+      </p>
     </Upload.Dragger>
   )
 }

apps/web/src/pages/voices/components/upload-voice-modal/FormFields.tsx

@@ -1,91 +1,101 @@
 import React from "react"
-import { UPLOAD_CONFIG } from "./types"
+import type { VoiceGender } from "@/pages/voices/types"
+import { GENDER_OPTIONS, UPLOAD_CONFIG } from "./types"
 
 interface FormFieldsProps {
   name: string
+  gender: VoiceGender
   desc: string
   disabled: boolean
   onNameChange: (name: string) => void
+  onGenderChange: (gender: VoiceGender) => void
   onDescChange: (desc: string) => void
 }
 
 const labelStyle: React.CSSProperties = {
-  fontSize: 12,
-  fontWeight: 600,
-  color: "var(--text-primary, #333)",
+  fontSize: 13,
+  color: "var(--text-secondary)",
   marginBottom: 6,
-  letterSpacing: "0.02em",
 }
 
-const baseInputStyle: React.CSSProperties = {
+const inputStyle: React.CSSProperties = {
   width: "100%",
-  padding: "10px 12px",
+  padding: "8px 12px",
   border: "1px solid var(--border-color)",
   borderRadius: 8,
   fontSize: 13,
   background: "var(--bg-primary)",
   color: "var(--text-primary)",
   outline: "none",
-  transition: "border-color 0.2s ease, box-shadow 0.2s ease",
-  lineHeight: 1.5,
-}
-
-const focusStyle: React.CSSProperties = {
-  borderColor: "var(--primary-color)",
-  boxShadow: "0 0 0 2px var(--primary-soft, rgba(22, 119, 255, 0.12))",
 }
 
 const FormFields: React.FC<FormFieldsProps> = ({
   name,
+  gender,
   desc,
   disabled,
   onNameChange,
+  onGenderChange,
   onDescChange,
 }) => {
   return (
     <>
       {/* 名称 */}
       <div>
-        <div style={labelStyle}>配音名称</div>
+        <div style={labelStyle}>素材名称</div>
         <input
           value={name}
           onChange={(e) => onNameChange(e.target.value)}
-          placeholder="输入配音名称"
+          placeholder="输入素材名称"
           maxLength={UPLOAD_CONFIG.maxNameLength}
           disabled={disabled}
-          style={baseInputStyle}
-          onFocus={(e) => {
-            Object.assign(e.target.style, focusStyle)
-          }}
-          onBlur={(e) => {
-            e.target.style.borderColor = "var(--border-color)"
-            e.target.style.boxShadow = "none"
-          }}
+          style={inputStyle}
         />
       </div>
 
+      {/* 性别选择 */}
+      <div>
+        <div style={labelStyle}>音色性别</div>
+        <div style={{ display: "flex", gap: 8 }}>
+          {GENDER_OPTIONS.map((opt) => (
+            <button
+              key={opt.value}
+              type="button"
+              onClick={() => onGenderChange(opt.value)}
+              disabled={disabled}
+              style={{
+                flex: 1,
+                padding: "6px 0",
+                borderRadius: 8,
+                border: `1px solid ${gender === opt.value ? "var(--primary-color)" : "var(--border-color)"}`,
+                background: gender === opt.value ? "var(--primary-soft)" : "transparent",
+                color: gender === opt.value ? "var(--primary-color)" : "var(--text-secondary)",
+                fontSize: 13,
+                fontWeight: gender === opt.value ? 600 : 400,
+                cursor: disabled ? "not-allowed" : "pointer",
+                transition: "all 0.2s",
+              }}
+            >
+              {opt.label}
+            </button>
+          ))}
+        </div>
+      </div>
+
       {/* 描述 */}
       <div>
-        <div style={labelStyle}>配音描述（可选）</div>
+        <div style={labelStyle}>音色描述（可选）</div>
         <textarea
           value={desc}
           onChange={(e) => onDescChange(e.target.value)}
-          placeholder="描述这段配音的内容..."
+          placeholder="描述这个音色的特点..."
           maxLength={UPLOAD_CONFIG.maxDescLength}
           rows={2}
           disabled={disabled}
           style={{
-            ...baseInputStyle,
+            ...inputStyle,
             resize: "vertical",
             fontFamily: "inherit",
-            minHeight: 56,
-          }}
-          onFocus={(e) => {
-            Object.assign(e.target.style, focusStyle)
-          }}
-          onBlur={(e) => {
-            e.target.style.borderColor = "var(--border-color)"
-            e.target.style.boxShadow = "none"
           }}
         />
       </div>

apps/web/src/pages/voices/components/upload-voice-modal/UploadProgress.tsx

@@ -6,40 +6,25 @@ interface UploadProgressProps {
 
 const UploadProgress: React.FC<UploadProgressProps> = ({ progress }) => {
   return (
-    <div
-      style={{
-        padding: "12px 16px",
-        background: "var(--bg-secondary)",
-        borderRadius: 10,
-        textAlign: "center",
-        border: "1px solid var(--border-color)",
-      }}
-    >
+    <div style={{ textAlign: "center", padding: "8px 0" }}>
       <div
         style={{
-          fontSize: 20,
+          fontSize: 22,
           fontWeight: 700,
           color: "var(--primary-color)",
-          lineHeight: 1.2,
         }}
       >
         {progress}%
       </div>
-      <div
-        style={{
-          fontSize: 12,
-          color: "var(--text-secondary)",
-          marginTop: 2,
-          marginBottom: 10,
-        }}
-      >
+      <div style={{ fontSize: 12, color: "var(--text-secondary)" }}>
         {progress < 100 ? "上传中..." : "处理中..."}
       </div>
       <div
         style={{
           height: 4,
-          background: "var(--bg-tertiary, #f0f0f0)",
+          background: "var(--bg-tertiary)",
           borderRadius: 2,
+          marginTop: 8,
           overflow: "hidden",
         }}
       >
@@ -47,7 +32,7 @@ const UploadProgress: React.FC<UploadProgressProps> = ({ progress }) => {
           style={{
             height: "100%",
             width: `${progress}%`,
-            background: progress < 100 ? "var(--primary-color)" : "var(--success-color, #52c41a)",
+            background: "var(--primary-color)",
             borderRadius: 2,
             transition: "width 0.3s ease",
           }}

apps/web/src/pages/voices/components/upload-voice-modal/types.ts

@@ -1,17 +1,27 @@
+import type { VoiceGender } from "@/pages/voices/types"
+
 export interface UploadVoiceModalProps {
   open: boolean
   uploadFile: File | null
   uploadName: string
+  uploadGender: VoiceGender
   uploadDesc: string
   uploadProgress: number | null
   onClose: () => void
   onFileSelect: (file: File) => void
   onFileRemove: () => void
   onNameChange: (name: string) => void
+  onGenderChange: (gender: VoiceGender) => void
   onDescChange: (desc: string) => void
   onUpload: () => void
 }
 
+export const GENDER_OPTIONS: { value: VoiceGender; label: string }[] = [
+  { value: "female", label: "女声" },
+  { value: "male", label: "男声" },
+  { value: "child", label: "童声" },
+]
+
 export const UPLOAD_CONFIG = {
   maxSizeMB: 200,
   maxNameLength: 100,

apps/web/src/pages/voices/hooks/useVoiceUpload.ts

@@ -1,5 +1,6 @@
 import { useState, useCallback } from "react"
 import { useMutation, useQueryClient } from "@tanstack/react-query"
+import { type VoiceGender } from "../types"
 import { uploadAssetDirect, getAssetLibraries, createAsset } from "@/api/assets"
 import { getAudioDuration } from "../utils/audio"
 import { buildVoiceMetadata } from "../types"
@@ -18,11 +19,17 @@ export function useVoiceUpload({ showToast }: UseVoiceUploadProps) {
   const [uploadOpen, setUploadOpen] = useState(false)
   const [uploadFile, setUploadFile] = useState<File | null>(null)
   const [uploadName, setUploadName] = useState("")
+  const [uploadGender, setUploadGender] = useState<VoiceGender>("female")
   const [uploadDesc, setUploadDesc] = useState("")
   const [uploadProgress, setUploadProgress] = useState<number | null>(null)
 
   const uploadMutation = useMutation({
-    mutationFn: async (data: { file: File; name: string; description: string }) => {
+    mutationFn: async (data: {
+      file: File
+      name: string
+      gender: VoiceGender
+      description: string
+    }) => {
       setUploadProgress(0)
       try {
         /* 获取或创建默认配音库 */
@@ -50,6 +57,7 @@ export function useVoiceUpload({ showToast }: UseVoiceUploadProps) {
           storage_key,
           mime_type: data.file.type || "audio/mpeg",
           metadata: buildVoiceMetadata({
+            gender: data.gender,
             description: data.description,
             duration,
           }),
@@ -63,15 +71,8 @@ export function useVoiceUpload({ showToast }: UseVoiceUploadProps) {
       showToast("上传成功", "success")
       handleUploadClose()
     },
-    onError: (err: Error & { response?: { status?: number } }) => {
-      const status = err?.response?.status
-      let msg = "上传失败，请重试"
-      if (status && status >= 500) {
-        msg = "服务器暂时不可用，请稍后重试"
-      } else if (err?.message) {
-        msg = err.message
-      }
-      showToast(msg, "error")
+    onError: (err: Error) => {
+      showToast(err.message || "上传失败，请重试", "error")
     },
   })
 
@@ -101,9 +102,10 @@ export function useVoiceUpload({ showToast }: UseVoiceUploadProps) {
     uploadMutation.mutate({
       file: uploadFile,
       name: uploadName.trim(),
+      gender: uploadGender,
       description: uploadDesc.trim(),
     })
-  }, [uploadFile, uploadName, uploadDesc, uploadMutation])
+  }, [uploadFile, uploadName, uploadGender, uploadDesc, uploadMutation])
 
   return {
     // 弹窗状态
@@ -112,11 +114,13 @@ export function useVoiceUpload({ showToast }: UseVoiceUploadProps) {
     // 表单状态
     uploadFile,
     uploadName,
+    uploadGender,
     uploadDesc,
     uploadProgress,
     isUploading: uploadMutation.isPending,
     // Setters
     setUploadName,
+    setUploadGender,
     setUploadDesc,
     // Handlers
     handleFileSelect,

apps/web/src/pages/voices/voices.css

@@ -733,7 +733,7 @@
 .xx-clone-detail-overlay {
   position: fixed;
   inset: 0;
-  z-index: var(--z-modal);
+  z-index: 1000;
   display: grid;
   place-items: center;
   background: var(--overlay-bg, rgba(0, 0, 0, 0.4));

apps/web/src/router/ProtectedRoute.tsx

@@ -3,6 +3,7 @@ import { Navigate } from "react-router-dom"
 import { useAuthStore } from "@/store/authStore"
 
 /** 受保护的路由组件 */
+// eslint-disable-next-line react-refresh/only-export-components
 export const ProtectedRoute = ({ children }: { children: React.ReactNode }) => {
   const isAuthenticated = useAuthStore((state) => state.isAuthenticated)
   const hasAccessToken = Boolean(localStorage.getItem("access_token"))

apps/web/src/test/api/client.test.ts

@@ -26,10 +26,12 @@ import { refreshAccessToken } from "@/api/auth"
 import apiClient from "@/api/client"
 
 // 从真实实例取出拦截器回调
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const requestHandlers = (apiClient as any).interceptors.request.handlers as Array<{
   fulfilled: (config: unknown) => unknown
   rejected: (error: unknown) => unknown
 }>
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const responseHandlers = (apiClient as any).interceptors.response.handlers as Array<{
   fulfilled: (response: unknown) => unknown
   rejected: (error: unknown) => Promise<unknown>
@@ -256,6 +258,7 @@ describe("apiClient - 401 token refresh", () => {
       isAuthenticated: false,
       clearAuth: mockClearAuth,
       setAuth: vi.fn(),
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any)
 
     const err = makeAxiosError(401, { detail: "Unauthorized" })
@@ -273,6 +276,7 @@ describe("apiClient - 401 token refresh", () => {
       isAuthenticated: true,
       clearAuth: vi.fn(),
       setAuth: mockSetAuth,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any)
     vi.mocked(refreshAccessToken).mockResolvedValue({
       access_token: "new-access",
@@ -302,6 +306,7 @@ describe("apiClient - 401 token refresh", () => {
       isAuthenticated: true,
       clearAuth: mockClearAuth,
       setAuth: vi.fn(),
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any)
     vi.mocked(refreshAccessToken).mockRejectedValue(new Error("refresh failed") as never)
 

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

@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest"
-import { render, cleanup, act } from "@testing-library/react"
+import { render, cleanup } from "@testing-library/react"
 import TtsPanel from "@/pages/editing-planner/components/TtsPanel"
 import { DEFAULT_TTS_CONFIG } from "@/pages/editing-planner/types"
 
@@ -16,28 +16,17 @@ const defaultProps = {
 }
 
 describe("TtsPanel", () => {
-  afterEach(async () => {
-    // Flush pending React updates before cleanup to avoid
-    // "window is not defined" errors after jsdom teardown
-    await act(async () => {})
+  afterEach(() => {
     cleanup()
   })
 
-  it("should render without crashing", async () => {
-    let container: HTMLElement
-    await act(async () => {
-      const result = render(<TtsPanel {...defaultProps} />)
-      container = result.container
-    })
-    expect(container!).toBeTruthy()
+  it("should render without crashing", () => {
+    const { container } = render(<TtsPanel {...defaultProps} />)
+    expect(container).toBeTruthy()
   })
 
-  it("should render when closed", async () => {
-    let container: HTMLElement
-    await act(async () => {
-      const result = render(<TtsPanel {...defaultProps} open={false} />)
-      container = result.container
-    })
-    expect(container!).toBeTruthy()
+  it("should render when closed", () => {
+    const { container } = render(<TtsPanel {...defaultProps} open={false} />)
+    expect(container).toBeTruthy()
   })
 })

apps/web/src/test/pages/generate/smoke.test.tsx

@@ -17,7 +17,7 @@ import "@/api/generation/types"
 // 直接引入所有 Step 组件，建立完整依赖链
 import "@/pages/generate/GeneratePage"
 import "@/pages/generate/components/Step2MaterialSelect"
-import "@/pages/generate/components/Step4GeneratePreview"
+import "@/pages/generate/components/Step3GeneratePreview"
 import "@/pages/generate/components/Step4TitleSettings"
 import "@/pages/generate/components/Step5VoiceSelect"
 import "@/pages/generate/components/PreviewVideoPanel"
@@ -47,7 +47,7 @@ describe("GeneratePage module smoke test", () => {
   })
 })
 import "@/pages/generate/hooks/useGenerateVideo"
-import "@/pages/generate/hooks/useStep4Preview"
+import "@/pages/generate/hooks/useStep3Preview"
 import "@/pages/generate/hooks/generate-video/useGenerationPolling"
 import "@/pages/generate/hooks/useGenerateFormState"
 import "@/pages/generate/hooks/useGenerateFormState/useTemplateSelection"

apps/web/src/test/pages/generate/step3-preview.smoke.test.tsx

@@ -0,0 +1,17 @@
+/**
+ * Step3GeneratePreview smoke test
+ * 确保 vitest related 模式能匹配到第3步预览生成相关文件的改动
+ */
+import { describe, it, expect } from "vitest"
+
+import "@/pages/generate/components/Step3GeneratePreview"
+import "@/pages/generate/hooks/useStep3Preview"
+import "@/pages/generate/hooks/useStepNavigation"
+import "@/pages/generate/components/GenerateStepContent"
+import "@/pages/generate/GeneratePage"
+
+describe("Step3GeneratePreview module smoke test", () => {
+  it("should load all step3 preview modules", () => {
+    expect(true).toBe(true)
+  })
+})

apps/web/src/test/pages/generate/step4-preview.smoke.test.tsx

@@ -1,17 +0,0 @@
-/**
- * Step4GeneratePreview smoke test
- * 确保 vitest related 模式能匹配到第4步预览生成相关文件的改动
- */
-import { describe, it, expect } from "vitest"
-
-import "@/pages/generate/components/Step4GeneratePreview"
-import "@/pages/generate/hooks/useStep4Preview"
-import "@/pages/generate/hooks/useStepNavigation"
-import "@/pages/generate/components/GenerateStepContent"
-import "@/pages/generate/GeneratePage"
-
-describe("Step4GeneratePreview module smoke test", () => {
-  it("should load all step4 preview modules", () => {
-    expect(true).toBe(true)
-  })
-})

apps/web/src/test/setup.ts

@@ -32,7 +32,9 @@ afterEach(() => {
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Vi {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     interface Assertion<T = any> extends jest.Matchers<void, T> {}
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     interface AsymmetricMatchersContaining extends jest.Matchers<void, any> {}
   }
 }

apps/worker/video_processing/cover_generator.py

@@ -93,7 +93,7 @@ class CoverGenerator:
             time_sec = 0
 
         # scale + crop 实现 cover 裁剪（铺满输出尺寸）
-        vf = f"scale={width}:{height}:force_original_aspect_ratio=increase," f"crop={width}:{height},format=yuvj420p"
+        vf = f"scale={width}:{height}:force_original_aspect_ratio=increase," f"crop={width}:{height}"
 
         command = [
             FFMPEG_BIN,
@@ -281,7 +281,7 @@ class CoverGenerator:
         output_path.parent.mkdir(parents=True, exist_ok=True)
 
         # scale + crop 实现 cover 裁剪
-        vf = f"scale={width}:{height}:force_original_aspect_ratio=increase," f"crop={width}:{height},format=yuvj420p"
+        vf = f"scale={width}:{height}:force_original_aspect_ratio=increase," f"crop={width}:{height}"
 
         command = [
             FFMPEG_BIN,