fix(generate): #1750 批量预览五连修——删除假数据 fallback/配音时长/竖屏播放器/封面一键生成 (#1751)

Co-authored-by: xiaoxia <dev@xiaoxiajianji.com>
Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>

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

@@ -420,42 +420,77 @@ def create_preview_generation_task(
         logger.error("[预览生成] 创建失败: %s", e, exc_info=True)
         raise HTTPException(status_code=500, detail="创建预览生成任务失败，请稍后再试") from e
 
-    # ── 克隆独立变体 plan：N 个预览全部克隆（预览不污染源 plan）──
-    # 源 plan 不存在（无编辑历史）时各任务走自身随机选片流程，不克隆。
+    # ── 独立变体 plan（#1743）──
+    # count=1：克隆源 plan（预览不污染源 plan，仅起点重算），行为与旧版一致；
+    # count>1：变体 0 保留源 plan，变体 1..N-1 用 reselect_plan_for_variant 完整
+    #   重跑单视频选片（素材洗牌+镜头洗牌+起点随机+跨变体避让+批次 20% 重叠重选），
+    #   所见即所得——预览变体差异即正式成片差异。
     source_plan_id = created_tasks[0].source_edit_plan_id if created_tasks else ""
-    if source_plan_id:
+    if source_plan_id and count == 1:
+        # 单预览：克隆一份（原逻辑）
         try:
             from app.services.edit_plan_service import EditPlanService
 
             _plan_svc = EditPlanService(db)
-            for variant_index in range(count):
+            variant_plan = _plan_svc.clone_plan_for_variant(
+                source_plan_id,
+                created_by_user_id=user_id,
+                name_suffix="预览变体",
+            )
+            variant_plan_ids.append(variant_plan.id)
+        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 e
+    elif source_plan_id and count > 1:
+        try:
+            from app.services.edit_plan_service import EditPlanService
+
+            _plan_svc = EditPlanService(db)
+            # 变体 0 直接用源 plan；变体 1..N-1 独立选片
+            variant_plan_ids.append(source_plan_id)
+            batch_asset_pool = list(dict.fromkeys(request.asset_ids or []))
+            for variant_index in range(1, 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(
+                        variant_plan = _plan_svc.reselect_plan_for_variant(
                             source_plan_id,
+                            batch_asset_pool,
                             created_by_user_id=user_id,
-                            name_suffix=f"预览变体{variant_index + 1}" if count > 1 else "预览变体",
+                            name_suffix=f"预览变体{variant_index + 1}",
                         )
                         break
-                    except Exception as clone_err:  # noqa: PERF203
-                        last_err = clone_err
+                    except ValueError as ve:
+                        logger.warning("[预览生成] 变体独立选片失败(素材不足): %s", ve)
+                        for t in created_tasks:
+                            _mark_task_failed(generation_task_repository, t, "预览变体选片失败")
+                        raise HTTPException(
+                            status_code=400,
+                            detail=f"批量预览第 {variant_index + 1} 个视频无法独立选片：{ve}。"
+                            "请增加素材库中的视频素材后重试。",
+                        ) from ve
+                    except Exception as reselection_err:  # noqa: PERF203
+                        last_err = reselection_err
                         logger.warning(
-                            "[预览生成] 克隆变体 plan 失败(尝试%d/2): variant=%d error=%s",
+                            "[预览生成] 变体独立选片失败(尝试%d/2): variant=%d error=%s",
                             _attempt + 1,
                             variant_index,
-                            clone_err,
+                            reselection_err,
                             exc_info=True,
                         )
                 if variant_plan is None:
                     logger.error(
-                        "[预览生成] 克隆预览变体 plan 重试仍失败: variant=%d source=%s",
+                        "[预览生成] 变体独立选片重试仍失败: 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(
@@ -466,7 +501,7 @@ def create_preview_generation_task(
         except HTTPException:
             raise
         except Exception as e:
-            logger.error("[预览生成] 克隆变体 plan 异常: %s", e, exc_info=True)
+            logger.error("[预览生成] 变体 plan 生成异常: %s", e, exc_info=True)
             for t in created_tasks:
                 _mark_task_failed(generation_task_repository, t, "预览变体计划创建失败")
             raise HTTPException(

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

@@ -123,6 +123,7 @@ def _select_assets_from_library(
     assets: list,
     mode: str,
     count: int,
+    rng=None,
 ) -> list[str]:
     """根据选取模式从素材库中选取 ready 状态的视频素材 ID。
 
@@ -130,6 +131,8 @@ def _select_assets_from_library(
         assets: 素材库中所有素材（Asset 实体列表）
         mode: 选取模式 — all=全部, smart=智能匹配（多维度评分+多样性）
         count: 选取数量，0 表示全部（仅 smart 模式有效）
+        rng: 可选随机源（smart 模式排序噪声用），生产环境不传则内部随机；
+            测试可注入固定种子或零噪声随机源获得确定性结果。
 
     Returns:
         选中的素材 ID 列表
@@ -142,8 +145,9 @@ def _select_assets_from_library(
     if mode == "smart":
         # 智能匹配：统一使用 packages/domain/smart_match.py 的多维评分+多样性选取
         # 评分维度：质量分(40%) + 时长适配(30%) + 新鲜度(20%) + 未使用加分(10%)
+        # 排序注入随机噪声（#1743）：同分素材每次选出不同组合，从素材组合层面降重
         limit = count if count > 0 else None
-        results = smart_select_assets(ready_video_assets, limit=limit, kind="video")
+        results = smart_select_assets(ready_video_assets, limit=limit, kind="video", rng=rng)
         return [r.asset.id for r in results]
 
     # 默认 all 模式：返回全部 ready 视频素材
@@ -432,39 +436,83 @@ def create_generation_task(
         logger.info("画中画已下线，strategy_id %s → one_take", effective_strategy_id)
         effective_strategy_id = "one_take"
 
-    # 批量生成时每个任务关联独立克隆 plan（片段起点重算），
-    # 禁止 N 条任务共用同一 source_edit_plan_id 导致片段一模一样。
-    # 在创建任何任务【之前】预克隆全部变体：克隆失败直接中断（此时无脏数据），
-    # 绝不静默退回共用源 plan（否则批量视频内容重复，违反去重诉求）。
+    # 批量生成（count>1）：每个变体必须走与单视频完全相同的独立选片流程（#1743）。
+    # - 变体 0 保留源 plan（保留用户编辑结果）；
+    # - 变体 1..N-1 用 reselect_plan_for_variant 完整重跑选片（素材洗牌 + 镜头洗牌
+    #   + 起点随机 + 跨变体区间避让 + 批次 20% 重叠重选），而非"克隆只改起点"；
+    # - count>1 但没有源 plan（前端未传 source_edit_plan_id 且无模板 plan）时，
+    #   不允许 N 个任务兜底共用同一 plan，直接 4xx 中断（宁可不生成，也不出同源成片）。
+    # 在创建任何任务【之前】预生成全部变体 plan：失败直接中断（此时无脏数据）。
     variant_plan_ids: list[str] = []
-    if count > 1 and request.source_edit_plan_id:
+    if count > 1:
         from app.services.edit_plan_service import EditPlanService
 
         _plan_svc = EditPlanService(db)
+
+        # 解析批量源 plan：优先前端传入；否则按 template_id + user 查最新（与单任务兜底同源）
+        batch_source_plan_id = request.source_edit_plan_id
+        if not batch_source_plan_id and request.template_id:
+            try:
+                from packages.adapters.sqlalchemy_impl.models import EditPlanModel
+
+                _latest = (
+                    db.query(EditPlanModel)
+                    .filter(
+                        EditPlanModel.template_id == request.template_id,
+                        EditPlanModel.created_by_user_id == user_id,
+                    )
+                    .order_by(EditPlanModel.created_at.desc())
+                    .first()
+                )
+                if _latest:
+                    batch_source_plan_id = _latest.id
+            except Exception:
+                logger.warning("[生成任务] 批量源 plan 解析失败", exc_info=True)
+
+        if not batch_source_plan_id:
+            # 无任何可用源 plan：批量变体无从选片，明确报错，严禁静默共用/同源
+            logger.error("[生成任务] 批量 count=%d 但无可编辑计划（无 source_edit_plan_id/template plan）", count)
+            raise HTTPException(
+                status_code=400,
+                detail="批量生成需要先完成预览生成（缺少剪辑计划）。请先生成预览后再批量创建。",
+            )
+
+        # 批次素材池：请求显式素材 + 库自动匹配素材（resolved_asset_ids）
+        batch_asset_pool = list(dict.fromkeys(resolved_asset_ids or []))
+
         for task_index in range(1, count):
             variant = None
             last_err: Exception | None = None
             for _attempt in range(2):  # 1 次重试，抗 DB 瞬时抖动
                 try:
-                    variant = _plan_svc.clone_plan_for_variant(
-                        request.source_edit_plan_id,
+                    variant = _plan_svc.reselect_plan_for_variant(
+                        batch_source_plan_id,
+                        batch_asset_pool,
                         created_by_user_id=user_id,
                         name_suffix=f"批量{task_index + 1}",
                     )
                     break
-                except Exception as clone_err:  # noqa: PERF203
-                    last_err = clone_err
+                except ValueError as ve:
+                    # 素材不足等可预期错误：不重试，直接中断并给出明确提示
+                    logger.warning("[生成任务] 变体独立选片失败(素材不足): %s", ve)
+                    raise HTTPException(
+                        status_code=400,
+                        detail=f"批量生成第 {task_index + 1} 个视频无法独立选片：{ve}。"
+                        "请增加素材库中的视频素材后重试。",
+                    ) from ve
+                except Exception as reselection_err:  # noqa: PERF203
+                    last_err = reselection_err
                     logger.warning(
-                        "[生成任务] 克隆变体 plan 失败(尝试%d/2): source=%s error=%s",
+                        "[生成任务] 变体独立选片失败(尝试%d/2): source=%s error=%s",
                         _attempt + 1,
-                        request.source_edit_plan_id,
-                        clone_err,
+                        batch_source_plan_id,
+                        reselection_err,
                         exc_info=True,
                     )
             if variant is None:
                 logger.error(
-                    "[生成任务] 克隆变体 plan 重试仍失败，中断批量创建: source=%s",
-                    request.source_edit_plan_id,
+                    "[生成任务] 变体独立选片重试仍失败，中断批量创建: source=%s",
+                    batch_source_plan_id,
                     exc_info=last_err,
                 )
                 raise HTTPException(
@@ -475,10 +523,11 @@ def create_generation_task(
 
     try:
         for task_index in range(count):
-            # 第 1 条复用源 plan（保留用户编辑结果）；其余使用预克隆的独立变体 plan。
-            # 无源 plan（source_edit_plan_id 为空）时无可克隆对象，variant_plan_ids
-            # 为空列表：各任务走自身随机选片流程，不做索引访问（防 IndexError）
-            effective_plan_id = request.source_edit_plan_id
+            # 变体 0 复用源 plan（保留用户编辑结果）；变体 1..N-1 用预生成的独立选片 plan。
+            # count>1 时上方已保证存在源 plan 且变体 plan 数量 == count-1。
+            effective_plan_id = (
+                request.source_edit_plan_id or batch_source_plan_id if count > 1 else request.source_edit_plan_id
+            )
             if task_index > 0 and variant_plan_ids:
                 effective_plan_id = variant_plan_ids[task_index - 1]
 
@@ -523,7 +572,19 @@ def create_generation_task(
             try:
                 # 兜底关联编辑计划：前端未传 source_edit_plan_id 时，
                 # 通过 template_id + user_id 在 DB 层直接查找最新的 plan。
-                # 必须在 enqueue 之前执行，避免 worker 读取时 source_edit_plan_id 为空（竞态条件）
+                # 必须在 enqueue 之前执行，避免 worker 读取时 source_edit_plan_id 为空（竞态条件）。
+                # #1743：批量（count>1）场景严禁兜底共用——变体 plan 已在上方预生成，
+                # 走到这里还缺 plan 说明预生成漏配，直接报错中断，不允许 N 任务关联同一 plan。
+                if not task.source_edit_plan_id and count > 1:
+                    logger.error(
+                        "[生成任务] 批量任务缺少独立 plan（禁止共用兜底）: task_index=%d task_id=%s",
+                        task_index,
+                        task.id,
+                    )
+                    raise HTTPException(
+                        status_code=500,
+                        detail="创建批量任务失败：变体剪辑计划缺失，请重新预览后再批量生成。",
+                    )
                 if not task.source_edit_plan_id and request.template_id:
                     try:
                         from packages.adapters.sqlalchemy_impl.models import EditPlanModel

apps/api/app/services/edit_plan_service.py

@@ -409,8 +409,13 @@ class EditPlanService:
                     clip_type=clip_item.get("clip_type", "main"),
                     order=order,
                     asset_id=clip_item.get("asset_id", ""),
+                    text_content=clip_item.get("text_content", ""),
                     start_time=clip_item.get("start_time", 0.0),
                     duration=clip_item.get("duration", 0.0),
+                    transition_effect=clip_item.get("transition_effect", "cut"),
+                    transition_duration=clip_item.get("transition_duration", 0.0),
+                    playback_speed=clip_item.get("playback_speed", 1.0),
+                    config=clip_item.get("config") or None,
                 )
                 model = EditPlanClipModel(
                     id=clip.id,
@@ -459,6 +464,136 @@ class EditPlanService:
             logger.exception("事务性替换片段失败: plan_id=%s", plan_id)
             raise
 
+    def reselect_plan_for_variant(
+        self,
+        source_plan_id: str,
+        candidate_asset_ids: list[str],
+        *,
+        created_by_user_id: str = "",
+        name_suffix: str = "变体",
+        rng=None,
+    ) -> EditPlan:
+        """为批量变体生成独立 plan：完整重跑单视频选片流程（#1743）。
+
+        与 clone_plan_for_variant（只重算起点、素材/顺序不变）不同，本方法：
+        - 源 plan 片段骨架（clip_type/order/duration/文案/转场）保留；
+        - 素材池 shuffle 随机分配 + main 片段顺序洗牌；
+        - 起点走场景镜头洗牌/随机起点/历史区间避让（与单视频同一入口）；
+        - 批次内同素材区间重叠 >20% 自动重选起点；
+        - 新片段区间 record_used_segments 写回素材 metadata（跨变体/跨任务避让）。
+
+        Args:
+            source_plan_id: 源 plan（任务 0 / 预览源）。
+            candidate_asset_ids: 素材池（源 plan 素材 ∪ 批次素材）。
+            created_by_user_id: 新 plan 归属用户。
+            name_suffix: plan 名后缀。
+            rng: 可选随机数（测试注入种子）。
+
+        Raises:
+            ValueError: 源 plan 不存在/无片段、素材池为空或时长全未知。
+        """
+        from packages.adapters.sqlalchemy_impl.models import AssetModel
+        from packages.domain.plan_generator_utils import extract_scene_points_from_metadata
+        from packages.domain.variant_plan_selector import reselect_clips_for_variant
+
+        source = self.get_plan_or_raise(source_plan_id)
+
+        # 分页读取源 plan 全部片段
+        clips: List[EditPlanClip] = []
+        skip, page = 0, 500
+        while True:
+            batch = self._clip_repo.list_by_plan(source_plan_id, skip=skip, limit=page)
+            if not batch:
+                break
+            clips.extend(batch)
+            if len(batch) < page:
+                break
+            skip += page
+        if not clips:
+            raise ValueError(f"源 plan 无片段，无法生成变体: {source_plan_id}")
+
+        source_clips_data = [
+            {
+                "order": c.order if c.order is not None else i,
+                "asset_id": c.asset_id,
+                "start_time": float(c.start_time or 0.0),
+                "duration": float(c.duration or 0.0),
+                "clip_type": c.clip_type,
+                "playback_speed": float(c.playback_speed or 1.0),
+                "transition_effect": c.transition_effect,
+                "transition_duration": float(c.transition_duration or 0.0),
+                "text_content": c.text_content or "",
+                "config": c.config or {},
+            }
+            for i, c in enumerate(clips)
+        ]
+
+        db = self._clip_repo.session
+
+        # 素材池 = 源 plan 素材 ∪ 调用方传入素材（去重保序）
+        pool_ids: list[str] = []
+        seen = set()
+        for aid in [c.asset_id for c in clips if c.asset_id] + list(candidate_asset_ids or []):
+            if aid and aid not in seen:
+                seen.add(aid)
+                pool_ids.append(aid)
+
+        # 时长 + 场景点
+        durations: dict[str, float] = {}
+        scene_points: dict[str, list[float]] = {}
+        if pool_ids:
+            for m in db.query(AssetModel).filter(AssetModel.id.in_(pool_ids)).all():
+                durations[m.id] = float(getattr(m, "duration", 0.0) or 0.0)
+                pts = extract_scene_points_from_metadata(getattr(m, "metadata", None))
+                if pts:
+                    scene_points[m.id] = pts
+
+        historical = get_used_segments(db, pool_ids)
+
+        # 创建新 plan（复制模板归属与 config）
+        new_plan = self.create_plan(
+            template_id=source.template_id,
+            name=f"{source.name or '剪辑计划'} · {name_suffix}",
+            config=dict(source.config or {}),
+            total_duration=source.total_duration,
+            project_id=source.project_id or "",
+            created_by_user_id=created_by_user_id or (source.created_by_user_id or ""),
+        )
+
+        # 批次内区间：以源 plan（变体 0）片段为初始避让对象
+        batch_segments: dict[str, list[tuple[float, float]]] = {}
+        for c in clips:
+            if c.asset_id and float(c.duration or 0) > 0:
+                st = float(c.start_time or 0.0)
+                batch_segments.setdefault(c.asset_id, []).append((st, st + float(c.duration)))
+
+        clips_data = reselect_clips_for_variant(
+            source_clips_data,
+            pool_ids,
+            asset_durations=durations,
+            asset_scene_points=scene_points,
+            historical_used_segments=historical,
+            batch_segments=batch_segments,
+            rng=rng,
+        )
+
+        # 片段区间写回素材 metadata（与落库同事务；replace_all_clips_transactional 内 commit）
+        for item in clips_data:
+            aid = item.get("asset_id", "")
+            if aid:
+                st = float(item.get("start_time", 0.0))
+                record_used_segments(db, aid, st, st + float(item.get("duration", 0.0)), new_plan.id)
+
+        self.replace_all_clips_transactional(new_plan.id, clips_data)
+        logger.info(
+            "变体独立选片完成: source=%s new=%s clips=%d assets=%d",
+            source_plan_id,
+            new_plan.id,
+            len(clips_data),
+            len(pool_ids),
+        )
+        return new_plan
+
     def clone_plan_for_variant(
         self,
         source_plan_id: str,

apps/web/src/api/editing-planner/types.ts

@@ -44,8 +44,10 @@ export interface BgmConfig {
 export interface TemplateSegment {
   id?: string
   segment_order: number
-  duration_min: number
-  duration_max: number
+  /** @deprecated 模板无时长概念（#1750 基线）：字段保留仅为兼容旧数据读取，新模板可不传 */
+  duration_min?: number
+  /** @deprecated 同上 */
+  duration_max?: number
   material_type: string | null
 }
 
@@ -59,7 +61,8 @@ export interface EditingTemplate {
   title_config: TitleConfig
   subtitle_config: SubtitleConfig
   bgm_config: BgmConfig
-  estimated_duration: number
+  /** @deprecated 模板无时长概念（#1750 基线）：成片时长由配音时长决定；字段保留兼容旧数据 */
+  estimated_duration?: number
   segments: TemplateSegment[]
   watermark_config?: WatermarkConfig
   intro_outro_config?: IntroOutroConfig
@@ -89,7 +92,8 @@ export interface SaveTemplatePayload {
   title_config: TitleConfig
   subtitle_config: SubtitleConfig
   bgm_config: BgmConfig
-  estimated_duration: number
+  /** @deprecated 模板无时长概念（#1750 基线）：保留兼容旧数据 */
+  estimated_duration?: number
   segments: Omit<TemplateSegment, "id">[]
   watermark_config?: WatermarkConfig
   intro_outro_config?: IntroOutroConfig

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

@@ -0,0 +1,61 @@
+/**
+ * 批量变体剪辑计划 API（#1744）
+ *
+ * 批量预览时向后端申请 N 个变体的「独立剪辑计划片段」：
+ * - 变体 0 保留源 plan（用户在编辑器/智能选片产出的片段，含标题样式编辑结果）；
+ * - 变体 1..N-1 由后端 reselect_plan_for_variant 完整重跑单视频选片流程
+ *   （素材洗牌 + main 片段顺序洗牌 + 镜头/起点随机 + 跨变体 20% 区间避让 +
+ *   素材使用区间写回 metadata），与正式批量生成 POST /generation/tasks?count=N
+ *   使用同一套选片逻辑；
+ * - 正式生成时把 variant_plan_ids 原样回传，后端直接关联这些 plan 渲染，
+ *   不再重新选片 —— 预览所见即成片。
+ *
+ * 该接口只做选片/建 plan（秒级），不触发视频渲染，无渲染成本。
+ * 后端端点未上线（404）或选片失败（素材不足等）时前端降级为本地 variantSeed
+ * 模拟预览，不阻塞用户流程。
+ */
+import apiClient from "../client"
+import type { EditPlanClip } from "../template-editor"
+
+/** 批量变体计划请求体 */
+export interface BatchVariantPlansRequest {
+  template_id: string
+  /** 本批次素材池（手动选择或智能匹配结果） */
+  asset_ids: string[]
+  /** 变体数量（≥1）；=1 时只返回源 plan 片段 */
+  count: number
+  /** 源剪辑计划 ID：优先取预览/草稿关联的 plan；不传由后端按 template_id+user 兜底最新 plan */
+  source_edit_plan_id?: string
+}
+
+/** 单个变体的计划片段 */
+export interface VariantPlan {
+  /** 变体序号，从 0 开始 */
+  variant_index: number
+  /** 该变体关联的剪辑计划 ID（正式生成时回传，实现预览即成片） */
+  plan_id: string
+  /** 该变体的真实片段（顺序/素材/起点与正式成片一致） */
+  clips: EditPlanClip[]
+}
+
+/** 批量变体计划响应 */
+export interface BatchVariantPlansResponse {
+  items: VariantPlan[]
+  total: number
+}
+
+/**
+ * 创建批量变体剪辑计划并返回各变体片段。
+ *
+ * 注意：端点 404（后端未上线）/ 400（素材不足）等失败由调用方 catch 后降级，
+ * 不要抛 unhandled rejection。
+ */
+export async function createBatchVariantPlans(
+  params: BatchVariantPlansRequest,
+): Promise<BatchVariantPlansResponse> {
+  const response = await apiClient.post<BatchVariantPlansResponse>(
+    "/generation/variant-plans",
+    params,
+  )
+  return response.data
+}

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

@@ -100,6 +100,12 @@ export interface CreateGenerationTaskRequest {
   voice_library_ids?: string[]
   /** 各变体独立封面URL：长度1=共用，长度=count=独立，空数组=回退 cover_url */
   cover_urls?: string[]
+  /**
+   * 批量变体剪辑计划 ID（#1744）：预览阶段后端独立选片产出的 plan id 列表
+   * （按变体全量索引，长度=previewCount）。正式生成回传后后端直接关联这些
+   * plan 渲染、不再重新选片，保证预览所见即成片。后端未支持时忽略该字段。
+   */
+  variant_plan_ids?: string[]
 }
 
 /** 单个生成任务详情（对齐后端 GenerationTaskResponse） */

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

@@ -42,8 +42,10 @@ export interface TemplateItem {
 export interface TemplateSegment {
   id?: string
   segment_order: number
-  duration_min: number
-  duration_max: number
+  /** @deprecated 模板无时长概念（#1750 基线）：字段保留仅为兼容旧数据读取 */
+  duration_min?: number
+  /** @deprecated 同上 */
+  duration_max?: number
   material_type: string | null
   description?: string
 }
@@ -55,8 +57,6 @@ export interface TemplateListParams {
   category?: string
   tags?: string
   keyword?: string
-  /** 时长筛选（秒）：short < 30, medium 30-120, long > 120 */
-  duration_range?: "short" | "medium" | "long"
 }
 
 /** 模板列表分页响应 */

apps/web/src/pages/editing-planner/hooks/template-management/usePlanLoading.ts

@@ -108,7 +108,10 @@ export function usePlanLoading({
             id: `seg-${idx}`,
             template_segment_id: `seg-${idx}`,
             type: (seg.material_type === "voiceover" ? "voice" : "pip") as ClipType,
-            duration: (seg.duration_min + seg.duration_max) / 2,
+            duration:
+              seg.duration_min != null && seg.duration_max != null
+                ? (seg.duration_min + seg.duration_max) / 2
+                : 5,
             startOffset: 0,
             script_text: "",
             order: seg.segment_order,

apps/web/src/pages/editing-planner/hooks/template-management/useTemplateDetail.ts

@@ -43,7 +43,10 @@ export function useTemplateDetail({
           id: seg.id || `seg-${idx}`,
           template_segment_id: seg.id || `seg-${idx}`,
           type: (seg.material_type === "voiceover" ? "voice" : "pip") as ClipType,
-          duration: (seg.duration_min + seg.duration_max) / 2,
+          duration:
+            seg.duration_min != null && seg.duration_max != null
+              ? (seg.duration_min + seg.duration_max) / 2
+              : 5,
           startOffset: 0,
           script_text: "",
           order: seg.segment_order,

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

@@ -27,6 +27,8 @@ import { useStepNavigation } from "./hooks/useStepNavigation"
 import { useGenerateVideo } from "./hooks/useGenerateVideo"
 
 import { usePreviewAssets } from "./hooks/usePreviewAssets"
+import { useBatchVariantPlans } from "./hooks/useBatchVariantPlans"
+import { useVariantVoicePreview } from "./hooks/useVariantVoicePreview"
 import { useTitleStyleUpdaters } from "./hooks/useStep4Title/useTitleStyleUpdaters"
 import { getAssetsByKind } from "@/api/assets"
 import { previewTts } from "@/api/tts"
@@ -136,14 +138,17 @@ const GeneratePage: React.FC = () => {
   const variant0Title = isBatch ? previewTitles?.[0] || "" : ""
 
   useEffect(() => {
+    // #1750：批量模式每变体独立/共用配音由 useVariantVoicePreview 接管（含独立模式每卡片挂各自 URL），
+    // 本 effect 只服务单视频，批量模式直接跳过（避免共用 TTS 结果错误下发给所有变体）
+    if (isBatch) return
     const voiceAsset = voiceMaterials.find((m) => m.id === selectedVoice)
     if (voiceAsset?.file_url) {
       setPreviewVoiceAudioUrl(voiceAsset.file_url)
       return
     }
 
-    // 批量模式下 TTS 文案跟随变体0标题；单视频跟随主标题
-    const ttsTitle = isBatch ? variant0Title || "" : titleSettings.title
+    // 单视频 TTS 文案跟随主标题
+    const ttsTitle = titleSettings.title
     const voiceId = selectedClonedVoice || selectedVoice
     if (!voiceId || !ttsTitle) {
       setPreviewVoiceAudioUrl(null)
@@ -213,14 +218,56 @@ const GeneratePage: React.FC = () => {
 
   /* ── 加载素材详情（供前端预览播放器使用） ── */
   const previewAssetsEnabled = previewAssetIds.length > 0
-  const { assets: previewAssets, ready: previewAssetsReady } = usePreviewAssets(
-    previewAssetIds,
-    previewAssetsEnabled,
-  )
+  const {
+    assets: previewAssets,
+    ready: previewAssetsReady,
+    ensureAssets,
+  } = usePreviewAssets(previewAssetIds, previewAssetsEnabled)
 
   /* ── 预览就绪：纯前端 Canvas 预览，素材详情加载完即可秒开（单视频/批量一致） ── */
   const previewReady = previewAssetsReady && !!currentTemplate
 
+  /* ── 批量变体真实片段（#1744）：后端独立选片，预览即成片；失败静默降级本地模拟 ──
+     仅批量（N>1）且在第 4 步预览时申请，避免选素材阶段频繁请求；
+     变体 0 沿用草稿 plan（与单视频一致），变体 1..N-1 后端 reselect 独立选片 */
+  const {
+    clipsByVariant: variantClips,
+    planIdsByVariant: variantPlanIds,
+    loading: variantClipsLoading,
+    error: variantClipsError,
+    retry: retryVariantClips,
+  } = useBatchVariantPlans({
+    enabled: isBatch && currentStep === 4 && previewAssetsReady,
+    count: previewCount,
+    templateId: selectedTemplate || "",
+    assetIds: previewAssetIds,
+    sourcePlanId: storedSourceEditPlanId || sourceEditPlanId || "",
+  })
+
+  /* ── 批量变体配音预览 URL（#1750）：独立模式每变体挂各自配音，共用模式全挂同一条；
+     hook 内部自取配音素材库并做 TTS 缓存/串行/防竞态 */
+  const variantVoiceAudioUrls = useVariantVoicePreview({
+    enabled: isBatch,
+    count: previewCount,
+    perVideo: voiceModePerVideo,
+    sharedVoiceId: selectedVoice || "",
+    clonedVoiceId: selectedClonedVoice || "",
+    variantVoiceIds: voiceLibraryIds || [],
+    titles: previewTitles || [],
+  })
+
+  /* ── 变体计划 clips 引用的素材可能不在已选列表中（#1750）：差集补拉素材详情，
+     保证播放器拿得到 file_url，而不是静默丢片段/用假数据冒充 */
+  const clipAssetIds = useMemo(() => {
+    if (!isBatch || !variantClips?.length) return []
+    const ids = new Set<string>()
+    variantClips.forEach((list) => list.forEach((c) => c.asset_id && ids.add(c.asset_id)))
+    return Array.from(ids)
+  }, [isBatch, variantClips])
+  useEffect(() => {
+    if (clipAssetIds.length > 0) void ensureAssets(clipAssetIds)
+  }, [clipAssetIds, ensureAssets])
+
   /* ── 勾选变体 ── */
   const toggleVariantSelect = useCallback(
     (index: number) => {
@@ -262,6 +309,8 @@ const GeneratePage: React.FC = () => {
     autoSubtitles,
     bgm,
     sourceEditPlanId: storedSourceEditPlanId || sourceEditPlanId,
+    // #1744：批量预览阶段后端为每个变体生成的独立 plan id，正式生成回传 → 预览即成片
+    variantPlanIds,
     previewTaskId,
     bgmConfig,
     previewCount,
@@ -393,7 +442,6 @@ const GeneratePage: React.FC = () => {
               /* 单视频：前端 Canvas 实时预览（与旧版一致，零回归） */
               <FrontendPreviewPlayer
                 assets={previewAssets}
-                template={currentTemplate}
                 videoRatio={videoRatio}
                 ready={previewAssets.length > 0}
                 serverClips={serverClips}
@@ -425,11 +473,14 @@ const GeneratePage: React.FC = () => {
                 <CanvasPreviewGrid
                   count={previewCount}
                   assets={previewAssets}
-                  template={currentTemplate}
                   videoRatio={videoRatio}
                   titles={previewTitles}
                   titleSettings={titleSettings}
-                  voiceAudioUrl={previewVoiceAudioUrl || undefined}
+                  voiceAudioUrls={variantVoiceAudioUrls}
+                  variantClips={variantClips}
+                  clipsLoading={variantClipsLoading}
+                  clipsError={variantClipsError}
+                  onRetryClips={retryVariantClips}
                   selectedIds={selectedVariantIds}
                   onToggleSelect={toggleVariantSelect}
                   selectable={!generating}
@@ -507,12 +558,31 @@ const GeneratePage: React.FC = () => {
         {/* ════ 步骤5/6（单视频）：右侧成片播放器 ════ */}
         {currentStep >= 5 && !isBatch && generated && finalVideo && (
           <div className="xx-generate-right-col">
-            <div className="xx-inline-video-player">
+            <div
+              className="xx-inline-video-player"
+              style={{
+                display: "flex",
+                justifyContent: "center",
+                alignItems: "center",
+                background: "#000",
+                borderRadius: 12,
+                padding: 8,
+              }}
+            >
               <video
                 src={finalVideo.download_url || finalVideo.file_url}
                 controls
                 autoPlay={currentStep === 5}
-                style={{ width: "100%", maxHeight: "70vh", objectFit: "contain", borderRadius: 12 }}
+                // 竖屏自适应（#1750）：成片固定 1080×1920（9:16），元数据到达前按 9:16 占位，
+                // 到达后浏览器按真实宽高比 contain；黑底居中杜绝左右大黑边
+                style={{
+                  width: "auto",
+                  maxWidth: "100%",
+                  maxHeight: "70vh",
+                  aspectRatio: "9 / 16",
+                  objectFit: "contain",
+                  borderRadius: 8,
+                }}
                 poster={finalVideo.thumbnail_url || undefined}
               />
               <div style={{ display: "flex", gap: 8, marginTop: 12, justifyContent: "center" }}>

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

@@ -66,12 +66,32 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
                   </>
                 )}
                 {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}
-                  />
+                  // 竖屏自适应容器（#1750）：成片固定 1080×1920（9:16），
+                  // 视频按真实宽高比 contain 显示，黑底居中，杜绝横屏播放器左右大黑边
+                  <div
+                    style={{
+                      display: "flex",
+                      justifyContent: "center",
+                      alignItems: "center",
+                      background: "#000",
+                      borderRadius: 8,
+                      padding: 8,
+                    }}
+                  >
+                    <video
+                      src={video.download_url || video.file_url}
+                      controls
+                      style={{
+                        width: "auto",
+                        maxWidth: "100%",
+                        maxHeight: "70vh",
+                        aspectRatio: "9 / 16",
+                        borderRadius: 4,
+                        background: "#000",
+                      }}
+                      poster={video.thumbnail_url}
+                    />
+                  </div>
                 )}
                 {task.status === "completed" && !video && (
                   <div className="xx-batch-gen-card-done">✅ 已完成（成片可在下一步选择封面）</div>

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

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

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

@@ -13,18 +13,19 @@ import {
   PauseCircleOutlined,
   SoundOutlined,
   LoadingOutlined,
+  AudioOutlined,
+  AudioMutedOutlined,
 } from "@ant-design/icons"
 import type { AssetItem } from "@/api/assets"
-import type { EditingTemplate } from "@/api/editing-planner"
 import type { EditPlanClip } from "@/api/template-editor"
 import { useSegmentScheduler, type PlaybackSegment } from "../hooks/useSegmentScheduler"
 import { useCanvasPlayer } from "../hooks/useCanvasPlayer"
 
 interface FrontendPreviewPlayerProps {
   assets: AssetItem[]
-  template: EditingTemplate | null
   videoRatio: string
   ready: boolean
+  /** 服务端变体计划真实片段（#1750：必填，无 fallback；批量网格传入各变体自己的 clips） */
   serverClips?: EditPlanClip[]
   voiceAudioUrl?: string
   titleSettings?: {
@@ -42,15 +43,21 @@ interface FrontendPreviewPlayerProps {
   }
   onTitlePositionChange?: (posX: number, posY: number) => void
   /**
-   * 变体种子（批量生成 #1677）：同一批素材在不同变体中采用不同的素材顺序与
-   * 片段起始点，让 N 个 Canvas 预览画面有差异（纯前端随机剪辑模拟，不调后端）。
-   * 0 / 不传 = 单视频，排布与旧版完全一致（零回归）。
+   * 播放互斥 token（#1750）：批量网格中为变体序号（0 起），单视频不传。
+   * 持有播放权的实例播放，其余自动暂停。
    */
-  variantSeed?: number
+  playToken?: number
   /** 变体标题文字（批量时每个预览独立标题，叠加在画面上）；不传用 titleSettings.title */
   variantTitle?: string
   /** 紧凑模式（批量网格中使用，缩小内边距/标题尺寸） */
   compact?: boolean
+  /**
+   * 批量网格播放互斥（#1741/#1750）：当前持有播放权的实例 token（变体序号）。
+   * 持有权变化且不等于自身时，本实例自动暂停（视频+配音）。单视频模式不传。
+   */
+  activePlayToken?: number | null
+  /** 播放权变化回调：本实例请求播放时传自身 playToken，暂停时传 null */
+  onPlayTokenChange?: (token: number | null) => void
 }
 
 function formatTime(seconds: number): string {
@@ -60,108 +67,51 @@ function formatTime(seconds: number): string {
 }
 
 /**
- * 将素材映射为播放片段（复用原逻辑）
+ * 将后端变体计划 clips 映射为播放片段（#1750：唯一数据来源，无本地模拟 fallback）
+ *
+ * 预览不渲染：浏览器按后端真实计划即时播放素材原片，预览即成片。
+ * 模板片段数固定、成片时长=配音时长（后端等比分配），前端不再有任何时长假设。
  */
-/** 简单可复现随机数（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 []
+  if (!assets.length || !serverClips || serverClips.length === 0) return []
 
-  // Build asset lookup map
   const assetMap = new Map(assets.map((a) => [a.id, a]))
-
-  // 优先使用服务端 clips（含随机 start_time 和正确数量），与最终生成结果一致
-  if (serverClips && serverClips.length > 0) {
-    const segments: PlaybackSegment[] = []
-    for (const clip of serverClips) {
-      const asset = assetMap.get(clip.asset_id)
-      if (!asset) continue
-      const assetDuration = asset.duration || asset.metadata?.duration || 30
-      const startTime = clip.start_time || 0
-      const endTime = Math.min(startTime + (clip.duration || assetDuration), assetDuration)
-      const videoUrl = asset.file_url || asset.storage_key
-      segments.push({ assetId: asset.id, videoUrl, startTime, endTime, order: clip.order })
-    }
-    if (segments.length > 0) {
-      return segments.sort((a, b) => a.order - b.order)
-    }
-  }
-
-  // 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]]
-    }
-  }
-
-  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)
-
-    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)
+  for (const clip of serverClips) {
+    const asset = assetMap.get(clip.asset_id)
+    if (!asset) continue
+    const assetDuration = asset.duration || asset.metadata?.duration || 0
+    const startTime = clip.start_time || 0
+    // 片段时长以后端计划为准（配音时长等比分配）；素材时长仅用于兜底钳制边界
+    const clipDuration = clip.duration || 0
+    const endTime =
+      assetDuration > 0
+        ? Math.min(startTime + clipDuration, assetDuration)
+        : startTime + clipDuration
     const videoUrl = asset.file_url || asset.storage_key
-
-    segments.push({ assetId: asset.id, videoUrl, startTime, endTime, order: i })
-  })
-
-  return segments
+    segments.push({ assetId: asset.id, videoUrl, startTime, endTime, order: clip.order })
+  }
+  return segments.sort((a, b) => a.order - b.order)
 }
 
 const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
   assets,
-  template,
   videoRatio,
   ready,
   serverClips,
   voiceAudioUrl,
   titleSettings,
   onTitlePositionChange,
-  variantSeed = 0,
+  playToken,
   variantTitle,
   compact = false,
+  activePlayToken = null,
+  onPlayTokenChange,
 }) => {
-  const segments = useMemo(
-    () => buildPlaybackSegments(assets, template, serverClips, variantSeed),
-    [assets, template, serverClips, variantSeed],
-  )
+  const segments = useMemo(() => buildPlaybackSegments(assets, serverClips), [assets, serverClips])
   // 批量变体：标题文字取 variantTitle，样式仍由全局 titleSettings 控制
   const effectiveTitle = variantTitle ?? titleSettings?.title
 
@@ -339,6 +289,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
     canPlay: videoCanPlay,
     togglePlayPause: videoTogglePlayPause,
     seekTo: videoSeekTo,
+    pause: videoPause,
     videoRefs,
   } = useSegmentScheduler(segments)
 
@@ -353,6 +304,10 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
   // ── 配音音频同步 ──
   const audioRef = useRef<HTMLAudioElement | null>(null)
   const prevIsPlayingRef = useRef(false)
+  // 本卡片静音开关（#1741）：默认有声，用户可点喇叭单独静音某张卡片
+  const [muted, setMuted] = useState(false)
+  // 有配音时 video 素材保持静音（避免原声与配音混音）；无配音时取消静音，素材原声兜底
+  const hasVoice = !!voiceAudioUrl
 
   useEffect(() => {
     if (!voiceAudioUrl) {
@@ -370,7 +325,8 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
     if (audioRef.current.src !== voiceAudioUrl) {
       audioRef.current.src = voiceAudioUrl
     }
-  }, [voiceAudioUrl])
+    audioRef.current.muted = muted
+  }, [voiceAudioUrl, muted])
 
   useEffect(() => {
     const audio = audioRef.current
@@ -409,17 +365,42 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
     [effectiveUseWebCodecs, canvasControls, videoSeekTo],
   )
 
+  // ── 批量网格播放互斥（#1741）：播放权属于其他实例时，本实例自动暂停（视频+配音） ──
+  useEffect(() => {
+    if (activePlayToken == null || playToken == null || activePlayToken === playToken) return
+    if (effectiveUseWebCodecs) {
+      if (canvasState.isPlaying) canvasControls.pause()
+    } else if (isPlaying) {
+      videoPause()
+    }
+    // isPlaying/canvasState.isPlaying 不放依赖：只在 token 变化时执行一次暂停，
+    // token 等于自身时本实例的播放在 handleTogglePlay 里处理
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [activePlayToken, playToken, effectiveUseWebCodecs])
+
   const handleTogglePlay = useCallback(() => {
     if (effectiveUseWebCodecs) {
       if (canvasState.isPlaying) {
         canvasControls.pause()
+        onPlayTokenChange?.(null)
       } else {
+        if (playToken != null) onPlayTokenChange?.(playToken)
         canvasControls.play()
       }
     } else {
+      // video fallback：先上报播放权（暂停其他卡片），再切换本卡片播放/暂停
+      if (playToken != null) onPlayTokenChange?.(isPlaying ? null : playToken)
       videoTogglePlayPause()
     }
-  }, [effectiveUseWebCodecs, canvasState.isPlaying, canvasControls, videoTogglePlayPause])
+  }, [
+    effectiveUseWebCodecs,
+    canvasState.isPlaying,
+    canvasControls,
+    videoTogglePlayPause,
+    isPlaying,
+    playToken,
+    onPlayTokenChange,
+  ])
 
   // ── 进度条拖拽 ──
   const [isDragging, setIsDragging] = useState(false)
@@ -608,7 +589,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
         segments.map((seg, i) => (
           <video
             key={seg.assetId}
-            muted
+            muted={hasVoice || muted}
             ref={(el) => {
               videoRefs.current[i] = el
             }}
@@ -662,8 +643,8 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
                         ? { top: "50%", transform: "translate(-50%, -50%)" }
                         : { bottom: `${titleBottomPct}%` }),
                   }),
-              pointerEvents: onTitlePositionChange && variantSeed === 0 ? "auto" : "none",
-              cursor: onTitlePositionChange && variantSeed === 0 ? "grab" : "default",
+              pointerEvents: onTitlePositionChange && playToken == null ? "auto" : "none",
+              cursor: onTitlePositionChange && playToken == null ? "grab" : "default",
               touchAction: "none",
               userSelect: "none",
               WebkitUserSelect: "none",
@@ -743,6 +724,45 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
         </button>
       )}
 
+      {/* 静音/有声切换（#1741）：左上角，默认有声；批量与单视频均可单独静音 */}
+      {segments.length > 0 && (
+        <button
+          type="button"
+          aria-label={muted ? "取消静音" : "静音"}
+          title={muted ? "取消静音" : "静音"}
+          onClick={() => setMuted((m) => !m)}
+          style={{
+            position: "absolute",
+            top: 8,
+            left: 8,
+            width: compact ? 26 : 30,
+            height: compact ? 26 : 30,
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            background: "rgba(0,0,0,0.45)",
+            backdropFilter: "blur(8px)",
+            WebkitBackdropFilter: "blur(8px)",
+            border: "1px solid rgba(255,255,255,0.1)",
+            borderRadius: "50%",
+            color: muted ? "rgba(255,255,255,0.45)" : "rgba(255,255,255,0.92)",
+            fontSize: compact ? 13 : 15,
+            cursor: "pointer",
+            zIndex: 10,
+            padding: 0,
+            transition: "background 0.15s, color 0.15s",
+          }}
+          onMouseEnter={(e) => {
+            e.currentTarget.style.background = "rgba(0,0,0,0.65)"
+          }}
+          onMouseLeave={(e) => {
+            e.currentTarget.style.background = "rgba(0,0,0,0.45)"
+          }}
+        >
+          {muted ? <AudioMutedOutlined /> : <AudioOutlined />}
+        </button>
+      )}
+
       {/* 片段指示器 — 右上角胶囊 */}
       <div
         style={{
@@ -753,9 +773,9 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
           backdropFilter: "blur(8px)",
           WebkitBackdropFilter: "blur(8px)",
           color: "rgba(255,255,255,0.9)",
-          fontSize: 10,
+          fontSize: compact ? 9 : 10,
           fontWeight: 500,
-          padding: "2px 8px",
+          padding: compact ? "1px 6px" : "2px 8px",
           borderRadius: 999,
           zIndex: 10,
           border: "1px solid rgba(255,255,255,0.1)",
@@ -774,8 +794,8 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
           right: 0,
           display: "flex",
           alignItems: "center",
-          gap: 10,
-          padding: "12px 16px 16px",
+          gap: compact ? 6 : 10,
+          padding: compact ? "8px 10px 10px" : "12px 16px 16px",
           background: "linear-gradient(transparent, rgba(0,0,0,0.7))",
           backdropFilter: "blur(4px)",
           WebkitBackdropFilter: "blur(4px)",
@@ -788,10 +808,10 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
             background: "rgba(255,255,255,0.15)",
             border: "none",
             color: "#fff",
-            fontSize: 16,
+            fontSize: compact ? 14 : 16,
             cursor: "pointer",
-            width: 32,
-            height: 32,
+            width: compact ? 26 : 32,
+            height: compact ? 26 : 32,
             borderRadius: "50%",
             display: "flex",
             alignItems: "center",
@@ -811,9 +831,9 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
 
         <span
           style={{
-            fontSize: 11,
+            fontSize: compact ? 10 : 11,
             color: "rgba(255,255,255,0.85)",
-            minWidth: 72,
+            minWidth: compact ? 58 : 72,
             fontVariantNumeric: "tabular-nums",
             letterSpacing: 0.2,
           }}

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

@@ -1,96 +0,0 @@
-import React from "react"
-import { Typography } from "antd"
-import { PlayCircleOutlined, CloseCircleOutlined } from "@ant-design/icons"
-import type { GeneratedVideo } from "@/api/template-editor"
-import { ProgressIndicator } from "./result-panel/ProgressIndicator"
-import { ResultVideoCard } from "./result-panel/ResultVideoCard"
-
-const { Text } = Typography
-
-interface GenerateResultPanelProps {
-  generated: boolean
-  generating: boolean
-  progress: number
-  generateError: string | null
-  generatedVideos: GeneratedVideo[]
-  onVideoPreview: (video: GeneratedVideo) => void
-  onDownload: () => void
-  onShare: () => void
-  onGoToLibrary: () => void
-}
-
-const GenerateResultPanel: React.FC<GenerateResultPanelProps> = ({
-  generated,
-  generating,
-  progress,
-  generateError,
-  generatedVideos,
-  onVideoPreview,
-  onDownload,
-  onShare,
-  onGoToLibrary,
-}) => {
-  return (
-    <div className="xx-generate-result">
-      <div className="xx-result-header">
-        <h3>生成结果</h3>
-        {generated && generatedVideos.length > 0 && (
-          <span className="xx-result-count">{generatedVideos.length} 个视频</span>
-        )}
-      </div>
-
-      {generating && <ProgressIndicator progress={progress} />}
-
-      {generateError && !generating && (
-        <div className="xx-result-empty">
-          <CloseCircleOutlined style={{ fontSize: 40, color: "#ff4d4f", marginBottom: 12 }} />
-          <Text strong style={{ display: "block", marginBottom: 4 }}>
-            生成失败
-          </Text>
-          <Text style={{ fontSize: 12, color: "var(--text-secondary)" }}>
-            {typeof generateError === "string" ? generateError : "请重试"}
-          </Text>
-        </div>
-      )}
-
-      {!generated && !generating && !generateError && (
-        <div className="xx-result-empty">
-          <PlayCircleOutlined
-            style={{ fontSize: 48, color: "var(--text-tertiary)", marginBottom: 12 }}
-          />
-          <Text style={{ color: "var(--text-secondary)", fontSize: 13 }}>
-            完成配置后点击「确认生成」
-          </Text>
-          <Text style={{ color: "var(--text-tertiary)", fontSize: 12, marginTop: 4 }}>
-            生成的视频将在这里展示
-          </Text>
-        </div>
-      )}
-
-      {generated && generatedVideos.length > 0 && (
-        <div className="xx-video-grid">
-          {generatedVideos.map((video, idx) => (
-            <ResultVideoCard
-              key={video.id || idx}
-              video={video}
-              index={idx}
-              onPreview={onVideoPreview}
-              onDownload={onDownload}
-              onShare={onShare}
-            />
-          ))}
-        </div>
-      )}
-
-      {generated && (
-        <div className="xx-result-footer">
-          <button className="xx-btn xx-btn-ghost xx-btn-block" onClick={onGoToLibrary}>
-            前往成片库 →
-          </button>
-        </div>
-      )}
-    </div>
-  )
-}
-
-export default GenerateResultPanel

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

@@ -1,380 +0,0 @@
-/**
- * 右侧预览视频面板 — 服务器渲染预览架构
- *
- * Step4+: 显示预览面板
- * Step5: 播放服务器渲染的真实视频（POST /generation/preview）
- *
- * 架构：
- * - 进入 Step4/5 时自动创建服务器预览渲染任务
- * - 轮询完成后用 <video> 标签播放返回的 video_url
- * - 标题样式编辑时 CSS TitleOverlay 实时叠加预览
- * - 素材/配音/BGM 变更自动重新渲染
- * - 标题文字/样式变更标记 stale，保留旧视频 + 显示"重新预览"按钮
- *
- * 点"确认生成"时走 confirm 路径，成品就是预览视频本身，100% 一致。
- */
-import React, { useMemo, useRef, useState, useEffect } from "react"
-import { LoadingOutlined, ReloadOutlined, ExclamationCircleOutlined } from "@ant-design/icons"
-import { Button } from "antd"
-import type { TitleSettings } from "../types"
-import { getFontFamily } from "../constants"
-import type { ServerPreviewStatus } from "../hooks/useServerPreview"
-
-interface PreviewVideoPanelProps {
-  /** 服务器预览状态 */
-  previewStatus: ServerPreviewStatus
-  /** 服务器渲染视频 URL */
-  videoUrl: string | null
-  /** 渲染进度 0-100 */
-  progress: number
-  /** 错误信息 */
-  error: string | null
-  /** 重新预览回调 */
-  onRetry: () => void
-  /** 视频比例 */
-  videoRatio: string
-  /** 标题设置 — CSS 实时预览层 */
-  titleSettings?: TitleSettings
-  /** 素材数量 */
-  assetCount?: number
-}
-
-/* ── ASS 坐标系参数（与后端 ass_subtitle_builder.py 一致） ── */
-const TITLE_MARGIN_TOP = 120
-const TITLE_MARGIN_BOTTOM = 60
-const TITLE_MARGIN_SIDE = 40
-
-/** 根据视频比例返回后端实际渲染分辨率（PlayResX × PlayResY） */
-function getResolution(ratio: string): { width: number; height: number } {
-  switch (ratio) {
-    case "16:9":
-      return { width: 1920, height: 1080 }
-    case "1:1":
-      return { width: 1080, height: 1080 }
-    case "9:16":
-    default:
-      return { width: 1080, height: 1920 }
-  }
-}
-
-function getPositionStyle(
-  position: string,
-  playResX: number,
-  playResY: number,
-): React.CSSProperties {
-  const sidePercent = (TITLE_MARGIN_SIDE / playResX) * 100
-  switch (position) {
-    case "bottom":
-      return {
-        bottom: `${(TITLE_MARGIN_BOTTOM / playResY) * 100}%`,
-        left: `${sidePercent}%`,
-        right: `${sidePercent}%`,
-        textAlign: "center",
-      }
-    case "center":
-      return {
-        top: "50%",
-        transform: "translateY(-50%)",
-        left: `${sidePercent}%`,
-        right: `${sidePercent}%`,
-        textAlign: "center",
-      }
-    case "top":
-    default:
-      return {
-        top: `${(TITLE_MARGIN_TOP / playResY) * 100}%`,
-        left: `${sidePercent}%`,
-        right: `${sidePercent}%`,
-        textAlign: "center",
-      }
-  }
-}
-
-function buildTitleStyle(
-  settings: TitleSettings,
-  containerHeight: number,
-  playResY: number,
-): React.CSSProperties {
-  // 字号按容器高度与 PlayResY 的比例缩放，不设上限（与后端一致）
-  const fontSizePx =
-    containerHeight > 0
-      ? (settings.size / playResY) * containerHeight
-      : (settings.size / playResY) * 400
-
-  const base: React.CSSProperties = {
-    fontFamily: getFontFamily(settings.font),
-    fontSize: `${fontSizePx}px`,
-    color: settings.color || "#ffffff",
-    fontWeight: settings.bold ? 700 : 400,
-    fontStyle: settings.italic ? "italic" : "normal",
-    lineHeight: 1.05,
-    wordBreak: "break-word",
-    pointerEvents: "none",
-    userSelect: "none",
-  }
-  if (settings.stroke) base.WebkitTextStroke = "1px #000000"
-  if (settings.shadow) base.textShadow = "2px 2px 4px rgba(0,0,0,0.8)"
-  return base
-}
-
-/** CSS 标题实时预览覆盖层 */
-const TitleOverlay: React.FC<{ titleSettings: TitleSettings; videoRatio: string }> = ({
-  titleSettings,
-  videoRatio,
-}) => {
-  const containerRef = useRef<HTMLDivElement>(null)
-  const [containerHeight, setContainerHeight] = useState(400)
-
-  useEffect(() => {
-    const el = containerRef.current
-    if (!el) return
-    const ro = new ResizeObserver((entries) => {
-      for (const entry of entries) {
-        const h = entry.contentRect.height
-        if (h > 0) setContainerHeight(h)
-      }
-    })
-    ro.observe(el)
-    const rect = el.getBoundingClientRect()
-    if (rect.height > 0) setContainerHeight(rect.height)
-    return () => ro.disconnect()
-  }, [])
-
-  const { width: playResX, height: playResY } = getResolution(videoRatio)
-
-  const positionStyle = useMemo(
-    () => getPositionStyle(titleSettings.position, playResX, playResY),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [titleSettings.position, playResX, playResY],
-  )
-  const titleStyle = useMemo(
-    () => buildTitleStyle(titleSettings, containerHeight, playResY),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
-      containerHeight,
-      titleSettings.font,
-      titleSettings.size,
-      titleSettings.color,
-      titleSettings.bold,
-      titleSettings.italic,
-      titleSettings.stroke,
-      titleSettings.shadow,
-      playResY,
-    ],
-  )
-
-  const displayTitle = titleSettings.title?.trim() || "标题预览"
-
-  return (
-    <div
-      ref={containerRef}
-      style={{
-        position: "absolute",
-        inset: 0,
-        zIndex: 20,
-        pointerEvents: "none",
-        overflow: "hidden",
-      }}
-    >
-      <div style={{ ...positionStyle, ...titleStyle, position: "absolute" }}>
-        {displayTitle.split(/[/／]/).map((part, i) => (
-          <span key={i}>
-            {i > 0 && <br />}
-            {part}
-          </span>
-        ))}
-      </div>
-    </div>
-  )
-}
-
-/* ── 主组件 ── */
-
-export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
-  previewStatus,
-  videoUrl,
-  progress,
-  error,
-  onRetry,
-  videoRatio,
-  titleSettings,
-  assetCount,
-}) => {
-  const videoAspectStyle = { aspectRatio: (videoRatio || "9:16").replace(":", "/") }
-  const isLoading = previewStatus === "loading"
-  const isReady = previewStatus === "ready" || previewStatus === "stale"
-  const isFailed = previewStatus === "failed"
-  const isIdle = previewStatus === "idle"
-  const isStale = previewStatus === "stale"
-
-  return (
-    <div className="xx-generate-preview">
-      <div className="xx-preview-header">
-        <h3>预览视频</h3>
-        {isReady && !isStale && <span className="xx-preview-badge">服务器渲染</span>}
-        {isStale && (
-          <span
-            style={{
-              fontSize: 12,
-              color: "#faad14",
-              display: "flex",
-              alignItems: "center",
-              gap: 4,
-            }}
-          >
-            <ExclamationCircleOutlined /> 配置已变更
-          </span>
-        )}
-        {isLoading && <span className="xx-preview-badge">渲染中</span>}
-      </div>
-
-      <div className="xx-preview-video" style={{ ...videoAspectStyle, position: "relative" }}>
-        {/* 加载中 */}
-        {isLoading && (
-          <div
-            style={{
-              position: "absolute",
-              inset: 0,
-              display: "flex",
-              flexDirection: "column",
-              alignItems: "center",
-              justifyContent: "center",
-              zIndex: 5,
-              background: "rgba(0,0,0,0.6)",
-            }}
-          >
-            <LoadingOutlined style={{ fontSize: 36, color: "#fff" }} spin />
-            <p style={{ marginTop: 12, color: "rgba(255,255,255,0.9)", fontSize: 14 }}>
-              正在渲染预览视频{progress > 0 ? `...${progress}%` : "..."}
-            </p>
-            <p style={{ marginTop: 4, color: "rgba(255,255,255,0.5)", fontSize: 12 }}>
-              首次渲染约需 30-60 秒
-            </p>
-          </div>
-        )}
-
-        {/* 空闲状态（尚未触发预览） */}
-        {isIdle && (
-          <div
-            style={{
-              position: "absolute",
-              inset: 0,
-              display: "flex",
-              flexDirection: "column",
-              alignItems: "center",
-              justifyContent: "center",
-              background: "rgba(0,0,0,0.3)",
-              zIndex: 5,
-            }}
-          >
-            <p style={{ color: "rgba(255,255,255,0.7)", fontSize: 14 }}>等待素材选择...</p>
-          </div>
-        )}
-
-        {/* 服务器渲染的真实视频 */}
-        {isReady && videoUrl && (
-          <video
-            key={videoUrl}
-            src={videoUrl}
-            controls
-            autoPlay
-            loop
-            playsInline
-            style={{
-              width: "100%",
-              height: "100%",
-              objectFit: "contain",
-              position: "absolute",
-              inset: 0,
-              zIndex: 1,
-            }}
-          />
-        )}
-
-        {/* 标题样式实时预览层（仅在有视频时叠加） */}
-        {isReady && titleSettings && (
-          <TitleOverlay titleSettings={titleSettings} videoRatio={videoRatio} />
-        )}
-
-        {/* stale 遮罩：配置变更提示 */}
-        {isStale && (
-          <div
-            style={{
-              position: "absolute",
-              bottom: 0,
-              left: 0,
-              right: 0,
-              padding: "10px 16px",
-              background: "linear-gradient(transparent, rgba(0,0,0,0.85))",
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "space-between",
-              gap: 8,
-              zIndex: 30,
-            }}
-          >
-            <span style={{ color: "rgba(255,255,255,0.9)", fontSize: 12 }}>
-              配置已变更，预览内容可能不是最新
-            </span>
-            <Button size="small" type="primary" icon={<ReloadOutlined />} onClick={onRetry}>
-              重新预览
-            </Button>
-          </div>
-        )}
-
-        {/* 错误状态 */}
-        {isFailed && (
-          <div
-            style={{
-              position: "absolute",
-              inset: 0,
-              display: "flex",
-              flexDirection: "column",
-              alignItems: "center",
-              justifyContent: "center",
-              background: "rgba(0,0,0,0.7)",
-              zIndex: 10,
-              padding: 24,
-            }}
-          >
-            <ExclamationCircleOutlined style={{ fontSize: 40, color: "#ff4d4f" }} />
-            <p
-              style={{
-                marginTop: 12,
-                color: "rgba(255,255,255,0.9)",
-                fontSize: 14,
-                textAlign: "center",
-              }}
-            >
-              {error || "预览渲染失败"}
-            </p>
-            <Button
-              type="primary"
-              icon={<ReloadOutlined />}
-              onClick={onRetry}
-              style={{ marginTop: 12 }}
-            >
-              重新预览
-            </Button>
-          </div>
-        )}
-      </div>
-
-      {/* 素材信息 */}
-      {assetCount !== undefined && assetCount > 0 && (
-        <div className="xx-preview-info">
-          <div className="xx-preview-info-row">
-            <span>素材数</span>
-            <span>{assetCount} 个</span>
-          </div>
-          <div className="xx-preview-info-row">
-            <span>比例</span>
-            <span>{videoRatio}</span>
-          </div>
-        </div>
-      )}
-    </div>
-  )
-}
-
-export default PreviewVideoPanel

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

@@ -37,6 +37,12 @@ const isAiVoice = (item: AssetItem): boolean => {
   return (!duration || duration <= 0) && (!size || size <= 0)
 }
 
+/** 格式化时长（秒 → "14.7秒"；0/无效 → "时长未知"，不做任何时长过滤） */
+const formatDurationSeconds = (seconds?: number): string => {
+  if (!seconds || seconds <= 0) return "时长未知"
+  return `${seconds.toFixed(1)}秒`
+}
+
 /** 格式化文件大小 */
 const formatFileSize = (bytes?: number): string => {
   if (!bytes || bytes <= 0) return "未知"
@@ -261,7 +267,9 @@ const Step5VoiceSelect: React.FC<Step5VoiceSelectProps> = ({
               >
                 {isAiVoice(item) ? (
                   <span style={{ color: "#1677ff", fontWeight: 500 }}>AI 音色</span>
-                ) : null}
+                ) : (
+                  <span>{formatDurationSeconds(getDuration(item))}</span>
+                )}
                 <span>{isAiVoice(item) ? "按文本合成" : formatFileSize(getFileSize(item))}</span>
               </div>
             </div>

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

@@ -91,11 +91,13 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
       shadow: props.titleSettings?.shadow ?? false,
     },
     covers: batchCoversList,
-    onCoversChange: (urls) => {
-      // 按卡片顺序写回对应变体索引
+    onCoversChange: (updater) => {
+      // 按卡片顺序写回对应变体索引；支持函数式 updater（#1750：串行回写避免闭包覆盖）
+      const prevCardView = cardIndexes.map((vi) => (props.previewCovers || [])[vi] || "")
+      const nextCardView = typeof updater === "function" ? updater(prevCardView) : updater
       const next = [...(props.previewCovers || [])]
       cardIndexes.forEach((vi, cardPos) => {
-        next[vi] = urls[cardPos] || ""
+        next[vi] = nextCardView[cardPos] || ""
       })
       props.onPreviewCoversChange?.(next)
     },
@@ -142,7 +144,8 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
           <Button
             buttonType="primary"
             onClick={() => void batchCovers.generateAll()}
-            disabled={completedVideos.length === 0 || batchCovers.loadingIndex !== null}
+            disabled={completedVideos.length === 0 || batchCovers.busyIndexes.length > 0}
+            style={{ whiteSpace: "nowrap", flexShrink: 0 }}
           >
             ✨ 一键全部自动生成
           </Button>
@@ -151,8 +154,8 @@ const Step6CoverSettings: React.FC<Step6CoverSettingsProps> = (props) => {
         <div className="xx-cover-grid">
           {cardIndexes.map((variantIndex, cardPos) => {
             const url = batchCoversList[cardPos]
-            const isLoading = batchCovers.loadingIndex === cardPos
-            const isUploading = batchCovers.uploadingIndex === cardPos
+            const isLoading = batchCovers.busyIndexes.includes(cardPos)
+            const isUploading = batchCovers.uploadingIndexes.includes(cardPos)
             const title = batchTitles[cardPos]
             return (
               <div className="xx-cover-card" key={variantIndex}>

apps/web/src/pages/generate/components/result-panel/ProgressIndicator.tsx

@@ -1,40 +0,0 @@
-import React from "react"
-import { Typography } from "antd"
-
-const { Text } = Typography
-
-interface ProgressIndicatorProps {
-  progress: number
-}
-
-export const ProgressIndicator: React.FC<ProgressIndicatorProps> = ({ progress }) => {
-  return (
-    <div className="xx-result-progress">
-      <div className="xx-progress-circle">
-        <svg viewBox="0 0 80 80">
-          <circle cx="40" cy="40" r="36" fill="none" stroke="var(--border-color)" strokeWidth="6" />
-          <circle
-            cx="40"
-            cy="40"
-            r="36"
-            fill="none"
-            stroke="var(--primary-color)"
-            strokeWidth="6"
-            strokeDasharray={`${Math.round(progress) * 2.26} 226`}
-            strokeLinecap="round"
-            transform="rotate(-90 40 40)"
-          />
-        </svg>
-        <span className="xx-progress-percent">{Math.round(progress)}%</span>
-      </div>
-      <div className="xx-progress-text">
-        <Text strong style={{ fontSize: 14, display: "block", marginBottom: 4 }}>
-          正在生成视频
-        </Text>
-        <Text style={{ fontSize: 12, color: "var(--text-secondary)" }}>
-          AI 正在处理素材，请稍候…
-        </Text>
-      </div>
-    </div>
-  )
-}

apps/web/src/pages/generate/components/result-panel/ResultVideoCard.tsx

@@ -1,63 +0,0 @@
-import React from "react"
-import { PlayCircleOutlined, DownloadOutlined, ShareAltOutlined } from "@ant-design/icons"
-import type { GeneratedVideo } from "@/api/template-editor"
-import { formatDuration } from "@/api/voice-clone"
-
-interface ResultVideoCardProps {
-  video: GeneratedVideo
-  index: number
-  onPreview: (video: GeneratedVideo) => void
-  onDownload: () => void
-  onShare: () => void
-}
-
-export const ResultVideoCard: React.FC<ResultVideoCardProps> = ({
-  video,
-  index,
-  onPreview,
-  onDownload,
-  onShare,
-}) => {
-  return (
-    <div className="xx-video-card" onClick={() => onPreview(video)}>
-      <div className="xx-video-thumb">
-        {video.thumbnail_url ? (
-          <img src={video.thumbnail_url} alt="" />
-        ) : (
-          <div className="xx-video-thumb-placeholder">
-            <PlayCircleOutlined style={{ fontSize: 32, opacity: 0.5 }} />
-          </div>
-        )}
-        <div className="xx-video-play-overlay">
-          <PlayCircleOutlined style={{ fontSize: 36, color: "#fff" }} />
-        </div>
-        {video.duration && (
-          <span className="xx-video-duration">{formatDuration(video.duration)}</span>
-        )}
-      </div>
-      <div className="xx-video-info">
-        <div className="xx-video-title">视频 {index + 1}</div>
-        <div className="xx-video-actions">
-          <button
-            className="xx-video-action-btn"
-            onClick={(e) => {
-              e.stopPropagation()
-              onDownload()
-            }}
-          >
-            <DownloadOutlined />
-          </button>
-          <button
-            className="xx-video-action-btn"
-            onClick={(e) => {
-              e.stopPropagation()
-              onShare()
-            }}
-          >
-            <ShareAltOutlined />
-          </button>
-        </div>
-      </div>
-    </div>
-  )
-}

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

@@ -3282,13 +3282,24 @@
 /* ============================================================
    批量前端 Canvas 预览网格（Issue #1677 修正：纯前端实时预览）
    ============================================================ */
+/* #1741：卡片整体缩小至约 3/5——宽屏排 3 列（卡片限宽 220px 居中），
+   中屏自动回退 2 列，窄屏 1 列（见下方媒体查询）；卡片保持 9:16 比例不变形 */
 .xx-canvas-grid {
   display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 16px;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 220px));
+  justify-content: center;
+  gap: 14px;
+}
+
+/* 窄屏单列时卡片限宽居中，避免 1fr 拉伸导致卡片过高 */
+@media (max-width: 960px) {
+  .xx-canvas-grid {
+    grid-template-columns: minmax(0, 320px);
+  }
 }
 
 .xx-canvas-grid-card {
+  position: relative;
   border: 2px solid var(--border-primary, #e2e8f0);
   border-radius: 12px;
   overflow: hidden;
@@ -3330,6 +3341,37 @@
   accent-color: var(--primary-color, #1677ff);
 }
 
+/* #1750：批量变体片段加载/错误占位（9:16 竖屏比例，与播放器卡片同尺寸防塌陷） */
+.xx-variant-clips-status {
+  position: relative;
+  width: 100%;
+  aspect-ratio: 9 / 16;
+  max-height: 70vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+  font-size: 13px;
+  color: rgba(255, 255, 255, 0.75);
+  background: #0a0a0a;
+  border-radius: 16px;
+  overflow: hidden;
+  box-shadow:
+    0 4px 6px -1px rgba(0, 0, 0, 0.3),
+    0 20px 50px -12px rgba(0, 0, 0, 0.5),
+    inset 0 0 0 1px rgba(255, 255, 255, 0.06);
+}
+
+.xx-variant-clips-status .anticon {
+  font-size: 22px;
+}
+
+.xx-variant-clips-error-text {
+  color: rgba(255, 255, 255, 0.85);
+  font-size: 13px;
+}
+
 /* ============================================================
    批量标题：AI 一键生成行（Issue #1677）
    ============================================================ */
@@ -3435,9 +3477,8 @@
   word-break: break-word;
 }
 
-/* ── 响应式：窄屏批量网格回退单列 ── */
+/* ── 响应式：窄屏批量网格回退单列（.xx-canvas-grid 的窄屏限宽见网格定义处 #1741） ── */
 @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

@@ -42,6 +42,12 @@ export interface UseGenerateVideoProps {
   variantCoverUrls?: string[]
   /** 勾选要生成的变体索引（批量模式） */
   selectedVariantIndexes?: number[]
+  /**
+   * 批量变体剪辑计划 ID（#1744，按变体全量索引长度=previewCount）：
+   * 预览阶段后端独立选片产出，正式生成按勾选顺序回传，实现预览即成片；
+   * 为空（降级本地模拟/后端未上线）时不传，后端自行独立选片。
+   */
+  variantPlanIds?: string[]
 }
 
 /** 生成阶段 */

apps/web/src/pages/generate/hooks/step2-materials/useSmartMatch.ts

@@ -13,21 +13,22 @@ interface UseSmartMatchOptions {
 }
 
 /** 默认 limit（拿不到目标时长时的兜底上限） */
-const DEFAULT_LIMIT = 10
-/** 每个素材切片按 15 秒估算所需素材数 */
-const SECONDS_PER_ASSET = 15
+const DEFAULT_LIMIT = 30
+/**
+ * 候选池放大倍数（#1744）：批量 N 个变体独立选片、跨变体 20% 区间避让需要
+ * 足够大的素材池才能保证 N 条成片素材排布互不相同（历史已用区间写回素材 metadata）。
+ * 旧规则「总时长/15 秒」只够 1 条成片的选片量，池太小会导致变体间大量复用同区间。
+ */
+const ASSET_POOL_MULTIPLIER = 3
 
 /**
- * 根据模板 segments 计算所需素材数量上限。
- * 取每个 segment 的 duration_min 之和作为目标视频总时长，
- * 再按 15 秒/素材估算需要多少个素材，且保证不少于片段数（每个片段至少 1 个素材）；
- * 结果钳制到 [1, 200] 区间（后端 limit 上限 200）。
+ * 根据模板 segments 计算智能匹配候选素材数量上限（#1750：模板无时长概念）。
+ * 候选池 = 片段数 × 3：每个片段至少 3 个候选素材供变体间洗牌/避让
+ * （独立选片 + 区间不重叠）；结果钳制到 [1, 200] 区间（后端 limit 上限 200）。
  */
-function computeLimitFromSegments(segments?: TemplateSegment[]): number {
+export function computeLimitFromSegments(segments?: TemplateSegment[]): number {
   if (!segments || segments.length === 0) return DEFAULT_LIMIT
-  const totalSeconds = segments.reduce((sum, seg) => sum + (seg.duration_min || 0), 0)
-  if (totalSeconds <= 0) return DEFAULT_LIMIT
-  const limit = Math.max(segments.length, Math.ceil(totalSeconds / SECONDS_PER_ASSET))
+  const limit = segments.length * ASSET_POOL_MULTIPLIER
   return Math.max(1, Math.min(limit, 200))
 }
 

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

@@ -1,6 +1,13 @@
 /**
- * 批量封面 Hook（Issue #1677）
+ * 批量封面 Hook（Issue #1677 / #1750 修复）
  * N 个视频时：逐个自动生成封面（从对应成片抽帧 + 叠加对应标题）或上传自定义封面
+ *
+ * #1750 修复：
+ * - patchCover 改为函数式 updater 回写（onCoversChange 支持 (prev)=>next），
+ *   修复串行 generateAll 时闭包捕获旧 covers 数组导致回写互相覆盖的 bug；
+ * - loading/uploading 状态改数组（busyIndexes/uploadingIndexes），支持多个卡片在途；
+ * - generateOne 返回 boolean，generateAll 据此统计成功/失败数量分级提示，单个失败不阻塞；
+ * - generateAll 一次点击即处理所有未生成封面（无需点 3 次）。
  */
 import { useCallback, useState } from "react"
 import { message } from "antd"
@@ -8,6 +15,9 @@ import { generateCover } from "@/api/generation"
 import { uploadAssetDirect, getAssetLibraries } from "@/api/assets"
 import type { GeneratedVideo } from "@/api/template-editor"
 
+/** onCoversChange 支持直接传值或函数式 updater（函数式用于串行回写避免闭包覆盖） */
+type CoversChangeFn = (updater: string[] | ((prev: string[]) => string[])) => void
+
 interface UseBatchCoversOptions {
   selectedTemplate: string
   generatedVideos: GeneratedVideo[]
@@ -24,7 +34,7 @@ interface UseBatchCoversOptions {
     shadow: boolean
   }
   covers: string[]
-  onCoversChange: (urls: string[]) => void
+  onCoversChange: CoversChangeFn
 }
 
 export function useBatchCovers({
@@ -35,28 +45,46 @@ export function useBatchCovers({
   covers,
   onCoversChange,
 }: UseBatchCoversOptions) {
-  const [loadingIndex, setLoadingIndex] = useState<number | null>(null)
-  const [uploadingIndex, setUploadingIndex] = useState<number | null>(null)
+  /** 正在自动生成封面的变体序号集合（数组支持多个卡片同时在途） */
+  const [busyIndexes, setBusyIndexes] = useState<number[]>([])
+  /** 正在上传自定义封面的变体序号集合 */
+  const [uploadingIndexes, setUploadingIndexes] = useState<number[]>([])
 
+  const addBusy = useCallback((i: number) => {
+    setBusyIndexes((prev) => (prev.includes(i) ? prev : [...prev, i]))
+  }, [])
+  const removeBusy = useCallback((i: number) => {
+    setBusyIndexes((prev) => prev.filter((x) => x !== i))
+  }, [])
+  const addUploading = useCallback((i: number) => {
+    setUploadingIndexes((prev) => (prev.includes(i) ? prev : [...prev, i]))
+  }, [])
+  const removeUploading = useCallback((i: number) => {
+    setUploadingIndexes((prev) => prev.filter((x) => x !== i))
+  }, [])
+
+  /** 函数式回写单个封面位置（基于最新 prev，不受闭包旧值影响） */
   const patchCover = useCallback(
     (index: number, url: string) => {
-      const next = [...covers]
-      next[index] = url
-      onCoversChange(next)
+      onCoversChange((prev) => {
+        const next = [...prev]
+        next[index] = url
+        return next
+      })
     },
-    [covers, onCoversChange],
+    [onCoversChange],
   )
 
-  /** 为第 index 个视频自动生成封面 */
+  /** 为第 index 个视频自动生成封面；返回是否成功（供 generateAll 统计） */
   const generateOne = useCallback(
-    async (index: number) => {
+    async (index: number): Promise<boolean> => {
       const finalVideos = generatedVideos.filter((v) => v.status === "completed")
       const target = finalVideos[index] || generatedVideos[index]
       if (!target) {
         message.warning("该视频尚未生成完成")
-        return
+        return false
       }
-      setLoadingIndex(index)
+      addBusy(index)
       try {
         const titleText = titles[index] || ""
         const response = await generateCover(selectedTemplate, {
@@ -82,23 +110,25 @@ export function useBatchCovers({
         if (url) {
           patchCover(index, url)
           message.success(`视频 ${index + 1} 封面生成成功`)
-        } else {
-          message.warning(`视频 ${index + 1} 封面生成未返回图片，请重试`)
+          return true
         }
+        message.warning(`视频 ${index + 1} 封面生成未返回图片，请重试`)
+        return false
       } catch (err) {
         console.error(`[封面] 视频 ${index + 1} 生成失败:`, err)
         message.error(`视频 ${index + 1} 封面生成失败，请重试`)
+        return false
       } finally {
-        setLoadingIndex(null)
+        removeBusy(index)
       }
     },
-    [generatedVideos, titles, titleStyle, selectedTemplate, patchCover],
+    [generatedVideos, titles, titleStyle, selectedTemplate, patchCover, addBusy, removeBusy],
   )
 
   /** 为第 index 个视频上传自定义封面 */
   const uploadOne = useCallback(
     async (index: number, file: File) => {
-      setUploadingIndex(index)
+      addUploading(index)
       try {
         const libs = await getAssetLibraries()
         const imageLib = libs.find((l) => l.kind === "image") || libs[0]
@@ -121,26 +151,43 @@ export function useBatchCovers({
         console.error(`[封面] 视频 ${index + 1} 上传失败:`, err)
         message.error("封面上传失败，请重试")
       } finally {
-        setUploadingIndex(null)
+        removeUploading(index)
       }
     },
-    [patchCover],
+    [patchCover, addUploading, removeUploading],
   )
 
-  /** 一键全部自动生成（串行，避免队列限流） */
+  /** 一键全部自动生成（串行，避免队列限流；单个失败不阻塞，结束后分级提示） */
   const generateAll = useCallback(async () => {
     const finalVideos = generatedVideos.filter((v) => v.status === "completed")
-    for (let i = 0; i < finalVideos.length; i++) {
-      if (covers[i]) continue // 已有封面跳过
+    const total = finalVideos.length
+    // 待处理：基于调用时刻的 covers 快照判断（已有封面跳过）；
+    // 回写走函数式 updater，循环内不再依赖可能过期的 covers 闭包
+    const pending = finalVideos.map((_, i) => i).filter((i) => !covers[i])
+    if (pending.length === 0) {
+      message.info("所有视频封面已生成")
+      return
+    }
+    let okCount = 0
+    let failCount = 0
+    for (const i of pending) {
       // eslint-disable-next-line no-await-in-loop
-      await generateOne(i)
+      const ok = await generateOne(i)
+      if (ok) okCount += 1
+      else failCount += 1
+    }
+    if (failCount === 0) {
+      message.success(`全部 ${total} 个封面已生成`)
+    } else if (okCount === 0) {
+      message.error("封面生成全部失败，请重试")
+    } else {
+      message.warning(`已生成 ${okCount} 个封面，${failCount} 个失败，请对失败项重试`)
     }
-    message.success("全部封面已生成")
   }, [generatedVideos, covers, generateOne])
 
   return {
-    loadingIndex,
-    uploadingIndex,
+    busyIndexes,
+    uploadingIndexes,
     generateOne,
     uploadOne,
     generateAll,

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

@@ -0,0 +1,153 @@
+/**
+ * 批量变体真实片段 Hook（#1744 接入 / #1750 修正）
+ *
+ * 批量预览（N>1）进入第 4 步时，向后端轻量接口 POST /generation/variant-plans
+ * 申请 N 个变体的独立剪辑计划片段：
+ * - 接口只做选片/建 plan（秒级），不渲染视频，无渲染成本；
+ * - 选片逻辑与正式批量生成（POST /generation/tasks?count=N）完全同源
+ *   （reselect_plan_for_variant：素材洗牌 + main 片段洗牌 + 起点随机 +
+ *   跨变体 20% 区间避让 + 使用区间写回素材 metadata），
+ *   因此前端按这些 clips 播放的预览与最终成片一致；
+ * - 正式生成时把 plan_ids 回传，后端直接关联预览 plan 渲染，不再重新选片。
+ *
+ * 错误处理（#1750 基线：严禁用前端假数据冒充预览）：
+ * - 端点 404（后端未上线）/ 400 / 网络错误 / 超时：一律置 error 状态，
+ *   UI 显示「预览加载失败，请重试」，不再静默降级本地模拟；
+ * - 单个变体 clips 为空同样视为加载失败（计划数据不完整）。
+ *
+ * N=1 不调用本 hook（单视频零回归）。
+ */
+import { useCallback, useEffect, useRef, useState } from "react"
+import type { EditPlanClip } from "@/api/template-editor"
+import { createBatchVariantPlans, type VariantPlan } from "@/api/generation/variantPlans"
+
+export interface BatchVariantClipsState {
+  /** 各变体的服务端真实片段（按 variant_index 排序）；未就绪为空数组 */
+  clipsByVariant: EditPlanClip[][]
+  /** 各变体的 plan_id（正式生成回传，保证预览即成片）；未就绪为空串 */
+  planIdsByVariant: string[]
+  /** 是否正在向后端申请变体计划 */
+  loading: boolean
+  /** 后端真实片段是否全部可用（每个变体都有 ≥1 条片段） */
+  ready: boolean
+  /** 加载失败（端点未上线/网络错误/数据不完整）；true 时 UI 显示错误态+重试 */
+  error: boolean
+  /** 用户点击「重试」：强制重新申请变体计划 */
+  retry: () => void
+}
+
+interface UseBatchVariantPlansOptions {
+  /** 是否启用：仅批量（count>1）且素材已选时为 true */
+  enabled: boolean
+  count: number
+  templateId: string
+  assetIds: string[]
+  /** 源剪辑计划 ID（草稿/预览关联），无则空串由后端兜底最新 plan */
+  sourcePlanId?: string
+}
+
+export function useBatchVariantPlans({
+  enabled,
+  count,
+  templateId,
+  assetIds,
+  sourcePlanId = "",
+}: UseBatchVariantPlansOptions): BatchVariantClipsState {
+  const [clipsByVariant, setClipsByVariant] = useState<EditPlanClip[][]>([])
+  const [planIdsByVariant, setPlanIdsByVariant] = useState<string[]>([])
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState(false)
+
+  const requestSeqRef = useRef(0)
+  // 记录上次成功申请的入参指纹，素材/数量未变时不重复请求
+  const lastKeyRef = useRef("")
+  // 重试计数（state）：用户点重试时 +1，驱动 effect 重新发起请求（即使指纹相同）；
+  // 用 state 而非 ref + 直接调 load，避免 retry 与 effect 双发导致 seq 竞争
+  const [retryNonce, setRetryNonce] = useState(0)
+
+  const load = useCallback(async () => {
+    const seq = ++requestSeqRef.current
+    setLoading(true)
+    setError(false)
+    try {
+      const resp = await createBatchVariantPlans({
+        template_id: templateId,
+        asset_ids: assetIds,
+        count,
+        ...(sourcePlanId ? { source_edit_plan_id: sourcePlanId } : {}),
+      })
+      if (seq !== requestSeqRef.current) return
+
+      const items: VariantPlan[] = Array.isArray(resp.items) ? resp.items : []
+      const clips: EditPlanClip[][] = Array.from({ length: count }, () => [])
+      const planIds: string[] = Array.from({ length: count }, () => "")
+      for (const item of items) {
+        const idx = item.variant_index
+        if (idx < 0 || idx >= count) continue
+        planIds[idx] = item.plan_id || ""
+        clips[idx] = (item.clips || [])
+          .filter((c) => c && c.asset_id && c.status === "ready")
+          .sort((a, b) => a.order - b.order)
+      }
+      // 数据完整性校验：每个变体都必须有真实片段，否则视为失败（不允许假数据冒充）
+      const incomplete = clips.some((list) => list.length === 0)
+      if (incomplete) {
+        console.warn("[useBatchVariantPlans] 变体计划数据不完整（存在空片段变体），标记加载失败")
+        setClipsByVariant([])
+        setPlanIdsByVariant([])
+        setError(true)
+      } else {
+        setClipsByVariant(clips)
+        setPlanIdsByVariant(planIds)
+        setError(false)
+      }
+    } catch (err) {
+      if (seq !== requestSeqRef.current) return
+      // 404（后端端点未上线）/ 400（参数错误）/ 网络错误 / 超时：统一错误态
+      console.warn("[useBatchVariantPlans] 申请变体计划失败，预览加载失败:", err)
+      setClipsByVariant([])
+      setPlanIdsByVariant([])
+      setError(true)
+    } finally {
+      if (seq === requestSeqRef.current) setLoading(false)
+    }
+  }, [templateId, count, sourcePlanId, assetIds])
+
+  /** 用户点击「重试」：nonce +1 驱动 effect 重新发起请求（effect 内 lastKey 校验保证只发一次） */
+  const retry = useCallback(() => {
+    setRetryNonce((n) => n + 1)
+  }, [])
+
+  useEffect(() => {
+    if (!enabled || !templateId || assetIds.length === 0 || count <= 1) {
+      requestSeqRef.current += 1
+      // 函数式更新：已是目标值时返回 prev（Object.is 相等 React 跳过渲染），
+      // 避免父组件传入内联字面量数组导致 effect 每次 render 触发 → 无限 setState 循环
+      setClipsByVariant((prev) => (prev.length === 0 ? prev : []))
+      setPlanIdsByVariant((prev) => (prev.length === 0 ? prev : []))
+      setLoading((prev) => (prev === false ? prev : false))
+      setError((prev) => (prev === false ? prev : false))
+      lastKeyRef.current = ""
+      return
+    }
+    const key = `${retryNonce}|${templateId}|${count}|${sourcePlanId}|${[...assetIds]
+      .sort()
+      .join(",")}`
+    if (key === lastKeyRef.current) return
+    lastKeyRef.current = key
+    load()
+  }, [enabled, templateId, count, sourcePlanId, assetIds, load, retryNonce])
+
+  const ready = !error && !loading && clipsByVariant.every((list) => list.length > 0)
+
+  return {
+    clipsByVariant,
+    planIdsByVariant,
+    loading,
+    ready,
+    error,
+    retry,
+  }
+}
+
+export default useBatchVariantPlans

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

@@ -178,6 +178,14 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
         isBatch && props.variantCoverUrls?.length
           ? indexes.map((i) => props.variantCoverUrls![i] || "")
           : []
+      // #1744 变体 plan 数组：预览阶段后端独立选片产出的 plan id，按勾选顺序回传，
+      // 后端直接关联这些 plan 渲染（不再重新选片）→ 预览所见即成片。
+      // 全部为空（降级本地模拟/后端端点未上线）时不传，后端走自身独立选片。
+      const variantPlansArr =
+        isBatch && props.variantPlanIds?.length
+          ? indexes.map((i) => props.variantPlanIds![i] || "")
+          : []
+      const hasVariantPlans = variantPlansArr.some((id) => !!id)
 
       try {
         const taskResp = await createGenerationTask({
@@ -200,6 +208,7 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
           ...(titlesArr.length ? { titles: titlesArr } : {}),
           ...(voiceArr.length ? { voice_library_ids: voiceArr } : {}),
           ...(coversArr.length ? { cover_urls: coversArr } : {}),
+          ...(hasVariantPlans ? { variant_plan_ids: variantPlansArr } : {}),
           ...(props.titleSettings?.title
             ? {
                 title_config: {

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

@@ -44,6 +44,12 @@ interface UsePreviewAssetsReturn {
   ready: boolean
   /** 手动触发重新加载 */
   reload: () => void
+  /**
+   * 差集补拉（#1750）：后端变体计划 clips 可能引用不在用户已选列表中的素材
+   * （跨素材库选片/素材池扩展），发现 assets 中缺失的 asset_id 时补拉详情并合并，
+   * 保证预览播放器拿得到素材文件 URL，而不是静默丢片段。
+   */
+  ensureAssets: (ids: string[]) => Promise<void>
 }
 
 /**
@@ -91,11 +97,41 @@ export function usePreviewAssets(assetIds: string[], enabled: boolean): UsePrevi
     }
   }, [stableAssetIds, enabled])
 
+  // 补拉用独立序号：不干扰主 load 的竞态守卫
+  const ensureSeqRef = useRef(0)
+  const assetsRef = useRef<AssetItem[]>([])
+  useEffect(() => {
+    assetsRef.current = assets
+  }, [assets])
+
+  /**
+   * 差集补拉（#1750）：变体计划 clips 引用的 asset_id 不在当前素材列表时，
+   * 补拉素材详情并去重合并（不静默丢片段、不用假数据冒充）。
+   */
+  const ensureAssets = useCallback(async (ids: string[]) => {
+    const validIds = ids.filter((id): id is string => typeof id === "string" && id.length > 0)
+    if (!validIds.length) return
+    const seq = ++ensureSeqRef.current
+    const missing = Array.from(new Set(validIds)).filter(
+      (id) => !assetsRef.current.some((a) => a.id === id),
+    )
+    if (!missing.length) return
+    const fetched = await fetchAssetsByIds(missing)
+    if (seq !== ensureSeqRef.current || !fetched.length) return
+    const existing = new Set(assetsRef.current.map((a) => a.id))
+    const additions = fetched.filter((a) => !existing.has(a.id))
+    if (!additions.length) return
+    const merged = [...assetsRef.current, ...additions]
+    assetsRef.current = merged
+    setAssets(merged)
+    setReady(merged.length > 0)
+  }, [])
+
   useEffect(() => {
     load()
   }, [load])
 
-  return { assets, loading, ready, reload: load }
+  return { assets, loading, ready, reload: load, ensureAssets }
 }
 
 /**

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

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

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

@@ -0,0 +1,166 @@
+/**
+ * 批量变体配音预览音频解析（#1750）
+ *
+ * 独立配音模式下每个变体挂载各自的配音 URL：
+ * - 配音素材（voice 资产，有 file_url）→ 直接用素材文件 URL；
+ * - AI 音色（预置/克隆，无实体文件）→ 按该变体自己的标题调 /tts/preview 合成；
+ * - 共用模式下所有变体解析为同一条（等价于旧 previewVoiceAudioUrl）。
+ *
+ * N=1 不使用本 hook（单视频配音预览逻辑在 GeneratePage 内保持不变，零回归）。
+ */
+import { useEffect, useRef, useState } from "react"
+import { useQuery } from "@tanstack/react-query"
+import { getAssetsByKind } from "@/api/assets"
+import type { AssetItem } from "@/api/assets"
+import { previewTts } from "@/api/tts"
+
+interface UseVariantVoicePreviewOptions {
+  /** 是否批量模式（count>1） */
+  enabled: boolean
+  /** 变体数量 */
+  count: number
+  /** 是否每个视频独立配音 */
+  perVideo: boolean
+  /** 共用配音 ID（独立模式下为变体 0 的配音） */
+  sharedVoiceId: string
+  /** 克隆音色 ID 覆盖（共用模式，与旧逻辑一致：selectedClonedVoice || selectedVoice） */
+  clonedVoiceId?: string
+  /** 各变体独立配音 ID（独立模式）；长度不足时回退共用 */
+  variantVoiceIds: string[]
+  /** 各变体标题（TTS 合成文案源） */
+  titles: string[]
+}
+
+/** 稳定的空数组常量：避免 useQuery 数据未就绪时每次渲染产生新引用导致 effect 无限触发 */
+const EMPTY_VOICE_MATERIALS: AssetItem[] = []
+
+/** 判断配音 ID 是否对应实体素材（有 file_url）；否则视为 AI 音色需 TTS */
+function findMaterialUrl(id: string, materials: AssetItem[]): string | null {
+  if (!id) return null
+  const m = materials.find((x) => x.id === id)
+  return m?.file_url || null
+}
+
+export function useVariantVoicePreview({
+  enabled,
+  count,
+  perVideo,
+  sharedVoiceId,
+  clonedVoiceId = "",
+  variantVoiceIds,
+  titles,
+}: UseVariantVoicePreviewOptions): (string | null)[] {
+  const [urls, setUrls] = useState<(string | null)[]>([])
+  // 配音素材库：组件内部自取，避免调用方传入不稳定数组引用导致 effect 反复触发
+  const { data: voiceMaterialsData } = useQuery({
+    queryKey: ["assets", "voice"],
+    queryFn: () => getAssetsByKind("voice", { limit: 50 }),
+  })
+  const voiceMaterials: AssetItem[] = voiceMaterialsData ?? EMPTY_VOICE_MATERIALS
+  // 已缓存的 TTS 结果：key = `${voiceId}|${title}`，避免重复合成
+  const ttsCacheRef = useRef<Map<string, string>>(new Map())
+  // 在途请求 AbortController
+  const abortRef = useRef<AbortController | null>(null)
+  const seqRef = useRef(0)
+
+  useEffect(() => {
+    if (!enabled || count <= 1) {
+      setUrls((prev) => (prev.length === 0 ? prev : []))
+      return
+    }
+
+    const seq = ++seqRef.current
+    abortRef.current?.abort()
+    const controller = new AbortController()
+    abortRef.current = controller
+
+    // 每个变体实际使用的配音 ID
+    const voiceIds = Array.from({ length: count }, (_, i) =>
+      perVideo ? variantVoiceIds[i] || sharedVoiceId : sharedVoiceId,
+    )
+
+    // 先用素材 URL 同步填充；AI 音色位置先置 null，待 TTS 完成
+    const result: (string | null)[] = voiceIds.map((id, i) => {
+      const materialUrl = findMaterialUrl(id, voiceMaterials)
+      if (materialUrl) return materialUrl
+      // 共用模式下克隆音色 ID 可能与 selectedVoice 不同（与旧 useEffect 逻辑一致）
+      if (!perVideo && i === 0 && clonedVoiceId) {
+        return findMaterialUrl(clonedVoiceId, voiceMaterials)
+      }
+      return null
+    })
+
+    // 收集需要 TTS 的变体：无素材 URL 且有标题且有音色 ID
+    const ttsJobs: { index: number; voiceId: string; title: string }[] = []
+    voiceIds.forEach((id, i) => {
+      if (result[i]) return
+      // 共用模式沿用旧逻辑：voice_id = selectedClonedVoice || selectedVoice
+      const ttsVoiceId = !perVideo && i === 0 ? clonedVoiceId || id : id
+      const title = titles[i] || ""
+      if (!ttsVoiceId || !title) return
+      ttsJobs.push({ index: i, voiceId: ttsVoiceId, title })
+    })
+
+    setUrls((prev) =>
+      prev.length === result.length && prev.every((v, i) => v === result[i]) ? prev : result,
+    )
+
+    if (ttsJobs.length === 0) return
+
+    let cancelled = false
+    void (async () => {
+      // 串行 TTS，避免瞬间 N 个合成请求打爆后端
+      for (const job of ttsJobs) {
+        const cacheKey = `${job.voiceId}|${job.title}`
+        const cached = ttsCacheRef.current.get(cacheKey)
+        if (cached) {
+          if (seq === seqRef.current) {
+            setUrls((prev) => {
+              if (prev[job.index] === cached) return prev
+              const next = [...prev]
+              next[job.index] = cached
+              return next
+            })
+          }
+          continue
+        }
+        try {
+          // eslint-disable-next-line no-await-in-loop
+          const res = await previewTts({ text: job.title, voice_id: job.voiceId })
+          if (cancelled || controller.signal.aborted || seq !== seqRef.current) return
+          const audioUrl = res.audio_url || ""
+          if (audioUrl) {
+            ttsCacheRef.current.set(cacheKey, audioUrl)
+            setUrls((prev) => {
+              if (prev[job.index] === audioUrl) return prev
+              const next = [...prev]
+              next[job.index] = audioUrl
+              return next
+            })
+          }
+        } catch (err) {
+          if (cancelled || controller.signal.aborted || seq !== seqRef.current) return
+          console.warn(`[变体${job.index + 1}预览配音生成失败]`, err)
+        }
+      }
+    })()
+
+    return () => {
+      cancelled = true
+      controller.abort()
+    }
+  }, [
+    enabled,
+    count,
+    perVideo,
+    sharedVoiceId,
+    clonedVoiceId,
+    variantVoiceIds,
+    titles,
+    voiceMaterials,
+  ])
+
+  return urls
+}
+
+export default useVariantVoicePreview

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

@@ -1,54 +0,0 @@
-/**
- * 共享：根据素材列表和模板片段计算总视频时长
- * GeneratePage（配音校验）和 FrontendPreviewPlayer（播放控制）共用
- */
-
-export interface DurationAsset {
-  id?: string
-  duration?: number
-  metadata?: { duration?: number }
-}
-
-export interface DurationTemplateSegment {
-  duration_min?: number
-  duration_max?: number
-}
-
-/**
- * 计算总视频时长
- * @param assets 素材列表
- * @param template 模板（含 segments）
- * @returns 总时长（秒），无有效数据时返回 0
- */
-export function calculateTotalVideoDuration(
-  assets: DurationAsset[] | undefined,
-  template: { segments?: DurationTemplateSegment[] } | undefined,
-): number {
-  if (!assets || assets.length === 0 || !template) return 0
-
-  const templateSegments = template.segments || []
-
-  return assets.reduce((sum, 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 ?? assetDuration,
-          Math.max(tplSeg.duration_min ?? 0, assetDuration),
-        )
-      : Math.min(assetDuration, 10)
-    return sum + segDuration
-  }, 0)
-}
-
-/**
- * 估算总视频时长（仅依赖模板 segments）
- * 当素材未加载或加载失败时，用各片段 duration_max 之和作为估算值
- * 确保配音时长校验不会因素材未就绪而跳过
- */
-export function estimateTotalVideoDuration(
-  template: { segments?: DurationTemplateSegment[] } | undefined,
-): number {
-  if (!template?.segments || template.segments.length === 0) return 0
-  return template.segments.reduce((sum, seg) => sum + (seg.duration_max || 0), 0)
-}

apps/web/src/pages/my-templates/components/TemplateCard.tsx

@@ -66,7 +66,7 @@ export const TemplateCard: React.FC<TemplateCardProps> = ({
 
     <div className="mt-card-meta">
       <Text type="secondary" style={{ fontSize: 12 }}>
-        {tpl.segments.length} 片段 · 预估 ~{tpl.estimated_duration}s
+        {tpl.segments.length} 个片段
       </Text>
       {tpl.category && <Tag style={{ fontSize: 11, marginTop: 4 }}>{tpl.category}</Tag>}
     </div>

apps/web/src/pages/my-templates/hooks/useMyTemplates.ts

@@ -57,11 +57,6 @@ export function useMyTemplates() {
         title_config: tpl.title_config,
         subtitle_config: tpl.subtitle_config,
         bgm_config: tpl.bgm_config,
-        estimated_duration:
-          tpl.estimated_duration ??
-          Math.round(
-            tpl.segments.reduce((s, seg) => s + (seg.duration_min + seg.duration_max) / 2, 0),
-          ),
         segments: tpl.segments.map(({ id: _id, ...rest }) => rest),
       }),
     onSuccess: () => {

apps/web/src/pages/templates/TemplateLibrary.tsx

@@ -1,7 +1,7 @@
 /**
  * 模板库页面（升级版）— V21 设计系统
  * 对接后端模板管理 API：
- * - 分页查询（page/page_size/category/keyword/duration_range）
+ * - 分页查询（page/page_size/category/keyword）
  * - 模板详情（素材规则、字幕样式、BGM、比例等参数配置）
  * - 复制模板 / 从模板生成
  * - 卡片网格布局 + 类型筛选 + 搜索 + 收藏
@@ -24,7 +24,6 @@ const TemplateLibrary: React.FC = () => {
     error,
     searchText,
     activeType,
-    durationRange,
     page,
     pageSize,
     setPage,
@@ -34,7 +33,6 @@ const TemplateLibrary: React.FC = () => {
     handleCreate,
     handleSearchChange,
     handleCategoryChange,
-    handleDurationChange,
   } = useTemplateLibrary()
 
   const {
@@ -62,8 +60,6 @@ const TemplateLibrary: React.FC = () => {
         onSearchChange={handleSearchChange}
         activeType={activeType}
         onTypeChange={handleCategoryChange}
-        durationRange={durationRange}
-        onDurationChange={handleDurationChange}
       />
 
       {/* 模板展示区 */}
@@ -77,7 +73,6 @@ const TemplateLibrary: React.FC = () => {
         errorMessage={error?.message}
         searchText={searchText}
         activeType={activeType}
-        durationRange={durationRange}
         onPageChange={setPage}
         onPreview={handlePreview}
         onToggleFavorite={toggleFavorite}

apps/web/src/pages/templates/components/template-library/TemplateCard.tsx

@@ -1,7 +1,7 @@
 import React from "react"
 import { Tag } from "antd"
 import type { TemplateItem } from "@/api/templates"
-import { gradientForCategory, getTypeColor, formatDuration } from "../../utils/templateLibrary"
+import { gradientForCategory, getTypeColor } from "../../utils/templateLibrary"
 
 interface TemplateCardProps {
   template: TemplateItem
@@ -37,7 +37,7 @@ export const TemplateCard: React.FC<TemplateCardProps> = ({
         <div className="xx-template-thumb-name">{template.name}</div>
         <div className="xx-template-thumb-meta">
           <span className="xx-template-thumb-duration">
-            {formatDuration(template.estimated_duration ?? template.target_duration)}
+            {template.clip_count || template.segments?.length || 0} 个片段
           </span>
         </div>
         <div className="xx-template-preview-hint">点击查看详情</div>

apps/web/src/pages/templates/components/template-library/TemplateDetailModal.tsx

@@ -5,9 +5,8 @@ import PreviewArea from "./template-detail-modal/PreviewArea"
 import SegmentList from "./template-detail-modal/SegmentList"
 import StyleConfig from "./template-detail-modal/StyleConfig"
 import DetailFooter from "./template-detail-modal/DetailFooter"
-import { getTypeColor, formatDuration } from "../../utils/templateLibrary"
+import { getTypeColor } from "../../utils/templateLibrary"
 import { TEMPLATE_TYPES } from "../../constants/templateLibrary"
-import { calcTotalSegmentDuration } from "../../utils/templateLibrary"
 
 export const TemplateDetailModal: React.FC<TemplateDetailModalProps> = ({
   template,
@@ -18,7 +17,6 @@ export const TemplateDetailModal: React.FC<TemplateDetailModalProps> = ({
   onCopy,
 }) => {
   const segments = template.segments ?? []
-  const totalSegmentDuration = calcTotalSegmentDuration(segments)
   const typeInfo = TEMPLATE_TYPES.find((t) => t.type === template.category)
 
   return (
@@ -64,11 +62,6 @@ export const TemplateDetailModal: React.FC<TemplateDetailModalProps> = ({
             size="small"
             className="xx-template-modal-desc-table"
             items={[
-              {
-                key: "duration",
-                label: "目标时长",
-                children: formatDuration(template.estimated_duration ?? template.target_duration),
-              },
               {
                 key: "clips",
                 label: "片段数量",
@@ -87,7 +80,7 @@ export const TemplateDetailModal: React.FC<TemplateDetailModalProps> = ({
             ]}
           />
 
-          <SegmentList segments={segments} totalDuration={totalSegmentDuration} />
+          <SegmentList segments={segments} />
           <StyleConfig template={template} />
           <DetailFooter
             template={template}

apps/web/src/pages/templates/components/template-library/TemplateGrid.tsx

@@ -14,7 +14,6 @@ interface TemplateGridProps {
   errorMessage?: string
   searchText: string
   activeType: string
-  durationRange: string
   onPageChange: (page: number) => void
   onPreview: (template: TemplateItem) => void
   onToggleFavorite: (id: string, e: React.MouseEvent) => void
@@ -31,7 +30,6 @@ export const TemplateGrid: React.FC<TemplateGridProps> = ({
   errorMessage,
   searchText,
   activeType,
-  durationRange,
   onPageChange,
   onPreview,
   onToggleFavorite,
@@ -64,7 +62,7 @@ export const TemplateGrid: React.FC<TemplateGridProps> = ({
 
   // 空状态
   if (templates.length === 0) {
-    const hasFilter = !!searchText || activeType !== "全部" || !!durationRange
+    const hasFilter = !!searchText || activeType !== "全部"
     return (
       <div className="xx-templates-empty">
         <div className="xx-templates-empty-icon">

apps/web/src/pages/templates/components/template-library/TemplateToolbar.tsx

@@ -1,15 +1,13 @@
 import React from "react"
 import { SearchOutlined } from "@ant-design/icons"
-import type { EditTemplateType, DurationRange } from "../../types/templateLibrary"
-import { TEMPLATE_TYPES, DURATION_OPTIONS } from "../../constants/templateLibrary"
+import type { EditTemplateType } from "../../types/templateLibrary"
+import { TEMPLATE_TYPES } from "../../constants/templateLibrary"
 
 interface TemplateToolbarProps {
   searchText: string
   onSearchChange: (e: React.ChangeEvent<HTMLInputElement>) => void
   activeType: EditTemplateType | "全部"
   onTypeChange: (type: EditTemplateType | "全部") => void
-  durationRange: DurationRange
-  onDurationChange: (value: DurationRange) => void
 }
 
 export const TemplateToolbar: React.FC<TemplateToolbarProps> = ({
@@ -17,8 +15,6 @@ export const TemplateToolbar: React.FC<TemplateToolbarProps> = ({
   onSearchChange,
   activeType,
   onTypeChange,
-  durationRange,
-  onDurationChange,
 }) => {
   return (
     <div className="xx-templates-toolbar">
@@ -46,18 +42,8 @@ export const TemplateToolbar: React.FC<TemplateToolbarProps> = ({
           </button>
         ))}
       </div>
-      {/* 时长筛选 */}
-      <div className="xx-templates-duration-filter">
-        {DURATION_OPTIONS.map((opt) => (
-          <button
-            key={opt.value}
-            className={`xx-templates-duration-btn${durationRange === opt.value ? " active" : ""}`}
-            onClick={() => onDurationChange(opt.value)}
-          >
-            {opt.label}
-          </button>
-        ))}
-      </div>
     </div>
   )
 }
+
+export default TemplateToolbar

apps/web/src/pages/templates/components/template-library/template-detail-modal/SegmentList.tsx

@@ -1,15 +1,13 @@
 import React from "react"
-import { Tooltip } from "antd"
 import type { TemplateSegment } from "@/api/templates"
-import { getMaterialTypeLabel, getTypeColor, formatDuration } from "../../../utils/templateLibrary"
+import { getMaterialTypeLabel, getTypeColor } from "../../../utils/templateLibrary"
 
 interface SegmentListProps {
   segments: TemplateSegment[]
-  totalDuration: number
 }
 
-/** 素材规则 / 片段列表 */
-const SegmentList: React.FC<SegmentListProps> = ({ segments, totalDuration }) => {
+/** 素材规则 / 片段列表（#1750：模板只定片段数/结构，无时长概念） */
+const SegmentList: React.FC<SegmentListProps> = ({ segments }) => {
   if (segments.length === 0) return null
 
   return (
@@ -35,17 +33,9 @@ const SegmentList: React.FC<SegmentListProps> = ({ segments, totalDuration }) =>
               <span className="xx-template-modal-clip-desc">
                 {seg.description || `片段 ${seg.segment_order}`}
               </span>
-              <Tooltip title={`时长范围: ${seg.duration_min}秒 - ${seg.duration_max}秒`}>
-                <span className="xx-template-modal-clip-duration">
-                  {seg.duration_min}-{seg.duration_max}秒
-                </span>
-              </Tooltip>
             </div>
           ))}
       </div>
-      <div className="xx-template-modal-total-duration">
-        预估总时长：{formatDuration(Math.round(totalDuration))}
-      </div>
     </div>
   )
 }

apps/web/src/pages/templates/constants/templateLibrary.ts

@@ -1,4 +1,4 @@
-import type { EditTemplateType, DurationRange } from "../types/templateLibrary"
+import type { EditTemplateType } from "../types/templateLibrary"
 
 export const TEMPLATE_TYPES: Array<{
   type: EditTemplateType | "全部"
@@ -15,16 +15,6 @@ export const TEMPLATE_TYPES: Array<{
   { type: "Vlog", label: "Vlog", icon: "📹", color: "#ec4899" },
 ]
 
-export const DURATION_OPTIONS: Array<{
-  value: DurationRange
-  label: string
-}> = [
-  { value: "", label: "全部时长" },
-  { value: "short", label: "30秒以内" },
-  { value: "medium", label: "30秒-2分钟" },
-  { value: "long", label: "2分钟以上" },
-]
-
 export const MATERIAL_TYPE_LABELS: Record<string, string> = {
   video: "视频",
   image: "图片",

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

@@ -9,7 +9,7 @@ import {
   type TemplateItem,
   type TemplateListParams,
 } from "@/api/templates"
-import type { EditTemplateType, DurationRange } from "../types/templateLibrary"
+import type { EditTemplateType } from "../types/templateLibrary"
 import { DEFAULT_PAGE_SIZE } from "../constants/templateLibrary"
 
 export const useTemplateLibrary = () => {
@@ -19,7 +19,6 @@ export const useTemplateLibrary = () => {
   /* 筛选状态 */
   const [searchText, setSearchText] = useState("")
   const [activeType, setActiveType] = useState<EditTemplateType | "全部">("全部")
-  const [durationRange, setDurationRange] = useState<DurationRange>("")
   const [page, setPage] = useState(1)
   const [pageSize] = useState(DEFAULT_PAGE_SIZE)
 
@@ -31,9 +30,8 @@ export const useTemplateLibrary = () => {
     }
     if (activeType !== "全部") params.category = activeType
     if (searchText.trim()) params.keyword = searchText.trim()
-    if (durationRange) params.duration_range = durationRange
     return params
-  }, [page, pageSize, activeType, searchText, durationRange])
+  }, [page, pageSize, activeType, searchText])
 
   /* 获取模板列表 */
   const {
@@ -112,12 +110,6 @@ export const useTemplateLibrary = () => {
     setPage(1)
   }, [])
 
-  /* 切换时长筛选 */
-  const handleDurationChange = useCallback((value: DurationRange) => {
-    setDurationRange(value)
-    setPage(1)
-  }, [])
-
   return {
     /* 状态 */
     templates,
@@ -127,7 +119,6 @@ export const useTemplateLibrary = () => {
     error,
     searchText,
     activeType,
-    durationRange,
     page,
     pageSize,
     /* mutations */
@@ -142,6 +133,5 @@ export const useTemplateLibrary = () => {
     handleCreate,
     handleSearchChange,
     handleCategoryChange,
-    handleDurationChange,
   }
 }

apps/web/src/pages/templates/types/templateLibrary.ts

@@ -2,7 +2,6 @@
 export type EditTemplateType = "口播" | "种草" | "产品" | "品牌" | "混剪" | "Vlog"
 
 /** 时长筛选值 */
-export type DurationRange = "" | "short" | "medium" | "long"
 
 /** 配置展示字段 */
 export interface ConfigDisplayFields {

apps/web/src/pages/templates/utils/templateLibrary.ts

@@ -5,7 +5,6 @@ import {
   DEFAULT_GRADIENT,
   MATERIAL_TYPE_LABELS,
 } from "../constants/templateLibrary"
-import type { TemplateSegment } from "@/api/templates"
 
 /** 获取类型对应颜色 */
 export const getTypeColor = (type: string): string => {
@@ -18,16 +17,6 @@ export const gradientForCategory = (category: string): string => {
   return CATEGORY_GRADIENT_MAP[category] ?? DEFAULT_GRADIENT
 }
 
-/** 格式化时长 */
-export const formatDuration = (seconds: number | undefined | null): string => {
-  if (!seconds || seconds <= 0) return "0秒"
-  const totalSec = Math.round(seconds)
-  const m = Math.floor(totalSec / 60)
-  const s = totalSec % 60
-  if (m === 0) return `${s}秒`
-  return `${m}分${s > 0 ? `${s}秒` : ""}`
-}
-
 /** 格式化配置对象为可读文本 */
 export const formatConfig = (config?: object): string => {
   if (!config || Object.keys(config).length === 0) return "默认"
@@ -47,8 +36,3 @@ export const getMaterialTypeLabel = (materialType: string | null | undefined): s
   if (!materialType) return "不限"
   return MATERIAL_TYPE_LABELS[materialType] ?? materialType
 }
-
-/** 计算片段总时长（取每个片段 min/max 的平均值） */
-export const calcTotalSegmentDuration = (segments: TemplateSegment[]): number => {
-  return segments.reduce((sum, s) => sum + (s.duration_min + s.duration_max) / 2, 0)
-}

apps/web/src/test/pages/generate/CanvasPreviewGrid.audio.test.tsx

@@ -0,0 +1,176 @@
+/**
+ * CanvasPreviewGrid 单测（Issue #1741 / #1750）
+ *
+ * 验证：
+ * - N=3 时每个变体都拿到各自的 voiceAudioUrls[i]（独立配音模式，null=TTS 合成中）
+ * - 每个变体都拿到各自的后端真实片段 variantClips[i]（serverClips），playToken 为 0 基变体序号
+ * - 每个变体都收到 activePlayToken / onPlayTokenChange（播放互斥接线）
+ * - 某个实例上报播放 → 所有实例的 activePlayToken 变为该实例（其他实例收到 token≠自身，自动暂停）
+ * - 实例上报暂停（null）→ 播放权释放
+ * - #1750 变体计划申请失败：渲染 role=alert 错误占位 ×N（严禁假数据/不渲染播放器），
+ *   「重试」按钮仅变体 0 卡片出现且点击触发 onRetryClips
+ * - #1750 加载态：渲染加载占位，不渲染播放器
+ */
+import { describe, it, expect, beforeEach, vi } from "vitest"
+import { render, fireEvent, screen } from "@testing-library/react"
+import type { AssetItem } from "@/api/assets"
+import type { EditPlanClip } from "@/api/template-editor"
+
+const playerCalls = vi.hoisted(() => [] as Array<Record<string, unknown>>)
+
+vi.mock("@/pages/generate/components/FrontendPreviewPlayer", () => ({
+  default: (props: Record<string, unknown>) => {
+    playerCalls.push(props)
+    const token = props.playToken as number
+    const active = props.activePlayToken as number | null
+    const change = props.onPlayTokenChange as (t: number | null) => void
+    return (
+      <div data-testid={`player-${token}`}>
+        <span data-testid={`voice-${token}`}>{props.voiceAudioUrl ? "has-voice" : "no-voice"}</span>
+        <span data-testid={`token-${token}`}>{active == null ? "none" : String(active)}</span>
+        <button type="button" onClick={() => change(token)}>
+          play-{token}
+        </button>
+        <button type="button" onClick={() => change(null)}>
+          pause-{token}
+        </button>
+      </div>
+    )
+  },
+}))
+
+import CanvasPreviewGrid from "@/pages/generate/components/CanvasPreviewGrid"
+
+function makeAsset(id: string): AssetItem {
+  return {
+    id,
+    library_id: "lib-1",
+    name: `${id}.mp4`,
+    storage_key: `media/${id}.mp4`,
+    file_url: `https://cdn.example.com/${id}.mp4`,
+    mime_type: "video/mp4",
+    metadata: { duration: 10 },
+    duration: 10,
+  }
+}
+
+function makeClips(variant: number): EditPlanClip[] {
+  return ["a1", "a2"].map((assetId, order) => ({
+    id: `clip-v${variant}-${assetId}`,
+    plan_id: `plan-${variant}`,
+    clip_type: "main",
+    order,
+    asset_id: assetId,
+    text_content: "",
+    start_time: 0,
+    duration: 5,
+    transition_effect: "none",
+    transition_duration: 0,
+    playback_speed: 1,
+    status: "ready",
+    config: {},
+  }))
+}
+
+const titleSettings = {
+  size: 36,
+  font: "思源黑体",
+  color: "#fff",
+  position: "bottom" as const,
+  bold: false,
+  italic: false,
+  stroke: true,
+  shadow: false,
+  posX: null,
+  posY: null,
+}
+
+const variantClips: EditPlanClip[][] = [makeClips(0), makeClips(1), makeClips(2)]
+
+function renderGrid(overrides: Record<string, unknown> = {}) {
+  playerCalls.length = 0
+  return render(
+    <CanvasPreviewGrid
+      count={3}
+      assets={[makeAsset("a1"), makeAsset("a2"), makeAsset("a3")]}
+      videoRatio="9:16"
+      titles={["标题1", "标题2", "标题3"]}
+      titleSettings={titleSettings}
+      variantClips={variantClips}
+      voiceAudioUrls={["https://cdn.example.com/v0.mp3", null, "https://cdn.example.com/v2.mp3"]}
+      selectedIds={[0, 1, 2]}
+      onToggleSelect={() => {}}
+      {...overrides}
+    />,
+  )
+}
+
+describe("CanvasPreviewGrid 配音、真实片段与播放互斥 (#1741/#1750)", () => {
+  beforeEach(() => {
+    playerCalls.length = 0
+  })
+
+  it("N=3 时每个变体都拿到各自的配音 URL 与后端真实片段，playToken 为 0 基序号", () => {
+    renderGrid()
+    expect(playerCalls).toHaveLength(3)
+    playerCalls.forEach((p, i) => {
+      expect(p.playToken).toBe(i)
+      expect(p.serverClips).toBe(variantClips[i])
+      expect(p.variantTitle).toBe(`标题${i + 1}`)
+    })
+    // 独立配音：变体 0/2 有各自 URL；变体 1 为 null（TTS 合成中）→ 传 undefined
+    expect(playerCalls[0].voiceAudioUrl).toBe("https://cdn.example.com/v0.mp3")
+    expect(playerCalls[1].voiceAudioUrl).toBeUndefined()
+    expect(playerCalls[2].voiceAudioUrl).toBe("https://cdn.example.com/v2.mp3")
+    // 配音状态徽标
+    expect(screen.getByTestId("voice-0").textContent).toBe("has-voice")
+    expect(screen.getByTestId("voice-1").textContent).toBe("no-voice")
+    expect(screen.getByTestId("voice-2").textContent).toBe("has-voice")
+  })
+
+  it("每个变体都接线 activePlayToken / onPlayTokenChange", () => {
+    renderGrid()
+    playerCalls.forEach((p) => {
+      expect(p.activePlayToken).toBeNull()
+      expect(typeof p.onPlayTokenChange).toBe("function")
+    })
+  })
+
+  it("点击变体2播放：所有实例 activePlayToken 变为 1（0 基，其他实例自动暂停）", () => {
+    renderGrid()
+    fireEvent.click(screen.getByTestId("player-1").querySelector("button")!)
+    expect(screen.getByTestId("token-0").textContent).toBe("1")
+    expect(screen.getByTestId("token-1").textContent).toBe("1")
+    expect(screen.getByTestId("token-2").textContent).toBe("1")
+  })
+
+  it("正在播放实例上报暂停后，播放权释放（token 回 null）", () => {
+    renderGrid()
+    fireEvent.click(screen.getByTestId("player-2").querySelector("button")!)
+    expect(screen.getByTestId("token-0").textContent).toBe("2")
+
+    fireEvent.click(screen.getByTestId("player-2").querySelectorAll("button")[1])
+    expect(screen.getByTestId("token-2").textContent).toBe("none")
+  })
+
+  it("clipsError：每张卡片显示错误占位（role=alert）且不渲染任何播放器，重试按钮仅一个并触发回调", () => {
+    const onRetry = vi.fn()
+    renderGrid({ clipsError: true, onRetryClips: onRetry })
+    expect(screen.getAllByRole("alert")).toHaveLength(3)
+    expect(screen.getAllByText("预览加载失败，请重试")).toHaveLength(3)
+    // 严禁假数据：错误态不渲染播放器
+    expect(playerCalls).toHaveLength(0)
+    // 重试按钮仅变体 0 卡片出现
+    const retryButtons = screen.getAllByText("重试")
+    expect(retryButtons).toHaveLength(1)
+    fireEvent.click(retryButtons[0])
+    expect(onRetry).toHaveBeenCalledTimes(1)
+  })
+
+  it("clipsLoading：渲染加载占位，不渲染播放器", () => {
+    renderGrid({ clipsLoading: true })
+    expect(screen.getAllByText("独立选片中…")).toHaveLength(3)
+    expect(screen.queryAllByRole("alert")).toHaveLength(0)
+    expect(playerCalls).toHaveLength(0)
+  })
+})

apps/web/src/test/pages/generate/FrontendPreviewPlayer.audio.test.tsx

@@ -0,0 +1,213 @@
+/**
+ * FrontendPreviewPlayer 音频行为单测（Issue #1741 / #1750）
+ *
+ * useSegmentScheduler/useCanvasPlayer 用 mock 控制播放态，专注验证本组件的音频逻辑：
+ * - 有配音时 video 保持 muted（素材原声不与配音混音）
+ * - 无配音时 video 不 muted（素材原声兜底，保证任何情况下播放有声）
+ * - 静音按钮：默认有声；点击后切 muted，aria-label 与图标切换
+ * - 批量播放互斥（#1750 playToken 为 0 基变体序号）：activePlayToken 变为其他实例且本实例在播放时，调用 pause
+ * - 点击播放/暂停时上报播放权（onPlayTokenChange）
+ * - #1750：serverClips 是唯一片段来源，缺失时不渲染任何 video（无本地模拟 fallback）
+ */
+import { describe, it, expect, beforeEach, vi } from "vitest"
+import { render, screen, fireEvent } from "@testing-library/react"
+import FrontendPreviewPlayer from "@/pages/generate/components/FrontendPreviewPlayer"
+import type { AssetItem } from "@/api/assets"
+import type { EditPlanClip } from "@/api/template-editor"
+
+const mocks = vi.hoisted(() => ({
+  isPlaying: false,
+  pause: vi.fn(),
+  togglePlayPause: vi.fn(),
+}))
+
+vi.mock("@/pages/generate/hooks/useSegmentScheduler", () => ({
+  // segments 由组件 buildPlaybackSegments 产出（唯一来源 serverClips）；
+  // canPlay 与真实 hook 一致：无片段时不可播放
+  useSegmentScheduler: vi.fn((segments: unknown[]) => ({
+    isPlaying: mocks.isPlaying,
+    currentTime: 0,
+    totalDuration: 20,
+    currentSegmentIndex: 0,
+    canPlay: segments.length > 0,
+    togglePlayPause: mocks.togglePlayPause,
+    seekTo: vi.fn(),
+    pause: mocks.pause,
+    videoRefs: { current: [] as (HTMLVideoElement | null)[] },
+  })),
+}))
+
+vi.mock("@/pages/generate/hooks/useCanvasPlayer", () => ({
+  useCanvasPlayer: () => ({
+    state: {
+      isPlaying: false,
+      isReady: false,
+      isBuffering: false,
+      currentTime: 0,
+      duration: 0,
+      errorMessage: "",
+      hasDecodeError: false,
+    },
+    controls: { play: vi.fn(), pause: vi.fn(), seek: vi.fn() },
+  }),
+}))
+
+beforeEach(() => {
+  mocks.isPlaying = false
+  mocks.pause.mockClear()
+  mocks.togglePlayPause.mockClear()
+  vi.stubGlobal(
+    "ResizeObserver",
+    class {
+      observe() {}
+      unobserve() {}
+      disconnect() {}
+    },
+  )
+})
+
+function makeAsset(id: string): AssetItem {
+  return {
+    id,
+    library_id: "lib-1",
+    name: `${id}.mp4`,
+    storage_key: `media/${id}.mp4`,
+    file_url: `https://cdn.example.com/${id}.mp4`,
+    mime_type: "video/mp4",
+    metadata: { duration: 10, width: 1080, height: 1920 },
+    duration: 10,
+  }
+}
+
+function makeClip(assetId: string, order: number): EditPlanClip {
+  return {
+    id: `clip-${assetId}`,
+    plan_id: "plan-1",
+    clip_type: "main",
+    order,
+    asset_id: assetId,
+    text_content: "",
+    start_time: 0,
+    duration: 5,
+    transition_effect: "none",
+    transition_duration: 0,
+    playback_speed: 1,
+    status: "ready",
+    config: {},
+  }
+}
+
+const serverClips = [makeClip("a1", 0), makeClip("a2", 1)]
+
+const baseProps = {
+  assets: [makeAsset("a1"), makeAsset("a2")],
+  videoRatio: "9:16",
+  ready: true,
+  serverClips,
+}
+
+function videos(): HTMLVideoElement[] {
+  return Array.from(document.querySelectorAll("video"))
+}
+
+describe("FrontendPreviewPlayer 音频行为 (#1741/#1750)", () => {
+  it("有配音时 video 保持 muted（素材原声不与配音混音）", () => {
+    render(<FrontendPreviewPlayer {...baseProps} voiceAudioUrl="https://cdn.example.com/tts.mp3" />)
+    expect(videos()).toHaveLength(2)
+    videos().forEach((v) => expect(v.muted).toBe(true))
+  })
+
+  it("无配音时 video 不 muted（素材原声兜底）", () => {
+    render(<FrontendPreviewPlayer {...baseProps} />)
+    videos().forEach((v) => expect(v.muted).toBe(false))
+  })
+
+  it("无配音时点静音按钮，video 切换为 muted；再点恢复", () => {
+    render(<FrontendPreviewPlayer {...baseProps} />)
+    const vs = videos()
+    expect(vs[0].muted).toBe(false)
+
+    fireEvent.click(screen.getByRole("button", { name: "静音" }))
+    videos().forEach((v) => expect(v.muted).toBe(true))
+
+    fireEvent.click(screen.getByRole("button", { name: "取消静音" }))
+    videos().forEach((v) => expect(v.muted).toBe(false))
+  })
+
+  it("批量播放互斥：token 变为其他实例且本实例在播放时调用 pause", () => {
+    mocks.isPlaying = true
+    const { rerender } = render(
+      <FrontendPreviewPlayer
+        {...baseProps}
+        playToken={1}
+        activePlayToken={1}
+        onPlayTokenChange={() => {}}
+        compact
+      />,
+    )
+    expect(mocks.pause).not.toHaveBeenCalled()
+
+    // 播放权切给实例 2（0 基 token）
+    rerender(
+      <FrontendPreviewPlayer
+        {...baseProps}
+        playToken={1}
+        activePlayToken={2}
+        onPlayTokenChange={() => {}}
+        compact
+      />,
+    )
+    expect(mocks.pause).toHaveBeenCalledTimes(1)
+
+    // token 切回自己：不重复暂停
+    rerender(
+      <FrontendPreviewPlayer
+        {...baseProps}
+        playToken={1}
+        activePlayToken={1}
+        onPlayTokenChange={() => {}}
+        compact
+      />,
+    )
+    expect(mocks.pause).toHaveBeenCalledTimes(1)
+  })
+
+  it("未播放时 token 变化不触发暂停（effect 仅在本实例播放时生效）", () => {
+    // mocks.isPlaying = false（beforeEach 重置）
+    const { rerender } = render(
+      <FrontendPreviewPlayer {...baseProps} playToken={0} activePlayToken={0} compact />,
+    )
+    rerender(<FrontendPreviewPlayer {...baseProps} playToken={0} activePlayToken={1} compact />)
+    expect(mocks.pause).not.toHaveBeenCalled()
+  })
+
+  it("暂停状态下点击播放按钮：上报播放权为自身 playToken 并触发播放", () => {
+    const onToken = vi.fn()
+    render(
+      <FrontendPreviewPlayer {...baseProps} playToken={2} onPlayTokenChange={onToken} compact />,
+    )
+    // 暂停态有两个图标播放按钮（中央大按钮 + 控制条按钮），均调 handleTogglePlay，点中央那个
+    const playButtons = screen.getAllByRole("button").filter((b) => !b.getAttribute("aria-label"))
+    expect(playButtons.length).toBeGreaterThanOrEqual(1)
+    fireEvent.click(playButtons[0])
+    expect(onToken).toHaveBeenCalledWith(2)
+    expect(mocks.togglePlayPause).toHaveBeenCalledTimes(1)
+  })
+
+  it("每个卡片都渲染独立静音按钮", () => {
+    render(
+      <div>
+        <FrontendPreviewPlayer {...baseProps} playToken={0} compact />
+        <FrontendPreviewPlayer {...baseProps} playToken={1} compact />
+        <FrontendPreviewPlayer {...baseProps} playToken={2} compact />
+      </div>,
+    )
+    expect(screen.getAllByRole("button", { name: "静音" })).toHaveLength(3)
+  })
+
+  it("#1750 serverClips 缺失时不渲染任何 video（无本地模拟 fallback，显示无可播放素材）", () => {
+    render(<FrontendPreviewPlayer {...baseProps} serverClips={undefined} />)
+    expect(videos()).toHaveLength(0)
+    expect(screen.getByText("暂无可播放素材")).toBeInTheDocument()
+  })
+})

apps/web/src/test/pages/generate/smart-match-pool.test.ts

@@ -0,0 +1,40 @@
+/**
+ * 智能匹配候选池数量规则单测（#1744/#1750）
+ *
+ * #1750 基线：模板只有片段数/结构、没有时长概念——候选池纯按「片段数 × 3」
+ * （每个片段至少 3 个候选供变体间洗牌避让），不再参考任何 duration 字段；
+ * 结果钳制到 [1, 200]（后端 limit 上限 200）；无片段信息时兜底 30。
+ */
+import { describe, it, expect } from "vitest"
+import { computeLimitFromSegments } from "@/pages/generate/hooks/step2-materials/useSmartMatch"
+import type { TemplateSegment } from "@/api/templates/types"
+
+function segs(n: number): TemplateSegment[] {
+  // 新规则只看片段数量，duration 字段已废弃，这里不再构造
+  return Array.from({ length: n }, () => ({}) as TemplateSegment)
+}
+
+describe("computeLimitFromSegments (#1750 候选池 = 片段数×3）", () => {
+  it("无 segments 时返回兜底 30", () => {
+    expect(computeLimitFromSegments(undefined)).toBe(30)
+    expect(computeLimitFromSegments([])).toBe(30)
+  })
+
+  it("候选池 = 片段数 × 3（与任何时长字段无关）", () => {
+    expect(computeLimitFromSegments(segs(1))).toBe(3)
+    expect(computeLimitFromSegments(segs(3))).toBe(9)
+    expect(computeLimitFromSegments(segs(5))).toBe(15)
+    expect(computeLimitFromSegments(segs(10))).toBe(30)
+  })
+
+  it("超过上限钳制为 200（后端 limit 上限）", () => {
+    expect(computeLimitFromSegments(segs(67))).toBe(200) // 67×3=201 → 200
+    expect(computeLimitFromSegments(segs(100))).toBe(200) // 100×3=300 → 200
+  })
+
+  it("任何正常片段数下 limit 均 ≥ 1", () => {
+    for (let n = 0; n <= 10; n++) {
+      expect(computeLimitFromSegments(segs(n))).toBeGreaterThanOrEqual(1)
+    }
+  })
+})

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

@@ -5,7 +5,6 @@
  *
  * 重构记录：
  * - useStep2Materials 拆分为 useMaterialLibrary + useSmartMatch 子 Hook
- * - Phase1 预览生成：新增 generation API 层 + PreviewVideoPanel
  */
 import { describe, it, expect } from "vitest"
 
@@ -23,8 +22,6 @@ import "@/pages/generate/components/Step3VoiceWithMode"
 import "@/pages/generate/components/CanvasPreviewGrid"
 import "@/pages/generate/components/BatchGenerationGrid"
 import "@/pages/generate/components/PreviewCountModal"
-import "@/pages/generate/components/PreviewVideoPanel"
-import "@/pages/generate/components/GenerateResultPanel"
 import "@/pages/generate/components/GenerateStepContent"
 import "@/pages/generate/components/voice/VoiceRecommendSection"
 import "@/pages/generate/components/voice/VoiceChoiceCard"
@@ -50,6 +47,8 @@ describe("GeneratePage module smoke test", () => {
 })
 import "@/pages/generate/hooks/useGenerateVideo"
 import "@/pages/generate/hooks/useBatchCovers"
+import "@/pages/generate/hooks/useBatchVariantPlans"
+import "@/pages/generate/hooks/useVariantVoicePreview"
 import "@/pages/generate/hooks/usePreviewAssets"
 import "@/pages/generate/hooks/useSegmentScheduler"
 import "@/pages/generate/hooks/generate-video/useGenerationPolling"

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

@@ -0,0 +1,230 @@
+/**
+ * useBatchVariantPlans 单测（#1750 修正：严禁假数据冒充预览）
+ * - 批量（N>1）时向后端申请变体计划，返回 clips/planIds
+ * - 404（端点未上线）/ 400（参数错误）/ 网络错误：一律 error=true，UI 可重试
+ * - 数据不完整（某变体 clips 为空）：error=true
+ * - retry() 重新发起请求，成功后 ready=true
+ * - N=1 / 无素材 / disabled 不发请求
+ * - 入参变化重新申请；未变化不重复请求
+ */
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { renderHook, waitFor, act } from "@testing-library/react"
+import { useBatchVariantPlans } from "@/pages/generate/hooks/useBatchVariantPlans"
+import type { EditPlanClip } from "@/api/template-editor"
+
+vi.mock("@/api/generation/variantPlans", () => ({
+  createBatchVariantPlans: vi.fn(),
+}))
+
+import { createBatchVariantPlans } from "@/api/generation/variantPlans"
+
+const mockCreate = vi.mocked(createBatchVariantPlans)
+
+function makeClip(
+  partial: Partial<EditPlanClip> & { asset_id: string; order: number },
+): EditPlanClip {
+  return {
+    id: `clip-${partial.asset_id}-${partial.order}`,
+    plan_id: "plan-x",
+    clip_type: "main",
+    start_time: 0,
+    duration: 5,
+    text_content: "",
+    transition_effect: "",
+    transition_duration: 0,
+    playback_speed: 1,
+    status: "ready",
+    config: {},
+    ...partial,
+  }
+}
+
+function buildResp(count: number) {
+  return {
+    total: count,
+    items: Array.from({ length: count }, (_, i) => ({
+      variant_index: i,
+      plan_id: `plan-${i}`,
+      clips: [makeClip({ asset_id: `a${(i % 3) + 1}`, order: 0, start_time: i * 2 })],
+    })),
+  }
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  mockCreate.mockReset()
+})
+
+describe("useBatchVariantPlans (#1750 错误态)", () => {
+  it("批量 N=3 时申请变体计划并返回按索引对齐的 clips/planIds", async () => {
+    mockCreate.mockResolvedValueOnce(buildResp(3))
+    const { result } = renderHook(() =>
+      useBatchVariantPlans({
+        enabled: true,
+        count: 3,
+        templateId: "tpl-1",
+        assetIds: ["a1", "a2", "a3"],
+        sourcePlanId: "plan-src",
+      }),
+    )
+
+    await waitFor(() => expect(result.current.ready).toBe(true))
+    expect(mockCreate).toHaveBeenCalledTimes(1)
+    expect(mockCreate).toHaveBeenCalledWith({
+      template_id: "tpl-1",
+      asset_ids: ["a1", "a2", "a3"],
+      count: 3,
+      source_edit_plan_id: "plan-src",
+    })
+    expect(result.current.planIdsByVariant).toEqual(["plan-0", "plan-1", "plan-2"])
+    expect(result.current.clipsByVariant[1]?.[0]?.start_time).toBe(2)
+    expect(result.current.error).toBe(false)
+    expect(result.current.loading).toBe(false)
+  })
+
+  it("sourcePlanId 为空时不传 source_edit_plan_id 字段", async () => {
+    mockCreate.mockResolvedValueOnce(buildResp(2))
+    const { result } = renderHook(() =>
+      useBatchVariantPlans({ enabled: true, count: 2, templateId: "tpl-1", assetIds: ["a1"] }),
+    )
+    await waitFor(() => expect(result.current.ready).toBe(true))
+    const arg = mockCreate.mock.calls[0][0]
+    expect(arg).not.toHaveProperty("source_edit_plan_id")
+  })
+
+  it("404（后端端点未上线）→ error=true，不再静默降级", async () => {
+    mockCreate.mockRejectedValueOnce({ response: { status: 404 } })
+    const { result } = renderHook(() =>
+      useBatchVariantPlans({ enabled: true, count: 3, templateId: "tpl-1", assetIds: ["a1"] }),
+    )
+    await waitFor(() => expect(result.current.loading).toBe(false))
+    expect(result.current.error).toBe(true)
+    expect(result.current.ready).toBe(false)
+    expect(result.current.clipsByVariant).toEqual([])
+  })
+
+  it("400（参数错误）→ error=true", async () => {
+    mockCreate.mockRejectedValueOnce({ response: { status: 400, data: { detail: "参数错误" } } })
+    const { result } = renderHook(() =>
+      useBatchVariantPlans({ enabled: true, count: 3, templateId: "tpl-1", assetIds: ["a1"] }),
+    )
+    await waitFor(() => expect(result.current.loading).toBe(false))
+    expect(result.current.error).toBe(true)
+    expect(result.current.ready).toBe(false)
+  })
+
+  it("网络错误 → error=true", async () => {
+    mockCreate.mockRejectedValue(new Error("Network Error"))
+    const { result } = renderHook(() =>
+      useBatchVariantPlans({ enabled: true, count: 3, templateId: "tpl-1", assetIds: ["a1"] }),
+    )
+    await waitFor(() => expect(result.current.loading).toBe(false))
+    expect(result.current.error).toBe(true)
+    expect(result.current.ready).toBe(false)
+  })
+
+  it("某变体 clips 为空（数据不完整）→ error=true，严禁假数据冒充", async () => {
+    mockCreate.mockResolvedValueOnce({
+      total: 2,
+      items: [
+        { variant_index: 0, plan_id: "plan-0", clips: [makeClip({ asset_id: "a1", order: 0 })] },
+        { variant_index: 1, plan_id: "plan-1", clips: [] },
+      ],
+    })
+    const { result } = renderHook(() =>
+      useBatchVariantPlans({ enabled: true, count: 2, templateId: "tpl-1", assetIds: ["a1"] }),
+    )
+    await waitFor(() => expect(result.current.loading).toBe(false))
+    expect(result.current.error).toBe(true)
+    expect(result.current.ready).toBe(false)
+    expect(result.current.clipsByVariant).toEqual([])
+  })
+
+  it("retry() 失败后重试：成功则 error 清除、ready=true", async () => {
+    mockCreate.mockRejectedValueOnce({ response: { status: 404 } })
+    const { result } = renderHook(() =>
+      useBatchVariantPlans({ enabled: true, count: 3, templateId: "tpl-1", assetIds: ["a1"] }),
+    )
+    await waitFor(() => expect(result.current.error).toBe(true))
+
+    mockCreate.mockResolvedValueOnce(buildResp(3))
+    act(() => {
+      result.current.retry()
+    })
+    await waitFor(() => expect(result.current.ready).toBe(true))
+    expect(result.current.error).toBe(false)
+    expect(mockCreate).toHaveBeenCalledTimes(2)
+  })
+
+  it("N=1 不发请求（单视频零回归）", () => {
+    renderHook(() =>
+      useBatchVariantPlans({ enabled: true, count: 1, templateId: "tpl-1", assetIds: ["a1"] }),
+    )
+    expect(mockCreate).not.toHaveBeenCalled()
+  })
+
+  it("无素材/enabled=false 不发请求", () => {
+    const { rerender } = renderHook(
+      (props: { enabled: boolean; ids: string[] }) =>
+        useBatchVariantPlans({
+          enabled: props.enabled,
+          count: 3,
+          templateId: "tpl-1",
+          assetIds: props.ids,
+        }),
+      { initialProps: { enabled: true, ids: [] as string[] } },
+    )
+    expect(mockCreate).not.toHaveBeenCalled()
+    rerender({ enabled: false, ids: ["a1"] })
+    expect(mockCreate).not.toHaveBeenCalled()
+  })
+
+  it("响应乱序/越界 variant_index：越界丢弃、其余按索引对齐", async () => {
+    mockCreate.mockResolvedValueOnce({
+      total: 2,
+      items: [
+        { variant_index: 99, plan_id: "plan-bad", clips: [makeClip({ asset_id: "a9", order: 0 })] },
+        { variant_index: 1, plan_id: "plan-1", clips: [makeClip({ asset_id: "a2", order: 0 })] },
+        { variant_index: 0, plan_id: "plan-0", clips: [makeClip({ asset_id: "a1", order: 0 })] },
+      ],
+    })
+    const { result } = renderHook(() =>
+      useBatchVariantPlans({
+        enabled: true,
+        count: 2,
+        templateId: "tpl-1",
+        assetIds: ["a1", "a2"],
+      }),
+    )
+    await waitFor(() => expect(result.current.ready).toBe(true))
+    // 越界 99 丢弃；乱序返回的 0/1 按索引对齐
+    expect(result.current.error).toBe(false)
+    expect(result.current.planIdsByVariant).toEqual(["plan-0", "plan-1"])
+    expect(result.current.clipsByVariant[0]?.[0]?.asset_id).toBe("a1")
+    expect(result.current.clipsByVariant[1]?.[0]?.asset_id).toBe("a2")
+  })
+
+  it("非 ready 状态的 clip 被过滤；过滤后每变体仍有片段则 ready", async () => {
+    mockCreate.mockResolvedValueOnce({
+      total: 2,
+      items: [
+        {
+          variant_index: 0,
+          plan_id: "plan-0",
+          clips: [
+            makeClip({ asset_id: "a1", order: 0 }),
+            makeClip({ asset_id: "a2", order: 1, status: "pending" }),
+          ],
+        },
+        { variant_index: 1, plan_id: "plan-1", clips: [makeClip({ asset_id: "a3", order: 0 })] },
+      ],
+    })
+    const { result } = renderHook(() =>
+      useBatchVariantPlans({ enabled: true, count: 2, templateId: "tpl-1", assetIds: ["a1"] }),
+    )
+    await waitFor(() => expect(result.current.ready).toBe(true))
+    expect(result.current.error).toBe(false)
+    expect(result.current.clipsByVariant[0]).toHaveLength(1)
+    expect(result.current.clipsByVariant[0]?.[0]?.asset_id).toBe("a1")
+  })
+})

apps/worker/video_processing/dedup_helpers.py

@@ -34,7 +34,9 @@ def create_video_record_and_dedup(
     fps: float = 25.0,
     name: str = "",
     thumbnail_url: str = "",
-) -> int:
+) -> dict:
+    """Returns: {"video_count": int, "is_duplicate": bool, "batch_similarity": float|None,
+    "duplicate_of": str|None} —— batch_similarity 为批次内最高相似度（无批次查重时 None）。"""
     """创建 GeneratedVideo 记录，计算指纹并执行查重（历史 + 批次）。
 
     采用两阶段持久化：先计算所有指纹/查重数据（内存），
@@ -76,6 +78,7 @@ def create_video_record_and_dedup(
         # ── Phase 2: 计算指纹 & 查重（全部在内存） ────────────────
         deduplicator = VideoDeduplicator()
         fingerprint = None
+        batch_similarity: float | None = None
 
         try:
             fingerprint = deduplicator.compute_fingerprint(video_path)
@@ -105,9 +108,11 @@ def create_video_record_and_dedup(
             )
 
             # (b) 批次内查重（仅当有 batch_id 时）
+            batch_similarity: float | None = None
             if not duplicate_result and batch_id:
                 duplicate_result = deduplicator.check_batch_duplicate(fingerprint, batch_id, video_id, session)
-
+                if duplicate_result:
+                    batch_similarity = float(duplicate_result.get("similarity", 0.0))
             if duplicate_result:
                 generated_video.is_duplicate = True
                 generated_video.duplicate_of = duplicate_result["duplicate_of"]
@@ -161,7 +166,12 @@ def create_video_record_and_dedup(
             generated_video.is_duplicate,
             generated_video.duplicate_rate,
         )
-        return 1
+        return {
+            "video_count": 1,
+            "is_duplicate": bool(generated_video.is_duplicate),
+            "batch_similarity": batch_similarity,
+            "duplicate_of": generated_video.duplicate_of,
+        }
     except Exception as e:
         logger.error(
             "Failed to create video record / dedup for task %s: %s",
@@ -169,4 +179,4 @@ def create_video_record_and_dedup(
             e,
         )
         session.rollback()
-        return 0
+        return {"video_count": 0, "is_duplicate": False, "batch_similarity": None, "duplicate_of": None}

apps/worker/worker_app/core/asset_usage.py

@@ -1,10 +1,20 @@
 from datetime import datetime, timezone
 
 
-def mark_asset_used_for_generation(asset) -> None:
+def mark_asset_used_for_generation(asset, times: int = 1) -> None:
+    """标记素材在成片中被使用，累加使用次数。
+
+    Args:
+        asset: Asset 实体（metadata 就地更新）
+        times: 本次成片实际使用次数（= 最终成片 plan 中引用该素材的片段数）。
+            按「成片实际渲染的片段」计数而非请求传入的 asset_ids 列表——
+            请求列表可能含未被 plan 选用的素材（不应计数），同一素材在多片段
+            复用时应按片段数累加（高频排除/未使用偏好才与真实渲染强度挂钩）。
+    """
+    times = max(1, int(times or 1))
     asset.metadata = {
         **asset.metadata,
-        "generation_use_count": int(asset.metadata.get("generation_use_count") or 0) + 1,
+        "generation_use_count": int(asset.metadata.get("generation_use_count") or 0) + times,
         "last_used_at": datetime.now(timezone.utc).isoformat(),
         "review_status": asset.metadata.get("review_status") or "pending_review",
     }

apps/worker/worker_app/tasks/generation.py

@@ -383,35 +383,131 @@ def _load_task_info(task_id: str) -> dict | None:
         session.close()
 
 
-def _upload_and_record(
+# ── #1743 批量变体重渲/封面判定（纯函数，便于单测） ──────────────────────
+BATCH_RENDER_SIMILARITY_LIMIT = 0.20
+"""批次内成片查重相似度阈值：超过则重选独立 plan 重渲一次（20%）。"""
+
+
+def should_rerender_for_batch_dedup(*, batch_id: str, render_attempt: int, batch_similarity) -> bool:
+    """批次内查重后判定是否需要重选 plan 重渲。
+
+    条件（全部满足才重渲）：批次任务、首版（attempt==0）、查重率已得出、相似度 > 20%。
+    非批次任务 / 已是重渲版 / 查重率缺失 / 相似度达标 → 不重渲。
+    """
+    if not batch_id:
+        return False
+    if render_attempt >= 1:
+        return False
+    if batch_similarity is None:
+        return False
+    return float(batch_similarity) > BATCH_RENDER_SIMILARITY_LIMIT
+
+
+def pick_batch_cover_index(task_id: str, candidate_count: int) -> int:
+    """批次变体封面帧选取：按 task_id md5 稳定哈希分散到候选帧。
+
+    同任务重试结果稳定；批次内不同 task_id 哈希后分散，避免 N 个变体都抽 frame_0
+    导致封面雷同。非批次调用方应直接取 0（主流程按 batch_id 区分）。
+    """
+    if candidate_count <= 1:
+        return 0
+    import hashlib
+
+    return int(hashlib.md5(task_id.encode()).hexdigest(), 16) % candidate_count
+
+
+def _count_plan_clip_asset_usage(session, plan_id: str) -> dict[str, int]:
+    """统计最终成片 plan 中每个素材被片段引用的次数。
+
+    计数口径（#1743）：以成片实际渲染的 edit_plan_clips 为准——
+    同一素材在多个片段复用按片段数累加；未被 plan 选用的素材（即使
+    出现在请求 asset_ids 中）不计数。
+    """
+    from packages.adapters.sqlalchemy_impl.models import EditPlanClipModel
+
+    rows = session.query(EditPlanClipModel.asset_id).filter(EditPlanClipModel.plan_id == plan_id).all()
+    counts: dict[str, int] = {}
+    for (asset_id,) in rows:
+        if asset_id:
+            counts[asset_id] = counts.get(asset_id, 0) + 1
+    return counts
+
+
+def _record_rendered_asset_usage(
+    session,
+    plan_id: str,
+    task_id: str,
+    fallback_asset_ids: list[str] | None = None,
+) -> int:
+    """按最终成片 plan 的实际片段统计素材使用次数并回写 metadata。
+
+    plan 无有效片段素材（异常数据）时退回 fallback_asset_ids 每个计 1 次，
+    保证使用统计不因数据异常完全丢失。单素材回写失败不影响其他素材。
+
+    Returns: 实际回写次数的素材数量。
+    """
+    from worker_app.core.asset_usage import mark_asset_used_for_generation
+
+    from packages.adapters.sqlalchemy_impl.asset_repository import (
+        SQLAlchemyAssetRepository,
+    )
+
+    used_counts = _count_plan_clip_asset_usage(session, plan_id)
+    if not used_counts and fallback_asset_ids:
+        used_counts = {aid: 1 for aid in fallback_asset_ids if aid}
+    if not used_counts:
+        logger.info("[task_id=%s] 素材使用计数: plan=%s 无有效片段素材，跳过", task_id, plan_id)
+        return 0
+
+    asset_repo = SQLAlchemyAssetRepository(session)
+    written = 0
+    for aid, times in used_counts.items():
+        try:
+            asset = asset_repo.get(aid)
+            if asset:
+                mark_asset_used_for_generation(asset, times=times)
+                asset_repo.update(asset)
+                written += 1
+        except Exception:
+            logger.warning(
+                "[task_id=%s] 更新素材使用次数失败: asset_id=%s times=%d",
+                task_id,
+                aid,
+                times,
+                exc_info=True,
+            )
+    logger.info(
+        "[task_id=%s] 素材使用计数回写完成(plan=%s): %d 个素材, 片段引用 %d 次",
+        task_id,
+        plan_id,
+        written,
+        sum(used_counts.values()),
+    )
+    return written
+
+
+def _upload_rendered_video(
     task_id: str,
     output_path: Path,
     project_id: str,
-    batch_id: str,
-    editing_mode,
-    user_id: str = "",
-    video_name: str = "",
-    thumbnail_url: str = "",
-) -> tuple[str, float, int, int]:
-    """上传 OSS、创建视频记录并查重。
+    *,
+    attempt: int = 0,
+) -> tuple[str, str]:
+    """上传成片到 OSS（不落库）。attempt>0 时文件名带轮次后缀，避免覆盖首版。
 
-    Returns:
-        (file_url, duration, file_size, video_count)
+    Returns: (file_url, storage_key)
     """
-    # project_id 可能为空（模板编辑器草稿不属于任何项目），过滤空段避免 OSS key 出现 //
-    path_parts = [p for p in ("generated", "projects", project_id, "tasks", task_id, output_path.name) if p]
+    suffix = f"_v{attempt}" if attempt > 0 else ""
+    stem = output_path.stem
+    name = f"{stem}{suffix}{output_path.suffix or '.mp4'}"
+    path_parts = [p for p in ("generated", "projects", project_id, "tasks", task_id, name) if p]
     storage_key = "/".join(path_parts)
-    file_size = output_path.stat().st_size
 
-    # 上传 OSS
-    logger.info("[task_id=%s] [OSS上传] 开始上传: size=%d", task_id, file_size)
-    upload_start = time.monotonic()
+    logger.info("[task_id=%s] [OSS上传] 开始上传(attempt=%d): size=%d", task_id, attempt, output_path.stat().st_size)
     file_url = upload_to_oss(output_path, storage_key)
-    upload_elapsed = time.monotonic() - upload_start
     if not file_url:
         raise RuntimeError(f"OSS 上传失败: task_id={task_id}, storage_key={storage_key}")
 
-    # 校验 URL 可达性（P0-2: 私有 bucket 用预签名 + object_exists 降级）
     verify_url = get_signed_download_url(file_url, expires_seconds=300) or file_url
     if not _verify_url_accessible(verify_url):
         from video_processing.oss_helpers import normalize_storage_key, oss_bucket
@@ -420,25 +516,58 @@ def _upload_and_record(
         key = normalize_storage_key(file_url)
         if not (bucket and bucket.object_exists(key)):
             raise RuntimeError(
-                f"OSS 上传后 URL 不可访问且 object_exists 失败: file_url={file_url}, " f"storage_key={storage_key}"
+                f"OSS 上传后 URL 不可访问且 object_exists 失败: file_url={file_url}, storage_key={storage_key}"
             )
-        logger.info(
-            "URL 校验失败但 object_exists 确认文件存在，视为上传成功: storage_key=%s",
-            key,
-        )
+        logger.info("URL 校验失败但 object_exists 确认文件存在，视为上传成功: storage_key=%s", key)
+    return file_url, storage_key
 
-    logger.info(
-        "[task_id=%s] [OSS上传] 成功: 耗时=%.1fs, file_url=%s",
-        task_id,
-        upload_elapsed,
-        file_url,
-    )
 
-    # 创建 GeneratedVideo 记录 + 查重
-    duration = probe_duration(output_path)
+def _reselect_plan_for_batch_retry(task_id: str, plan_id: str, task_info: dict) -> str | None:
+    """批次内查重超阈值后，为当前任务重新独立选片生成新 plan（#1743 自动重渲）。
+
+    复用 API 侧同一套 EditPlanService.reselect_plan_for_variant（packages 层
+    variant_plan_selector 纯核心），素材池来自任务 asset_ids + 源 plan 素材。
+    成功返回新 plan_id；失败返回 None（调用方放弃重渲，保留首版）。
+    """
+    try:
+        from app.services.edit_plan_service import EditPlanService
+
+        db = SessionLocal()
+        try:
+            svc = EditPlanService(db)
+            asset_pool = list(task_info.get("task_asset_ids") or [])
+            new_plan = svc.reselect_plan_for_variant(
+                plan_id,
+                asset_pool,
+                created_by_user_id=task_info.get("user_id", ""),
+                name_suffix="重渲变体",
+            )
+            return new_plan.id
+        finally:
+            db.close()
+    except Exception:
+        logger.warning("[task_id=%s] 批次重渲前重选 plan 失败，放弃重渲", task_id, exc_info=True)
+        return None
+
+
+def _record_video_and_dedup(
+    *,
+    task_id: str,
+    project_id: str,
+    batch_id: str,
+    editing_mode,
+    user_id: str,
+    file_url: str,
+    file_size: int,
+    video_path: str,
+    video_name: str = "",
+    thumbnail_url: str = "",
+) -> dict:
+    """成片落库 + 指纹查重（含批次内）。返回查重信息 dict。"""
+    duration = probe_duration(Path(video_path))
     dedup_session = SessionLocal()
     try:
-        video_count = create_video_record_and_dedup(
+        result = create_video_record_and_dedup(
             generation_task_id=task_id,
             project_id=project_id,
             user_id=user_id,
@@ -446,7 +575,7 @@ def _upload_and_record(
             file_url=file_url,
             file_size=file_size,
             duration=duration,
-            video_path=str(output_path),
+            video_path=video_path,
             mode=editing_mode.value,
             session=dedup_session,
             name=video_name,
@@ -454,11 +583,12 @@ def _upload_and_record(
         )
     finally:
         dedup_session.close()
-
-    return file_url, duration, file_size, video_count or 1
+    result["duration"] = duration
+    return result
 
 
 # ── Celery Task ──────────────────────────────────────────────────────────────
+# ── Celery Task ──────────────────────────────────────────────────────────────
 
 
 def _sync_task_config_to_plan(source_edit_plan_id: str, task_info: dict, db) -> str | None:
@@ -729,19 +859,29 @@ def generate_video(self, task_id: str) -> dict:
                     gen_task.append_log("渲染模式", "从草稿数据渲染（与预览一致）")
                     _flush_logs(task_id, gen_task)
 
-                output_path, render_duration, cover_candidates, voiceover_tmp_path, render_temp_dir, thumbnail_url = (
-                    _render_from_edit_plan(
+                # ── 渲染→上传→查重→（批次超阈值则重选 plan 重渲一次）循环（#1743）──
+                current_plan_id = source_edit_plan_id
+                file_url = ""
+                duration = 0.0
+                file_size = 0
+                video_count = 1
+                file_size_final = 0
+                for render_attempt in range(2):  # 首版 + 最多 1 次重渲
+                    (
+                        output_path,
+                        render_duration,
+                        cover_candidates,
+                        voiceover_tmp_path,
+                        render_temp_dir,
+                        thumbnail_url,
+                    ) = _render_from_edit_plan(
                         task_id=task_id,
-                        source_edit_plan_id=source_edit_plan_id,
+                        source_edit_plan_id=current_plan_id,
                         task_info=task_info,
                     )
-                )
-                # 从这里开始，render_temp_dir 已赋值，必须确保异常时也能清理
-                try:
                     if gen_task:
-                        gen_task.append_log("渲染", f"渲染完成, 时长={render_duration:.1f}s")
+                        gen_task.append_log("渲染", f"渲染完成(第{render_attempt + 1}版), 时长={render_duration:.1f}s")
                         _flush_logs(task_id, gen_task)
-
                     _update_task_progress(task_id, 80, "渲染完成")
 
                     # ── 3.5 随机边缘裁剪降重（#1664） ──────────────────────────
@@ -751,7 +891,7 @@ def generate_video(self, task_id: str) -> dict:
                         cropped_path = random_edge_crop(output_path)
                         if cropped_path != output_path:
                             output_path = cropped_path
-                        if gen_task:
+                        if gen_task and render_attempt == 0:
                             gen_task.append_log("边缘裁剪", "已应用随机 2-5% 边缘裁剪降重")
                             _flush_logs(task_id, gen_task)
                         logger.info("[task_id=%s] 随机边缘裁剪完成: %s", task_id, output_path)
@@ -762,45 +902,110 @@ def generate_video(self, task_id: str) -> dict:
                             crop_err,
                             exc_info=True,
                         )
-                        if gen_task:
-                            gen_task.append_log("边缘裁剪", f"裁剪失败，使用原始视频: {crop_err}")
-                            _flush_logs(task_id, gen_task)
 
-                    # ── 4. 上传 OSS + 查重记录 ───────────────────────────────
+                    # ── 4. 上传 OSS（不落库） ───────────────────────────────
                     _update_task_progress(task_id, 85, "开始上传")
-                    file_url, duration, file_size, video_count = _upload_and_record(
+                    file_url, _storage_key = _upload_rendered_video(
                         task_id=task_id,
                         output_path=output_path,
                         project_id=project_id,
+                        attempt=render_attempt,
+                    )
+                    file_size = output_path.stat().st_size
+
+                    # ── 4.5 落库 + 查重（批次任务检查批次内相似度） ───────────
+                    dedup_info = _record_video_and_dedup(
+                        task_id=task_id,
+                        project_id=project_id,
                         batch_id=batch_id,
                         editing_mode=editing_mode,
                         user_id=user_id,
+                        file_url=file_url,
+                        file_size=file_size,
+                        video_path=str(output_path),
                         video_name=task_info.get("video_title", ""),
                         thumbnail_url=thumbnail_url,
                     )
+                    duration = dedup_info.get("duration", render_duration)
+                    video_count = dedup_info.get("video_count", 1)
+                    batch_sim = dedup_info.get("batch_similarity")
 
                     if gen_task:
                         gen_task.append_log(
                             "OSS上传",
-                            f"上传成功, 大小={file_size}",
+                            f"第{render_attempt + 1}版上传成功, 大小={file_size}"
+                            + (f", 批次相似度={batch_sim:.0%}" if batch_sim is not None else ""),
                             file_size=file_size,
                             file_url=file_url,
                         )
                         _flush_logs(task_id, gen_task)
 
-                    _update_task_progress(task_id, 95, "上传完成")
-                finally:
-                    # 清理渲染临时目录（无论后续步骤成功与否都清理）
+                    # 非批次 / 相似度达标 / 已是最后一次 → 结束循环
+                    if not should_rerender_for_batch_dedup(
+                        batch_id=batch_id,
+                        render_attempt=render_attempt,
+                        batch_similarity=batch_sim,
+                    ):
+                        file_size_final = file_size
+                        break
+
+                    # 批次内相似度过高：重选独立 plan 后重渲一次
+                    logger.warning(
+                        "[task_id=%s] 批次内查重相似度 %.2f 超阈值 %.2f，重选 plan 重渲",
+                        task_id,
+                        batch_sim,
+                        BATCH_RENDER_SIMILARITY_LIMIT,
+                    )
+                    if gen_task:
+                        gen_task.append_log("批次查重", f"与批次内成片相似度过高({batch_sim:.0%})，重新选片渲染")
+                        _flush_logs(task_id, gen_task)
+                    new_plan_id = _reselect_plan_for_batch_retry(task_id, current_plan_id, task_info)
+                    if not new_plan_id:
+                        logger.warning("[task_id=%s] 重选 plan 失败，保留首版", task_id)
+                        file_size_final = file_size
+                        break
+                    # 回写任务关联的 plan（重渲版以新 plan 渲染）
+                    try:
+                        _ps = SessionLocal()
+                        try:
+                            from packages.adapters.sqlalchemy_impl.generation_task_repository import (
+                                SQLAlchemyGenerationTaskRepository,
+                            )
+
+                            _pr = SQLAlchemyGenerationTaskRepository(_ps)
+                            _gt = _pr.get(task_id)
+                            if _gt:
+                                _gt.source_edit_plan_id = new_plan_id
+                                _pr.update(_gt)
+                        finally:
+                            _ps.close()
+                    except Exception:
+                        logger.warning("[task_id=%s] 回写重渲 plan_id 失败", task_id, exc_info=True)
+                    current_plan_id = new_plan_id
+                    # 清理本轮临时目录，下一轮重新渲染
                     if render_temp_dir:
                         import shutil
 
                         shutil.rmtree(render_temp_dir, ignore_errors=True)
-                        logger.info("[task_id=%s] 渲染临时目录已清理: %s", task_id, render_temp_dir)
+                        render_temp_dir = None
+
+                file_size = file_size_final or file_size
+                _update_task_progress(task_id, 95, "上传完成")
+
+                # 渲染结束后清理临时目录（重渲循环内每轮已清理，此处兜底最后一轮）
+                if render_temp_dir:
+                    import shutil
+
+                    shutil.rmtree(render_temp_dir, ignore_errors=True)
+                    logger.info("[task_id=%s] 渲染临时目录已清理: %s", task_id, render_temp_dir)
 
                 # ── 4.5 封面帧持久化 ────────────────────────────────────────────
                 try:
                     if cover_candidates:
-                        first = cover_candidates[0]
+                        # #1743：批量变体封面差异化——候选帧按 task_id 稳定哈希分散选取
+                        # （同任务重试稳定，批次内不同任务落在不同帧位），非批次取首帧。
+                        _cover_idx = pick_batch_cover_index(task_id, len(cover_candidates)) if batch_id else 0
+                        first = cover_candidates[_cover_idx]
                         cover_frame_url = first.get("image_url") or first.get("url") or ""
                         if cover_frame_url:
                             _cover_session = SessionLocal()
@@ -859,35 +1064,22 @@ def generate_video(self, task_id: str) -> dict:
                     logger.warning("[task_id=%s] 更新标题使用次数异常", task_id, exc_info=True)
 
                 # 5.2 更新素材使用次数
+                # 按「最终成片 plan 实际渲染的片段」计数（#1743）：不用请求传入的
+                # task.asset_ids（可能含未被 plan 选用的素材），同一素材多片段复用
+                # 按片段数累加，使 unused_bonus / 高频排除与真实渲染强度挂钩。
+                # current_plan_id 是重渲循环结束后最终成片所用 plan（首版或重渲版）。
                 try:
-                    from worker_app.core.asset_usage import mark_asset_used_for_generation
-
                     _asset_session = SessionLocal()
                     try:
-                        from packages.adapters.sqlalchemy_impl.asset_repository import (
-                            SQLAlchemyAssetRepository,
-                        )
                         from packages.adapters.sqlalchemy_impl.generation_task_repository import (
                             SQLAlchemyGenerationTaskRepository,
                         )
 
-                        _task_repo = SQLAlchemyGenerationTaskRepository(_asset_session)
-                        _asset_repo = SQLAlchemyAssetRepository(_asset_session)
-                        _gen_task = _task_repo.get(task_id)
-                        if _gen_task and _gen_task.asset_ids:
-                            for _aid in _gen_task.asset_ids:
-                                try:
-                                    _asset = _asset_repo.get(_aid)
-                                    if _asset:
-                                        mark_asset_used_for_generation(_asset)
-                                        _asset_repo.update(_asset)
-                                except Exception:
-                                    logger.warning(
-                                        "[task_id=%s] 更新素材使用次数失败: asset_id=%s",
-                                        task_id,
-                                        _aid,
-                                        exc_info=True,
-                                    )
+                        _fallback_ids: list[str] = []
+                        _gt_for_assets = SQLAlchemyGenerationTaskRepository(_asset_session).get(task_id)
+                        if _gt_for_assets:
+                            _fallback_ids = list(_gt_for_assets.asset_ids or [])
+                        _record_rendered_asset_usage(_asset_session, current_plan_id, task_id, _fallback_ids)
                     finally:
                         _asset_session.close()
                 except Exception:

packages/application/auth/wechat_sync_use_case.py

@@ -34,7 +34,7 @@ class WechatSyncRequest:
     ):
         self.openid = openid.strip()
         self.unionid = unionid.strip() if unionid else ""
-        self.nickname = nickname or "微信用户"
+        self.nickname = nickname or "小虾同学"  # 微信新规拿不到真实昵称，新用户默认昵称
         self.avatar_url = avatar_url or ""
         self.source = source
 
@@ -227,7 +227,7 @@ class WechatSyncUseCase:
             id=user_id,
             email=email,
             username=username,
-            display_name=request.nickname or "微信用户",
+            display_name=request.nickname or "小虾同学",
             password_hash=password_hash,
             email_verified=True,  # 微信登录视为已验证
             wechat_openid=request.openid,

packages/domain/smart_match.py

@@ -10,6 +10,7 @@
 from __future__ import annotations
 
 import math
+import random
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
 from typing import Any
@@ -130,6 +131,7 @@ def smart_select_assets(
     limit: int | None = None,
     kind: str | None = None,
     now: datetime | None = None,
+    rng: random.Random | None = None,
 ) -> list[SmartMatchResult]:
     """从素材列表中智能选取素材。
 
@@ -138,9 +140,11 @@ def smart_select_assets(
         limit: 最大返回数量，None 表示不限制
         kind: 按文件类型过滤（video/image/audio），None 表示不过滤
         now: 当前时间（用于测试注入）
+        rng: 随机数生成器（用于测试注入，控制排序噪声可复现）
 
     Returns:
-        按得分降序排列的 SmartMatchResult 列表
+        按有效得分（综合得分 + 随机噪声）降序排列的 SmartMatchResult 列表。
+        r.score 始终为无噪声的原始综合得分；噪声仅用于排序/分桶顺序。
     """
     # Step 1: 过滤 ready 状态
     ready_assets = [a for a in assets if _get_enum_value(a, "status") == "ready"]
@@ -158,22 +162,39 @@ def smart_select_assets(
         total, breakdown = score_asset(a, now=now)
         scored.append(SmartMatchResult(asset=a, score=total, breakdown=breakdown))
 
-    # Step 4: 按得分降序排序
-    scored.sort(key=lambda r: r.score, reverse=True)
+    # Step 4: 按「得分 + 随机噪声」降序排序
+    # 同分/近分素材（分差 <= SCORE_RANDOM_NOISE_MAX）每次选出的顺序与组合不同，
+    # 从素材组合层面降低成片重复率；分差显著（>20）的高质量素材排名不受影响。
+    # 噪声以 asset.id 为 key 缓存，保证同一次调用内排序与分桶轮询顺序一致。
+    rng = rng or random.Random()
+    noise_by_asset: dict[str, float] = {
+        getattr(a, "id", ""): rng.uniform(0.0, SCORE_RANDOM_NOISE_MAX) for a in ready_assets
+    }
 
-    # Step 5: 多样性保障 — 时长分桶均衡选取
+    def _effective(r: SmartMatchResult) -> float:
+        return r.score + noise_by_asset.get(getattr(r.asset, "id", ""), 0.0)
+
+    scored.sort(key=_effective, reverse=True)
+
+    # Step 5: 多样性保障 — 时长分桶均衡选取（桶内同样按含噪声顺序）
     if limit and limit > 0 and len(scored) > limit:
-        scored = _diversity_select(scored, limit)
+        scored = _diversity_select(scored, limit, effective_key=_effective)
     elif limit and limit > 0:
         scored = scored[:limit]
 
     return scored
 
 
-def _diversity_select(scored: list[SmartMatchResult], limit: int) -> list[SmartMatchResult]:
+def _diversity_select(
+    scored: list[SmartMatchResult],
+    limit: int,
+    effective_key: Any | None = None,
+) -> list[SmartMatchResult]:
     """从已排序的候选中按分桶均衡选取，避免全选中同一时长档。
 
-    策略：轮流从 short/medium/long 桶中按得分顺序取，直到凑满 limit。
+    策略：轮流从 short/medium/long 桶中按顺序取，直到凑满 limit。
+    scored 已按含噪声的有效得分排序，桶内直接继承该顺序；
+    effective_key 给出时最终输出也按有效得分排序（同一次调用内噪声一致）。
     """
     buckets: dict[str, list[SmartMatchResult]] = {
         "short": [],
@@ -209,6 +230,6 @@ def _diversity_select(scored: list[SmartMatchResult], limit: int) -> list[SmartM
         if not added:
             break
 
-    # 按原始得分降序输出
-    selected.sort(key=lambda r: r.score, reverse=True)
+    # 按有效得分（含噪声）降序输出；未传 effective_key 时退回原始得分
+    selected.sort(key=effective_key or (lambda r: r.score), reverse=True)
     return selected

packages/domain/variant_plan_selector.py

@@ -0,0 +1,250 @@
+"""批量变体独立选片核心（#1743）。
+
+总原则：多视频 = 单视频逻辑 × N。批量正式生成/批量预览时，变体 1..N-1
+不再"克隆源 plan 只重算起点"（那会导致同批素材、同顺序、同速度，成片同源），
+而是**完整重跑单视频的选片流程**：
+
+1. 源 plan 片段骨架（clip_type/order/duration/text/transition）保持不变 —— 保留
+   模板结构与用户编辑结果；
+2. 素材池上做完整随机重选：
+   - 素材组合随机（shuffle 素材池 + smart_match 评分噪声由调用方排序决定）；
+   - main 片段之间随机洗牌顺序（片段顺序显著不同）；
+   - 起点走场景镜头洗牌 + 随机起点 + 历史已用区间避让
+     （pick_scene_aware_start / _calc_random_start_time，与单视频同一入口）；
+   - 跨变体/跨任务避让：get_used_segments 读取素材 metadata 持久化的已用区间，
+     record_used_segments 随新片段写回（同事务），N 个变体串行选片时天然互相避让；
+3. 批次内片段重叠检查：重选后与"本批次已选定片段"对比，同一 asset 时间区间
+   重叠占比 > 阈值（默认 20%）则该片段重选起点，最多重试若干次。
+
+本模块只产出 clips_data（dict 列表，供 EditPlanService.replace_all_clips_transactional
+落库），不碰 DB 事务边界；素材时长/场景点/已用区间由调用方注入，便于单测。
+"""
+
+from __future__ import annotations
+
+import logging
+import random
+
+from packages.domain.plan_generator_utils import _resolve_start_time
+
+logger = logging.getLogger(__name__)
+
+# ── 阈值常量 ────────────────────────────────────────────────────────────────
+BATCH_CLIP_OVERLAP_LIMIT = 0.20
+"""批次内同一素材片段时间区间重叠占比上限（20%）。超过则重选起点。"""
+
+VARIANT_RESELECT_MAX_ATTEMPTS = 6
+"""单片段重叠避让/起点重选的最大尝试次数。"""
+
+MAIN_CLIP_TYPES = {"main"}
+"""参与素材洗牌重选的片段类型（intro/outro/overlay 等固定角色片段保持源 plan）。"""
+
+
+def _clip_overlap_ratio(
+    asset_id: str,
+    start: float,
+    duration: float,
+    batch_segments: dict[str, list[tuple[float, float]]],
+) -> float:
+    """计算新区间 [start, start+duration) 与批次内同素材已选区间的重叠占比。
+
+    返回重叠总时长 / 片段时长。
+    """
+    if not asset_id or duration <= 0:
+        return 0.0
+    end = start + duration
+    overlap = 0.0
+    for seg_start, seg_end in batch_segments.get(asset_id, []):
+        ov = max(0.0, min(end, seg_end) - max(start, seg_start))
+        overlap += ov
+    return min(1.0, overlap / duration)
+
+
+def reselect_clips_for_variant(
+    source_clips: list[dict],
+    candidate_asset_ids: list[str],
+    *,
+    asset_durations: dict[str, float],
+    asset_scene_points: dict[str, list[float]] | None = None,
+    historical_used_segments: dict[str, list[tuple[float, float]]] | None = None,
+    batch_segments: dict[str, list[tuple[float, float]]] | None = None,
+    rng: random.Random | None = None,
+) -> list[dict]:
+    """为一个变体基于源片段骨架重新独立选片。
+
+    Args:
+        source_clips: 源 plan 片段（dict 列表，每项至少含
+            order/asset_id/start_time/duration/clip_type，可含
+            playback_speed/transition_effect/transition_duration/text_content）。
+        candidate_asset_ids: 素材池（源 plan 素材 ∪ 批次任务素材），将被 shuffle
+            后随机分配给 main 片段。
+        asset_durations: {asset_id: 时长秒}，起点避让/区间计算必需。
+        asset_scene_points: {asset_id: 场景切换点}，有则走镜头洗牌选起点。
+        historical_used_segments: 素材 metadata 中持久化的历史已用区间
+            （跨任务/跨变体避让），函数内会就地追加本变体选中的区间。
+        batch_segments: 本批次已选片段区间（变体间避让 + 20% 重叠检查），
+            函数内会就地追加本变体选中的区间。
+        rng: 可选随机数生成器（测试可注入固定种子）。
+
+    Returns:
+        clips_data: 与源片段等长、order 对齐的新片段 dict 列表。
+
+    Raises:
+        ValueError: 源片段为空 / 素材池为空 / 素材时长全为 0（无法差异化选片）。
+    """
+    rng = rng or random.Random()
+    if not source_clips:
+        raise ValueError("源 plan 无片段，无法为变体重新选片")
+    if not candidate_asset_ids:
+        raise ValueError("素材池为空，无法为变体独立选片（不允许退回同源成片）")
+
+    # 仅保留时长可知（>0）的素材；时长未知无法做区间避让/重叠计算
+    usable_assets = [a for a in dict.fromkeys(candidate_asset_ids) if asset_durations.get(a, 0.0) > 0]
+    if not usable_assets:
+        raise ValueError("素材池时长全部未知（0），无法为变体独立选片")
+
+    # 历史已用区间：复制一份，本变体选中的区间就地追加（随 clip record 持久化由调用方负责）
+    used_segments: dict[str, list[tuple[float, float]]] = (
+        {k: list(v) for k, v in (historical_used_segments or {}).items()} if historical_used_segments else {}
+    )
+    batch_segments = batch_segments if batch_segments is not None else {}
+
+    # 按 order 排序源片段，保持骨架顺序
+    ordered = sorted(source_clips, key=lambda c: c.get("order", 0))
+
+    # ── 1. 素材洗牌：素材池 shuffle（组合随机） ─────────────────────────────
+    shuffled_pool = list(usable_assets)
+    rng.shuffle(shuffled_pool)
+
+    # ── 2. main 片段之间洗牌顺序（顺序随机） ────────────────────────────────
+    main_indexes = [i for i, c in enumerate(ordered) if c.get("clip_type", "main") in MAIN_CLIP_TYPES]
+    rng.shuffle(main_indexes)
+
+    result: list[dict | None] = [None] * len(ordered)
+    pool_cursor = 0
+
+    for idx in main_indexes:
+        src = ordered[idx]
+        dur = float(src.get("duration", 0.0) or 0.0)
+        if dur <= 0:
+            # 异常片段：原样保留
+            result[idx] = _base_clip_data(
+                src, asset_id=src.get("asset_id", ""), start=float(src.get("start_time", 0.0))
+            )
+            continue
+
+        # 轮询取洗牌后素材（素材数 < 片段数时循环复用，但组合/顺序已随机）
+        asset_id = shuffled_pool[pool_cursor % len(shuffled_pool)]
+        pool_cursor += 1
+        total = asset_durations.get(asset_id, 0.0)
+        eff_dur = min(dur, total) if total > 0 else dur
+
+        # ── 3. 起点重选（镜头洗牌/随机起点/历史避让）+ 批次重叠避让 ──────────
+        start = _pick_start_with_overlap_avoid(
+            asset_id=asset_id,
+            clip_duration=eff_dur,
+            asset_durations=asset_durations,
+            used_segments=used_segments,
+            asset_scene_points=asset_scene_points,
+            batch_segments=batch_segments,
+            rng=rng,
+        )
+
+        interval = (start, start + eff_dur)
+        used_segments.setdefault(asset_id, []).append(interval)
+        batch_segments.setdefault(asset_id, []).append(interval)
+
+        result[idx] = _base_clip_data(src, asset_id=asset_id, start=start)
+
+    # ── 4. 非 main 片段（intro/outro/overlay 等固定角色）：保留源素材，仅重算起点 ──
+    for idx, c in enumerate(ordered):
+        if result[idx] is not None:
+            continue
+        src = c
+        aid = src.get("asset_id", "")
+        dur = float(src.get("duration", 0.0) or 0.0)
+        start = float(src.get("start_time", 0.0))
+        total = asset_durations.get(aid, 0.0)
+        if aid and dur > 0 and total > 0:
+            eff_dur = min(dur, total)
+            new_start = _pick_start_with_overlap_avoid(
+                asset_id=aid,
+                clip_duration=eff_dur,
+                asset_durations=asset_durations,
+                used_segments=used_segments,
+                asset_scene_points=asset_scene_points,
+                batch_segments=batch_segments,
+                rng=rng,
+            )
+            start = new_start
+            interval = (start, start + eff_dur)
+            used_segments.setdefault(aid, []).append(interval)
+            batch_segments.setdefault(aid, []).append(interval)
+        result[idx] = _base_clip_data(src, asset_id=aid, start=start)
+
+    return [c for c in result if c is not None]
+
+
+def _pick_start_with_overlap_avoid(
+    *,
+    asset_id: str,
+    clip_duration: float,
+    asset_durations: dict[str, float],
+    used_segments: dict[str, list[tuple[float, float]]],
+    asset_scene_points: dict[str, list[float]] | None,
+    batch_segments: dict[str, list[tuple[float, float]]],
+    rng: random.Random,
+) -> float:
+    """选起点：优先单视频同一入口（镜头洗牌/随机/历史避让），再叠加批次 20% 重叠避让。
+
+    批次内重叠超阈值时在素材可用范围内随机抖动重选，最多 VARIANT_RESELECT_MAX_ATTEMPTS 次；
+    仍超阈值则返回最后一次结果（素材极少时的尽力而为，不阻塞生成）。
+    """
+    total = asset_durations.get(asset_id, 0.0)
+    max_start = max(0.0, total - clip_duration)
+
+    candidate = _resolve_start_time(
+        asset_id,
+        clip_duration,
+        asset_durations,
+        used_segments,
+        asset_scene_points,
+    )
+    if candidate is None:
+        candidate = rng.uniform(0.0, max_start) if max_start > 0 else 0.0
+
+    best_start = candidate
+    best_ratio = _clip_overlap_ratio(asset_id, candidate, clip_duration, batch_segments)
+    if best_ratio <= BATCH_CLIP_OVERLAP_LIMIT:
+        return candidate
+
+    # 重叠超阈值：在可用范围内随机重试
+    for _ in range(VARIANT_RESELECT_MAX_ATTEMPTS):
+        alt = rng.uniform(0.0, max_start) if max_start > 0 else 0.0
+        ratio = _clip_overlap_ratio(asset_id, alt, clip_duration, batch_segments)
+        if ratio < best_ratio:
+            best_start, best_ratio = alt, ratio
+        if ratio <= BATCH_CLIP_OVERLAP_LIMIT:
+            return alt
+    logger.info(
+        "变体选片批次重叠避让达上限，采用最优起点: asset=%s overlap_ratio=%.2f",
+        asset_id,
+        best_ratio,
+    )
+    return best_start
+
+
+def _base_clip_data(src: dict, *, asset_id: str, start: float) -> dict:
+    """从源片段构造落库 dict（保留骨架/转场/文案/速度，替换素材与起点）。"""
+    return {
+        "order": src.get("order", 0),
+        "asset_id": asset_id,
+        "start_time": round(float(start), 3),
+        "duration": float(src.get("duration", 0.0) or 0.0),
+        "clip_type": src.get("clip_type", "main"),
+        "playback_speed": float(src.get("playback_speed", 1.0) or 1.0),
+        "transition_effect": src.get("transition_effect", "cut"),
+        "transition_duration": float(src.get("transition_duration", 0.0) or 0.0),
+        "text_content": src.get("text_content", ""),
+        "config": src.get("config") or {},
+    }

tests/integration/test_generation_api.py

@@ -347,8 +347,9 @@ class TestCreateGenerationTask:
         assert mock_celery.send_task.call_args[0][0] == "worker.generate_video"
 
     @patch("app.core.task_enqueue.celery_app")
-    def test_create_batch_tasks(self, mock_celery, client):
-        """批量创建多个生成任务。"""
+    def test_create_batch_tasks_without_plan_rejected(self, mock_celery, client):
+        """#1743：批量 count=3 但无剪辑计划（未传 source_edit_plan_id 且模板兜底无 plan）
+        → 400 中断，严禁 N 任务兜底共用同一 plan 产出同源成片。"""
         mock_celery.send_task = MagicMock()
 
         resp = client.post(
@@ -361,17 +362,44 @@ class TestCreateGenerationTask:
                 "count": 3,
             },
         )
-        assert resp.status_code == 200
+        assert resp.status_code == 400
+        assert "预览" in resp.json()["detail"] or "剪辑计划" in resp.json()["detail"]
+        mock_celery.send_task.assert_not_called()
+
+    @patch("app.core.task_enqueue.celery_app")
+    def test_create_batch_tasks_with_independent_variant_plans(self, mock_celery, client):
+        """#1743：批量 count=3 且有源 plan → 变体 0 用源 plan，变体 1/2 各自 reselect
+        独立选片，3 个任务关联 3 个不同 plan。"""
+        mock_celery.send_task = MagicMock()
+
+        with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+            MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = [
+                MagicMock(id="variant-plan-1"),
+                MagicMock(id="variant-plan-2"),
+            ]
+            resp = client.post(
+                "/api/v1/generation/tasks",
+                json={
+                    "project_id": "proj-1",
+                    "asset_library_id": "lib-1",
+                    "strategy_id": "strategy-default",
+                    "voice_library_id": "voice-lib-1",
+                    "source_edit_plan_id": "source-plan-1",
+                    "count": 3,
+                },
+            )
+        assert resp.status_code == 200, resp.text
         data = resp.json()
         assert len(data["items"]) == 3
         assert data["total"] == 3
-        # 验证所有任务都有不同的 ID
         task_ids = [t["id"] for t in data["items"]]
         assert len(set(task_ids)) == 3
-        # 同一批次应有相同的 batch_id
+        # 同一批次 batch_id 相同
         batch_ids = [t["batch_id"] for t in data["items"] if t["batch_id"]]
         assert len(batch_ids) == 3
         assert len(set(batch_ids)) == 1
+        # 变体 1/2 各自独立选片
+        assert MockPlanSvc.return_value.reselect_plan_for_variant.call_count == 2
 
     def test_create_task_project_not_found(self, client):
         """项目不存在返回 404。"""

tests/unit/test_1677_batch_variants.py

@@ -189,30 +189,32 @@ class TestBatchPreviewRoute:
         for i, item in enumerate(resp.items):
             assert item.variant_index == i
 
-    def test_preview_count_3_clones_three_variant_plans(self):
-        """有源 plan 时，N=3 克隆 3 个独立变体 plan（预览全部克隆，不用源 plan）"""
+    def test_preview_count_3_reselects_independent_variant_plans(self):
+        """#1743：有源 plan 时 N=3，变体0保留源 plan，变体1/2 各自独立选片（reselect）。"""
         from app.api.routes.generation_preview import create_preview_generation_task
 
         tasks = [_make_task(task_id=f"task_{i}", source_plan_id="source_plan") for i in range(3)]
         repo = _repo_mock()
-        cloned_plan_ids = ["clone_1", "clone_2", "clone_3"]
+        reselect_plan_ids = ["reselect_1", "reselect_2"]
         with patch("app.api.routes.generation_preview.CreateGenerationTaskUseCase") as MockUC:
             MockUC.return_value.execute.side_effect = tasks
             with patch("app.api.routes.generation_preview.safe_enqueue_generation_task", return_value=True):
                 with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
-                    clone_results = [MagicMock(id=pid) for pid in cloned_plan_ids]
-                    MockPlanSvc.return_value.clone_plan_for_variant.side_effect = clone_results
+                    reselect_results = [MagicMock(id=pid) for pid in reselect_plan_ids]
+                    MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = reselect_results
                     create_preview_generation_task(
                         _make_preview_request(preview_count=3),
                         authenticated_user=_make_user(),
                         generation_task_repository=repo,
                         db=MagicMock(),
                     )
-        # 克隆被调用 3 次
-        assert MockPlanSvc.return_value.clone_plan_for_variant.call_count == 3
-        # 每个任务关联到不同的克隆 plan
-        for i, task in enumerate(tasks):
-            assert task.source_edit_plan_id == cloned_plan_ids[i]
+        # 变体 1..N-1 各独立选片一次（共 2 次）；count>1 不再走 clone
+        assert MockPlanSvc.return_value.reselect_plan_for_variant.call_count == 2
+        MockPlanSvc.return_value.clone_plan_for_variant.assert_not_called()
+        # 变体0保留源 plan；变体1/2 关联各自独立选出的 plan
+        assert tasks[0].source_edit_plan_id == "source_plan"
+        assert tasks[1].source_edit_plan_id == "reselect_1"
+        assert tasks[2].source_edit_plan_id == "reselect_2"
 
     def test_preview_variant_titles_injected_per_variant(self):
         """titles[] 按变体注入 title_config.text"""
@@ -335,8 +337,8 @@ class TestBatchPreviewRoute:
             )
         assert exc.value.status_code == 429
 
-    def test_preview_clone_failure_marks_all_failed(self):
-        """克隆变体 plan 失败 → 已创建任务全部标记 failed 并 500"""
+    def test_preview_reselect_failure_marks_all_failed(self):
+        """#1743：变体独立选片（reselect）重试仍失败 → 已创建任务全部标记 failed 并 500"""
         from app.api.routes.generation_preview import create_preview_generation_task
         from fastapi import HTTPException
 
@@ -345,7 +347,7 @@ class TestBatchPreviewRoute:
         with patch("app.api.routes.generation_preview.CreateGenerationTaskUseCase") as MockUC:
             MockUC.return_value.execute.side_effect = tasks
             with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
-                MockPlanSvc.return_value.clone_plan_for_variant.side_effect = RuntimeError("db down")
+                MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = RuntimeError("db down")
                 with pytest.raises(HTTPException) as exc:
                     create_preview_generation_task(
                         _make_preview_request(preview_count=3),
@@ -357,6 +359,73 @@ class TestBatchPreviewRoute:
         # 所有已创建任务都被标记 failed
         assert all(t.status == GenerationTaskStatus.FAILED for t in tasks)
 
+    def test_preview_reselect_value_error_returns_400(self):
+        """#1743：预览 count>1 reselect 素材不足（ValueError）→ 400，已建任务标 failed。"""
+        from app.api.routes.generation_preview import create_preview_generation_task
+        from fastapi import HTTPException
+
+        tasks = [_make_task(task_id=f"task_{i}", source_plan_id="source_plan") for i in range(3)]
+        repo = _repo_mock()
+        with patch("app.api.routes.generation_preview.CreateGenerationTaskUseCase") as MockUC:
+            MockUC.return_value.execute.side_effect = tasks
+            with patch("app.api.routes.generation_preview.safe_enqueue_generation_task", return_value=True):
+                with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+                    MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = ValueError("素材池为空")
+                    with pytest.raises(HTTPException) as exc:
+                        create_preview_generation_task(
+                            _make_preview_request(preview_count=3),
+                            authenticated_user=_make_user(),
+                            generation_task_repository=repo,
+                            db=MagicMock(),
+                        )
+        assert exc.value.status_code == 400
+        assert "无法独立选片" in exc.value.detail
+        assert all(t.status == GenerationTaskStatus.FAILED for t in tasks)
+
+    def test_preview_reselect_retry_exhausted_returns_500(self):
+        """#1743：预览 count>1 reselect 连续失败（非 ValueError）→ 500，已建任务标 failed。"""
+        from app.api.routes.generation_preview import create_preview_generation_task
+        from fastapi import HTTPException
+
+        tasks = [_make_task(task_id=f"task_{i}", source_plan_id="source_plan") for i in range(3)]
+        repo = _repo_mock()
+        with patch("app.api.routes.generation_preview.CreateGenerationTaskUseCase") as MockUC:
+            MockUC.return_value.execute.side_effect = tasks
+            with patch("app.api.routes.generation_preview.safe_enqueue_generation_task", return_value=True):
+                with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+                    MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = RuntimeError("db down")
+                    with pytest.raises(HTTPException) as exc:
+                        create_preview_generation_task(
+                            _make_preview_request(preview_count=3),
+                            authenticated_user=_make_user(),
+                            generation_task_repository=repo,
+                            db=MagicMock(),
+                        )
+        assert exc.value.status_code == 500
+        assert all(t.status == GenerationTaskStatus.FAILED for t in tasks)
+
+    def test_preview_count1_with_source_plan_clones(self):
+        """#1743 零回归：预览 count=1 且有源 plan 仍走 clone（不 reselect）。"""
+        from app.api.routes.generation_preview import create_preview_generation_task
+
+        task = _make_task(task_id="task_1", source_plan_id="source_plan")
+        repo = _repo_mock()
+        with patch("app.api.routes.generation_preview.CreateGenerationTaskUseCase") as MockUC:
+            MockUC.return_value.execute.return_value = task
+            with patch("app.api.routes.generation_preview.safe_enqueue_generation_task", return_value=True):
+                with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+                    MockPlanSvc.return_value.clone_plan_for_variant.return_value = MagicMock(id="clone_1")
+                    resp = create_preview_generation_task(
+                        _make_preview_request(preview_count=1),
+                        authenticated_user=_make_user(),
+                        generation_task_repository=repo,
+                        db=MagicMock(),
+                    )
+        assert resp.total == 1
+        MockPlanSvc.return_value.clone_plan_for_variant.assert_called_once()
+        MockPlanSvc.return_value.reselect_plan_for_variant.assert_not_called()
+        assert task.source_edit_plan_id == "clone_1"
+
 
 # ════════════════════════════════════════════════════════════════════════════
 # 批量正式生成：变体配置注入
@@ -366,7 +435,7 @@ class TestBatchPreviewRoute:
 class TestBatchGenerationVariantConfig:
     """POST /tasks count=N 时变体独立配置。"""
 
-    def _call_create_tasks(self, request, repo=None):
+    def _call_create_tasks(self, request, repo=None, db_latest_plan=None):
         from app.api.routes.generation_tasks import create_generation_task
 
         repo = repo or MagicMock()
@@ -379,9 +448,9 @@ class TestBatchGenerationVariantConfig:
         asset_repo = MagicMock()
         asset_repo.find_by_id.return_value = None
 
-        # db.query().filter()...first() 返回 None：不走兜底关联编辑计划
+        # db.query().filter()...first()：db_latest_plan 非空时模拟模板兜底查到最新 plan
         db = MagicMock()
-        db.query.return_value.filter.return_value.order_by.return_value.first.return_value = None
+        db.query.return_value.filter.return_value.order_by.return_value.first.return_value = db_latest_plan
 
         return create_generation_task(
             request,
@@ -407,20 +476,29 @@ class TestBatchGenerationVariantConfig:
                 t.title_config = cmd.title_config
                 t.voice_library_id = cmd.voice_library_id
                 t.cover_url = cmd.cover_url
+                t.source_edit_plan_id = cmd.source_edit_plan_id  # #1743：usecase 落库关联 plan
                 return t
 
             MockUC.return_value.execute.side_effect = _execute
             with patch.object(routes, "safe_enqueue_generation_task", return_value=True):
-                req = CreateGenerationTaskRequest(
-                    template_id="tpl_1",
-                    asset_ids=["a1"],
-                    count=3,
-                    title_config={"font": "宋体"},
-                    titles=["成片标题1", "成片标题2", "成片标题3"],
-                    voice_library_ids=["v1", "v2", "v3"],
-                    cover_urls=["http://c1", "http://c2", "http://c3"],
-                )
-                resp = self._call_create_tasks(req)
+                # #1743：count>1 必须有源 plan，变体 1..N-1 走 reselect 独立选片
+                with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+                    MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = [
+                        MagicMock(id="reselect_1"),
+                        MagicMock(id="reselect_2"),
+                    ]
+                    req = CreateGenerationTaskRequest(
+                        template_id="tpl_1",
+                        asset_ids=["a1"],
+                        count=3,
+                        source_edit_plan_id="source_plan",
+                        title_config={"font": "宋体"},
+                        titles=["成片标题1", "成片标题2", "成片标题3"],
+                        voice_library_ids=["v1", "v2", "v3"],
+                        cover_urls=["http://c1", "http://c2", "http://c3"],
+                    )
+                    resp = self._call_create_tasks(req)
+            assert MockPlanSvc.return_value.reselect_plan_for_variant.call_count == 2
         assert resp.total == 3
         assert [c.title_config["text"] for c in captured] == ["成片标题1", "成片标题2", "成片标题3"]
         assert [c.voice_library_id for c in captured] == ["v1", "v2", "v3"]
@@ -467,21 +545,124 @@ class TestBatchGenerationVariantConfig:
 
             def _execute(cmd):
                 captured.append(cmd)
-                return tasks[len(captured) - 1]
+                t = tasks[len(captured) - 1]
+                t.source_edit_plan_id = cmd.source_edit_plan_id  # #1743：usecase 落库关联 plan
+                return t
 
             MockUC.return_value.execute.side_effect = _execute
             with patch.object(routes, "safe_enqueue_generation_task", return_value=True):
-                req = CreateGenerationTaskRequest(
-                    template_id="tpl_1",
-                    asset_ids=["a1"],
-                    count=3,
-                    voice_library_ids=["shared_voice"],
-                    cover_urls=["http://shared"],
-                )
-                self._call_create_tasks(req)
+                # #1743：count>1 必须有源 plan，变体 1..N-1 走 reselect 独立选片
+                with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+                    MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = [
+                        MagicMock(id="reselect_1"),
+                        MagicMock(id="reselect_2"),
+                    ]
+                    req = CreateGenerationTaskRequest(
+                        template_id="tpl_1",
+                        asset_ids=["a1"],
+                        count=3,
+                        source_edit_plan_id="source_plan",
+                        voice_library_ids=["shared_voice"],
+                        cover_urls=["http://shared"],
+                    )
+                    self._call_create_tasks(req)
+            assert MockPlanSvc.return_value.reselect_plan_for_variant.call_count == 2
         assert all(c.voice_library_id == "shared_voice" for c in captured)
         assert all(c.cover_url == "http://shared" for c in captured)
 
+    def test_count3_template_fallback_plan_used(self):
+        """#1743：未传 source_edit_plan_id 时，模板兜底查到最新 plan 即作为批量源 plan。"""
+        from app.api.routes import generation_tasks as routes
+
+        tasks = [_make_task(task_id=f"gen_fb_{i}") for i in range(3)]
+
+        def _execute(cmd):
+            t = tasks[len([c for c in getattr(_execute, "caps", [])])]
+            t.source_edit_plan_id = cmd.source_edit_plan_id
+            _execute.caps.append(cmd)
+            return t
+
+        _execute.caps = []
+
+        latest = MagicMock(id="fallback_plan_id")
+        req = CreateGenerationTaskRequest(template_id="tpl_1", asset_ids=["a1"], count=3)
+
+        with patch.object(routes, "CreateGenerationTaskUseCase") as MockUC:
+            MockUC.return_value.execute.side_effect = _execute
+            with patch.object(routes, "safe_enqueue_generation_task", return_value=True):
+                with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+                    MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = [
+                        MagicMock(id="reselect_1"),
+                        MagicMock(id="reselect_2"),
+                    ]
+                    self._call_create_tasks(req, db_latest_plan=latest)
+
+        # 兜底 plan 被用作源；变体0关联兜底 plan，变体1/2关联 reselect plan
+        assert _execute.caps[0].source_edit_plan_id == "fallback_plan_id"
+        assert _execute.caps[1].source_edit_plan_id == "reselect_1"
+        assert _execute.caps[2].source_edit_plan_id == "reselect_2"
+
+    def test_count3_reselect_value_error_returns_400(self):
+        """#1743：reselect 素材不足（ValueError）→ 400 明确报错，零任务入队。"""
+        from app.api.routes import generation_tasks as routes
+        from fastapi import HTTPException
+
+        enqueue = MagicMock(return_value=True)
+        req = CreateGenerationTaskRequest(
+            template_id="tpl_1", asset_ids=["a1"], count=3, source_edit_plan_id="source_plan"
+        )
+        with patch.object(routes, "CreateGenerationTaskUseCase") as MockUC:
+            MockUC.return_value.execute.side_effect = lambda cmd: _make_task(task_id="should_not_run")
+            with patch.object(routes, "safe_enqueue_generation_task", enqueue):
+                with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+                    MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = ValueError("素材池为空")
+                    with pytest.raises(HTTPException) as exc:
+                        self._call_create_tasks(req)
+        assert exc.value.status_code == 400
+        assert "无法独立选片" in exc.value.detail
+        enqueue.assert_not_called()
+
+    def test_count3_reselect_retry_exhausted_returns_500(self):
+        """#1743：reselect 连续 2 次都非 ValueError 失败 → 500，零任务入队。"""
+        from app.api.routes import generation_tasks as routes
+        from fastapi import HTTPException
+
+        enqueue = MagicMock(return_value=True)
+        req = CreateGenerationTaskRequest(
+            template_id="tpl_1", asset_ids=["a1"], count=3, source_edit_plan_id="source_plan"
+        )
+        with patch.object(routes, "CreateGenerationTaskUseCase") as MockUC:
+            MockUC.return_value.execute.side_effect = lambda cmd: _make_task(task_id="should_not_run")
+            with patch.object(routes, "safe_enqueue_generation_task", enqueue):
+                with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+                    MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = RuntimeError("db down")
+                    with pytest.raises(HTTPException) as exc:
+                        self._call_create_tasks(req)
+        assert exc.value.status_code == 500
+        enqueue.assert_not_called()
+
+    def test_count3_missing_plan_after_prebuild_raises_500(self):
+        """#1743 兜底守卫：任务落库时 plan 丢失（usecase 未透传）→ 500，严禁静默共用。"""
+        from app.api.routes import generation_tasks as routes
+        from fastapi import HTTPException
+
+        req = CreateGenerationTaskRequest(
+            template_id="tpl_1", asset_ids=["a1"], count=3, source_edit_plan_id="source_plan"
+        )
+        with patch.object(routes, "CreateGenerationTaskUseCase") as MockUC:
+            # usecase 返回的任务 source_edit_plan_id 为空（模拟落库丢 plan）
+            MockUC.return_value.execute.side_effect = lambda cmd: _make_task(task_id="lost_plan")
+            with patch.object(routes, "safe_enqueue_generation_task", return_value=True):
+                with patch("app.services.edit_plan_service.EditPlanService") as MockPlanSvc:
+                    MockPlanSvc.return_value.reselect_plan_for_variant.side_effect = [
+                        MagicMock(id="reselect_1"),
+                        MagicMock(id="reselect_2"),
+                    ]
+                    with pytest.raises(HTTPException) as exc:
+                        self._call_create_tasks(req)
+        assert exc.value.status_code == 500
+        assert "变体剪辑计划缺失" in exc.value.detail
+
 
 class TestVariantValueHelper:
     """_variant_value 取值逻辑。"""

tests/unit/test_asset_availability.py

@@ -420,8 +420,9 @@ class TestSmartMatchFlatStructure:
         """item.id 直接在顶层可读，不存在 item.asset 包装层。"""
         assets = [_fresh_asset("a-flat-1"), _fresh_asset("a-flat-2")]
         resp = TestSmartMatchFiltersExhausted()._call(assets)
-        ids = [item.id for item in resp.items]
-        assert ids == ["a-flat-1", "a-flat-2"]
+        ids = {item.id for item in resp.items}
+        # 同分素材排序含随机噪声（#1743），只断言集合不断言顺序
+        assert ids == {"a-flat-1", "a-flat-2"}
         # 嵌套 asset 字段已移除
         assert all(not hasattr(item, "asset") for item in resp.items)
 

tests/unit/test_asset_select_mode.py

@@ -12,6 +12,7 @@
 
 from __future__ import annotations
 
+import random
 import sys
 from pathlib import Path
 
@@ -19,6 +20,20 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
 
 from app.api.routes.generation_tasks import _select_assets_from_library
 
+from packages.domain.smart_match import SCORE_RANDOM_NOISE_MAX
+
+
+class _ZeroNoiseRandom(random.Random):
+    """零噪声随机源：uniform(0, NOISE_MAX) 恒返回 0，smart 排序确定可复现。"""
+
+    def uniform(self, a, b):
+        if a == 0.0 and b == SCORE_RANDOM_NOISE_MAX:
+            return 0.0
+        return super().uniform(a, b)
+
+
+_ZERO_NOISE = _ZeroNoiseRandom(0)
+
 from packages.domain import Asset, AssetStatus
 
 
@@ -106,7 +121,7 @@ class TestSelectAssetsSmartMode:
             _asset("high", "high.mp4", quality_score=90),
             _asset("mid", "mid.mp4", quality_score=60),
         ]
-        result = _select_assets_from_library(assets, mode="smart", count=0)
+        result = _select_assets_from_library(assets, mode="smart", count=0, rng=_ZERO_NOISE)
         assert result == ["high", "mid", "low"]
 
     def test_smart_duration_optimal_beats_too_short(self):
@@ -115,7 +130,7 @@ class TestSelectAssetsSmartMode:
             _asset("too_short", "short.mp4", quality_score=80, duration=1.0),
             _asset("optimal", "optimal.mp4", quality_score=80, duration=15.0),
         ]
-        result = _select_assets_from_library(assets, mode="smart", count=0)
+        result = _select_assets_from_library(assets, mode="smart", count=0, rng=_ZERO_NOISE)
         # Both: quality=80*0.4=32, recency/unused equal
         # optimal(15s): duration_fitness=30 → total=62+
         # too_short(1s): duration_fitness=20+(1/5)*80=36 → 36*0.3=10.8 → total=42.8+
@@ -127,7 +142,7 @@ class TestSelectAssetsSmartMode:
             _asset("a2", "v2.mp4", quality_score=70),
             _asset("a3", "v3.mp4", quality_score=50),
         ]
-        result = _select_assets_from_library(assets, mode="smart", count=2)
+        result = _select_assets_from_library(assets, mode="smart", count=2, rng=_ZERO_NOISE)
         assert result == ["a1", "a2"]
 
     def test_smart_null_quality_treated_as_default(self):
@@ -136,7 +151,7 @@ class TestSelectAssetsSmartMode:
             _asset("scored", "scored.mp4", quality_score=80),
             _asset("unscored", "unscored.mp4", quality_score=None),
         ]
-        result = _select_assets_from_library(assets, mode="smart", count=0)
+        result = _select_assets_from_library(assets, mode="smart", count=0, rng=_ZERO_NOISE)
         # scored(80): quality=80*0.4=32; unscored(None→50): quality=50*0.4=20
         assert result == ["scored", "unscored"]
 
@@ -146,7 +161,7 @@ class TestSelectAssetsSmartMode:
             _asset("a2", "v2.mp4", quality_score=90),
             _asset("a3", "v3.mp4", quality_score=50),
         ]
-        result = _select_assets_from_library(assets, mode="smart", count=0)
+        result = _select_assets_from_library(assets, mode="smart", count=0, rng=_ZERO_NOISE)
         assert result == ["a2", "a3", "a1"]
 
 

tests/unit/test_asset_usage_count_1743.py

@@ -0,0 +1,194 @@
+"""#1743 素材使用次数回写测试。
+
+计数口径修复：
+- mark_asset_used_for_generation 支持 times 参数，按成片实际片段引用次数累加
+- _count_plan_clip_asset_usage 从最终成片 plan 的 clips 统计 {asset_id: 片段引用次数}
+- _record_rendered_asset_usage 回写 metadata：plan clips 为准、空 plan 兜底任务 asset_ids、
+  未被 plan 选用的素材不计数、单素材失败不影响其他素材
+"""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+for sub in ("apps/worker", "apps/api", "packages", ""):
+    p = str(REPO_ROOT / sub) if sub else str(REPO_ROOT)
+    if p not in sys.path:
+        sys.path.insert(0, p)
+
+import worker_app.tasks.generation as gen_mod  # noqa: E402
+from worker_app.core.asset_usage import mark_asset_used_for_generation  # noqa: E402
+
+
+class FakeAsset:
+    def __init__(self, aid: str, metadata: dict | None = None):
+        self.id = aid
+        self.metadata = metadata or {}
+
+
+# ── mark_asset_used_for_generation ──────────────────────────────────────────
+
+
+class TestMarkAssetUsed:
+    def test_default_times_is_one(self):
+        a = FakeAsset("a1", metadata={})
+        mark_asset_used_for_generation(a)
+        assert a.metadata["generation_use_count"] == 1
+        assert "last_used_at" in a.metadata
+
+    def test_times_accumulates_by_clip_count(self):
+        """同一素材被 3 个片段引用 → 一次回写 +3。"""
+        a = FakeAsset("a1", metadata={"generation_use_count": 2})
+        mark_asset_used_for_generation(a, times=3)
+        assert a.metadata["generation_use_count"] == 5
+
+    def test_times_zero_or_negative_floored_to_one(self):
+        a = FakeAsset("a1", metadata={})
+        mark_asset_used_for_generation(a, times=0)
+        assert a.metadata["generation_use_count"] == 1
+
+    def test_preserves_existing_metadata(self):
+        a = FakeAsset("a1", metadata={"tags": ["travel"], "generation_use_count": 4})
+        mark_asset_used_for_generation(a, times=2)
+        assert a.metadata["tags"] == ["travel"]
+        assert a.metadata["generation_use_count"] == 6
+
+
+# ── _count_plan_clip_asset_usage ────────────────────────────────────────────
+
+
+def _mock_session_with_clips(clip_asset_ids: list[str]):
+    """构造 mock session：query(EditPlanClipModel).filter().all() 返回片段 asset_id 行。"""
+    rows = [(aid,) for aid in clip_asset_ids]
+    session = MagicMock()
+    session.query.return_value.filter.return_value.all.return_value = rows
+    return session
+
+
+class TestCountPlanClipUsage:
+    def test_counts_asset_occurrences_across_clips(self):
+        """plan clips 中 asset-x 出现 2 次、asset-y 1 次 → {x:2, y:1}。"""
+        session = _mock_session_with_clips(["asset-x", "asset-y", "asset-x", ""])
+        with _patch_clip_model():
+            counts = gen_mod._count_plan_clip_asset_usage(session, "plan-1")
+        assert counts == {"asset-x": 2, "asset-y": 1}
+
+    def test_empty_clips_returns_empty(self):
+        session = _mock_session_with_clips([])
+        with _patch_clip_model():
+            counts = gen_mod._count_plan_clip_asset_usage(session, "plan-9")
+        assert counts == {}
+
+    def test_blank_asset_ids_skipped(self):
+        session = _mock_session_with_clips(["", None, "asset-z"])
+        with _patch_clip_model():
+            counts = gen_mod._count_plan_clip_asset_usage(session, "plan-1")
+        assert counts == {"asset-z": 1}
+
+
+class _patch_clip_model:
+    """patch generation 模块内 EditPlanClipModel 的导入路径（函数内 import）。"""
+
+    def __enter__(self):
+        import unittest.mock as mock
+
+        self._patches = [
+            mock.patch("packages.adapters.sqlalchemy_impl.models.EditPlanClipModel", MagicMock()),
+        ]
+        for p in self._patches:
+            p.start()
+        return self
+
+    def __exit__(self, *exc):
+        for p in self._patches:
+            p.stop()
+        return False
+
+
+# ── _record_rendered_asset_usage ────────────────────────────────────────────
+
+
+class TestRecordRenderedAssetUsage:
+    def _run(self, clip_ids, fallback_ids=None, repo_get_override=None, repo_update_side=None):
+        session = _mock_session_with_clips(clip_ids)
+        assets: dict[str, FakeAsset] = {}
+
+        def fake_repo_init(sess):
+            repo = MagicMock()
+
+            def fake_get(aid):
+                if repo_get_override and aid in repo_get_override:
+                    return repo_get_override[aid]
+                return assets.setdefault(aid, FakeAsset(aid, metadata={}))
+
+            repo.get.side_effect = fake_get
+            if repo_update_side:
+                repo.update.side_effect = repo_update_side
+            else:
+                repo.update.side_effect = lambda a: a
+            return repo
+
+        import unittest.mock as mock
+
+        with (
+            mock.patch(
+                "packages.adapters.sqlalchemy_impl.asset_repository.SQLAlchemyAssetRepository",
+                side_effect=fake_repo_init,
+            ),
+            _patch_clip_model(),
+        ):
+            written = gen_mod._record_rendered_asset_usage(session, "plan-1", "task-1", fallback_asset_ids=fallback_ids)
+        return written, assets
+
+    def test_writes_by_plan_clips_not_request_asset_ids(self):
+        """核心口径：plan clips 用 x×2 + y×1；请求里的 z（未被 plan 选用）不计数。"""
+        written, assets = self._run(
+            clip_ids=["asset-x", "asset-x", "asset-y"],
+            fallback_ids=["asset-x", "asset-y", "asset-z"],
+        )
+        assert written == 2
+        assert assets["asset-x"].metadata["generation_use_count"] == 2
+        assert assets["asset-y"].metadata["generation_use_count"] == 1
+        assert "asset-z" not in assets, "未被 plan 选用的素材不应被计数"
+
+    def test_fallback_to_task_asset_ids_when_plan_empty(self):
+        """plan 无有效片段（异常数据）→ 兜底任务 asset_ids 每个计 1 次。"""
+        written, assets = self._run(clip_ids=[""], fallback_ids=["asset-a", "asset-b"])
+        assert written == 2
+        assert assets["asset-a"].metadata["generation_use_count"] == 1
+        assert assets["asset-b"].metadata["generation_use_count"] == 1
+
+    def test_no_clips_no_fallback_returns_zero(self):
+        written, assets = self._run(clip_ids=[], fallback_ids=[])
+        assert written == 0
+        assert assets == {}
+
+    def test_single_asset_failure_does_not_block_others(self):
+        """单素材 update 抛异常不影响其他素材回写。"""
+
+        def update_side(a):
+            if a.id == "bad":
+                raise RuntimeError("DB boom")
+            return a
+
+        written, assets = self._run(
+            clip_ids=["good1", "bad", "good2"],
+            fallback_ids=None,
+            repo_update_side=update_side,
+        )
+        assert written == 2
+        assert assets["good1"].metadata["generation_use_count"] == 1
+        assert assets["good2"].metadata["generation_use_count"] == 1
+
+    def test_missing_asset_skipped(self):
+        """repo.get 返回 None 的素材跳过，不报错。"""
+        written, assets = self._run(
+            clip_ids=["ghost", "real"],
+            fallback_ids=None,
+            repo_get_override={"ghost": None},
+        )
+        assert written == 1
+        assert assets["real"].metadata["generation_use_count"] == 1

tests/unit/test_batch_dedup_helpers_1743.py

@@ -0,0 +1,244 @@
+"""#1743 dedup_helpers 批次查重 + worker 重选 plan 重试函数测试。
+
+覆盖：
+- 批次任务且无历史重复时走 check_batch_duplicate，batch_similarity 透传到返回 dict
+- 批次任务历史已重复 → 不再做批次查重，is_duplicate=True / duplicate_of 透传
+- 非批次任务 batch_similarity 恒为 None
+- _reselect_plan_for_batch_retry：成功返回新 plan_id；异常返回 None（保留首版）
+"""
+
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+for sub in ("apps/worker", "apps/api", "packages", ""):
+    p = str(REPO_ROOT / sub) if sub else str(REPO_ROOT)
+    if p not in sys.path:
+        sys.path.insert(0, p)
+
+from sqlalchemy import create_engine  # noqa: E402
+from sqlalchemy.orm import sessionmaker  # noqa: E402
+
+os.environ.setdefault("DATABASE_URL", "sqlite:///:memory:")
+from packages.adapters.sqlalchemy_impl.models import Base  # noqa: E402
+
+
+@pytest.fixture
+def session():
+    engine = create_engine("sqlite:///:memory:")
+    Base.metadata.create_all(engine)
+    s = sessionmaker(bind=engine)()
+    try:
+        yield s
+    finally:
+        s.close()
+
+
+def _dedup_kwargs(batch_id):
+    return dict(
+        generation_task_id="task-batch-1",
+        project_id="proj-1",
+        user_id="user-1",
+        batch_id=batch_id,
+        file_url="https://oss.example.com/v.mp4",
+        file_size=1024,
+        duration=10.0,
+        video_path="/tmp/fake.mp4",
+        mode="edit_plan",
+        width=1280,
+        height=720,
+        fps=25.0,
+    )
+
+
+class TestBatchDedupInHelpers:
+    """dedup_helpers 内部 lazy import video_processing.dedup（依赖 cv2），
+    复用 test_generated_video_creation_logic 的 mock 模块注册模式。"""
+
+    @classmethod
+    def setup_class(cls):
+        import sys
+
+        if "cv2" not in sys.modules:
+            sys.modules["cv2"] = MagicMock()
+
+        # 保存 setup 前的真实模块引用，teardown 原样还原（沙箱无 cv2 时 reimport 会失败，
+        # 若直接 pop 掉 MagicMock 会让后续测试（如 test_dedup_1702）拿到残缺模块）
+        import video_processing
+
+        cls._orig_dedup = sys.modules.get("video_processing.dedup")
+        cls._orig_dedup_attr = getattr(video_processing, "dedup", None)
+        cls._orig_thumb = sys.modules.get("video_processing.thumbnail_generator")
+        cls._orig_thumb_attr = getattr(video_processing, "thumbnail_generator", None)
+
+        mock_dedup = MagicMock()
+        mock_dedup.VideoDeduplicator = MagicMock()
+        sys.modules["video_processing.dedup"] = mock_dedup
+
+        mock_thumb = MagicMock()
+        mock_thumb.extract_first_frame = MagicMock()
+        sys.modules["video_processing.thumbnail_generator"] = mock_thumb
+
+        video_processing.dedup = mock_dedup
+        video_processing.thumbnail_generator = mock_thumb
+
+    @classmethod
+    def teardown_class(cls):
+        import sys
+
+        import video_processing
+
+        # 还原 setup 前状态：原本有真模块→放回；原本没有→移除 mock
+        if cls._orig_dedup is not None:
+            sys.modules["video_processing.dedup"] = cls._orig_dedup
+        else:
+            sys.modules.pop("video_processing.dedup", None)
+        if cls._orig_dedup_attr is not None:
+            video_processing.dedup = cls._orig_dedup_attr
+        elif hasattr(video_processing, "dedup"):
+            delattr(video_processing, "dedup")
+
+        if cls._orig_thumb is not None:
+            sys.modules["video_processing.thumbnail_generator"] = cls._orig_thumb
+        else:
+            sys.modules.pop("video_processing.thumbnail_generator", None)
+        if cls._orig_thumb_attr is not None:
+            video_processing.thumbnail_generator = cls._orig_thumb_attr
+        elif hasattr(video_processing, "thumbnail_generator"):
+            delattr(video_processing, "thumbnail_generator")
+
+    def test_batch_similarity_returned_when_batch_duplicate_found(self, session):
+        """批次任务 + 无历史重复 + 批次查重命中 → 返回 batch_similarity 与 is_duplicate。"""
+        from video_processing.dedup_helpers import create_video_record_and_dedup
+
+        with patch("video_processing.dedup.VideoDeduplicator") as mock_cls:
+            dedup = mock_cls.return_value
+            dedup.compute_fingerprint.return_value = MagicMock(to_dict=lambda: {})
+            dedup.check_duplicate.return_value = None  # 历史无重复
+            dedup.check_batch_duplicate.return_value = {
+                "duplicate_of": "video-existing",
+                "reason": "batch_similar",
+                "similarity": 0.601,
+            }
+            dedup.compute_duplicate_rate.return_value = {
+                "duplicate_rate": 0.0,
+                "visual_similarity": 0.0,
+                "match_count": 0,
+            }
+
+            result = create_video_record_and_dedup(session=session, **_dedup_kwargs("batch-abc"))
+
+        assert result["video_count"] == 1
+        assert result["batch_similarity"] == pytest.approx(0.601)
+        assert result["is_duplicate"] is True
+        assert result["duplicate_of"] == "video-existing"
+        # 批次查重确实被调用（历史查重为 None 才走批次）
+        dedup.check_batch_duplicate.assert_called_once()
+
+    def test_batch_check_skipped_when_historical_duplicate(self, session):
+        """历史查重已命中 → 不再批次查重，batch_similarity 为 None。"""
+        from video_processing.dedup_helpers import create_video_record_and_dedup
+
+        with patch("video_processing.dedup.VideoDeduplicator") as mock_cls:
+            dedup = mock_cls.return_value
+            dedup.compute_fingerprint.return_value = MagicMock(to_dict=lambda: {})
+            dedup.check_duplicate.return_value = {
+                "duplicate_of": "video-old",
+                "reason": "global",
+                "similarity": 0.85,
+            }
+            dedup.compute_duplicate_rate.return_value = {
+                "duplicate_rate": 85.0,
+                "visual_similarity": 0.85,
+                "match_count": 3,
+            }
+
+            result = create_video_record_and_dedup(session=session, **_dedup_kwargs("batch-abc"))
+
+        assert result["is_duplicate"] is True
+        assert result["duplicate_of"] == "video-old"
+        assert result["batch_similarity"] is None
+        dedup.check_batch_duplicate.assert_not_called()
+
+    def test_non_batch_never_runs_batch_check(self, session):
+        """非批次任务（batch_id 为空）→ 不调用批次查重，batch_similarity None。"""
+        from video_processing.dedup_helpers import create_video_record_and_dedup
+
+        with patch("video_processing.dedup.VideoDeduplicator") as mock_cls:
+            dedup = mock_cls.return_value
+            dedup.compute_fingerprint.return_value = MagicMock(to_dict=lambda: {})
+            dedup.check_duplicate.return_value = None
+            dedup.check_batch_duplicate.return_value = {"similarity": 0.99}
+            dedup.compute_duplicate_rate.return_value = {
+                "duplicate_rate": 0.0,
+                "visual_similarity": 0.0,
+                "match_count": 0,
+            }
+
+            result = create_video_record_and_dedup(session=session, **_dedup_kwargs(""))
+
+        assert result["video_count"] == 1
+        assert result["batch_similarity"] is None
+        assert result["is_duplicate"] is False
+        dedup.check_batch_duplicate.assert_not_called()
+
+    def test_batch_no_duplicate_returns_none_similarity(self, session):
+        """批次任务但批次查重也未命中 → batch_similarity None（驱动不重渲）。"""
+        from video_processing.dedup_helpers import create_video_record_and_dedup
+
+        with patch("video_processing.dedup.VideoDeduplicator") as mock_cls:
+            dedup = mock_cls.return_value
+            dedup.compute_fingerprint.return_value = MagicMock(to_dict=lambda: {})
+            dedup.check_duplicate.return_value = None
+            dedup.check_batch_duplicate.return_value = None
+            dedup.compute_duplicate_rate.return_value = {
+                "duplicate_rate": 0.0,
+                "visual_similarity": 0.0,
+                "match_count": 0,
+            }
+
+            result = create_video_record_and_dedup(session=session, **_dedup_kwargs("batch-xyz"))
+
+        assert result["batch_similarity"] is None
+        assert result["is_duplicate"] is False
+
+
+class TestReselectPlanForBatchRetry:
+    def test_success_returns_new_plan_id(self):
+        """重选成功 → 返回新 plan_id。"""
+        from worker_app.tasks.generation import _reselect_plan_for_batch_retry
+
+        fake_svc = MagicMock()
+        fake_svc.reselect_plan_for_variant.return_value = MagicMock(id="new-plan-999")
+        with patch("app.services.edit_plan_service.EditPlanService", return_value=fake_svc):
+            with patch("worker_app.tasks.generation.SessionLocal") as mock_session_local:
+                mock_session_local.return_value = MagicMock()
+                new_id = _reselect_plan_for_batch_retry(
+                    "task-1",
+                    "old-plan",
+                    {"task_asset_ids": ["a1", "a2"], "user_id": "u-1"},
+                )
+        assert new_id == "new-plan-999"
+        fake_svc.reselect_plan_for_variant.assert_called_once()
+        args, kwargs = fake_svc.reselect_plan_for_variant.call_args
+        assert args[0] == "old-plan"
+        assert args[1] == ["a1", "a2"]
+        assert kwargs["created_by_user_id"] == "u-1"
+
+    def test_failure_returns_none_and_keeps_first_version(self):
+        """重选抛异常 → 返回 None（调用方放弃重渲、保留首版），不抛出。"""
+        from worker_app.tasks.generation import _reselect_plan_for_batch_retry
+
+        fake_svc = MagicMock()
+        fake_svc.reselect_plan_for_variant.side_effect = RuntimeError("db down")
+        with patch("app.services.edit_plan_service.EditPlanService", return_value=fake_svc):
+            with patch("worker_app.tasks.generation.SessionLocal") as mock_session_local:
+                mock_session_local.return_value = MagicMock()
+                result = _reselect_plan_for_batch_retry("task-1", "old-plan", {"task_asset_ids": [], "user_id": "u-1"})
+        assert result is None

tests/unit/test_batch_no_plan_guard.py

@@ -1,7 +1,9 @@
-"""AI Review 回归：批量生成 count>1 但 source_edit_plan_id 为空时不应 IndexError。
+"""#1743 批量生成无可用 plan 守卫。
 
-变体 plan 预克隆仅在 source_edit_plan_id 非空时执行；无源 plan 时
-variant_plan_ids 为空，循环中禁止索引访问，各任务走自身随机选片流程。
+新规则（P0 降重）：count>1 批量生成时必须存在源 plan（前端传入或按模板兜底
+解析到最新 plan），为每个变体独立选片；**无任何可用 plan 时直接 4xx 中断、
+不创建任务**，严禁 N 个任务兜底共用同一 plan 产出同源成片。
+N=1 单视频不受影响（无 plan 时走原有单任务流程）。
 """
 
 import sys
@@ -9,6 +11,9 @@ from pathlib import Path
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
+import pytest
+from fastapi import HTTPException
+
 REPO_ROOT = Path(__file__).resolve().parents[2]
 if str(REPO_ROOT) not in sys.path:
     sys.path.insert(0, str(REPO_ROOT))
@@ -18,78 +23,117 @@ def _make_user():
     return SimpleNamespace(user=SimpleNamespace(id="user-1"))
 
 
-def _make_request(count):
+def _make_request(count, **overrides):
     from app.schemas.generation_task import CreateGenerationTaskRequest
 
-    return CreateGenerationTaskRequest(
+    fields = dict(
         project_id="proj-1",
         asset_library_id="lib-1",
         strategy_id="one_take",
         asset_ids=["a1"],
         count=count,
-        source_edit_plan_id="",  # 关键：无源 plan（空字符串为假值）
+        source_edit_plan_id="",
     )
+    fields.update(overrides)
+    return CreateGenerationTaskRequest(**fields)
 
 
-class TestBatchNoSourcePlanNoIndexError:
-    def test_count3_without_source_plan_creates_three_tasks(self):
-        """count=3 且无 source_edit_plan_id：不克隆、不 IndexError、创建 3 个任务。"""
+def _common_patches(latest_plan=None):
+    """构造通用 patch 上下文（repo/usecase/enqueue 等）。latest_plan 为模板兜底 plan 或 None。"""
+    repo = MagicMock()
+    repo.count_pending_by_user.return_value = 0
+    repo.count_pending_total.return_value = 0
+    repo.create.side_effect = lambda t: t
+    repo.update.side_effect = lambda t: t
+
+    created = []
+
+    def _fake_execute(cmd):
+        task = MagicMock()
+        task.id = f"task-{len(created) + 1}"
+        task.source_edit_plan_id = cmd.source_edit_plan_id
+        task.status = "pending"
+        task.progress = 0.0
+        task.strategy_id = "one_take"
+        task.error_message = ""
+        task.cover_url = ""
+        task.title_config = {}
+        task.created_at = None
+        task.batch_id = "batch-1"
+        created.append(task)
+        return task
+
+    db = MagicMock()
+    # 模板兜底查最新 plan：返回 latest_plan（None 表示查不到）
+    db.query.return_value.filter.return_value.order_by.return_value.first.return_value = latest_plan
+
+    mock_uc = patch("app.api.routes.generation_tasks.CreateGenerationTaskUseCase")
+    other_patches = [
+        patch("app.api.routes.generation_tasks.safe_enqueue_generation_task", return_value=True),
+        patch("app.api.routes.generation_tasks._writeback_edit_plan_config"),
+        patch(
+            "app.api.routes.generation_tasks._resolve_project_and_library",
+            return_value=("proj-1", ""),
+        ),
+    ]
+    return repo, db, created, mock_uc, other_patches, _fake_execute
+
+
+class TestBatchNoSourcePlanGuard:
+    def test_count3_without_any_plan_rejects_4xx_and_creates_nothing(self):
+        """count=3 且无源 plan、模板兜底也查不到 → 400 中断，零任务创建（严禁同源成片）。"""
         from app.api.routes.generation_tasks import create_generation_task
 
-        repo = MagicMock()
-        repo.count_pending_by_user.return_value = 0
-        repo.count_pending_total.return_value = 0
-        repo.create.side_effect = lambda t: t
-        repo.update.side_effect = lambda t: t
+        repo, db, created, mock_uc, other_patches, fake_exec = _common_patches(latest_plan=None)
+        MockUC = mock_uc.start()
+        MockUC.return_value.execute.side_effect = fake_exec
+        for p in other_patches:
+            p.start()
+        all_patches = [mock_uc] + other_patches
+        try:
+            with pytest.raises(HTTPException) as exc_info:
+                create_generation_task(
+                    _make_request(3),
+                    authenticated_user=_make_user(),
+                    generation_task_repository=repo,
+                    project_repository=MagicMock(),
+                    asset_repository=MagicMock(),
+                    asset_library_repository=MagicMock(),
+                    db=db,
+                )
+            assert exc_info.value.status_code == 400
+        finally:
+            for p in reversed(all_patches):
+                p.stop()
+        assert len(created) == 0, "无 plan 批量必须零任务创建"
 
-        created = []
+    def test_count1_without_plan_still_works(self):
+        """N=1 单视频无 plan 不触发批量守卫（向后兼容，不 4xx）。"""
+        from app.api.routes.generation_tasks import create_generation_task
 
-        def _fake_execute(cmd):
-            task = MagicMock()
-            task.id = f"task-{len(created) + 1}"
-            task.source_edit_plan_id = cmd.source_edit_plan_id
-            task.status = "pending"
-            task.progress = 0.0
-            task.strategy_id = "one_take"
-            task.error_message = ""
-            task.cover_url = None
-            task.title_config = {}
-            task.created_at = None
-            task.batch_id = "batch-1"
-            created.append(task)
-            return task
-
-        with patch("app.api.routes.generation_tasks.CreateGenerationTaskUseCase") as MockUC:
-            MockUC.return_value.execute.side_effect = _fake_execute
-            with patch(
-                "app.api.routes.generation_tasks.safe_enqueue_generation_task",
-                return_value=True,
-            ):
-                with patch("app.api.routes.generation_tasks._writeback_edit_plan_config"):
-                    with patch(
-                        "app.api.routes.generation_tasks._resolve_project_and_library",
-                        return_value=("proj-1", ""),
-                    ):
-                        # 核心断言：不得抛 IndexError（变体 plan 索引守卫）。
-                        # 响应序列化字段与本回归无关，ValidationError 可接受，
-                        # 但 IndexError 必须不出现。
-                        try:
-                            create_generation_task(
-                                _make_request(3),
-                                authenticated_user=_make_user(),
-                                generation_task_repository=repo,
-                                project_repository=MagicMock(),
-                                asset_repository=MagicMock(),
-                                asset_library_repository=MagicMock(),
-                                db=MagicMock(),
-                            )
-                        except IndexError as exc:  # pragma: no cover - 不应发生
-                            pytest.fail(f"无源 plan 批量生成触发 IndexError: {exc}")
-                        except Exception:
-                            # 响应序列化等其他异常与本次守卫无关，忽略
-                            pass
-
-        # 3 个任务全部创建（未因 IndexError 中断）
-        assert len(created) == 3
-        # 无源 plan 时所有任务 source_edit_plan_id 均为空
-        assert all(not t.source_edit_plan_id for t in created)
+        repo, db, created, mock_uc, other_patches, fake_exec = _common_patches(latest_plan=None)
+        MockUC = mock_uc.start()
+        MockUC.return_value.execute.side_effect = fake_exec
+        for p in other_patches:
+            p.start()
+        all_patches = [mock_uc] + other_patches
+        try:
+            create_generation_task(
+                _make_request(1),
+                authenticated_user=_make_user(),
+                generation_task_repository=repo,
+                project_repository=MagicMock(),
+                asset_repository=MagicMock(),
+                asset_library_repository=MagicMock(),
+                db=db,
+            )
+        except HTTPException as e:
+            assert e.status_code != 400, f"N=1 不应被批量守卫拦截: {e.detail}"
+        except Exception:
+            # MagicMock 任务对象下游响应序列化可能抛 ValidationError 等，与批量守卫无关；
+            # 任务已在 usecase.execute 中创建，下方断言 created==1 即证明守卫未拦截。
+            pass
+        finally:
+            for p in reversed(all_patches):
+                p.stop()
+        assert len(created) == 1

tests/unit/test_batch_render_rerender_1743.py

@@ -0,0 +1,80 @@
+"""#1743 worker 批量重渲判定 + 封面哈希选帧纯函数测试。
+
+- should_rerender_for_batch_dedup：批次首版查重率 >20% 才重渲（非批次/重渲版/无查重率不重渲）
+- pick_batch_cover_index：task_id md5 稳定哈希分散候选帧（同任务稳定、跨任务分散）
+"""
+
+from __future__ import annotations
+
+import hashlib
+import sys
+from pathlib import Path
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+for sub in ("apps/worker", "apps/api", "packages", ""):
+    p = str(REPO_ROOT / sub) if sub else str(REPO_ROOT)
+    if p not in sys.path:
+        sys.path.insert(0, p)
+
+from worker_app.tasks.generation import (  # noqa: E402
+    BATCH_RENDER_SIMILARITY_LIMIT,
+    pick_batch_cover_index,
+    should_rerender_for_batch_dedup,
+)
+
+
+class TestShouldRerenderForBatchDedup:
+    def test_non_batch_never_rerenders(self):
+        """非批次任务（batch_id 为空）任何查重率都不重渲。"""
+        assert should_rerender_for_batch_dedup(batch_id="", render_attempt=0, batch_similarity=0.99) is False
+        assert should_rerender_for_batch_dedup(batch_id="", render_attempt=0, batch_similarity=None) is False
+
+    def test_batch_first_version_over_threshold_rerenders(self):
+        """批次首版（attempt=0）查重率 >20% → 重渲。"""
+        assert should_rerender_for_batch_dedup(batch_id="batch-1", render_attempt=0, batch_similarity=0.601) is True
+        assert should_rerender_for_batch_dedup(batch_id="batch-1", render_attempt=0, batch_similarity=0.21) is True
+
+    def test_batch_first_version_under_threshold_no_rerender(self):
+        """批次首版查重率 ≤20% → 不重渲。"""
+        assert should_rerender_for_batch_dedup(batch_id="batch-1", render_attempt=0, batch_similarity=0.20) is False
+        assert should_rerender_for_batch_dedup(batch_id="batch-1", render_attempt=0, batch_similarity=0.0) is False
+        assert should_rerender_for_batch_dedup(batch_id="batch-1", render_attempt=0, batch_similarity=0.05) is False
+
+    def test_rerendered_version_never_rerenders_again(self):
+        """重渲版（attempt=1）即使仍超阈值也不再重渲（最多重渲一次）。"""
+        assert should_rerender_for_batch_dedup(batch_id="batch-1", render_attempt=1, batch_similarity=0.99) is False
+
+    def test_missing_similarity_no_rerender(self):
+        """查重率缺失（None，非批次查重路径）→ 不重渲。"""
+        assert should_rerender_for_batch_dedup(batch_id="batch-1", render_attempt=0, batch_similarity=None) is False
+
+    def test_threshold_constant_is_20_percent(self):
+        assert BATCH_RENDER_SIMILARITY_LIMIT == 0.20
+
+
+class TestPickBatchCoverIndex:
+    def test_stable_for_same_task(self):
+        """同一 task_id 多次调用结果稳定（重试封面不变）。"""
+        first = pick_batch_cover_index("task-abc", 3)
+        for _ in range(5):
+            assert pick_batch_cover_index("task-abc", 3) == first
+
+    def test_zero_or_one_candidate_returns_zero(self):
+        assert pick_batch_cover_index("task-x", 0) == 0
+        assert pick_batch_cover_index("task-x", 1) == 0
+
+    def test_index_within_range(self):
+        for i in range(20):
+            idx = pick_batch_cover_index(f"task-{i}", 3)
+            assert 0 <= idx < 3
+
+    def test_matches_md5_formula(self):
+        """与主流程公式一致：md5(task_id) % 候选数。"""
+        task_id = "task-formula-check"
+        expected = int(hashlib.md5(task_id.encode()).hexdigest(), 16) % 3
+        assert pick_batch_cover_index(task_id, 3) == expected
+
+    def test_batch_tasks_spread_across_frames(self):
+        """30 个批次任务在 3 个候选帧上分散（不能全部落在 frame_0——旧 bug 回归守卫）。"""
+        indexes = {pick_batch_cover_index(f"batch-task-{i}", 3) for i in range(30)}
+        assert len(indexes) >= 2, f"封面帧应分散到多个帧位，实际全部落在: {indexes}"

tests/unit/test_dedup_two_phase_commit.py

@@ -85,7 +85,10 @@ class TestTwoPhaseCommit:
                 session=session,
             )
 
-        assert result == 1
+        # #1743：返回值由 int 改为 dict（含批次查重信息）
+        assert isinstance(result, dict)
+        assert result["video_count"] == 1
+        assert result["batch_similarity"] is None  # 非批次任务无批次相似度
         # create() should be called exactly once with the complete video object
         mock_repo.create.assert_called_once()
         created_video = mock_repo.create.call_args[0][0]
@@ -122,7 +125,10 @@ class TestTwoPhaseCommit:
                 session=session,
             )
 
-        assert result == 1
+        # #1743：返回值由 int 改为 dict（含批次查重信息）
+        assert isinstance(result, dict)
+        assert result["video_count"] == 1
+        assert result["batch_similarity"] is None  # 非批次任务无批次相似度
         mock_repo.create.assert_called_once()
         created_video = mock_repo.create.call_args[0][0]
         assert created_video.duplicate_rate is None
@@ -161,7 +167,10 @@ class TestTwoPhaseCommit:
                 session=session,
             )
 
-        assert result == 1
+        # #1743：返回值由 int 改为 dict（含批次查重信息）
+        assert isinstance(result, dict)
+        assert result["video_count"] == 1
+        assert result["batch_similarity"] is None  # 非批次任务无批次相似度
         mock_repo.create.assert_called_once()
         created_video = mock_repo.create.call_args[0][0]
         # Fingerprint should be set
@@ -229,6 +238,7 @@ class TestTwoPhaseCommit:
                 session=session,
             )
 
-        assert result == 0
+        # #1743：失败路径返回 dict（video_count=0）
+        assert result["video_count"] == 0
         session.commit.assert_not_called()
         session.rollback.assert_called_once()

tests/unit/test_generated_video_creation_logic.py

@@ -381,7 +381,8 @@ class TestThumbnailInDedupHelpers:
                     thumbnail_url=pre_thumb_url,
                 )
 
-            assert result == 1
+            # #1743：返回 dict（非批次 batch_similarity=None）
+            assert result["video_count"] == 1
 
             from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
 
@@ -427,7 +428,8 @@ class TestThumbnailInDedupHelpers:
                     fps=25.0,
                 )
 
-            assert result == 1
+            # #1743：返回 dict（非批次 batch_similarity=None）
+            assert result["video_count"] == 1
 
             from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
 
@@ -474,7 +476,7 @@ class TestThumbnailInDedupHelpers:
                     fps=25.0,
                 )
 
-            assert result == 1  # 不阻断
+            assert result["video_count"] == 1  # 不阻断（#1743 dict 返回）
 
             from packages.adapters.sqlalchemy_impl.models import GeneratedVideoModel
 

tests/unit/test_reselect_plan_variant_1743.py

@@ -0,0 +1,206 @@
+"""#1743 EditPlanService.reselect_plan_for_variant 服务层测试。
+
+与 clone_plan_for_variant（只重算起点、素材/顺序不变）不同，reselect 完整重跑
+单视频选片：素材池 shuffle + main 片段顺序洗牌 + 起点重选 + 批次 20% 重叠避让。
+
+覆盖：
+- 独立 plan：新 plan_id 与源不同、命名带后缀、模板/config 复制
+- 新片段经 replace_all_clips_transactional 落库，素材/起点与源 plan 存在差异
+- 源 plan 区间作为批次避让初始对象；record_used_segments 随新片段写回
+- 源 plan 无片段 → ValueError（不创建同源变体）
+"""
+
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
+os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+sys.path.insert(0, str(REPO_ROOT / "apps" / "api"))
+sys.path.insert(0, str(Path(__file__).resolve().parent))  # tests/unit
+
+from test_edit_plan_service import StubEditPlanClipRepository, StubEditPlanRepository, _make_service  # noqa: E402
+
+from packages.domain.edit_plan_clip import EditPlanClip  # noqa: E402
+
+
+@pytest.fixture
+def svc_with_source():
+    """带源 plan（4 个 main 片段，素材 a1/a2/a3/a4）+ 2 个批次候选素材的 service。"""
+    svc = _make_service()
+    svc._clip_repo.session = MagicMock()
+
+    source = svc.create_plan(template_id="tpl-001", name="9/6-草稿", total_duration=20.0, config={"title": "源配置"})
+    for i, aid in enumerate(["a1", "a2", "a3", "a4"]):
+        clip = EditPlanClip.create(
+            plan_id=source.id,
+            clip_type="main",
+            order=i,
+            asset_id=aid,
+            start_time=float(i * 5),
+            duration=5.0,
+            text_content=f"文案{i}",
+        )
+        svc._clip_repo.create(clip)
+    return svc, source
+
+
+def _patch_deps(svc, durations):
+    """统一 patch reselect 的 DB/素材/历史区间依赖。返回 (patches, mock_replace)。"""
+    asset_models = []
+    for aid, dur in durations.items():
+        m = MagicMock(id=aid)
+        m.duration = dur
+        m.metadata = None  # extract_scene_points_from_metadata(None) → 无场景点
+        asset_models.append(m)
+
+    mock_replace = patch.object(svc, "replace_all_clips_transactional", return_value=4)
+    patches = [
+        patch("app.services.edit_plan_service.get_used_segments", return_value={}),
+        patch("app.services.edit_plan_service.record_used_segments", return_value=None),
+        patch("packages.domain.plan_generator_utils.extract_scene_points_from_metadata", return_value=[]),
+        patch("packages.adapters.sqlalchemy_impl.models.AssetModel", create=True),
+        mock_replace,
+    ]
+    started = []
+    for p in patches:
+        started.append(p.start())
+    # started[-1] 是 replace_all 的 MagicMock
+    mock_replace_obj = started[-1]
+    # db.query(AssetModel).filter(...).all() → 带 duration 的素材 mock
+    svc._clip_repo.session.query.return_value.filter.return_value.all.return_value = asset_models
+    return patches, mock_replace_obj
+
+
+class TestReselectPlanForVariant:
+    def test_creates_independent_plan_with_different_clips(self, svc_with_source):
+        """reselect 产出新 plan（id/名称不同），片段素材或起点与源 plan 存在差异。"""
+        import random
+
+        svc, source = svc_with_source
+        durations = {"a1": 300.0, "a2": 300.0, "a3": 300.0, "a4": 300.0, "a5": 300.0, "a6": 300.0}
+        patches, mock_replace = _patch_deps(svc, durations)
+        try:
+            new_plan = svc.reselect_plan_for_variant(
+                source.id,
+                ["a5", "a6"],  # 批次素材并入素材池
+                created_by_user_id="u-1",
+                name_suffix="批量2",
+                rng=random.Random(42),
+            )
+        finally:
+            for p in reversed(patches):
+                p.stop()
+
+        # 新 plan 独立、归属/模板/config 复制
+        assert new_plan.id != source.id
+        assert "批量2" in new_plan.name
+        assert new_plan.template_id == "tpl-001"
+        assert new_plan.config == {"title": "源配置"}
+        assert new_plan.created_by_user_id == "u-1"
+
+        # 落库片段数 == 源片段数，且 order 对齐
+        clips_data = mock_replace.call_args.args[1]
+        assert len(clips_data) == 4
+        assert [c["order"] for c in clips_data] == [0, 1, 2, 3]
+
+        # 与源 plan 对比：素材序列或起点必须存在差异（降重核心——不是克隆）
+        source_pairs = [(c.asset_id, round(float(c.start_time), 2)) for c in svc._clip_repo.list_by_plan(source.id)]
+        new_pairs = [(c["asset_id"], round(float(c["start_time"]), 2)) for c in clips_data]
+        assert new_pairs != source_pairs, f"reselect 片段应与源 plan 不同，实际相同: {new_pairs}"
+        # 素材全部来自素材池（源 a1-a4 ∪ 批次 a5-a6）
+        for c in clips_data:
+            assert c["asset_id"] in durations
+
+    def test_record_used_segments_called_per_clip(self, svc_with_source):
+        """每个新片段区间调用 record_used_segments 写回（跨变体/跨任务避让链路）。"""
+        import random
+
+        svc, source = svc_with_source
+        durations = {"a1": 300.0, "a2": 300.0, "a3": 300.0, "a4": 300.0, "a5": 300.0}
+
+        asset_models = []
+        for aid in durations:
+            m = MagicMock(id=aid)
+            m.duration = durations[aid]
+            m.metadata = None
+            asset_models.append(m)
+        svc._clip_repo.session.query.return_value.filter.return_value.all.return_value = asset_models
+
+        started = [
+            patch("app.services.edit_plan_service.get_used_segments", return_value={}).start(),
+            patch("packages.domain.plan_generator_utils.extract_scene_points_from_metadata", return_value=[]).start(),
+            patch("packages.adapters.sqlalchemy_impl.models.AssetModel", create=True).start(),
+            patch.object(svc, "replace_all_clips_transactional", return_value=4).start(),
+        ]
+        mock_record = patch("app.services.edit_plan_service.record_used_segments", return_value=None).start()
+        try:
+            svc.reselect_plan_for_variant(
+                source.id, ["a5"], created_by_user_id="u-1", name_suffix="批量2", rng=random.Random(5)
+            )
+        finally:
+            patch.stopall()
+
+        assert mock_record.call_count == 4, "4 个片段应各写一次 used_segment"
+        for call in mock_record.call_args_list:
+            args = call.args
+            assert args[1] in durations, f"asset_id {args[1]} 不在素材池"  # asset_id
+            assert args[3] > args[2], "区间 end 应大于 start"  # end > start
+            assert args[4], "new plan_id 应非空"
+
+    def test_source_clips_seed_batch_avoidance(self, svc_with_source):
+        """源 plan 片段区间进入批次避让集：与源完全同区间的起点重叠率应超限被避开。"""
+        import random
+
+        svc, source = svc_with_source
+        # 素材池只有源素材（极端小池），时长充足
+        durations = {"a1": 600.0, "a2": 600.0, "a3": 600.0, "a4": 600.0}
+        patches, mock_replace = _patch_deps(svc, durations)
+        try:
+            new_plan = svc.reselect_plan_for_variant(
+                source.id, [], created_by_user_id="u-1", name_suffix="批量2", rng=random.Random(99)
+            )
+        finally:
+            for p in reversed(patches):
+                p.stop()
+
+        clips_data = mock_replace.call_args.args[1]
+        source_clips = svc._clip_repo.list_by_plan(source.id)
+        source_by_asset = {}
+        for c in source_clips:
+            source_by_asset.setdefault(c.asset_id, []).append(
+                (float(c.start_time), float(c.start_time) + float(c.duration))
+            )
+
+        # 同素材新片段与源区间的重叠占比均 ≤20%
+        from packages.domain.variant_plan_selector import _clip_overlap_ratio
+
+        for c in clips_data:
+            ratio = _clip_overlap_ratio(c["asset_id"], float(c["start_time"]), float(c["duration"]), source_by_asset)
+            assert (
+                ratio <= 0.20 + 1e-6
+            ), f"变体片段与源 plan 同素材区间重叠超限: asset={c['asset_id']} ratio={ratio:.2%}"
+        assert new_plan.id != source.id
+
+    def test_source_plan_without_clips_raises(self):
+        """源 plan 无片段 → ValueError（明确报错，不产出同源变体）。"""
+        svc = _make_service()
+        svc._clip_repo.session = MagicMock()
+        empty = svc.create_plan(template_id="tpl-x", name="空计划")
+
+        with pytest.raises(ValueError, match="源 plan 无片段"):
+            svc.reselect_plan_for_variant(empty.id, ["a1"], created_by_user_id="u-1", name_suffix="变体")
+
+    def test_missing_source_plan_raises(self):
+        """源 plan 不存在 → get_plan_or_raise 抛错。"""
+        svc = _make_service()
+        svc._clip_repo.session = MagicMock()
+        with pytest.raises((ValueError, KeyError, LookupError)):  # get_plan_or_raise 抛错
+            svc.reselect_plan_for_variant("not-exist-plan", ["a1"], created_by_user_id="u-1", name_suffix="变体")

tests/unit/test_smart_match.py

@@ -1,5 +1,6 @@
 """Tests for packages/domain/smart_match.py — 统一智能选素材算法。"""
 
+import random
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta, timezone
 from typing import Any
@@ -7,6 +8,7 @@ from typing import Any
 import pytest
 
 from packages.domain.smart_match import (
+    SCORE_RANDOM_NOISE_MAX,
     SmartMatchResult,
     _diversity_select,
     _duration_bucket,
@@ -46,6 +48,22 @@ class FakeAsset:
 NOW = datetime(2026, 8, 5, 12, 0, 0, tzinfo=timezone.utc)
 
 
+class _ZeroNoiseRandom(random.Random):
+    """零噪声随机源：uniform(0, NOISE_MAX) 恒返回 0，使「按评分降序」类断言确定可复现。
+
+    smart_select_assets 生产环境注入随机噪声（同分素材每次选出不同组合，#1743）；
+    验证纯评分排序的单测用本随机源消除排序随机性。
+    """
+
+    def uniform(self, a, b):
+        if a == 0.0 and b == SCORE_RANDOM_NOISE_MAX:
+            return 0.0
+        return super().uniform(a, b)
+
+
+_ZERO_NOISE = _ZeroNoiseRandom(0)
+
+
 # ── score_asset tests ────────────────────────────────────────────────────────
 
 
@@ -185,7 +203,7 @@ class TestSmartSelectAssets:
             FakeAsset(id="high", quality_score=95, duration=15),
             FakeAsset(id="mid", quality_score=60, duration=15),
         ]
-        results = smart_select_assets(assets)
+        results = smart_select_assets(assets, rng=_ZERO_NOISE)
         scores = [r.score for r in results]
         assert scores == sorted(scores, reverse=True)
         assert results[0].asset.id == "high"
@@ -234,7 +252,7 @@ class TestSmartSelectAssets:
             FakeAsset(id="img1", mime_type="image/jpeg", quality_score=90, duration=None),
             FakeAsset(id="img2", mime_type="image/png", quality_score=70, duration=None),
         ]
-        results = smart_select_assets(assets, kind="image")
+        results = smart_select_assets(assets, kind="image", rng=_ZERO_NOISE)
         assert len(results) == 2
         assert results[0].asset.id == "img1"
 

tests/unit/test_smart_match_fallback.py

@@ -155,7 +155,9 @@ class TestSmartMatchAvailabilityFallback:
         project = Project(id="proj-1", name="Test", owner_user_id="user-1")
         assets = [
             _video_asset("top-exhausted.mp4", quality=100, used_ranges=_exhausted_ranges(15)),
-            _video_asset("second-fresh.mp4", quality=40, used_ranges=None),
+            # second 质量分显著高于 third（质量项差 (90-30)*0.4=24 > 噪声上限 20），
+            # 排除耗尽素材后 second 稳定排首位回补（噪声不影响大分差排名）
+            _video_asset("second-fresh.mp4", quality=90, used_ranges=None),
             _video_asset("third-fresh.mp4", quality=30, used_ranges=None),
         ]
         repo = _StubAssetRepo(assets)

tests/unit/test_smart_match_integration.py

@@ -9,6 +9,7 @@
 from __future__ import annotations
 
 import os
+import random
 import sys
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
@@ -41,6 +42,18 @@ class FakeAsset:
     file_type: str = "video"
 
 
+class _ZeroNoiseRandom(random.Random):
+    """零噪声随机源：uniform(0, NOISE_MAX) 恒返回 0，消除排序随机性；
+    其他随机调用（非噪声区间）保持正常随机行为。"""
+
+    def uniform(self, a, b):
+        from packages.domain.smart_match import SCORE_RANDOM_NOISE_MAX
+
+        if a == 0.0 and b == SCORE_RANDOM_NOISE_MAX:
+            return 0.0
+        return super().uniform(a, b)
+
+
 def _asset_with_use_count(asset_id: str, use_count: int) -> FakeAsset:
     """创建指定使用次数的素材，其他维度保持一致。"""
     return FakeAsset(
@@ -112,25 +125,25 @@ class TestSmartSelectAssetsOrdering:
     """验证 smart_select_assets 返回结果按评分降序。"""
 
     def test_less_used_assets_ranked_higher(self):
-        """使用次数少的素材在结果中排名更高。"""
+        """使用次数少的素材在结果中排名更高（注入零噪声 rng 验证纯评分排序）。"""
         assets = [
             _asset_with_use_count("heavily_used", 10),
             _asset_with_use_count("never_used", 0),
             _asset_with_use_count("lightly_used", 2),
         ]
-        results = smart_select_assets(assets)
+        results = smart_select_assets(assets, rng=_ZeroNoiseRandom())
         ids = [r.asset.id for r in results]
         # never_used 排第一，heavily_used 排最后
         assert ids[0] == "never_used"
         assert ids[-1] == "heavily_used"
 
     def test_same_quality_different_use_count(self):
-        """质量相同时，使用次数少的排名更高。"""
+        """质量相同时，使用次数少的排名更高（注入零噪声 rng）。"""
         assets = [
             _asset_with_use_count("used_5", 5),
             _asset_with_use_count("used_0", 0),
         ]
-        results = smart_select_assets(assets)
+        results = smart_select_assets(assets, rng=_ZeroNoiseRandom())
         assert results[0].asset.id == "used_0"
         assert results[1].asset.id == "used_5"
 
@@ -158,22 +171,47 @@ def _make_auth_user():
     return auth
 
 
-def _make_zero_noise_patcher(module):
-    """构造 patch(module.random.uniform)：噪声调用(上界=SCORE_RANDOM_NOISE_MAX)返回 0。
+class _ZeroNoiseCtx:
+    """同时 patch module.random.uniform（排序噪声归零）与 module.random.shuffle
+    （排序后的素材洗牌保持原序），使「按评分排序」类断言确定可复现。
 
-    其他 uniform 调用（如片段时长随机）委托给一个独立的 Random 实例，
-    避免递归回已 patch 的全局函数。
+    生产环境排序噪声与 shuffle 都是降重随机的一部分；测试需要验证纯评分
+    排序时用本上下文消除随机性。其他 uniform 调用（片段时长随机等）委托给
+    独立 Random 实例，避免递归回已 patch 的全局函数。
     """
-    import random as _stdlib_random
 
-    _fallback = _stdlib_random.Random()
+    def __init__(self, module):
+        import random as _stdlib_random
 
-    def _fake_uniform(a, b):
-        if b == SCORE_RANDOM_NOISE_MAX:
-            return 0.0
-        return _fallback.uniform(a, b)
+        self._module = module
+        self._fallback = _stdlib_random.Random()
+        self._patches = []
 
-    return patch.object(module.random, "uniform", _fake_uniform)
+    def __enter__(self):
+        import random as _stdlib_random
+
+        def _fake_uniform(a, b):
+            if b == SCORE_RANDOM_NOISE_MAX:
+                return 0.0
+            return self._fallback.uniform(a, b)
+
+        def _no_shuffle(seq):
+            return None  # 保持原序，不洗牌
+
+        self._patches = [
+            patch.object(self._module.random, "uniform", _fake_uniform).start(),
+            patch.object(self._module.random, "shuffle", _no_shuffle).start(),
+        ]
+        return self
+
+    def __exit__(self, *exc):
+        patch.stopall()
+        return False
+
+
+def _make_zero_noise_patcher(module):
+    """构造零噪声上下文（uniform 噪声归零 + shuffle 保持原序）。"""
+    return _ZeroNoiseCtx(module)
 
 
 def _patch_zero_noise_clips():

tests/unit/test_smart_match_noise_1743.py

@@ -0,0 +1,134 @@
+"""#1743 smart-match 排序随机噪声测试。
+
+smart_select_assets 排序注入 0~SCORE_RANDOM_NOISE_MAX 随机噪声后：
+- 同分/近分素材每次调用选出的组合与顺序不同（修复"每次只选同样几个素材"）
+- 分差 > 噪声上限的高质量素材保持稳定优先级
+- r.score 始终为无噪声原始分；噪声只影响排序
+- 同一次调用内排序与多样性分桶使用一致噪声（结果稳定可复现）
+"""
+
+from __future__ import annotations
+
+import random
+import sys
+from dataclasses import dataclass, field
+from datetime import datetime, timezone
+from pathlib import Path
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+for sub in ("packages",):
+    p = str(REPO_ROOT / sub)
+    if p not in sys.path:
+        sys.path.insert(0, p)
+
+from packages.domain.smart_match import (  # noqa: E402
+    SCORE_RANDOM_NOISE_MAX,
+    score_asset,
+    smart_select_assets,
+)
+
+NOW = datetime(2026, 9, 6, 12, 0, 0, tzinfo=timezone.utc)
+
+
+@dataclass
+class FakeAsset:
+    id: str
+    duration: float = 15.0
+    quality_score: float | None = None  # None → 按 50 计，模拟 staging 真实情况
+    status: str = "ready"
+    metadata: dict = field(default_factory=dict)
+    created_at: datetime = NOW
+
+    @property
+    def file_type(self) -> str:
+        return "video"
+
+
+def _make_tied_assets(n: int) -> list[FakeAsset]:
+    """构造 n 个综合得分完全相同的素材（quality NULL 按 50 + 时长 15s 满分 + 同创建时间）。"""
+    return [FakeAsset(id=f"a{i}", duration=15.0, quality_score=None) for i in range(n)]
+
+
+class TestScoreNoiseInjection:
+    def test_tied_assets_same_raw_score(self):
+        """前置校验：同分素材原始得分确实一致。"""
+        assets = _make_tied_assets(6)
+        scores = {score_asset(a, now=NOW)[0] for a in assets}
+        assert len(scores) == 1, f"测试前提不成立：同分素材得分不一致 {scores}"
+
+    def test_tied_assets_order_varies_across_calls(self):
+        """同分素材：不同随机种子选出的顺序/组合不同（核心修复点）。"""
+        orderings = set()
+        for seed in range(8):
+            results = smart_select_assets(_make_tied_assets(8), rng=random.Random(seed))
+            orderings.add(tuple(r.asset.id for r in results))
+        # 8 个不同种子应产生多种不同排序（若零随机噪声则只有 1 种）
+        assert len(orderings) >= 4, f"同分素材排序几乎不变: {len(orderings)} 种"
+
+    def test_tied_assets_top_n_varies_with_limit(self):
+        """同分素材 + limit 截断：不同种子选出的 Top-N 组合不同。"""
+        top_sets = set()
+        for seed in range(10):
+            results = smart_select_assets(_make_tied_assets(10), limit=3, rng=random.Random(seed))
+            top_sets.add(frozenset(r.asset.id for r in results))
+        assert len(top_sets) >= 4, f"Top-N 组合几乎不变: {len(top_sets)} 种"
+
+    def test_large_score_gap_keeps_priority(self):
+        """分差 > 噪声上限（20）时：低质素材即使噪声拉满也排不到高质素材前面。"""
+        # 高质：quality=100 → quality_component=40；低质：quality=0 → 0，仅质量项就差 40 分
+        high = [FakeAsset(id="high", quality_score=100, duration=15.0)]
+        low = [FakeAsset(id=f"low{i}", quality_score=0, duration=15.0) for i in range(6)]
+        for seed in range(20):
+            results = smart_select_assets(high + low, limit=3, rng=random.Random(seed))
+            assert results[0].asset.id == "high", f"seed={seed} 低质素材靠噪声排到首位"
+
+    def test_score_field_is_raw_without_noise(self):
+        """r.score 始终是无噪声原始分（噪声只影响排序，不污染返回分值）。"""
+        assets = _make_tied_assets(5)
+        raw_scores = {score_asset(a, now=NOW)[0] for a in assets}
+        results = smart_select_assets(assets, rng=random.Random(42))
+        for r in results:
+            assert r.score in raw_scores
+
+    def test_rng_deterministic_same_seed(self):
+        """同一种子多次调用结果完全一致（可复现，测试可依赖）。"""
+        run = lambda: tuple(  # noqa: E731
+            r.asset.id for r in smart_select_assets(_make_tied_assets(8), rng=random.Random(123))
+        )
+        assert run() == run()
+
+    def test_diversity_bucket_respects_noise(self):
+        """多样性分桶路径（候选数 > limit）：同分素材跨种子入选组合不同。"""
+        # 构造短/中/长三档同分素材各 4 个，limit=6 触发分桶轮询
+        assets = []
+        for i in range(4):
+            assets.append(FakeAsset(id=f"short{i}", duration=6.0))
+        for i in range(4):
+            assets.append(FakeAsset(id=f"med{i}", duration=15.0))
+        for i in range(4):
+            assets.append(FakeAsset(id=f"long{i}", duration=45.0))
+        # 同档内时长接近 → 得分接近
+        combos = set()
+        for seed in range(10):
+            results = smart_select_assets(assets, limit=6, rng=random.Random(seed))
+            combos.add(frozenset(r.asset.id for r in results))
+        assert len(combos) >= 3, f"分桶选取组合几乎不变: {len(combos)} 种"
+
+    def test_noise_constant_matches_from_assets(self):
+        """噪声上限与 from-assets 片段分配的 SCORE_RANDOM_NOISE_MAX 同源（20 分）。"""
+        assert SCORE_RANDOM_NOISE_MAX == 20.0
+
+    def test_returns_all_when_no_limit(self):
+        """无 limit 时返回全部候选（噪声只改顺序，不丢素材）。"""
+        assets = _make_tied_assets(7)
+        results = smart_select_assets(assets, rng=random.Random(1))
+        assert len(results) == 7
+        assert {r.asset.id for r in results} == {a.id for a in assets}
+
+    def test_non_ready_assets_excluded_before_noise(self):
+        """非 ready 素材不参与排序（噪声不影响状态过滤）。"""
+        assets = _make_tied_assets(4)
+        assets[0].status = "processing"
+        results = smart_select_assets(assets, rng=random.Random(1))
+        assert all(r.asset.status == "ready" for r in results)
+        assert len(results) == 3

tests/unit/test_temp_dir_cleanup_race.py

@@ -51,6 +51,7 @@ def test_generation_cleans_up_temp_dir():
     assert "rmtree(render_temp_dir" in source, "generation.py 应清理 render_temp_dir"
 
     # 验证清理发生在上传之后（通过查找顺序）
-    upload_pos = source.find("_upload_and_record")
+    # #1743：_upload_and_record 拆分为 _upload_rendered_video（仅 OSS 上传）
+    upload_pos = source.find("_upload_rendered_video")
     cleanup_pos = source.find("rmtree(render_temp_dir")
-    assert upload_pos > 0 and cleanup_pos > upload_pos, "清理临时目录应在 _upload_and_record 之后执行"
+    assert upload_pos > 0 and cleanup_pos > upload_pos, "清理临时目录应在 _upload_rendered_video 之后执行"

tests/unit/test_variant_plan_selector_1743.py

@@ -0,0 +1,271 @@
+"""#1743 批量变体独立选片纯核心测试（packages/domain/variant_plan_selector.py）。
+
+覆盖：
+- 固定种子下 N 次独立选片：素材组合/片段顺序/起点显著不同（降重核心）
+- 批次内同素材区间重叠 >20% 触发避让重选
+- 异常输入：空源片段/空素材池/时长全 0 → ValueError（严禁退回同源）
+- 非 main 片段（intro/outro/overlay）保留源骨架素材，仅重算起点
+- 跨变体 batch_segments 就地累加（串行选片天然避让）
+- 文案/转场/速度等骨架字段透传
+"""
+
+from __future__ import annotations
+
+import random
+import sys
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+for sub in ("packages", ""):
+    p = str(REPO_ROOT / sub) if sub else str(REPO_ROOT)
+    if p not in sys.path:
+        sys.path.insert(0, p)
+
+from packages.domain import variant_plan_selector as vps  # noqa: E402
+from packages.domain.variant_plan_selector import (  # noqa: E402
+    BATCH_CLIP_OVERLAP_LIMIT,
+    _clip_overlap_ratio,
+    reselect_clips_for_variant,
+)
+
+
+def _source_clips(assets=("a1", "a2", "a3"), dur=5.0, with_non_main=False):
+    """构造源片段骨架：main 片段若干，可选 intro/outro 固定角色片段。"""
+    clips = []
+    order = 0
+    if with_non_main:
+        clips.append(
+            {
+                "order": order,
+                "asset_id": "intro_asset",
+                "start_time": 0.0,
+                "duration": 3.0,
+                "clip_type": "intro",
+                "playback_speed": 1.0,
+                "transition_effect": "fade",
+                "transition_duration": 0.5,
+                "text_content": "片头",
+                "config": {"role": "intro"},
+            }
+        )
+        order += 1
+    for i, aid in enumerate(assets):
+        clips.append(
+            {
+                "order": order,
+                "asset_id": aid,
+                "start_time": float(i * 10),
+                "duration": dur,
+                "clip_type": "main",
+                "playback_speed": 1.2,
+                "transition_effect": "cut",
+                "transition_duration": 0.0,
+                "text_content": f"文案{i}",
+                "config": {},
+            }
+        )
+        order += 1
+    if with_non_main:
+        clips.append(
+            {
+                "order": order,
+                "asset_id": "outro_asset",
+                "start_time": 0.0,
+                "duration": 2.0,
+                "clip_type": "outro",
+                "playback_speed": 1.0,
+                "transition_effect": "fade",
+                "transition_duration": 0.5,
+                "text_content": "片尾",
+                "config": {"role": "outro"},
+            }
+        )
+    return clips
+
+
+def _durations(asset_ids, total=120.0, extra=None):
+    d = {a: total for a in asset_ids}
+    if extra:
+        d.update(extra)
+    return d
+
+
+class TestReselectClipsValidation:
+    def test_empty_source_clips_raises(self):
+        with pytest.raises(ValueError, match="源 plan 无片段"):
+            reselect_clips_for_variant(
+                [],
+                ["a1"],
+                asset_durations={"a1": 60.0},
+                rng=random.Random(1),
+            )
+
+    def test_empty_asset_pool_raises(self):
+        with pytest.raises(ValueError, match="素材池为空"):
+            reselect_clips_for_variant(
+                _source_clips(),
+                [],
+                asset_durations={},
+                rng=random.Random(1),
+            )
+
+    def test_all_zero_duration_raises(self):
+        with pytest.raises(ValueError, match="时长全部未知"):
+            reselect_clips_for_variant(
+                _source_clips(),
+                ["a1", "a2"],
+                asset_durations={"a1": 0.0, "a2": 0.0},
+                rng=random.Random(1),
+            )
+
+
+class TestReselectClipsDifferentiation:
+    def test_three_variants_differ_in_assets_order_and_starts(self):
+        """核心验收：固定种子连续 3 次独立选片，素材组合/顺序/起点显著不同。"""
+        source = _source_clips(assets=("a1", "a2", "a3", "a4"))
+        pool = ["a1", "a2", "a3", "a4", "a5", "a6"]
+        durations = _durations(pool, total=300.0)
+
+        batch_segments: dict = {}
+        variants = []
+        for seed in range(3):
+            clips = reselect_clips_for_variant(
+                source,
+                pool,
+                asset_durations=durations,
+                batch_segments=batch_segments,  # 串行调用：上一变体区间参与避让
+                rng=random.Random(100 + seed),
+            )
+            variants.append(clips)
+
+        main_sequences = []
+        for clips in variants:
+            main = [c for c in clips if c["clip_type"] == "main"]
+            main_sequences.append([(c["asset_id"], round(c["start_time"], 2)) for c in main])
+
+        # 1) 每个变体片段数与源骨架一致
+        for clips in variants:
+            main_clips = [c for c in clips if c["clip_type"] == "main"]
+            assert len(main_clips) == 4
+
+        # 2) 三个变体的素材序列不全相同（素材洗牌 + main 顺序洗牌生效）
+        seq_sets = {tuple(a for a, _ in seq) for seq in main_sequences}
+        assert len(seq_sets) >= 2, f"变体素材序列应存在差异，实际全部相同: {seq_sets}"
+
+        # 3) 起点组合不全相同（起点重选生效）
+        start_sets = {tuple(s for _, s in seq) for seq in main_sequences}
+        assert len(start_sets) >= 2, f"变体起点组合应存在差异，实际全部相同: {start_sets}"
+
+        # 4) batch_segments 跨变体累加（串行避让链路存在）
+        total_segments = sum(len(v) for v in batch_segments.values())
+        assert total_segments >= 12, f"3 变体 × 4 main 片段应累加 >=12 区间，实际 {total_segments}"
+
+    def test_skeleton_fields_preserved(self):
+        """文案/转场/速度等骨架字段随片段透传（只换素材与起点）。"""
+        source = _source_clips(assets=("a1", "a2"), with_non_main=True)
+        pool = ["a1", "a2", "a3"]
+        durations = _durations(pool, total=120.0, extra={"intro_asset": 30.0, "outro_asset": 30.0})
+
+        clips = reselect_clips_for_variant(
+            source,
+            pool,
+            asset_durations=durations,
+            rng=random.Random(7),
+        )
+        by_order = {c["order"]: c for c in clips}
+
+        # intro/outro 骨架字段保留
+        intro = next(c for c in clips if c["clip_type"] == "intro")
+        outro = next(c for c in clips if c["clip_type"] == "outro")
+        assert intro["asset_id"] == "intro_asset"
+        assert intro["text_content"] == "片头"
+        assert intro["transition_effect"] == "fade"
+        assert intro["transition_duration"] == 0.5
+        assert outro["asset_id"] == "outro_asset"
+        assert outro["text_content"] == "片尾"
+
+        # main 片段文案/速度随骨架 order 保留
+        for c in clips:
+            if c["clip_type"] == "main":
+                assert c["playback_speed"] == 1.2
+                assert c["text_content"].startswith("文案")
+
+
+class TestBatchOverlapAvoidance:
+    def test_overlap_ratio_calculation(self):
+        segs = {"a1": [(10.0, 20.0)]}  # 已占 10s 区间
+        # 新区间 [10,20) 完全重叠 → 1.0
+        assert _clip_overlap_ratio("a1", 10.0, 10.0, segs) == pytest.approx(1.0)
+        # 新区间 [20,30) 零重叠 → 0.0
+        assert _clip_overlap_ratio("a1", 20.0, 10.0, segs) == pytest.approx(0.0)
+        # 新区间 [15,25) 重叠 5s / 10s → 0.5
+        assert _clip_overlap_ratio("a1", 15.0, 10.0, segs) == pytest.approx(0.5)
+        # 空 asset / 零时长 → 0
+        assert _clip_overlap_ratio("", 0.0, 10.0, segs) == 0.0
+        assert _clip_overlap_ratio("a1", 10.0, 0.0, segs) == 0.0
+
+    def test_over_limit_triggers_reselect_to_non_overlapping(self):
+        """批次已占满素材前段时，避让重选应把起点挪到重叠 ≤20% 的位置。"""
+        source = _source_clips(assets=("a1",), dur=10.0)
+        durations = {"a1": 120.0}
+        # 批次已选区间：a1 [0, 100) 几乎占满前段
+        batch_segments = {"a1": [(0.0, 100.0)]}
+
+        # _resolve_start_time 第一次返回高重叠起点（2.0），之后 rng 抖动应找到低重叠位置
+        call_count = {"n": 0}
+
+        def fake_resolve(asset_id, clip_duration, asset_durations, used_segments, scene_points=None, on_exhausted=None):
+            call_count["n"] += 1
+            return 2.0 if call_count["n"] == 1 else None  # 后续回退 rng.uniform
+
+        with patch.object(vps, "_resolve_start_time", side_effect=fake_resolve):
+            # rng.uniform 返回 105.0（与 [0,100) 零重叠）；rng 是 random.Random 实例，
+            # 需 patch 类方法 uniform 才能生效
+            with patch.object(random.Random, "uniform", return_value=105.0):
+                clips = reselect_clips_for_variant(
+                    source,
+                    ["a1"],
+                    asset_durations=durations,
+                    batch_segments=batch_segments,
+                    rng=random.Random(3),
+                )
+
+        main = [c for c in clips if c["clip_type"] == "main"]
+        assert len(main) == 1
+        ratio = _clip_overlap_ratio("a1", main[0]["start_time"], 10.0, {"a1": [(0.0, 100.0)]})
+        assert ratio <= BATCH_CLIP_OVERLAP_LIMIT, f"避让后重叠应 ≤20%，实际 {ratio:.2%}"
+        assert main[0]["start_time"] == pytest.approx(105.0, abs=0.01)
+
+    def test_first_variant_segments_become_avoidance_target(self):
+        """变体 0 选定区间后，变体 1 选同素材时批次区间生效（不与源区间完全重合）。"""
+        source = _source_clips(assets=("a1", "a2"), dur=8.0)
+        pool = ["a1", "a2", "a3"]
+        durations = _durations(pool, total=600.0)
+
+        batch_segments: dict = {}
+        v1 = reselect_clips_for_variant(
+            source, pool, asset_durations=durations, batch_segments=batch_segments, rng=random.Random(11)
+        )
+        v1_main = [(c["asset_id"], c["start_time"], c["duration"]) for c in v1 if c["clip_type"] == "main"]
+
+        # 快照 v1 之后的批次避让集（v2 调用会就地追加 v2 自身区间，断言必须用调用前快照）
+        import copy
+
+        batch_snapshot = copy.deepcopy(batch_segments)
+
+        v2 = reselect_clips_for_variant(
+            source, pool, asset_durations=durations, batch_segments=batch_segments, rng=random.Random(12)
+        )
+        # v2 与 v1（快照）同素材片段的区间重叠占比均 ≤20%
+        for c in v2:
+            if c["clip_type"] != "main" or not c["asset_id"]:
+                continue
+            ratio = _clip_overlap_ratio(c["asset_id"], c["start_time"], c["duration"], batch_snapshot)
+            assert (
+                ratio <= BATCH_CLIP_OVERLAP_LIMIT + 1e-6
+            ), f"变体间片段重叠超限: asset={c['asset_id']} start={c['start_time']} ratio={ratio:.2%}"
+        # v1 片段确实进入了批次避让集
+        assert any(a in batch_segments for a, _, _ in v1_main)

tests/unit/test_wechat_sync_use_case.py

@@ -60,7 +60,8 @@ class TestWechatSyncRequest:
         assert WechatSyncRequest(openid="o1", unionid="  unionid_456  ").unionid == "unionid_456"
 
     def test_default_nickname(self):
-        assert WechatSyncRequest(openid="o1").nickname == "微信用户"
+        # 微信新规拿不到真实昵称，新用户统一默认"小虾同学"
+        assert WechatSyncRequest(openid="o1").nickname == "小虾同学"
 
     def test_default_source(self):
         assert WechatSyncRequest(openid="o1").source == "miniapp"
@@ -319,3 +320,78 @@ class TestWechatSyncSession:
         assert kw["user_id"] == "user_001"
         assert "wechat_miniapp" in kw["device_info"]
         assert kw["expires_in_seconds"] == 30 * 24 * 3600
+
+
+class TestWechatSyncNicknameRules:
+    """昵称规则：默认昵称、登录不覆盖存量昵称、中文昵称全链路无损。"""
+
+    def test_existing_user_display_name_never_overwritten_on_login(self, mock_user_repo, mock_session_store):
+        """守护规则：已存在用户登录时，即使请求带了别的 nickname，
+        其 display_name 也绝不能被覆盖（只有建号时写入）。"""
+        user = User(
+            id="user_custom",
+            email="c@wechat.local",
+            username="wx_custom",
+            display_name="我的专属昵称",
+            password_hash="h",
+            email_verified=True,
+            wechat_openid="openid_123",
+            wechat_unionid="unionid_456",
+        )
+        mock_user_repo.find_by_wechat_openid.return_value = user
+        mock_user_repo.find_by_wechat_unionid.return_value = user
+
+        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
+            WechatSyncRequest(
+                openid="openid_123",
+                unionid="unionid_456",
+                nickname="小虾同学",  # 请求里带的任何昵称都不准覆盖
+            )
+        )
+        assert err is None
+        assert resp.is_new_user is False
+        # 数据层用户昵称不变
+        assert user.display_name == "我的专属昵称"
+        # 返回给调用方的昵称也是存量昵称
+        assert resp.nickname == "我的专属昵称"
+        # save 的都是同一个用户对象，且 display_name 未被改写
+        for call in mock_user_repo.save.call_args_list:
+            assert call.args[0].display_name == "我的专属昵称"
+
+    def test_new_user_gets_default_nickname_when_nickname_empty(self, mock_user_repo, mock_session_store):
+        """新用户且请求未带昵称（微信新规场景）→ 默认昵称小虾同学。"""
+        saved = {}
+        mock_user_repo.save.side_effect = lambda u: saved.update({u.id: u})
+        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
+            WechatSyncRequest(openid="new_oid_default", unionid="new_uid_default", nickname="")
+        )
+        assert err is None
+        assert resp.is_new_user is True
+        u = saved[resp.user_id]
+        assert u.display_name == "小虾同学"
+        assert resp.nickname == "小虾同学"
+
+    def test_chinese_nickname_full_chain_no_mojibake(self, mock_user_repo, mock_session_store):
+        """中文昵称全链路无损：建号写入 → 仓储对象 → 响应返回，
+        不允许出现 latin-1/utf-8 双重编码乱码（如 \u00e8\u0080\u0081 一类）。"""
+        chinese_name = "老字号🏮肩腰腿🏮御众堂永康店"
+        saved = {}
+        mock_user_repo.save.side_effect = lambda u: saved.update({u.id: u})
+
+        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
+            WechatSyncRequest(
+                openid="new_oid_cn",
+                unionid="new_uid_cn",
+                nickname=chinese_name,
+            )
+        )
+        assert err is None
+        u = saved[resp.user_id]
+        # 写入仓储对象的昵称必须与原文完全一致
+        assert u.display_name == chinese_name
+        assert resp.nickname == chinese_name
+        assert resp.to_dict()["user"]["display_name"] == chinese_name
+        assert resp.to_dict()["user_info"]["display_name"] == chinese_name
+        # 乱码特征：双重编码后必然出现Ã/\u00c2 拼音字母或控制字符
+        assert "\u00c3" not in u.display_name and "\u00c2" not in u.display_name
+        assert "\u00e8" not in u.display_name