chore: 合入最新develop触发合入检查

- WechatBindUseCase：绑定到当前登录账号不建新号；openid/unionid 已绑其他账号 409；已绑同一微信幂等
- WechatUnbindUseCase：解绑前守卫——必须有已验证手机或真实已验证邮箱（随机密码 hash/占位邮箱不算兜底，口径同 binding_complete）
- /auth/me 增加 wechat_bound 字段，供设置页判断绑定状态
- state 复用 RedisStateStore CSRF 校验；22 个新单测，diff coverage 100%

.gitea/workflows/ci-pipeline.yml

@@ -1187,6 +1187,8 @@ jobs:
         COSYVOICE_API_KEY: ${{ secrets.COSYVOICE_API_KEY }}
         DASHSCOPE_API_KEY: ${{ secrets.DASHSCOPE_API_KEY }}
         MEDIAKIT_API_KEY: ${{ secrets.MEDIAKIT_API_KEY }}
+        WECHAT_APP_ID: ${{ secrets.WECHAT_APP_ID }}
+        WECHAT_APP_SECRET: ${{ secrets.WECHAT_APP_SECRET }}
       run: |
         set -eu
         echo "Rendering .env from template + secrets..."

alembic/versions/063_add_video_fingerprint_chunks.py

@@ -0,0 +1,46 @@
+"""add video_fingerprint_chunks table for per-chunk fingerprint storage
+
+Revision ID: 063_fingerprint_chunks
+Revises: 062_edit_plan_id
+Create Date: 2026-09-03
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "063_fingerprint_chunks"
+down_revision = "062_edit_plan_id"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "video_fingerprint_chunks",
+        sa.Column("id", sa.String(36), primary_key=True),
+        sa.Column("video_id", sa.String(36), nullable=False),
+        sa.Column("project_id", sa.String(36), nullable=False),
+        sa.Column("user_id", sa.String(36), nullable=False, server_default=""),
+        sa.Column("start_time_ms", sa.Integer, nullable=False),
+        sa.Column("end_time_ms", sa.Integer, nullable=False),
+        sa.Column("phash_binary", sa.String(16), nullable=False),
+        sa.Column("color_histogram", sa.JSON, nullable=False),
+        sa.Column("frame_count", sa.Integer, nullable=False, server_default="1"),
+        sa.Column(
+            "created_at",
+            sa.DateTime,
+            nullable=False,
+            server_default=sa.func.now(),
+        ),
+    )
+    op.create_index("ix_vfc_video_id", "video_fingerprint_chunks", ["video_id"])
+    op.create_index("ix_vfc_project_id", "video_fingerprint_chunks", ["project_id"])
+    op.create_index("ix_vfc_user_id", "video_fingerprint_chunks", ["user_id"])
+
+
+def downgrade() -> None:
+    op.drop_index("ix_vfc_user_id", table_name="video_fingerprint_chunks")
+    op.drop_index("ix_vfc_project_id", table_name="video_fingerprint_chunks")
+    op.drop_index("ix_vfc_video_id", table_name="video_fingerprint_chunks")
+    op.drop_table("video_fingerprint_chunks")

alembic/versions/064_add_match_count_visual_similarity.py

@@ -0,0 +1,25 @@
+"""add match_count and visual_similarity to generated_videos
+
+Revision ID: 064_match_count_visual_sim
+Revises: 063_fingerprint_chunks
+Create Date: 2026-09-03
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "064_match_count_visual_sim"
+down_revision = "063_fingerprint_chunks"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("generated_videos", sa.Column("match_count", sa.Integer(), nullable=True, server_default="0"))
+    op.add_column("generated_videos", sa.Column("visual_similarity", sa.Float(), nullable=True, server_default="0.0"))
+
+
+def downgrade() -> None:
+    op.drop_column("generated_videos", "visual_similarity")
+    op.drop_column("generated_videos", "match_count")

alembic/versions/065_add_visual_similarity_match_count_duplication.py

@@ -0,0 +1,25 @@
+"""add visual_similarity and match_count to duplication_records
+
+Revision ID: 065_dup_record_sim_match
+Revises: 064_match_count_visual_sim
+Create Date: 2026-09-04
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "065_dup_record_sim_match"
+down_revision = "064_match_count_visual_sim"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("duplication_records", sa.Column("visual_similarity", sa.Float(), nullable=True))
+    op.add_column("duplication_records", sa.Column("match_count", sa.Integer(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("duplication_records", "match_count")
+    op.drop_column("duplication_records", "visual_similarity")

alembic/versions/066_asset_client_upload_id_ingest_job_asset_id.py

@@ -0,0 +1,34 @@
+"""add client_upload_id to assets and asset_id to ingest_jobs
+
+Issue #1714：上传 complete 幂等 + worker 转码回写关联。
+- assets.client_upload_id：客户端幂等 token（complete 去重）
+- ingest_jobs.asset_id：complete 阶段创建的占位 asset id（worker 回写关联，
+  防止 HEVC 转码改写 storage_key 后找不到占位而兜底新建 READY 记录）
+
+Revision ID: 066_upload_idempotency
+Revises: 065_dup_record_sim_match
+Create Date: 2026-09-05
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "066_upload_idempotency"
+down_revision = "065_dup_record_sim_match"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("assets", sa.Column("client_upload_id", sa.String(64), nullable=True))
+    op.create_index("ix_assets_client_upload_id", "assets", ["client_upload_id"])
+    op.add_column("ingest_jobs", sa.Column("asset_id", sa.String(36), nullable=False, server_default=""))
+    op.create_index("ix_ingest_jobs_asset_id", "ingest_jobs", ["asset_id"])
+
+
+def downgrade() -> None:
+    op.drop_index("ix_ingest_jobs_asset_id", table_name="ingest_jobs")
+    op.drop_column("ingest_jobs", "asset_id")
+    op.drop_index("ix_assets_client_upload_id", table_name="assets")
+    op.drop_column("assets", "client_upload_id")

alembic/versions/067_celery_task_id_revoke.py

@@ -0,0 +1,35 @@
+"""add celery_task_id to generation_tasks and ingest_jobs
+
+Issue #1714：孤儿恢复/超时清理撤销队列消息。
+- generation_tasks.celery_task_id：入队时记录的 Celery 消息 ID，清理时 revoke
+- ingest_jobs.celery_task_id：同上（素材转码任务）
+
+Revision ID: 067_celery_task_id
+Revises: 066_upload_idempotency
+Create Date: 2026-09-05
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "067_celery_task_id"
+down_revision = "066_upload_idempotency"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "generation_tasks",
+        sa.Column("celery_task_id", sa.String(64), nullable=False, server_default=""),
+    )
+    op.add_column(
+        "ingest_jobs",
+        sa.Column("celery_task_id", sa.String(64), nullable=False, server_default=""),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("ingest_jobs", "celery_task_id")
+    op.drop_column("generation_tasks", "celery_task_id")

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

@@ -13,7 +13,7 @@ import jwt
 from app.auth import AuthenticatedUser, blacklist_token, get_current_user
 from app.config import settings
 from app.dependencies import get_auth_email_service, get_auth_session_store, get_user_repository
-from fastapi import APIRouter, Depends, Header, HTTPException, status
+from fastapi import APIRouter, Depends, Header, HTTPException, Request, status
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from pydantic import BaseModel, EmailStr
 
@@ -84,6 +84,7 @@ class CurrentUserResponse(BaseModel):
     phone: str = ""
     phone_verified: bool = False
     binding_complete: bool = False
+    wechat_bound: bool = False
 
 
 class PasswordResetRequestModel(BaseModel):
@@ -272,6 +273,7 @@ async def get_current_user_info(
         phone=user.phone or "",
         phone_verified=user.phone_verified,
         binding_complete=binding_complete,
+        wechat_bound=bool(user.wechat_openid),
     )
 
 
@@ -426,6 +428,7 @@ async def get_wechat_auth_url() -> WechatAuthUrlResponse:
 @router.post("/wechat/callback", response_model=WechatLoginResponse)
 async def wechat_callback(
     request: WechatCallbackRequest,
+    http_request: Request,
     user_repository: UserRepository = Depends(get_user_repository),
 ) -> WechatLoginResponse:
     """微信登录回调处理"""
@@ -433,11 +436,30 @@ async def wechat_callback(
     from packages.application.auth.wechat_sync_use_case import WechatSyncRequest as SyncRequest
     from packages.application.auth.wechat_sync_use_case import WechatSyncUseCase
 
+    # 回调可观测性：记录 UA（区分微信内置浏览器 MicroMessenger）与 state，
+    # 便于排查"停留 open.weixin.qq.com / 回调失败"类问题（#1718）
+    user_agent = http_request.headers.get("User-Agent", "")
+    is_wechat_browser = "MicroMessenger" in user_agent
+    logger.info(
+        "[微信回调] 收到回调: state=%s code_len=%d UA=%r 微信内置浏览器=%s",
+        (request.state or "")[:8],
+        len(request.code or ""),
+        user_agent[:200],
+        is_wechat_browser,
+    )
+
     # 1. 用 code 换微信用户信息
     oauth_service = get_wechat_oauth_service()
     wechat_user, err = oauth_service.handle_callback(request.code, request.state)
     if err:
+        # state 校验失败 / 微信 errcode 等错误原文已在 service 内 log，这里带上 UA 上下文
+        logger.warning("[微信回调] 处理失败: err=%s 微信内置浏览器=%s", err, is_wechat_browser)
         raise HTTPException(status_code=400, detail=err)
+    logger.info(
+        "[微信回调] state 校验通过，微信用户信息获取成功: openid=%s unionid=%s",
+        wechat_user.openid[:8] if wechat_user.openid else "",
+        bool(wechat_user.unionid),
+    )
 
     # 2. 同步登录/注册（复用 wechat-sync 逻辑）
     use_case = WechatSyncUseCase(user_repository=user_repository)
@@ -472,6 +494,122 @@ async def wechat_callback(
     )
 
 
+# ==================== 微信账号绑定/解绑（已登录用户） ====================
+
+
+class WechatBindUrlResponse(BaseModel):
+    auth_url: str
+    state: str
+
+
+class WechatBindCompleteRequest(BaseModel):
+    code: str
+    state: str = ""
+
+
+class WechatBindUserProfile(BaseModel):
+    """绑定/解绑后返回的用户信息（字段对齐 /auth/me，前端 normalizeUser 直接消费）"""
+
+    user_id: str
+    email: str
+    username: str
+    display_name: str
+    email_verified: bool
+    phone: str = ""
+    phone_verified: bool = False
+    binding_complete: bool = False
+    wechat_bound: bool = False
+
+
+class WechatBindCompleteResponse(BaseModel):
+    success: bool
+    user: WechatBindUserProfile
+
+
+class WechatUnbindResponse(BaseModel):
+    success: bool
+
+
+def _wechat_user_profile(user) -> WechatBindUserProfile:
+    binding_complete = bool(
+        user.phone_verified and user.email_verified and user.email and "@wechat.local" not in user.email
+    )
+    return WechatBindUserProfile(
+        user_id=user.id,
+        email=user.email,
+        username=user.username,
+        display_name=user.display_name,
+        email_verified=user.email_verified,
+        phone=user.phone or "",
+        phone_verified=user.phone_verified,
+        binding_complete=binding_complete,
+        wechat_bound=bool(user.wechat_openid),
+    )
+
+
+@router.get("/wechat/bind/url", response_model=WechatBindUrlResponse)
+async def get_wechat_bind_url(
+    current_user: AuthenticatedUser = Depends(get_current_user),
+) -> WechatBindUrlResponse:
+    """获取微信绑定授权链接（已登录用户场景）。state 经 Redis 存储做 CSRF 校验。"""
+    from packages.application.auth.wechat_oauth_service import get_wechat_oauth_service
+
+    oauth_service = get_wechat_oauth_service()
+    auth_url, state = oauth_service.generate_auth_url()
+    logger.info("[微信绑定] 用户 %s 请求绑定授权链接", current_user.user.id)
+    return WechatBindUrlResponse(auth_url=auth_url, state=state)
+
+
+@router.post("/wechat/bind", response_model=WechatBindCompleteResponse)
+async def wechat_bind(
+    request: WechatBindCompleteRequest,
+    current_user: AuthenticatedUser = Depends(get_current_user),
+    user_repository: UserRepository = Depends(get_user_repository),
+) -> WechatBindCompleteResponse:
+    """微信绑定完成：扫码回调后用 code 换 openid，绑定到当前登录账号（不创建新用户）。"""
+    from packages.application.auth.wechat_bind_use_case import WechatBindRequest, WechatBindUseCase
+    from packages.application.auth.wechat_oauth_service import get_wechat_oauth_service
+
+    oauth_service = get_wechat_oauth_service()
+    wechat_user, err = oauth_service.handle_callback(request.code, request.state)
+    if err:
+        logger.warning("[微信绑定] 用户 %s 换取微信信息失败: %s", current_user.user.id, err)
+        raise HTTPException(status_code=400, detail=err)
+
+    use_case = WechatBindUseCase(user_repository=user_repository)
+    result, error, http_status = use_case.bind(
+        WechatBindRequest(
+            user_id=current_user.user.id,
+            openid=wechat_user.openid,
+            unionid=wechat_user.unionid or "",
+        )
+    )
+    if error:
+        logger.warning("[微信绑定] 用户 %s 绑定失败: %s", current_user.user.id, error)
+        raise HTTPException(status_code=http_status, detail=error)
+
+    logger.info("[微信绑定] 用户 %s 绑定成功 openid=%s", current_user.user.id, wechat_user.openid[:8])
+    return WechatBindCompleteResponse(success=True, user=_wechat_user_profile(result.user))
+
+
+@router.delete("/wechat/bind", response_model=WechatUnbindResponse)
+async def wechat_unbind(
+    current_user: AuthenticatedUser = Depends(get_current_user),
+    user_repository: UserRepository = Depends(get_user_repository),
+) -> WechatUnbindResponse:
+    """解绑微信：需账号仍有其他登录方式（密码/手机/真实邮箱），否则拒绝。"""
+    from packages.application.auth.wechat_bind_use_case import WechatUnbindUseCase
+
+    use_case = WechatUnbindUseCase(user_repository=user_repository)
+    result, error, http_status = use_case.unbind(current_user.user.id)
+    if error:
+        logger.warning("[微信解绑] 用户 %s 解绑失败: %s", current_user.user.id, error)
+        raise HTTPException(status_code=http_status, detail=error)
+
+    logger.info("[微信解绑] 用户 %s 解绑成功", current_user.user.id)
+    return WechatUnbindResponse(success=True)
+
+
 # ==================== 验证码 & 绑定 ====================
 
 

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

@@ -14,6 +14,7 @@ from typing import Any
 from uuid import uuid4
 
 from app.api.routes._helpers import require_project_and_library
+from app.api.routes.upload import _persist_celery_task_id
 from app.auth import AuthenticatedUser, get_current_user
 from app.core.celery_app import celery_app
 from app.core.storage import OSSStorageService, get_storage_service
@@ -381,7 +382,8 @@ async def complete_chunked_upload(
                 file_hash=request.file_hash,
             )
         )
-        celery_app.send_task("worker.ingest_asset", args=[job.id])
+        celery_result = celery_app.send_task("worker.ingest_asset", args=[job.id])
+        _persist_celery_task_id(ingest_job_repository, job, getattr(celery_result, "id", ""))
 
         # Update metadata status
         meta["status"] = "completed"

apps/api/app/api/routes/duplication.py

@@ -7,6 +7,7 @@ from typing import Any
 from uuid import uuid4
 
 from app.auth import AuthenticatedUser, get_current_user
+from app.core.celery_app import celery_app
 from app.core.storage import OSSStorageService, get_storage_service
 from app.dependencies import get_duplication_repository
 from app.schemas.duplication import (
@@ -76,6 +77,8 @@ def _to_record_response(record: DuplicationRecord) -> DuplicationRecordResponse:
         status=record.status,
         duplicate_rate=record.duplicate_rate,
         duplicate_count=record.duplicate_count,
+        visual_similarity=getattr(record, "visual_similarity", None),
+        match_count=getattr(record, "match_count", None),
         created_at=record.created_at.isoformat(),
         updated_at=record.updated_at.isoformat(),
     )
@@ -90,6 +93,8 @@ def _to_detail_response(record: DuplicationRecord) -> DuplicationDetailResponse:
         status=record.status,
         duplicate_rate=record.duplicate_rate,
         duplicate_count=record.duplicate_count,
+        visual_similarity=getattr(record, "visual_similarity", None),
+        match_count=getattr(record, "match_count", None),
         created_at=record.created_at.isoformat(),
         updated_at=record.updated_at.isoformat(),
         segments=[
@@ -192,6 +197,8 @@ async def upload_for_duplication(
         authenticated_user.user.id,
     )
 
+    celery_app.send_task("worker.process_duplication_check", args=[record.id])
+
     return DuplicationUploadResponse(
         id=record.id,
         status=record.status,
@@ -296,6 +303,8 @@ def retry_duplication(
             detail=f"查重记录 {record_id} 不存在",
         )
 
+    celery_app.send_task("worker.process_duplication_check", args=[updated.id])
+
     return DuplicationUploadResponse(
         id=updated.id,
         status=updated.status,

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

@@ -14,6 +14,7 @@ from app.core.task_enqueue import (
     USER_PENDING_LIMIT,
     GlobalQueueFull,
     UserPendingLimitExceeded,
+    build_rate_limit_detail,
     safe_enqueue_generation_task,
 )
 from app.dependencies import (
@@ -23,6 +24,7 @@ from app.dependencies import (
     get_generation_task_repository,
 )
 from app.schemas.generation_task import (
+    BatchPreviewGenerationTaskResponse,
     CreatePreviewGenerationTaskRequest,
     PreviewGenerationTaskResponse,
 )
@@ -193,11 +195,19 @@ def _to_preview_response(task, generated_videos: list | None = None) -> PreviewG
     if started_at and completed_at:
         generate_duration = (completed_at - started_at).total_seconds()
 
+    title_cfg = getattr(task, "title_config", None)
+    title_cfg = title_cfg if isinstance(title_cfg, dict) else {}
+    extra_meta = getattr(task, "extra_meta", None)
+    extra_meta = extra_meta if isinstance(extra_meta, dict) else {}
+    voice_library_id = getattr(task, "voice_library_id", "") or ""
+    if not isinstance(voice_library_id, str):
+        voice_library_id = str(voice_library_id) if voice_library_id else ""
     return PreviewGenerationTaskResponse(
         task_id=task.id,
         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)),
+        variant_index=int(extra_meta.get("variant_index", 0) or 0),
         resolution=getattr(task, "resolution", "") or "",
         video_url=video_url,
         duration=duration,
@@ -206,6 +216,8 @@ def _to_preview_response(task, generated_videos: list | None = None) -> PreviewG
         transition_count=transition_count,
         material_usage=material_usage,
         error_message=task.error_message or "",
+        title_text=str(title_cfg.get("text", "") or ""),
+        voice_library_id=voice_library_id,
         created_at=task.created_at,
         started_at=started_at,
         finished_at=completed_at,
@@ -213,50 +225,100 @@ def _to_preview_response(task, generated_videos: list | None = None) -> PreviewG
     )
 
 
-@router.post("/preview", response_model=PreviewGenerationTaskResponse, status_code=201)
+def _resolve_preview_edit_plan_id(
+    *,
+    request: CreatePreviewGenerationTaskRequest,
+    task,
+    db: Session,
+    user_id: str,
+) -> str:
+    """确定任务关联的编辑计划ID：优先前端传入，否则按 template_id+user 兜底查找。"""
+    if task.source_edit_plan_id:
+        return task.source_edit_plan_id
+    if not request.template_id:
+        return ""
+    try:
+        from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
+            SQLAlchemyEditPlanRepository,
+        )
+
+        _plan_repo = SQLAlchemyEditPlanRepository(db)
+        _plans = _plan_repo.list_by_template(request.template_id, limit=20)
+        for _p in _plans:
+            if (_p.created_by_user_id or "") == user_id:
+                logger.info(
+                    "[预览生成] 自动关联编辑计划: task_id=%s plan_id=%s",
+                    task.id,
+                    _p.id,
+                )
+                return _p.id
+    except Exception:
+        logger.warning(
+            "[预览生成] 查找关联编辑计划失败（不影响主流程）: task_id=%s",
+            task.id,
+            exc_info=True,
+        )
+    return ""
+
+
+def _variant_value(values: list[str], index: int, fallback: str = "") -> str:
+    """从变体数组中取值：长度1=共用，长度>N=按索引，空数组=回退 fallback。"""
+    if not values:
+        return fallback
+    if len(values) == 1:
+        return values[0]
+    return values[index] if index < len(values) else fallback
+
+
+@router.post("/preview", response_model=BatchPreviewGenerationTaskResponse, status_code=201)
 def create_preview_generation_task(
     request: CreatePreviewGenerationTaskRequest,
     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:
-    """创建预览生成任务。
+) -> BatchPreviewGenerationTaskResponse:
+    """创建预览生成任务（支持批量）。
 
-    预览渲染品质与正式生成一致（1080p, CRF 23, medium preset），确认生成时可直接复用预览产物。
-
-    Args:
-        request: 预览任务创建请求（template_id + asset_ids 等）
+    preview_count=1 时行为与旧版完全一致（创建 1 个任务）；
+    preview_count=N 时一次创建 N 个独立变体任务：
+    - 每个变体克隆独立编辑计划（独立 clips、独立随机素材起点），N 个预览内容互不相同
+    - 每个变体拥有独立 task_id / 状态 / 预览视频 URL，前端按 task_id 分别轮询
+    - 标题样式（font/color/position 等）全局共用；标题文字/配音/封面可按变体独立
+      （titles[] / voice_library_ids[] / cover_urls[]，长度1=共用，长度N=独立）
 
     Returns:
-        201 + 预览任务详情
+        201 + 变体任务数组 {items: [...], total: N}
     """
     user_id = authenticated_user.user.id
+    count = max(1, request.preview_count)
     logger.info(
         "[预览生成] 接收请求: user_id=%s, template_id=%s, asset_count=%d, preview_count=%d",
         user_id,
         request.template_id,
         len(request.asset_ids),
-        request.preview_count,
+        count,
     )
 
-    # 预检查队列限流
+    # 预检查队列限流（按变体总数计）
     try:
         user_pending = generation_task_repository.count_pending_by_user(user_id)
         global_pending = generation_task_repository.count_pending_total()
-        if user_pending + 1 > USER_PENDING_LIMIT:
-            raise UserPendingLimitExceeded(user_id=user_id, pending_count=user_pending + 1, limit=USER_PENDING_LIMIT)
-        if global_pending + 1 > GLOBAL_PENDING_LIMIT:
-            raise GlobalQueueFull(pending_count=global_pending + 1, limit=GLOBAL_PENDING_LIMIT)
+        if user_pending + count > USER_PENDING_LIMIT:
+            raise UserPendingLimitExceeded(
+                user_id=user_id, pending_count=user_pending + count, limit=USER_PENDING_LIMIT
+            )
+        if global_pending + count > GLOBAL_PENDING_LIMIT:
+            raise GlobalQueueFull(pending_count=global_pending + count, limit=GLOBAL_PENDING_LIMIT)
     except UserPendingLimitExceeded as e:
         raise HTTPException(
             status_code=429,
-            detail=f"您的待处理任务过多（当前 {e.pending_count - 1}/{e.limit}），请等待后再提交",
+            detail=build_rate_limit_detail(e, generation_task_repository, scope="user"),
         ) from e
     except GlobalQueueFull as e:
         raise HTTPException(
             status_code=503,
-            detail="系统繁忙，请稍后再试",
+            detail=build_rate_limit_detail(e, generation_task_repository, scope="global"),
         ) from e
 
     # 确定视频比例：优先前端传入，否则从模板 mode 推断
@@ -273,14 +335,11 @@ def create_preview_generation_task(
                 w, h = int(parts[0]), int(parts[1])
                 base = 1920
                 if w < h:
-                    # 竖屏
                     output_width = round(base * w / h)
                     output_height = base
                 else:
-                    # 横屏
                     output_width = base
                     output_height = round(base * h / w)
-                # 对齐到偶数
                 output_width = output_width - output_width % 2
                 output_height = output_height - output_height % 2
             except (ValueError, ZeroDivisionError):
@@ -289,42 +348,71 @@ def create_preview_generation_task(
 
     logger.info(
         "[预览生成] 分辨率: video_ratio=%s → %s (%dx%d)",
-        video_ratio, resolution, output_width, output_height,
+        video_ratio,
+        resolution,
+        output_width,
+        output_height,
     )
 
-    # 从模板读取 editing_mode / mode 作为 strategy_id（渲染 pipeline 的 mode 参数）
     strategy_id = _resolve_strategy_id_from_template(request.template_id, db, user_id)
-
-    title_config = request.title_config or {}
+    base_title_config = request.title_config or {}
 
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
 
+    # ── 预创建第一个任务，仅用于解析源编辑计划（不落库为最终任务）──
+    # 先创建一个临时任务拿到 task 对象上下文，实际 N 个任务在循环中统一创建；
+    # 为保持与旧版一致的源 plan 解析逻辑，先创建任务0、解析源 plan，
+    # 再预克隆 N 个变体 plan，最后重建任务关联。
+    # 简化实现：直接创建全部任务，plan 关联在创建后、入队前完成。
+
+    created_tasks: list = []
+    variant_plan_ids: list[str] = []  # 每个变体最终关联的 plan_id（按变体顺序）
+
     try:
-        task = use_case.execute(
-            CreateGenerationTaskCommand(
-                project_id="",
-                asset_library_id="",
-                strategy_id=strategy_id,
-                voice_library_id=request.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,
-                asset_select_mode="",
-                batch_id="",
-                video_title=request.video_title,
-                resolution=resolution,
-                bgm_config=request.bgm_config or {},
-                auto_retry_enabled=False,
-                auto_retry_max=0,
-                is_preview=True,
-                title_config=title_config,
-                output_width=output_width,
-                output_height=output_height,
+        for variant_index in range(count):
+            # 变体独立标题文字：titles[] 覆盖 title_config.text
+            variant_title_text = _variant_value(request.titles, variant_index, "")
+            variant_title_config = dict(base_title_config)
+            if variant_title_text.strip():
+                variant_title_config["text"] = variant_title_text.strip()
+
+            # 变体独立配音
+            variant_voice_library_id = _variant_value(
+                request.voice_library_ids, variant_index, request.voice_library_id
             )
-        )
+
+            task = use_case.execute(
+                CreateGenerationTaskCommand(
+                    project_id="",
+                    asset_library_id="",
+                    strategy_id=strategy_id,
+                    voice_library_id=variant_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,
+                    asset_select_mode="",
+                    batch_id="",
+                    video_title=request.video_title,
+                    resolution=resolution,
+                    bgm_config=request.bgm_config or {},
+                    auto_retry_enabled=False,
+                    auto_retry_max=0,
+                    is_preview=True,
+                    title_config=variant_title_config,
+                    output_width=output_width,
+                    output_height=output_height,
+                )
+            )
+            task.extra_meta["variant_index"] = variant_index
+
+            # 解析源编辑计划（前端传入或按模板兜底查找）
+            source_plan_id = _resolve_preview_edit_plan_id(request=request, task=task, db=db, user_id=user_id)
+            task.source_edit_plan_id = source_plan_id
+            generation_task_repository.update(task)
+            created_tasks.append(task)
     except ValueError as e:
         logger.warning("[预览生成] 创建失败: %s", e)
         raise HTTPException(status_code=400, detail=str(e)) from e
@@ -332,93 +420,128 @@ def create_preview_generation_task(
         logger.error("[预览生成] 创建失败: %s", e, exc_info=True)
         raise HTTPException(status_code=500, detail="创建预览生成任务失败，请稍后再试") from e
 
-    # 关联编辑计划：如果前端未传 source_edit_plan_id，通过 template_id + user_id 查找
-    if not task.source_edit_plan_id and request.template_id:
-        try:
-            from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
-                SQLAlchemyEditPlanRepository,
-            )
-
-            _plan_repo = SQLAlchemyEditPlanRepository(db)
-            _plans = _plan_repo.list_by_template(request.template_id, limit=20)
-            for _p in _plans:
-                if (_p.created_by_user_id or "") == user_id:
-                    task.source_edit_plan_id = _p.id
-                    generation_task_repository.update(task)
-                    logger.info(
-                        "[预览生成] 自动关联编辑计划: task_id=%s plan_id=%s",
-                        task.id,
-                        _p.id,
-                    )
-                    break
-        except Exception:
-            logger.warning(
-                "[预览生成] 查找关联编辑计划失败（不影响主流程）: task_id=%s",
-                task.id,
-                exc_info=True,
-            )
-
-    # 每条预览都关联独立克隆 plan：多预览前端为 N 次并发调用，若共用同一 plan
-    # 则 N 条预览片段完全相同；克隆时片段起点按持久化历史区间重算（含受控复用），
-    # 保证各预览版本内容不同
-    if task.source_edit_plan_id:
+    # ── 克隆独立变体 plan：N 个预览全部克隆（预览不污染源 plan）──
+    # 源 plan 不存在（无编辑历史）时各任务走自身随机选片流程，不克隆。
+    source_plan_id = created_tasks[0].source_edit_plan_id if created_tasks else ""
+    if source_plan_id:
         try:
             from app.services.edit_plan_service import EditPlanService
 
             _plan_svc = EditPlanService(db)
-            _preview_plan = _plan_svc.clone_plan_for_variant(
-                task.source_edit_plan_id,
-                created_by_user_id=user_id,
-                name_suffix="预览变体",
-            )
-            task.source_edit_plan_id = _preview_plan.id
-            generation_task_repository.update(task)
-            logger.info(
-                "[预览生成] 预览关联独立克隆 plan: task_id=%s clone_plan_id=%s",
-                task.id,
-                _preview_plan.id,
-            )
-        except Exception as clone_err:
-            # 不退回共用原 plan（否则多条预览内容相同，违反去重诉求）：
-            # 标记任务失败并中断，前端可重新发起预览
-            logger.error(
-                "[预览生成] 克隆预览变体 plan 失败，任务标记失败: task_id=%s error=%s",
-                task.id,
-                clone_err,
-                exc_info=True,
-            )
-            _mark_task_failed(generation_task_repository, task, "预览变体计划创建失败")
+            for variant_index in range(count):
+                last_err: Exception | None = None
+                variant_plan = None
+                for _attempt in range(2):  # 1 次重试，抗 DB 瞬时抖动
+                    try:
+                        variant_plan = _plan_svc.clone_plan_for_variant(
+                            source_plan_id,
+                            created_by_user_id=user_id,
+                            name_suffix=f"预览变体{variant_index + 1}" if count > 1 else "预览变体",
+                        )
+                        break
+                    except Exception as clone_err:  # noqa: PERF203
+                        last_err = clone_err
+                        logger.warning(
+                            "[预览生成] 克隆变体 plan 失败(尝试%d/2): variant=%d error=%s",
+                            _attempt + 1,
+                            variant_index,
+                            clone_err,
+                            exc_info=True,
+                        )
+                if variant_plan is None:
+                    logger.error(
+                        "[预览生成] 克隆预览变体 plan 重试仍失败: variant=%d source=%s",
+                        variant_index,
+                        source_plan_id,
+                        exc_info=last_err,
+                    )
+                    # 标记已创建任务失败
+                    for t in created_tasks:
+                        _mark_task_failed(generation_task_repository, t, "预览变体计划创建失败")
+                    raise HTTPException(
+                        status_code=500,
+                        detail="创建预览任务失败：无法生成独立剪辑计划，请重试",
+                    ) from last_err
+                variant_plan_ids.append(variant_plan.id)
+        except HTTPException:
+            raise
+        except Exception as e:
+            logger.error("[预览生成] 克隆变体 plan 异常: %s", e, exc_info=True)
+            for t in created_tasks:
+                _mark_task_failed(generation_task_repository, t, "预览变体计划创建失败")
             raise HTTPException(
                 status_code=500,
                 detail="创建预览任务失败：无法生成独立剪辑计划，请重试",
-            ) from clone_err
+            ) from e
 
-    # 入队执行；若入队失败则标记任务为 failed 避免僵尸数据
-    try:
-        if not safe_enqueue_generation_task(
-            task,
-            generation_task_repository,
-            user_id=user_id,
-            log_prefix="[预览生成]",
-            log_task_status=True,
-        ):
-            logger.warning("[预览生成] 任务入队失败: task_id=%s", task.id)
-            _mark_task_failed(generation_task_repository, task, "任务入队失败")
-            raise HTTPException(status_code=500, detail="任务入队失败，请稍后重试")
-    except UserPendingLimitExceeded as e:
-        _mark_task_failed(generation_task_repository, task, "待处理任务超限")
-        raise HTTPException(
-            status_code=429,
-            detail=f"您的待处理任务过多（当前 {e.pending_count - 1}/{e.limit}），请等待后再提交",
-        ) from None
-    except GlobalQueueFull:
-        _mark_task_failed(generation_task_repository, task, "系统队列已满")
+    # 关联变体 plan 并回写标题配置
+    for variant_index, task in enumerate(created_tasks):
+        if variant_plan_ids:
+            task.source_edit_plan_id = variant_plan_ids[variant_index]
+            generation_task_repository.update(task)
+        # 回写变体标题到 plan config（worker 渲染时从 plan 读取 title 配置）
+        if task.source_edit_plan_id and (task.title_config or {}).get("text", "").strip():
+            try:
+                from app.api.routes.generation_tasks import _writeback_edit_plan_config
+
+                _writeback_edit_plan_config(
+                    plan_id=task.source_edit_plan_id,
+                    task_id=task.id,
+                    title_config=task.title_config,
+                    db=db,
+                )
+            except Exception:
+                logger.warning(
+                    "[预览生成] 回写标题配置失败（不影响主流程）: task_id=%s",
+                    task.id,
+                    exc_info=True,
+                )
+
+    # ── 入队 ──
+    responses: list[PreviewGenerationTaskResponse] = []
+    rate_limit_exc: Exception | None = None  # 记录首个限流异常，全部失败时返回结构化提示
+    for variant_index, task in enumerate(created_tasks):
+        try:
+            enqueued = safe_enqueue_generation_task(
+                task,
+                generation_task_repository,
+                user_id=user_id,
+                log_prefix=f"[预览生成][变体{variant_index + 1}]",
+                log_task_status=True,
+            )
+            if not enqueued:
+                logger.warning("[预览生成] 任务入队失败: task_id=%s", task.id)
+                _mark_task_failed(generation_task_repository, task, "任务入队失败")
+        except UserPendingLimitExceeded as e:
+            _mark_task_failed(generation_task_repository, task, "待处理任务超限")
+            rate_limit_exc = rate_limit_exc or e
+        except GlobalQueueFull as e:
+            _mark_task_failed(generation_task_repository, task, "系统队列已满")
+            rate_limit_exc = rate_limit_exc or e
+        except Exception:
+            logger.exception("[预览生成] 入队异常: task_id=%s", task.id)
+            _mark_task_failed(generation_task_repository, task, "任务入队异常")
+        # enqueue 会原地更新 task 状态/进度，直接用 task 构造响应
+        responses.append(_to_preview_response(task))
+
+    # 队列满/限流时若全部失败，返回结构化错误码（前端区分"排队"与"创建失败"）
+    if all(r.status == "failed" for r in responses) and rate_limit_exc is not None:
+        if isinstance(rate_limit_exc, UserPendingLimitExceeded):
+            raise HTTPException(
+                status_code=429,
+                detail=build_rate_limit_detail(rate_limit_exc, generation_task_repository, scope="user"),
+            )
         raise HTTPException(
             status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from None
+            detail=build_rate_limit_detail(rate_limit_exc, generation_task_repository, scope="global"),
+        )
 
-    return _to_preview_response(task)
+    logger.info(
+        "[预览生成] 创建完成: %d 个变体任务, task_ids=%s",
+        len(responses),
+        [r.task_id for r in responses],
+    )
+    return BatchPreviewGenerationTaskResponse(items=responses, total=len(responses))
 
 
 @router.get("/preview/{task_id}", response_model=PreviewGenerationTaskResponse)

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

@@ -10,6 +10,7 @@ from app.core.task_enqueue import (
     USER_PENDING_LIMIT,
     GlobalQueueFull,
     UserPendingLimitExceeded,
+    build_rate_limit_detail,
     safe_enqueue_generation_task,
 )
 from app.dependencies import (
@@ -47,6 +48,15 @@ logger = logging.getLogger(__name__)
 router = APIRouter()
 
 
+def _variant_value(values: list[str], index: int, fallback: str = "") -> str:
+    """从变体数组中取值：长度1=共用，长度>N=按索引，空数组=回退 fallback。"""
+    if not values:
+        return fallback
+    if len(values) == 1:
+        return values[0]
+    return values[index] if index < len(values) else fallback
+
+
 def _to_generation_task_response(task) -> GenerationTaskResponse:
     return GenerationTaskResponse(
         id=task.id,
@@ -92,6 +102,9 @@ def _to_generated_video_response(item, download_url: str | None = None) -> Gener
         height=item.height,
         fps=item.fps,
         download_url=download_url,
+        duplicate_rate=getattr(item, "duplicate_rate", None),
+        visual_similarity=getattr(item, "visual_similarity", None),
+        match_count=getattr(item, "match_count", None),
     )
 
 
@@ -137,7 +150,6 @@ def _select_assets_from_library(
     return [a.id for a in ready_video_assets]
 
 
-
 def _writeback_edit_plan_config(
     plan_id: str,
     task_id: str,
@@ -162,7 +174,7 @@ def _writeback_edit_plan_config(
         current_config = plan_model.config if isinstance(plan_model.config, dict) else {}
         merged = dict(current_config)
         merged["generation_task_id"] = task_id
-        
+
         # 检查标题是否发生变化，如果变化则清除 cover 字段强制重新生成封面
         if title_config:
             old_title_config = merged.get("title_config", {}) or {}
@@ -174,10 +186,12 @@ def _writeback_edit_plan_config(
                     del merged["cover"]
                     logger.info(
                         "[生成任务] 标题变化，清除旧封面: plan_id=%s old_title=%s new_title=%s",
-                        plan_id, old_title_text, new_title_text,
+                        plan_id,
+                        old_title_text,
+                        new_title_text,
                     )
             merged["title_config"] = title_config
-        
+
         plan_model.config = merged
         db.commit()
         logger.info(
@@ -404,12 +418,12 @@ def create_generation_task(
     except UserPendingLimitExceeded as e:
         raise HTTPException(
             status_code=429,
-            detail=f"您的待处理任务过多（当前 {e.pending_count - count}/{e.limit}，本次提交 {count} 个），请等待完成后再提交",
+            detail=build_rate_limit_detail(e, generation_task_repository, scope="user"),
         ) from e
     except GlobalQueueFull as e:
         raise HTTPException(
             status_code=503,
-            detail="系统繁忙，请稍后再试",
+            detail=build_rate_limit_detail(e, generation_task_repository, scope="global"),
         ) from e
 
     # 画中画已下线：strategy_id 中的 pip/voice_pip 统一映射为 one_take
@@ -468,12 +482,21 @@ def create_generation_task(
             if task_index > 0 and variant_plan_ids:
                 effective_plan_id = variant_plan_ids[task_index - 1]
 
+            # 变体级独立配置：titles[]/voice_library_ids[]/cover_urls[]
+            # 长度1=所有变体共用，长度=count=每个变体独立，空数组=回退单值字段
+            variant_title_text = _variant_value(request.titles, task_index, "")
+            variant_title_config = dict(request.title_config or {})
+            if variant_title_text.strip():
+                variant_title_config["text"] = variant_title_text.strip()
+            variant_voice_library_id = _variant_value(request.voice_library_ids, task_index, request.voice_library_id)
+            variant_cover_url = _variant_value(request.cover_urls, task_index, request.cover_url)
+
             task = use_case.execute(
                 CreateGenerationTaskCommand(
                     project_id=project_id,
                     asset_library_id=asset_library_id,
                     strategy_id=effective_strategy_id,
-                    voice_library_id=request.voice_library_id,
+                    voice_library_id=variant_voice_library_id,
                     template_id=request.template_id,
                     asset_ids=resolved_asset_ids,
                     title_ids=request.title_ids,
@@ -491,10 +514,12 @@ def create_generation_task(
                     source_task_id=request.source_task_id,
                     output_width=request.output_width,
                     output_height=request.output_height,
-                    cover_url=request.cover_url,
-                    title_config=request.title_config or {},
+                    cover_url=variant_cover_url,
+                    title_config=variant_title_config,
                 )
             )
+            # 变体序号写入 extra_meta（响应/排查时可辨识）
+            task.extra_meta["variant_index"] = task_index
             try:
                 # 兜底关联编辑计划：前端未传 source_edit_plan_id 时，
                 # 通过 template_id + user_id 在 DB 层直接查找最新的 plan。
@@ -529,13 +554,13 @@ def create_generation_task(
 
                 # 回写 plan.config：必须在 enqueue 之前执行，
                 # 确保 worker 读取 plan 时 config 中已包含 generation_task_id。
-                # 只在首个任务时回写一次，避免批量生成时循环覆盖。
+                # 批量场景下每个变体关联独立 plan，需各自回写自己的变体标题配置。
                 _effective_plan_id = task.source_edit_plan_id
-                if _effective_plan_id and len(created_tasks) == 0:
+                if _effective_plan_id:
                     _writeback_edit_plan_config(
                         plan_id=_effective_plan_id,
                         task_id=task.id,
-                        title_config=request.title_config,
+                        title_config=variant_title_config,
                         db=db,
                     )
 
@@ -555,7 +580,7 @@ def create_generation_task(
                 if not created_tasks:
                     raise HTTPException(
                         status_code=429,
-                        detail="您的待处理任务过多，请等待完成后再提交",
+                        detail=build_rate_limit_detail(_e, generation_task_repository, scope="user"),
                     ) from _e
                 break
             except GlobalQueueFull as _e:
@@ -563,7 +588,7 @@ def create_generation_task(
                 if not created_tasks:
                     raise HTTPException(
                         status_code=503,
-                        detail="系统繁忙，请稍后再试",
+                        detail=build_rate_limit_detail(_e, generation_task_repository, scope="global"),
                     ) from _e
                 break
     except HTTPException:
@@ -689,15 +714,15 @@ def confirm_generation(
             log_task_status=True,
         ):
             logger.warning("[确认生成] 入队失败: task_id=%s", new_task.id)
-    except UserPendingLimitExceeded:
+    except UserPendingLimitExceeded as _e:
         raise HTTPException(
             status_code=429,
-            detail="您的待处理任务过多，请等待完成后再提交",
+            detail=build_rate_limit_detail(_e, generation_task_repository, scope="user"),
         ) from None
-    except GlobalQueueFull:
+    except GlobalQueueFull as _e:
         raise HTTPException(
             status_code=503,
-            detail="系统繁忙，请稍后再试",
+            detail=build_rate_limit_detail(_e, generation_task_repository, scope="global"),
         ) from None
 
     return BatchGenerationTaskResponse(
@@ -779,12 +804,24 @@ def retry_generation_task(
     if user_pending >= USER_PENDING_LIMIT:
         raise HTTPException(
             status_code=429,
-            detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
+            detail=build_rate_limit_detail(
+                UserPendingLimitExceeded(
+                    user_id=user_id,
+                    pending_count=user_pending,
+                    limit=USER_PENDING_LIMIT,
+                ),
+                generation_task_repository,
+                scope="user",
+            ),
         )
     if global_pending >= GLOBAL_PENDING_LIMIT:
         raise HTTPException(
             status_code=503,
-            detail="系统繁忙，请稍后再试",
+            detail=build_rate_limit_detail(
+                GlobalQueueFull(pending_count=global_pending, limit=GLOBAL_PENDING_LIMIT),
+                generation_task_repository,
+                scope="global",
+            ),
         )
 
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
@@ -819,15 +856,15 @@ def retry_generation_task(
             log_task_status=True,
         ):
             logger.warning("[生成任务] 重试入队失败: task_id=%s", retried.id)
-    except UserPendingLimitExceeded:
+    except UserPendingLimitExceeded as _e:
         raise HTTPException(
             status_code=429,
-            detail="您的待处理任务过多，请等待完成后再提交",
+            detail=build_rate_limit_detail(_e, generation_task_repository, scope="user"),
         ) from None
-    except GlobalQueueFull:
+    except GlobalQueueFull as _e:
         raise HTTPException(
             status_code=503,
-            detail="系统繁忙，请稍后再试",
+            detail=build_rate_limit_detail(_e, generation_task_repository, scope="global"),
         ) from None
     return _to_generation_task_response(retried)
 

apps/api/app/api/routes/ingest_jobs.py

@@ -43,7 +43,13 @@ def submit_ingest_job(
         )
     )
 
-    celery_app.send_task("worker.ingest_asset", args=[job.id])
+    celery_result = celery_app.send_task("worker.ingest_asset", args=[job.id])
+    if getattr(celery_result, "id", ""):
+        try:
+            job.celery_task_id = celery_result.id
+            ingest_job_repository.update(job)
+        except Exception:  # noqa: BLE001
+            pass
 
     return IngestJobResponse(
         id=job.id,

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

@@ -375,7 +375,13 @@ def retry_project_task(
                 storage_key=job.storage_key,
             )
         )
-        celery_app.send_task("worker.ingest_asset", args=[retried.id])
+        celery_result = celery_app.send_task("worker.ingest_asset", args=[retried.id])
+        if getattr(celery_result, "id", ""):
+            try:
+                retried.celery_task_id = celery_result.id
+                ingest_job_repository.update(retried)
+            except Exception:  # noqa: BLE001
+                pass
         return ProjectTaskResponse(
             id=f"ingest:{retried.id}",
             task_type="ingest",

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

@@ -85,12 +85,22 @@ def _infer_mime_type_from_storage_key(storage_key: str) -> str:
     """从 storage_key 推断 MIME 类型（与 worker 端保持一致）。"""
     lower_filename = storage_key.rsplit("/", 1)[-1].lower()
     _MIME_MAP = {
-        ".mov": "video/quicktime", ".mp4": "video/mp4", ".avi": "video/x-msvideo",
-        ".mkv": "video/x-matroska", ".webm": "video/webm",
-        ".png": "image/png", ".gif": "image/gif", ".bmp": "image/bmp",
-        ".svg": "image/svg+xml", ".jpg": "image/jpeg", ".jpeg": "image/jpeg",
-        ".mp3": "audio/mpeg", ".wav": "audio/wav", ".ogg": "audio/ogg",
-        ".flac": "audio/flac", ".m4a": "audio/x-m4a",
+        ".mov": "video/quicktime",
+        ".mp4": "video/mp4",
+        ".avi": "video/x-msvideo",
+        ".mkv": "video/x-matroska",
+        ".webm": "video/webm",
+        ".png": "image/png",
+        ".gif": "image/gif",
+        ".bmp": "image/bmp",
+        ".svg": "image/svg+xml",
+        ".jpg": "image/jpeg",
+        ".jpeg": "image/jpeg",
+        ".mp3": "audio/mpeg",
+        ".wav": "audio/wav",
+        ".ogg": "audio/ogg",
+        ".flac": "audio/flac",
+        ".m4a": "audio/x-m4a",
     }
     for ext, mime in _MIME_MAP.items():
         if lower_filename.endswith(ext):
@@ -98,8 +108,85 @@ def _infer_mime_type_from_storage_key(storage_key: str) -> str:
     return "video/mp4"  # default
 
 
+# 兜底去重：无 file_hash / client_upload_id 时，同库同名近期活动记录视为重复
+FALLBACK_DEDUP_WINDOW_MINUTES = 30
+ACTIVE_ASSET_STATUSES = (AssetStatus.UPLOADING, AssetStatus.PROCESSING)
+
+
+def _find_duplicate_asset(
+    asset_repository: Any,
+    *,
+    library_id: str,
+    file_hash: str,
+    client_upload_id: str,
+    filename: str,
+    file_size: int = 0,
+) -> Any:
+    """complete/上传幂等去重，按优先级查找已存在的素材。
+
+    1. client_upload_id（客户端幂等 token，同一次上传的重试保持一致）
+    2. file_hash（内容哈希，不同上传只要内容相同即去重）
+    3. 兜底：同库 + 同文件名（+同大小）且 30 分钟内仍处 uploading/processing
+       的记录——旧客户端不传 hash/token 时，防止 complete 超时重试反复建占位。
+
+    全部为鸭子类型调用：旧仓储无对应方法时静默跳过，不破坏既有实现。
+    """
+    if client_upload_id:
+        find = getattr(asset_repository, "find_by_library_and_client_upload_id", None)
+        if callable(find):
+            existing = find(library_id=library_id, client_upload_id=client_upload_id)
+            if existing is not None:
+                logger.info(
+                    "素材幂等命中(client_upload_id): library=%s token=%s asset=%s",
+                    library_id,
+                    client_upload_id,
+                    getattr(existing, "id", "?"),
+                )
+                return existing
+    if file_hash:
+        existing = asset_repository.find_by_library_and_file_hash(
+            library_id=library_id,
+            file_hash=file_hash,
+        )
+        if existing is not None:
+            logger.info(
+                "素材去重命中(file_hash): library=%s hash=%s asset=%s",
+                library_id,
+                file_hash,
+                existing.id,
+            )
+            return existing
+    if filename:
+        find_recent = getattr(asset_repository, "find_recent_active_by_library_and_name", None)
+        if callable(find_recent):
+            existing = find_recent(
+                library_id=library_id,
+                name=filename,
+                within_minutes=FALLBACK_DEDUP_WINDOW_MINUTES,
+                file_size=file_size or 0,
+            )
+            if existing is not None and getattr(existing, "status", None) in ACTIVE_ASSET_STATUSES:
+                logger.info(
+                    "素材幂等兜底命中(近期活动同名记录): library=%s name=%s asset=%s status=%s",
+                    library_id,
+                    filename,
+                    getattr(existing, "id", "?"),
+                    getattr(existing, "status", "?"),
+                )
+                return existing
+    return None
+
+
 def _create_pending_asset(
-    asset_repository, project_id, library_id, storage_key, filename, mime_type, user_id, file_hash=""
+    asset_repository,
+    project_id,
+    library_id,
+    storage_key,
+    filename,
+    mime_type,
+    user_id,
+    file_hash="",
+    client_upload_id="",
 ):
     """立即创建一条 PROCESSING 状态的 Asset 记录，使前端能马上看到新素材。"""
     asset = Asset.create(
@@ -111,16 +198,29 @@ def _create_pending_asset(
         status=AssetStatus.PROCESSING,
         uploaded_by_user_id=user_id,
         file_hash=file_hash,
+        client_upload_id=client_upload_id,
     )
     return asset_repository.create(asset)
 
 
+def _persist_celery_task_id(repo: Any, job: Any, celery_task_id: str) -> None:
+    """记录 celery 消息 ID 到任务行，供孤儿清理时 revoke/清除队列消息（#1714）。"""
+    if not celery_task_id:
+        return
+    try:
+        job.celery_task_id = celery_task_id
+        repo.update(job)
+    except Exception:  # noqa: BLE001 — 记录失败不影响主流程（执行前状态守卫兜底）
+        pass
+
+
 def _submit_ingest_job(
     project_id: str,
     library_id: str,
     storage_key: str,
     ingest_job_repository: Any,
     file_hash: str = "",
+    asset_id: str = "",
 ) -> Any:
     use_case = SubmitIngestJobUseCase(ingest_job_repository)
     job = use_case.execute(
@@ -129,9 +229,11 @@ def _submit_ingest_job(
             library_id=library_id,
             storage_key=storage_key,
             file_hash=file_hash,
+            asset_id=asset_id,
         )
     )
-    celery_app.send_task("worker.ingest_asset", args=[job.id])
+    celery_result = celery_app.send_task("worker.ingest_asset", args=[job.id])
+    _persist_celery_task_id(ingest_job_repository, job, getattr(celery_result, "id", ""))
     return job
 
 
@@ -202,7 +304,7 @@ async def complete_direct_upload(
     asset_repository: Any = Depends(get_asset_repository),
     storage_service: OSSStorageService = Depends(get_storage_service),
 ) -> DirectUploadCompleteResponse:
-    """确认浏览器直传完成并创建导入任务。"""
+    """确认浏览器直传完成并创建导入任务（幂等：重复 complete 返回同一素材）。"""
     require_project_and_library(
         request.project_id,
         request.library_id,
@@ -212,6 +314,29 @@ async def complete_direct_upload(
     normalized_key = storage_service._normalize_storage_key(request.storage_key)
     if not normalized_key.startswith("uploads/"):
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid upload key")
+
+    filename = normalized_key.rsplit("/", 1)[-1]
+
+    # ── 幂等去重（放在 OSS 检查之前）：complete 超时后前端重试时，
+    # 第一次 complete 可能已建好占位记录，此时即使 OSS 检查失败也必须返回
+    # 已存在记录，绝不能再建第二条。─
+    existing = _find_duplicate_asset(
+        asset_repository,
+        library_id=request.library_id,
+        file_hash=request.file_hash,
+        client_upload_id=request.client_upload_id,
+        filename=filename,
+        file_size=request.file_size,
+    )
+    if existing is not None:
+        return DirectUploadCompleteResponse(
+            storage_key=existing.storage_key,
+            ingest_job_id="",
+            duplicated=True,
+            asset_id=existing.id,
+            url=storage_service.get_url(existing.storage_key),
+        )
+
     try:
         file_exists = storage_service.file_exists(normalized_key)
     except Exception as error:
@@ -223,29 +348,7 @@ async def complete_direct_upload(
     if not file_exists:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Uploaded file not found")
 
-    # ── 素材去重检测：同素材库 + 同 file_hash 视为重复 ──
-    if request.file_hash:
-        existing = asset_repository.find_by_library_and_file_hash(
-            library_id=request.library_id,
-            file_hash=request.file_hash,
-        )
-        if existing is not None:
-            logger.info(
-                "素材去重命中: library=%s hash=%s existing_asset=%s",
-                request.library_id,
-                request.file_hash,
-                existing.id,
-            )
-            return DirectUploadCompleteResponse(
-                storage_key=normalized_key,
-                ingest_job_id="",
-                duplicated=True,
-                asset_id=existing.id,
-                url=storage_service.get_url(normalized_key),
-            )
-
     # 立即创建 Asset 记录（PROCESSING 状态），使前端刷新后即可看到新素材
-    filename = normalized_key.rsplit("/", 1)[-1]
     mime_type = _infer_mime_type_from_storage_key(normalized_key)
     pending_asset = _create_pending_asset(
         asset_repository=asset_repository,
@@ -256,6 +359,7 @@ async def complete_direct_upload(
         mime_type=mime_type,
         user_id=authenticated_user.user.id,
         file_hash=request.file_hash,
+        client_upload_id=request.client_upload_id,
     )
 
     job = _submit_ingest_job(
@@ -264,6 +368,7 @@ async def complete_direct_upload(
         storage_key=normalized_key,
         ingest_job_repository=ingest_job_repository,
         file_hash=request.file_hash,
+        asset_id=pending_asset.id,
     )
     return DirectUploadCompleteResponse(
         storage_key=normalized_key,
@@ -283,7 +388,8 @@ async def upload_asset(
     project_id: str = Form(..., min_length=1, description="项目 ID"),
     library_id: str = Form(..., min_length=1, description="素材库 ID"),
     file: UploadFile = File(..., description="要上传的文件（视频、音频、图片等）"),
-    file_hash: str = Form(default="", description="文件 MD5 哈希，用于去重检测"),
+    file_hash: str = Form(default="", description="文件哈希，用于去重检测"),
+    client_upload_id: str = Form(default="", description="客户端幂等 token（同一次上传的重试保持一致）"),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     ingest_job_repository: Any = Depends(get_ingest_job_repository),
     project_repository: Any = Depends(get_project_repository),
@@ -294,32 +400,31 @@ async def upload_asset(
     """上传素材文件并触发导入流水线。"""
     require_project_and_library(project_id, library_id, project_repository, asset_library_repository)
 
-    # ── 素材去重检测：上传前检查同素材库 + 同 file_hash ──
-    if file_hash:
-        existing = asset_repository.find_by_library_and_file_hash(
-            library_id=library_id,
-            file_hash=file_hash,
-        )
-        if existing is not None:
-            logger.info(
-                "素材去重命中(multipart): library=%s hash=%s existing_asset=%s",
-                library_id,
-                file_hash,
-                existing.id,
-            )
-            return UploadAssetResponse(
-                storage_key=existing.storage_key,
-                ingest_job_id="",
-                url="",
-                duplicated=True,
-                asset_id=existing.id,
-            )
-
-    # P2-5: 服务端验证 MIME 类型
+    # P2-5: 服务端验证 MIME 类型（先验证，再幂等去重，避免非法类型绕过）
     validated_content_type = _validate_mime_type(file.content_type)
 
-    file_id = uuid4().hex[:8]
     safe_filename = file.filename.replace("/", "_").replace("\\", "_") if file.filename else "unknown"
+
+    # ── 幂等去重：client_upload_id → file_hash → 近期活动同名记录兜底 ──
+    # 放在 OSS 上传之前：重复提交直接返回，不占 OSS 流量、不建新记录。
+    existing = _find_duplicate_asset(
+        asset_repository,
+        library_id=library_id,
+        file_hash=file_hash,
+        client_upload_id=client_upload_id,
+        filename=safe_filename,
+        file_size=0,
+    )
+    if existing is not None:
+        return UploadAssetResponse(
+            storage_key=existing.storage_key,
+            ingest_job_id="",
+            url="",
+            duplicated=True,
+            asset_id=existing.id,
+        )
+
+    file_id = uuid4().hex[:8]
     storage_key = f"uploads/{file_id}/{safe_filename}"
 
     try:
@@ -348,6 +453,7 @@ async def upload_asset(
         mime_type=validated_content_type,
         user_id=authenticated_user.user.id,
         file_hash=file_hash,
+        client_upload_id=client_upload_id,
     )
 
     job = _submit_ingest_job(
@@ -356,6 +462,7 @@ async def upload_asset(
         storage_key=storage_key,
         ingest_job_repository=ingest_job_repository,
         file_hash=file_hash,
+        asset_id=pending_asset.id,
     )
 
     return UploadAssetResponse(

apps/api/app/api/routes/videos.py

@@ -15,6 +15,7 @@ from app.schemas.video_center import (
     VideoItemResponse,
 )
 from fastapi import APIRouter, Depends, HTTPException, Query, Response
+from pydantic import BaseModel, Field
 
 from packages.application import (
     GetGeneratedVideoUseCase,
@@ -53,6 +54,8 @@ def _to_video_response(item, storage: OSSStorageService | None = None) -> VideoI
         download_url=download_url,
         generated_at=format_utc_datetime(item.generated_at) if hasattr(item, "generated_at") else "",
         duplicate_rate=getattr(item, "duplicate_rate", None),
+        visual_similarity=getattr(item, "visual_similarity", None),
+        match_count=getattr(item, "match_count", None),
     )
 
 
@@ -237,3 +240,74 @@ def get_batch_download_status(
         status=api_status,
         download_url=download_url,
     )
+
+
+# ── 重新计算查重率 ─────────────────────────────────────────────────
+
+
+class RecomputeDedupRequest(BaseModel):
+    """重新计算查重率请求。"""
+
+    video_ids: list[str] | None = Field(
+        None,
+        description="指定视频 ID 列表。为空则对当前用户所有缺少查重数据的视频重新计算。",
+    )
+    force: bool = Field(
+        False,
+        description="强制重算：即使视频已有查重数据也重新入队（#1702 查重算法升级后用于存量视频重算）。",
+    )
+
+
+class RecomputeDedupResponse(BaseModel):
+    """重新计算查重率响应。"""
+
+    enqueued: int = Field(..., description="已入队的任务数量")
+    total_scanned: int = Field(..., description="扫描的视频总数")
+    skipped: int = Field(..., description="已有查重数据跳过的数量")
+    message: str = ""
+
+
+@router.post("/videos/recompute-dedup", response_model=RecomputeDedupResponse)
+def recompute_dedup(
+    request: RecomputeDedupRequest = RecomputeDedupRequest(),
+    repo=Depends(get_generated_video_repository),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+):
+    """重新计算视频的查重率/视觉相似度。
+
+    对于已存在但缺少 duplicate_rate / video_fingerprint 的视频，
+    触发异步 Celery 任务重新下载并计算指纹 + 查重率。
+
+    不传 video_ids 时，对当前用户所有视频进行检查。
+    """
+    user_id = current_user.user.id
+
+    # 获取目标视频列表
+    if request.video_ids:
+        all_videos = repo.get_by_ids(request.video_ids)
+        # 安全校验：只处理当前用户的视频
+        target_videos = [v for v in all_videos if v.user_id == user_id]
+    else:
+        target_videos = repo.list_by_user(user_id)
+
+    total_scanned = len(target_videos)
+    enqueued = 0
+    skipped = 0
+
+    for video in target_videos:
+        # 已有完整查重数据的跳过（force=True 时强制重算，#1702 算法升级后存量视频需要重算指纹/分片）
+        if not request.force and video.duplicate_rate is not None and video.video_fingerprint:
+            skipped += 1
+            continue
+
+        # 触发异步查重任务
+        celery_app.send_task("worker.check_duplicate", args=[video.id])
+        enqueued += 1
+        logger.info("Enqueued re-dedup for video %s (user=%s, force=%s)", video.id, user_id, request.force)
+
+    return RecomputeDedupResponse(
+        enqueued=enqueued,
+        total_scanned=total_scanned,
+        skipped=skipped,
+        message=f"已入队 {enqueued} 个查重任务" if enqueued > 0 else "所有视频查重数据已完整",
+    )

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

@@ -687,13 +687,13 @@ def extract_voice_from_video(
         raise HTTPException(
             status_code=status.HTTP_504_GATEWAY_TIMEOUT,
             detail="视频处理超时，请尝试较短的视频",
-        )
+        ) from None
     except Exception as e:
         logger.exception("提取视频配音失败: %s", e)
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail="提取配音失败，请稍后重试",
-        )
+        ) from e
     finally:
         # 清理临时文件
         if tmp_dir and Path(tmp_dir).exists():
@@ -740,7 +740,7 @@ def _find_or_create_voice_library_for_extract(*, user_id, project_repository, as
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail="配音素材库创建失败",
-        )
+        ) from None
 
 
 def _get_audio_duration(audio_path: Path) -> float:

apps/api/app/core/celery_app.py

@@ -5,3 +5,11 @@ settings = get_settings()
 celery_app = Celery("xiaoxia-saas-api")
 celery_app.conf.broker_url = settings.CELERY_BROKER_URL
 celery_app.conf.result_backend = settings.CELERY_RESULT_BACKEND
+
+# #1714 队列隔离：视频生成走 generation 队列，素材转码走 transcode 队列
+try:
+    from packages.shared.celery_queues import apply_queue_settings
+
+    apply_queue_settings(celery_app)
+except Exception:  # noqa: BLE001 — 队列配置失败不阻断 API 启动
+    pass

apps/api/app/core/task_enqueue.py

@@ -8,27 +8,145 @@ logger = logging.getLogger(__name__)
 # ── 限流阈值常量（全系统统一管理，不要在业务代码里硬编码） ──
 USER_PENDING_LIMIT = 3  # 单用户 pending 上限
 GLOBAL_PENDING_LIMIT = 20  # 全局 pending 上限
+WORKER_CONCURRENCY = 4  # worker 渲染并发数（infra/docker/compose.yml WORKER_CONCURRENCY 默认值）
+
+# 限流错误码：前端据此区分"排队等待"与"创建失败"
+ERROR_CODE_USER_QUEUE_FULL = "USER_QUEUE_FULL"  # 429：用户自己的任务排队中
+ERROR_CODE_SYSTEM_QUEUE_FULL = "SYSTEM_QUEUE_FULL"  # 503：系统整体繁忙
 
 
 class UserPendingLimitExceeded(Exception):
     """用户 pending 任务数超限，返回 429。"""
 
-    def __init__(self, user_id: str, pending_count: int, limit: int):
+    def __init__(
+        self,
+        user_id: str,
+        pending_count: int,
+        limit: int,
+        *,
+        running_count: int = 0,
+        requested_count: int = 1,
+        queue_ahead: int = 0,
+        estimated_wait_seconds: int = 0,
+    ):
         self.user_id = user_id
         self.pending_count = pending_count
         self.limit = limit
+        # 排队上下文（用于 429 结构化提示，前端展示"排队中"而非"创建失败"）
+        self.running_count = running_count
+        self.requested_count = requested_count
+        self.queue_ahead = queue_ahead
+        self.estimated_wait_seconds = estimated_wait_seconds
         super().__init__(f"用户 {user_id} pending 任务数 {pending_count} 超过上限 {limit}")
 
 
 class GlobalQueueFull(Exception):
     """全局限流，返回 503。"""
 
-    def __init__(self, pending_count: int, limit: int):
+    def __init__(
+        self,
+        pending_count: int,
+        limit: int,
+        *,
+        running_count: int = 0,
+        queue_ahead: int = 0,
+        estimated_wait_seconds: int = 0,
+    ):
         self.pending_count = pending_count
         self.limit = limit
+        self.running_count = running_count
+        self.queue_ahead = queue_ahead
+        self.estimated_wait_seconds = estimated_wait_seconds
         super().__init__(f"系统 pending 任务数 {pending_count} 超过上限 {limit}")
 
 
+def _estimate_wait_seconds(queue_ahead: int, generation_task_repository: Any) -> int:
+    """根据排队任务数 + worker 并发数 + 历史平均任务耗时估算等待秒数。
+
+    估算公式：ceil(排队任务数 / 并发数) × 平均单任务耗时。
+    拿不到历史数据时仓储层返回默认 120 秒。
+    """
+    import math
+
+    if queue_ahead <= 0:
+        return 0
+    try:
+        estimator = getattr(generation_task_repository, "estimate_avg_duration_seconds", None)
+        avg_seconds = estimator() if estimator is not None else 120.0
+    except Exception:
+        avg_seconds = 120.0
+    return int(math.ceil(queue_ahead / WORKER_CONCURRENCY) * avg_seconds)
+
+
+def build_rate_limit_detail(
+    exc: Exception,
+    generation_task_repository: Any,
+    *,
+    scope: str = "user",
+) -> dict:
+    """构造结构化限流响应体（HTTPException 的 detail）。
+
+    前端按 detail.code 判断场景：
+    - USER_QUEUE_FULL (429)：用户自己的任务在排队，应提示"等待/继续排队"，不是创建失败
+    - SYSTEM_QUEUE_FULL (503)：系统繁忙，稍后重试
+
+    detail 字段：
+    - code: 错误码
+    - message: 可读中文提示（可直接展示）
+    - queued_count: 当前排队(pending)任务数
+    - running_count: 当前渲染中(running)任务数
+    - queue_ahead: 前方排队任务数（预计等待批次依据）
+    - estimated_wait_seconds: 预计等待秒数
+    - limit: 对应限流上限
+    """
+    if scope == "user" and isinstance(exc, UserPendingLimitExceeded):
+        running = exc.running_count
+        if not running:
+            try:
+                counter = getattr(generation_task_repository, "count_running_by_user", None)
+                running = counter(exc.user_id) if counter is not None else 0
+            except Exception:
+                running = 0
+        queue_ahead = exc.queue_ahead or max(exc.pending_count, 0)
+        wait = exc.estimated_wait_seconds or _estimate_wait_seconds(queue_ahead, generation_task_repository)
+        wait_minutes = max(1, round(wait / 60))
+        message = (
+            f"您有 {exc.pending_count} 个任务正在排队、{running} 个正在渲染，"
+            f"同一时间最多提交 {exc.limit} 个任务。请等待约 {wait_minutes} 分钟后再提交"
+        )
+        return {
+            "code": ERROR_CODE_USER_QUEUE_FULL,
+            "message": message,
+            "queued_count": exc.pending_count,
+            "running_count": running,
+            "queue_ahead": queue_ahead,
+            "estimated_wait_seconds": wait,
+            "limit": exc.limit,
+        }
+
+    # 全局繁忙
+    pending = getattr(exc, "pending_count", 0)
+    running = getattr(exc, "running_count", 0)
+    if not running:
+        try:
+            counter = getattr(generation_task_repository, "count_running_total", None)
+            running = counter() if counter is not None else 0
+        except Exception:
+            running = 0
+    queue_ahead = getattr(exc, "queue_ahead", 0) or pending
+    wait = getattr(exc, "estimated_wait_seconds", 0) or _estimate_wait_seconds(queue_ahead, generation_task_repository)
+    wait_minutes = max(1, round(wait / 60))
+    return {
+        "code": ERROR_CODE_SYSTEM_QUEUE_FULL,
+        "message": f"系统繁忙：当前 {pending} 个任务排队中、{running} 个渲染中，预计等待约 {wait_minutes} 分钟，请稍后再试",
+        "queued_count": pending,
+        "running_count": running,
+        "queue_ahead": queue_ahead,
+        "estimated_wait_seconds": wait,
+        "limit": getattr(exc, "limit", GLOBAL_PENDING_LIMIT),
+    }
+
+
 def check_queue_limits(
     user_id: str,
     generation_task_repository: Any,
@@ -161,7 +279,17 @@ def safe_enqueue_generation_task(
 
     # ── 发送 Celery 任务 ──
     try:
-        celery_app.send_task("worker.generate_video", args=[task.id])
+        celery_result = celery_app.send_task("worker.generate_video", args=[task.id])
+        # 记录 celery 消息 ID：孤儿清理/超时作废时据此 revoke + 清除队列消息（#1714）
+        celery_task_id = getattr(celery_result, "id", "")
+        if celery_task_id:
+            try:
+                task.celery_task_id = celery_task_id
+                generation_task_repository.update(task)
+            except Exception as persist_err:  # noqa: BLE001
+                logger.warning(
+                    "%s 持久化 celery_task_id 失败（不影响主流程）: task_id=%s err=%s", log_prefix, task.id, persist_err
+                )
     except Exception as e:
         logger.error(
             "%s 入队失败，标记为失败: task_id=%s error=%s",

apps/api/app/schemas/duplication.py

@@ -28,6 +28,9 @@ class DuplicationRecordResponse(BaseModel):
     status: str = "pending"
     duplicate_rate: float | None = None
     duplicate_count: int = 0
+    # #1661 视觉相似度（归一化 0~1）/ 匹配视频数
+    visual_similarity: float | None = None
+    match_count: int | None = None
     created_at: str
     updated_at: str
 

apps/api/app/schemas/generated_video.py

@@ -25,6 +25,10 @@ class GeneratedVideoResponse(BaseModel):
     review_status: str = "pending_review"
     generation_params: dict = Field(default_factory=dict)
     download_url: str | None = None
+    # #1660 查重率（百分比 0~100）/ 视觉相似度（0~1）/ 匹配帧数
+    duplicate_rate: float | None = None
+    visual_similarity: float | None = None
+    match_count: int | None = None
 
 
 class GeneratedVideoDownloadUrlResponse(BaseModel):

apps/api/app/schemas/generation_task.py

@@ -25,6 +25,12 @@ class CreateGenerationTaskRequest(BaseModel):
     asset_library_id: str = ""
     strategy_id: str = ""
     voice_library_id: str = ""
+    # ── 多变体独立配音（批量生成）──
+    # 长度 1 = 所有变体共用；长度 = count = 每个变体独立配音；空数组 = 回退 voice_library_id
+    voice_library_ids: list[str] = Field(
+        default_factory=list,
+        description="各变体独立配音素材库ID数组：长度1=共用，长度=count=独立。为空时回退 voice_library_id",
+    )
     created_by_user_id: str = ""
     # ── 模板模式新增字段 ──
     template_id: str = ""
@@ -75,6 +81,27 @@ class CreateGenerationTaskRequest(BaseModel):
     output_width: int = Field(default=1280, description="输出视频宽度")
     output_height: int = Field(default=720, description="输出视频高度")
     cover_url: str = Field(default="", description="封面图片 URL")
+    # ── 多变体独立封面（批量生成）──
+    # 长度 1 = 所有变体共用；长度 = count = 每个变体独立封面；空数组 = 回退 cover_url
+    cover_urls: list[str] = Field(
+        default_factory=list,
+        description="各变体独立封面URL数组：长度1=共用，长度=count=独立。为空时回退 cover_url",
+    )
+    # ── 多变体独立标题文字（批量生成）──
+    # 长度 1 = 所有变体共用；长度 = count = 每个变体独立标题文字；空数组 = 使用 title_config.text
+    titles: list[str] = Field(
+        default_factory=list,
+        description="各变体独立标题文字数组：长度1=共用，长度=count=独立。为空时使用 title_config.text",
+    )
+
+    @model_validator(mode="after")
+    def _check_variant_arrays(self) -> "CreateGenerationTaskRequest":
+        """变体数组字段长度校验：空数组（回退单值）、长度 1（共用）、或长度 = count（独立）。"""
+        for name in ("voice_library_ids", "cover_urls", "titles"):
+            arr = getattr(self, name)
+            if arr and len(arr) != 1 and len(arr) != self.count:
+                raise ValueError(f"{name} 长度必须为 1（共用）或 {self.count}（与 count 一致），当前为 {len(arr)}")
+        return self
 
     @model_validator(mode="after")
     def _check_at_least_one_mode(self) -> "CreateGenerationTaskRequest":
@@ -185,8 +212,33 @@ class CreatePreviewGenerationTaskRequest(BaseModel):
     )
     title_config: dict = Field(
         default_factory=dict,
-        description="标题配置（可选），渲染时烧录到预览视频中。支持字段: text/font/font_size/font_color/position/bold/stroke/shadow",
+        description="标题配置（可选），渲染时烧录到预览视频中。支持字段: text/font/font_size/font_color/position/bold/stroke/shadow。N个变体时样式全局共用",
     )
+    # ── 多变体独立配置（preview_count > 1）──
+    # 长度 1 = 所有变体共用；长度 = preview_count = 每个变体独立；空数组 = 回退单值字段
+    titles: list[str] = Field(
+        default_factory=list,
+        description="各变体独立标题文字数组：长度1=共用，长度=preview_count=独立。为空时使用 title_config.text",
+    )
+    voice_library_ids: list[str] = Field(
+        default_factory=list,
+        description="各变体独立配音素材库ID数组：长度1=共用，长度=preview_count=独立。为空时回退 voice_library_id",
+    )
+    cover_urls: list[str] = Field(
+        default_factory=list,
+        description="各变体独立封面URL数组：长度1=共用，长度=preview_count=独立（预览阶段通常为空）",
+    )
+
+    @model_validator(mode="after")
+    def _check_variant_arrays(self) -> "CreatePreviewGenerationTaskRequest":
+        """变体数组字段长度校验：空数组（回退单值）、长度 1（共用）、或长度 = preview_count（独立）。"""
+        for name in ("titles", "voice_library_ids", "cover_urls"):
+            arr = getattr(self, name)
+            if arr and len(arr) != 1 and len(arr) != self.preview_count:
+                raise ValueError(
+                    f"{name} 长度必须为 1（共用）或 {self.preview_count}（与 preview_count 一致），当前为 {len(arr)}"
+                )
+        return self
 
     @model_validator(mode="after")
     def _check_template_id(self) -> "CreatePreviewGenerationTaskRequest":
@@ -202,7 +254,7 @@ class CreatePreviewGenerationTaskRequest(BaseModel):
 
 
 class PreviewGenerationTaskResponse(BaseModel):
-    """预览生成任务响应。
+    """单个预览变体任务响应。
 
     包含任务状态、进度、分辨率、生成结果 URL 等关键字段。
     """
@@ -211,6 +263,7 @@ class PreviewGenerationTaskResponse(BaseModel):
     status: str
     progress: float
     is_preview: bool = True
+    variant_index: int = 0
     resolution: str = ""
     video_url: str = ""
     duration: float = 0.0
@@ -219,7 +272,21 @@ class PreviewGenerationTaskResponse(BaseModel):
     transition_count: int = 0
     material_usage: dict = Field(default_factory=dict)
     error_message: str = ""
+    title_text: str = ""
+    voice_library_id: str = ""
     created_at: datetime | None = None
     started_at: datetime | None = None
     finished_at: datetime | None = None
     generate_duration: float = 0.0
+
+
+class BatchPreviewGenerationTaskResponse(BaseModel):
+    """批量预览任务响应：preview_count=N 时返回 N 个独立变体任务。
+
+    - items: 变体任务数组，按 variant_index 顺序排列，每个含独立 task_id/状态/预览视频URL
+    - total: 变体总数（= preview_count）
+    - 前端按 items[i].task_id 分别轮询 GET /preview/{task_id} 获取进度与结果
+    """
+
+    items: list[PreviewGenerationTaskResponse]
+    total: int

apps/api/app/schemas/upload.py

@@ -31,14 +31,16 @@ class DirectUploadCompleteRequest(BaseModel):
     project_id: str = Field(..., min_length=1)
     library_id: str = Field(..., min_length=1)
     storage_key: str = Field(..., min_length=1, max_length=255)
-    file_hash: str = Field(default="", max_length=64, description="文件 MD5 哈希，用于去重检测")
+    file_hash: str = Field(default="", max_length=64, description="文件哈希，用于去重检测")
+    client_upload_id: str = Field(default="", max_length=64, description="客户端幂等 token（同一次上传的重试保持一致）")
+    file_size: int = Field(default=0, ge=0, description="文件大小（字节），用于无 hash 时的兜底去重")
 
 
 class DirectUploadCompleteResponse(BaseModel):
     storage_key: str
     ingest_job_id: str
-    duplicated: bool = Field(default=False, description="是否为重复素材（命中去重）")
-    asset_id: str = Field(default="", description="重复素材的 asset_id（duplicated=true 时返回）")
+    duplicated: bool = Field(default=False, description="是否为重复素材/重复 complete（命中幂等去重）")
+    asset_id: str = Field(default="", description="素材 asset_id（重复 complete 时返回已存在记录）")
     url: str = Field(default="", description="Public URL of uploaded file")
 
 
@@ -46,5 +48,5 @@ class UploadAssetResponse(BaseModel):
     storage_key: str
     ingest_job_id: str
     url: str = Field(..., description="Public URL of uploaded file")
-    duplicated: bool = Field(default=False, description="是否为重复素材（命中去重）")
-    asset_id: str = Field(default="", description="重复素材的 asset_id（duplicated=true 时返回）")
+    duplicated: bool = Field(default=False, description="是否为重复素材/重复提交（命中幂等去重）")
+    asset_id: str = Field(default="", description="素材 asset_id（重复提交时返回已存在记录）")

apps/api/app/schemas/video_center.py

@@ -22,7 +22,10 @@ class VideoItemResponse(BaseModel):
     generation_params: dict = Field(default_factory=dict)
     download_url: str | None = None
     generated_at: str = ""
+    # #1660 查重率（百分比 0~100）/ 视觉相似度（0~1）/ 匹配帧数
     duplicate_rate: float | None = None
+    visual_similarity: float | None = None
+    match_count: int | None = None
 
 
 class ListVideosResponse(BaseModel):

apps/api/app/services/plan_generator_service.py

@@ -131,6 +131,7 @@ class PlanGeneratorService:
                 editing_mode,
                 random_selection=random_preview,
                 asset_durations=asset_durations,
+                user_id=created_by_user_id,
             )
 
         # 5. 持久化所有 clips 并计算总时长
@@ -218,6 +219,7 @@ class PlanGeneratorService:
         *,
         random_selection: bool = False,
         asset_durations: dict[str, float] | None = None,
+        user_id: str = "",
     ) -> None:
         """按 editing_mode 将素材分配到 clips（就地修改，未持久化）.
 
@@ -239,6 +241,14 @@ class PlanGeneratorService:
                 asset_ids = list(asset_ids)  # 复制避免修改调用方原列表
                 random.shuffle(asset_ids)
 
+        # 查询已有视频的已用区间（跨视频避让）
+        external_used_segments = None
+        if user_id and self._clip_repo:
+            try:
+                external_used_segments = self._clip_repo.list_used_segments_by_user(user_id, limit_recent=50)
+            except Exception:
+                logger.warning("跨视频避让查询失败，回退到纯随机", exc_info=True)
+
         distribute_assets(
             clips,
             asset_ids,
@@ -246,6 +256,7 @@ class PlanGeneratorService:
             random_selection=random_selection,
             asset_durations=asset_durations,
             asset_scene_points=asset_scene_points,
+            external_used_segments=external_used_segments,
         )
 
     def _fetch_asset_scene_points(self, asset_ids: List[str]) -> dict[str, list[float]]:

apps/api/scripts/rebuild_fingerprint_chunks.py

@@ -0,0 +1,174 @@
+#!/usr/bin/env python3
+"""存量指纹重建脚本 — 为已有视频生成 video_fingerprint_chunks 分片数据。
+
+功能：
+- 查询 generated_videos 中 video_fingerprint IS NOT NULL 但尚无分片数据的视频
+- 从 OSS 下载视频 → 用新的分片算法重新计算指纹 → 写入分片表
+- 支持 --dry-run（只打印不写入）和 --batch-size（默认 50）
+- 幂等：已存在分片数据的视频跳过
+
+用法：
+    # 预览（不写入）
+    python rebuild_fingerprint_chunks.py --dry-run
+
+    # 执行重建
+    python rebuild_fingerprint_chunks.py --batch-size 50
+"""
+
+from __future__ import annotations
+
+import argparse
+import logging
+import os
+import sys
+import tempfile
+
+# 确保可以 import worker_app 和 packages
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "worker"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", ".."))
+
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
+)
+logger = logging.getLogger("rebuild_fingerprint_chunks")
+
+
+def find_videos_needing_rebuild(session, batch_size: int) -> list[dict]:
+    """查询需要重建分片指纹的视频。"""
+    from sqlalchemy import and_
+
+    from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel, VideoFingerprintChunkModel
+
+    # 有 video_fingerprint 的视频
+    has_fingerprint = GeneratedVideoModel.video_fingerprint.isnot(None)
+    has_fingerprint = and_(has_fingerprint, GeneratedVideoModel.video_fingerprint != "")
+
+    # 排除已有分片数据的视频
+    subq = session.query(VideoFingerprintChunkModel.video_id).distinct().subquery()
+    no_chunks = ~GeneratedVideoModel.id.in_(subq)
+
+    videos = (
+        session.query(GeneratedVideoModel)
+        .filter(and_(has_fingerprint, no_chunks))
+        .order_by(GeneratedVideoModel.generated_at.desc())
+        .limit(batch_size)
+        .all()
+    )
+
+    return [
+        {
+            "id": v.id,
+            "project_id": v.project_id,
+            "user_id": v.user_id or "",
+            "duration": v.duration,
+        }
+        for v in videos
+    ]
+
+
+def rebuild_one(video_info: dict, dry_run: bool = False) -> int:
+    """重建单个视频的分片数据。返回写入的 chunk 数量。"""
+    from video_processing.dedup import VideoDeduplicator, _save_fingerprint_chunks
+    from worker_app.db import SessionLocal
+
+    from packages.adapters.sqlalchemy_impl.models import VideoFingerprintChunkModel
+    from packages.shared.storage import get_storage_service
+
+    video_id = video_info["id"]
+    project_id = video_info["project_id"]
+    user_id = video_info["user_id"]
+
+    if dry_run:
+        logger.info("[DRY-RUN] Would rebuild video %s (project=%s)", video_id, project_id)
+        return 0
+
+    session = SessionLocal()
+    temp_dir = tempfile.mkdtemp()
+
+    try:
+        # 再次检查幂等性
+        existing_count = (
+            session.query(VideoFingerprintChunkModel).filter(VideoFingerprintChunkModel.video_id == video_id).count()
+        )
+        if existing_count > 0:
+            logger.info("Video %s already has %d chunks, skipping", video_id, existing_count)
+            return 0
+
+        # 下载视频
+        storage_service = get_storage_service()
+        local_path = os.path.join(temp_dir, f"{video_id}.mp4")
+        storage_key = f"projects/{project_id}/generated/{video_id}/{video_id}.mp4"
+        storage_service.download_file(storage_key, local_path)
+
+        # 重新计算指纹
+        deduplicator = VideoDeduplicator()
+        fingerprint = deduplicator.compute_fingerprint(local_path)
+
+        # 写入分片表
+        _save_fingerprint_chunks(fingerprint, video_id, project_id, user_id, session)
+        session.commit()
+
+        chunk_count = len(fingerprint.chunks)
+        logger.info("Rebuilt %d chunks for video %s", chunk_count, video_id)
+        return chunk_count
+
+    except Exception as e:
+        logger.error("Failed to rebuild video %s: %s", video_id, e)
+        session.rollback()
+        return -1
+    finally:
+        session.close()
+        import shutil
+
+        shutil.rmtree(temp_dir, ignore_errors=True)
+
+
+def main():
+    parser = argparse.ArgumentParser(description="存量指纹重建脚本")
+    parser.add_argument("--dry-run", action="store_true", help="只打印不写入")
+    parser.add_argument("--batch-size", type=int, default=50, help="每批处理数量（默认 50）")
+    parser.add_argument("--total-limit", type=int, default=0, help="总处理数量限制（0=不限制）")
+    args = parser.parse_args()
+
+    from worker_app.db import SessionLocal
+
+    session = SessionLocal()
+
+    try:
+        videos = find_videos_needing_rebuild(session, args.batch_size)
+        logger.info("Found %d videos needing rebuild", len(videos))
+
+        if args.dry_run:
+            for v in videos:
+                logger.info("[DRY-RUN] Video %s | project=%s | duration=%.1fs", v["id"], v["project_id"], v["duration"])
+            return
+
+        total_chunks = 0
+        processed = 0
+        failed = 0
+
+        for v in videos:
+            if args.total_limit > 0 and processed >= args.total_limit:
+                break
+
+            result = rebuild_one(v, dry_run=False)
+            if result < 0:
+                failed += 1
+            else:
+                total_chunks += result
+                processed += 1
+
+        logger.info(
+            "Rebuild complete: processed=%d, chunks=%d, failed=%d",
+            processed,
+            total_chunks,
+            failed,
+        )
+
+    finally:
+        session.close()
+
+
+if __name__ == "__main__":
+    main()

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

@@ -185,6 +185,13 @@ test.describe("Core generation flow", () => {
     await expect(page.locator(".xx-choice-item.selected")).toBeVisible()
     await page.getByRole("button", { name: "下一步" }).click()
 
+    // Step1 下一步弹出数量选择弹窗（Issue #1677 固定6步：模板→素材→配音→标题→确认生成→封面）
+    // 单视频流程：默认 1 个，点击「生成 1 个视频」进入步骤2
+    await expect(page.getByRole("heading", { name: "要生成几个视频？" })).toBeVisible({
+      timeout: 10_000,
+    })
+    await page.getByRole("button", { name: "生成 1 个视频" }).click()
+
     // Step 2: select material (card grid UI)
     await expect(page.getByRole("heading", { name: /选择素材/ })).toBeVisible()
     const librarySelect = page.locator("select").first()
@@ -255,32 +262,19 @@ test.describe("Core generation flow", () => {
       expect(genData.items.length).toBeGreaterThan(0)
       expect(genData.items[0].id).toBeTruthy()
 
-      // Step 5: 确认生成页 — 任务创建成功后自动跳转，展示渲染进度
-      await expect(page.getByRole("heading", { name: /确认生成/ })).toBeVisible({
-        timeout: 15_000,
+      // 单视频（N=1）：点击「确认生成视频」后跳 Step 5「确认生成」，展示实时渲染进度
+      await expect(page.getByRole("heading", { name: "🎬 确认生成" })).toBeVisible({
+        timeout: 30_000,
       })
 
-      // Step 5 → Step 6：等待渲染终态
-      // - 完成：页面出现「视频生成完成」，步骤5「下一步」按钮解锁，点击进入封面
-      // - 失败：出现「生成失败」，停在确认生成页也算向导流程走通
-      // - 超时未终态（测试环境 worker 可能不处理任务）：进度仍在轮询，同样算走通
-      const renderSucceeded = await page
-        .getByText("视频生成完成", { exact: false })
-        .waitFor({ timeout: 180_000 })
-        .then(() => true)
-        .catch(() => false)
-      if (renderSucceeded) {
-        // 渲染完成：手动点「下一步」进入封面步骤（渲染完不自动跳转）
-        await page.getByRole("button", { name: "下一步" }).click()
-        // Step 6: 封面（最后一步，无主按钮），仅验证页面渲染
-        await expect(page.getByRole("heading", { name: /选择封面/ })).toBeVisible({
-          timeout: 15_000,
-        })
-      } else {
-        // 失败或超时：仍在确认生成页（进度展示或失败提示），向导流程已完整走通
-        await expect(page.getByRole("heading", { name: /确认生成/ })).toBeVisible()
-        console.log("[E2E] 渲染任务失败或未在 180s 内完成，冒烟测试仍通过（已达确认生成页）")
-      }
+      // 等待渲染完成：进度卡变为「视频生成完成」（最长等待 3 分钟）
+      await expect(page.getByText("视频生成完成")).toBeVisible({ timeout: 180_000 })
+
+      // 全部完成后「下一步：选择封面」解锁，点击进入 Step 6
+      await page.getByRole("button", { name: /下一步：选择封面/ }).click()
+      await expect(page.getByRole("heading", { name: /选择封面/ })).toBeVisible({
+        timeout: 30_000,
+      })
     } else {
       console.log(`[E2E] Generate API returned ${genResp.status()}, wizard flow test still passes`)
       // 创建失败时停留在标题页并展示错误提示

apps/web/src/api/assets/upload.ts

@@ -4,6 +4,7 @@
 import apiClient from "../client"
 import { getOrCreateDefaultProject } from "../projects"
 import type { DirectUploadPrepareResult, DirectUploadCompleteResult } from "./types"
+import { computeFileHash, makeClientUploadId } from "./uploadDedup"
 
 /** 预签名直传准备 */
 export const prepareDirectUpload = async (data: {
@@ -12,8 +13,13 @@ export const prepareDirectUpload = async (data: {
   filename: string
   content_type: string
   file_size: number
+  /** 前端算好的文件内容哈希（SHA-256 hex），打开后端 file_hash 去重闸门 */
+  file_hash?: string
+  /** 前端生成的上传幂等 token，同一次逻辑上传（含重试）保持不变 */
+  client_upload_id?: string
 }): Promise<DirectUploadPrepareResult> => {
-  const response = await apiClient.post("/upload/direct/prepare", data)
+  // prepare 单独放宽到 30s（全局 axios 实例只有 10s，staging 抖动时易超时）
+  const response = await apiClient.post("/upload/direct/prepare", data, { timeout: 30_000 })
   return response.data
 }
 
@@ -22,8 +28,14 @@ export const completeDirectUpload = async (data: {
   project_id: string
   library_id: string
   storage_key: string
+  /** 前端算好的文件内容哈希（与 prepare 一致），后端按 hash 幂等去重 */
+  file_hash?: string
+  /** 前端上传幂等 token（与 prepare 一致），同一次上传重发 complete 不重复建记录 */
+  client_upload_id?: string
 }): Promise<DirectUploadCompleteResult> => {
-  const response = await apiClient.post("/upload/direct/complete", data)
+  // complete 内含 OSS 存在性检查 + 建库 + 派单，放宽到 60s；
+  // 超时不代表失败（记录可能已建成），调用方禁止超时后盲目重传整个文件
+  const response = await apiClient.post("/upload/direct/complete", data, { timeout: 60_000 })
   return response.data
 }
 
@@ -109,8 +121,20 @@ export interface DirectUploadHandle {
 export const prepareDirectUploadHandle = async (data: {
   file: File
   library_id: string
+  /** 前端算好的文件内容哈希（SHA-256 hex），prepare/complete 均携带 */
+  fileHash?: string
+  /** 本次逻辑上传的幂等 token，prepare/complete 一致、重试复用 */
+  clientUploadId?: string
 }): Promise<DirectUploadHandle> => {
-  const project = await getOrCreateDefaultProject()
+  // 默认项目初始化失败（项目列表接口异常/自动创建失败）给出独立、明确的提示，
+  // 不与 prepare 的签名接口错误混在一起
+  let project: Awaited<ReturnType<typeof getOrCreateDefaultProject>>
+  try {
+    project = await getOrCreateDefaultProject()
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : "网络异常"
+    throw new Error(`初始化默认项目失败，无法开始上传：${reason}`)
+  }
 
   const prepared = await prepareDirectUpload({
     project_id: project.id,
@@ -118,6 +142,8 @@ export const prepareDirectUploadHandle = async (data: {
     filename: data.file.name,
     content_type: data.file.type || "application/octet-stream",
     file_size: data.file.size,
+    file_hash: data.fileHash,
+    client_upload_id: data.clientUploadId,
   })
 
   return {
@@ -128,6 +154,8 @@ export const prepareDirectUploadHandle = async (data: {
         project_id: project.id,
         library_id: data.library_id,
         storage_key: prepared.storage_key,
+        file_hash: data.fileHash,
+        client_upload_id: data.clientUploadId,
       }),
   }
 }
@@ -137,8 +165,20 @@ export const uploadAssetDirect = async (data: {
   file: File
   library_id: string
   onProgress?: (percent: number) => void
+  /** 文件内容哈希；未传时自动补算（配音/封面/克隆等非队列链路统一受益） */
+  fileHash?: string
+  /** 幂等 token；未传时自动生成 */
+  clientUploadId?: string
 }): Promise<DirectUploadCompleteResult> => {
-  const handle = await prepareDirectUploadHandle({ file: data.file, library_id: data.library_id })
+  // 自动补算哈希与幂等 token：确保 file_hash 去重闸门对所有上传链路生效
+  const fileHash = data.fileHash ?? (await computeFileHash(data.file))
+  const clientUploadId = data.clientUploadId ?? makeClientUploadId()
+  const handle = await prepareDirectUploadHandle({
+    file: data.file,
+    library_id: data.library_id,
+    fileHash,
+    clientUploadId,
+  })
   await handle.transfer(data.onProgress)
   return handle.complete()
 }

apps/web/src/api/assets/uploadDedup.ts

@@ -0,0 +1,143 @@
+/**
+ * 上传去重 / 幂等工具（Issue #1714）
+ *
+ * 背景：同一文件被反复入队、complete 超时后盲目重传，导致后端创建大量重复
+ * PROCESSING 素材记录。本模块提供两类纯函数：
+ *
+ * 1. 文件指纹：
+ *    - makeFileFingerprint()：文件名+大小+lastModified，入队去重用（同步、零开销）
+ *    - computeFileHash()：SHA-256 内容哈希（小文件全量、大文件抽样头尾），
+ *      prepare/complete 时发给后端打开 file_hash 去重闸门
+ * 2. 队列去重：findDuplicateInQueue() 判断文件是否已在队列中
+ * 3. 幂等 token：makeClientUploadId() 生成上传幂等 ID（每次"一次逻辑上传"一个，
+ *    重试复用同一 ID，重新入队才生成新 ID）
+ */
+
+/** 全量哈希阈值：≤64MB 全量读入计算；超过即走头尾抽样，避免 100~256MB 视频被整文件读进内存卡死页面 */
+export const HASH_FULL_READ_LIMIT = 64 * 1024 * 1024 // 64MB
+/** 抽样读取的头尾片段大小（各 16MB） */
+export const HASH_SAMPLE_CHUNK = 16 * 1024 * 1024
+
+/** 计算指纹时，文件在队列中已存在的状态（已失败的可以重试，不算重复） */
+export type DedupExcludeStatus = "error" | "done"
+
+/**
+ * 文件入队指纹：同库 + 文件名 + 大小 + 修改时间。
+ * 同一文件（File 对象由 <input> 重选或拖拽重复触发时三个字段均一致）稳定复现；
+ * 不同文件极小概率碰撞时可由后端 file_hash 内容去重兜底。
+ */
+export function makeFileFingerprint(file: Pick<File, "name" | "size" | "lastModified">): string {
+  return `${file.name}::${file.size}::${file.lastModified}`
+}
+
+/**
+ * 在现有队列项中查找同一文件的在途记录。
+ * 已失败（error）的项允许重试路径复用、已完成（done）的可跳过；
+ * 处于 preparing/uploading/ingesting 的在途项一律视为重复，禁止重复入队。
+ *
+ * 返回命中的队列项 id（tempId），未命中返回 null。
+ */
+export function findDuplicateInQueue<T extends { fileKey: string; status: string }>(
+  queue: T[],
+  fileKey: string,
+  excludeStatuses: DedupExcludeStatus[] = [],
+): T | null {
+  const exclude = new Set<string>(excludeStatuses)
+  return queue.find((it) => it.fileKey === fileKey && !exclude.has(it.status)) ?? null
+}
+
+/** 生成上传幂等 token：一次"逻辑上传"一个，重试复用、重新入队换新 */
+export function makeClientUploadId(): string {
+  const rand =
+    typeof crypto !== "undefined" && "randomUUID" in crypto
+      ? crypto.randomUUID()
+      : `${Date.now()}-${Math.random().toString(36).slice(2, 10)}-${Math.random()
+          .toString(36)
+          .slice(2, 10)}`
+  return `up_${Date.now().toString(36)}_${rand.replace(/-/g, "").slice(0, 16)}`
+}
+
+/** 读取 Blob/File 片段为 ArrayBuffer：优先 Blob.arrayBuffer()，老环境回退 FileReader */
+function readAsArrayBuffer(blob: Blob): Promise<ArrayBuffer> {
+  if (typeof blob.arrayBuffer === "function") {
+    return blob.arrayBuffer()
+  }
+  return new Promise<ArrayBuffer>((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = () => resolve(reader.result as ArrayBuffer)
+    reader.onerror = () => reject(reader.error ?? new Error("FileReader read failed"))
+    reader.readAsArrayBuffer(blob)
+  })
+}
+
+/**
+ * 把 buffer 复制到当前 JS realm 的 Uint8Array 再哈希。
+ * jsdom/测试环境中 Blob.arrayBuffer() 可能返回另一 realm 的 ArrayBuffer，
+ * Node WebCrypto 的 WebIDL instanceof 校验会拒绝跨 realm 参数。
+ */
+async function digestSha256(buffer: ArrayBuffer): Promise<ArrayBuffer> {
+  const subtle =
+    typeof globalThis !== "undefined" && globalThis.crypto ? globalThis.crypto.subtle : null
+  if (!subtle) throw new Error("crypto.subtle unavailable")
+  const local = new Uint8Array(buffer.byteLength)
+  local.set(new Uint8Array(buffer))
+  return subtle.digest("SHA-256", local)
+}
+
+function toHex(buffer: ArrayBuffer): string {
+  const bytes = new Uint8Array(buffer)
+  let hex = ""
+  for (let i = 0; i < bytes.length; i += 1) {
+    hex += bytes[i].toString(16).padStart(2, "0")
+  }
+  return hex
+}
+
+/**
+ * 计算文件内容 SHA-256（hex，64 字符，与后端 file_hash 字段长度一致）。
+ * - ≤64MB：全量哈希，内容一致必然一致
+ * - >64MB：哈希「头部 16MB + 尾部 16MB + 文件大小」，视频素材体积大、
+ *   头部含 moov 元数据、尾部含 mdat 结尾，抽样碰撞概率可忽略，
+ *   且避免 100~256MB 视频被整文件读进内存导致页面卡死/崩溃
+ *
+ * 运行环境不支持 crypto.subtle（非安全上下文/老浏览器）时返回空字符串，
+ * 调用方据此降级为不传 hash（后端仍有幂等 token + 同文件名兜底去重）。
+ */
+export async function computeFileHash(file: File): Promise<string> {
+  try {
+    const subtle =
+      typeof globalThis !== "undefined" &&
+      globalThis.crypto &&
+      typeof globalThis.crypto.subtle?.digest === "function"
+        ? globalThis.crypto.subtle
+        : null
+    if (!subtle) return ""
+
+    if (file.size <= HASH_FULL_READ_LIMIT) {
+      const data = await readAsArrayBuffer(file.slice(0, file.size))
+      return toHex(await digestSha256(data))
+    }
+
+    // 大文件：头 8MB + 尾 8MB + 大小，拼成一段后哈希
+    const head = await readAsArrayBuffer(file.slice(0, HASH_SAMPLE_CHUNK))
+    const tail =
+      file.size > HASH_SAMPLE_CHUNK
+        ? await readAsArrayBuffer(file.slice(Math.max(0, file.size - HASH_SAMPLE_CHUNK), file.size))
+        : new ArrayBuffer(0)
+    const merged = new Uint8Array(head.byteLength + tail.byteLength + 8)
+    merged.set(new Uint8Array(head), 0)
+    merged.set(new Uint8Array(tail), head.byteLength)
+    const sizeView = new DataView(merged.buffer, head.byteLength + tail.byteLength, 8)
+    // 文件大小以 64 位大端写入（BigInt 最稳；不支持 BigInt64 时手算高低位）
+    if (typeof sizeView.setBigUint64 === "function") {
+      sizeView.setBigUint64(0, BigInt(file.size), false)
+    } else {
+      sizeView.setUint32(0, Math.floor(file.size / 0x100000000), false)
+      sizeView.setUint32(4, file.size >>> 0, false)
+    }
+    return toHex(await digestSha256(merged.buffer))
+  } catch (err) {
+    console.warn("[uploadDedup] 计算文件哈希失败，降级为不传 file_hash:", err)
+    return ""
+  }
+}

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

@@ -12,13 +12,18 @@ export type {
   UserResponse,
   WechatAuthUrlResponse,
   WechatCallbackResponse,
+  WechatBindUrlResponse,
+  WechatBindCompleteResponse,
+  WechatUnbindResponse,
+  UpdateProfileRequest,
+  UpdateProfileResponse,
   SendVerificationCodeRequest,
   BindContactRequest,
   BindContactResponse,
 } from "./types"
 
 // 用户工具函数
-export { normalizeUser } from "./user"
+export { normalizeUser, updateProfile } from "./user"
 
 // 登录/注册/登出/刷新
 export { login, refreshAccessToken, register, logout } from "./login"
@@ -32,8 +37,14 @@ export { requestPasswordReset, resetPassword } from "./password"
 // 邮箱验证
 export { verifyEmail } from "./email"
 
-// 微信登录
-export { getWechatAuthUrl, wechatCallback } from "./wechat"
+// 微信登录 / 绑定
+export {
+  getWechatAuthUrl,
+  wechatCallback,
+  getWechatBindUrl,
+  bindWechat,
+  unbindWechat,
+} from "./wechat"
 
 // 联系方式
 export { sendVerificationCode, bindContact } from "./contact"

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

@@ -34,6 +34,17 @@ export interface User {
   is_email_verified: boolean
   email_verified: boolean
   created_at?: string
+  /** 微信是否已绑定 */
+  wechat_bound?: boolean
+  /** 微信昵称（绑定后展示） */
+  wechat_nickname?: string
+  /** 头像 URL（微信头像等） */
+  avatar_url?: string
+  /** 手机号 */
+  phone?: string
+  phone_verified?: boolean
+  /** 资料是否完善（微信新用户首次登录为 false，需填昵称引导） */
+  profile_completed?: boolean
 }
 
 export interface UserResponse {
@@ -45,6 +56,12 @@ export interface UserResponse {
   is_email_verified?: boolean
   email_verified?: boolean
   created_at?: string
+  wechat_bound?: boolean
+  wechat_nickname?: string
+  avatar_url?: string
+  phone?: string
+  phone_verified?: boolean
+  profile_completed?: boolean
 }
 
 export interface WechatAuthUrlResponse {
@@ -80,3 +97,30 @@ export interface BindContactResponse {
   success: boolean
   user: User
 }
+
+/** 更新个人资料请求 */
+export interface UpdateProfileRequest {
+  display_name?: string
+}
+
+/** 更新个人资料响应（返回最新用户信息） */
+export interface UpdateProfileResponse {
+  user: UserResponse
+}
+
+/** 微信绑定授权链接响应 */
+export interface WechatBindUrlResponse {
+  auth_url: string
+  state: string
+}
+
+/** 微信绑定完成响应 */
+export interface WechatBindCompleteResponse {
+  success: boolean
+  user: UserResponse
+}
+
+/** 微信解绑响应 */
+export interface WechatUnbindResponse {
+  success: boolean
+}

apps/web/src/api/auth/user.ts

@@ -1,4 +1,5 @@
-import type { User, UserResponse } from "./types"
+import apiClient from "../client"
+import type { User, UserResponse, UpdateProfileRequest, UpdateProfileResponse } from "./types"
 
 /**
  * 规范化用户数据，兼容不同后端返回格式
@@ -16,5 +17,19 @@ export const normalizeUser = (data: UserResponse): User => {
     is_email_verified: emailVerified,
     email_verified: emailVerified,
     created_at: data.created_at,
+    wechat_bound: data.wechat_bound,
+    wechat_nickname: data.wechat_nickname,
+    avatar_url: data.avatar_url,
+    phone: data.phone,
+    phone_verified: data.phone_verified,
+    profile_completed: data.profile_completed,
   }
 }
+
+/**
+ * 更新个人资料（昵称等）
+ */
+export const updateProfile = async (data: UpdateProfileRequest): Promise<User> => {
+  const response = await apiClient.patch<UpdateProfileResponse>("/auth/me", data)
+  return normalizeUser(response.data.user)
+}

apps/web/src/api/auth/wechat.ts

@@ -1,8 +1,14 @@
 import apiClient from "../client"
-import type { WechatAuthUrlResponse, WechatCallbackResponse } from "./types"
+import type {
+  WechatAuthUrlResponse,
+  WechatCallbackResponse,
+  WechatBindUrlResponse,
+  WechatBindCompleteResponse,
+  WechatUnbindResponse,
+} from "./types"
 
 /**
- * 获取微信授权链接
+ * 获取微信授权链接（登录场景）
  */
 export const getWechatAuthUrl = async (): Promise<WechatAuthUrlResponse> => {
   const response = await apiClient.get("/auth/wechat/url")
@@ -19,3 +25,30 @@ export const wechatCallback = async (
   const response = await apiClient.post("/auth/wechat/callback", { code, state })
   return response.data
 }
+
+/**
+ * 获取微信绑定授权链接（已登录用户绑定场景）
+ */
+export const getWechatBindUrl = async (): Promise<WechatBindUrlResponse> => {
+  const response = await apiClient.get("/auth/wechat/bind/url")
+  return response.data
+}
+
+/**
+ * 微信绑定完成（扫码回调后用 code 绑定到当前登录账号）
+ */
+export const bindWechat = async (
+  code: string,
+  state: string,
+): Promise<WechatBindCompleteResponse> => {
+  const response = await apiClient.post("/auth/wechat/bind", { code, state })
+  return response.data
+}
+
+/**
+ * 解绑微信
+ */
+export const unbindWechat = async (): Promise<WechatUnbindResponse> => {
+  const response = await apiClient.delete("/auth/wechat/bind")
+  return response.data
+}

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

@@ -20,6 +20,10 @@ export interface DuplicationRecord {
   duplicate_rate?: number
   /** 重复片段数 */
   duplicate_count?: number
+  /** 视觉相似度（0-100），#1660 新增 */
+  visual_similarity?: number
+  /** 匹配帧数，#1660 新增 */
+  match_count?: number
   /** 创建时间 */
   created_at: string
   /** 更新时间 */

apps/web/src/api/errors.ts

@@ -0,0 +1,132 @@
+/**
+ * 统一错误信息提取
+ * 把 axios 错误（后端 detail / FastAPI 校验错误 / HTTP 状态码）、XHR/OSS 错误、
+ * 网络/超时错误、普通 Error 统一转成「可直接展示给用户」的中文信息。
+ *
+ * 与 api/client.ts 响应拦截器的提示口径保持一致；拦截器负责全局 toast，
+ * 页面/队列卡片用本工具把真实原因展示在持久位置（回调页、失败卡片等）。
+ */
+import type { AxiosError } from "axios"
+
+/** 后端错误响应体可能出现的字段（FastAPI：detail；历史接口：message/msg） */
+interface ErrorBody {
+  detail?: unknown
+  message?: unknown
+  msg?: unknown
+}
+
+/** FastAPI 422 校验错误单项 */
+interface ValidationItem {
+  loc?: (string | number)[]
+  msg?: string
+}
+
+/** 从后端响应体提取人类可读信息（detail 可能是字符串、对象、422 数组） */
+function extractBodyMessage(data: unknown): string {
+  if (!data || typeof data !== "object") return ""
+  const body = data as ErrorBody
+
+  const walk = (val: unknown): string => {
+    if (typeof val === "string") return val
+    if (Array.isArray(val)) {
+      // FastAPI 422: [{loc, msg, type}, ...] → 取每条 msg 拼接
+      const parts = val
+        .map((item) => {
+          if (typeof item === "string") return item
+          if (item && typeof item === "object") {
+            const v = item as ValidationItem
+            if (typeof v.msg === "string") {
+              const field = Array.isArray(v.loc) ? v.loc.filter((x) => x !== "body").join(".") : ""
+              return field ? `${field}: ${v.msg}` : v.msg
+            }
+            return walk(item)
+          }
+          return ""
+        })
+        .filter(Boolean)
+      return parts.join("；")
+    }
+    if (val && typeof val === "object") {
+      const obj = val as Record<string, unknown>
+      if (typeof obj.message === "string") return obj.message
+      if (typeof obj.msg === "string") return obj.msg
+      if (typeof obj.detail === "string") return obj.detail
+      if (obj.message && typeof obj.message === "object") return walk(obj.message)
+      if (obj.msg && typeof obj.msg === "object") return walk(obj.msg)
+      try {
+        return JSON.stringify(val)
+      } catch {
+        return ""
+      }
+    }
+    return ""
+  }
+
+  return walk(body.detail) || walk(body.message) || walk(body.msg)
+}
+
+/** 无响应体时按 HTTP 状态码给出兜底提示（与 client.ts 拦截器口径一致） */
+function statusFallback(status: number): string {
+  switch (status) {
+    case 400:
+      return "请求参数有误（HTTP 400）"
+    case 401:
+      return "登录状态已失效，请重新登录（HTTP 401）"
+    case 403:
+      return "没有权限执行该操作（HTTP 403）"
+    case 404:
+      return "请求的资源不存在（HTTP 404）"
+    case 409:
+      return "操作冲突，资源状态已变化（HTTP 409）"
+    case 413:
+      return "文件过大，请缩小后重试（HTTP 413）"
+    case 415:
+      return "不支持的文件格式（HTTP 415）"
+    case 429:
+      return "操作过于频繁，请稍后再试（HTTP 429）"
+    case 503:
+      return "服务暂不可用，请稍后再试（HTTP 503）"
+    default:
+      if (status >= 500) return `服务器繁忙，请稍后再试（HTTP ${status}）`
+      return `请求失败（HTTP ${status}）`
+  }
+}
+
+/**
+ * 从任意抛出值提取可展示的错误信息。
+ * @param fallback 全部提取失败时的兜底文案
+ */
+export function getErrorMessage(err: unknown, fallback = "操作失败，请稍后重试"): string {
+  if (!err) return fallback
+
+  // axios 错误（后端 JSON 响应 / HTTP 错误状态）
+  const ax = err as AxiosError<ErrorBody>
+  if (ax.isAxiosError || (typeof ax === "object" && "response" in (ax as object))) {
+    // 超时
+    if (ax.code === "ECONNABORTED" || /timeout/i.test(ax.message || "")) {
+      return "请求超时，请检查网络后重试"
+    }
+    const resp = ax.response
+    if (resp) {
+      const bodyMsg = extractBodyMessage(resp.data)
+      if (bodyMsg) return bodyMsg
+      return statusFallback(resp.status)
+    }
+    // 请求已发出但无响应（断网/CORS/DNS）
+    if (ax.request) return "网络连接异常，请检查网络设置"
+    return ax.message || fallback
+  }
+
+  if (err instanceof Error) {
+    // XHR 直传 OSS 失败等场景自带详细 message（含 HTTP 状态 + OSS Code/Message）
+    if (err.message) return err.message
+  }
+  if (typeof err === "string") return err
+
+  return fallback
+}
+
+/** client.ts 拦截器是否已对该错误弹过全局 toast（__msgShown 标记） */
+export function isErrorMsgShown(err: unknown): boolean {
+  return Boolean((err as { __msgShown?: boolean } | null)?.__msgShown)
+}

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

@@ -33,15 +33,36 @@ export interface CreatePreviewRequest {
     preset_id?: string
     volume?: number
   }
+  /** 批量预览数量（1~10），默认1。N>1 时返回 N 个独立变体任务 */
+  preview_count?: number
+  /** 各变体独立标题文字：长度1=共用，长度=preview_count=独立，空数组=使用 title_config.text */
+  titles?: string[]
+  /** 各变体独立配音素材库ID：长度1=共用，长度=preview_count=独立，空数组=回退 voice_library_id */
+  voice_library_ids?: string[]
+  /** 各变体独立封面URL：长度1=共用，长度=preview_count=独立（预览阶段通常为空） */
+  cover_urls?: string[]
 }
 
-/** 创建预览任务响应 */
-export interface CreatePreviewResponse {
+/** 单个预览变体任务 */
+export interface PreviewVariantItem {
   task_id: string
-  status: PreviewStatus
+  status: string
+  progress: number
   is_preview: boolean
+  variant_index: number
   resolution: string
-  created_at: string
+  video_url: string
+  duration: number
+  error_message: string
+  title_text: string
+  voice_library_id: string
+  created_at?: string | null
+}
+
+/** 创建预览任务响应（单变体，preview_count=1 时 items 长度为1） */
+export interface CreatePreviewResponse {
+  items: PreviewVariantItem[]
+  total: number
   /** 后端自动关联的编辑计划 ID（用于 fallback 路径传递 source_edit_plan_id） */
   source_edit_plan_id?: string
 }

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

@@ -13,6 +13,8 @@ export type {
   VideoItem,
 } from "./types"
 
+export type { RecomputeDedupResponse } from "./products"
+
 // 工具函数
 export { mapVideoToProductItem } from "./utils"
 
@@ -25,4 +27,5 @@ export {
   updateReviewStatus,
   batchDownload,
   getBatchDownloadStatus,
+  recomputeDedup,
 } from "./products"

apps/web/src/api/products/products.ts

@@ -78,3 +78,18 @@ export const getBatchDownloadStatus = async (jobId: string): Promise<BatchDownlo
   console.warn("[getBatchDownloadStatus] 后端暂无批量下载状态端点", jobId)
   return { job_id: jobId, status: "processing", progress: 0 }
 }
+
+/** 重新计算存量视频查重率（异步） */
+export interface RecomputeDedupResponse {
+  enqueued: number
+  total_scanned: number
+  skipped: number
+  message: string
+}
+
+export const recomputeDedup = async (videoIds?: string[]): Promise<RecomputeDedupResponse> => {
+  const response = await apiClient.post("/videos/recompute-dedup", {
+    video_ids: videoIds,
+  })
+  return response.data
+}

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

@@ -23,6 +23,10 @@ export interface ProductItem {
   project_name?: string
   /** 查重率（百分比） */
   duplicate_rate?: number
+  /** 视觉相似度（0-1），#1660 新增 */
+  visual_similarity?: number
+  /** 匹配帧数，#1660 新增 */
+  match_count?: number
   created_at?: string
   updated_at?: string
 }
@@ -72,4 +76,8 @@ export interface VideoItem {
   download_url: string
   generated_at: string
   duplicate_rate?: number
+  /** 视觉相似度（0-1），#1660 新增 */
+  visual_similarity?: number
+  /** 匹配帧数，#1660 新增 */
+  match_count?: number
 }

apps/web/src/api/products/utils.ts

@@ -30,5 +30,7 @@ export function mapVideoToProductItem(video: VideoItem): ProductItem {
     created_at: video.generated_at,
     updated_at: video.generated_at,
     duplicate_rate: video.duplicate_rate,
+    visual_similarity: video.visual_similarity,
+    match_count: video.match_count,
   }
 }

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

@@ -92,6 +92,14 @@ export interface CreateGenerationTaskRequest {
     preset_id?: string
     volume?: number
   }
+  /** 批量生成数量（1~10），默认1。不传=单条旧逻辑 */
+  count?: number
+  /** 各变体独立标题文字：长度1=共用，长度=count=独立，空数组=使用 title_config/custom_title */
+  titles?: string[]
+  /** 各变体独立配音素材库ID：长度1=共用，长度=count=独立，空数组=回退 voice_library_id */
+  voice_library_ids?: string[]
+  /** 各变体独立封面URL：长度1=共用，长度=count=独立，空数组=回退 cover_url */
+  cover_urls?: string[]
 }
 
 /** 单个生成任务详情（对齐后端 GenerationTaskResponse） */

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

@@ -81,10 +81,11 @@ export const extractVideoVoice = async (
 ): Promise<{ asset_id: string; duration: number }> => {
   const formData = new FormData()
   formData.append("file", file)
+  formData.append("project_id", "default")
 
   return new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest()
-    xhr.open("POST", "/api/v1/tts/extract-video-voice")
+    xhr.open("POST", "/api/v1/voices/extract-voice")
 
     // 携带认证 token（从 localStorage 获取，与 apiClient 拦截器一致）
     const token = localStorage.getItem("access_token")

apps/web/src/pages/assets/AssetLibrary.tsx

@@ -42,6 +42,7 @@ const AssetLibrary: React.FC = () => {
     assetsError,
     assetsErrorObj,
     refetchAssets,
+    stalledAssetIds,
     searchText,
     setSearchText,
     filterType,
@@ -77,6 +78,7 @@ const AssetLibrary: React.FC = () => {
     removeUpload,
     clearFinished,
     uploading,
+    transferActive,
     activeCount,
     pendingCount,
   } = useAssetUpload({ effectiveLibId })
@@ -168,6 +170,7 @@ const AssetLibrary: React.FC = () => {
           {/* 上传区域 */}
           <AssetUploadZone
             uploading={uploading}
+            transferActive={transferActive}
             activeCount={activeCount}
             pendingCount={pendingCount}
             onUpload={enqueueUploads}
@@ -214,6 +217,7 @@ const AssetLibrary: React.FC = () => {
             selectedIds={selectedIds}
             diagnosingId={diagnosingId}
             uploadProgressMap={uploadProgressMap}
+            stalledAssetIds={stalledAssetIds}
             onRetry={refetchAssets}
             onToggleSelect={toggleSelect}
             onDiagnose={handleDiagnose}

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

@@ -831,6 +831,20 @@
   color: #ef4444;
 }
 
+.xx-upload-queue-error-detail {
+  margin-top: 4px;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #ef4444;
+  word-break: break-word;
+  white-space: normal;
+}
+
+.xx-upload-queue-error-hint {
+  margin-top: 2px;
+  color: #b45309;
+}
+
 .xx-upload-queue-actions {
   display: flex;
   gap: 6px;
@@ -1041,3 +1055,25 @@
   background: #fef2f2;
   color: #dc2626;
 }
+
+/* 上传入口禁用态（直传进行中，防重复提交，Issue #1714） */
+.xx-asset-upload-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+.xx-asset-upload-btn:disabled:hover {
+  opacity: 0.6;
+}
+.xx-asset-upload-btn:disabled:active {
+  transform: none;
+}
+
+/* 处理超时遮罩：创建超过 10 分钟仍在处理中（疑似后端卡住），停止转圈并警示 */
+.xx-asset-thumb-stalled {
+  background: rgba(217, 119, 6, 0.28);
+  color: #fde68a;
+  backdrop-filter: blur(2px);
+}
+.xx-asset-thumb-stalled :first-child {
+  font-size: var(--font-size-2xl);
+}

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

@@ -22,6 +22,8 @@ export interface AssetCardProps {
   diagnosing?: boolean
   /** 上传中实时进度（仅 uploading 态有值；ingesting 后由后端状态接管） */
   uploadProgress?: { progress: number; uploading: boolean }
+  /** 处理超过 10 分钟仍未就绪（疑似后端卡住）：停止转圈并提示处理超时 */
+  stalled?: boolean
   onToggle: () => void
   onDiagnose: () => void
   onPlay: () => void
@@ -33,6 +35,7 @@ const AssetCard: React.FC<AssetCardProps> = ({
   selected,
   diagnosing,
   uploadProgress,
+  stalled,
   onToggle,
   onDiagnose,
   onPlay,
@@ -67,11 +70,15 @@ const AssetCard: React.FC<AssetCardProps> = ({
           </div>
         )}
 
-        {/* 转码/处理中遮罩 */}
+        {/* 转码/处理中遮罩（卡死超过 10 分钟时停止转圈，提示超时） */}
         {asset.loading && !isUploading && (
-          <div className="xx-asset-thumb-overlay xx-asset-thumb-processing">
-            <LoadingOutlined />
-            <span>转码处理中</span>
+          <div
+            className={`xx-asset-thumb-overlay ${
+              stalled ? "xx-asset-thumb-stalled" : "xx-asset-thumb-processing"
+            }`}
+          >
+            {stalled ? <CloseCircleOutlined /> : <LoadingOutlined />}
+            <span>{stalled ? "处理超时，可重试上传" : "转码处理中"}</span>
           </div>
         )}
 
@@ -129,7 +136,7 @@ const AssetCard: React.FC<AssetCardProps> = ({
         </p>
         <div className="xx-asset-meta">
           <span className="xx-asset-meta-status">
-            <StatusPill status={asset.status} label={asset.statusLabel} />
+            <StatusPill status={asset.status} label={stalled ? "处理超时" : asset.statusLabel} />
           </span>
           {asset.duration && <span className="xx-asset-meta-duration">{asset.duration}</span>}
         </div>

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

@@ -19,6 +19,8 @@ export interface AssetGridSectionProps {
   selectedIds: Set<string>
   diagnosingId: string | null
   uploadProgressMap?: UploadProgressMap
+  /** 创建超过 10 分钟仍在处理中的素材 id（疑似后端卡住），卡片提示处理超时 */
+  stalledAssetIds?: Set<string>
   onRetry?: () => void
   onToggleSelect: (id: string) => void
   onDiagnose: (asset: AssetItem) => void
@@ -34,6 +36,7 @@ export const AssetGridSection: React.FC<AssetGridSectionProps> = ({
   selectedIds,
   diagnosingId,
   uploadProgressMap,
+  stalledAssetIds,
   onRetry,
   onToggleSelect,
   onDiagnose,
@@ -76,6 +79,7 @@ export const AssetGridSection: React.FC<AssetGridSectionProps> = ({
             selected={selectedIds.has(asset.id)}
             diagnosing={diagnosingId === asset.id}
             uploadProgress={uploadProgressMap?.get(asset.id)}
+            stalled={stalledAssetIds?.has(asset.id)}
             onToggle={() => onToggleSelect(asset.id)}
             onDiagnose={() => onDiagnose(asset)}
             onPlay={() => onPlay(asset)}

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

@@ -4,10 +4,13 @@
  * - 拖拽文件到内容区任意位置同样触发上传（不再占用大面积虚线框）
  */
 import React, { useRef, useState } from "react"
+import { message } from "antd"
 import { PlusOutlined, CloudUploadOutlined } from "@ant-design/icons"
 
 export interface AssetUploadZoneProps {
   uploading: boolean
+  /** 有文件正在本地指纹/prepare/直传（非服务端转码），此时禁用入口防重复提交 */
+  transferActive: boolean
   activeCount: number
   pendingCount: number
   onUpload: (files: File[]) => void
@@ -15,6 +18,7 @@ export interface AssetUploadZoneProps {
 
 export const AssetUploadZone: React.FC<AssetUploadZoneProps> = ({
   uploading,
+  transferActive,
   activeCount,
   pendingCount,
   onUpload,
@@ -27,6 +31,11 @@ export const AssetUploadZone: React.FC<AssetUploadZoneProps> = ({
 
   const pickFiles = (list: FileList | null) => {
     if (!list || list.length === 0) return
+    // 直传进行中拦截重复触发：相同文件仍由入队去重兜底，这里先给明确反馈
+    if (transferActive) {
+      message.warning("文件正在上传中，请等待当前上传完成后再添加")
+      return
+    }
     onUpload(Array.from(list))
   }
 
@@ -58,10 +67,18 @@ export const AssetUploadZone: React.FC<AssetUploadZoneProps> = ({
       <button
         type="button"
         className="xx-asset-upload-btn"
-        onClick={() => inputRef.current?.click()}
+        disabled={transferActive}
+        title={transferActive ? "文件上传中，暂不能添加新文件" : undefined}
+        onClick={() => {
+          if (transferActive) {
+            message.warning("文件正在上传中，请等待当前上传完成后再添加")
+            return
+          }
+          inputRef.current?.click()
+        }}
       >
         <PlusOutlined />
-        上传素材
+        {transferActive ? "上传中…" : "上传素材"}
       </button>
       <span className="xx-asset-upload-status">
         {uploading ? (

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

@@ -12,7 +12,8 @@ import {
   ReloadOutlined,
   CloseOutlined,
 } from "@ant-design/icons"
-import type { UploadItem } from "../hooks/useAssetUpload"
+import type { UploadItem, UploadFailStage } from "../hooks/useAssetUpload"
+import { COMPLETE_RETRY_HINT } from "../hooks/useAssetUpload"
 
 export interface UploadQueuePanelProps {
   items: UploadItem[]
@@ -29,6 +30,13 @@ const STATUS_TEXT: Record<UploadItem["status"], string> = {
   error: "上传失败",
 }
 
+/** 失败阶段中文名：让用户一眼看到失败发生在哪一步 */
+const FAIL_STAGE_TEXT: Record<UploadFailStage, string> = {
+  prepare: "准备上传阶段",
+  transfer: "文件传输阶段",
+  complete: "确认入库阶段",
+}
+
 const UploadQueuePanel: React.FC<UploadQueuePanelProps> = ({
   items,
   onRetry,
@@ -80,16 +88,34 @@ const UploadQueuePanel: React.FC<UploadQueuePanelProps> = ({
                 ) : null}
                 <div className="xx-upload-queue-status">
                   {it.duplicated ? "素材已存在，已跳过" : STATUS_TEXT[it.status]}
+                  {it.status === "preparing" && it.hint ? `（${it.hint}）` : ""}
                   {it.status === "uploading" ? ` ${it.progress}%` : ""}
-                  {it.status === "error" && it.error ? `：${it.error}` : ""}
+                  {it.status === "error" && it.failedStage
+                    ? `（${FAIL_STAGE_TEXT[it.failedStage]}）`
+                    : ""}
                 </div>
+                {it.status === "error" && it.error ? (
+                  <div className="xx-upload-queue-error-detail" title={it.error}>
+                    {it.error.split("\n").map((line, idx) =>
+                      line === COMPLETE_RETRY_HINT ? (
+                        <div key={idx} className="xx-upload-queue-error-hint">
+                          {line}
+                        </div>
+                      ) : (
+                        <div key={idx}>{line}</div>
+                      ),
+                    )}
+                  </div>
+                ) : null}
               </div>
               <span className="xx-upload-queue-actions">
                 {it.status === "error" && (
                   <button
                     type="button"
                     className="xx-upload-queue-btn"
-                    title="重试"
+                    title={
+                      it.failedStage === "complete" ? "安全重试（只确认，不重新上传）" : "重试上传"
+                    }
                     onClick={() => onRetry(it.tempId)}
                   >
                     <ReloadOutlined />

apps/web/src/pages/assets/hooks/useAssetUpload.ts

@@ -2,34 +2,65 @@ import { useState, useCallback, useRef, useEffect } from "react"
 import { useQueryClient } from "@tanstack/react-query"
 import { message } from "antd"
 import { prepareDirectUploadHandle, type DirectUploadHandle } from "@/api/assets"
+import { getErrorMessage, isErrorMsgShown } from "@/api/errors"
 import { MAX_FILE_SIZE } from "../constants"
+import {
+  computeFileHash,
+  findDuplicateInQueue,
+  makeClientUploadId,
+  makeFileFingerprint,
+} from "@/api/assets/uploadDedup"
 
 /** 单文件上传状态机 */
 export type UploadItemStatus = "preparing" | "uploading" | "ingesting" | "done" | "error"
 
+/** 失败发生的阶段：complete 阶段失败时记录可能已在后端建成，禁止盲目重传整个文件 */
+export type UploadFailStage = "prepare" | "transfer" | "complete"
+
 export interface UploadItem {
-  /** 前端临时 id（prepare 前无 asset_id 时用） */
+  /** 前端临时 id（prepare 前无 asset_id 时用），同时作为队列项 key */
   tempId: string
   file: File
   fileName: string
   /** 进度 0~100（仅直传阶段有真实进度） */
   progress: number
   status: UploadItemStatus
+  /** 文件指纹（name+size+lastModified），入队去重用 */
+  fileKey: string
+  /** 本次逻辑上传的幂等 token：重试复用、重新入队才换新 */
+  clientUploadId: string
+  /** 上传前算好的文件内容哈希（SHA-256），prepare/complete 都带上 */
+  fileHash?: string
   /** 后端 prepare 预建的 asset id（旧后端可能为空） */
   assetId?: string
   /** 去重命中：complete 返回 duplicated，标记完成但不产生新素材 */
   duplicated?: boolean
+  /** 失败发生的阶段；complete 阶段失败点重试只重发 complete，不重新上传文件 */
+  failedStage?: UploadFailStage
+  /** 状态行补充提示（如"正在计算文件指纹…"） */
+  hint?: string
   error?: string
 }
 
 /** 批量直传最大并发数，避免多文件瓜分上行带宽 */
 const MAX_CONCURRENT = 3
 
+/** complete 阶段失败后的安全提示：素材可能已在后端建成，重试只重发 complete 幂等安全 */
+export const COMPLETE_RETRY_HINT = "素材可能已在服务器处理中，点重试将安全确认，不会重新上传文件"
+
+/** 失败阶段中文名（toast 提示用，明确失败发生在哪一步） */
+const STAGE_LABEL: Record<UploadFailStage, string> = {
+  prepare: "准备上传",
+  transfer: "文件传输",
+  complete: "确认入库",
+}
+
 /**
  * 素材批量上传 Hook
- * - prepare 阶段后端预建 status=uploading 的 asset，前端拿到 asset_id 立即刷新列表
+ * - 入队按文件指纹（name+size+lastModified）去重：同一文件已在队列/上传中/处理中时不重复入队
+ * - 上传前计算文件 SHA-256，prepare/complete 携带 file_hash + 幂等 token（clientUploadId）
+ * - complete 超时/失败不盲目重传：复用 handle 只重发 complete（幂等），prepare/transfer 失败才全量重跑
  * - OSS 直传并发限制为 3，其余排队；每个文件独立进度/状态
- * - complete 后素材进入转码（ingesting/processing），由列表轮询反映
  * - 失败卡片支持重试/移除
  */
 export function useAssetUpload({ effectiveLibId }: { effectiveLibId: string }) {
@@ -39,6 +70,13 @@ export function useAssetUpload({ effectiveLibId }: { effectiveLibId: string }) {
   const itemsRef = useRef<UploadItem[]>([])
   itemsRef.current = items
 
+  /**
+   * prepare 成功后的 handle 按 tempId 留存：
+   * complete 阶段失败（超时/网络）时 OSS 文件已存在、后端记录也可能已建成，
+   * 重试必须复用同一 handle 只重发 complete，绝不能重新 prepare+直传。
+   */
+  const handlesRef = useRef<Map<string, DirectUploadHandle>>(new Map())
+
   const updateItem = useCallback((tempId: string, patch: Partial<UploadItem>) => {
     setItems((prev) => prev.map((it) => (it.tempId === tempId ? { ...it, ...patch } : it)))
   }, [])
@@ -52,14 +90,57 @@ export function useAssetUpload({ effectiveLibId }: { effectiveLibId: string }) {
     queryClient.invalidateQueries({ queryKey: ["asset-libraries"] })
   }, [queryClient, effectiveLibId])
 
-  /** 执行单个文件的完整上传流程（prepare→transfer→complete） */
+  /**
+   * 执行单个文件的完整上传流程。
+   * @param completeOnly  complete 阶段失败后的重试：跳过 hash/prepare/transfer，只重发 complete
+   *                      （OSS 文件已传完，重发由 file_hash + clientUploadId 保证幂等）
+   */
   const runUpload = useCallback(
-    async (item: UploadItem, handle?: DirectUploadHandle) => {
+    async (item: UploadItem, handle?: DirectUploadHandle, completeOnly = false) => {
+      let stage: UploadFailStage = "prepare"
       try {
-        // 1. prepare（重试时复用已准备的 handle 也行，但签名可能过期，重新 prepare 最稳）
-        const h =
-          handle ??
-          (await prepareDirectUploadHandle({ file: item.file, library_id: effectiveLibId }))
+        let h = handle
+
+        if (completeOnly && h) {
+          // ── complete 重试：文件已在 OSS，直接幂等重发确认 ──
+          stage = "complete"
+          updateItem(item.tempId, {
+            status: "ingesting",
+            progress: 100,
+            error: undefined,
+            failedStage: undefined,
+            hint: undefined,
+          })
+          const result = await h.complete()
+          refreshList()
+          handlesRef.current.delete(item.tempId)
+          if (result.duplicated) {
+            updateItem(item.tempId, { status: "done", duplicated: true, assetId: result.asset_id })
+            message.info(`"${item.fileName}" 与素材库已有内容相同，已跳过`)
+          } else {
+            updateItem(item.tempId, { status: "done", assetId: result.asset_id || item.assetId })
+            message.success(`"${item.fileName}" 上传完成，正在转码处理`)
+          }
+          return
+        }
+
+        // 1. 计算文件内容哈希（失败不阻塞，降级为不传 hash；后端仍有幂等 token 兜底）
+        updateItem(item.tempId, { hint: "正在计算文件指纹…" })
+        const fileHash = item.fileHash || (await computeFileHash(item.file))
+        updateItem(item.tempId, { fileHash, hint: undefined })
+
+        // 2. prepare（携带 file_hash + 幂等 token；重试时复用同一 clientUploadId）
+        stage = "prepare"
+        h =
+          h ??
+          (await prepareDirectUploadHandle({
+            file: item.file,
+            library_id: effectiveLibId,
+            fileHash,
+            clientUploadId: item.clientUploadId,
+          }))
+        handlesRef.current.set(item.tempId, h)
+
         if (h.prepared.asset_id) {
           updateItem(item.tempId, {
             status: "uploading",
@@ -72,26 +153,59 @@ export function useAssetUpload({ effectiveLibId }: { effectiveLibId: string }) {
           updateItem(item.tempId, { status: "uploading", progress: 0 })
         }
 
-        // 2. OSS 直传（真实进度）
+        // 3. OSS 直传（真实进度）
+        stage = "transfer"
         await h.transfer((pct) => updateItem(item.tempId, { progress: pct }))
 
-        // 3. complete：后端创建 ingest job，素材进入转码
+        // 4. complete：后端确认入库并创建 ingest job（file_hash + 幂等 token 已在 handle 闭包中）
+        stage = "complete"
         updateItem(item.tempId, { status: "ingesting", progress: 100 })
         const result = await h.complete()
         refreshList()
+        handlesRef.current.delete(item.tempId)
 
         if (result.duplicated) {
           updateItem(item.tempId, { status: "done", duplicated: true, assetId: result.asset_id })
           message.info(`"${item.fileName}" 与素材库已有内容相同，已跳过`)
         } else {
-          updateItem(item.tempId, { status: "done" })
+          updateItem(item.tempId, { status: "done", assetId: result.asset_id || item.assetId })
           message.success(`"${item.fileName}" 上传完成，正在转码处理`)
         }
       } catch (err: unknown) {
-        const detail = err instanceof Error ? err.message : "上传失败"
-        console.error("[useAssetUpload] 上传失败:", item.fileName, err)
-        updateItem(item.tempId, { status: "error", error: detail })
-        message.error(`"${item.fileName}" 上传失败：${detail}`)
+        // 完整失败原因：HTTP 状态码 / OSS XML 的 Code+Message / 后端 detail，
+        // 由 getErrorMessage 统一提取（OSS XHR 错误自带「OSS 直传失败: HTTP xxx ...」明细）
+        const detail = getErrorMessage(err, "未知错误")
+        console.error("[useAssetUpload] 上传失败:", item.fileName, stage, err)
+
+        if (stage === "complete") {
+          // complete 失败（超时/5xx/网络）：后端记录可能已建成，handle 保留供幂等重试；
+          // 刷新列表让用户看到可能已创建的「处理中」素材，避免误以为没传上去而重复操作。
+          // 卡片同时展示真实错误原因 + 安全重试提示（重试只重发 complete，不重新上传）
+          refreshList()
+          updateItem(item.tempId, {
+            status: "error",
+            failedStage: "complete",
+            error: `${detail}\n${COMPLETE_RETRY_HINT}`,
+            hint: undefined,
+          })
+          if (!isErrorMsgShown(err)) {
+            message.error(`"${item.fileName}" 确认入库失败：${detail}`)
+          }
+        } else {
+          // prepare / transfer 失败：后端尚无素材记录，可安全全量重跑
+          handlesRef.current.delete(item.tempId)
+          updateItem(item.tempId, {
+            status: "error",
+            failedStage: stage === "transfer" ? "transfer" : "prepare",
+            error: detail,
+            hint: undefined,
+          })
+          // 拦截器已对后端错误弹过 toast（含真实 detail）时不重复弹；
+          // OSS XHR 直传错误不走 axios，必须在这里弹
+          if (!isErrorMsgShown(err)) {
+            message.error(`"${item.fileName}" ${STAGE_LABEL[stage]}失败：${detail}`)
+          }
+        }
       }
     },
     [effectiveLibId, refreshList, updateItem],
@@ -113,7 +227,9 @@ export function useAssetUpload({ effectiveLibId }: { effectiveLibId: string }) {
       if (!next) return
       claimedRef.current.add(next.tempId)
       inFlightRef.current += 1
-      void runUpload(next).finally(() => {
+      // complete 阶段失败的重试：复用留存的 handle，只重发 complete
+      const existingHandle = handlesRef.current.get(next.tempId)
+      void runUpload(next, existingHandle, existingHandle !== undefined).finally(() => {
         inFlightRef.current -= 1
         claimedRef.current.delete(next.tempId)
         // 一个任务结束（成功/失败）后继续拉起排队任务
@@ -126,7 +242,11 @@ export function useAssetUpload({ effectiveLibId }: { effectiveLibId: string }) {
     pumpRef.current()
   }, [items])
 
-  /** 入队一个或多个文件 */
+  /**
+   * 入队一个或多个文件（按文件指纹去重）：
+   * - 同一文件已在队列且 preparing/uploading/ingesting/done → 跳过，不重复入队
+   * - 同一文件此前失败（error）→ 重新激活原队列项（复用 clientUploadId，保持幂等语义）
+   */
   const enqueueUploads = useCallback(
     (files: File[]) => {
       if (!effectiveLibId) {
@@ -143,37 +263,86 @@ export function useAssetUpload({ effectiveLibId }: { effectiveLibId: string }) {
       }
       if (valid.length === 0) return
 
-      const newItems: UploadItem[] = valid.map((file, idx) => ({
-        tempId: `${Date.now()}-${idx}-${Math.random().toString(36).slice(2, 8)}`,
-        file,
-        fileName: file.name,
-        progress: 0,
-        status: "preparing",
-      }))
-      setItems((prev) => [...prev, ...newItems])
+      let skipped = 0
+      let rearmed = 0
+      const newItems: UploadItem[] = []
+
+      for (const file of valid) {
+        const fileKey = makeFileFingerprint(file)
+        // error 项允许重新激活；其余状态（preparing/uploading/ingesting/done）都算重复
+        const dup = findDuplicateInQueue([...itemsRef.current, ...newItems], fileKey, ["error"])
+        if (dup) {
+          skipped += 1
+          continue
+        }
+        // 失败项重新激活：复用 tempId/clientUploadId，由 pump 按留存 handle 决定重试方式
+        const failed = itemsRef.current.find(
+          (it) => it.fileKey === fileKey && it.status === "error",
+        )
+        if (failed) {
+          rearmed += 1
+          updateItem(failed.tempId, {
+            status: "preparing",
+            progress: 0,
+            error: undefined,
+            failedStage: undefined,
+            hint: undefined,
+          })
+          continue
+        }
+        newItems.push({
+          tempId: `${Date.now()}-${newItems.length}-${Math.random().toString(36).slice(2, 8)}`,
+          file,
+          fileName: file.name,
+          progress: 0,
+          status: "preparing",
+          fileKey,
+          clientUploadId: makeClientUploadId(),
+        })
+      }
+
+      if (newItems.length > 0) {
+        setItems((prev) => [...prev, ...newItems])
+      }
+      if (skipped > 0) {
+        message.warning(`已跳过 ${skipped} 个重复文件（已在上传队列、处理中或本页已上传）`)
+      }
+      if (rearmed > 0) {
+        message.info(`已重新加入 ${rearmed} 个此前失败的文件`)
+      }
     },
-    [effectiveLibId],
+    [effectiveLibId, updateItem],
   )
 
-  /** 重试失败任务 */
+  /**
+   * 重试失败任务（仅限 status=error）：
+   * - complete 阶段失败：复用留存 handle 只重发 complete（幂等，不重新上传）
+   * - prepare/transfer 阶段失败：全量重跑（后端尚无记录，安全）
+   */
   const retryUpload = useCallback(
     (tempId: string) => {
       const target = itemsRef.current.find((it) => it.tempId === tempId)
-      if (!target) return
-      updateItem(tempId, { status: "preparing", progress: 0, error: undefined })
-      // 状态更新后由 useEffect 触发 pump
+      if (!target || target.status !== "error") return
+      updateItem(tempId, { status: "preparing", progress: 0, error: undefined, hint: undefined })
+      // 状态更新后由 useEffect 触发 pump；pump 会按 handlesRef 自动选择 completeOnly / 全量
     },
     [updateItem],
   )
 
   /** 从上传列表移除（已进入转码的由素材网格管理；这里只移除上传面板记录） */
   const removeUpload = useCallback((tempId: string) => {
+    handlesRef.current.delete(tempId)
     setItems((prev) => prev.filter((it) => it.tempId !== tempId))
   }, [])
 
   /** 清空已完成/去重记录 */
   const clearFinished = useCallback(() => {
-    setItems((prev) => prev.filter((it) => it.status !== "done"))
+    setItems((prev) => {
+      for (const it of prev) {
+        if (it.status === "done") handlesRef.current.delete(it.tempId)
+      }
+      return prev.filter((it) => it.status !== "done")
+    })
   }, [])
 
   const activeCount = items.filter(
@@ -188,8 +357,10 @@ export function useAssetUpload({ effectiveLibId }: { effectiveLibId: string }) {
     retryUpload,
     removeUpload,
     clearFinished,
-    /** 是否有进行中的上传（用于上传区文案） */
+    /** 是否有进行中的上传（用于上传区文案/禁用入口） */
     uploading: hasActive,
+    /** 是否有文件正在本地处理或直传（用于禁用上传入口，防重复提交） */
+    transferActive: activeCount > 0,
     activeCount,
     pendingCount,
   }

apps/web/src/pages/assets/hooks/useAssetsData.ts

@@ -10,6 +10,26 @@ import {
 import { getOrCreateDefaultProject } from "@/api/projects"
 import { mapLibrary, mapAsset, type AssetItem, type LibraryItem } from "../types"
 
+/** 处理中素材快速轮询（3s）的最大持续时间：超过后停止快轮询，避免孤儿任务永久转圈 */
+const PROCESSING_POLL_MAX_MS = 10 * 60 * 1000 // 10 分钟
+
+const isProcessingStatus = (st?: string | null): boolean =>
+  st === "uploading" || st === "ingesting" || st === "processing" || st === "pending"
+
+/** 判断列表是否存在「创建超过 maxMs 仍在处理中」的卡死素材 */
+const hasStalledProcessing = (
+  list: ApiAssetItem[],
+  maxMs: number = PROCESSING_POLL_MAX_MS,
+): boolean => {
+  const now = Date.now()
+  return list.some((a) => {
+    if (!isProcessingStatus(a.status ?? "")) return false
+    if (!a.created_at) return false
+    const created = new Date(a.created_at).getTime()
+    return Number.isFinite(created) && now - created > maxMs
+  })
+}
+
 /**
  * 素材库数据 Hook
  * 封装视频库列表、素材列表的数据查询，以及筛选、搜索状态管理
@@ -63,15 +83,15 @@ export function useAssetsData() {
       }),
     enabled: !!effectiveLibId,
     staleTime: 30_000,
-    // 列表中存在上传中/转码中素材时每 3s 轮询；全部就绪后自动停止
+    // 列表中存在上传中/转码中素材时每 3s 轮询；全部就绪后自动停止。
+    // 但若处理中素材创建已超过 10 分钟仍未就绪（疑似后端卡住/孤儿任务），
+    // 停止快轮询避免无限转圈——卡死素材在网格中显示「处理超时」提示。
     refetchInterval: (query) => {
       const data = query.state.data as { items: ApiAssetItem[] } | undefined
       const items = data?.items ?? []
-      const processing = items.some((a) => {
-        const st = a.status ?? ""
-        return st === "uploading" || st === "ingesting" || st === "processing" || st === "pending"
-      })
-      return processing ? 3000 : false
+      const processing = items.some((a) => isProcessingStatus(a.status ?? ""))
+      if (!processing) return false
+      return hasStalledProcessing(items) ? false : 3000
     },
   })
 
@@ -80,6 +100,21 @@ export function useAssetsData() {
     [apiAssets],
   )
 
+  /** 创建超过 10 分钟仍在处理中的素材（后端可能卡住），网格提示「处理超时」 */
+  const stalledAssetIds = useMemo(() => {
+    const list = Array.isArray(apiAssets?.items) ? apiAssets.items : []
+    const ids = new Set<string>()
+    const now = Date.now()
+    for (const a of list) {
+      if (!isProcessingStatus(a.status ?? "") || !a.created_at) continue
+      const created = new Date(a.created_at).getTime()
+      if (Number.isFinite(created) && now - created > PROCESSING_POLL_MAX_MS) {
+        ids.add(a.id)
+      }
+    }
+    return ids
+  }, [apiAssets])
+
   /* ── 筛选状态 ── */
   const [searchText, setSearchText] = useState("")
   const [filterType, setFilterType] = useState<string>("all")
@@ -129,6 +164,8 @@ export function useAssetsData() {
     assetsError,
     assetsErrorObj,
     refetchAssets,
+    stalledAssetIds,
+    hasStalledAssets: stalledAssetIds.size > 0,
     // 筛选
     searchText,
     setSearchText,

apps/web/src/pages/auth/Login.tsx

@@ -1,11 +1,12 @@
 /**
  * 登录页面 - V21 完全对标
  */
-import React, { useState } from "react"
+import React, { useRef, useState } from "react"
 import { Form, Input, Checkbox, message } from "antd"
 import { Link, useNavigate } from "react-router-dom"
 import { useLogin } from "@/hooks/useAuth"
 import { getWechatAuthUrl } from "@/api/auth"
+import { getErrorMessage, isErrorMsgShown } from "@/api/errors"
 import Button from "@/components/ui/Button"
 import "./Login.css"
 
@@ -20,6 +21,9 @@ const Login: React.FC = () => {
   const loginMutation = useLogin()
   const [form] = Form.useForm()
   const [wechatLoading, setWechatLoading] = useState(false)
+  // 同步防连点守卫：state 更新有渲染间隙，连点两次会各自请求授权 URL，
+  // 后一次的 state 覆盖前一次写入 localStorage 的 state，导致回调校验失败
+  const wechatStartingRef = useRef(false)
 
   const onFinish = async (values: LoginFormValues) => {
     try {
@@ -36,8 +40,10 @@ const Login: React.FC = () => {
   }
 
   const handleWechatLogin = async () => {
+    if (wechatStartingRef.current) return
+    wechatStartingRef.current = true
+    setWechatLoading(true)
     try {
-      setWechatLoading(true)
       const result = await getWechatAuthUrl()
       // 保存 state 到 localStorage 用于回调时验证
       localStorage.setItem("wechat_state", result.state)
@@ -51,11 +57,15 @@ const Login: React.FC = () => {
       // 跳转到微信授权页
       window.location.href = result.auth_url
     } catch (error) {
-      if (!(error as { __msgShown?: boolean })?.__msgShown)
-        message.error("微信登录暂不可用，请稍后重试")
-    } finally {
+      // 跳走前才可能回到这里；拦截器已弹过后端 detail 时不重复弹，
+      // 否则透传真实原因（如微信服务未配置、网络异常）
+      if (!isErrorMsgShown(error)) {
+        message.error(`微信登录启动失败：${getErrorMessage(error, "请稍后重试")}`)
+      }
+      wechatStartingRef.current = false
       setWechatLoading(false)
     }
+    // 成功时 window.location 跳走，不复位 loading（页面即将卸载）
   }
 
   return (

apps/web/src/pages/auth/WechatBindCallback.tsx

@@ -0,0 +1,95 @@
+/**
+ * 微信绑定回调页（已登录用户在设置页发起"绑定微信"扫码后回到这里）
+ * 用 code 调绑定接口把微信关联到当前账号，成功后回设置页
+ */
+import React, { useEffect, useState } from "react"
+import { useSearchParams, useNavigate } from "react-router-dom"
+import { Spin } from "antd"
+import { bindWechat, normalizeUser } from "@/api/auth"
+import { getErrorMessage } from "@/api/errors"
+import { useAuthStore } from "@/store/authStore"
+
+const WechatBindCallback: React.FC = () => {
+  const [searchParams] = useSearchParams()
+  const navigate = useNavigate()
+  const setUser = useAuthStore((state) => state.setUser)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    const code = searchParams.get("code")
+    const state = searchParams.get("state")
+
+    if (!code || !state) {
+      setError("无效的回调参数，请回到设置页重新扫码绑定")
+      return
+    }
+
+    const handleBind = async () => {
+      // state 校验由后端 state store 一次性消费兜底（前端不再比对 localStorage，
+      // 微信内打开/跨浏览器场景本地无 state 会误杀）；清理绑定前写入的 state
+      localStorage.removeItem("wechat_bind_state")
+
+      try {
+        const result = await bindWechat(code, state)
+        setUser(normalizeUser(result.user))
+        // 用 replace 回设置页，query 携带成功标记由设置页提示
+        navigate("/app/profile?wechat_bind=success", { replace: true })
+      } catch (err) {
+        // 绑定失败直接在本页展示真实原因（如微信已被其他账号绑定），不静默跳走
+        setError(`微信绑定失败：${getErrorMessage(err, "请回到设置页重试")}`)
+      }
+    }
+
+    handleBind()
+  }, [searchParams, navigate, setUser])
+
+  if (error) {
+    return (
+      <div
+        style={{
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "center",
+          minHeight: "100vh",
+          background: "#f5f5f5",
+        }}
+      >
+        <div style={{ textAlign: "center" }}>
+          <p style={{ color: "#ef4444", fontSize: 16, marginBottom: 16 }}>{error}</p>
+          <button
+            onClick={() => navigate("/app/profile")}
+            style={{
+              padding: "8px 24px",
+              background: "var(--primary-color, #3b82f6)",
+              color: "white",
+              border: "none",
+              borderRadius: 6,
+              cursor: "pointer",
+            }}
+          >
+            返回设置
+          </button>
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        minHeight: "100vh",
+        background: "#f5f5f5",
+      }}
+    >
+      <div style={{ textAlign: "center" }}>
+        <Spin size="large" />
+        <p style={{ marginTop: 16, color: "#666" }}>正在绑定微信...</p>
+      </div>
+    </div>
+  )
+}
+
+export default WechatBindCallback

apps/web/src/pages/auth/WechatCallback.tsx

@@ -1,40 +1,48 @@
 /**
  * 微信登录回调页
+ * 扫码授权后由微信重定向回来：用 code 换登录态，
+ * 新用户/资料未完善 → 跳昵称引导页；老用户 → 回来源页/首页
  */
 import React, { useEffect, useState } from "react"
 import { useSearchParams, useNavigate } from "react-router-dom"
-import { Spin, message } from "antd"
+import { Spin } from "antd"
 import { wechatCallback, getCurrentUser, normalizeUser, type User } from "@/api/auth"
+import { getErrorMessage } from "@/api/errors"
 import { useAuthStore } from "@/store/authStore"
-import BindContactModal from "@/components/auth/BindContactModal"
+import { scheduleProactiveRefresh } from "@/api/auth/tokenRefresh"
 
 const WechatCallback: React.FC = () => {
   const [searchParams] = useSearchParams()
   const navigate = useNavigate()
   const setAuth = useAuthStore((state) => state.setAuth)
   const [loading, setLoading] = useState(true)
-  const [showBindModal, setShowBindModal] = useState(false)
   const [error, setError] = useState<string | null>(null)
 
   useEffect(() => {
     const code = searchParams.get("code")
     const state = searchParams.get("state")
 
+    // 微信重定向出错时（如用户拒绝授权 error=access_denied）直接展示原因
+    const wxErrorCode = searchParams.get("error")
+    const wxErrDesc = searchParams.get("error_description")
+    if (wxErrorCode || wxErrDesc) {
+      const reason = [wxErrorCode, wxErrDesc].filter(Boolean).join("：")
+      setError(`微信授权失败：${reason}`)
+      setLoading(false)
+      return
+    }
+
     if (!code || !state) {
-      setError("无效的回调参数")
+      setError("无效的回调参数，请重新扫码登录")
       setLoading(false)
       return
     }
 
     const handleCallback = async () => {
       try {
-        // 校验 state，防止 CSRF
-        const savedState = localStorage.getItem("wechat_state")
-        if (!savedState || savedState !== state) {
-          setError("安全校验失败，请重新登录")
-          setLoading(false)
-          return
-        }
+        // state 的 CSRF 校验由后端 state store 一次性消费兜底（前端不再比对
+        // localStorage——微信内打开、跨浏览器等场景本地没有 state，会误杀正常回调）；
+        // 清理登录前写入的 state，避免残留
         localStorage.removeItem("wechat_state")
 
         const result = await wechatCallback(code, state)
@@ -49,20 +57,22 @@ const WechatCallback: React.FC = () => {
         const userData = await getCurrentUser()
         const user: User = normalizeUser(userData)
         setAuth(user, result.access_token, result.refresh_token)
+        scheduleProactiveRefresh()
 
-        if (result.binding_complete) {
-          // 已绑定，跳转到登录前页面或首页
-          message.success("登录成功")
-          const redirect = localStorage.getItem("login_redirect") || "/"
-          localStorage.removeItem("login_redirect")
-          navigate(redirect, { replace: true })
-        } else {
-          // 未绑定，显示绑定弹窗
-          setLoading(false)
-          setShowBindModal(true)
+        // 新用户 或 资料未完善（如上次中断没填昵称）→ 强制昵称引导
+        const needOnboarding = result.is_new_user || user.profile_completed === false
+        if (needOnboarding) {
+          navigate("/welcome/wechat", { replace: true })
+          return
         }
+
+        // 老用户：回登录前页面或首页
+        const redirect = localStorage.getItem("login_redirect") || "/"
+        localStorage.removeItem("login_redirect")
+        navigate(redirect, { replace: true })
       } catch (err) {
-        setError("登录失败，请重试")
+        // 透传后端真实错误（如 state 过期、code 已消费、接口异常），禁止吞成通用提示
+        setError(`微信登录失败：${getErrorMessage(err, "请重试或更换登录方式")}`)
         setLoading(false)
       }
     }
@@ -70,21 +80,6 @@ const WechatCallback: React.FC = () => {
     handleCallback()
   }, [searchParams, navigate, setAuth])
 
-  const handleBindSuccess = (user: User) => {
-    const setUser = useAuthStore.getState().setUser
-    setUser(user)
-    setShowBindModal(false)
-    message.success("绑定成功")
-    const redirect = localStorage.getItem("login_redirect") || "/"
-    localStorage.removeItem("login_redirect")
-    navigate(redirect, { replace: true })
-  }
-
-  const handleBindCancel = () => {
-    setShowBindModal(false)
-    navigate("/login")
-  }
-
   if (loading) {
     return (
       <div
@@ -98,49 +93,39 @@ const WechatCallback: React.FC = () => {
       >
         <div style={{ textAlign: "center" }}>
           <Spin size="large" />
-          <p style={{ marginTop: 16, color: "#666" }}>正在登录...</p>
-        </div>
-      </div>
-    )
-  }
-
-  if (error) {
-    return (
-      <div
-        style={{
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "center",
-          minHeight: "100vh",
-          background: "#f5f5f5",
-        }}
-      >
-        <div style={{ textAlign: "center" }}>
-          <p style={{ color: "#ef4444", fontSize: 16, marginBottom: 16 }}>{error}</p>
-          <button
-            onClick={() => navigate("/login")}
-            style={{
-              padding: "8px 24px",
-              background: "var(--primary-color, #3b82f6)",
-              color: "white",
-              border: "none",
-              borderRadius: 6,
-              cursor: "pointer",
-            }}
-          >
-            返回登录
-          </button>
+          <p style={{ marginTop: 16, color: "#666" }}>微信登录中...</p>
         </div>
       </div>
     )
   }
 
   return (
-    <BindContactModal
-      open={showBindModal}
-      onSuccess={handleBindSuccess}
-      onCancel={handleBindCancel}
-    />
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        minHeight: "100vh",
+        background: "#f5f5f5",
+      }}
+    >
+      <div style={{ textAlign: "center" }}>
+        <p style={{ color: "#ef4444", fontSize: 16, marginBottom: 16 }}>{error}</p>
+        <button
+          onClick={() => navigate("/login")}
+          style={{
+            padding: "8px 24px",
+            background: "var(--primary-color, #3b82f6)",
+            color: "white",
+            border: "none",
+            borderRadius: 6,
+            cursor: "pointer",
+          }}
+        >
+          返回登录
+        </button>
+      </div>
+    </div>
   )
 }
 

apps/web/src/pages/auth/WechatOnboarding.tsx

@@ -0,0 +1,103 @@
+/**
+ * 微信新用户昵称引导页
+ * 新微信用户首次登录后强制填写昵称，完成后才进入主界面
+ */
+import React from "react"
+import { Form, Input, message } from "antd"
+import { Navigate, useNavigate } from "react-router-dom"
+import { useMutation } from "@tanstack/react-query"
+import { updateProfile } from "@/api/auth"
+import { useAuthStore } from "@/store/authStore"
+import Button from "@/components/ui/Button"
+import "./Login.css"
+
+interface OnboardingFormValues {
+  display_name: string
+}
+
+const WechatOnboarding: React.FC = () => {
+  const navigate = useNavigate()
+  const setUser = useAuthStore((state) => state.setUser)
+  const isAuthenticated = useAuthStore((state) => state.isAuthenticated)
+  const user = useAuthStore((state) => state.user)
+  const hasAccessToken = Boolean(localStorage.getItem("access_token"))
+  const [form] = Form.useForm<OnboardingFormValues>()
+
+  const saveMutation = useMutation({
+    mutationFn: (displayName: string) => updateProfile({ display_name: displayName }),
+  })
+
+  // 已登录且资料已完善的用户不该停留在引导页
+  if (isAuthenticated && hasAccessToken && user?.profile_completed === true) {
+    return <Navigate to="/app/dashboard" replace />
+  }
+  // 未登录（如手动输入 URL）回登录页
+  if (!isAuthenticated || !hasAccessToken) {
+    return <Navigate to="/login" replace />
+  }
+
+  const onFinish = async (values: OnboardingFormValues) => {
+    try {
+      const updated = await saveMutation.mutateAsync(values.display_name.trim())
+      // 后端返回的 profile_completed 以最新资料为准，前端同步标记完善
+      setUser({ ...updated, profile_completed: true })
+      message.success("欢迎加入小虾智剪！")
+      const redirect = localStorage.getItem("login_redirect") || "/app/dashboard"
+      localStorage.removeItem("login_redirect")
+      navigate(redirect, { replace: true })
+    } catch {
+      message.error("保存失败，请重试")
+    }
+  }
+
+  return (
+    <div className="xx-auth-page">
+      <div className="xx-auth-card">
+        <div className="xx-auth-header">
+          <div className="xx-auth-brand">
+            <span className="xx-auth-logo">🦐</span>
+            <span className="xx-auth-brand-name">小虾智剪</span>
+          </div>
+          <p>欢迎使用微信登录，请先设置您的昵称</p>
+        </div>
+
+        <Form
+          form={form}
+          name="wechat-onboarding"
+          onFinish={onFinish}
+          autoComplete="off"
+          layout="vertical"
+          // 不预填：新微信用户必须自己输入昵称（user.display_name 可能是微信昵称/系统占位）
+          initialValues={{ display_name: "" }}
+        >
+          <Form.Item
+            name="display_name"
+            label="昵称"
+            rules={[
+              { required: true, message: "请输入昵称" },
+              { whitespace: true, message: "昵称不能为空白" },
+              { min: 1, max: 20, message: "昵称长度需在 1-20 个字符之间" },
+            ]}
+            extra="昵称将展示在您的作品和账户中，之后可在个人设置中修改"
+          >
+            <Input placeholder="请输入您的昵称" size="large" maxLength={20} showCount />
+          </Form.Item>
+
+          <Form.Item>
+            <Button
+              buttonType="primary"
+              buttonSize="lg"
+              htmlType="submit"
+              loading={saveMutation.isPending}
+              style={{ width: "100%" }}
+            >
+              {saveMutation.isPending ? "保存中..." : "进入小虾智剪"}
+            </Button>
+          </Form.Item>
+        </Form>
+      </div>
+    </div>
+  )
+}
+
+export default WechatOnboarding

apps/web/src/pages/duplication/DuplicationDetail.tsx

@@ -98,7 +98,7 @@ const DuplicationDetail: React.FC = () => {
       <div className="dup-detail-grid">
         <RiskCard riskLevel={riskLevel} similarityPercent={similarityPercent} />
         <InfoCard detail={detail} />
-        <SegmentsSection segments={detail.segments} />
+        <SegmentsSection segments={detail.segments} totalDuration={detail.duration_seconds} />
       </div>
     </div>
   )

apps/web/src/pages/duplication/components/ResultCard.tsx

@@ -1,7 +1,7 @@
 import React from "react"
 import { Button, Tag, Tooltip } from "@/components/ui"
 import type { DuplicationRecord } from "@/api/duplication"
-import { STATUS_CONFIG } from "../constants"
+import { STATUS_CONFIG, RISK_TAG_VARIANT, RISK_LABELS } from "../constants"
 import { getRiskLevel, formatSize, formatDuration } from "../utils"
 
 interface ResultCardProps {
@@ -54,6 +54,9 @@ const ResultCard: React.FC<ResultCardProps> = ({ record, onView, onDelete, onRet
               />
             </div>
             <span className={`dup-score-value ${riskLevel}`}>{rateValue.toFixed(1)}%</span>
+            <Tag variant={RISK_TAG_VARIANT[riskLevel]} className="dup-score-risk-tag">
+              {RISK_LABELS[riskLevel]}
+            </Tag>
           </>
         ) : record.status === "failed" ? (
           <Tooltip title="重新查重">

apps/web/src/pages/duplication/components/SegmentsSection.tsx

@@ -2,34 +2,81 @@ import React from "react"
 import { Tag } from "@/components/ui"
 import type { DuplicateSegment } from "@/api/duplication"
 import { SegmentCard } from "./SegmentCard"
+import { formatTime } from "../utils"
 
 interface SegmentsSectionProps {
   segments?: DuplicateSegment[]
+  /** 视频总时长（秒），用于渲染时间轴 */
+  totalDuration?: number
+}
+
+/** 片段相似度 → 风险等级（时间轴配色用） */
+const getSegmentRisk = (similarity: number): "low" | "medium" | "high" => {
+  if (similarity >= 90) return "high"
+  if (similarity >= 70) return "medium"
+  return "low"
 }
 
 /**
- * 重复片段列表区域
+ * 重复片段列表区域（含时间轴可视化）
  */
-export const SegmentsSection: React.FC<SegmentsSectionProps> = ({ segments = [] }) => (
-  <div className="dup-checks-section">
-    <h3>
-      🔍 重复片段详情
-      <Tag variant="primary" style={{ marginLeft: 8 }}>
-        {segments.length} 个片段
-      </Tag>
-    </h3>
+export const SegmentsSection: React.FC<SegmentsSectionProps> = ({
+  segments = [],
+  totalDuration,
+}) => {
+  const showTimeline = segments.length > 0 && totalDuration !== undefined && totalDuration > 0
 
-    {segments.length > 0 ? (
-      <div className="dup-checks-list">
-        {segments.map((segment, index) => (
-          <SegmentCard key={segment.id} segment={segment} index={index} />
-        ))}
-      </div>
-    ) : (
-      <div className="dup-results-empty" style={{ padding: "32px 0" }}>
-        <div className="dup-results-empty-icon">🎉</div>
-        <p>未发现重复片段，内容原创度很高</p>
-      </div>
-    )}
-  </div>
-)
+  return (
+    <div className="dup-checks-section">
+      <h3>
+        🔍 重复片段详情
+        <Tag variant="primary" style={{ marginLeft: 8 }}>
+          {segments.length} 个片段
+        </Tag>
+      </h3>
+
+      {showTimeline && (
+        <div className="dup-timeline">
+          <div className="dup-timeline-bar">
+            {segments.map((seg, i) => {
+              const left = (seg.source_start / totalDuration) * 100
+              const width = Math.max(
+                ((seg.source_end - seg.source_start) / totalDuration) * 100,
+                0.5,
+              )
+              const segRisk = getSegmentRisk(seg.similarity)
+              return (
+                <div
+                  key={seg.id ?? i}
+                  className={`dup-timeline-segment ${segRisk}`}
+                  style={{
+                    left: `${Math.min(left, 100)}%`,
+                    width: `${Math.min(width, 100 - Math.min(left, 100))}%`,
+                  }}
+                  title={`${formatTime(seg.source_start)} - ${formatTime(seg.source_end)} · 相似度 ${seg.similarity.toFixed(0)}% · ${seg.matched_video_name}`}
+                />
+              )
+            })}
+          </div>
+          <div className="dup-timeline-labels">
+            <span>0s</span>
+            <span>{formatTime(totalDuration ?? 0)}</span>
+          </div>
+        </div>
+      )}
+
+      {segments.length > 0 ? (
+        <div className="dup-checks-list">
+          {segments.map((segment, index) => (
+            <SegmentCard key={segment.id} segment={segment} index={index} />
+          ))}
+        </div>
+      ) : (
+        <div className="dup-results-empty" style={{ padding: "32px 0" }}>
+          <div className="dup-results-empty-icon">🎉</div>
+          <p>未发现重复片段，内容原创度很高</p>
+        </div>
+      )}
+    </div>
+  )
+}

apps/web/src/pages/duplication/duplication.css

@@ -831,3 +831,61 @@
     font-size: 16px;
   }
 }
+
+/* ============================================================
+   查重率风险标签（列表卡片）
+   ============================================================ */
+.dup-score-risk-tag {
+  flex-shrink: 0;
+  margin-left: 2px;
+}
+
+/* ============================================================
+   重复片段时间轴可视化（#1662）
+   ============================================================ */
+.dup-timeline {
+  margin: 16px 0;
+  padding: 0 8px;
+}
+
+.dup-timeline-bar {
+  position: relative;
+  height: 24px;
+  background: var(--bg-secondary, #f1f5f9);
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.dup-timeline-segment {
+  position: absolute;
+  top: 2px;
+  height: 20px;
+  border-radius: 3px;
+  opacity: 0.8;
+  cursor: pointer;
+  transition: opacity 0.2s;
+}
+
+.dup-timeline-segment:hover {
+  opacity: 1;
+}
+
+.dup-timeline-segment.low {
+  background: #22c55e;
+}
+
+.dup-timeline-segment.medium {
+  background: #f59e0b;
+}
+
+.dup-timeline-segment.high {
+  background: #ef4444;
+}
+
+.dup-timeline-labels {
+  display: flex;
+  justify-content: space-between;
+  font-size: 12px;
+  color: var(--text-secondary);
+  margin-top: 4px;
+}

apps/web/src/pages/duplication/utils.ts

@@ -1,9 +1,9 @@
 /** 根据查重率获取风险等级 */
 export const getRiskLevel = (rate?: number): "low" | "medium" | "high" => {
   if (rate === undefined) return "low"
-  if (rate <= 10) return "low"
-  if (rate <= 30) return "medium"
-  return "high"
+  if (rate < 15) return "low" // <15% 绿色（安全）
+  if (rate <= 30) return "medium" // 15-30% 黄色（注意）
+  return "high" // >30% 红色（危险）
 }
 
 /** 格式化时间（秒 → mm:ss） */

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

@@ -40,13 +40,6 @@ const clipTypeLabel: Record<ClipType | string, string> = {
   pip: "混剪",
 }
 
-const formatDuration = (sec: number) => {
-  if (sec < 60) return `${sec.toFixed(1)}s`
-  const m = Math.floor(sec / 60)
-  const s = (sec % 60).toFixed(0)
-  return `${m}m${s.padStart(2, "0")}s`
-}
-
 const EditorClipList: React.FC<EditorClipListProps> = ({
   clips,
   selectedClipId,
@@ -102,7 +95,6 @@ const EditorClipList: React.FC<EditorClipListProps> = ({
                   {clipTypeLabel[clip.type] || "片段"}
                 </span>
               </span>
-              <span className="ep-clip-item-duration">{formatDuration(clip.duration)}</span>
             </div>
 
             {/* 文案预览 */}

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

@@ -87,7 +87,7 @@ const PreviewPlayer: React.FC<PreviewPlayerProps> = ({
                 WebkitTextStroke: "1px rgba(0,0,0,0.6)",
                 top:
                   titleConfig.position === "top"
-                    ? "8px"
+                    ? "6.25%"
                     : titleConfig.position === "center"
                       ? "50%"
                       : "auto",

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

@@ -7,7 +7,6 @@
  * - ClipCard - 片段卡片
  * - ClipTrack - 片段轨道（播放头+片段列表+添加卡片）
  * - TimelineHeader - 时间线头部（标题+缩放+操作按钮）
- * - AddClipPicker - 添加片段选择器
  * - TrimPreview - 裁剪预览 tooltip
  * - ContextMenu - 右键菜单
  *
@@ -27,7 +26,6 @@ import { usePlayheadDrag } from "./timeline/hooks/usePlayheadDrag"
 import { TimeRuler } from "./timeline/TimeRuler"
 import { ClipTrack } from "./timeline/ClipTrack"
 import { TimelineHeader } from "./timeline/TimelineHeader"
-import { AddClipPicker } from "./timeline/AddClipPicker"
 import { TrimPreview } from "./timeline/TrimPreview"
 import { ContextMenu } from "./timeline/ContextMenu"
 
@@ -100,16 +98,7 @@ const TimelinePanel: React.FC<TimelinePanelProps> = ({
     handleContextSplit,
     handleContextResetTrim,
     handleContextDelete,
-    showAddPicker,
-    pickerRef,
     addCardRef,
-    pickerPos,
-    availableTypes,
-    addType,
-    addDuration,
-    setAddType,
-    setAddDuration,
-    handleTogglePicker,
     handleConfirmAdd,
     hoveredClipId,
     setHoveredClipId,
@@ -177,7 +166,7 @@ const TimelinePanel: React.FC<TimelinePanelProps> = ({
           onClipMouseLeave={() => setHoveredClipId(null)}
           onTrimHandleMouseDown={handleTrimHandleMouseDown}
           onClipRemove={onClipRemove}
-          onTogglePicker={handleTogglePicker}
+          onTogglePicker={handleConfirmAdd}
         />
       )}
 
@@ -204,20 +193,6 @@ const TimelinePanel: React.FC<TimelinePanelProps> = ({
           onDelete={handleContextDelete}
         />
       )}
-
-      {/* 类型+时长选择面板 */}
-      {showAddPicker && (
-        <AddClipPicker
-          pickerRef={pickerRef}
-          position={pickerPos}
-          availableTypes={availableTypes}
-          addType={addType}
-          addDuration={addDuration}
-          onTypeChange={setAddType}
-          onDurationChange={setAddDuration}
-          onConfirm={handleConfirmAdd}
-        />
-      )}
     </div>
   )
 }

apps/web/src/pages/editing-planner/components/timeline/AddClipPicker.tsx

@@ -7,12 +7,8 @@ interface AddClipPickerProps {
   position: { top: number; right: number }
   availableTypes: ClipType[]
   addType: ClipType
-  addDuration: number
   onTypeChange: (type: ClipType) => void
-  onDurationChange: (duration: number) => void
   onConfirm: () => void
-  minDuration?: number
-  maxDuration?: number
 }
 
 export const AddClipPicker: React.FC<AddClipPickerProps> = ({
@@ -20,12 +16,8 @@ export const AddClipPicker: React.FC<AddClipPickerProps> = ({
   position,
   availableTypes,
   addType,
-  addDuration,
   onTypeChange,
-  onDurationChange,
   onConfirm,
-  minDuration = 1,
-  maxDuration = 120,
 }) => {
   return (
     <div
@@ -53,24 +45,6 @@ export const AddClipPicker: React.FC<AddClipPickerProps> = ({
         ))}
       </div>
 
-      {/* 时长输入 */}
-      <div className="ep-add-clip-duration-row">
-        <span className="ep-add-clip-type-label">时长:</span>
-        <input
-          type="number"
-          className="ep-duration-input"
-          min={minDuration}
-          max={maxDuration}
-          value={addDuration}
-          onChange={(e) =>
-            onDurationChange(
-              Math.max(minDuration, Math.min(maxDuration, Number(e.target.value) || minDuration)),
-            )
-          }
-        />
-        <span className="ep-add-clip-duration-unit">秒</span>
-      </div>
-
       {/* 确认按钮 */}
       <button className="ep-add-clip-confirm-btn" onClick={onConfirm}>
         添加

apps/web/src/pages/editing-planner/components/timeline/ClipCard.tsx

@@ -105,14 +105,11 @@ export const ClipCard: React.FC<ClipCardProps> = ({
           <span className="ep-clip-name">
             {CLIP_TYPE_LABELS[clip.type] || "片段"} {idx + 1}
           </span>
-          <span className="ep-clip-duration">
-            {clip.duration}s
-            {hasTrim && (
-              <span className="ep-trim-indicator" title="已裁剪">
-                ✂
-              </span>
-            )}
-          </span>
+          {hasTrim && (
+            <span className="ep-trim-indicator" title="已裁剪">
+              ✂
+            </span>
+          )}
         </div>
 
         {/* 速度徽章 */}

apps/web/src/pages/editing-planner/hooks/timeline-menus/useAddPicker.ts

@@ -26,8 +26,6 @@ export function useAddPicker({ currentMode, onAddClip }: UseAddPickerOptions) {
   }, [currentMode])
 
   const [addType, setAddType] = useState<ClipType>(defaultAddType)
-  const [addDuration, setAddDuration] = useState<number>(DEFAULT_ADD_DURATION)
-
   useEffect(() => {
     if (!availableTypes.includes(addType)) {
       setAddType(defaultAddType)
@@ -95,9 +93,9 @@ export function useAddPicker({ currentMode, onAddClip }: UseAddPickerOptions) {
   }, [showAddPicker])
 
   const handleConfirmAdd = useCallback(() => {
-    onAddClip(addType, addDuration)
+    onAddClip(addType, DEFAULT_ADD_DURATION)
     setShowAddPicker(false)
-  }, [onAddClip, addType, addDuration])
+  }, [onAddClip, addType])
 
   return {
     showAddPicker,
@@ -107,9 +105,8 @@ export function useAddPicker({ currentMode, onAddClip }: UseAddPickerOptions) {
     pickerPos,
     availableTypes,
     addType,
-    addDuration,
+    addDuration: DEFAULT_ADD_DURATION,
     setAddType,
-    setAddDuration,
     handleTogglePicker,
     handleConfirmAdd,
   }

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

@@ -35,7 +35,6 @@ export const useTimelineMenus = (
     addType,
     addDuration,
     setAddType,
-    setAddDuration,
     handleTogglePicker,
     handleConfirmAdd,
   } = useAddPicker({ currentMode, onAddClip })
@@ -57,7 +56,6 @@ export const useTimelineMenus = (
     addType,
     addDuration,
     setAddType,
-    setAddDuration,
     handleTogglePicker,
     handleConfirmAdd,
     // 悬停状态

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

@@ -1,12 +1,12 @@
 /**
- * 智能剪辑页面 — 前端实时预览架构
- * 6 步向导：选择模板 → 素材 → 配音 → 标题(含预览) → 确认生成 → 选择封面
+ * 智能剪辑页面（Issue #1677 多视频批量生成，修正版）
+ * 固定 6 步向导：模板(弹数量) → 素材 → 配音 → 标题 → 确认生成 → 封面，单视频与批量完全一致
  *
  * 架构：
- * - 步骤 4 右侧显示 FrontendPreviewPlayer 实时预览
- * - 步骤 5 右侧内联播放生成中的/最终视频
- * - 步骤 6 封面从最终成片中智能选帧（MediaKit）
- * - 点"确认生成"时调用 createGenerationTask 创建一次服务器渲染任务
+ * - 预览全部为纯前端 Canvas 实时播放（FrontendPreviewPlayer），不调任何后端渲染接口：
+ *   N=1 单播放器；N>1 CanvasPreviewGrid（variantSeed 让素材排布/起始点不同，画面有差异）
+ * - 步骤5确认生成：正式生成接口（count + titles[]/voice_library_ids[]/cover_urls[]），
+ *   批量时逐任务独立进度/失败重试（BatchGenerationGrid）
  */
 import React, { useMemo, useState, useEffect, useRef, useCallback } from "react"
 import { message } from "antd"
@@ -16,17 +16,16 @@ import { useQuery } from "@tanstack/react-query"
 import { useCloneProgress } from "@/hooks/useCloneProgress"
 import CloneModal from "@/components/voice/CloneModal"
 import GenerateHeader from "./components/GenerateHeader"
-import {
-  calculateTotalVideoDuration,
-  estimateTotalVideoDuration,
-} from "./utils/calculateTotalVideoDuration"
 import FrontendPreviewPlayer from "./components/FrontendPreviewPlayer"
+import CanvasPreviewGrid from "./components/CanvasPreviewGrid"
+import PreviewCountModal from "./components/PreviewCountModal"
 import GenerateStepsBar from "./components/GenerateStepsBar"
 import GenerateStepContent from "./components/GenerateStepContent"
 import GenerateStepActions from "./components/GenerateStepActions"
 import { useGenerateFormState } from "./hooks/useGenerateFormState"
 import { useStepNavigation } from "./hooks/useStepNavigation"
 import { useGenerateVideo } from "./hooks/useGenerateVideo"
+
 import { usePreviewAssets } from "./hooks/usePreviewAssets"
 import { useTitleStyleUpdaters } from "./hooks/useStep4Title/useTitleStyleUpdaters"
 import { getAssetsByKind } from "@/api/assets"
@@ -57,10 +56,8 @@ const GeneratePage: React.FC = () => {
     selectedVoice,
     setSelectedVoice,
     voiceMode,
-    setVoiceMode,
     selectedClonedVoice,
-    setSelectedClonedVoice,
-    presetVoices,
+
     cloneModalOpen,
     setCloneModalOpen,
     videoRatio,
@@ -76,8 +73,51 @@ const GeneratePage: React.FC = () => {
     setStoredSourceEditPlanId,
     serverClips,
     setServerClips,
+    previewCount,
+    setPreviewCount,
+    previewTitles,
+    setPreviewTitles,
+    voiceModePerVideo,
+    setVoiceModePerVideo,
+    voiceLibraryIds,
+    setVoiceLibraryIds,
+    previewCovers,
+    setPreviewCovers,
+    selectedVariantIds,
+    setSelectedVariantIds,
   } = formState
 
+  const isBatch = previewCount > 1
+
+  /* ── 配音选择同步：共用配音 ↔ 变体数组 ── */
+  // 触发场景：①共用配音变化 ②批量模式进入/退出 ③独立→共用切换（需把所有变体刷成共用配音）
+  // 独立模式下：仅同步变体[0]（其选择器绑定共用配音），用户单独选择的其他变体不覆盖
+  const prevVoiceSyncRef = useRef({
+    voice: selectedVoice,
+    batch: isBatch,
+    perVideo: voiceModePerVideo,
+  })
+  useEffect(() => {
+    const prev = prevVoiceSyncRef.current
+    const voiceChanged = prev.voice !== selectedVoice
+    const modeChanged = prev.batch !== isBatch || prev.perVideo !== voiceModePerVideo
+    prevVoiceSyncRef.current = { voice: selectedVoice, batch: isBatch, perVideo: voiceModePerVideo }
+    if (!voiceChanged && !modeChanged) return
+    if (!isBatch) return
+    if (!voiceModePerVideo) {
+      // 共用模式（含刚从独立切回）：所有变体跟随共用配音，未选择的补默认值
+      setVoiceLibraryIds((prevIds) => (prevIds || []).map((id) => id || selectedVoice))
+    } else if (voiceChanged) {
+      // 独立模式下共用配音变化：仅同步变体[0]（与共用选择器绑定），其余不覆盖
+      setVoiceLibraryIds((prevIds) =>
+        (prevIds || []).map((id, i) => (i === 0 ? selectedVoice : id)),
+      )
+    }
+  }, [selectedVoice, isBatch, voiceModePerVideo, setVoiceLibraryIds])
+
+  /* ── 数量选择弹窗 ── */
+  const [countModalOpen, setCountModalOpen] = useState(false)
+
   /* ── 标题样式回调 ── */
   const styleUpdaters = useTitleStyleUpdaters({
     titleSettings,
@@ -92,6 +132,8 @@ const GeneratePage: React.FC = () => {
 
   const [previewVoiceAudioUrl, setPreviewVoiceAudioUrl] = useState<string | null>(null)
   const ttsAbortRef = useRef<AbortController | null>(null)
+  // TTS 试听文案：批量跟随变体0标题（仅取首项，避免编辑其他变体标题触发多余 TTS 请求）
+  const variant0Title = isBatch ? previewTitles?.[0] || "" : ""
 
   useEffect(() => {
     const voiceAsset = voiceMaterials.find((m) => m.id === selectedVoice)
@@ -100,8 +142,10 @@ const GeneratePage: React.FC = () => {
       return
     }
 
+    // 批量模式下 TTS 文案跟随变体0标题；单视频跟随主标题
+    const ttsTitle = isBatch ? variant0Title || "" : titleSettings.title
     const voiceId = selectedClonedVoice || selectedVoice
-    if (!voiceId || !titleSettings.title) {
+    if (!voiceId || !ttsTitle) {
       setPreviewVoiceAudioUrl(null)
       return
     }
@@ -111,7 +155,7 @@ const GeneratePage: React.FC = () => {
     ttsAbortRef.current = controller
     let cancelled = false
 
-    previewTts({ text: titleSettings.title, voice_id: voiceId })
+    previewTts({ text: ttsTitle, voice_id: voiceId })
       .then((res) => {
         if (!cancelled && res.audio_url) {
           setPreviewVoiceAudioUrl(res.audio_url)
@@ -128,11 +172,17 @@ const GeneratePage: React.FC = () => {
       cancelled = true
       controller.abort()
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedVoice, selectedClonedVoice, titleSettings.title, voiceMaterials])
+  }, [
+    selectedVoice,
+    selectedClonedVoice,
+    titleSettings.title,
+    variant0Title,
+    isBatch,
+    voiceMaterials,
+  ])
 
   /* ── 克隆声音 ── */
-  const { clones: clonedVoices, addClone, hasProcessing } = useCloneProgress()
+  const { addClone } = useCloneProgress()
 
   const handleCloneSuccess = (voice: VoiceClone) => {
     addClone(voice)
@@ -161,25 +211,26 @@ const GeneratePage: React.FC = () => {
     [bgm, currentTemplate],
   )
 
-  /* ── 加载素材详情（供前端预览播放器使用 + 配音时长校验） ── */
+  /* ── 加载素材详情（供前端预览播放器使用） ── */
   const previewAssetsEnabled = previewAssetIds.length > 0
   const { assets: previewAssets, ready: previewAssetsReady } = usePreviewAssets(
     previewAssetIds,
     previewAssetsEnabled,
   )
 
-  /* ── 预览就绪：素材已加载，且有模板 ── */
-  const previewReady = useMemo(
-    () => previewAssetsReady && !!currentTemplate,
-    [previewAssetsReady, currentTemplate],
-  )
+  /* ── 预览就绪：纯前端 Canvas 预览，素材详情加载完即可秒开（单视频/批量一致） ── */
+  const previewReady = previewAssetsReady && !!currentTemplate
 
-  /* ── 视频总时长计算 ── */
-  const totalVideoDuration = useMemo(() => {
-    const exact = calculateTotalVideoDuration(previewAssets, currentTemplate ?? undefined)
-    if (exact > 0) return exact
-    return estimateTotalVideoDuration(currentTemplate ?? undefined)
-  }, [previewAssets, currentTemplate])
+  /* ── 勾选变体 ── */
+  const toggleVariantSelect = useCallback(
+    (index: number) => {
+      setSelectedVariantIds((prev) => {
+        const list = prev || []
+        return list.includes(index) ? list.filter((i) => i !== index) : [...list, index].sort()
+      })
+    },
+    [setSelectedVariantIds],
+  )
 
   /* ── 视频生成核心逻辑 ── */
   const {
@@ -188,8 +239,10 @@ const GeneratePage: React.FC = () => {
     generated,
     generateError,
     generatedVideos,
+    batchTasks,
     generate: handleGenerate,
     retry: handleRetryGenerate,
+    retryBatchTask: handleRetryBatchTask,
     dismissError: handleDismissError,
     download: handleDownload,
     share: handleShare,
@@ -211,27 +264,92 @@ const GeneratePage: React.FC = () => {
     sourceEditPlanId: storedSourceEditPlanId || sourceEditPlanId,
     previewTaskId,
     bgmConfig,
+    previewCount,
+    variantTitles: previewTitles,
+    variantVoiceLibraryIds: voiceLibraryIds,
+    voiceModePerVideo,
+    variantCoverUrls: previewCovers,
+    selectedVariantIndexes: isBatch ? selectedVariantIds : undefined,
     onGenerationSuccess: () => {
       setPreviewTaskId(null)
       setStoredSourceEditPlanId(null)
     },
   })
 
-  /* ── 步骤4「确认生成视频」：校验标题/预览 → 创建最终渲染任务 → 成功后进入步骤5 ── */
+  /* ── 数量弹窗确认：设置数量 + 同步批量数组长度 + 进入步骤2 ── */
+  const handleCountConfirm = useCallback(
+    (count: number) => {
+      setPreviewCount(count)
+      setCountModalOpen(false)
+      // 同步批量数组长度
+      setPreviewTitles((prev) => {
+        const list = prev || []
+        const base = list[0] || titleSettings.title || ""
+        return Array.from({ length: count }, (_, i) => list[i] ?? (i === 0 ? base : ""))
+      })
+      setVoiceLibraryIds((prev) => {
+        const list = prev || []
+        return Array.from({ length: count }, (_, i) => list[i] ?? selectedVoice ?? "")
+      })
+      setPreviewCovers((prev) => {
+        const list = prev || []
+        return Array.from({ length: count }, (_, i) => list[i] ?? "")
+      })
+      setSelectedVariantIds(Array.from({ length: count }, (_, i) => i))
+      setCurrentStep(2)
+    },
+    [
+      setPreviewCount,
+      setPreviewTitles,
+      setVoiceLibraryIds,
+      setPreviewCovers,
+      setSelectedVariantIds,
+      setCurrentStep,
+      titleSettings.title,
+      selectedVoice,
+    ],
+  )
+
+  /* ── 步骤4「确认生成视频」：校验通过 → 创建正式生成任务 → 跳步骤5看实时进展 ── */
   const handleConfirmGenerate = useCallback(async () => {
-    if (!titleSettings.title.trim()) {
-      message.warning("请选择或输入标题")
-      return
+    // 标题校验：批量只校验已勾选的变体；单视频校验主标题
+    if (isBatch) {
+      if (selectedVariantIds.length === 0) {
+        message.warning("请至少勾选一个视频")
+        return
+      }
+      const missing = selectedVariantIds.some((i) => !previewTitles[i]?.trim())
+      if (missing) {
+        message.warning("请为每个勾选的视频输入标题")
+        return
+      }
+    } else if (!titleSettings.title?.trim()) {
+      // 与 buildPayload.validateGenerateInputs 一致：AI 自动选标题模式（aiAutoSelect）
+      // 允许空标题由后端生成；手动模式必须填写，避免提交空标题
+      if (!titleSettings.aiAutoSelect) {
+        message.warning("请先选择或输入标题")
+        return
+      }
     }
     if (!previewReady) {
-      message.warning("预览视频正在加载，请稍候")
+      message.warning("预览素材正在加载，请稍候")
       return
     }
     const ok = await handleGenerate()
     if (ok) {
+      // 单视频与批量一致：任务创建成功后进入步骤5「确认生成」看实时渲染进展
       setCurrentStep(5)
     }
-  }, [titleSettings.title, previewReady, handleGenerate, setCurrentStep])
+  }, [
+    isBatch,
+    selectedVariantIds,
+    previewTitles,
+    titleSettings.aiAutoSelect,
+    titleSettings.title,
+    previewReady,
+    handleGenerate,
+    setCurrentStep,
+  ])
 
   /* ── 步骤导航 ── */
   const { goNext, goPrev } = useStepNavigation({
@@ -242,13 +360,21 @@ const GeneratePage: React.FC = () => {
     selectedMaterials,
     smartSelectedIds,
     titleSettings,
-    previewReady,
     generated,
+    onOpenCountModal: () => setCountModalOpen(true),
   })
 
-  /* ── 最终成片（步骤5/6 右侧播放） ── */
+  /* ── 最终成片（单视频右侧播放） ── */
   const finalVideo = generatedVideos[0]
 
+  /* ── 布局 class：步骤4标题页=预览+标题侧栏；步骤5/6批量=整行宽；步骤1~3=整行宽 ── */
+  const layoutClassName = useMemo(() => {
+    if (currentStep < 4) return "xx-generate-layout full-width"
+    if (currentStep === 4) return "xx-generate-layout step4-layout"
+    // 步骤5/6：批量网格需要整行宽度；单视频保持 表单+右侧成片 两栏
+    return isBatch ? "xx-generate-layout full-width" : "xx-generate-layout"
+  }, [currentStep, isBatch])
+
   /* ================================================================
      渲染
      ================================================================ */
@@ -259,8 +385,61 @@ const GeneratePage: React.FC = () => {
 
       <GenerateStepsBar currentStep={currentStep} onStepClick={setCurrentStep} />
 
-      <div className={`xx-generate-layout${currentStep < 4 ? " full-width" : ""}`}>
-        {/* ════ 左侧：表单区 ════ */}
+      <div className={layoutClassName}>
+        {/* ════ 步骤4：左侧预览大区域（纯前端 Canvas 实时预览） ════ */}
+        {currentStep === 4 && !!currentTemplate && (
+          <div className="xx-generate-preview-col">
+            {!isBatch ? (
+              /* 单视频：前端 Canvas 实时预览（与旧版一致，零回归） */
+              <FrontendPreviewPlayer
+                assets={previewAssets}
+                template={currentTemplate}
+                videoRatio={videoRatio}
+                ready={previewAssets.length > 0}
+                serverClips={serverClips}
+                voiceAudioUrl={previewVoiceAudioUrl || undefined}
+                titleSettings={{
+                  title: titleSettings.title,
+                  size: titleSettings.size,
+                  font: titleSettings.font,
+                  color: titleSettings.color,
+                  position: titleSettings.position as "top" | "center" | "bottom" | "custom",
+                  bold: titleSettings.bold,
+                  italic: titleSettings.italic,
+                  stroke: titleSettings.stroke,
+                  shadow: titleSettings.shadow,
+                  posX: titleSettings.posX,
+                  posY: titleSettings.posY,
+                }}
+                onTitlePositionChange={styleUpdaters.updateTitlePosition}
+              />
+            ) : (
+              /* 批量：N 个前端 Canvas 预览网格（不调任何后端渲染接口，秒开） */
+              <div className="xx-form-section">
+                <div className="xx-preview-header">
+                  <h3>🎬 {previewCount} 个视频预览</h3>
+                  <span style={{ fontSize: 13, color: "var(--text-secondary, #666)" }}>
+                    实时预览，勾选要生成的视频
+                  </span>
+                </div>
+                <CanvasPreviewGrid
+                  count={previewCount}
+                  assets={previewAssets}
+                  template={currentTemplate}
+                  videoRatio={videoRatio}
+                  titles={previewTitles}
+                  titleSettings={titleSettings}
+                  voiceAudioUrl={previewVoiceAudioUrl || undefined}
+                  selectedIds={selectedVariantIds}
+                  onToggleSelect={toggleVariantSelect}
+                  selectable={!generating}
+                />
+              </div>
+            )}
+          </div>
+        )}
+
+        {/* ════ 右侧：步骤1~3 表单 / 步骤4 标题边栏 / 步骤5 确认生成进度 / 步骤6 封面 ════ */}
         <div className="xx-generate-form">
           <GenerateStepContent
             currentStep={currentStep}
@@ -291,25 +470,26 @@ const GeneratePage: React.FC = () => {
             onCoverSettingsChange={setCoverSettings}
             selectedVoice={selectedVoice}
             onSelectedVoiceChange={setSelectedVoice}
-            totalVideoDuration={totalVideoDuration}
             onServerClipsChange={setServerClips}
-            voiceMode={voiceMode}
-            onVoiceModeChange={setVoiceMode}
-            selectedClonedVoice={selectedClonedVoice}
-            onSelectedClonedVoiceChange={setSelectedClonedVoice}
-            clonedVoices={clonedVoices}
-            addClone={addClone}
-            hasProcessing={hasProcessing}
-            cloneModalOpen={cloneModalOpen}
-            onCloneModalOpenChange={setCloneModalOpen}
             generating={generating}
             generated={generated}
             generateError={generateError}
             progress={progress}
             generatedVideos={generatedVideos}
             onRetry={handleRetryGenerate}
+            onRetryBatchTask={handleRetryBatchTask}
             onDismissError={handleDismissError}
-            presetVoices={presetVoices}
+            batchTasks={batchTasks}
+            previewCount={previewCount}
+            previewTitles={previewTitles}
+            onPreviewTitlesChange={setPreviewTitles}
+            voiceModePerVideo={voiceModePerVideo}
+            onVoiceModePerVideoChange={setVoiceModePerVideo}
+            voiceLibraryIds={voiceLibraryIds}
+            onVoiceLibraryIdsChange={setVoiceLibraryIds}
+            previewCovers={previewCovers}
+            onPreviewCoversChange={setPreviewCovers}
+            selectedVariantIds={selectedVariantIds}
           />
 
           <GenerateStepActions
@@ -320,36 +500,13 @@ const GeneratePage: React.FC = () => {
             generating={generating}
             generated={generated}
             generateError={generateError}
+            selectedCount={isBatch ? selectedVariantIds.length : 1}
           />
         </div>
 
-        {/* ════ 右侧：步骤4实时预览，步骤5/6最终视频 ════ */}
-        <div className="xx-generate-right-col">
-          {currentStep === 4 && !!currentTemplate && (
-            <FrontendPreviewPlayer
-              assets={previewAssets}
-              template={currentTemplate}
-              videoRatio={videoRatio}
-              ready={previewAssets.length > 0}
-              serverClips={serverClips}
-              voiceAudioUrl={previewVoiceAudioUrl || undefined}
-              titleSettings={{
-                title: titleSettings.title,
-                size: titleSettings.size,
-                font: titleSettings.font,
-                color: titleSettings.color,
-                position: titleSettings.position as "top" | "center" | "bottom" | "custom",
-                bold: titleSettings.bold,
-                italic: titleSettings.italic,
-                stroke: titleSettings.stroke,
-                shadow: titleSettings.shadow,
-                posX: titleSettings.posX,
-                posY: titleSettings.posY,
-              }}
-              onTitlePositionChange={styleUpdaters.updateTitlePosition}
-            />
-          )}
-          {currentStep >= 5 && generated && finalVideo && (
+        {/* ════ 步骤5/6（单视频）：右侧成片播放器 ════ */}
+        {currentStep >= 5 && !isBatch && generated && finalVideo && (
+          <div className="xx-generate-right-col">
             <div className="xx-inline-video-player">
               <video
                 src={finalVideo.download_url || finalVideo.file_url}
@@ -373,10 +530,18 @@ const GeneratePage: React.FC = () => {
                 </button>
               </div>
             </div>
-          )}
-        </div>
+          </div>
+        )}
       </div>
 
+      {/* 数量选择弹窗 */}
+      <PreviewCountModal
+        open={countModalOpen}
+        defaultCount={1}
+        onConfirm={handleCountConfirm}
+        onCancel={() => setCountModalOpen(false)}
+      />
+
       {/* 音色克隆弹窗 */}
       <CloneModal
         open={cloneModalOpen}

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

@@ -0,0 +1,100 @@
+/**
+ * 第5步「确认生成」— 批量渲染进度网格（Issue #1677）
+ *
+ * N 个正式生成任务各自独立卡片：进度条 / 成功成片播放 / 失败原因 + 单独重试。
+ * 数据来自 useGenerateVideo 的 batchTasks（useGenerationPolling 实时回传）。
+ */
+import React from "react"
+import { LoadingOutlined, CheckCircleFilled, CloseCircleOutlined } from "@ant-design/icons"
+import type { BatchTaskState } from "../hooks/generate-video/useGenerationPolling"
+import type { GeneratedVideo } from "@/api/template-editor"
+
+interface BatchGenerationGridProps {
+  tasks: BatchTaskState[]
+  /** 变体标题（按变体序号取） */
+  titles: string[]
+  /** 失败任务重试 */
+  onRetryTask: (taskId: string) => void
+}
+
+const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
+  tasks,
+  titles,
+  onRetryTask,
+}) => {
+  const sorted = [...tasks].sort(
+    (a, b) => Number(a.variantIndex || 0) - Number(b.variantIndex || 0),
+  )
+
+  return (
+    <div className="xx-form-section">
+      <div className="xx-preview-header">
+        <h3>🎬 正在生成 {tasks.length} 个视频</h3>
+        <span style={{ fontSize: 13, color: "var(--text-secondary, #666)" }}>
+          完成 {tasks.filter((t) => t.status === "completed").length} / {tasks.length}
+        </span>
+      </div>
+      <div className="xx-batch-gen-grid">
+        {sorted.map((task) => {
+          const title = titles[task.variantIndex] || `视频 ${task.variantIndex + 1}`
+          const video = (task.videos?.[0] || null) as GeneratedVideo | null
+          return (
+            <div key={task.taskId} className={`xx-batch-gen-card status-${task.status}`}>
+              <div className="xx-batch-gen-card-head">
+                <span className="xx-batch-gen-card-title" title={title}>
+                  {task.status === "completed" ? (
+                    <CheckCircleFilled style={{ color: "#52c41a", marginRight: 6 }} />
+                  ) : task.status === "failed" ? (
+                    <CloseCircleOutlined style={{ color: "#ef4444", marginRight: 6 }} />
+                  ) : (
+                    <LoadingOutlined style={{ color: "#1677ff", marginRight: 6 }} />
+                  )}
+                  视频 {task.variantIndex + 1}：{title}
+                </span>
+              </div>
+
+              <div className="xx-batch-gen-card-body">
+                {task.status === "running" && (
+                  <>
+                    <div className="xx-gen-progress-bar">
+                      <div
+                        className="xx-gen-progress-bar-fill"
+                        style={{ width: `${Math.min(task.progress, 100)}%` }}
+                      />
+                    </div>
+                    <div className="xx-batch-gen-card-pct">{Math.round(task.progress)}%</div>
+                  </>
+                )}
+                {task.status === "completed" && video && (
+                  <video
+                    src={video.download_url || video.file_url}
+                    controls
+                    style={{ width: "100%", borderRadius: 8, background: "#000", maxHeight: 280 }}
+                    poster={video.thumbnail_url}
+                  />
+                )}
+                {task.status === "completed" && !video && (
+                  <div className="xx-batch-gen-card-done">✅ 已完成（成片可在下一步选择封面）</div>
+                )}
+                {task.status === "failed" && (
+                  <div className="xx-batch-gen-card-failed">
+                    <div className="xx-batch-gen-card-err">{task.error || "生成失败"}</div>
+                    <button
+                      type="button"
+                      className="xx-btn xx-btn-primary xx-btn-sm"
+                      onClick={() => onRetryTask(task.taskId)}
+                    >
+                      🔄 重试此视频
+                    </button>
+                  </div>
+                )}
+              </div>
+            </div>
+          )
+        })}
+      </div>
+    </div>
+  )
+}
+
+export default BatchGenerationGrid

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

@@ -0,0 +1,97 @@
+/**
+ * 批量前端 Canvas 实时预览网格（Issue #1677 修正方案）
+ *
+ * N 个 FrontendPreviewPlayer 网格排列：
+ * - 纯前端 Canvas + video 元素实时播放素材片段，不调任何后端渲染接口
+ * - variantSeed 让每个变体素材排布/起始点不同，画面有可见差异
+ * - 各自叠加独立标题浮层（variantTitle），标题样式全局共用
+ * - 勾选框决定提交时生成哪些变体
+ */
+import React from "react"
+import type { AssetItem } from "@/api/assets"
+import type { EditingTemplate } from "@/api/editing-planner"
+import type { TitleSettings } from "../types"
+import FrontendPreviewPlayer from "./FrontendPreviewPlayer"
+
+interface CanvasPreviewGridProps {
+  count: number
+  assets: AssetItem[]
+  template: EditingTemplate | null
+  videoRatio: string
+  titles: string[]
+  titleSettings: TitleSettings
+  /** 共用配音预览音频（仅第 1 个变体播放，避免多路音频重叠） */
+  voiceAudioUrl?: string
+  /** 勾选的变体序号 */
+  selectedIds: number[]
+  onToggleSelect: (index: number) => void
+  /** 生成中禁止勾选 */
+  selectable?: boolean
+}
+
+const CanvasPreviewGrid: React.FC<CanvasPreviewGridProps> = ({
+  count,
+  assets,
+  template,
+  videoRatio,
+  titles,
+  titleSettings,
+  voiceAudioUrl,
+  selectedIds,
+  onToggleSelect,
+  selectable = true,
+}) => {
+  // count 上限已在源头 PreviewCountModal 的数量选择（1~MAX_PREVIEW_COUNT=10）clamp，
+  // 这里完整渲染所有变体，保证每个变体都有勾选/预览入口，UI 与数据不脱节
+  return (
+    <div className="xx-canvas-grid">
+      {Array.from({ length: count }, (_, i) => {
+        const checked = selectedIds.includes(i)
+        return (
+          <div
+            key={i}
+            className={`xx-canvas-grid-card${checked ? " selected" : ""}`}
+            data-variant={i}
+          >
+            <div className="xx-canvas-grid-card-bar">
+              <label className="xx-canvas-grid-check">
+                <input
+                  type="checkbox"
+                  checked={checked}
+                  disabled={!selectable}
+                  onChange={() => onToggleSelect(i)}
+                />
+                <span>视频 {i + 1}</span>
+              </label>
+            </div>
+            <FrontendPreviewPlayer
+              assets={assets}
+              template={template}
+              videoRatio={videoRatio}
+              ready={assets.length > 0}
+              variantSeed={i + 1}
+              variantTitle={titles[i] || ""}
+              voiceAudioUrl={i === 0 ? voiceAudioUrl : undefined}
+              compact
+              titleSettings={{
+                title: titles[i] || "",
+                size: titleSettings.size,
+                font: titleSettings.font,
+                color: titleSettings.color,
+                position: titleSettings.position as "top" | "center" | "bottom" | "custom",
+                bold: titleSettings.bold,
+                italic: titleSettings.italic,
+                stroke: titleSettings.stroke,
+                shadow: titleSettings.shadow,
+                posX: titleSettings.posX,
+                posY: titleSettings.posY,
+              }}
+            />
+          </div>
+        )
+      })}
+    </div>
+  )
+}
+
+export default CanvasPreviewGrid

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

@@ -41,6 +41,16 @@ interface FrontendPreviewPlayerProps {
     posY?: number | null
   }
   onTitlePositionChange?: (posX: number, posY: number) => void
+  /**
+   * 变体种子（批量生成 #1677）：同一批素材在不同变体中采用不同的素材顺序与
+   * 片段起始点，让 N 个 Canvas 预览画面有差异（纯前端随机剪辑模拟，不调后端）。
+   * 0 / 不传 = 单视频，排布与旧版完全一致（零回归）。
+   */
+  variantSeed?: number
+  /** 变体标题文字（批量时每个预览独立标题，叠加在画面上）；不传用 titleSettings.title */
+  variantTitle?: string
+  /** 紧凑模式（批量网格中使用，缩小内边距/标题尺寸） */
+  compact?: boolean
 }
 
 function formatTime(seconds: number): string {
@@ -52,10 +62,23 @@ function formatTime(seconds: number): string {
 /**
  * 将素材映射为播放片段（复用原逻辑）
  */
+/** 简单可复现随机数（mulberry32），同一种子产出稳定排布，避免每次渲染抖动 */
+function seededRandom(seed: number): () => number {
+  let a = seed >>> 0
+  return () => {
+    a |= 0
+    a = (a + 0x6d2b79f5) | 0
+    let t = Math.imul(a ^ (a >>> 15), 1 | a)
+    t = (t + Math.imul(t ^ (t >>> 7), 61 | t)) ^ t
+    return ((t ^ (t >>> 14)) >>> 0) / 4294967296
+  }
+}
+
 function buildPlaybackSegments(
   assets: AssetItem[],
   template: EditingTemplate | null,
   serverClips?: EditPlanClip[],
+  variantSeed = 0,
 ): PlaybackSegment[] {
   if (!assets.length) return []
 
@@ -79,18 +102,40 @@ function buildPlaybackSegments(
     }
   }
 
-  // Fallback: 本地构建片段（与旧行为一致）
+  // Fallback: 本地构建片段
+  // variantSeed=0（单视频）：与旧行为完全一致（素材原序、起始点 0），零回归
+  // variantSeed>0（批量变体）：素材顺序按种子轮换 + 片段起始点在素材内偏移，
+  //   模拟后端"AI 随机剪辑出不同版本"，让 N 个预览画面有可见差异
   const templateSegments = template?.segments || []
   const segments: PlaybackSegment[] = []
+  const orderedAssets = variantSeed > 0 ? [...assets] : assets
+  if (variantSeed > 0 && orderedAssets.length > 1) {
+    const rand = seededRandom(variantSeed * 7919 + 13)
+    // 素材轮换：把数组旋转 (seed % n) 位，再对后半段做一次稳定交换
+    const n = orderedAssets.length
+    const rotate = variantSeed % n
+    orderedAssets.push(...orderedAssets.splice(0, rotate))
+    const swapA = Math.floor(rand() * n)
+    const swapB = Math.floor(rand() * n)
+    if (swapA !== swapB) {
+      ;[orderedAssets[swapA], orderedAssets[swapB]] = [orderedAssets[swapB], orderedAssets[swapA]]
+    }
+  }
 
-  assets.forEach((asset, i) => {
+  orderedAssets.forEach((asset, i) => {
     const assetDuration = asset.duration || asset.metadata?.duration || 30
     const tplSeg = templateSegments[i] || templateSegments[templateSegments.length - 1]
     const segDuration = tplSeg
       ? Math.min(tplSeg.duration_max, Math.max(tplSeg.duration_min, assetDuration))
       : Math.min(assetDuration, 10)
 
-    const startTime = 0
+    let startTime = 0
+    if (variantSeed > 0 && assetDuration - segDuration > 1) {
+      const rand = seededRandom(variantSeed * 104729 + i * 31 + 7)
+      // 起始点在素材可用区间内随机偏移（至少留 0.5s 余量）
+      const maxStart = Math.max(0, assetDuration - segDuration - 0.5)
+      startTime = Math.round(rand() * maxStart * 10) / 10
+    }
     const endTime = Math.min(startTime + segDuration, assetDuration)
     const videoUrl = asset.file_url || asset.storage_key
 
@@ -109,11 +154,16 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
   voiceAudioUrl,
   titleSettings,
   onTitlePositionChange,
+  variantSeed = 0,
+  variantTitle,
+  compact = false,
 }) => {
   const segments = useMemo(
-    () => buildPlaybackSegments(assets, template, serverClips),
-    [assets, template, serverClips],
+    () => buildPlaybackSegments(assets, template, serverClips, variantSeed),
+    [assets, template, serverClips, variantSeed],
   )
+  // 批量变体：标题文字取 variantTitle，样式仍由全局 titleSettings 控制
+  const effectiveTitle = variantTitle ?? titleSettings?.title
 
   // ── ASS 坐标系参数（与后端 ass_subtitle_builder.py 一致） ──
   const TITLE_MARGIN_TOP = 120
@@ -234,7 +284,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
   // ── Canvas 播放器（WebCodecs 路径） ──
   const canvasTitle = titleSettings
     ? {
-        text: titleSettings.title || "标题预览",
+        text: effectiveTitle || "标题预览",
         fontSize: titleSettings.size,
         fontFamily: titleSettings.font || "思源黑体",
         color: titleSettings.color || "#ffffff",
@@ -520,13 +570,15 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
       style={{
         position: "relative",
         width: "100%",
-        maxWidth: 280,
+        maxWidth: compact ? "100%" : 280,
+        margin: compact ? 0 : "0 auto",
         aspectRatio: "9 / 16",
         background: "#0a0a0a",
-        borderRadius: 24,
+        borderRadius: compact ? 10 : 24,
         overflow: "hidden",
-        boxShadow:
-          "0 4px 6px -1px rgba(0,0,0,0.3), 0 20px 50px -12px rgba(0,0,0,0.5), inset 0 0 0 1px rgba(255,255,255,0.06)",
+        boxShadow: compact
+          ? "inset 0 0 0 1px rgba(255,255,255,0.06)"
+          : "0 4px 6px -1px rgba(0,0,0,0.3), 0 20px 50px -12px rgba(0,0,0,0.5), inset 0 0 0 1px rgba(255,255,255,0.06)",
       }}
     >
       {/* ── Canvas 渲染层（WebCodecs 路径） ── */}
@@ -591,6 +643,8 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
           <div
             style={{
               position: "absolute",
+              width: `${100 - 2 * titleSidePct}%`,
+              maxWidth: `${100 - 2 * titleSidePct}%`,
               ...(customTitleXPct != null && customTitleYPct != null
                 ? {
                     left: `${customTitleXPct}%`,
@@ -599,17 +653,17 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
                     textAlign: "center" as const,
                   }
                 : {
-                    left: `${titleSidePct}%`,
-                    right: `${titleSidePct}%`,
+                    left: "50%",
+                    transform: "translateX(-50%)",
                     textAlign: "center" as const,
                     ...(titleSettings.position === "top"
                       ? { top: `${titleTopPct}%` }
                       : titleSettings.position === "center"
-                        ? { top: "50%", transform: "translateY(-50%)" }
+                        ? { top: "50%", transform: "translate(-50%, -50%)" }
                         : { bottom: `${titleBottomPct}%` }),
                   }),
-              pointerEvents: "auto",
-              cursor: onTitlePositionChange ? "grab" : "default",
+              pointerEvents: onTitlePositionChange && variantSeed === 0 ? "auto" : "none",
+              cursor: onTitlePositionChange && variantSeed === 0 ? "grab" : "default",
               touchAction: "none",
               userSelect: "none",
               WebkitUserSelect: "none",
@@ -639,7 +693,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
                   : undefined,
               }}
             >
-              {titleSettings.title.split(/[/／]/).map((part, i) => (
+              {(effectiveTitle || "").split(/[/／]/).map((part, i) => (
                 <span key={i}>
                   {i > 0 && <br />}
                   {part}

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

@@ -1,9 +1,9 @@
 /**
- * GeneratePage 步骤底部操作按钮
+ * GeneratePage 步骤底部操作按钮（Issue #1677 修正：固定 6 步）
  *
  * 步骤 1~3：上一步 / 下一步
- * 步骤 4（标题+预览）：上一步 / 确认生成视频（点击后直接创建最终渲染任务，成功后跳转步骤5）
- * 步骤 5（确认生成）：上一步 / 下一步（渲染中禁用，渲染完成后可进入封面）
+ * 步骤 4（选择标题）：「✨ 确认生成视频 / 确认生成 N 个视频」→ 创建正式生成任务，成功后跳步骤5
+ * 步骤 5（确认生成）：渲染进度页，全部完成后「下一步：选择封面」；仅上一步
  * 步骤 6（选择封面）：仅上一步
  */
 import React from "react"
@@ -12,14 +12,16 @@ export interface GenerateStepActionsProps {
   currentStep: number
   onPrev: () => void
   onNext: () => void
-  /** 步骤4：确认生成视频（校验 + 创建渲染任务 + 成功后进入步骤5） */
+  /** 步骤4：确认生成视频（校验 + 创建渲染任务） */
   onConfirmGenerate: () => void | Promise<void>
   generating: boolean
   generated: boolean
   generateError: string | null
+  /** 批量模式下勾选的视频数量（N=1 时为1） */
+  selectedCount?: number
 }
 
-export const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
+const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
   currentStep,
   onPrev,
   onNext,
@@ -27,9 +29,10 @@ export const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
   generating,
   generated,
   generateError,
+  selectedCount = 1,
 }) => {
   const renderPrimaryButton = () => {
-    /* 步骤 1~3：上一步 / 下一步（必填校验由 useStepNavigation.goNext 统一处理） */
+    /* 步骤 1~3：上一步 / 下一步 */
     if (currentStep < 4) {
       return (
         <button className="xx-btn xx-btn-primary" onClick={onNext}>
@@ -38,50 +41,46 @@ export const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
       )
     }
 
-    /* 步骤 4：确认生成视频（触发按钮在标题页） */
+    /* 步骤 4：选择标题 — 确认生成 */
     if (currentStep === 4) {
       if (generating) {
         return (
           <button className="xx-btn xx-btn-primary" disabled>
-            ⏳ 视频生成中…
+            ⏳ 正在提交生成任务…
           </button>
         )
       }
       if (generateError) {
         return (
           <button className="xx-btn xx-btn-primary" onClick={onConfirmGenerate}>
-            🔄 重新生成视频
-          </button>
-        )
-      }
-      if (generated) {
-        return (
-          <button className="xx-btn xx-btn-primary" onClick={onNext}>
-            下一步 →
+            🔄 重新生成
           </button>
         )
       }
       return (
         <button className="xx-btn xx-btn-primary" onClick={onConfirmGenerate}>
-          ✨ 确认生成视频
+          {selectedCount > 1 ? `✨ 确认生成 ${selectedCount} 个视频` : "✨ 确认生成视频"}
         </button>
       )
     }
 
-    /* 步骤 5：渲染中禁用，完成后下一步进入封面 */
+    /* 步骤 5：确认生成进度页 — 全部完成后下一步进封面 */
     if (currentStep === 5) {
+      if (generated) {
+        return (
+          <button className="xx-btn xx-btn-primary" onClick={onNext}>
+            下一步：选择封面 →
+          </button>
+        )
+      }
       return (
-        <button
-          className="xx-btn xx-btn-primary"
-          onClick={onNext}
-          disabled={generating || !generated}
-        >
-          {generating ? "视频生成中…" : "下一步 →"}
+        <button className="xx-btn xx-btn-primary" disabled>
+          ⏳ 视频渲染中…
         </button>
       )
     }
 
-    /* 步骤 6（最后一步）：无主按钮 */
+    /* 步骤 6（封面，最后一步）：无主按钮 */
     return null
   }
 

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

@@ -1,20 +1,20 @@
 /**
  * GeneratePage 步骤内容渲染
- * 步骤顺序（6步）：模板(1) → 素材(2) → 配音(3) → 标题(4) → 确认生成(5) → 封面(6)
+ * 步骤顺序（6步，Issue #1677 修正）：模板(1) → 素材(2) → 配音(3) → 标题(4) → 确认生成(5) → 封面(6)
+ * 步骤4预览（Canvas 网格）与步骤5进度（批量渲染网格）由 GeneratePage 直接渲染在左侧大区域。
  */
 import React from "react"
 import type { EditingTemplate } from "@/api/editing-planner"
 import type { EditPlanClip } from "@/api/template-editor"
-import type { PresetVoiceItem } from "@/api/voices"
-import type { VoiceClone } from "@/api/voice-clone"
 import type { CoverConfig } from "../types/cover"
 import type { TitleSettings } from "../types"
 import Step1TemplateSelect from "../components/Step1TemplateSelect"
 import Step2MaterialSelect from "../components/Step2MaterialSelect"
-import Step3VoiceSelect from "../components/Step5VoiceSelect"
+import Step3VoiceWithMode from "./Step3VoiceWithMode"
 import Step4TitleSettings from "../components/Step4TitleSettings"
-import Step5ConfirmGenerate from "../components/Step7ConfirmGenerate"
 import Step6CoverSettings from "../components/Step6CoverSettings"
+import BatchGenerationGrid from "./BatchGenerationGrid"
+import type { BatchTaskState } from "../hooks/generate-video/useGenerationPolling"
 import type { GeneratedVideo } from "@/api/template-editor"
 
 export interface GenerateStepContentProps {
@@ -49,17 +49,7 @@ export interface GenerateStepContentProps {
   /* 配音 */
   selectedVoice: string
   onSelectedVoiceChange: (id: string) => void
-  totalVideoDuration?: number
   onServerClipsChange: (clips: EditPlanClip[]) => void
-  voiceMode: "preset" | "custom" | "clone"
-  onVoiceModeChange: (mode: "preset" | "custom" | "clone") => void
-  selectedClonedVoice: string
-  onSelectedClonedVoiceChange: (id: string) => void
-  clonedVoices: VoiceClone[]
-  addClone: (voice: VoiceClone) => void
-  hasProcessing: boolean
-  cloneModalOpen: boolean
-  onCloneModalOpenChange: (open: boolean) => void
   /* 生成 */
   generating: boolean
   generated: boolean
@@ -67,13 +57,26 @@ export interface GenerateStepContentProps {
   progress: number
   generatedVideos: GeneratedVideo[]
   onRetry: () => void
+  onRetryBatchTask: (taskId: string) => void
   onDismissError: () => void
-  /* 其他 */
-  presetVoices: PresetVoiceItem[]
+  /** 批量：每个正式生成任务的独立状态（步骤5进度网格） */
+  batchTasks: BatchTaskState[]
   /** BGM 开关 */
   bgm: boolean
   /** BGM 配置（来自模板） */
   bgmConfig?: { enabled: boolean; music_id?: string }
+  /* ── 批量生成（#1677）── */
+  previewCount: number
+  previewTitles: string[]
+  onPreviewTitlesChange: (titles: string[]) => void
+  voiceModePerVideo: boolean
+  onVoiceModePerVideoChange: (v: boolean) => void
+  voiceLibraryIds: string[]
+  onVoiceLibraryIdsChange: (ids: string[]) => void
+  previewCovers: string[]
+  onPreviewCoversChange: (urls: string[]) => void
+  /** 批量模式勾选的变体索引（封面卡片按勾选顺序展示） */
+  selectedVariantIds?: number[]
 }
 
 export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) => {
@@ -104,19 +107,25 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
     onCoverSettingsChange,
     selectedVoice,
     onSelectedVoiceChange,
-    totalVideoDuration,
     onServerClipsChange,
-    voiceMode,
-    selectedClonedVoice,
-    clonedVoices,
     generating,
     generated,
     generateError,
     progress,
-    generatedVideos,
     onRetry,
-    onDismissError,
-    presetVoices,
+    generatedVideos,
+    batchTasks,
+    onRetryBatchTask,
+    previewCount,
+    previewTitles,
+    onPreviewTitlesChange,
+    voiceModePerVideo,
+    onVoiceModePerVideoChange,
+    voiceLibraryIds,
+    onVoiceLibraryIdsChange,
+    previewCovers,
+    onPreviewCoversChange,
+    selectedVariantIds,
   } = props
 
   /* 当前模板的 segments，传给 Step2 构建 clips */
@@ -148,10 +157,14 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
       )
     case 3:
       return (
-        <Step3VoiceSelect
+        <Step3VoiceWithMode
+          previewCount={previewCount}
           selectedVoice={selectedVoice}
           onSelectedVoiceChange={onSelectedVoiceChange}
-          totalVideoDuration={totalVideoDuration}
+          voiceModePerVideo={voiceModePerVideo}
+          onVoiceModePerVideoChange={onVoiceModePerVideoChange}
+          voiceLibraryIds={voiceLibraryIds}
+          onVoiceLibraryIdsChange={onVoiceLibraryIdsChange}
         />
       )
     case 4:
@@ -170,31 +183,66 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           onApplyPreset={onApplyPreset}
           activePreset={activePreset}
           titlePresets={titlePresets}
+          previewCount={previewCount}
+          previewTitles={previewTitles}
+          onPreviewTitlesChange={onPreviewTitlesChange}
         />
       )
     case 5:
+      /* 确认生成页：批量=逐任务进度网格；单视频=进度状态卡（成片播放器在左侧大区域） */
+      if (previewCount > 1) {
+        return (
+          <BatchGenerationGrid
+            tasks={batchTasks}
+            titles={previewTitles}
+            onRetryTask={onRetryBatchTask}
+          />
+        )
+      }
+      /* 单视频：渲染进度 / 失败重试 / 完成提示（成片播放器在右侧栏） */
       return (
-        <Step5ConfirmGenerate
-          templates={userTemplates}
-          selectedTemplate={selectedTemplate}
-          materialMode={materialMode}
-          selectedMaterials={selectedMaterials}
-          smartSelectedIds={smartSelectedIds}
-          title={titleSettings.title}
-          voiceMode={voiceMode}
-          selectedVoice={selectedVoice}
-          selectedClonedVoice={selectedClonedVoice}
-          presetVoices={presetVoices}
-          clonedVoices={clonedVoices}
-          coverSettings={coverSettings}
-          generating={generating}
-          generated={generated}
-          generateError={generateError}
-          progress={progress}
-          generatedVideos={generatedVideos}
-          onRetry={onRetry}
-          onDismissError={onDismissError}
-        />
+        <div className="xx-form-section">
+          <h3>🎬 确认生成</h3>
+          {generating && (
+            <div className="xx-gen-progress-card">
+              <div className="xx-gen-progress-header">
+                <div className="xx-gen-progress-info">
+                  <div className="xx-gen-progress-phase">
+                    ⏳ 视频渲染中… {Math.round(progress)}%
+                  </div>
+                  <div className="xx-gen-progress-sub">
+                    生成过程中可以切换到其他页面，完成后可在任务历史查看
+                  </div>
+                </div>
+              </div>
+              <div className="xx-gen-progress-bar">
+                <div
+                  className="xx-gen-progress-bar-fill"
+                  style={{ width: `${Math.min(Math.round(progress), 100)}%` }}
+                />
+              </div>
+            </div>
+          )}
+          {generateError && !generating && (
+            <div className="xx-gen-error-card">
+              <div className="xx-gen-error-info">
+                <div className="xx-gen-error-title">生成失败</div>
+                <div className="xx-gen-error-msg">{generateError}</div>
+              </div>
+              <button type="button" className="xx-btn xx-btn-primary xx-btn-sm" onClick={onRetry}>
+                🔄 重试
+              </button>
+            </div>
+          )}
+          {generated && !generating && (
+            <div className="xx-gen-success-card">
+              <div className="xx-gen-success-info">
+                <div className="xx-gen-success-title">✅ 视频生成完成！</div>
+                <div className="xx-gen-success-sub">右侧可预览成片，点击「下一步」选择封面</div>
+              </div>
+            </div>
+          )}
+        </div>
       )
     case 6:
       return (
@@ -204,6 +252,11 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           selectedTemplate={selectedTemplate}
           titleSettings={titleSettings}
           generatedVideos={generatedVideos}
+          previewCount={previewCount}
+          previewTitles={previewTitles}
+          previewCovers={previewCovers}
+          onPreviewCoversChange={onPreviewCoversChange}
+          selectedVariantIndexes={selectedVariantIds}
         />
       )
     default:

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

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

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

@@ -47,9 +47,7 @@ const Step1TemplateSelect: React.FC<Step1TemplateSelectProps> = (props) => {
                 🎬
               </div>
               <h4>{tpl.name}</h4>
-              <p>
-                {tpl.estimated_duration}s · {tpl.segments.length}片段
-              </p>
+              <p>{tpl.segments.length}片段</p>
               {tpl.tags.length > 0 && (
                 <div
                   style={{

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

@@ -0,0 +1,102 @@
+/**
+ * Step3 配音选择（Issue #1677 批量生成）
+ * - 单视频 / 共用模式：与原配音选择完全一致
+ * - 独立模式（开关开启）：N 个配音选择器，每个视频独立选择
+ */
+import React from "react"
+import Step3VoiceSelect from "./Step5VoiceSelect"
+
+interface Step3VoiceWithModeProps {
+  previewCount: number
+  /** 共用配音ID */
+  selectedVoice: string
+  onSelectedVoiceChange: (id: string) => void
+  /** 是否独立配音 */
+  voiceModePerVideo: boolean
+  onVoiceModePerVideoChange: (v: boolean) => void
+  /** 各变体独立配音ID */
+  voiceLibraryIds: string[]
+  onVoiceLibraryIdsChange: (ids: string[]) => void
+}
+
+const Step3VoiceWithMode: React.FC<Step3VoiceWithModeProps> = ({
+  previewCount,
+  selectedVoice,
+  onSelectedVoiceChange,
+  voiceModePerVideo,
+  onVoiceModePerVideoChange,
+  voiceLibraryIds,
+  onVoiceLibraryIdsChange,
+}) => {
+  const isBatch = previewCount > 1
+
+  if (!isBatch) {
+    return (
+      <Step3VoiceSelect
+        selectedVoice={selectedVoice}
+        onSelectedVoiceChange={onSelectedVoiceChange}
+      />
+    )
+  }
+
+  return (
+    <div className="xx-form-section">
+      {/* 共用/独立切换 */}
+      <div className="xx-title-ai-toggle" style={{ marginBottom: 16 }}>
+        <div>
+          <div style={{ fontWeight: 600, fontSize: 15 }}>
+            🎙️ 配音方式：{voiceModePerVideo ? "每个视频独立配音" : "所有视频共用配音"}
+          </div>
+          <div style={{ fontSize: 12, color: "var(--text-tertiary, #999)", marginTop: 2 }}>
+            {voiceModePerVideo
+              ? `为 ${previewCount} 个视频分别选择不同配音`
+              : "所有视频使用同一个配音（默认）"}
+          </div>
+        </div>
+        <div
+          className={`xx-switch ${voiceModePerVideo ? "active" : ""}`}
+          onClick={() => onVoiceModePerVideoChange(!voiceModePerVideo)}
+          role="switch"
+          aria-checked={voiceModePerVideo}
+          tabIndex={0}
+          onKeyDown={(e) => {
+            if (e.key === "Enter" || e.key === " ") {
+              e.preventDefault()
+              onVoiceModePerVideoChange(!voiceModePerVideo)
+            }
+          }}
+        >
+          <div className="xx-switch-knob" />
+        </div>
+      </div>
+
+      {!voiceModePerVideo ? (
+        <Step3VoiceSelect
+          heading="🎙️ 共用配音"
+          description={`所有 ${previewCount} 个视频使用同一个配音，点击卡片可预览播放`}
+          selectedVoice={selectedVoice}
+          onSelectedVoiceChange={onSelectedVoiceChange}
+        />
+      ) : (
+        <div className="xx-per-voice-list">
+          {Array.from({ length: previewCount }, (_, i) => (
+            <Step3VoiceSelect
+              key={i}
+              heading={`🎙️ 视频 ${i + 1} 的配音`}
+              description="为这个视频单独选择配音"
+              compact
+              selectedVoice={voiceLibraryIds[i] || ""}
+              onSelectedVoiceChange={(id) => {
+                const next = [...voiceLibraryIds]
+                next[i] = id
+                onVoiceLibraryIdsChange(next)
+              }}
+            />
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
+
+export default Step3VoiceWithMode

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

@@ -1,17 +1,22 @@
 /**
- * Step 4 选择标题（合并原 Step4 标题输入 + Step5 标题样式面板）
+ * Step 4 选择标题（Issue #1677 批量生成）
  *
- * 左侧：标题文字输入 + AI生成标题 + 样式设置（位置/字号/字体/颜色/样式/预设）
- * 右侧：FrontendPreviewPlayer 实时预览（由 GeneratePage 统一渲染）
+ * 布局（由 GeneratePage 编排）：左侧大区域实时预览（单=大播放器，批量=Canvas 网格），
+ * 右侧边栏标题设置。本组件渲染在右侧边栏：
+ * - 单视频：AI 标题生成器 + AutoComplete 标题库（与旧版完全一致，零回归）
+ * - 批量：N 个独立标题输入框（AutoComplete 支持标题库选择）+ 批量 AI 生成
+ *   （一次生成 N 个标题，分别填入各变体，可单独换一个）
+ * - 标题样式（字体/颜色/位置/大小/粗斜描边/预设）：全局统一
  */
-import React from "react"
-import { AutoComplete } from "antd"
-import { PlayCircleOutlined } from "@ant-design/icons"
+import React, { useMemo, useState } from "react"
+import { AutoComplete, Input, message } from "antd"
+import { LoadingOutlined } from "@ant-design/icons"
 import type { TitleSettings } from "../types"
 import { POSITION_OPTIONS, FONT_OPTIONS } from "../constants"
 import { useStep4Title } from "../hooks/useStep4Title"
 import AiTitleGenerator from "./title/AiTitleGenerator"
 import TitleStylePanel from "./title/TitleStylePanel"
+import { AI_TITLE_TEMPLATES } from "../constants"
 
 interface Step4TitleSettingsProps {
   titleSettings: TitleSettings
@@ -29,6 +34,42 @@ interface Step4TitleSettingsProps {
   onApplyPreset: (presetKey: string) => void
   activePreset: string | null
   titlePresets: { key: string; label: string; previewStyle: React.CSSProperties }[]
+  /* ── 批量生成（#1677）── */
+  /** 生成数量 */
+  previewCount?: number
+  /** 每个变体的标题文字（长度=previewCount） */
+  previewTitles?: string[]
+  onPreviewTitlesChange?: (titles: string[]) => void
+}
+
+/** 从本地 AI 标题模板池按主题词生成 N 个不同标题（与单视频 AI 生成同源） */
+function buildBatchAiTitles(topic: string, count: number): string[] {
+  const styles: Array<"catchy" | "emotional" | "informative"> = [
+    "catchy",
+    "emotional",
+    "informative",
+  ]
+  const pool: string[] = []
+  styles.forEach((style) => {
+    const templates = AI_TITLE_TEMPLATES[style] || []
+    templates.forEach((tpl) => pool.push(tpl.replace(/\{topic\}/g, topic)))
+  })
+  // 洗牌后取前 count 个；不足则轮转补齐
+  const shuffled = [...pool].sort(() => Math.random() - 0.5)
+  const out: string[] = []
+  for (let i = 0; i < count; i++) {
+    out.push(shuffled[i % shuffled.length] || "")
+  }
+  return out
+}
+
+function extractTopic(text: string): string {
+  const keywords = text
+    .replace(/[，。！？、,.!?]/g, " ")
+    .split(/\s+/)
+    .filter(Boolean)
+  if (keywords.length === 0) return "这个话题"
+  return keywords.slice(0, 3).join("")
 }
 
 const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
@@ -44,122 +85,208 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
     onApplyPreset,
     activePreset,
     titlePresets,
+    previewCount = 1,
+    previewTitles,
+    onPreviewTitlesChange,
   } = props
 
+  const isBatch = previewCount > 1
+  const [batchAiLoading, setBatchAiLoading] = useState(false)
+  const [batchAiTopic, setBatchAiTopic] = useState("")
+
+  /** 更新单个变体标题；变体0同步写回 titleSettings.title（全局样式面板/草稿/TTS 链路依赖） */
+  const updateVariantTitle = (index: number, val: string) => {
+    if (!previewTitles || !onPreviewTitlesChange) return
+    const next = [...previewTitles]
+    next[index] = val
+    onPreviewTitlesChange(next)
+    if (index === 0) {
+      t.updateTitle(val)
+    }
+  }
+
+  /** 批量 AI 生成：按主题词生成标题，分别填入 N 个变体 */
+  const handleBatchAiGenerate = async (onlyEmpty = false) => {
+    if (!onPreviewTitlesChange || !previewTitles) return
+    const topic = (batchAiTopic || t.aiTitleInput || "").trim()
+    if (!topic) {
+      message.warning("请先输入主题词，例如：萌宠日常、旅行vlog")
+      return
+    }
+    setBatchAiLoading(true)
+    try {
+      // 与单视频一致：本地模板模拟 AI 生成（1200ms 体验延迟）
+      await new Promise((resolve) => setTimeout(resolve, 800))
+      const picked = buildBatchAiTitles(extractTopic(topic), previewCount)
+      const next = [...previewTitles]
+      for (let i = 0; i < previewCount; i++) {
+        if (onlyEmpty && next[i]?.trim()) continue
+        if (picked[i]) next[i] = picked[i]
+      }
+      onPreviewTitlesChange(next)
+      if (next[0]) t.updateTitle(next[0])
+      message.success(`已为 ${previewCount} 个视频生成标题，可单独修改`)
+    } finally {
+      setBatchAiLoading(false)
+    }
+  }
+
+  const titleOptions = useMemo(
+    () => t.userTitles.map((ut) => ({ label: ut.content, value: ut.content })),
+    [t.userTitles],
+  )
+
   return (
-    <div className="xx-form-section">
+    <div className="xx-form-section xx-title-sidebar">
       <h3>📝 选择标题</h3>
 
-      {/* AI 自动选择模式 */}
-      {t.titleSettings.aiAutoSelect && (
+      {!isBatch ? (
+        /* ── 单视频：原有 AI 标题 + 输入框（保持不变，零回归） ── */
         <>
-          <div className="xx-title-ai-toggle">
-            <span className="xx-toggle-label">AI 自动选择标题</span>
-            <div className="xx-switch active" onClick={t.toggleAiAutoSelect}>
-              <div className="xx-switch-knob" />
-            </div>
-          </div>
-
-          {/* 显示当前 AI 选中的标题（只读）+ 换一个按钮 */}
-          <div className="xx-form-field">
-            <label>当前 AI 选定标题</label>
-            <div
-              style={{
-                display: "flex",
-                alignItems: "center",
-                gap: 10,
-                padding: "8px 12px",
-                background: "var(--bg-secondary, rgba(0,0,0,0.04))",
-                borderRadius: 8,
-                fontSize: 14,
-                color: "var(--text-primary, #333)",
-              }}
-            >
-              <span style={{ flex: 1 }}>{t.titleSettings.title || "AI 将自动为你选择标题"}</span>
-              <button
-                type="button"
-                className="xx-btn xx-btn-primary"
-                style={{ flexShrink: 0, fontSize: 13, padding: "4px 12px" }}
-                onClick={t.autoGenerateTitle}
-              >
-                🔄 换一个
-              </button>
-            </div>
-          </div>
-        </>
-      )}
-
-      {/* 手动选择模式 */}
-      {!t.titleSettings.aiAutoSelect && (
-        <>
-          <AiTitleGenerator
-            inputValue={t.aiTitleInput}
-            onInputChange={t.setAiTitleInput}
-            generating={t.aiTitleGenerating}
-            onGenerate={t.handleGenerateAiTitles}
-            results={t.aiTitleResults}
-            hasGenerated={t.hasGeneratedTitles}
-            onSelect={t.handleSelectAiTitle}
-            selectedTitle={t.titleSettings.title}
-            onRefresh={t.handleRefreshAiTitles}
-          />
-
-          <div className="xx-title-ai-toggle">
-            <span className="xx-toggle-label">AI 自动选择标题</span>
-            <div className="xx-switch" onClick={t.toggleAiAutoSelect}>
-              <div className="xx-switch-knob" />
-            </div>
-          </div>
-
-          <div className="xx-form-field">
-            <label>标题</label>
-            <AutoComplete
-              placeholder="输入或从标题库选择…"
-              allowClear
-              maxLength={50}
-              style={{ width: "100%" }}
-              value={t.titleSettings.title || undefined}
-              onChange={(val) => t.updateTitle(val || "")}
-              options={t.userTitles.map((ut) => ({
-                label: ut.content,
-                value: ut.content,
-              }))}
-              filterOption={(inputValue, option) => {
-                const title = (option?.label || option?.value || "") as string
-                return title.toLowerCase().includes((inputValue || "").toLowerCase())
-              }}
-              notFoundContent={
-                t.userTitles.length === 0 ? (
-                  <span style={{ color: "var(--text-tertiary)", fontSize: 13 }}>
-                    标题库为空，请前往「标题管理」添加
+          {t.titleSettings.aiAutoSelect ? (
+            <>
+              <div className="xx-title-ai-toggle">
+                <span className="xx-toggle-label">AI 自动选择标题</span>
+                <div className="xx-switch active" onClick={t.toggleAiAutoSelect}>
+                  <div className="xx-switch-knob" />
+                </div>
+              </div>
+              <div className="xx-form-field">
+                <label>当前 AI 选定标题</label>
+                <div
+                  style={{
+                    display: "flex",
+                    alignItems: "center",
+                    gap: 10,
+                    padding: "8px 12px",
+                    background: "var(--bg-secondary, rgba(0,0,0,0.04))",
+                    borderRadius: 8,
+                    fontSize: 14,
+                    color: "var(--text-primary, #333)",
+                  }}
+                >
+                  <span style={{ flex: 1 }}>
+                    {(previewTitles?.[0] ?? t.titleSettings.title) || "AI 将自动为你选择标题"}
                   </span>
-                ) : null
-              }
-            />
-          </div>
+                  <button
+                    type="button"
+                    className="xx-btn xx-btn-primary"
+                    style={{ flexShrink: 0, fontSize: 13, padding: "4px 12px" }}
+                    onClick={t.autoGenerateTitle}
+                  >
+                    🔄 换一个
+                  </button>
+                </div>
+              </div>
+            </>
+          ) : (
+            <>
+              <AiTitleGenerator
+                inputValue={t.aiTitleInput}
+                onInputChange={t.setAiTitleInput}
+                generating={t.aiTitleGenerating}
+                onGenerate={t.handleGenerateAiTitles}
+                results={t.aiTitleResults}
+                hasGenerated={t.hasGeneratedTitles}
+                onSelect={t.handleSelectAiTitle}
+                selectedTitle={t.titleSettings.title}
+                onRefresh={t.handleRefreshAiTitles}
+              />
+
+              <div className="xx-title-ai-toggle">
+                <span className="xx-toggle-label">AI 自动选择标题</span>
+                <div className="xx-switch" onClick={t.toggleAiAutoSelect}>
+                  <div className="xx-switch-knob" />
+                </div>
+              </div>
+              <div className="xx-form-field">
+                <label>标题</label>
+                <AutoComplete
+                  placeholder="输入标题文字…"
+                  allowClear
+                  maxLength={50}
+                  style={{ width: "100%" }}
+                  value={(previewTitles?.[0] ?? t.titleSettings.title) || undefined}
+                  onChange={(val) => {
+                    t.updateTitle(val || "")
+                    onPreviewTitlesChange?.([val || ""])
+                  }}
+                  options={titleOptions}
+                  filterOption={(inputValue, option) => {
+                    const title = (option?.label || option?.value || "") as string
+                    return title.toLowerCase().includes((inputValue || "").toLowerCase())
+                  }}
+                />
+              </div>
+            </>
+          )}
         </>
+      ) : (
+        /* ── 批量：AI 批量生成 + N 个独立标题输入框（AutoComplete 支持标题库） ── */
+        <div className="xx-batch-titles">
+          <div
+            style={{
+              fontSize: 12,
+              color: "var(--text-secondary, #666)",
+              marginBottom: 10,
+              lineHeight: 1.6,
+            }}
+          >
+            为每个视频输入独立标题，修改会实时叠加到左侧对应视频上。标题样式（字体/颜色/位置）全局统一。
+          </div>
+
+          {/* 批量 AI 标题 */}
+          <div className="xx-batch-ai-row">
+            <Input
+              placeholder="主题词，如：萌宠日常、旅行vlog"
+              value={batchAiTopic || t.aiTitleInput}
+              onChange={(e) => {
+                setBatchAiTopic(e.target.value)
+                t.setAiTitleInput(e.target.value)
+              }}
+              maxLength={30}
+              size="small"
+              style={{ flex: 1 }}
+            />
+            <button
+              type="button"
+              className="xx-btn xx-btn-primary xx-btn-sm"
+              disabled={batchAiLoading}
+              onClick={() => handleBatchAiGenerate(false)}
+            >
+              {batchAiLoading ? <LoadingOutlined /> : "✨"} 一键生成 {previewCount} 个标题
+            </button>
+            <button
+              type="button"
+              className="xx-btn xx-btn-ghost xx-btn-sm"
+              disabled={batchAiLoading}
+              onClick={() => handleBatchAiGenerate(true)}
+            >
+              补填空标题
+            </button>
+          </div>
+
+          {Array.from({ length: previewCount }, (_, i) => (
+            <div className="xx-form-field" key={i}>
+              <label>视频 {i + 1} 标题</label>
+              <AutoComplete
+                placeholder={`视频 ${i + 1} 的标题…`}
+                maxLength={50}
+                style={{ width: "100%" }}
+                value={previewTitles?.[i] || undefined}
+                onChange={(val) => updateVariantTitle(i, val || "")}
+                options={titleOptions}
+                filterOption={(inputValue, option) => {
+                  const title = (option?.label || option?.value || "") as string
+                  return title.toLowerCase().includes((inputValue || "").toLowerCase())
+                }}
+              />
+            </div>
+          ))}
+        </div>
       )}
 
-      {/* 标题样式面板（原 Step5） */}
-      <div
-        style={{
-          display: "flex",
-          alignItems: "center",
-          gap: 8,
-          padding: "10px 14px",
-          background: "rgba(59, 130, 246, 0.08)",
-          borderRadius: 8,
-          marginTop: 16,
-          marginBottom: 12,
-          border: "1px solid rgba(59, 130, 246, 0.15)",
-        }}
-      >
-        <PlayCircleOutlined style={{ fontSize: 16, color: "#3b82f6" }} />
-        <span style={{ fontSize: 12, color: "var(--text-secondary, #666)" }}>
-          右侧为实时预览，调整样式即时生效
-        </span>
-      </div>
-
+      {/* 标题样式面板（全局共用） */}
       <TitleStylePanel
         settings={t.titleSettings}
         onUpdatePosition={onUpdatePosition}

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

@@ -5,18 +5,21 @@
 import React, { useState, useRef, useCallback } from "react"
 import { useNavigate } from "react-router-dom"
 import { useQuery } from "@tanstack/react-query"
-import { AudioOutlined, SoundOutlined, WarningOutlined } from "@ant-design/icons"
-import { Modal } from "antd"
+import { AudioOutlined, SoundOutlined } from "@ant-design/icons"
 import { getAssetsByKind } from "@/api/assets"
 import type { AssetItem } from "@/api/assets"
 
 interface Step5VoiceSelectProps {
   selectedVoice: string
   onSelectedVoiceChange: (id: string) => void
-  totalVideoDuration?: number
+  /** 卡片标题（独立配音模式下显示"视频 N 的配音"），默认"选择配音" */
+  heading?: string
+  /** 描述文案 */
+  description?: string
+  /** 是否使用紧凑卡片样式（独立配音模式下 N 个并排） */
+  compact?: boolean
 }
 
-/** 格式化时长 mm:ss */
 /** 获取素材实际时长（优先顶层 duration，fallback 到 metadata.duration） */
 const getDuration = (item: AssetItem): number => {
   return item.duration ?? (item.metadata?.duration as number) ?? 0
@@ -34,13 +37,6 @@ const isAiVoice = (item: AssetItem): boolean => {
   return (!duration || duration <= 0) && (!size || size <= 0)
 }
 
-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 "未知"
@@ -53,13 +49,13 @@ const formatFileSize = (bytes?: number): string => {
 const Step5VoiceSelect: React.FC<Step5VoiceSelectProps> = ({
   selectedVoice,
   onSelectedVoiceChange,
-  totalVideoDuration = 0,
+  heading = "🎙️ 选择配音",
+  description = "从配音库中选择已上传的素材，点击卡片可预览播放",
+  compact = false,
 }) => {
   const navigate = useNavigate()
   const [playingId, setPlayingId] = useState<string | null>(null)
   const audioRef = useRef<HTMLAudioElement | null>(null)
-  const [durationWarningOpen, setDurationWarningOpen] = useState(false)
-  const [pendingVoiceId, setPendingVoiceId] = useState<string | null>(null)
 
   // 获取用户上传的配音素材
   const { data: materials = [], isLoading } = useQuery({
@@ -100,38 +96,14 @@ const Step5VoiceSelect: React.FC<Step5VoiceSelectProps> = ({
     [playingId],
   )
 
-  /** 选中素材（含时长校验） */
+  /** 选中素材（直接选中，不再做时长校验弹窗） */
   const handleSelect = useCallback(
     (id: string) => {
-      // 如果启用了时长校验，且配音时长不足（AI 音色按脚本实时合成，不参与时长校验）
-      if (totalVideoDuration > 0) {
-        const material = materials.find((m) => m.id === id)
-        if (material && !isAiVoice(material) && getDuration(material) < totalVideoDuration) {
-          setPendingVoiceId(id)
-          setDurationWarningOpen(true)
-          return
-        }
-      }
       onSelectedVoiceChange(id)
     },
-    [onSelectedVoiceChange, totalVideoDuration, materials],
+    [onSelectedVoiceChange],
   )
 
-  /** 确认使用时长不足的配音 */
-  const handleConfirmUseAnyway = useCallback(() => {
-    if (pendingVoiceId) {
-      onSelectedVoiceChange(pendingVoiceId)
-    }
-    setDurationWarningOpen(false)
-    setPendingVoiceId(null)
-  }, [pendingVoiceId, onSelectedVoiceChange])
-
-  /** 取消选择 */
-  const handleCancelSelection = useCallback(() => {
-    setDurationWarningOpen(false)
-    setPendingVoiceId(null)
-  }, [])
-
   /** 跳转到配音库上传 */
   const handleGoToUpload = useCallback(() => {
     navigate("/app/voices?tab=material&upload=1")
@@ -185,14 +157,14 @@ const Step5VoiceSelect: React.FC<Step5VoiceSelectProps> = ({
 
   return (
     <div className="xx-form-section">
-      <h3>🎙️ 选择配音</h3>
-      <p style={{ color: "#666", marginBottom: 16, fontSize: 14 }}>
-        从配音库中选择已上传的素材，点击卡片可预览播放
-      </p>
+      <h3>{heading}</h3>
+      <p style={{ color: "#666", marginBottom: 16, fontSize: 14 }}>{description}</p>
       <div
         style={{
           display: "grid",
-          gridTemplateColumns: "repeat(auto-fill, minmax(220px, 1fr))",
+          gridTemplateColumns: compact
+            ? "repeat(auto-fill, minmax(160px, 1fr))"
+            : "repeat(auto-fill, minmax(220px, 1fr))",
           gap: 12,
         }}
       >
@@ -277,7 +249,7 @@ const Step5VoiceSelect: React.FC<Step5VoiceSelectProps> = ({
                 {item.name}
               </div>
 
-              {/* 时长 + 大小 */}
+              {/* 文件大小 */}
               <div
                 style={{
                   display: "flex",
@@ -289,65 +261,13 @@ const Step5VoiceSelect: React.FC<Step5VoiceSelectProps> = ({
               >
                 {isAiVoice(item) ? (
                   <span style={{ color: "#1677ff", fontWeight: 500 }}>AI 音色</span>
-                ) : (
-                  <span style={{ display: "flex", alignItems: "center", gap: 4 }}>
-                    {formatDuration(getDuration(item))}
-                    {totalVideoDuration > 0 && getDuration(item) < Number(totalVideoDuration) && (
-                      <span
-                        style={{
-                          color: "#ff4d4f",
-                          fontSize: 11,
-                          fontWeight: 500,
-                          display: "inline-flex",
-                          alignItems: "center",
-                          gap: 2,
-                        }}
-                      >
-                        <WarningOutlined />
-                        时长不足
-                      </span>
-                    )}
-                  </span>
-                )}
+                ) : null}
                 <span>{isAiVoice(item) ? "按文本合成" : formatFileSize(getFileSize(item))}</span>
               </div>
             </div>
           )
         })}
       </div>
-
-      {/* 时长不足警告弹窗 */}
-      <Modal
-        title={
-          <span style={{ display: "flex", alignItems: "center", gap: 8 }}>
-            <WarningOutlined style={{ color: "#faad14" }} />
-            配音时长不足
-          </span>
-        }
-        open={durationWarningOpen}
-        onOk={handleConfirmUseAnyway}
-        onCancel={handleCancelSelection}
-        okText="仍要使用"
-        cancelText="重新选择"
-        okButtonProps={{ danger: true }}
-      >
-        {(() => {
-          const pendingMaterial = pendingVoiceId
-            ? materials.find((m) => m.id === pendingVoiceId)
-            : null
-          return (
-            <p>
-              该配音时长（
-              <strong>
-                {pendingMaterial ? formatDuration(getDuration(pendingMaterial)) : "--"}
-              </strong>
-              ）短于视频总时长（
-              <strong>{formatDuration(totalVideoDuration)}</strong>
-              ），播放时配音可能提前结束，建议选择更长的配音素材。
-            </p>
-          )
-        })()}
-      </Modal>
     </div>
   )
 }

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

@@ -1,9 +1,16 @@
-import React from "react"
+/**
+ * Step 5 选择封面（Issue #1677 批量生成改造）
+ * - 单视频：保留原封面流程（自动生成/封面设置模板/封面预览）
+ * - N 个视频：N 张封面卡片，每张带对应视频标题，可逐个自动生成或上传
+ */
+import React, { useRef } from "react"
 import { Modal, Spin } from "antd"
+import { LoadingOutlined } from "@ant-design/icons"
 import type { CoverConfig } from "../types/cover"
 import type { GeneratedVideo } from "@/api/template-editor"
 import type { TitleSettings } from "../types"
 import { useStep6Cover } from "../hooks/useStep6Cover"
+import { useBatchCovers } from "../hooks/useBatchCovers"
 import Button from "@/components/ui/Button"
 import CoverSettingsModal from "./cover-settings/CoverSettingsModal"
 import CoverEditorModal from "./cover-settings/CoverEditorModal"
@@ -17,6 +24,15 @@ interface Step6CoverSettingsProps {
   titleSettings?: TitleSettings
   /** 确认生成步骤产出的最终视频列表 */
   generatedVideos: GeneratedVideo[]
+  /* ── 批量生成（#1677）── */
+  previewCount?: number
+  /** 每个变体的标题文字 */
+  previewTitles?: string[]
+  /** 每个变体的封面URL（按变体索引） */
+  previewCovers?: string[]
+  onPreviewCoversChange?: (urls: string[]) => void
+  /** 勾选的变体索引（批量封面按此顺序展示，与最终成片顺序一致） */
+  selectedVariantIndexes?: number[]
 }
 
 const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
@@ -46,13 +62,173 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
     generatedVideos: props.generatedVideos,
   })
 
-  const handleAutoGenerate = () => {
-    generateAutoCover()
-  }
+  const previewCount = props.previewCount || 1
+  const isBatch = previewCount > 1
+  const previewTitles = props.previewTitles || []
+  const previewCovers = props.previewCovers || []
+  /** 卡片展示的变体索引顺序：批量=勾选顺序（与成片顺序一致），单视频=[0] */
+  const cardIndexes =
+    isBatch && props.selectedVariantIndexes?.length
+      ? props.selectedVariantIndexes
+      : Array.from({ length: previewCount }, (_, i) => i)
+  const uploadInputRef = useRef<HTMLInputElement>(null)
+  const uploadTargetRef = useRef<number>(0)
+
+  const completedVideos = props.generatedVideos.filter((v) => v.status === "completed")
+  const batchTitles = cardIndexes.map((vi) => previewTitles[vi] || "")
+  const batchCoversList = cardIndexes.map((vi) => previewCovers[vi] || "")
+  const batchCovers = useBatchCovers({
+    selectedTemplate: props.selectedTemplate || "",
+    generatedVideos: props.generatedVideos,
+    titles: batchTitles,
+    titleStyle: {
+      font: props.titleSettings?.font || "思源黑体",
+      size: props.titleSettings?.size || 28,
+      color: props.titleSettings?.color || "#ffffff",
+      position: props.titleSettings?.position || "top",
+      bold: props.titleSettings?.bold ?? true,
+      stroke: props.titleSettings?.stroke ?? true,
+      shadow: props.titleSettings?.shadow ?? false,
+    },
+    covers: batchCoversList,
+    onCoversChange: (urls) => {
+      // 按卡片顺序写回对应变体索引
+      const next = [...(props.previewCovers || [])]
+      cardIndexes.forEach((vi, cardPos) => {
+        next[vi] = urls[cardPos] || ""
+      })
+      props.onPreviewCoversChange?.(next)
+    },
+  })
 
-  // 预览图：优先 thumbnail_url，其次 upload_url
   const previewUrl = coverSettings.thumbnail_url || coverSettings.upload_url
 
+  const handleUploadClick = (variantIndex: number) => {
+    uploadTargetRef.current = variantIndex
+    uploadInputRef.current?.click()
+  }
+
+  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0]
+    e.target.value = ""
+    if (file) {
+      const variantIndex = uploadTargetRef.current
+      const cardPos = cardIndexes.indexOf(variantIndex)
+      if (cardPos >= 0) void batchCovers.uploadOne(cardPos, file)
+    }
+  }
+
+  /* ── 批量封面 ── */
+  if (isBatch) {
+    return (
+      <div className="xx-form-section">
+        <h3>🖼️ 选择封面</h3>
+
+        <div
+          style={{
+            padding: "10px 14px",
+            background: "rgba(16, 185, 129, 0.08)",
+            borderRadius: 8,
+            marginBottom: 16,
+            border: "1px solid rgba(16, 185, 129, 0.15)",
+            fontSize: 13,
+            color: "var(--text-secondary, #666)",
+          }}
+        >
+          🎬 共 {completedVideos.length} 个成片，封面将从对应成片中智能选帧并叠加该视频的标题
+        </div>
+
+        <div style={{ display: "flex", gap: 8, marginBottom: 16 }}>
+          <Button
+            buttonType="primary"
+            onClick={() => void batchCovers.generateAll()}
+            disabled={completedVideos.length === 0 || batchCovers.loadingIndex !== null}
+          >
+            ✨ 一键全部自动生成
+          </Button>
+        </div>
+
+        <div className="xx-cover-grid">
+          {cardIndexes.map((variantIndex, cardPos) => {
+            const url = batchCoversList[cardPos]
+            const isLoading = batchCovers.loadingIndex === cardPos
+            const isUploading = batchCovers.uploadingIndex === cardPos
+            const title = batchTitles[cardPos]
+            return (
+              <div className="xx-cover-card" key={variantIndex}>
+                <div className="xx-cover-card-title">视频 {variantIndex + 1}</div>
+                <div className="xx-cover-card-box">
+                  {isLoading || isUploading ? (
+                    <div className="xx-cover-card-loading">
+                      <Spin indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />} />
+                      <span>{isLoading ? "AI 选帧中…" : "上传中…"}</span>
+                    </div>
+                  ) : url ? (
+                    <img
+                      src={url}
+                      alt={`视频${variantIndex + 1}封面`}
+                      className="xx-cover-card-img"
+                    />
+                  ) : (
+                    <div className="xx-cover-card-placeholder">
+                      <span style={{ fontSize: 26 }}>🖼️</span>
+                      <span style={{ fontSize: 12 }}>未设置封面</span>
+                    </div>
+                  )}
+                  <div className="xx-cover-card-ratio">9:16</div>
+                </div>
+                {title && (
+                  <div
+                    style={{
+                      fontSize: 12,
+                      color: "var(--text-secondary, #666)",
+                      marginTop: 6,
+                      overflow: "hidden",
+                      textOverflow: "ellipsis",
+                      whiteSpace: "nowrap",
+                    }}
+                    title={title}
+                  >
+                    标题：{title}
+                  </div>
+                )}
+                <div style={{ display: "flex", gap: 6, marginTop: 8 }}>
+                  <button
+                    type="button"
+                    className="xx-btn xx-btn-primary xx-btn-sm"
+                    style={{ flex: 1, fontSize: 12, padding: "4px 8px" }}
+                    onClick={() => void batchCovers.generateOne(cardPos)}
+                    disabled={isLoading || isUploading}
+                  >
+                    {url ? "🔄 重新生成" : "✨ 自动生成"}
+                  </button>
+                  <button
+                    type="button"
+                    className="xx-btn xx-btn-ghost xx-btn-sm"
+                    style={{ flex: 1, fontSize: 12, padding: "4px 8px" }}
+                    onClick={() => handleUploadClick(variantIndex)}
+                    disabled={isLoading || isUploading}
+                  >
+                    📤 上传
+                  </button>
+                </div>
+              </div>
+            )
+          })}
+        </div>
+
+        <input
+          ref={uploadInputRef}
+          type="file"
+          accept="image/*"
+          style={{ display: "none" }}
+          onChange={handleFileChange}
+        />
+      </div>
+    )
+  }
+
+  /* ── 单视频：原有流程保持不变 ── */
   return (
     <div className="xx-form-section">
       <h3>🖼️ 选择封面</h3>
@@ -75,7 +251,7 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
       )}
 
       <div className="xx-cover-actions">
-        <Button buttonType="primary" onClick={handleAutoGenerate} disabled={!finalVideo}>
+        <Button buttonType="primary" onClick={generateAutoCover} disabled={!finalVideo}>
           ✨ 自动生成封面
         </Button>
         <Button buttonType="ghost" onClick={() => setShowCoverSettings(true)}>

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

@@ -1,79 +0,0 @@
-/**
- * Step 7 确认生成组件
- */
-import React from "react"
-import type { EditingTemplate } from "@/api/editing-planner"
-import type { GeneratedVideo } from "@/api/template-editor"
-import type { CoverConfig } from "../types/cover"
-import type { VoiceClone } from "@/api/voice-clone"
-import type { PresetVoiceItem } from "@/api/voices"
-import { useStep7Generate } from "../hooks/useStep7Generate"
-import SummaryCard from "./step7-confirm/SummaryCard"
-import GenerationStatus from "./step7-confirm/GenerationStatus"
-
-interface Step7ConfirmGenerateProps {
-  templates: EditingTemplate[]
-  selectedTemplate: string
-  materialMode: "manual" | "auto"
-  selectedMaterials: string[]
-  smartSelectedIds: string[]
-  title: string
-  voiceMode: "preset" | "custom" | "clone"
-  selectedVoice: string
-  selectedClonedVoice: string
-  presetVoices: PresetVoiceItem[]
-  clonedVoices: VoiceClone[]
-  coverSettings: CoverConfig
-  generating: boolean
-  generated: boolean
-  generateError: string | null
-  progress: number
-  generatedVideos: GeneratedVideo[]
-  onRetry: () => void
-  onDismissError: () => void
-}
-
-const Step7ConfirmGenerate: React.FC<Step7ConfirmGenerateProps> = (props) => {
-  const {
-    templateName,
-    materialSummary,
-    title,
-    voiceName,
-    coverSummary,
-    generating,
-    generated,
-    generateError,
-    progress,
-    generatedVideos,
-    getGenerationPhase,
-    handleScrollToPreview,
-  } = useStep7Generate(props)
-
-  const { onRetry, onDismissError } = props
-
-  return (
-    <div className="xx-form-section">
-      <h3>✨ 确认生成</h3>
-      <SummaryCard
-        templateName={templateName}
-        materialSummary={materialSummary}
-        title={title}
-        voiceName={voiceName}
-        coverSummary={coverSummary}
-      />
-      <GenerationStatus
-        generating={generating}
-        generated={generated}
-        generateError={generateError}
-        progress={progress}
-        generatedVideos={generatedVideos}
-        getGenerationPhase={getGenerationPhase}
-        onScrollToPreview={handleScrollToPreview}
-        onRetry={onRetry}
-        onDismissError={onDismissError}
-      />
-    </div>
-  )
-}
-
-export default Step7ConfirmGenerate

apps/web/src/pages/generate/components/step7-confirm/SummaryCard.tsx

@@ -1,44 +0,0 @@
-import React from "react"
-
-interface SummaryCardProps {
-  templateName: string
-  materialSummary: string
-  title: string
-  voiceName: string
-  coverSummary: string
-}
-
-const SummaryCard: React.FC<SummaryCardProps> = ({
-  templateName,
-  materialSummary,
-  title,
-  voiceName,
-  coverSummary,
-}) => {
-  return (
-    <div className="xx-summary-card">
-      <div className="xx-summary-row">
-        <span className="xx-summary-label">模板</span>
-        <span className="xx-summary-value">{templateName}</span>
-      </div>
-      <div className="xx-summary-row">
-        <span className="xx-summary-label">素材</span>
-        <span className="xx-summary-value">{materialSummary}</span>
-      </div>
-      <div className="xx-summary-row">
-        <span className="xx-summary-label">标题</span>
-        <span className="xx-summary-value">{title || "未选择"}</span>
-      </div>
-      <div className="xx-summary-row">
-        <span className="xx-summary-label">配音</span>
-        <span className="xx-summary-value">{voiceName}</span>
-      </div>
-      <div className="xx-summary-row">
-        <span className="xx-summary-label">封面</span>
-        <span className="xx-summary-value">{coverSummary}</span>
-      </div>
-    </div>
-  )
-}
-
-export default SummaryCard

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

@@ -37,6 +37,10 @@ export const STEPS = [
   { key: 6, label: "选择封面" },
 ]
 
+/* ── 批量生成限制 ── */
+export const MAX_PREVIEW_COUNT = 10
+export const MIN_PREVIEW_COUNT = 1
+
 /* ── 标题位置选项 ── */
 export const POSITION_OPTIONS = [
   { value: "top", label: "顶部" },

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

@@ -2900,3 +2900,545 @@
   color: rgba(255, 255, 255, 0.85);
   white-space: nowrap;
 }
+
+/* ================================================================
+   Issue #1677 多视频批量生成
+   ================================================================ */
+
+/* ── Step4 布局对调：左侧预览大区域，右侧标题边栏 ── */
+.xx-generate-layout.step4-layout {
+  grid-template-columns: 1fr 380px;
+  align-items: start;
+}
+
+.xx-generate-preview-col {
+  min-width: 0;
+  position: sticky;
+  top: 16px;
+}
+
+.xx-generate-preview-col .xx-form-section {
+  margin: 0;
+}
+
+.xx-title-sidebar {
+  max-height: calc(100vh - 140px);
+  overflow-y: auto;
+}
+
+/* ── 数量选择弹窗 ── */
+.xx-modal-mask {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.45);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+}
+
+.xx-modal-box {
+  background: var(--bg-primary, #fff);
+  border-radius: 16px;
+  padding: 28px;
+  width: 420px;
+  max-width: calc(100vw - 32px);
+  box-shadow: 0 12px 48px rgba(0, 0, 0, 0.18);
+}
+
+.xx-count-selector {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 16px;
+  margin: 8px 0 16px;
+}
+
+.xx-count-btn {
+  width: 44px;
+  height: 44px;
+  border-radius: 50%;
+  border: 1px solid var(--border-primary, #d9d9d9);
+  background: var(--bg-secondary, #f5f5f5);
+  font-size: 22px;
+  line-height: 1;
+  cursor: pointer;
+  color: var(--text-primary, #333);
+  transition: all 0.15s;
+}
+
+.xx-count-btn:hover:not(:disabled) {
+  border-color: #1677ff;
+  color: #1677ff;
+}
+
+.xx-count-btn:disabled {
+  opacity: 0.4;
+  cursor: not-allowed;
+}
+
+.xx-count-input {
+  width: 88px;
+  height: 52px;
+  text-align: center;
+  font-size: 26px;
+  font-weight: 700;
+  border: 2px solid var(--border-primary, #d9d9d9);
+  border-radius: 12px;
+  color: var(--text-primary, #333);
+  background: var(--bg-primary, #fff);
+}
+
+.xx-count-input:focus {
+  outline: none;
+  border-color: #1677ff;
+}
+
+/* 隐藏 number input 上下箭头 */
+.xx-count-input::-webkit-outer-spin-button,
+.xx-count-input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.xx-count-input {
+  -moz-appearance: textfield;
+  appearance: textfield;
+}
+
+.xx-count-quick {
+  display: flex;
+  gap: 8px;
+  justify-content: center;
+  margin-bottom: 20px;
+}
+
+.xx-count-chip {
+  padding: 6px 16px;
+  border-radius: 999px;
+  border: 1px solid var(--border-primary, #d9d9d9);
+  background: var(--bg-primary, #fff);
+  font-size: 13px;
+  cursor: pointer;
+  color: var(--text-secondary, #666);
+  transition: all 0.15s;
+}
+
+.xx-count-chip:hover {
+  border-color: #1677ff;
+  color: #1677ff;
+}
+
+.xx-count-chip.active {
+  background: #1677ff;
+  border-color: #1677ff;
+  color: #fff;
+}
+
+.xx-count-actions {
+  display: flex;
+  gap: 12px;
+}
+
+.xx-count-actions .xx-btn {
+  flex: 1;
+}
+
+/* ── 批量预览网格 ── */
+.xx-variant-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+  gap: 16px;
+}
+
+.xx-variant-card {
+  position: relative;
+  border: 2px solid var(--border-primary, #e8e8e8);
+  border-radius: 12px;
+  padding: 10px;
+  background: var(--bg-primary, #fff);
+  cursor: pointer;
+  transition: all 0.18s;
+}
+
+.xx-variant-card:hover {
+  border-color: #91caff;
+}
+
+.xx-variant-card.selected {
+  border-color: #1677ff;
+  box-shadow: 0 0 0 3px rgba(22, 119, 255, 0.12);
+}
+
+.xx-variant-card.failed {
+  border-color: #ffccc7;
+  cursor: default;
+}
+
+.xx-variant-check {
+  position: absolute;
+  top: 14px;
+  left: 14px;
+  z-index: 3;
+  width: 26px;
+  height: 26px;
+  border-radius: 50%;
+  border: 2px solid #fff;
+  background: rgba(0, 0, 0, 0.35);
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  font-weight: 700;
+}
+
+.xx-variant-check.checked {
+  background: #1677ff;
+  border-color: #1677ff;
+}
+
+.xx-variant-index {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--text-secondary, #666);
+  margin-bottom: 8px;
+}
+
+.xx-variant-video-wrap {
+  position: relative;
+  border-radius: 8px;
+  overflow: hidden;
+  background: #000;
+  aspect-ratio: 9 / 16;
+  max-height: 420px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.xx-variant-loading,
+.xx-variant-failed {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 10px;
+  color: var(--text-secondary, #999);
+  font-size: 12px;
+  padding: 16px;
+  text-align: center;
+}
+
+.xx-variant-progress {
+  width: 120px;
+  height: 4px;
+  border-radius: 2px;
+  background: rgba(255, 255, 255, 0.25);
+  overflow: hidden;
+}
+
+.xx-variant-progress-bar {
+  height: 100%;
+  background: #1677ff;
+  border-radius: 2px;
+  transition: width 0.4s;
+}
+
+.xx-variant-progress-text {
+  color: rgba(255, 255, 255, 0.85);
+  font-size: 12px;
+}
+
+.xx-variant-title-overlay {
+  position: absolute;
+  left: 8%;
+  right: 8%;
+  text-align: center;
+  font-weight: 700;
+  line-height: 1.3;
+  pointer-events: none;
+  text-shadow: 0 1px 3px rgba(0, 0, 0, 0.7);
+  word-break: break-all;
+}
+
+.xx-variant-title-overlay.pos-top {
+  top: 8%;
+}
+
+.xx-variant-title-overlay.pos-center {
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.xx-variant-title-overlay.pos-bottom,
+.xx-variant-title-overlay.pos-custom {
+  bottom: 10%;
+}
+
+.xx-variant-footer {
+  min-height: 22px;
+  margin-top: 8px;
+  font-size: 12px;
+}
+
+.xx-variant-ready-tag {
+  color: #52c41a;
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.xx-variant-skip-tag {
+  color: var(--text-tertiary, #999);
+}
+
+/* ── 批量配音列表 ── */
+.xx-per-voice-list {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.xx-per-voice-list .xx-form-section {
+  margin: 0;
+}
+
+/* ── 批量封面网格 ── */
+.xx-cover-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+  gap: 16px;
+}
+
+.xx-cover-card {
+  border: 1px solid var(--border-primary, #e8e8e8);
+  border-radius: 12px;
+  padding: 10px;
+  background: var(--bg-primary, #fff);
+}
+
+.xx-cover-card-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--text-secondary, #666);
+  margin-bottom: 8px;
+}
+
+.xx-cover-card-box {
+  position: relative;
+  border-radius: 8px;
+  overflow: hidden;
+  background: #000;
+  aspect-ratio: 9 / 16;
+  max-height: 300px;
+}
+
+.xx-cover-card-img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  display: block;
+}
+
+.xx-cover-card-placeholder,
+.xx-cover-card-loading {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  color: var(--text-tertiary, #999);
+  background: var(--bg-secondary, #f7f7f7);
+  font-size: 13px;
+}
+
+.xx-cover-card-ratio {
+  position: absolute;
+  right: 6px;
+  bottom: 6px;
+  background: rgba(0, 0, 0, 0.55);
+  color: #fff;
+  font-size: 10px;
+  padding: 1px 6px;
+  border-radius: 4px;
+}
+
+/* ── 响应式：窄屏 Step4 回退单列 ── */
+@media (max-width: 960px) {
+  .xx-generate-layout.step4-layout {
+    grid-template-columns: 1fr;
+  }
+
+  .xx-generate-preview-col {
+    position: static;
+  }
+
+  .xx-title-sidebar {
+    max-height: none;
+  }
+}
+
+/* ============================================================
+   批量前端 Canvas 预览网格（Issue #1677 修正：纯前端实时预览）
+   ============================================================ */
+.xx-canvas-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 16px;
+}
+
+.xx-canvas-grid-card {
+  border: 2px solid var(--border-primary, #e2e8f0);
+  border-radius: 12px;
+  overflow: hidden;
+  background: #000;
+  transition: border-color 0.2s ease;
+  min-width: 0;
+}
+
+.xx-canvas-grid-card.selected {
+  border-color: var(--primary-color, #1677ff);
+  box-shadow: 0 0 0 2px rgba(22, 119, 255, 0.15);
+}
+
+.xx-canvas-grid-card-bar {
+  position: relative;
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  padding: 6px 10px;
+  background: var(--bg-surface, #fff);
+  border-bottom: 1px solid var(--border-primary, #e2e8f0);
+}
+
+.xx-canvas-grid-check {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 13px;
+  font-weight: 500;
+  color: var(--text-primary, #1a1a1a);
+  cursor: pointer;
+  user-select: none;
+}
+
+.xx-canvas-grid-check input[type="checkbox"] {
+  width: 15px;
+  height: 15px;
+  cursor: pointer;
+  accent-color: var(--primary-color, #1677ff);
+}
+
+/* ============================================================
+   批量标题：AI 一键生成行（Issue #1677）
+   ============================================================ */
+.xx-batch-ai-row {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8px;
+  padding: 10px 12px;
+  margin-bottom: 12px;
+  background: var(--bg-secondary, #f7f8fa);
+  border: 1px dashed var(--border-primary, #d9d9d9);
+  border-radius: 10px;
+}
+
+.xx-batch-ai-row .xx-form-field {
+  margin: 0;
+  flex: 1;
+  min-width: 140px;
+}
+
+.xx-batch-titles {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+/* ============================================================
+   第5步确认生成：批量渲染进度网格（Issue #1677）
+   ============================================================ */
+.xx-batch-gen-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 16px;
+}
+
+.xx-batch-gen-card {
+  border: 1px solid var(--border-primary, #e2e8f0);
+  border-radius: 12px;
+  padding: 14px;
+  background: var(--bg-surface, #fff);
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  min-width: 0;
+}
+
+.xx-batch-gen-card.status-completed {
+  border-color: rgba(82, 196, 26, 0.4);
+  background: rgba(82, 196, 26, 0.04);
+}
+
+.xx-batch-gen-card.status-failed {
+  border-color: rgba(239, 68, 68, 0.4);
+  background: rgba(239, 68, 68, 0.04);
+}
+
+.xx-batch-gen-card-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+}
+
+.xx-batch-gen-card-title {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--text-primary, #1a1a1a);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.xx-batch-gen-card-body {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.xx-batch-gen-card-pct {
+  font-size: 13px;
+  color: var(--text-secondary, #666);
+  text-align: right;
+}
+
+.xx-batch-gen-card-done {
+  font-size: 13px;
+  color: var(--success-color, #52c41a);
+  padding: 8px 0;
+}
+
+.xx-batch-gen-card-failed {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  align-items: flex-start;
+}
+
+.xx-batch-gen-card-err {
+  font-size: 13px;
+  color: var(--error-color, #ef4444);
+  line-height: 1.5;
+  word-break: break-word;
+}
+
+/* ── 响应式：窄屏批量网格回退单列 ── */
+@media (max-width: 960px) {
+  .xx-canvas-grid,
+  .xx-batch-gen-grid {
+    grid-template-columns: 1fr;
+  }
+}

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

@@ -29,6 +29,19 @@ export interface UseGenerateVideoProps {
   }
   /** 生成成功后的回调（用于清除持久化的 previewTaskId 等状态） */
   onGenerationSuccess?: () => void
+  /* ── 批量生成（#1677）── */
+  /** 生成数量（1=单条旧逻辑，>1=批量） */
+  previewCount?: number
+  /** 每个变体的标题文字（长度=count 时各自独立） */
+  variantTitles?: string[]
+  /** 独立配音模式下每个变体的配音ID（空数组=共用 selectedVoice） */
+  variantVoiceLibraryIds?: string[]
+  /** 是否独立配音 */
+  voiceModePerVideo?: boolean
+  /** 每个变体的封面URL（空数组=回退 coverSettings） */
+  variantCoverUrls?: string[]
+  /** 勾选要生成的变体索引（批量模式） */
+  selectedVariantIndexes?: number[]
 }
 
 /** 生成阶段 */
@@ -44,7 +57,7 @@ export interface UseGenerateVideoResult {
   generated: boolean
   generateError: string | null
   generatedVideos: GeneratedVideo[]
-  generate: () => Promise<void>
+  generate: () => Promise<boolean>
   retry: () => void
   dismissError: () => void
   download: () => Promise<void>

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

@@ -1,14 +1,28 @@
-import { useRef, useCallback } from "react"
+import { useRef, useCallback, useState } from "react"
 import { message } from "antd"
 import axios from "axios"
-import { getGenerationTask } from "@/api/tasks/tasks"
+import { getGenerationTask, retryTask as retryGenerationTaskApi } from "@/api/tasks/tasks"
 import { getGenerationTaskResults } from "@/api/template-editor"
 import { safeExtractError } from "./errorUtils"
 
+/** 批量生成时单个任务的实时状态（Issue #1677 第5步确认生成页） */
+export interface BatchTaskState {
+  taskId: string
+  /** 变体序号（0-based，与标题/封面数组对齐） */
+  variantIndex: number
+  status: "running" | "completed" | "failed"
+  progress: number
+  error: string | null
+  /** 完成后的成片视频 */
+  videos: unknown[]
+}
+
 interface UseGenerationPollingOptions {
   onProgress: (progress: number) => void
   onComplete: (videos: unknown[]) => void
   onFailed: (errorMsg: string) => void
+  /** 批量：单任务状态变化（第5步逐卡片展示） */
+  onBatchTaskUpdate?: (taskId: string, patch: Partial<BatchTaskState>) => void
 }
 
 /** 最大连续错误次数（仅对可重试错误），超过后终止轮询 */
@@ -17,31 +31,30 @@ const MAX_RETRYABLE_ERRORS = 10
 const MAX_RESULTS_RETRIES = 3
 
 /**
- * 生成状态轮询 Hook（v2 — 改用 /generation/tasks/{task_id}）
+ * 生成状态轮询 Hook（v4 — 批量任务独立状态 + 单任务重试）
  *
- * 旧版轮询 GET /templates/{id}/editor/generation-status 依赖 plan 维度状态，
- * 在编辑流程数据链路断裂时拿不到 task_id。新版直接使用 POST /generation/tasks
- * 返回的 task_id 轮询任务详情，不再依赖 plan。
- *
- * 错误处理：
- * - 4xx（尤其 404）视为不可恢复，立即 onFailed，不再重试
- * - 5xx / 网络错误重试，最多连续 MAX_RETRYABLE_ERRORS 次
- * - 任务完成后获取结果失败会重试 MAX_RESULTS_RETRIES 次，仍失败则 onFailed
+ * startPolling(taskId) 轮询单个任务；
+ * startPollingBatch(tasks) 并行轮询 N 个任务：
+ * - 每个任务独立进度/状态/失败，通过 onBatchTaskUpdate 实时回传
+ * - 全部成功才 onComplete（聚合视频按变体顺序）；任一失败不影响其他任务继续
+ * - retryTask(taskId) 单独重试失败任务（重新轮询，后端任务仍在跑则直接接续）
  */
-export const useGenerationPolling = ({
+export function useGenerationPolling({
   onProgress,
   onComplete,
   onFailed,
-}: UseGenerationPollingOptions) => {
-  const progressTimer = useRef<ReturnType<typeof setTimeout>>()
+  onBatchTaskUpdate,
+}: UseGenerationPollingOptions) {
+  const progressTimer = useRef<ReturnType<typeof setTimeout>[]>([])
   const cancelledRef = useRef(false)
+  /** 批量任务上下文：taskId → 变体序号 */
+  const batchContextRef = useRef<Map<string, number>>(new Map())
+  const [, forceTick] = useState(0)
 
   const clearTimer = useCallback(() => {
     cancelledRef.current = true
-    if (progressTimer.current) {
-      clearTimeout(progressTimer.current)
-      progressTimer.current = undefined
-    }
+    progressTimer.current.forEach((t) => clearTimeout(t))
+    progressTimer.current = []
   }, [])
 
   /** 任务完成后拉取结果列表，带重试 */
@@ -62,85 +75,237 @@ export const useGenerationPolling = ({
     [],
   )
 
+  const extractErrorMessage = (pollErr: unknown, status: number): string => {
+    const msg =
+      (axios.isAxiosError(pollErr) &&
+        (pollErr.response?.data as { detail?: string; message?: string } | undefined)?.detail) ||
+      (axios.isAxiosError(pollErr) &&
+        (pollErr.response?.data as { detail?: string; message?: string } | undefined)?.message) ||
+      `查询任务失败 (${status})`
+    return safeExtractError(msg)
+  }
+
+  /**
+   * 轮询单个任务。
+   * - isBatch=true：状态变化通过 onBatchTaskUpdate 回传，不触发整体 onProgress/onComplete
+   * - resolve(videos) 成功；reject(Error) 失败
+   */
+  const pollSingleTask = useCallback(
+    (
+      taskId: string,
+      runId: number,
+      callbacks?: {
+        onTaskProgress?: (pct: number) => void
+        onTaskCompleted?: (videos: unknown[]) => void
+        onTaskFailed?: (msg: string) => void
+      },
+    ): Promise<unknown[]> => {
+      return new Promise((resolve, reject) => {
+        let consecutiveErrors = 0
+        let done = false
+
+        const poll = async () => {
+          if (cancelledRef.current || done) return
+          try {
+            const task = await getGenerationTask(taskId)
+            if (cancelledRef.current || done) return
+            consecutiveErrors = 0
+
+            if (task.status === "completed") {
+              done = true
+              const videos = await fetchResultsWithRetry(taskId)
+              if (cancelledRef.current) return
+              if (videos === null) {
+                const msg = "视频已生成，但获取结果列表失败，请稍后在任务列表查看"
+                callbacks?.onTaskFailed?.(msg)
+                reject(new Error(msg))
+                return
+              }
+              callbacks?.onTaskCompleted?.(videos)
+              resolve(videos)
+              return
+            }
+
+            if (task.status === "failed" || task.status === "cancelled") {
+              done = true
+              const rawMsg =
+                task.error_info?.error_message ||
+                task.error_message ||
+                (task.status === "cancelled" ? "任务已取消" : "视频生成失败，请联系管理员或重试")
+              const msg = safeExtractError(rawMsg)
+              callbacks?.onTaskFailed?.(msg)
+              reject(new Error(msg))
+              return
+            }
+
+            const pct = Math.max(0, Math.min(99, Math.round(Number(task.progress) || 0)))
+            callbacks?.onTaskProgress?.(pct)
+            if (!callbacks && runId === 0) {
+              onProgress(pct)
+            }
+            const timer = setTimeout(poll, 2000)
+            progressTimer.current.push(timer)
+          } catch (pollErr) {
+            if (cancelledRef.current || done) return
+            console.error("[轮询出错] taskId:", taskId, pollErr)
+            const status = axios.isAxiosError(pollErr) ? pollErr.response?.status : undefined
+            if (status && status >= 400 && status < 500) {
+              done = true
+              const msg = extractErrorMessage(pollErr, status)
+              callbacks?.onTaskFailed?.(msg)
+              reject(new Error(msg))
+              return
+            }
+            consecutiveErrors += 1
+            if (consecutiveErrors >= MAX_RETRYABLE_ERRORS) {
+              done = true
+              const msg = "任务状态查询连续失败，请稍后在任务列表查看结果"
+              callbacks?.onTaskFailed?.(msg)
+              reject(new Error(msg))
+              return
+            }
+            const timer = setTimeout(poll, 3000)
+            progressTimer.current.push(timer)
+          }
+        }
+
+        const timer = setTimeout(poll, 1500)
+        progressTimer.current.push(timer)
+      })
+    },
+    [onProgress, fetchResultsWithRetry],
+  )
+
+  /** 单任务轮询（单视频，兼容旧调用） */
   const startPolling = useCallback(
     (taskId: string) => {
       cancelledRef.current = false
-      let consecutiveErrors = 0
-
-      const poll = async () => {
-        if (cancelledRef.current) return
-        try {
-          const task = await getGenerationTask(taskId)
-          consecutiveErrors = 0
-
-          if (task.status === "completed") {
-            onProgress(100)
-            const videos = await fetchResultsWithRetry(taskId)
-            if (cancelledRef.current) return
-            if (videos === null) {
-              const errorMsg = "视频已生成，但获取结果列表失败，请稍后在任务列表查看"
-              console.error("[生成结果获取失败] taskId:", taskId)
-              onFailed(errorMsg)
-              message.error(errorMsg)
-              return
-            }
-            onComplete(videos)
-            message.success("视频生成完成！")
-            return
-          }
-
-          if (task.status === "failed" || task.status === "cancelled") {
-            const rawMsg =
-              task.error_info?.error_message ||
-              task.error_message ||
-              (task.status === "cancelled" ? "任务已取消" : "视频生成失败，请联系管理员或重试")
-            const errorMsg = safeExtractError(rawMsg)
-            console.error("[生成失败] taskId:", taskId, "响应:", task)
-            onFailed(errorMsg)
-            message.error(errorMsg)
-            return
-          }
-
-          // pending / waiting / running — 继续轮询
-          const pct = Math.max(0, Math.min(99, Math.round(Number(task.progress) || 0)))
-          onProgress(pct)
-          progressTimer.current = setTimeout(poll, 2000)
-        } catch (pollErr) {
+      batchContextRef.current.clear()
+      pollSingleTask(taskId, 0)
+        .then((videos) => {
           if (cancelledRef.current) return
-          console.error("[轮询出错] taskId:", taskId, pollErr)
+          onProgress(100)
+          onComplete(videos)
+          message.success("视频生成完成！")
+        })
+        .catch((err: Error) => {
+          if (cancelledRef.current) return
+          console.error("[生成失败] taskId:", taskId, err.message)
+          onFailed(err.message)
+          message.error(err.message)
+        })
+    },
+    [pollSingleTask, onProgress, onComplete, onFailed],
+  )
 
-          // 4xx 不可恢复，立即失败
-          const status = axios.isAxiosError(pollErr) ? pollErr.response?.status : undefined
-          if (status && status >= 400 && status < 500) {
-            const msg =
-              (axios.isAxiosError(pollErr) &&
-                (pollErr.response?.data as { detail?: string; message?: string } | undefined)
-                  ?.detail) ||
-              (axios.isAxiosError(pollErr) &&
-                (pollErr.response?.data as { detail?: string; message?: string } | undefined)
-                  ?.message) ||
-              `查询任务失败 (${status})`
-            const errorMsg = safeExtractError(msg)
-            onFailed(errorMsg)
-            message.error(errorMsg)
-            return
-          }
+  /**
+   * 批量多任务轮询：
+   * - 每个任务独立进度/状态回传 onBatchTaskUpdate
+   * * 全部完成后按变体顺序聚合视频 onComplete
+   * - 部分失败：整体不 onFailed（第5步逐卡片展示失败+重试按钮）；全部失败才 onFailed
+   */
+  const startPollingBatch = useCallback(
+    (tasks: { taskId: string; variantIndex: number }[]) => {
+      cancelledRef.current = false
+      const runId = Date.now()
+      const progressMap = new Map<string, number>()
+      const resultMap = new Map<string, unknown[]>()
+      const failureMap = new Map<string, string>()
+      batchContextRef.current = new Map(tasks.map((t) => [t.taskId, t.variantIndex]))
 
-          consecutiveErrors += 1
-          if (consecutiveErrors >= MAX_RETRYABLE_ERRORS) {
-            const errorMsg = "任务状态查询连续失败，请稍后在任务列表查看结果"
-            onFailed(errorMsg)
-            message.error(errorMsg)
-            return
-          }
-          progressTimer.current = setTimeout(poll, 3000)
+      const reportAggregateProgress = () => {
+        if (cancelledRef.current) return
+        const values = tasks.map((t) => progressMap.get(t.taskId) ?? 0)
+        const avg = Math.round(values.reduce((a, b) => a + b, 0) / Math.max(values.length, 1))
+        onProgress(Math.min(avg, 99))
+      }
+
+      const checkAllSettled = () => {
+        if (resultMap.size + failureMap.size < tasks.length) return
+        if (resultMap.size === tasks.length) {
+          onProgress(100)
+          const ordered = tasks.map((t) => resultMap.get(t.taskId) || []).flat()
+          onComplete(ordered)
+          message.success(`全部 ${tasks.length} 个视频生成完成！`)
+        } else if (resultMap.size > 0) {
+          // 部分失败：成功的视频聚合进成片列表（可进封面），失败卡片带重试按钮
+          onProgress(100)
+          const ordered = tasks
+            .filter((t) => resultMap.has(t.taskId))
+            .map((t) => resultMap.get(t.taskId) || [])
+            .flat()
+          onComplete(ordered)
+          message.warning(
+            `${failureMap.size} 个视频生成失败，可点击卡片上的「重试此视频」，成功的视频可先进入下一步`,
+          )
+        } else {
+          const firstMsg = failureMap.get(tasks[0].taskId) || "全部视频生成失败"
+          onFailed(firstMsg)
         }
       }
 
-      progressTimer.current = setTimeout(poll, 1500)
+      tasks.forEach(({ taskId, variantIndex }) => {
+        onBatchTaskUpdate?.(taskId, {
+          taskId,
+          variantIndex,
+          status: "running",
+          progress: 0,
+          error: null,
+          videos: [],
+        })
+        pollSingleTask(taskId, runId, {
+          onTaskProgress: (pct) => {
+            progressMap.set(taskId, pct)
+            onBatchTaskUpdate?.(taskId, { status: "running", progress: pct })
+            reportAggregateProgress()
+          },
+          onTaskCompleted: (videos) => {
+            progressMap.set(taskId, 100)
+            resultMap.set(taskId, videos)
+            onBatchTaskUpdate?.(taskId, { status: "completed", progress: 100, videos })
+            reportAggregateProgress()
+            checkAllSettled()
+          },
+          onTaskFailed: (msg) => {
+            failureMap.set(taskId, msg)
+            onBatchTaskUpdate?.(taskId, { status: "failed", error: msg })
+            checkAllSettled()
+          },
+        }).catch(() => {
+          // 失败已在 onTaskFailed 处理，这里吞掉 Promise rejection
+        })
+      })
     },
-    [onProgress, onComplete, onFailed, fetchResultsWithRetry],
+    [pollSingleTask, onProgress, onComplete, onFailed, onBatchTaskUpdate],
   )
 
-  return { startPolling, clearTimer }
+  /** 单独重试失败任务（第5步卡片「重试此视频」）：先调后端重试接口，再轮询 */
+  const retryTask = useCallback(
+    async (taskId: string) => {
+      if (cancelledRef.current) cancelledRef.current = false
+      const variantIndex = batchContextRef.current.get(taskId) ?? 0
+      onBatchTaskUpdate?.(taskId, { status: "running", progress: 0, error: null, videos: [] })
+      try {
+        await retryGenerationTaskApi(taskId)
+      } catch (err) {
+        // 后端不支持重试或任务不可重试：直接重新轮询（任务可能已被自动恢复）
+        console.warn("[重试任务接口调用失败，改为直接轮询]", err)
+      }
+      pollSingleTask(taskId, Date.now(), {
+        onTaskProgress: (pct) => onBatchTaskUpdate?.(taskId, { status: "running", progress: pct }),
+        onTaskCompleted: (videos) => {
+          onBatchTaskUpdate?.(taskId, { status: "completed", progress: 100, videos })
+          message.success(`视频 ${variantIndex + 1} 重试成功`)
+        },
+        onTaskFailed: (msg) => onBatchTaskUpdate?.(taskId, { status: "failed", error: msg }),
+      }).catch(() => {
+        /* 失败已在回调处理 */
+      })
+      forceTick((n) => n + 1)
+      return variantIndex
+    },
+    [pollSingleTask, onBatchTaskUpdate],
+  )
+
+  return { startPolling, startPollingBatch, retryTask, clearTimer }
 }

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

@@ -0,0 +1,150 @@
+/**
+ * 批量封面 Hook（Issue #1677）
+ * N 个视频时：逐个自动生成封面（从对应成片抽帧 + 叠加对应标题）或上传自定义封面
+ */
+import { useCallback, useState } from "react"
+import { message } from "antd"
+import { generateCover } from "@/api/generation"
+import { uploadAssetDirect, getAssetLibraries } from "@/api/assets"
+import type { GeneratedVideo } from "@/api/template-editor"
+
+interface UseBatchCoversOptions {
+  selectedTemplate: string
+  generatedVideos: GeneratedVideo[]
+  /** 每个变体的标题文字 */
+  titles: string[]
+  /** 标题样式（全局共用） */
+  titleStyle: {
+    font: string
+    size: number
+    color: string
+    position: string
+    bold: boolean
+    stroke: boolean
+    shadow: boolean
+  }
+  covers: string[]
+  onCoversChange: (urls: string[]) => void
+}
+
+export function useBatchCovers({
+  selectedTemplate,
+  generatedVideos,
+  titles,
+  titleStyle,
+  covers,
+  onCoversChange,
+}: UseBatchCoversOptions) {
+  const [loadingIndex, setLoadingIndex] = useState<number | null>(null)
+  const [uploadingIndex, setUploadingIndex] = useState<number | null>(null)
+
+  const patchCover = useCallback(
+    (index: number, url: string) => {
+      const next = [...covers]
+      next[index] = url
+      onCoversChange(next)
+    },
+    [covers, onCoversChange],
+  )
+
+  /** 为第 index 个视频自动生成封面 */
+  const generateOne = useCallback(
+    async (index: number) => {
+      const finalVideos = generatedVideos.filter((v) => v.status === "completed")
+      const target = finalVideos[index] || generatedVideos[index]
+      if (!target) {
+        message.warning("该视频尚未生成完成")
+        return
+      }
+      setLoadingIndex(index)
+      try {
+        const titleText = titles[index] || ""
+        const response = await generateCover(selectedTemplate, {
+          generated_video_id: target.id,
+          video_url: target.file_url || target.download_url || "",
+          cover_type: "ai_frame",
+          ...(titleText
+            ? {
+                title_config: {
+                  text: titleText,
+                  font: titleStyle.font,
+                  font_size: titleStyle.size,
+                  font_color: titleStyle.color,
+                  position: titleStyle.position,
+                  bold: titleStyle.bold,
+                  stroke: titleStyle.stroke,
+                  shadow: titleStyle.shadow,
+                },
+              }
+            : {}),
+        })
+        const url = response.cover?.image_url || response.cover?.thumbnail_url || ""
+        if (url) {
+          patchCover(index, url)
+          message.success(`视频 ${index + 1} 封面生成成功`)
+        } else {
+          message.warning(`视频 ${index + 1} 封面生成未返回图片，请重试`)
+        }
+      } catch (err) {
+        console.error(`[封面] 视频 ${index + 1} 生成失败:`, err)
+        message.error(`视频 ${index + 1} 封面生成失败，请重试`)
+      } finally {
+        setLoadingIndex(null)
+      }
+    },
+    [generatedVideos, titles, titleStyle, selectedTemplate, patchCover],
+  )
+
+  /** 为第 index 个视频上传自定义封面 */
+  const uploadOne = useCallback(
+    async (index: number, file: File) => {
+      setUploadingIndex(index)
+      try {
+        const libs = await getAssetLibraries()
+        const imageLib = libs.find((l) => l.kind === "image") || libs[0]
+        if (!imageLib) {
+          message.error("未找到素材库，请先创建")
+          return
+        }
+        const result = await uploadAssetDirect({
+          file,
+          library_id: imageLib.id,
+        })
+        const url = result?.url || ""
+        if (url) {
+          patchCover(index, url)
+          message.success(`视频 ${index + 1} 封面已上传`)
+        } else {
+          message.warning("上传完成但未获取到图片URL，请重试")
+        }
+      } catch (err) {
+        console.error(`[封面] 视频 ${index + 1} 上传失败:`, err)
+        message.error("封面上传失败，请重试")
+      } finally {
+        setUploadingIndex(null)
+      }
+    },
+    [patchCover],
+  )
+
+  /** 一键全部自动生成（串行，避免队列限流） */
+  const generateAll = useCallback(async () => {
+    const finalVideos = generatedVideos.filter((v) => v.status === "completed")
+    for (let i = 0; i < finalVideos.length; i++) {
+      if (covers[i]) continue // 已有封面跳过
+      // eslint-disable-next-line no-await-in-loop
+      await generateOne(i)
+    }
+    message.success("全部封面已生成")
+  }, [generatedVideos, covers, generateOne])
+
+  return {
+    loadingIndex,
+    uploadingIndex,
+    generateOne,
+    uploadOne,
+    generateAll,
+  }
+}
+
+export default useBatchCovers

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

@@ -1,6 +1,6 @@
 /**
  * GeneratePage 表单状态管理
- * 集中管理 7 步向导的所有共享状态、API 加载、URL 参数解析
+ * 集中管理 5 步向导的所有共享状态、API 加载、URL 参数解析
  */
 import { useState } from "react"
 import { useSearchParams } from "react-router-dom"
@@ -100,6 +100,26 @@ export interface GenerateFormState {
   /** 从预览响应中提取的 source_edit_plan_id（供 fallback 路径使用） */
   storedSourceEditPlanId: string | null
   setStoredSourceEditPlanId: (planId: string | null) => void
+
+  /* ── 批量生成（Issue #1677）── */
+  /** 生成数量（1~10），1=单条旧逻辑 */
+  previewCount: number
+  setPreviewCount: (n: number) => void
+  /** 每个变体的标题文字，长度=previewCount；[0] 与 titleSettings.title 保持同步 */
+  previewTitles: string[]
+  setPreviewTitles: (titles: string[] | ((prev: string[]) => string[])) => void
+  /** false=所有视频共用一个配音；true=每个视频独立配音 */
+  voiceModePerVideo: boolean
+  setVoiceModePerVideo: (v: boolean) => void
+  /** 独立配音模式下每个变体的配音素材ID，长度=previewCount */
+  voiceLibraryIds: string[]
+  setVoiceLibraryIds: (ids: string[] | ((prev: string[]) => string[])) => void
+  /** 每个变体的封面URL（自动生成或上传），长度=previewCount，空串=未设置 */
+  previewCovers: string[]
+  setPreviewCovers: (urls: string[] | ((prev: string[]) => string[])) => void
+  /** 确认生成时勾选的变体索引 */
+  selectedVariantIds: number[]
+  setSelectedVariantIds: (ids: number[] | ((prev: number[]) => number[])) => void
 }
 
 export const useGenerateFormState = (): GenerateFormState => {
@@ -185,6 +205,14 @@ export const useGenerateFormState = (): GenerateFormState => {
     null,
   )
 
+  /* ── 批量生成状态（Issue #1677）── */
+  const [previewCount, setPreviewCount] = useState(1)
+  const [previewTitles, setPreviewTitles] = useState<string[]>([""])
+  const [voiceModePerVideo, setVoiceModePerVideo] = useState(false)
+  const [voiceLibraryIds, setVoiceLibraryIds] = useState<string[]>([""])
+  const [previewCovers, setPreviewCovers] = useState<string[]>([""])
+  const [selectedVariantIds, setSelectedVariantIds] = useState<number[]>([0])
+
   /* ── 从 URL / 编辑计划加载配置 ── */
   usePlanConfigLoader({
     editPlanId,
@@ -233,5 +261,17 @@ export const useGenerateFormState = (): GenerateFormState => {
     setPreviewTaskId,
     storedSourceEditPlanId,
     setStoredSourceEditPlanId,
+    previewCount,
+    setPreviewCount,
+    previewTitles,
+    setPreviewTitles,
+    voiceModePerVideo,
+    setVoiceModePerVideo,
+    voiceLibraryIds,
+    setVoiceLibraryIds,
+    previewCovers,
+    setPreviewCovers,
+    selectedVariantIds,
+    setSelectedVariantIds,
   }
 }

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

@@ -2,13 +2,13 @@
  * 视频生成 Hook
  * 封装视频生成的核心逻辑、状态管理、轮询等
  */
-import { useState, useCallback } from "react"
+import { useState, useCallback, useEffect } from "react"
 import { message } from "antd"
 import { type GeneratedVideo, getEditPlanClips, createClipsFromAssets } from "@/api/template-editor"
 import { createGenerationTask } from "@/api/tasks/tasks"
 import type { UseGenerateVideoProps } from "./generate-video/types"
 import { getGenerationPhase } from "./generate-video/phase"
-import { useGenerationPolling } from "./generate-video/useGenerationPolling"
+import { useGenerationPolling, type BatchTaskState } from "./generate-video/useGenerationPolling"
 import { validateGenerateInputs } from "./generate-video/buildPayload"
 import { calculateResolution } from "../utils/calculateResolution"
 import { extractBackendError, translateError } from "./generate-video/errorUtils"
@@ -22,6 +22,32 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
   const [generated, setGenerated] = useState(false)
   const [generateError, setGenerateError] = useState<string | null>(null)
   const [generatedVideos, setGeneratedVideos] = useState<GeneratedVideo[]>([])
+  /** 批量模式：每个正式生成任务的独立状态（第5步逐卡片展示） */
+  const [batchTasks, setBatchTasks] = useState<BatchTaskState[]>([])
+
+  const handleBatchTaskUpdate = useCallback((taskId: string, patch: Partial<BatchTaskState>) => {
+    setBatchTasks((prev) => {
+      const list = prev || []
+      const idx = list.findIndex((t) => t.taskId === taskId)
+      if (idx === -1) {
+        return [
+          ...list,
+          {
+            taskId,
+            variantIndex: patch.variantIndex ?? 0,
+            status: "running",
+            progress: 0,
+            error: null,
+            videos: [],
+            ...patch,
+          },
+        ]
+      }
+      const next = [...list]
+      next[idx] = { ...next[idx], ...patch }
+      return next
+    })
+  }, [])
 
   const handleProgress = useCallback((p: number) => setProgress(p), [])
   const handleComplete = useCallback(
@@ -29,6 +55,19 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
       setGenerating(false)
       setGenerated(true)
       setGeneratedVideos(videos as GeneratedVideo[])
+      // 批量：成功任务的 videos 已通过 onBatchTaskUpdate 写入，这里同步兜底
+      setBatchTasks((prev) =>
+        (prev || []).map((t) =>
+          t.status === "completed" && t.videos.length === 0
+            ? {
+                ...t,
+                videos: (videos as GeneratedVideo[]).filter(
+                  (v) => v.generation_task_id === t.taskId,
+                ),
+              }
+            : t,
+        ),
+      )
       onGenerationSuccess?.()
     },
     [onGenerationSuccess],
@@ -38,10 +77,30 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
     setGenerateError(errorMsg)
   }, [])
 
-  const { startPolling, clearTimer } = useGenerationPolling({
+  /* 批量：任务状态变化时聚合已完成成片（含失败重试成功后补入），
+     按变体索引排序，供步骤6封面按勾选顺序逐个取视频 */
+  useEffect(() => {
+    if (batchTasks.length === 0) return
+    const byVariant = new Map<number, GeneratedVideo>()
+    batchTasks.forEach((t) => {
+      if (t.status === "completed" && t.videos && t.videos.length > 0) {
+        byVariant.set(t.variantIndex, t.videos[0] as GeneratedVideo)
+      }
+    })
+    const ordered = [...byVariant.entries()].sort((a, b) => a[0] - b[0]).map(([, v]) => v)
+    setGeneratedVideos((prev) => {
+      if (prev.length === ordered.length && prev.every((v, i) => v.id === ordered[i].id)) {
+        return prev
+      }
+      return ordered
+    })
+  }, [batchTasks])
+
+  const { startPolling, startPollingBatch, retryTask, clearTimer } = useGenerationPolling({
     onProgress: handleProgress,
     onComplete: handleComplete,
     onFailed: handleFailed,
+    onBatchTaskUpdate: handleBatchTaskUpdate,
   })
 
   /* ── 生成视频 ──
@@ -57,6 +116,7 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
     setProgress(0)
     setGenerated(false)
     setGenerateError(null)
+    setBatchTasks([])
     clearTimer()
 
     try {
@@ -83,7 +143,11 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
         }
       }
 
-      const hide = message.loading("正在生成预览视频...", 0)
+      const isBatch = (props.previewCount || 1) > 1
+      const hide = message.loading(
+        isBatch ? `正在生成 ${props.previewCount} 个视频...` : "正在生成预览视频...",
+        0,
+      )
 
       const coverUrl = props.coverSettings?.thumbnail_url || props.coverSettings?.upload_url || ""
 
@@ -92,6 +156,29 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
           ? props.selectedClonedVoice || props.selectedVoice || ""
           : props.selectedVoice || ""
 
+      /* ── 批量变体数组（长度1=共用，长度=count=独立，空=回退单值） ── */
+      const indexes =
+        isBatch && props.selectedVariantIndexes?.length
+          ? props.selectedVariantIndexes
+          : Array.from({ length: props.previewCount || 1 }, (_, i) => i)
+      const batchCount = isBatch ? indexes.length : 1
+
+      // 标题文字数组：批量时按勾选顺序
+      const titlesArr =
+        isBatch && (props.variantTitles?.length || 0) >= batchCount
+          ? indexes.map((i) => props.variantTitles![i] || props.titleSettings?.title || "")
+          : []
+      // 配音数组：独立配音模式按勾选顺序；否则不传（回退共用 voice_library_id）
+      const voiceArr =
+        isBatch && props.voiceModePerVideo && props.variantVoiceLibraryIds?.length
+          ? indexes.map((i) => props.variantVoiceLibraryIds![i] || voiceLibraryId)
+          : []
+      // 封面数组：批量时按勾选顺序（未设置封面的变体传空串，后端回退智能封面）
+      const coversArr =
+        isBatch && props.variantCoverUrls?.length
+          ? indexes.map((i) => props.variantCoverUrls![i] || "")
+          : []
+
       try {
         const taskResp = await createGenerationTask({
           template_id: selectedTemplate,
@@ -109,6 +196,10 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
             ...(props.bgmConfig?.music_id ? { preset_id: props.bgmConfig.music_id } : {}),
           },
           ...(props.sourceEditPlanId ? { source_edit_plan_id: props.sourceEditPlanId } : {}),
+          ...(isBatch ? { count: batchCount } : {}),
+          ...(titlesArr.length ? { titles: titlesArr } : {}),
+          ...(voiceArr.length ? { voice_library_ids: voiceArr } : {}),
+          ...(coversArr.length ? { cover_urls: coversArr } : {}),
           ...(props.titleSettings?.title
             ? {
                 title_config: {
@@ -133,12 +224,17 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
             : {}),
         })
         hide()
-        const taskId = taskResp.items?.[0]?.id
+        const taskIds = (taskResp.items || []).map((it) => it.id).filter(Boolean)
 
-        if (!taskId) {
+        if (taskIds.length === 0) {
           throw new Error("创建任务成功但未返回任务 ID，请稍后在任务列表查看")
         }
-        startPolling(taskId)
+        if (taskIds.length > 1) {
+          // 批量：任务按创建顺序与勾选变体一一对应（后端按 count 顺序创建）
+          startPollingBatch(taskIds.map((taskId, i) => ({ taskId, variantIndex: indexes[i] ?? i })))
+        } else {
+          startPolling(taskIds[0])
+        }
       } catch (err) {
         hide()
         throw err
@@ -154,13 +250,21 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
       return false
     }
     return true
-  }, [props, clearTimer, startPolling, selectedTemplate])
+  }, [props, clearTimer, startPolling, startPollingBatch, selectedTemplate])
 
   const retry = useCallback(() => {
     setGenerateError(null)
     generate()
   }, [generate])
 
+  /** 第5步：单独重试某个失败任务 */
+  const retryBatchTask = useCallback(
+    (taskId: string) => {
+      retryTask(taskId)
+    },
+    [retryTask],
+  )
+
   const dismissError = useCallback(() => {
     setGenerateError(null)
   }, [])
@@ -205,6 +309,8 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
     generatedVideos,
     generate,
     retry,
+    retryBatchTask,
+    batchTasks,
     dismissError,
     download,
     share,

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

@@ -114,8 +114,11 @@ export function useServerPreview({
         const resp = await createPreview(request)
         if (seq !== requestSeqRef.current || !mountedRef.current) return
 
-        setTaskId(resp.task_id)
-        onCreatedRef.current?.(resp.task_id, resp.source_edit_plan_id)
+        // 兼容批量响应 {items, total}：取第一个变体
+        const firstTask = resp.items?.[0]
+        const taskId = firstTask?.task_id || ""
+        setTaskId(taskId)
+        onCreatedRef.current?.(taskId, resp.source_edit_plan_id)
 
         let completed = false
 
@@ -132,7 +135,7 @@ export function useServerPreview({
           if (completed || seq !== requestSeqRef.current || !mountedRef.current) return
 
           try {
-            const st = await getPreviewStatus(resp.task_id)
+            const st = await getPreviewStatus(taskId)
             if (completed || seq !== requestSeqRef.current || !mountedRef.current) return
 
             if (st.status === "completed" && st.video_url) {

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

@@ -1,112 +0,0 @@
-/**
- * Step 7 确认生成 Hook
- * 封装生成确认页的展示逻辑
- */
-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 "../types/cover"
-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 {
-  templates: EditingTemplate[]
-  selectedTemplate: string
-  materialMode: "manual" | "auto"
-  selectedMaterials: string[]
-  smartSelectedIds: string[]
-  title: string
-  voiceMode: "preset" | "custom" | "clone"
-  selectedVoice: string
-  selectedClonedVoice: string
-  presetVoices: PresetVoiceItem[]
-  clonedVoices: VoiceClone[]
-  coverSettings: CoverConfig
-  generating: boolean
-  generated: boolean
-  generateError: string | null
-  progress: number
-  generatedVideos: GeneratedVideo[]
-}
-
-export function useStep7Generate({
-  templates,
-  selectedTemplate,
-  materialMode,
-  selectedMaterials,
-  smartSelectedIds,
-  title,
-  voiceMode: _voiceMode,
-  selectedVoice,
-  selectedClonedVoice: _selectedClonedVoice,
-  presetVoices: _presetVoices,
-  clonedVoices: _clonedVoices,
-  coverSettings,
-  generating,
-  generated,
-  generateError,
-  progress,
-  generatedVideos,
-}: UseStep7GenerateProps) {
-  const templateName = useMemo(
-    () => templates.find((t) => t.id === selectedTemplate)?.name ?? "未选择",
-    [templates, selectedTemplate],
-  )
-
-  const materialSummary = useMemo(() => {
-    if (materialMode === "auto") {
-      return `${smartSelectedIds.length} 个素材（智能匹配）`
-    }
-    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])
-
-  const coverSummary = useMemo(() => {
-    if (!coverSettings.enabled) return "不使用"
-    return COVER_MODE_LABELS[coverSettings.mode] || "智能封面"
-  }, [coverSettings])
-
-  const getGenerationPhase = (p: number) => {
-    if (p < 20) return { label: "分析素材与配置", icon: "🔍" }
-    if (p < 50) return { label: "智能剪辑合成", icon: "🎬" }
-    if (p < 80) return { label: "渲染视频中", icon: "⚡" }
-    return { label: "即将完成", icon: "✨" }
-  }
-
-  const handleScrollToPreview = () => {
-    const el =
-      document.querySelector(".xx-inline-video-player") ||
-      document.querySelector(".xx-preview-section")
-    el?.scrollIntoView({ behavior: "smooth", block: "start" })
-  }
-
-  return {
-    templateName,
-    materialSummary,
-    title,
-    voiceName,
-    coverSummary,
-    generating,
-    generated,
-    generateError,
-    progress,
-    generatedVideos,
-    getGenerationPhase,
-    handleScrollToPreview,
-  }
-}
-
-export default useStep7Generate

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

@@ -1,6 +1,11 @@
 /**
- * GeneratePage 步骤导航
- * 步骤顺序（6步）：模板(1) → 素材(2) → 配音(3) → 标题(4) → 确认生成(5) → 封面(6)
+ * GeneratePage 步骤导航（Issue #1677 修正：固定 6 步，单视频与批量一致）
+ * 步骤：模板(1) → 素材(2) → 配音(3) → 标题(4) → 确认生成(5) → 封面(6)
+ *
+ * - 步骤4底部按钮是「确认生成视频/确认生成 N 个视频」（由 GenerateStepActions 调
+ *   onConfirmGenerate），创建成功后跳转步骤5；本 hook 的 goNext 只负责 1→2→3→4
+ *   和 5→6 的「下一步」。
+ * - 步骤5（确认生成进度页）：渲染全部完成（generated）后「下一步」解锁进封面。
  */
 import { message } from "antd"
 import type { TitleSettings } from "../types"
@@ -13,10 +18,10 @@ export interface UseStepNavigationOptions {
   selectedMaterials: string[]
   smartSelectedIds: string[]
   titleSettings: TitleSettings
-  /** 预览是否已就绪（素材已加载，可播放） */
-  previewReady: boolean
-  /** 是否已完成视频生成（步骤5确认生成后才能进入封面） */
+  /** 是否已完成视频生成（步骤5全部渲染完成后才能进入封面） */
   generated: boolean
+  /** Step1 点下一步时弹出数量选择弹窗 */
+  onOpenCountModal: () => void
 }
 
 export interface UseStepNavigationReturn {
@@ -32,14 +37,18 @@ export const useStepNavigation = (options: UseStepNavigationOptions): UseStepNav
     materialMode,
     selectedMaterials,
     smartSelectedIds,
-    titleSettings,
-    previewReady,
     generated,
+    onOpenCountModal,
   } = options
 
   const goNext = () => {
-    if (currentStep === 1 && !selectedTemplate) {
-      message.warning("请先选择一个模板")
+    if (currentStep === 1) {
+      if (!selectedTemplate) {
+        message.warning("请先选择一个模板")
+        return
+      }
+      // 选完模板弹数量选择弹窗（每次都弹，不记忆）
+      onOpenCountModal()
       return
     }
     if (currentStep === 2 && materialMode === "manual" && selectedMaterials.length === 0) {
@@ -50,21 +59,12 @@ export const useStepNavigation = (options: UseStepNavigationOptions): UseStepNav
       message.warning("请先进行智能匹配并选择素材")
       return
     }
-    // Step4（标题+预览）：标题必填 + 预览必须已加载
-    if (currentStep === 4) {
-      if (!titleSettings.title.trim()) {
-        message.warning("请选择或输入标题")
+    // 步骤5（确认生成）：全部渲染完成后才能下一步进封面
+    if (currentStep === 5) {
+      if (!generated) {
+        message.warning("视频还在渲染中，请等待生成完成")
         return
       }
-      if (!previewReady) {
-        message.warning("预览视频正在加载，请稍候")
-        return
-      }
-    }
-    // Step5（确认生成）：必须已完成生成才能进入封面
-    if (currentStep === 5 && !generated) {
-      message.warning("请先生成视频")
-      return
     }
     if (currentStep < 6) {
       setCurrentStep((s) => s + 1)

apps/web/src/pages/history/hooks/useTaskHistory.ts

@@ -35,7 +35,13 @@ export const useTaskHistory = () => {
   } = useQuery<TaskItem[], Error>({
     queryKey: ["tasks"],
     queryFn: getUserTasks,
-    staleTime: 30_000,
+    staleTime: 5_000,
+    // 有进行中任务时每 3 秒自动刷新，全部结束后停止轮询
+    refetchInterval: (query) => {
+      const list = query.state.data ?? []
+      const hasActive = list.some((t) => ["pending", "waiting", "running"].includes(t.status))
+      return hasActive ? 3_000 : false
+    },
   })
 
   // 重试 mutation

apps/web/src/pages/products/ProductLibrary.tsx

@@ -11,7 +11,7 @@
  * 产品卡片 → components/ProductCard（内联视频播放）
  */
 import React from "react"
-import { VideoCameraOutlined, DownloadOutlined } from "@ant-design/icons"
+import { VideoCameraOutlined, DownloadOutlined, ReloadOutlined } from "@ant-design/icons"
 import { Button } from "@/components/ui"
 import { ProductCard } from "./components/ProductCard"
 import { ProductFilterBar } from "./components/ProductFilterBar"
@@ -19,6 +19,7 @@ import { ProductBatchBar } from "./components/ProductBatchBar"
 import { ProductEmptyState } from "./components/ProductEmptyState"
 import { useProductList } from "./hooks/useProductList"
 import { useProductActions } from "./hooks/useProductActions"
+import { useRecomputeDedup } from "./hooks/product-actions/useRecomputeDedup"
 import "./products.css"
 
 const ProductLibrary: React.FC = () => {
@@ -67,6 +68,8 @@ const ProductLibrary: React.FC = () => {
     setPlayingProduct: () => {}, // 不再使用弹窗播放
   })
 
+  const { recomputeDedup, isRecomputing } = useRecomputeDedup()
+
   // ── Loading 状态 ──
   if (isLoading) {
     return <ProductEmptyState type="loading" />
@@ -94,6 +97,15 @@ const ProductLibrary: React.FC = () => {
           <Button buttonType="ghost" buttonSize="sm" icon={<DownloadOutlined />}>
             批量导出
           </Button>
+          <Button
+            buttonType="ghost"
+            buttonSize="sm"
+            icon={<ReloadOutlined />}
+            loading={isRecomputing}
+            onClick={recomputeDedup}
+          >
+            重新查重
+          </Button>
         </div>
       </div>
 

apps/web/src/pages/products/components/ProductInfoPanel.tsx

@@ -2,6 +2,7 @@ import React from "react"
 import type { ProductItem } from "../../../api/products"
 import { STATUS_MAP } from "../constants"
 import { formatDuration, formatFileSize, formatDate } from "../detailUtils"
+import { getRiskLevel } from "../../duplication/utils"
 
 interface ProductInfoPanelProps {
   product: ProductItem
@@ -44,12 +45,28 @@ export const ProductInfoPanel: React.FC<ProductInfoPanelProps> = ({ product }) =
         </div>
         <div className="xx-detail-meta-item">
           <span className="xx-detail-meta-label">查重率</span>
-          <span className="xx-detail-meta-value">
+          <span
+            className={`xx-detail-meta-value dup-risk-text dup-risk-${getRiskLevel(product.duplicate_rate)}`}
+          >
             {(product.duplicate_rate ?? 0) > 0
               ? `${(product.duplicate_rate ?? 0).toFixed(1)}%`
               : "-"}
           </span>
         </div>
+        {product.visual_similarity != null && (
+          <div className="xx-detail-meta-item">
+            <span className="xx-detail-meta-label">视觉相似度</span>
+            <span className="xx-detail-meta-value">
+              {(product.visual_similarity * 100).toFixed(1)}%
+            </span>
+          </div>
+        )}
+        {product.match_count != null && (
+          <div className="xx-detail-meta-item">
+            <span className="xx-detail-meta-label">匹配帧数</span>
+            <span className="xx-detail-meta-value">{product.match_count}</span>
+          </div>
+        )}
         <div className="xx-detail-meta-item">
           <span className="xx-detail-meta-label">创建时间</span>
           <span className="xx-detail-meta-value">{formatDate(product.created_at ?? "")}</span>

apps/web/src/pages/products/hooks/product-actions/useRecomputeDedup.ts

@@ -0,0 +1,27 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query"
+import { message } from "antd"
+import { recomputeDedup } from "@/api/products"
+
+export function useRecomputeDedup() {
+  const queryClient = useQueryClient()
+
+  const mutation = useMutation({
+    mutationFn: () => recomputeDedup(),
+    onSuccess: (data) => {
+      queryClient.invalidateQueries({ queryKey: ["products"] })
+      if (data.enqueued > 0) {
+        message.success(`已提交 ${data.enqueued} 个视频的查重任务，后台处理中`)
+      } else {
+        message.info("所有视频查重率已是最新，无需重算")
+      }
+    },
+    onError: () => {
+      message.error("查重任务提交失败，请稍后重试")
+    },
+  })
+
+  return {
+    recomputeDedup: () => mutation.mutate(),
+    isRecomputing: mutation.isPending,
+  }
+}

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

@@ -1076,3 +1076,19 @@
     gap: var(--space-sm);
   }
 }
+
+/* 查重率风险颜色（#1662） */
+.xx-detail-meta-value.dup-risk-low {
+  color: var(--success-color, #22c55e);
+  font-weight: 600;
+}
+
+.xx-detail-meta-value.dup-risk-medium {
+  color: var(--warning-color, #f59e0b);
+  font-weight: 600;
+}
+
+.xx-detail-meta-value.dup-risk-high {
+  color: var(--error-color, #ef4444);
+  font-weight: 600;
+}

apps/web/src/pages/profile/ProfileSettings.css

@@ -178,3 +178,35 @@
   border-color: var(--border-color);
   margin: var(--space-lg) 0;
 }
+
+/* 微信账号绑定卡片 */
+.xx-settings-wechat {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: var(--space-lg);
+  flex-wrap: wrap;
+}
+
+.xx-settings-wechat-info {
+  display: flex;
+  align-items: center;
+  gap: var(--space-md);
+}
+
+.xx-settings-wechat-info .xx-wechat-icon {
+  font-size: 28px;
+  line-height: 1;
+}
+
+.xx-settings-wechat-info strong {
+  display: block;
+  color: var(--text-primary);
+  font-size: var(--font-size-md);
+}
+
+.xx-settings-wechat-info p {
+  margin: 2px 0 0;
+  color: var(--text-secondary);
+  font-size: var(--font-size-sm);
+}

apps/web/src/pages/profile/Settings.tsx

@@ -1,39 +1,111 @@
 /**
  * 个人设置页面
- * P1-2: 添加 PageHead
- * P1-3: antd Form/Input/Button/Alert → 自定义 UI 组件
+ * - 个人资料（昵称）保存
+ * - 微信账号绑定状态 / 绑定 / 解绑
  */
-import React, { useState } from "react"
+import React, { useEffect, useRef, useState } from "react"
+import { useSearchParams } from "react-router-dom"
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
+import { message } from "antd"
 import { Button, Input, Modal } from "@/components/ui"
+import { getCurrentUser, updateProfile, getWechatBindUrl, unbindWechat } from "@/api/auth"
 import { useAuthStore } from "@/store/authStore"
 import PageHead from "@/components/layout/PageHead"
 import "./ProfileSettings.css"
 
 const Settings: React.FC = () => {
   const user = useAuthStore((state) => state.user)
+  const setUser = useAuthStore((state) => state.setUser)
+  const queryClient = useQueryClient()
+  const [searchParams, setSearchParams] = useSearchParams()
   const [displayName, setDisplayName] = useState(user?.display_name || "")
+  const bindTipShownRef = useRef(false)
 
-  const handleSave = () => {
-    Modal.info({
-      title: "提示",
-      content: "个人资料修改接口暂未开放，保存功能即将上线。",
+  // 拉取最新用户信息（微信绑定状态以后端为准）
+  const { data: freshUser } = useQuery({
+    queryKey: ["currentUser"],
+    queryFn: getCurrentUser,
+  })
+
+  useEffect(() => {
+    if (freshUser) {
+      setUser(freshUser)
+      setDisplayName((prev) => prev || freshUser.display_name || "")
+    }
+  }, [freshUser, setUser])
+
+  // 绑定回调结果提示（?wechat_bind=success|failed）
+  useEffect(() => {
+    if (bindTipShownRef.current) return
+    const result = searchParams.get("wechat_bind")
+    if (!result) return
+    bindTipShownRef.current = true
+    if (result === "success") {
+      message.success("微信绑定成功")
+    } else if (result === "failed") {
+      message.error("微信绑定失败，请重试")
+    }
+    searchParams.delete("wechat_bind")
+    setSearchParams(searchParams, { replace: true })
+  }, [searchParams, setSearchParams])
+
+  const wechatBound = user?.wechat_bound === true
+
+  const saveProfileMutation = useMutation({
+    mutationFn: () => updateProfile({ display_name: displayName.trim() }),
+    onSuccess: (updated) => {
+      setUser(updated)
+      message.success("资料已保存")
+    },
+    onError: () => {
+      message.error("保存失败，请重试")
+    },
+  })
+
+  const handleBindWechat = async () => {
+    try {
+      const result = await getWechatBindUrl()
+      localStorage.setItem("wechat_bind_state", result.state)
+      window.location.href = result.auth_url
+    } catch {
+      message.error("微信绑定暂不可用，请稍后重试")
+    }
+  }
+
+  const unbindMutation = useMutation({
+    mutationFn: unbindWechat,
+    onSuccess: () => {
+      message.success("已解绑微信")
+      queryClient.invalidateQueries({ queryKey: ["currentUser"] })
+      // 本地立即更新，避免等待刷新
+      if (user) {
+        setUser({ ...user, wechat_bound: false, wechat_nickname: "" })
+      }
+    },
+    onError: () => {
+      message.error("解绑失败，请重试")
+    },
+  })
+
+  const handleUnbind = () => {
+    Modal.confirm({
+      title: "解绑微信",
+      content: "解绑后将无法使用微信登录该账号，确定要解绑吗？",
+      okText: "确定解绑",
+      cancelText: "取消",
+      okButtonProps: { danger: true },
+      onOk: () => unbindMutation.mutateAsync(),
     })
   }
 
+  const displayNameDirty = displayName.trim() !== (user?.display_name || "")
+
   return (
     <div className="xx-settings-page">
       <PageHead title="个人设置" description="管理您的账户信息" />
 
       <div className="xx-settings-card">
         <h3>个人信息</h3>
-        <div className="xx-settings-notice">
-          <span className="xx-settings-notice-icon">ℹ️</span>
-          <div>
-            <strong>个人资料编辑暂未开放</strong>
-            <p>当前仅展示登录用户信息，资料修改接口接入后再开放保存。</p>
-          </div>
-        </div>
-
         <div className="xx-settings-form">
           <div className="xx-settings-field">
             <label className="xx-settings-label">用户名</label>
@@ -42,25 +114,76 @@ const Settings: React.FC = () => {
 
           <div className="xx-settings-field">
             <label className="xx-settings-label">邮箱</label>
-            <Input value={user?.email || ""} disabled placeholder="邮箱" />
-          </div>
-
-          <div className="xx-settings-field">
-            <label className="xx-settings-label">显示名称</label>
             <Input
-              value={displayName}
-              onChange={(e) => setDisplayName(e.target.value)}
-              placeholder="请输入显示名称"
+              value={user?.email && !user.email.endsWith("@wechat.local") ? user.email : ""}
+              disabled
+              placeholder={user?.email?.endsWith("@wechat.local") ? "微信账号暂未绑定邮箱" : "邮箱"}
             />
           </div>
 
           <div className="xx-settings-field">
-            <Button buttonType="primary" buttonSize="md" onClick={handleSave} disabled>
-              保存暂未开放
+            <label className="xx-settings-label">昵称</label>
+            <Input
+              value={displayName}
+              onChange={(e) => setDisplayName(e.target.value)}
+              placeholder="请输入昵称"
+              maxLength={20}
+            />
+          </div>
+
+          <div className="xx-settings-field">
+            <Button
+              buttonType="primary"
+              buttonSize="md"
+              onClick={() => saveProfileMutation.mutate()}
+              loading={saveProfileMutation.isPending}
+              disabled={!displayName.trim() || !displayNameDirty}
+            >
+              保存
             </Button>
           </div>
         </div>
       </div>
+
+      <div className="xx-settings-card">
+        <h3>微信账号</h3>
+        <div className="xx-settings-wechat">
+          <div className="xx-settings-wechat-info">
+            <span className="xx-wechat-icon">💬</span>
+            <div>
+              {wechatBound ? (
+                <>
+                  <strong>
+                    已绑定微信{user?.wechat_nickname ? `（${user.wechat_nickname}）` : ""}
+                  </strong>
+                  <p>可使用微信扫码登录本账号</p>
+                </>
+              ) : (
+                <>
+                  <strong>未绑定微信</strong>
+                  <p>绑定后可使用微信扫码快速登录</p>
+                </>
+              )}
+            </div>
+          </div>
+          <div className="xx-settings-wechat-actions">
+            {wechatBound ? (
+              <Button
+                buttonType="ghost"
+                buttonSize="md"
+                onClick={handleUnbind}
+                loading={unbindMutation.isPending}
+              >
+                解绑
+              </Button>
+            ) : (
+              <Button buttonType="primary" buttonSize="md" onClick={handleBindWechat}>
+                绑定微信
+              </Button>
+            )}
+          </div>
+        </div>
+      </div>
     </div>
   )
 }

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

@@ -136,8 +136,9 @@ export const MaterialVoiceTab: React.FC<MaterialVoiceTabProps> = ({
             const material = mapAssetToMaterial(asset)
             // duration 优先取顶层（后端从 metadata 提取），兜底 metadata
             const cardDuration = asset.duration || material.duration || 0
-            // AI 生成素材标识（metadata.source === "tts_job"）
-            const isAiMaterial = (asset.metadata as Record<string, unknown>)?.source === "tts_job"
+            // AI 生成素材标识：兼容旧素材（无 source 字段但有 tts_job_id）
+            const meta = asset.metadata as Record<string, unknown>
+            const isAiMaterial = meta?.source === "tts_job" || !!meta?.tts_job_id
             const isPlaying = playingId === asset.id
             const isSelected = selectedIds.has(asset.id)
             // 播放中以 audio 真实时长为准，未播放显示卡片时长
@@ -184,8 +185,10 @@ export const MaterialVoiceTab: React.FC<MaterialVoiceTabProps> = ({
                 </div>
 
                 <div className="xx-voice-info vmat-info">
-                  <div className="xx-voice-name" title={asset.name}>
-                    {asset.name}
+                  <div className="xx-voice-name-row">
+                    <div className="xx-voice-name" title={asset.name}>
+                      {asset.name}
+                    </div>
                     {isAiMaterial && <span className="vmat-ai-badge">AI</span>}
                   </div>
                   <div className="xx-voice-subtitle">

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

@@ -30,6 +30,7 @@ const VideoExtractModal: React.FC<VideoExtractModalProps> = ({
       title={<span style={{ fontSize: 16, fontWeight: 600 }}>提取视频配音</span>}
       open={open}
       onCancel={() => {
+        if (inputRef.current) inputRef.current.value = ""
         if (isExtracting) return
         onClose()
       }}
@@ -152,7 +153,7 @@ const VideoExtractModal: React.FC<VideoExtractModalProps> = ({
 
           {isExtracting && (
             <p style={{ textAlign: "center", fontSize: 13, color: "#7c3aed", margin: "12px 0 0" }}>
-              {progress === 100 ? "正在提取人声，请稍候..." : "正在上传视频..."}
+              {"正在提取音频，请稍后..."}
             </p>
           )}
         </div>

apps/web/src/router/ProtectedRoute.tsx

@@ -6,10 +6,16 @@ import { useAuthStore } from "@/store/authStore"
 export const ProtectedRoute = ({ children }: { children: React.ReactNode }) => {
   const isAuthenticated = useAuthStore((state) => state.isAuthenticated)
   const hasAccessToken = Boolean(localStorage.getItem("access_token"))
+  const profileCompleted = useAuthStore((state) => state.user?.profile_completed !== false)
 
   if (!isAuthenticated || !hasAccessToken) {
     return <Navigate to="/login" replace />
   }
 
+  // 微信新用户未完成昵称引导时，禁止进入主界面
+  if (!profileCompleted) {
+    return <Navigate to="/welcome/wechat" replace />
+  }
+
   return <>{children}</>
 }

apps/web/src/router/publicRoutes.tsx

@@ -5,6 +5,8 @@ import Register from "@/pages/auth/Register"
 import ForgotPassword from "@/pages/auth/ForgotPassword"
 import ResetPassword from "@/pages/auth/ResetPassword"
 import WechatCallback from "@/pages/auth/WechatCallback"
+import WechatOnboarding from "@/pages/auth/WechatOnboarding"
+import WechatBindCallback from "@/pages/auth/WechatBindCallback"
 import { useAuthStore } from "@/store/authStore"
 
 /** 首页路由组件：已登录跳 dashboard，未登录显示落地页 */
@@ -45,4 +47,12 @@ export const publicRoutes: RouteObject[] = [
     path: "/auth/wechat/callback",
     element: <WechatCallback />,
   },
+  {
+    path: "/auth/wechat/bind/callback",
+    element: <WechatBindCallback />,
+  },
+  {
+    path: "/welcome/wechat",
+    element: <WechatOnboarding />,
+  },
 ]