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

- 新增 _resolve_tts_voice_id(job)：voice_source 为 my_voice/clone 时，
  前端传的 voice_id 是 VoiceCloneProfile.id，查 DB 取 profile.voice_id（CosyVoice 真正的克隆音色ID）
- profile 不存在/未就绪/voice_id为空时回退默认 longxiaochun_v3，任务不崩
- preset 或 voice_source 为空时，voice_id 直接当 CosyVoice 音色名透传（与原有行为一致）
- _step_tts 改用 _resolve_tts_voice_id 解析后的 voice_id 调 synthesize
- 不改 DB schema，不加字段；voice_source/voice_id schema 已在之前合入

.env.example

@@ -79,14 +79,33 @@ CELERY_BROKER_URL=redis://localhost:6379/0
 CELERY_RESULT_BACKEND=redis://localhost:6379/1
 
 
-# ==================== Worker 配置 ====================
+# ==================== Worker 配置（#2073 队列分流） ====================
+#
+# 容器内跑三个独立进程：beat（只发定时任务）+ generation worker（实时高优）
+# + transcode worker（后台批量/清理）。三个进程的并发与开关独立配置。
 
 # Worker 进程名称
 WORKER_NAME=xiaoxia-saas-worker
 
-# Worker 并发数（同时执行的任务数）
+# 总并发参考（兼容旧变量）：
+# - 若 GENERATION_CONCURRENCY 与 TRANSCODE_CONCURRENCY 都未显式设置，
+#   entrypoint 会按此总数对半分配（gen=ceil(total/2), trans=剩余，各至少 1）；
+# - 任一个 *_CONCURRENCY 显式设置后，按显式值生效，忽略此变量对应部分。
 WORKER_CONCURRENCY=4
 
+# Generation worker 并发数（用户实时任务：视频生成/TTS/音色克隆/lipsync/数字人）
+# 实时链路对延迟敏感，建议 2C 以上机器设为 2；高负载场景可加到 4。
+GENERATION_CONCURRENCY=2
+
+# Transcode worker 并发数（后台批量：素材入库转码/AI 分类打标/质量评分/查重/批量下载）
+# 后台任务可排队，独立伸缩；素材入库量大时可加到 4。
+TRANSCODE_CONCURRENCY=2
+
+# 是否在本容器启动 celery beat 进程（默认 1）。
+# 默认 beat 与 worker 同容器部署；若要独立 beat 容器部署，worker 容器设为 0、
+# beat 容器单独跑 `celery -A worker_app.celery_app beat` 并设 BEAT_ENABLED=1。
+BEAT_ENABLED=1
+
 # 每个子进程最多处理多少任务后重启（防止内存泄漏）
 WORKER_MAX_TASKS_PER_CHILD=1000
 
@@ -192,10 +211,24 @@ COSYVOICE_CLONE_MODEL=voice-enrollment
 # 用于 AI 文案生成、智能剪辑等需要大模型能力的场景
 
 DOUBAO_API_KEY=your-doubao-api-key
-DOUBAO_MODEL=doubao-seed-1-6-250615
+DOUBAO_MODEL=doubao-seed-2-1-pro-260915
+DOUBAO_FAST_MODEL=doubao-seed-2-1-lite-260915
 DOUBAO_BASE_URL=https://ark.cn-beijing.volces.com/api/v3
 DOUBAO_TIMEOUT=30
 DOUBAO_MAX_RETRIES=2
+# 视觉模型：pro 精度高，lite 速度快（viral-video 商品识别默认用 lite 提速）
+DOUBAO_VISION_MODEL=doubao-seed-2-1-pro-260915
+DOUBAO_VISION_LITE_MODEL=doubao-seed-2-1-lite-260915
+DOUBAO_VISION_USE_LITE=true
+# Embedding 向量化模型
+DOUBAO_EMBEDDING_MODEL=doubao-embedding-vision-251215
+# 视频模型（Seedance 2.5，统一走方舟；真人参考图通过信任链自动 AI 化）
+DOUBAO_VIDEO_MODEL=doubao-seedance-2-5-260628
+DOUBAO_VIDEO_TIMEOUT=480
+DOUBAO_VIDEO_POLL_INTERVAL=10
+# 图片模型（Seedream 5.0 Pro，用于信任链真人 AI 化 + 文生图）
+DOUBAO_IMAGE_MODEL=doubao-seedream-5-0-pro-260628
+DOUBAO_IMAGE_TIMEOUT=120
 
 # ==================== 积分/会员系统 (#1895) ====================
 # 积分系统总开关：默认 false（暂停积分系统）。

.gitea/workflows/ci-pipeline.yml

@@ -813,7 +813,7 @@ jobs:
         IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:pr-${GITHUB_SHA}"
         CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:develop"
 
-        EXTRA_BUILD_ARGS="APP_VERSION=\"${GITHUB_SHA}\""
+        EXTRA_BUILD_ARGS="APP_VERSION=${GITHUB_SHA}"
 
         # Worker 与 API/Web 统一走持久 builder（ci-builder-persist），共享宿主机层缓存
         NO_CACHE_FLAG=""
@@ -1014,7 +1014,7 @@ jobs:
           PUSHED_TAGS_SUMMARY="${BRANCH_TAG}"
         fi
 
-        EXTRA_BUILD_ARGS="APP_VERSION=\"${GITHUB_SHA}\""
+        EXTRA_BUILD_ARGS="APP_VERSION=${GITHUB_SHA}"
 
         NO_CACHE_FLAG=""
         for i in 1 2 3; do
@@ -1187,6 +1187,14 @@ jobs:
         DOUBAO_MODEL: "${{ secrets.DOUBAO_MODEL }}"
         DOUBAO_BASE_URL: "${{ secrets.DOUBAO_BASE_URL }}"
         DOUBAO_VISION_MODEL: "${{ secrets.DOUBAO_VISION_MODEL }}"
+        DOUBAO_VISION_LITE_MODEL: "${{ secrets.DOUBAO_VISION_LITE_MODEL }}"
+        DOUBAO_VISION_USE_LITE: "${{ secrets.DOUBAO_VISION_USE_LITE }}"
+        DOUBAO_IMAGE_MODEL: "${{ secrets.DOUBAO_IMAGE_MODEL }}"
+        DOUBAO_IMAGE_SIZE: "${{ secrets.DOUBAO_IMAGE_SIZE }}"
+        DOUBAO_IMAGE_TIMEOUT: "${{ secrets.DOUBAO_IMAGE_TIMEOUT }}"
+        DOUBAO_FAST_MODEL: "${{ secrets.DOUBAO_FAST_MODEL }}"
+        DOUBAO_TIMEOUT: "${{ secrets.DOUBAO_TIMEOUT }}"
+        DOUBAO_MAX_RETRIES: "${{ secrets.DOUBAO_MAX_RETRIES }}"
         WECHAT_APP_ID: "${{ secrets.WECHAT_APP_ID }}"
         WECHAT_APP_SECRET: "${{ secrets.WECHAT_APP_SECRET }}"
         TIKHUB_API_KEY: "${{ secrets.TIKHUB_API_KEY }}"
@@ -1238,9 +1246,11 @@ jobs:
         ACR_PASSWORD: "${{ secrets.ACR_PASSWORD }}"
       run: |
         set -eux
-        # CI runner (act_runner) 部署在 116 staging 本机（116.62.226.203 公网 22 未开放），
-        # 默认走 127.0.0.1:22 本机 SSH，避免跨机网络依赖；可通过 secrets 覆盖。
-        staging_host="${STAGING_SSH_HOST:-127.0.0.1}"
+        # Staging 业务机 = 116.62.226.203（公网 sshd 端口 22）。
+        # 47.98.113.167 现为生产机（sshd 端口 22222），不承载 staging 容器。
+        # CI job 在隔离容器网络内执行，127.0.0.1 会指向 job 容器自身而失败，
+        # 故默认目标必须是 staging 业务机；仍可通过 secrets 覆盖。
+        staging_host="${STAGING_SSH_HOST:-116.62.226.203}"
         staging_user="${STAGING_SSH_USER:-root}"
         staging_port="${STAGING_SSH_PORT:-22}"
         echo "Host: $staging_host"
@@ -1300,8 +1310,16 @@ jobs:
           "${staging_user}@${staging_host}:/var/lib/xiaoxia-saas-staging/configs/douyin_cookies.txt"
         echo "✅ Douyin cookies uploaded"
 
+        # 上传 infra/docker 配置到服务器（compose 单一事实来源）
+        echo "Uploading infra/docker configs to staging server..."
+        ssh -p "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no "${staging_user}@${staging_host}" \
+          "mkdir -p /var/lib/xiaoxia-saas-staging/infra/docker"
+        scp -P "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no infra/docker/compose.yml \
+          "${staging_user}@${staging_host}:/var/lib/xiaoxia-saas-staging/infra/docker/compose.yml"
+        echo "✅ infra/docker/compose.yml uploaded"
+
         # 通过环境变量传递凭证，避免命令行引号转义问题
-        cat scripts/ci_staging_deploy.sh | ssh -p "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no "${staging_user}@${staging_host}" "IMAGE_TAG=${GITHUB_SHA} ACR_USERNAME=${ACR_USERNAME} ACR_PASSWORD=${ACR_PASSWORD} sh"
+        cat scripts/ci_staging_deploy.sh | ssh -p "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no "${staging_user}@${staging_host}" "IMAGE_TAG=${GITHUB_SHA} ACR_USERNAME=${ACR_USERNAME} ACR_PASSWORD=${ACR_PASSWORD} COMPOSE_SYNC=0 sh"
 
         # 清理 CI runner 上的渲染文件
         rm -f .env.rendered
@@ -1552,7 +1570,7 @@ jobs:
         IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:${TAG_NAME}"
         CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:main"
 
-        EXTRA_BUILD_ARGS="APP_VERSION=\"${TAG_NAME}\""
+        EXTRA_BUILD_ARGS="APP_VERSION=${TAG_NAME}"
 
         # Docker build 带重试：失败自动重试2次，第2次重试加--no-cache
         NO_CACHE_FLAG=""

alembic/versions/085_atom_clip_caption_embedding.py

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

alembic/versions/086_add_viral_video_tables.py

@@ -0,0 +1,100 @@
+"""add viral video tables
+
+Revision ID: 086_add_viral_video_tables
+Revises: 085_atom_clip_caption_embedding
+Create Date: 2026-09-28
+
+新增爆款视频相关表：
+- viral_video_jobs: 爆款视频任务
+- viral_video_style_templates: 风格模板配置
+- viral_video_prompt_templates: Prompt 模板（由 #2040 seed）
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "086_add_viral_video_tables"
+down_revision = "085_atom_clip_caption_embedding"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # viral_video_jobs
+    op.create_table(
+        "viral_video_jobs",
+        sa.Column("id", sa.String(36), primary_key=True),
+        sa.Column("user_id", sa.String(36), nullable=False, index=True),
+        sa.Column("images", sa.JSON(), nullable=False, server_default="[]"),
+        sa.Column("industry", sa.String(100), nullable=False, server_default=""),
+        sa.Column("target_customer", sa.String(500), nullable=False, server_default=""),
+        sa.Column("persona_id", sa.String(36), nullable=False, server_default=""),
+        sa.Column("viral_structure", sa.String(50), nullable=False, server_default=""),
+        sa.Column("marketing_purpose", sa.String(100), nullable=False, server_default=""),
+        sa.Column("bgm_preference", sa.String(50), nullable=False, server_default=""),
+        sa.Column("duration", sa.Integer(), nullable=False, server_default="30"),
+        sa.Column("user_copy_text", sa.Text(), nullable=False, server_default=""),
+        sa.Column("fusion_level", sa.String(20), nullable=False, server_default="ai_polish"),
+        sa.Column("reference_audio_path", sa.String(1000), nullable=False, server_default=""),
+        # v1.3 新增
+        sa.Column("reference_video_url", sa.String(1000), nullable=False, server_default=""),
+        sa.Column("style_strength", sa.String(20), nullable=False, server_default="medium"),
+        sa.Column("style_guide", sa.JSON(), nullable=True),
+        sa.Column("style_template_id", sa.String(36), nullable=False, server_default="", index=True),
+        # 状态与结果
+        sa.Column("status", sa.String(30), nullable=False, server_default="pending", index=True),
+        sa.Column("intent_result", sa.JSON(), nullable=True),
+        sa.Column("result_video_url", sa.String(1000), nullable=False, server_default=""),
+        sa.Column("credits_cost", sa.Integer(), nullable=False, server_default="0"),
+        sa.Column("error_msg", sa.Text(), nullable=False, server_default=""),
+        sa.Column("retry_count", sa.Integer(), nullable=False, server_default="0"),
+        sa.Column("started_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("completed_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+        sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+    )
+
+    # viral_video_style_templates
+    op.create_table(
+        "viral_video_style_templates",
+        sa.Column("id", sa.String(36), primary_key=True),
+        sa.Column("name", sa.String(200), nullable=False),
+        sa.Column("description", sa.Text(), nullable=False, server_default=""),
+        sa.Column("thumbnail_url", sa.String(1000), nullable=False, server_default=""),
+        sa.Column("style_config", sa.JSON(), nullable=False, server_default="{}"),
+        sa.Column("is_system", sa.Boolean(), nullable=False, server_default=sa.text("true"), index=True),
+        sa.Column("sort_order", sa.Integer(), nullable=False, server_default="0"),
+        sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+        sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+    )
+
+    # viral_video_prompt_templates
+    op.create_table(
+        "viral_video_prompt_templates",
+        sa.Column("id", sa.String(36), primary_key=True),
+        sa.Column("prompt_type", sa.String(50), nullable=False, index=True),
+        sa.Column("name", sa.String(200), nullable=False),
+        sa.Column("content", sa.Text(), nullable=False, server_default=""),
+        sa.Column("variables", sa.JSON(), nullable=False, server_default="[]"),
+        sa.Column("version", sa.Integer(), nullable=False, server_default="1"),
+        sa.Column("is_active", sa.Boolean(), nullable=False, server_default=sa.text("true"), index=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+        sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+    )
+
+    # Seed 默认风格模板
+    op.execute("""
+        INSERT INTO viral_video_style_templates (id, name, description, style_config, is_system, sort_order)
+        VALUES
+            ('style-tpl-001', '快节奏冲击', '高频切镜+动感BGM，适合食品饮料等快消品', '{"cut_speed": "fast", "transition": "jump_cut", "energy": "high"}', true, 1),
+            ('style-tpl-002', '质感慢镜', '慢节奏+电影感调色，适合美妆护肤珠宝', '{"cut_speed": "slow", "transition": "dissolve", "energy": "low", "color_grade": "cinematic"}', true, 2),
+            ('style-tpl-003', '口播种草', '数字人口播+产品特写穿插', '{"cut_speed": "medium", "transition": "cross_dissolve", "has_talking_head": true}', true, 3),
+            ('style-tpl-004', '场景叙事', '多场景切换+故事线叙述', '{"cut_speed": "medium", "transition": "wipe", "narrative": true}', true, 4)
+        """)
+
+
+def downgrade() -> None:
+    op.drop_table("viral_video_prompt_templates")
+    op.drop_table("viral_video_style_templates")
+    op.drop_table("viral_video_jobs")

alembic/versions/087_viral_video_image_analysis.py

@@ -0,0 +1,25 @@
+"""viral video add image_analysis column
+
+Revision ID: 087_viral_video_image_analysis
+Revises: 086_add_viral_video_tables
+Create Date: 2026-09-30
+
+#2106 爆款视频 P0：持久化图片分析结果（image_analysis JSON），供 resume 阶段使用。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "087_viral_video_image_analysis"
+down_revision = "086_add_viral_video_tables"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("viral_video_jobs", sa.Column("image_analysis", sa.JSON(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("viral_video_jobs", "image_analysis")

alembic/versions/088_viral_video_copy_result.py

@@ -0,0 +1,51 @@
+"""viral video add copy_result + voice/video columns
+
+Revision ID: 088_viral_video_copy_result
+Revises: 087_viral_video_image_analysis
+Create Date: 2026-10-01
+
+v1.6 爆款视频字段补齐：
+- copy_result JSON: 编导分镜脚本完整结构（overview/scene_and_lighting/shots/hard_constraints/negative_prompts/voiceover_script）
+- voice_id/voice_source: TTS 音色参数
+- video_ratio/video_model: Seedance 视频比例/模型
+注意：线上启动也有幂等 ADD COLUMN 补列逻辑 (_ensure_viral_video_columns)，本 migration 提供标准 Alembic 路径，
+两套机制互不冲突（IF NOT EXISTS 等价行为）。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "088_viral_video_copy_result"
+down_revision = "087_viral_video_image_analysis"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # 幂等添加列（通过单独执行 + 异常忽略兼容已由 backfill 补上的环境）
+    cols = [
+        ("voice_id", "VARCHAR(200) NOT NULL DEFAULT ''"),
+        ("voice_source", "VARCHAR(20) NOT NULL DEFAULT ''"),
+        ("video_ratio", "VARCHAR(10) NOT NULL DEFAULT '9:16'"),
+        ("video_model", "VARCHAR(100) NOT NULL DEFAULT ''"),
+        ("copy_result", "JSON"),
+    ]
+    conn = op.get_bind()
+    for name, ddl in cols:
+        try:
+            conn.execute(sa.text(f"ALTER TABLE viral_video_jobs ADD COLUMN IF NOT EXISTS {name} {ddl}"))
+        except Exception:
+            # 不支持 IF NOT EXISTS 的库（如老版本 SQLite）直接尝试 ADD COLUMN，失败则忽略
+            try:
+                conn.execute(sa.text(f"ALTER TABLE viral_video_jobs ADD COLUMN {name} {ddl}"))
+            except Exception:
+                pass
+
+
+def downgrade() -> None:
+    for name in ("copy_result", "video_model", "video_ratio", "voice_source", "voice_id"):
+        try:
+            op.drop_column("viral_video_jobs", name)
+        except Exception:
+            pass

alembic/versions/089_viral_video_cols.py

@@ -0,0 +1,62 @@
+"""viral video add storyboard + generated_copy_text (complement 088)
+
+Revision ID: 089_viral_video_cols
+Revises: 088_viral_video_copy_result
+Create Date: 2026-10-01
+
+#2129 兜底迁移：补齐 _VIRAL_VIDEO_BACKFILL_COLS 中所有列，覆盖
+# watchtower 自动部署未跑历史 migration、且 AUTO_CREATE_SCHEMA=false 时
+# _ensure_viral_video_columns 未执行的场景。
+# 幂等 ADD COLUMN IF NOT EXISTS，已存在则跳过。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "089_viral_video_cols"
+down_revision = "088_viral_video_copy_result"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # 扩展 alembic_version.version_num 字段长度（原来 VARCHAR(32) 装不下长 revision id）
+    conn = op.get_bind()
+    try:
+        conn.execute(sa.text("ALTER TABLE alembic_version ALTER COLUMN version_num TYPE VARCHAR(256)"))
+    except Exception:
+        pass
+    cols = [
+        ("storyboard", "JSON"),
+        ("generated_copy_text", "TEXT NOT NULL DEFAULT ''"),
+        ("voice_id", "VARCHAR(200) NOT NULL DEFAULT ''"),
+        ("voice_source", "VARCHAR(20) NOT NULL DEFAULT ''"),
+        ("video_ratio", "VARCHAR(10) NOT NULL DEFAULT '9:16'"),
+        ("video_model", "VARCHAR(100) NOT NULL DEFAULT ''"),
+        ("copy_result", "JSON"),
+    ]
+    for name, ddl in cols:
+        try:
+            conn.execute(sa.text(f"ALTER TABLE viral_video_jobs ADD COLUMN IF NOT EXISTS {name} {ddl}"))
+        except Exception:
+            try:
+                conn.execute(sa.text(f"ALTER TABLE viral_video_jobs ADD COLUMN {name} {ddl}"))
+            except Exception:
+                pass
+
+
+def downgrade() -> None:
+    for name in (
+        "copy_result",
+        "video_model",
+        "video_ratio",
+        "voice_source",
+        "voice_id",
+        "generated_copy_text",
+        "storyboard",
+    ):
+        try:
+            op.drop_column("viral_video_jobs", name)
+        except Exception:
+            pass

alembic/versions/090_viral_video_phase_msg.py

@@ -0,0 +1,35 @@
+"""viral video add phase_message column (#2134)
+
+Revision ID: 090_viral_video_phase_msg
+Revises: 089_viral_video_cols
+Create Date: 2026-10-02
+
+#2134 阶段细粒度提示：viral_video 表新增 phase_message 列（中文阶段提示文案）。
+current_stage 列已在之前版本存在，本迁移只补 phase_message。
+幂等 ADD COLUMN IF NOT EXISTS。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "090_viral_video_phase_msg"
+down_revision = "089_viral_video_cols"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # SQLite/PostgreSQL 兼容的幂等添加列
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+    cols = {c["name"] for c in inspector.get_columns("viral_video_jobs")}
+    if "phase_message" not in cols:
+        op.add_column(
+            "viral_video_jobs",
+            sa.Column("phase_message", sa.String(length=500), nullable=False, server_default=""),
+        )
+
+
+def downgrade() -> None:
+    op.drop_column("viral_video_jobs", "phase_message")

alembic/versions/091_viral_video_stage.py

@@ -0,0 +1,49 @@
+"""viral video add current_stage column (#2137 follow-up)
+
+Revision ID: 091_viral_video_stage
+Revises: 090_viral_video_phase_msg
+Create Date: 2026-10-02
+
+#2137 follow-up fix: 090 migration missed current_stage column on viral_video_jobs,
+causing UndefinedColumn errors and 500s on all authenticated viral-video endpoints.
+Idempotently add current_stage and double-check phase_message.
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "091_viral_video_stage"
+down_revision = "090_viral_video_phase_msg"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+    cols = {c["name"] for c in inspector.get_columns("viral_video_jobs")}
+    if "current_stage" not in cols:
+        op.add_column(
+            "viral_video_jobs",
+            sa.Column(
+                "current_stage",
+                sa.String(length=200),
+                nullable=False,
+                server_default="",
+            ),
+        )
+    if "phase_message" not in cols:
+        op.add_column(
+            "viral_video_jobs",
+            sa.Column(
+                "phase_message",
+                sa.String(length=500),
+                nullable=False,
+                server_default="",
+            ),
+        )
+
+
+def downgrade() -> None:
+    op.drop_column("viral_video_jobs", "current_stage")

alembic/versions/092_viral_video_heartbeat.py

@@ -0,0 +1,42 @@
+"""viral_video_jobs 增加 heartbeat_at 列（worker 心跳，用于僵尸任务超时回收）
+
+Revision ID: 092_viral_video_heartbeat
+Revises: 091_viral_video_stage
+Create Date: 2026-10-02
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "092_viral_video_heartbeat"
+down_revision = "091_viral_video_stage"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+    cols = {c["name"] for c in inspector.get_columns("viral_video_jobs")}
+    if "heartbeat_at" not in cols:
+        op.add_column("viral_video_jobs", sa.Column("heartbeat_at", sa.DateTime(), nullable=True))
+        op.execute(
+            "UPDATE viral_video_jobs SET heartbeat_at = updated_at " "WHERE status = 'running' AND heartbeat_at IS NULL"
+        )
+        try:
+            op.create_index("ix_viral_video_jobs_heartbeat_at", "viral_video_jobs", ["heartbeat_at"])
+        except Exception:
+            pass
+
+
+def downgrade() -> None:
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+    cols = {c["name"] for c in inspector.get_columns("viral_video_jobs")}
+    if "heartbeat_at" in cols:
+        try:
+            op.drop_index("ix_viral_video_jobs_heartbeat_at", table_name="viral_video_jobs")
+        except Exception:
+            pass
+        op.drop_column("viral_video_jobs", "heartbeat_at")

alembic/versions/093_viral_video_pricing_points_float.py

@@ -0,0 +1,87 @@
+"""viral_video 动态积分定价 + 积分字段从 Integer 改为 Float (#2151)
+
+Revision ID: 093
+Revises: 092_viral_video_heartbeat
+Create Date: 2026-10-02
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "093"
+down_revision = "092_viral_video_heartbeat"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+
+    # 1) points_accounts 三列 Integer -> Float
+    pa_cols = {c["name"]: c for c in inspector.get_columns("points_accounts")}
+    for col in ("balance", "total_earned", "total_spent"):
+        if col in pa_cols:
+            op.alter_column(
+                "points_accounts",
+                col,
+                existing_type=sa.Integer(),
+                type_=sa.Float(),
+                existing_nullable=False,
+            )
+
+    # 2) points_transactions amount/balance_after Integer -> Float
+    pt_cols = {c["name"]: c for c in inspector.get_columns("points_transactions")}
+    for col in ("amount", "balance_after"):
+        if col in pt_cols:
+            op.alter_column(
+                "points_transactions",
+                col,
+                existing_type=sa.Integer(),
+                type_=sa.Float(),
+                existing_nullable=False,
+            )
+
+    # 3) users.points_balance Integer -> Float
+    user_cols = {c["name"]: c for c in inspector.get_columns("users")}
+    if "points_balance" in user_cols:
+        op.alter_column(
+            "users",
+            "points_balance",
+            existing_type=sa.Integer(),
+            type_=sa.Float(),
+            existing_nullable=False,
+        )
+
+    # 4) viral_video_jobs.credits_cost Integer -> Float
+    vv_cols = {c["name"]: c for c in inspector.get_columns("viral_video_jobs")}
+    if "credits_cost" in vv_cols:
+        op.alter_column(
+            "viral_video_jobs",
+            "credits_cost",
+            existing_type=sa.Integer(),
+            type_=sa.Float(),
+            existing_nullable=False,
+        )
+
+    # 5) viral_video_jobs 新增列
+    if "video_resolution" not in vv_cols:
+        op.add_column(
+            "viral_video_jobs",
+            sa.Column("video_resolution", sa.String(20), nullable=False, server_default="720p"),
+        )
+    if "credits_prepaid" not in vv_cols:
+        op.add_column(
+            "viral_video_jobs",
+            sa.Column("credits_prepaid", sa.Float(), nullable=False, server_default="0"),
+        )
+    if "credits_transaction_id" not in vv_cols:
+        op.add_column(
+            "viral_video_jobs",
+            sa.Column("credits_transaction_id", sa.String(36), nullable=False, server_default=""),
+        )
+
+
+def downgrade() -> None:
+    pass

alembic/versions/094_viral_video_pre_trusted.py

@@ -0,0 +1,31 @@
+"""viral_video_jobs 增加 pre_trusted_images 列（信任链Seedream预热结果）
+
+Revision ID: 094_viral_video_pre_trusted
+Revises: 093_viral_video_pricing_points_float
+Create Date: 2026-10-04
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "094_viral_video_pre_trusted"
+down_revision = "093"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+    cols = {c["name"] for c in inspector.get_columns("viral_video_jobs")}
+    if "pre_trusted_images" not in cols:
+        op.add_column("viral_video_jobs", sa.Column("pre_trusted_images", sa.Text(), nullable=True))
+
+
+def downgrade() -> None:
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+    cols = {c["name"] for c in inspector.get_columns("viral_video_jobs")}
+    if "pre_trusted_images" in cols:
+        op.drop_column("viral_video_jobs", "pre_trusted_images")

alembic/versions/095_viral_video_prompt_templates.py

@@ -0,0 +1,102 @@
+"""爆款视频 Prompt 模板配置表（#2040）。
+
+086 曾预留同名旧表（id varchar / content / variables json），从未被业务使用；
+本迁移将其替换为 #2040 新结构。
+
+Revision ID: 095_viral_video_prompt_templates
+Revises: 094_viral_video_pre_trusted
+Create Date: 2026-10-04
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "095_viral_video_prompt_templates"
+down_revision = "094_viral_video_pre_trusted"
+branch_labels = None
+depends_on = None
+
+
+def _table_exists(conn, name: str) -> bool:
+    return name in sa.inspect(conn).get_table_names()
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    # 086 预留的旧结构表：先删除（无业务数据、无任何引用）
+    if _table_exists(conn, "viral_video_prompt_templates"):
+        op.drop_table("viral_video_prompt_templates")
+
+    op.create_table(
+        "viral_video_prompt_templates",
+        sa.Column("id", sa.Integer, primary_key=True, autoincrement=True),
+        sa.Column("name", sa.String(128), nullable=False),
+        sa.Column("prompt_type", sa.String(32), nullable=False),
+        sa.Column("version", sa.Integer, nullable=False, server_default="1"),
+        sa.Column("system_prompt", sa.Text, nullable=False),
+        sa.Column("user_prompt_template", sa.Text, nullable=False),
+        sa.Column("example_output", sa.Text, nullable=True),
+        sa.Column("is_active", sa.Boolean, nullable=False, server_default=sa.text("true")),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.func.now(),
+            nullable=False,
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.func.now(),
+            nullable=False,
+        ),
+    )
+    op.create_index(
+        "ix_vvpt_type_active",
+        "viral_video_prompt_templates",
+        ["prompt_type", "is_active"],
+    )
+    op.create_index(
+        "uq_vvpt_type_version",
+        "viral_video_prompt_templates",
+        ["prompt_type", "version"],
+        unique=True,
+    )
+
+
+def downgrade() -> None:
+    conn = op.get_bind()
+    if _table_exists(conn, "viral_video_prompt_templates"):
+        op.drop_index("uq_vvpt_type_version", table_name="viral_video_prompt_templates")
+        op.drop_index("ix_vvpt_type_active", table_name="viral_video_prompt_templates")
+        op.drop_table("viral_video_prompt_templates")
+
+    # 恢复 086 的旧预留结构
+    op.create_table(
+        "viral_video_prompt_templates",
+        sa.Column("id", sa.String(36), primary_key=True),
+        sa.Column("prompt_type", sa.String(50), nullable=False, index=True),
+        sa.Column("name", sa.String(200), nullable=False),
+        sa.Column("content", sa.Text, nullable=False, server_default=""),
+        sa.Column("variables", sa.JSON, nullable=False, server_default="[]"),
+        sa.Column("version", sa.Integer, nullable=False, server_default="1"),
+        sa.Column(
+            "is_active",
+            sa.Boolean,
+            nullable=False,
+            server_default=sa.text("true"),
+            index=True,
+        ),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=sa.func.now(),
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=sa.func.now(),
+        ),
+    )

apps/api/app/api/router.py

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

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

@@ -29,8 +29,6 @@ from app.services.ai_avatar_render_service import (
 from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 
-from packages.middleware.points_gate import points_gate
-
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
@@ -44,7 +42,6 @@ def _get_service(db: Session = Depends(get_db_session)) -> AiAvatarRenderService
 
 
 @router.post("", response_model=AiAvatarRenderJobResponse, status_code=201)
-@points_gate("ai_digital_human", per_unit=15)
 def create_render_job(
     body: CreateAiAvatarRenderRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),

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

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

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

@@ -27,7 +27,6 @@ from packages.adapters.sqlalchemy_impl.generation_task_repository import (
 )
 from packages.application import ListGeneratedVideosByTaskUseCase
 from packages.domain.config_schemas import normalize_plan_config
-from packages.middleware.points_gate import points_gate
 from packages.shared.storage import get_shared_storage_service
 
 from .templates_editor.dependencies import get_draft_plan_id, get_editor_services
@@ -76,10 +75,7 @@ class GenerateCoverResponse(BaseModel):
 # ── Route ────────────────────────────────────────────────────────────────
 
 
-
-def _select_best_frame_from_snapshots(
-    snapshots: list[dict], plan_id: str
-) -> str:
+def _select_best_frame_from_snapshots(snapshots: list[dict], plan_id: str) -> str:
     """从 MediaKit 抽帧结果中，通过质量评分选出最佳帧。
 
     降级策略：cv2 不可用或评分失败时，返回第一帧。
@@ -232,7 +228,10 @@ def _persist_cover_frame(
 
 
 def _get_task_video_url(db: Session, task_id: str) -> Optional[str]:
-    """从 GenerationTask 关联的 GeneratedVideo 中获取视频 storage_key / URL."""
+    """从 GenerationTask 关联的 GeneratedVideo 中获取视频 storage_key / URL.
+
+    #2028: awaiting_cover 状态下 GeneratedVideo 尚未入库，兜底从 task.extra_meta.rendered_output.file_url 读取。
+    """
     try:
         video_repo = get_generated_video_repository(db)
         use_case = ListGeneratedVideosByTaskUseCase(video_repo)
@@ -241,6 +240,20 @@ def _get_task_video_url(db: Session, task_id: str) -> Optional[str]:
             return getattr(videos[0], "file_url", "") or ""
     except Exception:
         logger.warning("[封面生成] 获取任务视频失败: task_id=%s", task_id, exc_info=True)
+    # awaiting_cover 兜底：从 extra_meta.rendered_output 取
+    try:
+        task_repo = SQLAlchemyGenerationTaskRepository(db)
+        task = task_repo.get(task_id)
+        if task is not None:
+            _status = task.status.value if hasattr(task.status, "value") else str(task.status)
+            if _status == "awaiting_cover":
+                _meta = getattr(task, "extra_meta", {}) or {}
+                _ro = _meta.get("rendered_output") or {}
+                _url = _ro.get("file_url") or ""
+                if _url:
+                    return _url
+    except Exception:
+        logger.warning("[封面生成] awaiting_cover 兜底读取失败: task_id=%s", task_id, exc_info=True)
     return None
 
 
@@ -332,7 +345,6 @@ def _is_trusted_media_url(url: str) -> bool:
 
 
 @router.post("/generate-cover", response_model=GenerateCoverResponse)
-@points_gate("ai_cover")
 def generate_cover(
     body: GenerateCoverRequest,
     template_id: str = Query(..., description="模板 ID"),

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

@@ -11,9 +11,7 @@ from app.auth import AuthenticatedUser, get_current_user
 from app.core.storage import get_storage_service
 from app.core.task_enqueue import (
     GLOBAL_PENDING_LIMIT,
-    USER_PENDING_LIMIT,
     GlobalQueueFull,
-    UserPendingLimitExceeded,
     build_rate_limit_detail,
     safe_enqueue_generation_task,
 )
@@ -43,7 +41,6 @@ from packages.application import (
     GetGenerationTaskUseCase,
     ListGeneratedVideosByTaskUseCase,
 )
-from packages.middleware.points_gate import points_gate
 
 logger = logging.getLogger(__name__)
 
@@ -272,7 +269,6 @@ def _variant_value(values: list[str], index: int, fallback: str = "") -> str:
 
 
 @router.post("/preview", response_model=BatchPreviewGenerationTaskResponse, status_code=201)
-@points_gate("ai_video", quantity_field="preview_count")
 def create_preview_generation_task(
     request: CreatePreviewGenerationTaskRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -302,26 +298,17 @@ def create_preview_generation_task(
         count,
     )
 
-    # 预检查队列限流（按变体总数计）
-    try:
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
-        global_pending = generation_task_repository.count_pending_total()
-        if user_pending + count > USER_PENDING_LIMIT:
-            raise UserPendingLimitExceeded(
-                user_id=user_id, pending_count=user_pending + count, limit=USER_PENDING_LIMIT
-            )
-        if global_pending + count > GLOBAL_PENDING_LIMIT:
-            raise GlobalQueueFull(pending_count=global_pending + count, limit=GLOBAL_PENDING_LIMIT)
-    except UserPendingLimitExceeded as e:
-        raise HTTPException(
-            status_code=429,
-            detail=build_rate_limit_detail(e, generation_task_repository, scope="user"),
-        ) from e
-    except GlobalQueueFull as e:
+    # 预检查队列限流（按变体总数计）——仅保留全局硬上限，用户上限改为软 warning 在 safe_enqueue 内处理（#2098）
+    global_pending = generation_task_repository.count_pending_total()
+    if global_pending + count > GLOBAL_PENDING_LIMIT:
         raise HTTPException(
             status_code=503,
-            detail=build_rate_limit_detail(e, generation_task_repository, scope="global"),
-        ) from e
+            detail=build_rate_limit_detail(
+                GlobalQueueFull(pending_count=global_pending + count, limit=GLOBAL_PENDING_LIMIT),
+                generation_task_repository,
+                scope="global",
+            ),
+        )
 
     # 确定视频比例：优先前端传入，否则从模板 mode 推断
     video_ratio = request.video_ratio or ""
@@ -589,9 +576,6 @@ def create_preview_generation_task(
             if not enqueued:
                 logger.warning("[预览生成] 任务入队失败: task_id=%s", task.id)
                 _mark_task_failed(generation_task_repository, task, "任务入队失败")
-        except UserPendingLimitExceeded as e:
-            _mark_task_failed(generation_task_repository, task, "待处理任务超限")
-            rate_limit_exc = rate_limit_exc or e
         except GlobalQueueFull as e:
             _mark_task_failed(generation_task_repository, task, "系统队列已满")
             rate_limit_exc = rate_limit_exc or e
@@ -603,11 +587,6 @@ def create_preview_generation_task(
 
     # 队列满/限流时若全部失败，返回结构化错误码（前端区分"排队"与"创建失败"）
     if all(r.status == "failed" for r in responses) and rate_limit_exc is not None:
-        if isinstance(rate_limit_exc, UserPendingLimitExceeded):
-            raise HTTPException(
-                status_code=429,
-                detail=build_rate_limit_detail(rate_limit_exc, generation_task_repository, scope="user"),
-            )
         raise HTTPException(
             status_code=503,
             detail=build_rate_limit_detail(rate_limit_exc, generation_task_repository, scope="global"),

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

@@ -7,7 +7,6 @@ from app.auth import AuthenticatedUser, get_current_user
 from app.core.storage import OSSStorageService, get_storage_service
 from app.core.task_enqueue import (
     GLOBAL_PENDING_LIMIT,
-    USER_PENDING_LIMIT,
     GlobalQueueFull,
     UserPendingLimitExceeded,
     build_rate_limit_detail,
@@ -46,7 +45,124 @@ from packages.application import (
     ListGeneratedVideosByTaskUseCase,
 )
 from packages.domain.smart_match import smart_select_assets
-from packages.middleware.points_gate import points_gate
+
+# #2035：文案关键词 → 素材分类 映射表（用于 smart_match category_match 维度）
+# AssetClassification 枚举: scenic / product / person / animal / food / tech / sport / music / other
+_CATEGORY_KEYWORDS: dict[str, set[str]] = {
+    "scenic": {
+        "风景",
+        "自然",
+        "山水",
+        "大海",
+        "天空",
+        "日落",
+        "日出",
+        "森林",
+        "城市",
+        "建筑",
+        "夜景",
+        "街道",
+        "公园",
+        "景区",
+        "旅行",
+        "旅游",
+        "户外",
+    },
+    "product": {
+        "产品",
+        "商品",
+        "展示",
+        "演示",
+        "开箱",
+        "评测",
+        "好物",
+        "推荐",
+        "种草",
+        "购物",
+        "电商",
+        "带货",
+        "品牌",
+        "广告",
+        "包装",
+    },
+    "person": {
+        "人物",
+        "人物采访",
+        "对话",
+        "说话",
+        "讲解",
+        "演讲",
+        "采访",
+        "聊天",
+        "开会",
+        "工作",
+        "办公室",
+        "团队",
+        "员工",
+        "老板",
+        "女性",
+        "男性",
+        "美女",
+        "帅哥",
+    },
+    "animal": {"动物", "宠物", "狗", "猫", "鸟", "鱼", "马", "牛", "羊", "野生动物", "动物园"},
+    "food": {
+        "美食",
+        "食物",
+        "餐饮",
+        "餐厅",
+        "做饭",
+        "烹饪",
+        "厨房",
+        "菜品",
+        "饮料",
+        "水果",
+        "甜点",
+        "蛋糕",
+        "咖啡",
+        "茶",
+        "零食",
+        "吃",
+    },
+    "tech": {
+        "科技",
+        "数码",
+        "电脑",
+        "手机",
+        "屏幕",
+        "软件",
+        "APP",
+        "互联网",
+        "AI",
+        "人工智能",
+        "机器人",
+        "办公",
+        "程序员",
+        "代码",
+        "屏幕录制",
+    },
+    "sport": {"运动", "健身", "跑步", "篮球", "足球", "游泳", "瑜伽", "户外", "锻炼", "体育", "比赛", "球场"},
+    "music": {"音乐", "歌曲", "演唱会", "乐器", "唱歌", "跳舞", "舞蹈", "MV", "演出", "乐队", "钢琴", "吉他", "节奏"},
+}
+
+
+def _infer_expected_categories(script_tags: set[str] | None) -> set[str] | None:
+    """从文案标签集合推断期望的素材分类（可能命中多个）。标签为空返回 None。"""
+    if not script_tags:
+        return None
+    matched: set[str] = set()
+    for cat, kws in _CATEGORY_KEYWORDS.items():
+        for tag in script_tags:
+            tag.lower()
+            for kw in kws:
+                if kw in tag or tag in kw:
+                    matched.add(cat)
+                    break
+            if cat in matched:
+                break
+    return matched or None
+
+
 
 logger = logging.getLogger(__name__)
 
@@ -134,10 +250,11 @@ def _ensure_library_has_ready_video_assets(assets) -> None:
 def _select_assets_from_library(
     assets: list,
     mode: str,
-    count: int,
+    count: int = 0,
     rng=None,
     script_tags: list | None = None,
     tag_names_by_id: dict | None = None,
+    db=None,
 ) -> list[str]:
     """根据选取模式从素材库中选取 ready 状态的视频素材 ID。
 
@@ -158,6 +275,45 @@ def _select_assets_from_library(
     if not ready_video_assets:
         return []
 
+    # #2035：加载片段级 AI 标签，供叙事模式 AI 加权和 smart 模式语义匹配使用。
+    # 失败降级为空（不影响选片主流程）。
+    clip_ai_tags_by_asset: dict[str, list[dict]] = {}
+    ai_tags_by_asset: dict[
+        str, dict
+    ] = {}  # asset_id → 聚合后的 ai_tags dict（取首个有 has_text 的片段；合并 scene/objects/action 去重）
+    try:
+        if db is not None:
+            from packages.adapters.sqlalchemy_impl.models import AssetAtomClipModel
+
+            ready_ids = [a.id for a in ready_video_assets]
+            clip_rows = (
+                db.query(AssetAtomClipModel.asset_id, AssetAtomClipModel.ai_tags)
+                .filter(AssetAtomClipModel.asset_id.in_(ready_ids))
+                .filter(AssetAtomClipModel.ai_tags.isnot(None))
+                .all()
+            )
+            agg: dict[str, dict] = {}
+            for asset_id, ai_tags in clip_rows:
+                if not isinstance(ai_tags, dict):
+                    continue
+                clip_ai_tags_by_asset.setdefault(asset_id, []).append(ai_tags)
+                # 聚合：合并 scene/objects/action 去重
+                agg.setdefault(asset_id, {"scene": [], "objects": [], "action": [], "shot": "", "has_text": False})
+                for key in ("scene", "objects", "action"):
+                    for v in ai_tags.get(key) or []:
+                        v = str(v).strip()
+                        if v and v not in agg[asset_id][key]:
+                            agg[asset_id][key].append(v)
+                if ai_tags.get("has_text") is True:
+                    agg[asset_id]["has_text"] = True
+                if not agg[asset_id]["shot"] and ai_tags.get("shot"):
+                    agg[asset_id]["shot"] = ai_tags["shot"]
+            ai_tags_by_asset = agg
+    except Exception:  # noqa: BLE001
+        logger.warning("[选片] 加载片段 AI 标签失败，降级不使用语义匹配", exc_info=True)
+        clip_ai_tags_by_asset = {}
+        ai_tags_by_asset = {}
+
     # 叙事模式（#1970 PR3）：文案标签命中池优先；无任何命中时完全降级为现有随机逻辑。
     if script_tags:
         from packages.domain.narrative_match import pick_narrative_assets
@@ -167,6 +323,7 @@ def _select_assets_from_library(
             ready_video_assets,
             script_tags=script_tags,
             tag_names_by_id=tag_names_by_id,
+            clip_ai_tags_by_asset=clip_ai_tags_by_asset,
             limit=limit,
             rng=rng,
         )
@@ -177,7 +334,18 @@ def _select_assets_from_library(
         # 评分维度：质量分(40%) + 时长适配(30%) + 新鲜度(20%) + 未使用加分(10%)
         # 排序注入随机噪声（#1743）：同分素材每次选出不同组合，从素材组合层面降重
         limit = count if count > 0 else None
-        results = smart_select_assets(ready_video_assets, limit=limit, kind="video", rng=rng)
+        # #2035：给 smart_select_assets 传入文案标签和 AI 标签映射，启用语义维度
+        norm_script = {t.strip().lower() for t in (script_tags or []) if t and t.strip()}
+        expected_categories = _infer_expected_categories(norm_script)
+        results = smart_select_assets(
+            ready_video_assets,
+            limit=limit,
+            kind="video",
+            rng=rng,
+            script_tags=norm_script if norm_script else None,
+            ai_tags_by_asset=ai_tags_by_asset or None,
+            expected_categories=expected_categories,
+        )
         return [r.asset.id for r in results]
 
     # 默认 all 模式：返回全部 ready 视频素材
@@ -296,7 +464,6 @@ def _resolve_project_and_library(
 
 
 @router.post("/tasks", response_model=BatchGenerationTaskResponse)
-@points_gate("ai_video", quantity_field="count")
 def create_generation_task(
     request: CreateGenerationTaskRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -396,6 +563,7 @@ def create_generation_task(
                 count=request.asset_select_count,
                 script_tags=narrative_script_tags or None,
                 tag_names_by_id=_tag_index,
+                db=db,
             )
     elif project_id and not resolved_asset_ids and (request.asset_select_mode in ("smart",) or narrative_script_tags):
         # 项目级模式：未指定 asset_ids 且选择了 smart 模式（或叙事模式按标签匹配）时自动选取
@@ -410,6 +578,7 @@ def create_generation_task(
                 count=request.asset_select_count,
                 script_tags=narrative_script_tags or None,
                 tag_names_by_id=_tag_index,
+                db=db,
             )
             if not resolved_asset_ids:
                 raise HTTPException(
@@ -512,21 +681,13 @@ def create_generation_task(
     # 同批次任务共享 batch_id，用于视频查重时批次内比对
     batch_id = uuid.uuid4().hex if count > 1 else ""
 
-    # 预检查：批量提交前先看会不会超限，避免建一半才拒
+    # 预检查（Bug B #2098）：只保留全局 503 保护，用户级不再硬拒 429；
+    # 超额任务直接入队等待 worker 自然消费，前端展示排队位置而非阻止提交。
+    # USER_PENDING_LIMIT 作为软上限（safe_enqueue 兜底），提高到 20 支持批量提交。
     try:
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
         global_pending = generation_task_repository.count_pending_total()
-        if user_pending + count > USER_PENDING_LIMIT:
-            raise UserPendingLimitExceeded(
-                user_id=user_id, pending_count=user_pending + count, limit=USER_PENDING_LIMIT
-            )
         if global_pending + count > GLOBAL_PENDING_LIMIT:
             raise GlobalQueueFull(pending_count=global_pending + count, limit=GLOBAL_PENDING_LIMIT)
-    except UserPendingLimitExceeded as e:
-        raise HTTPException(
-            status_code=429,
-            detail=build_rate_limit_detail(e, generation_task_repository, scope="user"),
-        ) from e
     except GlobalQueueFull as e:
         raise HTTPException(
             status_code=503,
@@ -841,14 +1002,10 @@ def create_generation_task(
                 else:
                     failed_tasks.append(task)
             except UserPendingLimitExceeded as _e:
-                # 兜底：如果预检查后又并发提交了，在这里也拦住
-                failed_tasks.append(task)
-                if not created_tasks:
-                    raise HTTPException(
-                        status_code=429,
-                        detail=build_rate_limit_detail(_e, generation_task_repository, scope="user"),
-                    ) from _e
-                break
+                # Bug B #2098: 用户级限流已改为软限制，此分支理论上不再触发；
+                # 极端并发兜底仍入队（safe_enqueue 内部会打 warning 日志），不 429 拒绝
+                logger.warning("[生成任务] 用户 pending 超软限制，仍允许入队: task_id=%s", task.id)
+                created_tasks.append(task)
             except GlobalQueueFull as _e:
                 failed_tasks.append(task)
                 if not created_tasks:
@@ -999,10 +1156,8 @@ def confirm_generation(
         ):
             logger.warning("[确认生成] 入队失败: task_id=%s", new_task.id)
     except UserPendingLimitExceeded as _e:
-        raise HTTPException(
-            status_code=429,
-            detail=build_rate_limit_detail(_e, generation_task_repository, scope="user"),
-        ) from None
+        # Bug B #2098: 用户级限流已软处理，理论上不再触发；作为防御仍放行
+        logger.warning("[任务] 用户 pending 超软限制，任务已入队")
     except GlobalQueueFull as _e:
         raise HTTPException(
             status_code=503,
@@ -1050,17 +1205,29 @@ def finalize_generation_task(
             task_id=task_id,
             user_id=authenticated_user.user.id,
             cover_url=request.cover_url or None,
+            custom_title=(request.custom_title or "").strip() or None,
         )
     except GenerationFinalizeError as e:
         raise HTTPException(status_code=e.status_code, detail=str(e)) from e
 
-    download_url = storage_service.get_download_url(video.file_url, expires_seconds=86400)
+    try:
+        download_url = storage_service.get_download_url(video.file_url, expires_seconds=86400)
+    except Exception:
+        download_url = video.file_url
     return FinalizeGenerationResponse(
         video_id=video.id,
+        project_id=getattr(video, "project_id", "") or "",
+        name=getattr(video, "name", "") or "",
+        file_size=int(getattr(video, "file_size", 0) or 0),
+        duration=float(getattr(video, "duration", 0.0) or 0.0),
+        thumbnail_url=video.thumbnail_url or "",
         cover_url=video.thumbnail_url or "",
         file_url=download_url,
+        width=int(getattr(video, "width", 0) or 0),
+        height=int(getattr(video, "height", 0) or 0),
+        fps=float(getattr(video, "fps", 0.0) or 0.0),
         status="success",
-        is_duplicate=bool(video.is_duplicate),
+        is_duplicate=bool(getattr(video, "is_duplicate", False)),
     )
 
 
@@ -1111,6 +1278,44 @@ def list_generation_results(
     for item in items:
         download_url = storage_service.get_download_url(item.file_url, expires_seconds=86400)
         responses.append(_to_generated_video_response(item, download_url=download_url))
+
+    # #2024/#2028: awaiting_cover 状态下 GeneratedVideo 尚未入库，
+    # 从 extra_meta["rendered_output"] 合成一条轻量视频响应，供前端预览与智能封面使用。
+    status_val = task.status.value if hasattr(task.status, "value") else str(task.status)
+    if not responses and status_val == "awaiting_cover":
+        _meta = getattr(task, "extra_meta", {}) or {}
+        _ro = _meta.get("rendered_output") or {}
+        _file_url = _ro.get("file_url") or ""
+        if _file_url:
+            if _file_url.startswith("http"):
+                _download = _file_url
+            else:
+                try:
+                    _download = storage_service.get_download_url(_file_url, expires_seconds=86400)
+                except Exception:
+                    _download = _file_url
+            _name = _ro.get("name") or ""
+            if not _name:
+                _name = f"generated-{task_id[:8]}"
+            responses.append(
+                GeneratedVideoResponse(
+                    id=f"preview-{task_id}",
+                    project_id=getattr(task, "project_id", "") or "",
+                    generation_task_id=task_id,
+                    name=_name,
+                    file_url=_file_url,
+                    file_size=int(_ro.get("file_size") or 0),
+                    duration=float(_ro.get("duration") or 0.0),
+                    thumbnail_url=_ro.get("thumbnail_url") or getattr(task, "cover_url", "") or "",
+                    width=int(_ro.get("width") or 0),
+                    height=int(_ro.get("height") or 0),
+                    fps=float(_ro.get("fps") or 0.0),
+                    mode=_ro.get("mode", ""),
+                    download_url=_download,
+                    created_at=getattr(task, "updated_at", None) or getattr(task, "created_at", None),
+                )
+            )
+
     return ListGeneratedVideosResponse(items=responses)
 
 
@@ -1131,22 +1336,8 @@ def retry_generation_task(
         raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
 
     user_id = authenticated_user.user.id
-    # 预检查：创建前判断，>= 上限就拒绝
-    user_pending = generation_task_repository.count_pending_by_user(user_id)
+    # 预检查（Bug B #2098）：只保留全局 503，用户级不再硬拒
     global_pending = generation_task_repository.count_pending_total()
-    if user_pending >= USER_PENDING_LIMIT:
-        raise HTTPException(
-            status_code=429,
-            detail=build_rate_limit_detail(
-                UserPendingLimitExceeded(
-                    user_id=user_id,
-                    pending_count=user_pending,
-                    limit=USER_PENDING_LIMIT,
-                ),
-                generation_task_repository,
-                scope="user",
-            ),
-        )
     if global_pending >= GLOBAL_PENDING_LIMIT:
         raise HTTPException(
             status_code=503,
@@ -1189,10 +1380,8 @@ def retry_generation_task(
         ):
             logger.warning("[生成任务] 重试入队失败: task_id=%s", retried.id)
     except UserPendingLimitExceeded as _e:
-        raise HTTPException(
-            status_code=429,
-            detail=build_rate_limit_detail(_e, generation_task_repository, scope="user"),
-        ) from None
+        # Bug B #2098: 用户级限流已软处理，理论上不再触发；作为防御仍放行
+        logger.warning("[任务] 用户 pending 超软限制，任务已入队")
     except GlobalQueueFull as _e:
         raise HTTPException(
             status_code=503,

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

@@ -0,0 +1,215 @@
+"""GPU 编码回传 relay 端点。
+
+两个用途：
+1. 结果回传（原）：P4000 编码完成后通过 HTTP PUT 把结果 mp4 写到 /{key}；Worker 用同 URL GET 回本地。
+2. Mezzanine 中转（新）：Worker 先把 CPU ultrafast 编码出的 mezzanine 通过 PUT 到 /mezzanine/{key}，
+   P4000 通过 Tailscale 内网直接 GET 下载，跳过公网 OSS 中转，节省 18-20s 固定延迟。
+   编码完成后 DELETE 清理。
+
+安全：
+- 生产环境必须配置 GPU_ENCODE_RELAY_SECRET；token=xxx 查询参数必须匹配。
+- key 为随机 hex，无法被枚举。
+- 写入/读取后 worker 会调用 DELETE 主动清理；文件落地在 generated-files/gpu_relay/。
+"""
+from __future__ import annotations
+
+import logging
+import os
+import secrets
+import time
+import uuid
+from pathlib import Path
+from typing import Optional
+
+from fastapi import APIRouter, HTTPException, Query, Request
+from fastapi.responses import FileResponse, Response
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/internal/gpu-relay", tags=["Internal-GpuRelay"])
+
+_DEFAULT_SECRET_LOGGED = False
+
+
+def _relay_dir() -> Path:
+    base = os.getenv("GENERATED_FILES_DIR", "/app/generated")
+    sub = os.getenv("GPU_ENCODE_RELAY_DIR", "gpu_relay")
+    p = Path(base) / sub
+    p.mkdir(parents=True, exist_ok=True)
+    return p
+
+
+def _mezzanine_dir() -> Path:
+    p = _relay_dir() / "mezzanine"
+    p.mkdir(parents=True, exist_ok=True)
+    return p
+
+
+def _secret() -> str:
+    global _DEFAULT_SECRET_LOGGED
+    secret = (os.getenv("GPU_ENCODE_RELAY_SECRET", "") or "").strip()
+    if not secret:
+        env = (os.getenv("APP_ENV", os.getenv("ENV", "development"))).lower()
+        if env in ("production", "prod"):
+            raise RuntimeError("GPU_ENCODE_RELAY_SECRET must be set in production")
+        secret = os.environ.setdefault("GPU_ENCODE_RELAY_SECRET", secrets.token_urlsafe(32))
+        if not _DEFAULT_SECRET_LOGGED:
+            logger.warning(
+                "[gpu-relay] GPU_ENCODE_RELAY_SECRET not set; using ephemeral dev token (%s...)",
+                secret[:8],
+            )
+            _DEFAULT_SECRET_LOGGED = True
+    return secret
+
+
+def _safe_key(key: str) -> str:
+    """只允许合法文件名字符，防 path traversal。"""
+    k = key.strip()
+    if not k or "/" in k or "\\" in k or k in (".", "..") or not all(
+        c.isalnum() or c in "-_" for c in k
+    ):
+        raise HTTPException(status_code=400, detail="invalid key")
+    return k
+
+
+def _check_token(tok: Optional[str]) -> None:
+    if not tok or tok != _secret():
+        raise HTTPException(status_code=401, detail="unauthorized")
+
+
+async def _atomic_write(request: Request, dst: Path, log_prefix: str, key_for_log: str) -> int:
+    """通用原子写入（流式 → .part → replace）。返回字节数。"""
+    tmp = dst.with_suffix(dst.suffix + ".part")
+    size = 0
+    t0 = time.time()
+    try:
+        with open(tmp, "wb") as f:
+            async for chunk in request.stream():
+                f.write(chunk)
+                size += len(chunk)
+        os.replace(tmp, dst)
+    except Exception as e:  # noqa: BLE001
+        if tmp.exists():
+            try:
+                tmp.unlink()
+            except OSError:
+                pass
+        logger.exception("[gpu-relay] %s PUT failed key=%s", log_prefix, key_for_log)
+        raise HTTPException(status_code=500, detail=f"write failed: {e}") from e
+    logger.info(
+        "[gpu-relay] %s PUT key=%s size=%d took=%.2fs",
+        log_prefix, key_for_log, size, time.time() - t0,
+    )
+    return size
+
+
+def _file_response(path: Path, download_name: str) -> FileResponse:
+    if not path.exists():
+        raise HTTPException(status_code=404, detail="not found")
+    return FileResponse(path=path, media_type="video/mp4", filename=f"{download_name}.mp4")
+
+
+def _head_response(path: Path) -> Response:
+    if not path.exists():
+        return Response(status_code=404)
+    return Response(
+        status_code=200,
+        media_type="video/mp4",
+        headers={"Content-Length": str(path.stat().st_size)},
+    )
+
+
+def _safe_delete(path: Path, err_detail: str) -> dict:
+    try:
+        if path.exists():
+            path.unlink()
+    except OSError as e:
+        raise HTTPException(status_code=500, detail=f"{err_detail}: {e}") from e
+    return {"ok": True}
+
+
+# ── Worker 侧 URL 构造 ─────────────────────────────────────────────────
+def build_relay_put_url(base_url: str, key: str, secret: str) -> str:
+    """给 P4000 回传结果用的 PUT URL（外部/Tailscale 可达）。"""
+    return f"{base_url.rstrip('/')}/api/v1/internal/gpu-relay/{key}?token={secret}"
+
+
+def build_relay_get_url(base_url: str, key: str, secret: str) -> str:
+    """Worker 取回结果用的 GET URL。"""
+    return build_relay_put_url(base_url, key, secret)
+
+
+def build_mezzanine_put_url(base_url: str, key: str, secret: str) -> str:
+    """Worker 上传 mezzanine 用的 PUT URL（Docker 内网或 Tailscale）。"""
+    return f"{base_url.rstrip('/')}/api/v1/internal/gpu-relay/mezzanine/{key}?token={secret}"
+
+
+def build_mezzanine_get_url(base_url: str, key: str, secret: str) -> str:
+    """P4000 下载 mezzanine 用的 GET URL（必须是 P4000 可达地址，通常是 Tailscale host:8092）。"""
+    return build_mezzanine_put_url(base_url, key, secret)
+
+
+def generate_key() -> str:
+    return uuid.uuid4().hex
+
+
+# ── 编码结果：PUT/GET/HEAD/DELETE /{key} ──────────────────────────────
+@router.put("/{key}")
+async def put_object(key: str, request: Request, token: Optional[str] = Query(None)):
+    _check_token(token)
+    safe = _safe_key(key)
+    size = await _atomic_write(request, _relay_dir() / safe, "result", safe)
+    return {"ok": True, "key": safe, "size": size}
+
+
+@router.get("/{key}")
+async def get_object(key: str, token: Optional[str] = Query(None)):
+    _check_token(token)
+    safe = _safe_key(key)
+    return _file_response(_relay_dir() / safe, safe)
+
+
+@router.head("/{key}")
+async def head_object(key: str, token: Optional[str] = Query(None)):
+    _check_token(token)
+    safe = _safe_key(key)
+    return _head_response(_relay_dir() / safe)
+
+
+@router.delete("/{key}")
+async def delete_object(key: str, token: Optional[str] = Query(None)):
+    _check_token(token)
+    safe = _safe_key(key)
+    return _safe_delete(_relay_dir() / safe, "delete failed")
+
+
+# ── Mezzanine 中转：PUT/GET/HEAD/DELETE /mezzanine/{key} ─────────────
+# Worker 上传 mezzanine 用；P4000 通过 Tailscale 直接 GET 下载。
+@router.put("/mezzanine/{key}")
+async def put_mezzanine(key: str, request: Request, token: Optional[str] = Query(None)):
+    _check_token(token)
+    safe = _safe_key(key)
+    dst = _mezzanine_dir() / f"{safe}.mp4"
+    size = await _atomic_write(request, dst, "mezzanine", safe)
+    return {"ok": True, "key": safe, "size": size}
+
+
+@router.get("/mezzanine/{key}")
+async def get_mezzanine(key: str, token: Optional[str] = Query(None)):
+    _check_token(token)
+    safe = _safe_key(key)
+    return _file_response(_mezzanine_dir() / f"{safe}.mp4", f"{safe}-mezzanine")
+
+
+@router.head("/mezzanine/{key}")
+async def head_mezzanine(key: str, token: Optional[str] = Query(None)):
+    _check_token(token)
+    safe = _safe_key(key)
+    return _head_response(_mezzanine_dir() / f"{safe}.mp4")
+
+
+@router.delete("/mezzanine/{key}")
+async def delete_mezzanine(key: str, token: Optional[str] = Query(None)):
+    _check_token(token)
+    safe = _safe_key(key)
+    return _safe_delete(_mezzanine_dir() / f"{safe}.mp4", "mezzanine delete failed")

apps/api/app/api/routes/health.py

@@ -9,6 +9,11 @@ from fastapi.responses import JSONResponse
 router = APIRouter(tags=["Health"])
 
 
+
+def _pg_url(url: str) -> str:
+    """Convert SQLAlchemy URL (postgresql+psycopg://...) to libpq connection string."""
+    return url.replace("postgresql+psycopg://", "postgresql://", 1).replace("postgresql+psycopg2://", "postgresql://", 1)
+
 @router.get("/health", status_code=status.HTTP_200_OK)
 async def health_check():
     return {
@@ -49,7 +54,7 @@ async def _check_database() -> dict:
             "message": "Using in-memory database",
         }
     try:
-        conn = psycopg.connect(settings.DATABASE_URL, connect_timeout=3)
+        conn = psycopg.connect(_pg_url(settings.DATABASE_URL), connect_timeout=3)
         with conn.cursor() as cur:
             cur.execute("SELECT 1")
             cur.fetchone()
@@ -124,7 +129,7 @@ async def _check_migrations() -> dict:
             "message": "Using in-memory database, no migrations needed",
         }
     try:
-        conn = psycopg.connect(settings.DATABASE_URL, connect_timeout=3)
+        conn = psycopg.connect(_pg_url(settings.DATABASE_URL), connect_timeout=3)
         with conn.cursor() as cur:
             cur.execute("""
                 SELECT COUNT(*) FROM information_schema.tables
@@ -137,3 +142,5 @@ async def _check_migrations() -> dict:
         return {"status": "unhealthy", "message": f"Missing tables, found {count}/5"}
     except Exception as error:
         return {"status": "unhealthy", "message": f"Migration check failed: {error}"}
+
+

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

@@ -12,11 +12,9 @@
 from __future__ import annotations
 
 import logging
-import math
 from datetime import UTC
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.config import settings
 from app.dependencies import (
     get_db_session,
     get_voice_clone_profile_repository,
@@ -32,9 +30,6 @@ from app.services.mediakit_client import MediaKitError
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 
-from packages.domain.points_rules import calculate_points_cost
-from packages.domain.points_service import PointsService
-
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
@@ -61,37 +56,6 @@ def create_lipsync_job(
     db: Session = Depends(get_db_session),
     svc: LipsyncService = Depends(_get_service),
 ):
-    user_id = current_user.user.id
-
-    # ── 积分扣点（#1895 P2） ──
-    _points_deducted = 0
-    _points_scene = "ai_digital_human"
-    _points_svc = PointsService() if settings.points_enabled else None
-    if _points_svc is not None:
-        # 口型同步：TTS 模式按 script_text 估时长（240字/分钟）；音频直传按 audio_duration（秒→分钟）
-        if body.audio_url and body.audio_duration and body.audio_duration > 0:
-            est_minutes = max(1.0, math.ceil(body.audio_duration / 60.0))
-        elif body.script_text:
-            est_minutes = max(1.0, math.ceil(len(body.script_text) / 240))
-        else:
-            est_minutes = 1.0
-        _points_deducted = calculate_points_cost(
-            _points_scene,
-            is_member=getattr(current_user.user, "is_member", False),
-            duration_minutes=est_minutes,
-            member_type=getattr(current_user.user, "member_type", None),
-        )
-        _deduct_res = _points_svc.deduct_points(user_id, _points_deducted, _points_scene, db)
-        if not _deduct_res["success"]:
-            raise HTTPException(
-                status_code=402,
-                detail={
-                    "code": "INSUFFICIENT_POINTS",
-                    "message": f"积分不足，需要 {_points_deducted} 积分，当前余额 {_deduct_res['balance']}",
-                    "required": _points_deducted,
-                    "balance": _deduct_res["balance"],
-                },
-            )
     """提交对口型任务.
 
     三种模式：
@@ -101,6 +65,8 @@ def create_lipsync_job(
     - 预合成音频（#1845 新主路径）：传 {video_url, audio_url, audio_duration, sentence_timings}，
       后端同步ffprobe+写入timings+直接提交MediaKit（~2-3s）。
     """
+    user_id = current_user.user.id
+
     try:
         job = svc.create_job(
             user_id=user_id,
@@ -118,18 +84,8 @@ def create_lipsync_job(
             project_id=body.project_id,
         )
     except ValueError as exc:
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"对口型 ValueError 退积分异常: err={refund_err}")
         raise HTTPException(status_code=400, detail=str(exc)) from exc
     except MediaKitError as exc:
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"对口型 MediaKitError 退积分异常: err={refund_err}")
         status_code = 502
         if exc.code in ("VoiceForbidden",):
             status_code = 403
@@ -145,24 +101,11 @@ def create_lipsync_job(
         ) from exc
     except Exception as exc:
         logger.error("创建对口型任务异常: %s", exc, exc_info=True)
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"对口型异常退积分异常: err={refund_err}")
         raise HTTPException(
             status_code=400,
             detail=f"创建对口型任务失败: {exc}",
         ) from exc
 
-    # 创建成功但状态为 failed（同步路径失败已抛异常到上面 except；此处处理 Celery 调度失败等）
-    # 若任务已创建且状态为 failed，退费
-    if _points_deducted > 0 and _points_svc is not None and getattr(job, "status", None) == "failed":
-        try:
-            _points_svc.refund_points(user_id, _points_deducted, _points_scene, db, ref_id=job.id)
-        except Exception as refund_err:
-            logger.warning(f"对口型任务失败退积分异常: job_id={job.id}, err={refund_err}")
-
     return job
 
 
@@ -176,37 +119,14 @@ def preview_tts(
     db: Session = Depends(get_db_session),
     svc: LipsyncService = Depends(_get_service),
 ):
-    user_id = current_user.user.id
-
-    # ── 积分扣点（#1895 P2） ──
-    _points_deducted = 0
-    _points_scene = "ai_digital_human"
-    _points_svc = PointsService() if settings.points_enabled else None
-    if _points_svc is not None:
-        est_minutes = max(1.0, math.ceil(len(body.script_text or "") / 240)) if body.script_text else 1.0
-        _points_deducted = calculate_points_cost(
-            _points_scene,
-            is_member=getattr(current_user.user, "is_member", False),
-            duration_minutes=est_minutes,
-            member_type=getattr(current_user.user, "member_type", None),
-        )
-        _deduct_res = _points_svc.deduct_points(user_id, _points_deducted, _points_scene, db)
-        if not _deduct_res["success"]:
-            raise HTTPException(
-                status_code=402,
-                detail={
-                    "code": "INSUFFICIENT_POINTS",
-                    "message": f"积分不足，需要 {_points_deducted} 积分，当前余额 {_deduct_res['balance']}",
-                    "required": _points_deducted,
-                    "balance": _deduct_res["balance"],
-                },
-            )
     """步骤1「生成配音」同步 TTS 预合成.
 
     同步执行 TTS 合成 → 下载音频 → ffprobe 时长 → 句子时间戳计算，
     不创建 LipsyncJob、不转存 OSS，直接返回 CosyVoice 临时 URL（~24h 有效）。
     耗时约 2-3 秒。
     """
+    user_id = current_user.user.id
+
     try:
         result = svc.preview_tts(
             user_id=user_id,
@@ -218,11 +138,6 @@ def preview_tts(
             emotion=body.emotion,
         )
     except MediaKitError as exc:
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"TTS 预合成 MediaKitError 退积分异常: err={refund_err}")
         status_code = 400
         if exc.code in ("VoiceForbidden",):
             status_code = 403
@@ -237,11 +152,6 @@ def preview_tts(
         ) from exc
     except Exception as exc:
         logger.error("TTS 预合成异常: %s", exc, exc_info=True)
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"TTS 预合成异常退积分异常: err={refund_err}")
         raise HTTPException(
             status_code=400,
             detail=f"TTS 合成失败: {exc}",

apps/api/app/api/routes/points.py

@@ -145,19 +145,22 @@ def get_rules(
 def get_packages(
     current_user: AuthenticatedUser = Depends(get_current_user),
 ):
-    """查询可购买的积分包列表。"""
-    packages = []
-    for code, pkg in POINTS_PACKAGES.items():
-        unit_price = f"¥{pkg['price_cents'] / 100 / pkg['points']:.3f}/积分"
-        packages.append(
-            PointsPackageItem(
-                code=code,
-                name=pkg["name"],
-                points=pkg["points"],
-                price_cents=pkg["price_cents"],
-                unit_price=unit_price,
-            )
+    """查询可购买的积分包列表（读管理后台 credit_packages 表真实数据）。
+
+    仅返回 is_active=true；后台改价/启停后最多 30 秒生效。
+    """
+    from packages.application.catalog.admin_catalog import get_points_packages
+
+    packages = [
+        PointsPackageItem(
+            code=row["code"],
+            name=row["name"],
+            points=row["points"],
+            price_cents=row["price_cents"],
+            unit_price=row["unit_price"],
         )
+        for row in get_points_packages()
+    ]
     mt = _member_type(current_user)
     discount = MEMBER_DISCOUNT.get(mt) if mt else None
     return PointsPackagesResponse(packages=packages, user_discount=discount)
@@ -169,17 +172,7 @@ def check_points(
     current_user: AuthenticatedUser = Depends(get_current_user),
     db: Session = Depends(get_db_session),
 ):
-    """消费前检查余额是否足够。未知 scene_key 返回 400（而非 500）。"""
-    if body.scene_key not in POINTS_SCENES:
-        raise HTTPException(
-            status_code=400,
-            detail={
-                "code": "UNKNOWN_SCENE",
-                "message": f"未知场景: {body.scene_key}",
-                "valid_scenes": sorted(POINTS_SCENES.keys()),
-            },
-        )
-
+    """消费前检查余额是否足够。已下线/未知场景返回 cost=0（免费）。"""
     # 积分系统暂停（ENABLE_CREDIT_SYSTEM=false）：所有场景直接放行，需 0 积分
     if not _credits_enabled():
         svc = _get_service()
@@ -195,13 +188,6 @@ def check_points(
     is_mem = _is_member(current_user)
     mt = _member_type(current_user)
 
-    # 混剪场景先检查免费额度
-    is_free_quota = False
-    if body.scene_key == "ai_video" and not is_mem:
-        svc = _get_service()
-        if svc.check_daily_free_clip(current_user.user.id, db):
-            is_free_quota = True
-
     required = calculate_points_cost(
         body.scene_key,
         is_mem,
@@ -215,11 +201,11 @@ def check_points(
     balance = account["balance"]
 
     return PointsCheckResponse(
-        allowed=is_free_quota or balance >= required,
+        allowed=balance >= required,
         required_points=required,
         current_balance=balance,
         remaining_after=balance - required,
-        is_free_quota=is_free_quota,
+        is_free_quota=False,
     )
 
 

apps/api/app/api/routes/scripts_ai.py

@@ -44,7 +44,6 @@ from app.services.script_asr_service import (
 from fastapi import APIRouter, Depends, HTTPException, status
 from sqlalchemy.orm import Session
 
-from packages.middleware.points_gate import points_gate
 from packages.shared.ai_client import get_doubao_client
 
 logger = logging.getLogger(__name__)
@@ -373,7 +372,6 @@ def douyin_diag():
 
 
 @router.post("/extract-from-douyin", response_model=ExtractFromDouyinResponse)
-@points_gate("douyin_extract")
 def extract_from_douyin(
     request: ExtractFromDouyinRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),
@@ -497,7 +495,6 @@ def extract_from_douyin(
 
 
 @router.post("/ai-rewrite", response_model=AiRewriteResponse)
-@points_gate("ai_rewrite")
 def ai_rewrite(
     request: AiRewriteRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),
@@ -537,7 +534,6 @@ def ai_rewrite(
 
 
 @router.post("/ai-generate-titles", response_model=AiGenerateTitlesResponse)
-@points_gate("ai_title")
 def ai_generate_titles(
     request: AiGenerateTitlesRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),

apps/api/app/api/routes/subscription.py

@@ -86,33 +86,13 @@ async def get_current_subscription(
 def list_membership_plans(
     current_user: AuthenticatedUser = Depends(get_current_user),
 ) -> dict[str, list[dict[str, Any]]]:
-    """查询所有会员档位（供前端会员购买页展示）。
+    """查询可购买的会员套餐（读管理后台 plans 表真实数据）。
 
-    返回 points 积分体系下的会员档位（月卡/季卡/年卡），含价格、时长、积分折扣等信息。
+    仅返回 is_enabled=true 的套餐；后台启停/改价后最多 30 秒生效。
     """
-    from packages.domain.points_rules import MEMBER_DISCOUNT, MEMBERSHIP_PRICES
+    from packages.application.catalog.admin_catalog import get_membership_plans
 
-    plans: list[dict[str, Any]] = []
-    for plan_id, info in MEMBERSHIP_PRICES.items():
-        days = info["duration_days"]
-        monthly_cents = round(info["price_cents"] * 30 / days)
-        features: dict[str, Any] = {"max_resolution": "1080p"}
-        if plan_id == MembershipType.MONTHLY:
-            features.update({"free_clips_daily": 2})
-        elif plan_id == MembershipType.QUARTERLY:
-            features.update({"free_clips_daily": 5})
-        elif plan_id == MembershipType.YEARLY:
-            features.update({"free_clips_daily": "unlimited"})
-        plans.append({
-            "plan_id": plan_id,
-            "name": info["name"],
-            "price_cents": info["price_cents"],
-            "monthly_price_cents": monthly_cents,
-            "duration_days": days,
-            "points_discount": MEMBER_DISCOUNT.get(plan_id, 1.0),
-            "features": features,
-        })
-    return {"plans": plans}
+    return {"plans": get_membership_plans()}
 
 
 @router.get("/billing-records", response_model=list[BillingRecord])

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

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

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

@@ -4,14 +4,12 @@ from __future__ import annotations
 
 import json
 import logging
-import math
 import subprocess
 import tempfile
 from pathlib import Path
 from typing import Any, Optional
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.config import settings
 from app.core.celery_app import celery_app
 from app.core.storage import get_storage_service
 from app.dependencies import (
@@ -53,8 +51,6 @@ from packages.application.tts_job.use_cases import (
 )
 from packages.application.tts_job.workflow import TTSWorkflowService
 from packages.domain import Asset, AssetLibrary, AssetLibraryKind, AssetStatus, ClassificationStatus
-from packages.domain.points_rules import calculate_points_cost
-from packages.domain.points_service import PointsService
 from packages.domain.voice_presets import list_voices
 from packages.ports.asset_library_repository import AssetLibraryRepository
 from packages.ports.asset_repository import AssetRepository
@@ -144,31 +140,6 @@ def synthesize(
     """
     user_id = authenticated_user.user.id
 
-    # ── 积分扣点（#1895 P2） ──
-    _points_deducted = 0
-    _points_scene = "ai_voice"
-    _points_svc = PointsService() if settings.points_enabled else None
-    if _points_svc is not None:
-        # 中文按 ~240 字/分钟粗估时长，至少按 1 分钟扣 1 分
-        est_minutes = max(1.0, math.ceil(len(request.text) / 240))
-        _points_deducted = calculate_points_cost(
-            _points_scene,
-            is_member=getattr(authenticated_user.user, "is_member", False),
-            duration_minutes=est_minutes,
-            member_type=getattr(authenticated_user.user, "member_type", None),
-        )
-        _deduct_res = _points_svc.deduct_points(user_id, _points_deducted, _points_scene, db)
-        if not _deduct_res["success"]:
-            raise HTTPException(
-                status_code=402,
-                detail={
-                    "code": "INSUFFICIENT_POINTS",
-                    "message": f"积分不足，需要 {_points_deducted} 积分，当前余额 {_deduct_res['balance']}",
-                    "required": _points_deducted,
-                    "balance": _deduct_res["balance"],
-                },
-            )
-
     # 解析 voice_id：前端可能传克隆音色 profile UUID（而非 CosyVoice voice_id），
     # 与 /tts/preview 保持一致：命中 profile → 校验归属 → 取 CosyVoice voice_id
     actual_voice_id = request.voice_id
@@ -231,7 +202,6 @@ def synthesize(
         cosyvoice_service=cosyvoice_service,
     )
 
-    synthesis_error: Exception | None = None
     try:
         job = workflow.start_synthesis(job.id)
     except Exception as e:
@@ -239,18 +209,10 @@ def synthesize(
         # 但 DB 异常、网络异常等意外错误可能逃逸。
         # 与音色克隆接口保持一致：标记 failed，返回 201，不抛 500。
         logger.error(f"TTS 合成异常: job_id={job.id}, error={e}", exc_info=True)
-        synthesis_error = e
         try:
             job = workflow.process_synthesis_failure(job.id, str(e))
         except Exception as inner_e:
             logger.error(f"标记 TTS job 失败时出错: job_id={job.id}, error={inner_e}")
-    # 合成失败且已扣积分 → 退费
-    if synthesis_error is not None and _points_deducted > 0 and _points_svc is not None:
-        try:
-            _points_svc.refund_points(user_id, _points_deducted, _points_scene, db, ref_id=job.id)
-        except Exception as refund_err:
-            logger.warning(f"TTS 合失败退积分异常: job_id={job.id}, err={refund_err}")
-
     # 若任务处于 processing 状态（异步模式），触发 Celery 后台轮询
     if job.status.value == "processing":
         # 分段合成任务 vs 普通单段任务
@@ -269,13 +231,6 @@ def synthesize(
                 workflow.process_synthesis_failure(job.id, f"Celery 任务调度失败: {e}")
             except Exception as inner_e:
                 logger.error(f"Celery 调度后标记失败时出错: job_id={job.id}, error={inner_e}")
-            # 调度失败退费
-            if _points_deducted > 0 and _points_svc is not None:
-                try:
-                    _points_svc.refund_points(user_id, _points_deducted, _points_scene, db, ref_id=job.id)
-                except Exception as refund_err:
-                    logger.warning(f"Celery 调度失败退积分异常: job_id={job.id}, err={refund_err}")
-
     return TTSSynthesizeResponse(
         job_id=job.id,
         status=job.status,
@@ -610,31 +565,6 @@ def preview_tts(
     用于前端预览配音效果，限制文本长度 200 字以内。
     支持预设音色和克隆音色：克隆音色传的是 profile UUID，需解析为 CosyVoice voice_id。
     """
-    user_id = authenticated_user.user.id
-    # ── 积分扣点（#1895 P2） ──
-    _points_deducted = 0
-    _points_scene = "ai_voice"
-    _points_svc = PointsService() if settings.points_enabled else None
-    if _points_svc is not None:
-        est_minutes = max(1.0, math.ceil(len(request.text) / 240))
-        _points_deducted = calculate_points_cost(
-            _points_scene,
-            is_member=getattr(authenticated_user.user, "is_member", False),
-            duration_minutes=est_minutes,
-            member_type=getattr(authenticated_user.user, "member_type", None),
-        )
-        _deduct_res = _points_svc.deduct_points(user_id, _points_deducted, _points_scene, db)
-        if not _deduct_res["success"]:
-            raise HTTPException(
-                status_code=402,
-                detail={
-                    "code": "INSUFFICIENT_POINTS",
-                    "message": f"积分不足，需要 {_points_deducted} 积分，当前余额 {_deduct_res['balance']}",
-                    "required": _points_deducted,
-                    "balance": _deduct_res["balance"],
-                },
-            )
-
     # 解析 voice_id：前端可能传 VoiceCloneProfile UUID 或预设音色 ID
     actual_voice_id = request.voice_id
     profile = voice_clone_repo.get(request.voice_id)
@@ -664,12 +594,6 @@ def preview_tts(
             language=getattr(request, "language", "zh-CN"),
         )
     except (CosyVoiceError, ValueError) as e:
-        # 合成失败退费
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"TTS 预览失败退积分异常: {refund_err}")
         if isinstance(e, CosyVoiceError):
             raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=f"TTS 合成失败: {e}") from e
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e)) from e

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

@@ -191,6 +191,23 @@ def _find_duplicate_asset(
     return None
 
 
+
+def _get_existing_asset_url(existing: Any, storage_service: Any) -> str:
+    """安全获取已存在素材的公网 URL，兼容 domain Asset（无 file_url 字段）和 ORM model。"""
+    # Domain Asset 只有 storage_key 字段；ORM model 有 file_url 但存的也是 storage_key
+    key = ""
+    for attr in ("storage_key", "file_url"):
+        v = getattr(existing, attr, None)
+        if v:
+            key = v
+            break
+    if not key:
+        return ""
+    try:
+        return storage_service.get_url(key) or ""
+    except Exception:
+        return ""
+
 def _create_pending_asset(
     asset_repository,
     project_id,
@@ -290,6 +307,43 @@ def _submit_ingest_job(
     return job
 
 
+def _find_active_ingest_job(ingest_job_repository: Any, asset_id: str) -> Any | None:
+    """查询 asset 上是否存在"仍在跑或已成功"的 ingest job（FAILED 视为不存在，需重提）。"""
+    if not asset_id:
+        return None
+    find = getattr(ingest_job_repository, "find_by_asset_id", None)
+    if not callable(find):
+        # 旧仓储未实现 find_by_asset_id，无法判断 → 保守返回 None（走正常流程，
+        # _submit_ingest_job 自身有数据库唯一约束/幂等兜底，不会重复建 job）
+        return None
+    try:
+        return find(asset_id)
+    except Exception:  # noqa: BLE001
+        logger.warning("[upload] find_by_asset_id 查询失败，按无 job 处理: asset=%s", asset_id, exc_info=True)
+        return None
+
+
+def _is_true_duplicate(existing_asset: Asset, ingest_job_repository: Any) -> tuple[bool, Any | None]:
+    """判断 `existing_asset` 是真重复（应短路返 duplicated）还是占位（应补提 ingest）。
+
+    返回 (is_duplicate, existing_job):
+    - READY 素材：真重复，job 可能为 None（已就绪不需要 job_id）
+    - PROCESSING/UPLOADING 且已有在跑/已完成 ingest job：幂等重试，真重复，job 返回给前端轮询
+    - PROCESSING/UPLOADING 且无 job：prepare 建的占位 / 之前 ingest 创建失败 → 非重复，需补提 ingest
+    - ERROR/DELETED：非重复（允许重新上传覆盖）
+    """
+    status = getattr(existing_asset, "status", None)
+    if status == AssetStatus.READY:
+        return True, None
+    if status in (AssetStatus.PROCESSING, AssetStatus.UPLOADING):
+        job = _find_active_ingest_job(ingest_job_repository, existing_asset.id)
+        if job is not None:
+            return True, job
+        return False, None
+    # ERROR / DELETED / 其它：走正常流程重新 ingest
+    return False, None
+
+
 @router.post("/direct/prepare", response_model=DirectUploadPrepareResponse)
 async def prepare_direct_upload(
     request: DirectUploadPrepareRequest,
@@ -353,6 +407,7 @@ async def prepare_direct_upload(
                 duplicated=True,
                 skip_transfer=True,
                 asset_id=existing.id,
+                url=_get_existing_asset_url(existing, storage_service),
             )
 
     file_id = uuid4().hex[:8]
@@ -406,6 +461,7 @@ async def prepare_direct_upload(
         duplicated=False,
         skip_transfer=False,
         asset_id=pending_asset_id,
+        url="",
     )
 
 
@@ -444,12 +500,25 @@ async def complete_direct_upload(
         file_size=request.file_size,
     )
     if existing is not None:
-        return DirectUploadCompleteResponse(
-            storage_key=existing.storage_key,
-            ingest_job_id="",
-            duplicated=True,
-            asset_id=existing.id,
-            url=storage_service.get_url(existing.storage_key),
+        is_dup, existing_job = _is_true_duplicate(existing, ingest_job_repository)
+        if is_dup:
+            logger.info(
+                "[upload] complete 幂等命中真重复: asset=%s status=%s job=%s",
+                existing.id,
+                getattr(existing, "status", None),
+                getattr(existing_job, "id", None),
+            )
+            return DirectUploadCompleteResponse(
+                storage_key=existing.storage_key,
+                ingest_job_id=getattr(existing_job, "id", "") or "",
+                duplicated=True,
+                asset_id=existing.id,
+                url=storage_service.get_url(existing.storage_key),
+            )
+        logger.info(
+            "[upload] complete 命中占位 asset（status=%s 无 ingest job），继续补提 ingest: asset=%s",
+            getattr(existing, "status", None),
+            existing.id,
         )
 
     try:
@@ -479,14 +548,24 @@ async def complete_direct_upload(
     )
     # Issue #1776: 计数由 asset_repository.create() 自动维护
 
-    job = _submit_ingest_job(
-        project_id=request.project_id,
-        library_id=request.library_id,
-        storage_key=normalized_key,
-        ingest_job_repository=ingest_job_repository,
-        file_hash=request.file_hash,
-        asset_id=pending_asset.id,
-    )
+    # 幂等保护：补提占位场景下可能已有 job（极端竞态），先查一次
+    existing_job = _find_active_ingest_job(ingest_job_repository, pending_asset.id)
+    if existing_job is not None:
+        logger.info(
+            "[upload] complete 补提时发现 job 已存在（竞态/并发重试），复用: asset=%s job=%s",
+            pending_asset.id,
+            existing_job.id,
+        )
+        job = existing_job
+    else:
+        job = _submit_ingest_job(
+            project_id=request.project_id,
+            library_id=request.library_id,
+            storage_key=normalized_key,
+            ingest_job_repository=ingest_job_repository,
+            file_hash=request.file_hash,
+            asset_id=pending_asset.id,
+        )
     return DirectUploadCompleteResponse(
         storage_key=normalized_key,
         ingest_job_id=job.id,
@@ -533,12 +612,27 @@ async def upload_asset(
         file_size=0,
     )
     if existing is not None:
-        return UploadAssetResponse(
-            storage_key=existing.storage_key,
-            ingest_job_id="",
-            url="",
-            duplicated=True,
-            asset_id=existing.id,
+        is_dup, existing_job = _is_true_duplicate(existing, ingest_job_repository)
+        if is_dup:
+            logger.info(
+                "[upload] multipart 幂等命中真重复: asset=%s status=%s job=%s",
+                existing.id,
+                getattr(existing, "status", None),
+                getattr(existing_job, "id", None),
+            )
+            return UploadAssetResponse(
+                storage_key=existing.storage_key,
+                ingest_job_id=getattr(existing_job, "id", "") or "",
+                url=storage_service.get_url(existing.storage_key)
+                if getattr(existing, "status", None) == AssetStatus.READY
+                else "",
+                duplicated=True,
+                asset_id=existing.id,
+            )
+        logger.info(
+            "[upload] multipart 命中占位 asset（status=%s 无 ingest job），继续补提 ingest: asset=%s",
+            getattr(existing, "status", None),
+            existing.id,
         )
 
     file_id = uuid4().hex[:8]
@@ -574,14 +668,23 @@ async def upload_asset(
     )
     # Issue #1776: 计数由 asset_repository.create() 自动维护
 
-    job = _submit_ingest_job(
-        project_id=project_id,
-        library_id=library_id,
-        storage_key=storage_key,
-        ingest_job_repository=ingest_job_repository,
-        file_hash=file_hash,
-        asset_id=pending_asset.id,
-    )
+    existing_job = _find_active_ingest_job(ingest_job_repository, pending_asset.id)
+    if existing_job is not None:
+        logger.info(
+            "[upload] multipart 补提时发现 job 已存在（竞态/并发重试），复用: asset=%s job=%s",
+            pending_asset.id,
+            existing_job.id,
+        )
+        job = existing_job
+    else:
+        job = _submit_ingest_job(
+            project_id=project_id,
+            library_id=library_id,
+            storage_key=storage_key,
+            ingest_job_repository=ingest_job_repository,
+            file_hash=file_hash,
+            asset_id=pending_asset.id,
+        )
 
     return UploadAssetResponse(
         storage_key=storage_key,

apps/api/app/api/routes/viral_video.py

@@ -0,0 +1,981 @@
+"""爆款视频 API 路由。
+
+v1.6 三步分步流水线端点（单次 Seedance 出片版）：
+  POST   /api/v1/viral-video/analyze-images          阶段1：创建任务 + 仅做图片/视频分析，暂停在 image_analyzed
+  POST   /api/v1/viral-video/{job_id}/generate-copy  阶段2：用户填完参数后跑意图+文案+分镜+审核，暂停在 copy_generated
+  POST   /api/v1/viral-video/{job_id}/confirm-copy   阶段3：用户确认/编辑文案后跑渲染，直到完成
+
+旧端点（兼容保留，旧前端/一键生成模式）：
+  POST   /api/v1/viral-video/generate                一键入队，前半段跑到 wait_user_confirm
+  POST   /api/v1/viral-video/{job_id}/confirm-intent 旧的意图确认后继续渲染
+
+通用：
+  GET    /api/v1/viral-video/{job_id}                查询任务状态（含 image_analysis/copy_result 编导脚本）
+  GET    /api/v1/viral-video/history                 历史记录
+  POST   /api/v1/viral-video/{job_id}/retry          重试失败任务
+  POST   /api/v1/viral-video/{job_id}/analyze-style  触发风格分析
+  GET    /api/v1/viral-video/style-templates         风格模板列表
+  WS     /api/v1/viral-video/ws/{job_id}?token=      WebSocket 进度推送
+"""
+
+from __future__ import annotations
+
+import logging
+
+from app.auth import AuthenticatedUser, get_current_user
+from app.core.celery_app import celery_app
+from app.dependencies import get_db_session
+from app.schemas.viral_video import (
+    AnalyzeImagesRequest,
+    AnalyzeStyleRequest,
+    AnalyzeStyleResponse,
+    ConfirmCopyRequest,
+    ConfirmIntentRequest,
+    CreateViralVideoRequest,
+    CreditsFormulaBreakdown,
+    EstimateCreditsRequest,
+    EstimateCreditsResponse,
+    GenerateCopyRequest,
+    RetryViralVideoRequest,
+    StyleTemplateListResponse,
+    StyleTemplateResponse,
+    ViralVideoHistoryResponse,
+    ViralVideoJobResponse,
+)
+from fastapi import APIRouter, Depends, HTTPException, WebSocket, WebSocketDisconnect
+from sqlalchemy.orm import Session
+
+from packages.adapters.sqlalchemy_impl.viral_video_repository import (
+    SQLAlchemyViralVideoJobRepository,
+    SQLAlchemyViralVideoStyleTemplateRepository,
+)
+from packages.domain.points_rules import list_viral_video_models
+from packages.domain.viral_video import ViralVideoStatus
+from packages.shared.dashscope_client import get_dashscope_client
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter()
+
+
+# ── Helpers ──────────────────────────────────────────────────────────────
+
+
+def _build_copy_result(job) -> dict | None:
+    """v1.6: 返回编导分镜脚本 CopyResult 结构（给前端/Seedance 使用）。
+
+    - 若 job.copy_result 已持久化（v1.6 worker 生成），直接返回（补 final_copy 兜底）。
+    - 否则从老字段（generated_copy_text=口播, storyboard=分镜列表, intent_result）拼装兼容结构。
+    """
+    cr = getattr(job, "copy_result", None)
+    if isinstance(cr, dict) and cr:
+        out = dict(cr)
+        # 向后兼容字段
+        voiceover = out.get("voiceover_script", "") or ""
+        out.setdefault("final_copy", voiceover)
+        out.setdefault("suggested_copy", voiceover)
+        out.setdefault("title", "")
+        return out
+    # 兼容 v1.5 老数据：storyboard 是老格式 [{order,type,description,text,duration,...}]
+    copy_text = getattr(job, "generated_copy_text", "") or ""
+    sb = getattr(job, "storyboard", None) or []
+    intent = getattr(job, "intent_result", None) or {}
+    if not copy_text and not sb:
+        return None
+    title = ""
+    if isinstance(intent, dict):
+        title = intent.get("suggested_title") or intent.get("intent", "") or ""
+    shots = []
+    for seg in sb:
+        if isinstance(seg, dict):
+            shots.append(
+                {
+                    "time_range": "",
+                    "shot_type_angle_movement": seg.get("ken_burns", ""),
+                    "scene_and_dialogue": (seg.get("text") or "")
+                    + (" " + seg.get("description", "") if seg.get("description") else ""),
+                    "action_details": "",
+                    "audio_bgm": "",
+                    "transition": seg.get("transition", "硬切"),
+                    "reference_image_index": None,
+                }
+            )
+    ratio = getattr(job, "video_ratio", None) or "9:16"
+    return {
+        "overview": {"theme": title, "total_duration": getattr(job, "duration", 15), "aspect_ratio": ratio},
+        "scene_and_lighting": "",
+        "shots": shots,
+        "hard_constraints": ["无字幕", "无水印", "人物一致性"],
+        "negative_prompts": ["字幕", "水印", "错误文字", "五官崩坏"],
+        "voiceover_script": copy_text,
+        "final_copy": copy_text,
+        "suggested_copy": copy_text,
+        "title": title,
+    }
+
+
+def _to_response(job) -> ViralVideoJobResponse:
+    return ViralVideoJobResponse(
+        id=job.id,
+        user_id=job.user_id,
+        images=job.images,
+        industry=job.industry,
+        target_customer=job.target_customer,
+        persona_id=job.persona_id,
+        viral_structure=job.viral_structure,
+        marketing_purpose=job.marketing_purpose,
+        bgm_preference=job.bgm_preference,
+        duration=job.duration or 15,
+        user_copy_text=job.user_copy_text,
+        fusion_level=job.fusion_level,
+        reference_audio_path=job.reference_audio_path,
+        reference_video_url=job.reference_video_url,
+        style_strength=job.style_strength,
+        style_guide=job.style_guide,
+        style_template_id=job.style_template_id,
+        status=job.status,
+        current_stage=getattr(job, "current_stage", "") or "",
+        phase_message=getattr(job, "phase_message", "") or "",
+        image_analysis=getattr(job, "image_analysis", None),
+        storyboard=getattr(job, "storyboard", None),
+        generated_copy_text=getattr(job, "generated_copy_text", "") or "",
+        copy_result=_build_copy_result(job),
+        voice_id=getattr(job, "voice_id", "") or "",
+        voice_source=getattr(job, "voice_source", "") or "",
+        video_ratio=getattr(job, "video_ratio", "9:16") or "9:16",
+        video_model=getattr(job, "video_model", "") or "",
+        intent_result=job.intent_result,
+        result_video_url=job.result_video_url,
+        pre_trusted_images=getattr(job, "pre_trusted_images", None) or None,
+        video_resolution=getattr(job, "video_resolution", "720p") or "720p",
+        credits_prepaid=float(getattr(job, "credits_prepaid", 0) or 0),
+        credits_cost=float(getattr(job, "credits_cost", 0) or 0),
+        error_msg=job.error_msg,
+        retry_count=job.retry_count,
+        started_at=job.started_at,
+        completed_at=job.completed_at,
+        created_at=job.created_at,
+        updated_at=job.updated_at,
+    )
+
+
+def _get_job_repo(session: Session) -> SQLAlchemyViralVideoJobRepository:
+    return SQLAlchemyViralVideoJobRepository(session)
+
+
+def _get_style_repo(session: Session) -> SQLAlchemyViralVideoStyleTemplateRepository:
+    return SQLAlchemyViralVideoStyleTemplateRepository(session)
+
+
+# ── Endpoints ────────────────────────────────────────────────────────────
+
+
+@router.post("/generate", response_model=ViralVideoJobResponse)
+def create_viral_video(
+    request: CreateViralVideoRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    session: Session = Depends(get_db_session),
+) -> ViralVideoJobResponse:
+    """创建爆款视频任务，入队 Celery 编排器。"""
+    from packages.domain.viral_video import ViralVideoJob
+
+    repo = _get_job_repo(session)
+
+    # 创建领域实体
+    job = ViralVideoJob(
+        user_id=authenticated_user.user.id,
+        images=list(request.images),
+        industry=request.industry,
+        target_customer=request.target_customer,
+        persona_id=request.persona_id,
+        viral_structure=request.viral_structure,
+        marketing_purpose=request.marketing_purpose,
+        bgm_preference=request.bgm_preference,
+        duration=request.duration or 15,
+        user_copy_text=request.user_copy_text,
+        fusion_level=request.fusion_level,
+        reference_audio_path=request.reference_audio_path,
+        reference_video_url=request.reference_video_url,
+        style_strength=request.style_strength,
+        style_template_id=request.style_template_id,
+        voice_id=getattr(request, "voice_id", "") or "",
+        voice_source=getattr(request, "voice_source", "") or "",
+        video_ratio=getattr(request, "video_ratio", "9:16") or "9:16",
+        video_model=getattr(request, "video_model", "") or "",
+        video_resolution=getattr(request, "video_resolution", "720p") or "720p",
+        copy_result=None,
+    )
+
+    # 持久化
+    repo.save(job)
+
+    # 入队 Celery 任务
+    try:
+        celery_app.send_task("worker.run_viral_video_pipeline", args=[job.id])
+        logger.info("[爆款视频] 任务已入队: job_id=%s user_id=%s", job.id, job.user_id)
+    except Exception as e:
+        logger.error("[爆款视频] 入队失败: %s", e, exc_info=True)
+        job.mark_failed(f"任务入队失败: {e}")
+        repo.update(job)
+
+    return _to_response(job)
+
+
+@router.post("/analyze-images", response_model=ViralVideoJobResponse)
+def analyze_images(
+    request: AnalyzeImagesRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    session: Session = Depends(get_db_session),
+) -> ViralVideoJobResponse:
+    """v1.5 阶段1：创建任务并仅做图片/视频 VLM 分析，跑完后状态=image_analyzed。
+
+    前端拿到 image_analysis（商品名/品牌/特征/颜色/材质等结构化结果）展示给用户；
+    用户填完营销参数后再调 /{id}/generate-copy 进入阶段2。
+    """
+    from packages.domain.viral_video import ViralVideoJob
+
+    repo = _get_job_repo(session)
+    job = ViralVideoJob(
+        user_id=authenticated_user.user.id,
+        images=list(request.images),
+        reference_video_url=request.reference_video_url or "",
+        style_template_id=request.style_template_id or "",
+        style_strength=request.style_strength or "medium",
+        voice_id=request.voice_id or "",
+        voice_source=request.voice_source or "",
+        video_ratio=request.video_ratio or "9:16",
+        video_model=request.video_model or "",
+        video_resolution=getattr(request, "video_resolution", "720p") or "720p",
+        duration=request.duration or 15,
+    )
+    repo.save(job)
+
+    try:
+        celery_app.send_task("worker.run_viral_video_analyze", args=[job.id])
+        logger.info("[爆款视频][阶段1] analyze-images 入队: job_id=%s", job.id)
+    except Exception as e:
+        logger.error("[爆款视频][阶段1] analyze-images 入队失败: %s", e, exc_info=True)
+        job.mark_failed(f"任务入队失败: {e}")
+        repo.update(job)
+
+    return _to_response(job)
+
+
+@router.post("/{job_id}/generate-copy", response_model=ViralVideoJobResponse)
+def generate_copy(
+    job_id: str,
+    request: GenerateCopyRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    session: Session = Depends(get_db_session),
+) -> ViralVideoJobResponse:
+    """v1.6 阶段2：用户填完营销参数后，跑 意图解析 → 编导分镜脚本生成 → 合规审核。
+
+    跑完后状态=copy_generated，响应 copy_result（含 overview/scene_and_lighting/shots/
+    hard_constraints/negative_prompts/voiceover_script），前端展示脚本与口播供用户编辑；
+    确认/编辑后调 /{id}/confirm-copy 进入阶段3（TTS + 单次 Seedance 出片）。
+    """
+    repo = _get_job_repo(session)
+    job = repo.get(job_id)
+    if job is None:
+        raise HTTPException(status_code=404, detail="任务不存在")
+    if job.user_id != authenticated_user.user.id:
+        raise HTTPException(status_code=403, detail="无权操作此任务")
+    if job.status not in (ViralVideoStatus.IMAGE_ANALYZED, ViralVideoStatus.PENDING, ViralVideoStatus.FAILED):
+        raise HTTPException(status_code=409, detail=f"任务当前状态 {job.status} 不能生成文案")
+
+    # 允许失败任务重试：重置
+    if job.status == ViralVideoStatus.FAILED:
+        job.retry_count += 1
+        job.error_msg = ""
+
+    # 把用户填的营销参数写到 job 上
+    job.industry = request.industry or job.industry
+    job.target_customer = request.target_customer or job.target_customer
+    job.persona_id = request.persona_id or job.persona_id
+    job.viral_structure = request.viral_structure or job.viral_structure
+    job.marketing_purpose = request.marketing_purpose or job.marketing_purpose
+    job.bgm_preference = request.bgm_preference or job.bgm_preference
+    if request.duration:
+        job.duration = max(5, min(30, int(request.duration)))
+    job.user_copy_text = request.user_copy_text if request.user_copy_text else job.user_copy_text
+    job.fusion_level = request.fusion_level or job.fusion_level
+    job.reference_audio_path = request.reference_audio_path or job.reference_audio_path
+    job.reference_video_url = request.reference_video_url or job.reference_video_url
+    job.style_strength = request.style_strength or job.style_strength
+    job.style_template_id = request.style_template_id or job.style_template_id
+    if request.style_guide is not None:
+        job.style_guide = request.style_guide
+    job.voice_id = request.voice_id or job.voice_id
+    job.voice_source = request.voice_source or job.voice_source
+    job.video_ratio = request.video_ratio or job.video_ratio or "9:16"
+    job.video_model = request.video_model or job.video_model or ""
+    job.video_resolution = getattr(request, "video_resolution", "") or job.video_resolution or "720p"
+
+    job.resume_from_image_analyzed()
+    repo.update(job)
+
+    try:
+        celery_app.send_task("worker.run_viral_video_generate_copy", args=[job.id])
+        logger.info("[爆款视频][阶段2] generate-copy 入队: job_id=%s", job.id)
+    except Exception as e:
+        logger.error("[爆款视频][阶段2] generate-copy 入队失败: %s", e, exc_info=True)
+        job.mark_failed(f"任务入队失败: {e}")
+        repo.update(job)
+
+    return _to_response(job)
+
+
+@router.post("/{job_id}/confirm-copy", response_model=ViralVideoJobResponse)
+def confirm_copy(
+    job_id: str,
+    request: ConfirmCopyRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    session: Session = Depends(get_db_session),
+) -> ViralVideoJobResponse:
+    """v1.6 阶段3：用户确认/编辑口播后开始 TTS + 单次 Seedance 生成 + 上传。"""
+    repo = _get_job_repo(session)
+    job = repo.get(job_id)
+    if job is None:
+        raise HTTPException(status_code=404, detail="任务不存在")
+    if job.user_id != authenticated_user.user.id:
+        raise HTTPException(status_code=403, detail="无权操作此任务")
+    if job.status != ViralVideoStatus.COPY_GENERATED:
+        raise HTTPException(status_code=409, detail=f"任务当前状态 {job.status} 不能确认文案（需 copy_generated）")
+
+    # 积分预扣（已扣过/重试任务跳过）
+    from app.config import settings as _settings
+
+    if _settings.points_enabled:
+        already_paid = (float(getattr(job, "credits_prepaid", 0) or 0) > 0) or (
+            float(getattr(job, "credits_cost", 0) or 0) > 0
+        )
+        if not already_paid:
+            from packages.domain.points_rules import calculate_viral_video_credits, resolve_video_dimensions
+            from packages.domain.points_service import PointsService
+
+            w, h = resolve_video_dimensions(
+                getattr(job, "video_resolution", "720p") or "720p",
+                job.video_ratio or "9:16",
+            )
+            est_credits = calculate_viral_video_credits(
+                int(job.duration or 15), w, h, job.video_model or "seedance-2.5"
+            )
+            svc = PointsService()
+            res = svc.deduct_viral_video(authenticated_user.user.id, est_credits, job.id, session)
+            if not res.get("success"):
+                balance = res.get("balance", 0)
+                raise HTTPException(
+                    status_code=402,
+                    detail={
+                        "code": "INSUFFICIENT_POINTS",
+                        "message": f"积分不足，需要 {est_credits} 积分，当前余额 {balance}",
+                        "required": est_credits,
+                        "balance": balance,
+                    },
+                )
+            job.credits_prepaid = est_credits
+            job.credits_transaction_id = res.get("transaction_id", "") or ""
+            repo.update(job)
+
+    job.resume_from_copy_generated(edited_copy=request.edited_copy or None)
+    repo.update(job)
+
+    try:
+        celery_app.send_task("worker.run_viral_video_render", args=[job.id])
+        logger.info("[爆款视频][阶段3] confirm-copy 入队: job_id=%s", job.id)
+    except Exception as e:
+        logger.error("[爆款视频][阶段3] confirm-copy 入队失败: %s", e, exc_info=True)
+        job.mark_failed(f"任务入队失败: {e}")
+        repo.update(job)
+
+    return _to_response(job)
+
+
+@router.post("/estimate-credits", response_model=EstimateCreditsResponse)
+def estimate_credits(
+    request: EstimateCreditsRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+) -> EstimateCreditsResponse:
+    """爆款视频积分预估（纯计算，不扣费、不创建任务）。
+
+    返回 estimated_credits 与 formula_breakdown（tokens / video_cost / fixed_cost /
+    profit_multiplier / model_price / width / height / fps），便于前端展示计费明细。
+    同时兼容前端传 model 或 video_model、resolution 或 video_resolution、ratio 或 video_ratio。
+    """
+    from packages.domain.points_rules import (
+        calculate_viral_video_credits_with_breakdown,
+        resolve_video_dimensions,
+    )
+
+    model = (request.model or "").strip() or "seedance-2.5"
+    resolution = (request.resolution or "").strip() or "720p"
+    ratio = (request.ratio or "").strip() or "9:16"
+    duration = int(request.duration or 15)
+
+    w, h = resolve_video_dimensions(resolution, ratio)
+    credits, bd = calculate_viral_video_credits_with_breakdown(
+        duration,
+        w,
+        h,
+        model,
+    )
+    breakdown = CreditsFormulaBreakdown(**bd)
+    return EstimateCreditsResponse(estimated_credits=credits, formula_breakdown=breakdown)
+
+
+@router.get("/history", response_model=ViralVideoHistoryResponse)
+def list_viral_video_history(
+    limit: int = 50,
+    offset: int = 0,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    session: Session = Depends(get_db_session),
+) -> ViralVideoHistoryResponse:
+    """获取用户的爆款视频历史列表。"""
+    repo = _get_job_repo(session)
+    jobs = repo.list_by_user(authenticated_user.user.id, limit=limit, offset=offset)
+    items = [_to_response(j) for j in jobs]
+    return ViralVideoHistoryResponse(items=items, total=len(items))
+
+
+@router.get("/style-templates", response_model=StyleTemplateListResponse)
+def list_style_templates(
+    session: Session = Depends(get_db_session),
+) -> StyleTemplateListResponse:
+    """获取风格模板列表。"""
+    repo = _get_style_repo(session)
+    templates = repo.list_all()
+    items = [
+        StyleTemplateResponse(
+            id=t["id"],
+            name=t["name"],
+            description=t["description"],
+            thumbnail_url=t["thumbnail_url"],
+            style_config=t["style_config"],
+        )
+        for t in templates
+    ]
+    return StyleTemplateListResponse(items=items)
+
+
+@router.get("/models")
+def list_available_models() -> dict:
+    """返回爆款视频可用模型列表（供前端模型选择器使用）。"""
+    dashscope_available = get_dashscope_client() is not None
+    models = list_viral_video_models(
+        include_placeholder=False,
+        dashscope_available=dashscope_available,
+    )
+    return {"models": models}
+
+
+@router.get("/{job_id}", response_model=ViralVideoJobResponse)
+def get_viral_video_job(
+    job_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    session: Session = Depends(get_db_session),
+) -> ViralVideoJobResponse:
+    """查询爆款视频任务状态。"""
+    repo = _get_job_repo(session)
+    job = repo.get(job_id)
+    if job is None:
+        raise HTTPException(status_code=404, detail="任务不存在")
+    if job.user_id != authenticated_user.user.id:
+        raise HTTPException(status_code=403, detail="无权查看此任务")
+    return _to_response(job)
+
+
+@router.post("/{job_id}/retry", response_model=ViralVideoJobResponse)
+def retry_viral_video_job(
+    job_id: str,
+    request: RetryViralVideoRequest | None = None,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    session: Session = Depends(get_db_session),
+) -> ViralVideoJobResponse:
+    """重试失败的爆款视频任务（也支持对僵尸/超时 running 任务强制重置后重试）。
+
+    可选 body (RetryViralVideoRequest)：若传入新的 duration/video_resolution/video_ratio/
+    video_model，会重新预估积分并与原 credits_prepaid 做差额多退少补（不足抛 402 阻止重试）；
+    不传 body 或参数无变化时，保持原参数、原预扣金额不变，仅重置状态并入队。
+    credits_prepaid 为 0 的老任务首次重试会走预扣流程（与 confirm-copy 一致）。
+    """
+    from datetime import datetime, timezone
+
+    repo = _get_job_repo(session)
+    job = repo.get(job_id)
+    if job is None:
+        raise HTTPException(status_code=404, detail="任务不存在")
+    if job.user_id != authenticated_user.user.id:
+        raise HTTPException(status_code=403, detail="无权操作此任务")
+
+    # 判定是否为僵尸 running 任务：running 超过 10 分钟且心跳停止超过 2 分钟
+    now = datetime.now(timezone.utc)
+    is_stale_running = False
+    if job.status == ViralVideoStatus.RUNNING and job.started_at is not None:
+        hb = getattr(job, "heartbeat_at", None) or job.updated_at
+        if (now - job.started_at).total_seconds() > 10 * 60 and hb is not None and (now - hb).total_seconds() > 2 * 60:
+            is_stale_running = True
+
+    if job.status != ViralVideoStatus.FAILED and not is_stale_running:
+        raise HTTPException(status_code=409, detail="只有失败或超时的任务可以重试")
+
+    # ── 参数变更检测 + 积分多退少补 ──────────────────────────────────────
+    req = request or RetryViralVideoRequest()
+    new_duration = req.duration
+    new_resolution = (req.video_resolution or "").strip() or None
+    new_ratio = (req.video_ratio or "").strip() or None
+    new_model = (req.video_model or "").strip() or None
+
+    old_duration = int(getattr(job, "duration", 15) or 15)
+    old_resolution = (getattr(job, "video_resolution", "720p") or "720p").strip() or "720p"
+    old_ratio = (getattr(job, "video_ratio", "9:16") or "9:16").strip() or "9:16"
+    old_model = (getattr(job, "video_model", "") or "").strip()
+
+    # 仅当有任意字段传入且值不同才算"参数变更"
+    param_changed = bool(
+        (new_duration is not None and int(new_duration) != old_duration)
+        or (new_resolution is not None and new_resolution != old_resolution)
+        or (new_ratio is not None and new_ratio != old_ratio)
+        or (new_model is not None and new_model != old_model)
+    )
+
+    from app.config import settings as _settings
+
+    need_points_settle = False
+    new_est = 0.0
+    if _settings.points_enabled and param_changed:
+        from packages.domain.points_rules import (
+            calculate_viral_video_credits_with_breakdown,
+            resolve_video_dimensions,
+        )
+
+        eff_dur = int(new_duration if new_duration is not None else old_duration)
+        eff_res = new_resolution if new_resolution is not None else old_resolution
+        eff_ratio = new_ratio if new_ratio is not None else old_ratio
+        eff_model = new_model if new_model is not None else (old_model or "seedance-2.5")
+        w, h = resolve_video_dimensions(eff_res, eff_ratio)
+        new_est, _ = calculate_viral_video_credits_with_breakdown(eff_dur, w, h, eff_model or "seedance-2.5")
+        need_points_settle = True
+
+    # 写入新参数（即使不开 points 也要允许用户重试时改参数）
+    if new_duration is not None:
+        job.duration = max(5, min(30, int(new_duration)))
+    if new_resolution is not None:
+        job.video_resolution = new_resolution
+    if new_ratio is not None:
+        job.video_ratio = new_ratio
+    if new_model is not None:
+        job.video_model = new_model
+
+    if need_points_settle:
+        from packages.domain.points_service import PointsService
+
+        old_prepaid = float(getattr(job, "credits_prepaid", 0) or 0)
+        svc = PointsService()
+        diff = round(new_est - old_prepaid, 2)
+        if abs(diff) >= 0.01:
+            if diff > 0:
+                # 新预扣更多：补扣差额
+                res = svc.deduct_viral_video(authenticated_user.user.id, diff, job.id, session)
+                if not res.get("success"):
+                    balance = res.get("balance", 0)
+                    raise HTTPException(
+                        status_code=402,
+                        detail={
+                            "code": "INSUFFICIENT_POINTS",
+                            "message": f"重试参数变更后需补扣 {diff} 积分，余额不足（当前 {balance}，需 {new_est}）",
+                            "required": new_est,
+                            "balance": balance,
+                            "delta": diff,
+                        },
+                    )
+                job.credits_prepaid = round(old_prepaid + diff, 2)
+                logger.info(
+                    "[爆款视频][retry] 补扣差额 job_id=%s diff=%.2f new_prepaid=%.2f",
+                    job.id,
+                    diff,
+                    job.credits_prepaid,
+                )
+            else:
+                # 新预扣更少：退还差额
+                refund = round(-diff, 2)
+                txn_id = getattr(job, "credits_transaction_id", "") or ""
+                svc.refund_points(
+                    user_id=authenticated_user.user.id,
+                    amount=refund,
+                    source="viral_video",
+                    db=session,
+                    ref_id=txn_id or job.id,
+                    description="爆款视频重试参数变更退费",
+                )
+                job.credits_prepaid = round(old_prepaid - refund, 2)
+                logger.info(
+                    "[爆款视频][retry] 退还差额 job_id=%s refund=%.2f new_prepaid=%.2f",
+                    job.id,
+                    refund,
+                    job.credits_prepaid,
+                )
+        # 差额为 0 则不调整
+
+    # 重置状态
+    job.retry_count += 1
+    job.status = ViralVideoStatus.PENDING
+    job.error_msg = "" if not is_stale_running else "任务执行超时，已重置重试"
+    job.started_at = None
+    job.completed_at = None
+    job.current_stage = ""
+    job.phase_message = ""
+    job.heartbeat_at = None
+    repo.update(job)
+
+    # 重新入队
+    try:
+        celery_app.send_task("worker.run_viral_video_pipeline", args=[job.id])
+        logger.info(
+            "[爆款视频] 重试入队: job_id=%s retry_count=%d stale=%s params_changed=%s",
+            job.id,
+            job.retry_count,
+            is_stale_running,
+            param_changed,
+        )
+    except Exception as e:
+        logger.error("[爆款视频] 重试入队失败: %s", e, exc_info=True)
+        job.mark_failed(f"重试入队失败: {e}")
+        repo.update(job)
+
+    return _to_response(job)
+
+
+@router.post("/{job_id}/confirm-intent", response_model=ViralVideoJobResponse)
+def confirm_intent(
+    job_id: str,
+    request: ConfirmIntentRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    session: Session = Depends(get_db_session),
+) -> ViralVideoJobResponse:
+    """用户确认/修改 AI 生成的意图文案，恢复流水线。"""
+    repo = _get_job_repo(session)
+    job = repo.get(job_id)
+    if job is None:
+        raise HTTPException(status_code=404, detail="任务不存在")
+    if job.user_id != authenticated_user.user.id:
+        raise HTTPException(status_code=403, detail="无权操作此任务")
+    if job.status != ViralVideoStatus.WAIT_USER_CONFIRM:
+        raise HTTPException(status_code=409, detail="任务当前不在等待确认状态")
+
+    # 更新文案
+    if request.confirmed_copy:
+        job.user_copy_text = request.confirmed_copy
+
+    # 恢复流水线
+    job.resume_from_confirm()
+    repo.update(job)
+
+    # 从断点恢复 Celery 任务
+    try:
+        celery_app.send_task("worker.resume_viral_video_pipeline", args=[job.id])
+        logger.info("[爆款视频] 意图确认，恢复流水线: job_id=%s", job.id)
+    except Exception as e:
+        logger.error("[爆款视频] 恢复流水线失败: %s", e, exc_info=True)
+        job.mark_failed(f"恢复流水线失败: {e}")
+        repo.update(job)
+
+    return _to_response(job)
+
+
+@router.post("/{job_id}/analyze-style", response_model=AnalyzeStyleResponse)
+def analyze_style(
+    job_id: str,
+    request: AnalyzeStyleRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    session: Session = Depends(get_db_session),
+) -> AnalyzeStyleResponse:
+    """触发参考视频风格分析（独立步骤，可在生成前单独调用）。"""
+    repo = _get_job_repo(session)
+    job = repo.get(job_id)
+    if job is None:
+        raise HTTPException(status_code=404, detail="任务不存在")
+    if job.user_id != authenticated_user.user.id:
+        raise HTTPException(status_code=403, detail="无权操作此任务")
+
+    # 更新参考视频 URL
+    job.reference_video_url = request.reference_video_url
+    if request.style_template_id:
+        job.style_template_id = request.style_template_id
+    repo.update(job)
+
+    # 入队风格分析任务
+    try:
+        celery_app.send_task("worker.run_video_style_analysis", args=[job.id])
+        logger.info("[爆款视频] 风格分析入队: job_id=%s", job.id)
+    except Exception as e:
+        logger.error("[爆款视频] 风格分析入队失败: %s", e, exc_info=True)
+
+    return AnalyzeStyleResponse(
+        job_id=job.id,
+        status="analyzing",
+        style_guide=None,
+    )
+
+
+# ── WebSocket 进度推送 ──────────────────────────────────────────────────
+
+
+def _ws_authenticate_user(token: str):
+    """从 token 字符串解析用户（复用 HTTP Bearer 的解码 + 黑名单逻辑）。
+
+    WebSocket 握手阶段不能发自定义 Authorization header，
+    因此统一通过 query 参数 ``?token=...`` 传 JWT。
+    """
+    from app.auth import _decode_user_token
+    from app.dependencies import get_user_repository
+
+    if not token:
+        return None
+    try:
+        payload = _decode_user_token(token)
+    except Exception:
+        return None
+    user_id = payload.get("sub")
+    if not isinstance(user_id, str) or not user_id:
+        return None
+    # 同步场景下手动拉 repository 实例
+    from app.db import SessionLocal
+
+    session = SessionLocal()
+    try:
+        user_repo = get_user_repository(session)
+        user = user_repo.find_by_id(user_id)
+        return user
+    finally:
+        session.close()
+
+
+async def _run_pubsub_forwarder(
+    websocket, redis_lib, settings, job_id: str
+) -> None:  # pragma: no cover - integration tested (real Redis + thread)
+    """订阅 Redis 频道并把消息桥接到 WebSocket，终态消息后自动关闭。
+
+    该函数封装了线程 + asyncio.Queue 桥接逻辑，在单测中可被整体替换为桩，
+    避免引入真实 Redis 与线程调度的不确定性。
+    """
+    import asyncio
+    import json
+    import threading
+
+    r = redis_lib.from_url(settings.REDIS_URL, decode_responses=True)
+    pubsub = r.pubsub(ignore_subscribe_messages=True)
+    channel = f"viral_video:{job_id}"
+    pubsub.subscribe(channel)
+
+    loop = asyncio.get_running_loop()
+    queue: asyncio.Queue = asyncio.Queue(maxsize=64)
+    stop_event = asyncio.Event()
+
+    def _reader() -> None:
+        try:
+            while not stop_event.is_set():
+                msg = pubsub.get_message(timeout=0.5)
+                if msg is None or msg.get("type") != "message":
+                    continue
+                raw = msg.get("data")
+                if not isinstance(raw, str):
+                    continue
+                try:
+                    payload = json.loads(raw)
+                except Exception:
+                    payload = {"type": "viral_video:progress", "data": {"raw": raw}}
+                loop.call_soon_threadsafe(queue.put_nowait, payload)
+                if payload.get("type") in ("viral_video:completed", "viral_video:failed"):
+                    loop.call_soon_threadsafe(stop_event.set)
+                    break
+        except Exception as e:
+            logger.warning("[爆款视频WS] pubsub reader 异常退出: %s", e)
+            loop.call_soon_threadsafe(stop_event.set)
+
+    try:
+        reader_thread = threading.Thread(target=_reader, name=f"viral-video-ws-{job_id}", daemon=True)
+        reader_thread.start()
+
+        while not stop_event.is_set():
+            try:
+                payload = await asyncio.wait_for(queue.get(), timeout=1.0)
+            except asyncio.TimeoutError:
+                continue
+            try:
+                await websocket.send_json(payload)
+            except Exception:
+                break
+            if payload.get("type") in ("viral_video:completed", "viral_video:failed"):
+                break
+    except WebSocketDisconnect:
+        logger.info("[爆款视频WS] 客户端断开: job_id=%s", job_id)
+    except Exception as e:
+        logger.error("[爆款视频WS] 转发异常: %s", e, exc_info=True)
+        try:
+            await websocket.send_json({"type": "viral_video:error", "message": f"服务异常: {e}"})
+        except Exception:
+            pass
+    finally:
+        stop_event.set()
+        try:
+            pubsub.unsubscribe(channel)
+            pubsub.close()
+        except Exception:
+            pass
+        try:
+            r.close()
+        except Exception:
+            pass
+        try:
+            await websocket.close()
+        except Exception:
+            pass
+
+
+@router.websocket("/ws/{job_id}")
+async def viral_video_websocket(websocket: WebSocket, job_id: str) -> None:
+    """WebSocket 桥接：订阅 Redis `viral_video:{job_id}` 频道并转发给前端。
+
+    认证：通过 ``?token=<jwt>`` query 参数传 JWT（浏览器 WS 握手不支持自定义 header）。
+    事件类型：
+      - viral_video:progress    中间进度（progress: 0-100）
+      - viral_video:wait_user   等待用户确认意图文案
+      - viral_video:completed   任务完成（data.video_url）
+      - viral_video:failed      任务失败（data.error）
+      - viral_video:error       服务端错误（如鉴权失败 / job 不存在 / 无权限）
+    """
+
+    import redis as redis_lib
+    from app.config import settings
+
+    # ── 1. 鉴权 ──────────────────────────────────────────────────────
+    token = websocket.query_params.get("token", "")
+    user = _ws_authenticate_user(token)
+    if user is None:
+        await websocket.close(code=4401, reason="Unauthorized")
+        return
+
+    # ── 2. 校验 job 归属 ─────────────────────────────────────────────
+    from app.db import SessionLocal
+
+    session = SessionLocal()
+    try:
+        job_repo = SQLAlchemyViralVideoJobRepository(session)
+        job = job_repo.get(job_id)
+        if job is None:
+            await websocket.close(code=4404, reason="Job not found")
+            return
+        if job.user_id != user.id:
+            await websocket.close(code=4403, reason="Forbidden")
+            return
+    finally:
+        session.close()
+
+    await websocket.accept()
+
+    # ── 3. 发送一条初始状态（前端连接后立即拿到当前进度） ────────────
+    try:
+        session = SessionLocal()
+        job_repo = SQLAlchemyViralVideoJobRepository(session)
+        job = job_repo.get(job_id)
+        if job is not None:
+            status_val = job.status.value if hasattr(job.status, "value") else str(job.status)
+            initial = {
+                "type": "viral_video:progress",
+                "job_id": job_id,
+                "stage": _stage_from_status(job),
+                "progress": _estimate_progress(job),
+                "message": _initial_message(job),
+                "data": {"status": status_val},
+            }
+            await websocket.send_json(initial)
+            # 已经终态 → 再发一条终态事件后立即关闭，避免占连接
+            if job.is_terminal:
+                is_completed = status_val == "completed"
+                terminal_type = "viral_video:completed" if is_completed else "viral_video:failed"
+                terminal_data = (
+                    {"video_url": job.result_video_url or ""} if is_completed else {"error": job.error_msg or ""}
+                )
+                await websocket.send_json(
+                    {
+                        "type": terminal_type,
+                        "job_id": job_id,
+                        "stage": "",
+                        "progress": 100 if is_completed else 0,
+                        "message": "视频生成完成" if is_completed else "任务失败",
+                        "data": terminal_data,
+                    }
+                )
+                await websocket.close()
+                return
+        session.close()
+    except Exception as e:
+        logger.warning("[爆款视频WS] 发送初始状态失败: %s", e)
+        try:
+            session.close()
+        except Exception:
+            pass
+
+    # ── 4. 订阅 Redis 频道并转发 ─────────────────────────────────────
+    # redis-py 的 pubsub 是同步阻塞的，放到线程里跑，通过 asyncio.Queue 桥接到 event loop。
+    # 该段依赖真实 Redis + 线程调度，属于集成测试范围，单测通过桩替换。
+    await _run_pubsub_forwarder(websocket, redis_lib, settings, job_id)
+
+
+def _job_status(job) -> str:
+    return job.status.value if hasattr(job.status, "value") else str(job.status)
+
+
+# 初始快照的 stage 推断：领域对象不持久化 stage，
+# 只能根据 status 给一个占位，后续 worker 推送的真实进度事件会覆盖。
+_STATUS_STAGE = {
+    "pending": "",
+    "running": "",
+    "image_analyzed": "image_analysis",
+    "copy_generated": "review",
+    "wait_user_confirm": "intent_parsing",
+    "completed": "uploading",
+    "failed": "",
+    "cancelled": "",
+}
+
+_STATUS_PROGRESS = {
+    "pending": 0.0,
+    "running": 5.0,
+    "image_analyzed": 15.0,
+    "copy_generated": 70.0,
+    "wait_user_confirm": 35.0,
+    "completed": 100.0,
+    "failed": 0.0,
+    "cancelled": 0.0,
+}
+
+_STATUS_MESSAGE = {
+    "pending": "任务已创建，等待执行",
+    "running": "任务执行中",
+    "image_analyzed": "图片分析完成，等待填写营销参数",
+    "copy_generated": "文案与分镜已生成，等待确认文案",
+    "wait_user_confirm": "等待用户确认意图文案",
+    "completed": "视频生成完成",
+    "failed": "任务失败",
+    "cancelled": "任务已取消",
+}
+
+
+def _stage_from_status(job) -> str:
+    return _STATUS_STAGE.get(_job_status(job), "")
+
+
+def _estimate_progress(job) -> float:
+    """根据 status 粗略估算百分比（0-100），用于连接初始快照；
+    连接建立后由 Redis 推送的真实事件持续更新。
+    """
+    return _STATUS_PROGRESS.get(_job_status(job), 5.0)
+
+
+def _initial_message(job) -> str:
+    """给新连接的前端一个可读的初始状态文案。"""
+    status_val = _job_status(job)
+    if status_val == "failed" and job.error_msg:
+        return f"任务失败: {job.error_msg}"
+    return _STATUS_MESSAGE.get(status_val, "任务准备中")

apps/api/app/core/task_enqueue.py

@@ -6,7 +6,7 @@ from app.core.celery_app import celery_app
 logger = logging.getLogger(__name__)
 
 # ── 限流阈值常量（全系统统一管理，不要在业务代码里硬编码） ──
-USER_PENDING_LIMIT = 3  # 单用户 pending 上限
+USER_PENDING_LIMIT = 20  # 单用户 pending 上限（#2098: 从 3 提到 20，支持批量任务自动排队）
 GLOBAL_PENDING_LIMIT = 20  # 全局 pending 上限
 WORKER_CONCURRENCY = 4  # worker 渲染并发数（infra/docker/compose.yml WORKER_CONCURRENCY 默认值）
 
@@ -154,19 +154,18 @@ def check_queue_limits(
     user_pending_limit: int = USER_PENDING_LIMIT,
     global_pending_limit: int = GLOBAL_PENDING_LIMIT,
 ) -> None:
-    """检查队列限流（预检查用，任务创建前调用），超限抛对应异常。
+    """检查队列限流（预检查用，任务创建前调用）。
 
-    边界语义：>= 上限即拒绝（达到上限就不能再加新任务）。
+    #2098 语义变更：用户级限流改为软提示，不再抛异常拒绝；仅全局硬上限抛 GlobalQueueFull。
 
     Args:
-        user_id: 用户 ID
+        user_id: 用户 ID（保留参数，当前不做用户级硬拒）
         generation_task_repository: 任务仓储
-        user_pending_limit: 单用户 pending 上限，默认 USER_PENDING_LIMIT
+        user_pending_limit: 单用户 pending 上限（保留，当前未硬拒）
         global_pending_limit: 全局 pending 上限，默认 GLOBAL_PENDING_LIMIT
 
     Raises:
-        GlobalQueueFull: 全局超限时抛出（优先级更高，先查全局）
-        UserPendingLimitExceeded: 用户超限时抛出
+        GlobalQueueFull: 全局超限时抛出
     """
     # 先查全局（系统级保护优先级更高）
     global_pending = generation_task_repository.count_pending_total()
@@ -179,17 +178,9 @@ def check_queue_limits(
         )
         raise GlobalQueueFull(pending_count=global_pending, limit=global_pending_limit)
 
-    # 再查用户级
-    if user_id:
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
-        if user_pending >= user_pending_limit:
-            logger.warning(
-                "[队列限流] 用户 pending 任务数超限: user_id=%s, count=%d/%d",
-                user_id,
-                user_pending,
-                user_pending_limit,
-            )
-            raise UserPendingLimitExceeded(user_id=user_id, pending_count=user_pending, limit=user_pending_limit)
+    # #2098: 用户级限流改为软提示，不在预检查阶段拒绝（超额任务仍入队排队）。
+    # 真正的系统保护由全局 GLOBAL_PENDING_LIMIT 硬上限承担。
+    # UserPendingLimitExceeded 保留以兼容历史 import/except，但预检查与 safe_enqueue 均不再 raise。
 
 
 def _mark_task_failed_safely(
@@ -246,7 +237,6 @@ def safe_enqueue_generation_task(
 
     Raises:
         GlobalQueueFull: 全局 pending 超限时抛出，任务会被标记为 failed
-        UserPendingLimitExceeded: 用户 pending 超限时抛出，任务会被标记为 failed
     """
     # ── 入队前检查：任务已是 pending，用 > 判断（包含当前任务） ──
 
@@ -263,19 +253,18 @@ def safe_enqueue_generation_task(
         _mark_task_failed_safely(task, generation_task_repository, log_prefix, str(exc))
         raise exc
 
-    # 用户级限流检查（传了 user_id 才做）
+    # Bug B #2098: 用户级限流改为软提示，不再硬拒；所有任务都入队等待 worker 自然消费。
+    # user_pending_limit 作为兜底阈值保留（默认 20），达到时打 warning 日志但仍入队，
+    # 避免极端情况下恶意用户无限堆积任务。真正的系统保护由全局 GLOBAL_PENDING_LIMIT 承担。
     if user_id:
         user_pending = generation_task_repository.count_pending_by_user(user_id)
         if user_pending > user_pending_limit:
             logger.warning(
-                "[队列限流] 用户 pending 任务数超限(入队前): user_id=%s, count=%d/%d",
+                "[队列限流] 用户 pending 任务数超过软上限(入队): user_id=%s, count=%d/%d, 仍允许入队排队",
                 user_id,
                 user_pending,
                 user_pending_limit,
             )
-            exc = UserPendingLimitExceeded(user_id=user_id, pending_count=user_pending, limit=user_pending_limit)
-            _mark_task_failed_safely(task, generation_task_repository, log_prefix, str(exc))
-            raise exc
 
     # ── 发送 Celery 任务 ──
     try:
@@ -317,16 +306,18 @@ def safe_enqueue_generation_task(
     user_after = generation_task_repository.count_pending_by_user(user_id) if user_id else 0
 
     global_over = global_after > global_pending_limit
-    user_over = bool(user_id and user_after > user_pending_limit)
-
-    if global_over or user_over:
-        if global_over:
-            reason = f"全局 pending 超限(入队后): {global_after}/{global_pending_limit}"
-            exc = GlobalQueueFull(pending_count=global_after, limit=global_pending_limit)
-        else:
-            reason = f"用户 pending 超限(入队后): {user_after}/{user_pending_limit}"
-            exc = UserPendingLimitExceeded(user_id=user_id, pending_count=user_after, limit=user_pending_limit)
+    # Bug B #2098: 用户超限仅日志警告，不回滚任务
+    if user_id and user_after > user_pending_limit:
+        logger.warning(
+            "[队列限流] 用户 pending 超软上限(入队后): user_id=%s, count=%d/%d",
+            user_id,
+            user_after,
+            user_pending_limit,
+        )
 
+    if global_over:
+        reason = f"全局 pending 超限(入队后): {global_after}/{global_pending_limit}"
+        exc = GlobalQueueFull(pending_count=global_after, limit=global_pending_limit)
         logger.warning(
             "[队列限流] %s, task_id=%s, user_id=%s — 回滚状态为 failed",
             reason,

apps/api/app/db.py

@@ -7,9 +7,9 @@ from packages.adapters.sqlalchemy_impl import (
 )
 from packages.adapters.sqlalchemy_impl.schema_guard import assert_auto_create_schema_allowed
 
-ensure_database_exists(settings.DATABASE_URL)
+ensure_database_exists(settings.effective_database_url)
 engine, SessionLocal = build_session_factory(
-    settings.DATABASE_URL,
+    settings.effective_database_url,
     pool_size=settings.DATABASE_POOL_SIZE,
     max_overflow=settings.DATABASE_MAX_OVERFLOW,
     pool_timeout=settings.DATABASE_POOL_TIMEOUT,

apps/api/app/dependencies.py

@@ -56,7 +56,7 @@ from packages.adapters.sqlalchemy_impl.voice_library_repository import (
 from packages.ports.tag_repository import TagRepository
 from packages.ports.user_repository import UserRepository
 
-_engine, _SessionLocal = build_session_factory(settings.DATABASE_URL)
+_engine, _SessionLocal = build_session_factory(settings.effective_database_url)
 
 
 def get_db_session() -> Generator[Session, None, None]:

apps/api/app/schemas/generation_task.py

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

apps/api/app/schemas/points.py

@@ -13,9 +13,9 @@ from pydantic import BaseModel, Field
 class PointsBalanceResponse(BaseModel):
     """积分余额 + 会员状态"""
 
-    balance: int = Field(..., description="当前积分余额")
-    total_earned: int = Field(..., description="累计获得积分")
-    total_spent: int = Field(..., description="累计消耗积分")
+    balance: float = Field(..., description="当前积分余额")
+    total_earned: float = Field(..., description="累计获得积分")
+    total_spent: float = Field(..., description="累计消耗积分")
     is_member: bool = Field(default=False, description="是否付费会员")
     member_type: Optional[str] = Field(None, description="会员类型: monthly/quarterly/yearly")
     member_expires_at: Optional[datetime] = Field(None, description="会员到期时间")
@@ -30,8 +30,8 @@ class PointsTransactionItem(BaseModel):
     id: str
     type: str = Field(..., description="类型: add/deduct")
     source: str = Field(..., description="来源场景")
-    amount: int
-    balance_after: int
+    amount: float
+    balance_after: float
     description: str = ""
     ref_id: str = ""
     created_at: Optional[str] = None
@@ -99,9 +99,9 @@ class PointsCheckResponse(BaseModel):
     """消费前余额检查响应"""
 
     allowed: bool
-    required_points: int
-    current_balance: int
-    remaining_after: int
+    required_points: float
+    current_balance: float
+    remaining_after: float
     is_free_quota: bool = False
 
 
@@ -112,7 +112,7 @@ class PointsDeductRequest(BaseModel):
     """积分扣减请求"""
 
     scene_key: str
-    amount: int
+    amount: float
     description: Optional[str] = ""
     ref_id: Optional[str] = ""
 
@@ -170,7 +170,7 @@ class MembershipStatusResponse(BaseModel):
     is_member: bool
     member_type: Optional[str] = None
     member_expires_at: Optional[datetime] = None
-    points_balance: int
+    points_balance: float
     max_resolution: str = Field(
         default="1080p",
         description="可用最高分辨率: 720p(free) / 1080p(paid)",

apps/api/app/schemas/upload.py

@@ -29,6 +29,8 @@ class DirectUploadPrepareResponse(BaseModel):
     duplicated: bool = False
     skip_transfer: bool = False
     asset_id: str = ""
+    # duplicated=true 时填充已存在素材的公网 URL，前端可直接用而不必再调 complete
+    url: str = Field(default="", description="duplicated=true 时已存在素材的公网 URL")
 
 
 class DirectUploadCompleteRequest(BaseModel):

apps/api/app/schemas/viral_video.py

@@ -0,0 +1,320 @@
+"""爆款视频 API schemas (v1.6 单次 Seedance 出片版)。"""
+
+from __future__ import annotations
+
+from datetime import datetime
+
+from pydantic import BaseModel, Field, field_validator
+
+# -- 枚举常量 --
+
+VALID_FUSION_LEVELS = ("ai_full", "full_ai", "ai_polish", "user_primary")
+VALID_STYLE_STRENGTHS = ("light", "medium", "strict")
+VALID_STAGES = (
+    "image_analysis",
+    "video_analysis",
+    "intent_parsing",
+    "script_generation",
+    "review",
+    "tts",
+    "rendering",
+    "uploading",
+)
+VALID_VIDEO_RATIOS = ("9:16", "16:9", "1:1", "4:3", "3:4", "21:9")
+VALID_DURATIONS = (5, 10, 15, 20, 25, 30)
+VALID_VIDEO_RESOLUTIONS = ("480p", "720p", "1080p", "普清", "高清", "超清")
+
+
+# -- 编导脚本结构（v1.6） --
+
+
+class ShotScript(BaseModel):
+    """逐镜头分镜。"""
+
+    time_range: str = Field(default="", description="时间区间，如 0-3秒")
+    shot_type_angle_movement: str = Field(default="", description="景别/角度/运镜，如『近景俯拍45度，缓慢推镜』")
+    scene_and_dialogue: str = Field(default="", description="场景描述+口播台词")
+    action_details: str = Field(default="", description="人物动作、表情、物品操作细节")
+    audio_bgm: str = Field(default="", description="环境音+BGM提示")
+    transition: str = Field(default="硬切", description="转场方式：硬切/淡入淡出/叠化")
+    reference_image_index: int | None = Field(
+        default=None, description="参考图片索引（0-based，对应上传的第几张产品图）"
+    )
+
+
+class CopyResultOverview(BaseModel):
+    theme: str = ""
+    total_duration: int = 15
+    aspect_ratio: str = "9:16"
+
+
+class CopyResult(BaseModel):
+    """v1.6 编导分镜脚本结构（给前端 + Seedance 用）。"""
+
+    overview: CopyResultOverview = Field(default_factory=CopyResultOverview)
+    scene_and_lighting: str = ""
+    shots: list[ShotScript] = Field(default_factory=list)
+    hard_constraints: list[str] = Field(default_factory=list)
+    negative_prompts: list[str] = Field(default_factory=list)
+    voiceover_script: str = Field(
+        default="", description="纯口播对白，从各镜 scene_and_dialogue 的对白部分拼接，供 TTS 使用"
+    )
+    # 向后兼容：final_copy = voiceover_script
+    final_copy: str = ""
+    suggested_copy: str = ""
+    title: str = ""
+
+
+# -- Request Schemas --
+
+
+class CreateViralVideoRequest(BaseModel):
+    """旧接口：一键创建（保留兼容）。"""
+
+    images: list[str] = Field(..., min_length=1, max_length=20)
+    industry: str = ""
+    target_customer: str = ""
+    persona_id: str = ""
+    viral_structure: str = ""
+    marketing_purpose: str = ""
+    bgm_preference: str = ""
+    duration: int = Field(default=15, ge=5, le=30, description="视频时长（秒），5-30")
+    user_copy_text: str = ""
+    fusion_level: str = "ai_polish"
+    reference_audio_path: str = ""
+    reference_video_url: str = ""
+    style_strength: str = "medium"
+    style_template_id: str = ""
+    voice_id: str = ""
+    voice_source: str = ""
+    video_ratio: str = "9:16"
+    video_model: str = ""
+    video_resolution: str = "720p"
+
+    @field_validator("fusion_level")
+    @classmethod
+    def _v_fl(cls, v: str) -> str:
+        if v == "full_ai":
+            return "ai_full"
+        if v not in VALID_FUSION_LEVELS:
+            raise ValueError(f"fusion_level must be one of {VALID_FUSION_LEVELS}")
+        return v
+
+    @field_validator("style_strength")
+    @classmethod
+    def _v_ss(cls, v: str) -> str:
+        if v not in VALID_STYLE_STRENGTHS:
+            raise ValueError(f"style_strength must be one of {VALID_STYLE_STRENGTHS}")
+        return v
+
+
+class AnalyzeImagesRequest(BaseModel):
+    """v1.5+ 阶段1：创建任务 + 图片/视频分析。"""
+
+    images: list[str] = Field(..., min_length=1, max_length=30)
+    reference_video_url: str = ""
+    style_template_id: str = ""
+    style_strength: str = "medium"
+    voice_id: str = ""
+    voice_source: str = ""
+    video_ratio: str = "9:16"
+    video_model: str = ""
+    video_resolution: str = "720p"
+    duration: int = Field(default=15, ge=5, le=30)
+
+
+class GenerateCopyRequest(BaseModel):
+    """v1.5+ 阶段2：填完营销参数，生成编导脚本。"""
+
+    industry: str = ""
+    target_customer: str = ""
+    persona_id: str = ""
+    viral_structure: str = ""
+    marketing_purpose: str = ""
+    bgm_preference: str = ""
+    duration: int = Field(default=15, ge=5, le=30)
+    user_copy_text: str = ""
+    fusion_level: str = "ai_polish"
+    reference_audio_path: str = ""
+    reference_video_url: str = ""
+    style_strength: str = "medium"
+    style_template_id: str = ""
+    style_guide: dict | None = None
+    voice_id: str = ""
+    voice_source: str = ""
+    video_ratio: str = "9:16"
+    video_model: str = ""
+    video_resolution: str = "720p"
+
+    @field_validator("fusion_level")
+    @classmethod
+    def _v_fl(cls, v: str) -> str:
+        if v == "full_ai":
+            return "ai_full"
+        if v not in VALID_FUSION_LEVELS:
+            raise ValueError(f"fusion_level must be one of {VALID_FUSION_LEVELS}")
+        return v
+
+    @field_validator("style_strength")
+    @classmethod
+    def _v_ss(cls, v: str) -> str:
+        if v not in VALID_STYLE_STRENGTHS:
+            raise ValueError(f"style_strength must be one of {VALID_STYLE_STRENGTHS}")
+        return v
+
+
+class ConfirmCopyRequest(BaseModel):
+    """v1.5+ 阶段3：用户确认/编辑口播后开始渲染（TTS+单次Seedance）。"""
+
+    edited_copy: str = Field(default="", description="用户编辑后的口播文案；为空则用 AI 生成的 voiceover_script")
+
+
+class ConfirmIntentRequest(BaseModel):
+    """旧 confirm-intent（兼容）。"""
+
+    confirmed_copy: str = ""
+    adjustments: str = ""
+
+
+class AnalyzeStyleRequest(BaseModel):
+    reference_video_url: str = Field(..., description="参考视频 URL")
+    style_template_id: str = ""
+
+
+# -- Response Schemas --
+
+
+class ViralVideoJobResponse(BaseModel):
+    """爆款视频任务响应（v1.6 包含 copy_result 编导脚本结构）。"""
+
+    id: str
+    user_id: str
+    images: list[str] = Field(default_factory=list)
+    industry: str = ""
+    target_customer: str = ""
+    persona_id: str = ""
+    viral_structure: str = ""
+    marketing_purpose: str = ""
+    bgm_preference: str = ""
+    duration: int = 15
+    user_copy_text: str = ""
+    fusion_level: str = "ai_polish"
+    reference_audio_path: str = ""
+    reference_video_url: str = ""
+    style_strength: str = "medium"
+    style_guide: dict | None = None
+    style_template_id: str = ""
+    status: str
+    current_stage: str = (
+        ""  # 细粒度阶段 snake_case（analyzing_images/parsing_intent/generating_script/reviewing/tts_synthesizing/rendering_video/uploading）
+    )
+    phase_message: str = ""  # 中文阶段提示文案（前端轮询/SSE 直接展示）
+    image_analysis: dict | None = None
+    # v1.6 编导脚本（推荐前端使用）
+    copy_result: dict | None = None
+    # v1.5 兼容字段
+    storyboard: list | None = None
+    generated_copy_text: str = ""
+    # 音色/视频参数
+    voice_id: str = ""
+    voice_source: str = ""
+    video_ratio: str = "9:16"
+    video_model: str = ""
+    intent_result: dict | None = None
+    result_video_url: str = ""
+    pre_trusted_images: list[str] | None = None
+    video_resolution: str = "720p"
+    credits_prepaid: float = 0.0
+    credits_cost: float = 0.0
+    error_msg: str = ""
+    retry_count: int = 0
+    started_at: datetime | None = None
+    completed_at: datetime | None = None
+    created_at: datetime | None = None
+    updated_at: datetime | None = None
+
+
+class ViralVideoHistoryResponse(BaseModel):
+    items: list[ViralVideoJobResponse]
+    total: int
+
+
+class StyleTemplateResponse(BaseModel):
+    id: str
+    name: str
+    description: str = ""
+    thumbnail_url: str = ""
+    style_config: dict = Field(default_factory=dict)
+
+
+class StyleTemplateListResponse(BaseModel):
+    items: list[StyleTemplateResponse]
+
+
+class AnalyzeStyleResponse(BaseModel):
+    job_id: str
+    status: str
+    style_guide: dict | None = None
+
+
+# -- 积分预估 --
+
+
+class EstimateCreditsRequest(BaseModel):
+    """爆款视频积分预估请求。
+
+    前端可传 model 或 video_model（兼容老字段）；resolution/ratio/duration 为预估所需参数。
+    """
+
+    model: str = Field(default="", alias="video_model")
+    resolution: str = Field(default="720p", alias="video_resolution")
+    ratio: str = Field(default="9:16", alias="video_ratio")
+    duration: int = Field(default=15, ge=5, le=30)
+
+    model_config = {"populate_by_name": True}
+
+
+class CreditsFormulaBreakdown(BaseModel):
+    """爆款视频积分计费公式明细（前端展示用）。"""
+
+    tokens: float = Field(..., description="估算视频 tokens 数 (duration*width*height*fps/1024)")
+    video_cost: float = Field(..., description="视频生成成本（元）= tokens/1e6 * model_price")
+    fixed_cost: float = Field(..., description="固定成本（元），含 VLM/LLM/TTS/OSS/服务器")
+    profit_multiplier: float = Field(..., description="利润系数（默认 1.3）")
+    model_price: float = Field(..., description="模型单价（元/百万 tokens）")
+    width: int = Field(..., description="视频宽度像素")
+    height: int = Field(..., description="视频高度像素")
+    fps: int = Field(..., description="视频帧率")
+
+
+class EstimateCreditsResponse(BaseModel):
+    """爆款视频积分预估响应。"""
+
+    estimated_credits: float
+    formula_breakdown: CreditsFormulaBreakdown = Field(..., description="计费公式明细")
+
+
+class RetryViralVideoRequest(BaseModel):
+    """重试爆款视频任务的请求体（可选，允许改参数重新预估积分多退少补）。
+
+    不传 body 或字段全缺省：保持原参数、不重新扣点，走默认重置+入队逻辑。
+    传入新的 duration/video_resolution/video_ratio/video_model：重新预估积分，
+    与原 credits_prepaid 比较后多退少补（差额补扣不足抛 402）。
+    """
+
+    duration: int | None = Field(default=None, ge=5, le=30, description="重试时新的视频时长（秒）")
+    video_resolution: str | None = Field(default=None, description="重试时新的分辨率，如 720p/1080p")
+    video_ratio: str | None = Field(default=None, description="重试时新的画幅比，如 9:16/16:9")
+    video_model: str | None = Field(default=None, description="重试时新的视频模型，如 seedance-2.5")
+
+
+# -- WebSocket 事件 Schema --
+
+
+class WSProgressEvent(BaseModel):
+    type: str = "viral_video:progress"
+    job_id: str
+    stage: str
+    progress: float = Field(ge=0.0, le=100.0)
+    message: str = ""
+    data: dict = Field(default_factory=dict)

apps/api/app/services/edit_plan_service.py

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

apps/api/app/services/generation_finalize_service.py

@@ -32,7 +32,13 @@ class GenerationFinalizeService:
     def __init__(self, db: Session):
         self.db = db
 
-    def finalize_task(self, task_id: str, user_id: str, cover_url: Optional[str] = None):
+    def finalize_task(
+        self,
+        task_id: str,
+        user_id: str,
+        cover_url: Optional[str] = None,
+        custom_title: Optional[str] = None,
+    ):
         """执行 finalize：状态校验 → 幂等 → 绑定封面 → 入库 → 推进 completed。
 
         Returns:
@@ -58,9 +64,15 @@ class GenerationFinalizeService:
         existing = self.db.query(GeneratedVideoModel).filter(GeneratedVideoModel.generation_task_id == task_id).first()
         if existing is not None:
             logger.info("[finalize] 幂等命中 task=%s video=%s", task_id, existing.id)
+            _changed = False
             if cover_url and cover_url.strip() and existing.thumbnail_url != cover_url.strip():
                 existing.thumbnail_url = cover_url.strip()
                 task.cover_url = cover_url.strip()
+                _changed = True
+            if custom_title and custom_title.strip() and (getattr(existing, "name", "") or "") != custom_title.strip():
+                existing.name = custom_title.strip()
+                _changed = True
+            if _changed:
                 self.db.commit()
             if task.status.value != "completed":
                 try:
@@ -91,12 +103,23 @@ class GenerationFinalizeService:
                 task=task,
                 session=self.db,
                 effective_cover_url=effective_cover,
+                custom_name=custom_title,
             )
         except ValueError as e:
             raise GenerationFinalizeError(str(e), "RenderedOutputMissing", 400) from e
 
         video_id = result["video_id"]
 
+        # 应用自定义标题
+        if custom_title and custom_title.strip():
+            try:
+                _v = self.db.query(GeneratedVideoModel).filter(GeneratedVideoModel.id == video_id).first()
+                if _v is not None:
+                    _v.name = custom_title.strip()
+                    self.db.flush()
+            except Exception:
+                logger.warning("[finalize] 更新标题失败: video_id=%s", video_id, exc_info=True)
+
         # ── 推进任务 ─────────────────────────────────────────────
         task.mark_completed(result_count=1)
         task.cover_url = effective_cover

apps/api/app/services/narrative_service.py

@@ -11,14 +11,12 @@
    存储路径与元信息约定），返回 asset_id —— 下游仍以 voice_library_id（实为
    audio asset id）消费，渲染链路零改动。
 
-积分扣点与 /tts 合成端点保持一致（ai_voice 场景），失败退费。
 """
 
 from __future__ import annotations
 
 import json
 import logging
-import math
 import subprocess
 import tempfile
 from dataclasses import dataclass
@@ -32,13 +30,10 @@ from packages.application.cosyvoice_service import CosyVoiceService
 from packages.application.tts_job.use_cases import CreateTTSJobUseCase
 from packages.application.tts_job.workflow import TTSWorkflowService
 from packages.domain import Asset, AssetLibrary, AssetLibraryKind, AssetStatus, ClassificationStatus
-from packages.domain.points_rules import calculate_points_cost
-from packages.domain.points_service import PointsService
 from packages.shared.storage import SharedStorageService
 
 logger = logging.getLogger(__name__)
 
-_POINTS_SCENE = "ai_voice"
 _SYNTH_TIMEOUT = 180.0  # 叙事配音在 HTTP 请求内同步等待，长文案分段合成时留出余量
 _CONTENT_TYPE_MAP = {"mp3": "audio/mpeg", "wav": "audio/wav", "pcm": "audio/pcm", "opus": "audio/opus"}
 
@@ -273,24 +268,6 @@ def prepare_narrative_voice(
         voice_clone_repository=voice_clone_repository,
     )
 
-    # 积分扣点（与 /tts 合成端点同口径），失败时在合成失败分支退费
-    points_svc = PointsService() if points_enabled else None
-    points_deducted = 0
-    if points_svc is not None:
-        est_minutes = max(1.0, math.ceil(len(content) / 240))
-        points_deducted = calculate_points_cost(
-            _POINTS_SCENE,
-            is_member=is_member,
-            duration_minutes=est_minutes,
-            member_type=member_type,
-        )
-        deduct_res = points_svc.deduct_points(user_id, points_deducted, _POINTS_SCENE, db)
-        if not deduct_res["success"]:
-            raise NarrativeError(
-                f"积分不足，需要 {points_deducted} 积分，当前余额 {deduct_res['balance']}",
-                status_code=402,
-            )
-
     use_case = CreateTTSJobUseCase(tts_repository)
     job = use_case.execute(
         user_id=user_id,
@@ -311,19 +288,9 @@ def prepare_narrative_voice(
             workflow.process_synthesis_failure(job.id, str(e))
         except Exception:  # noqa: BLE001
             logger.warning("标记叙事 TTS job 失败出错: job_id=%s", job.id, exc_info=True)
-        if points_deducted and points_svc is not None:
-            try:
-                points_svc.refund_points(user_id, points_deducted, _POINTS_SCENE, db, ref_id=job.id)
-            except Exception:  # noqa: BLE001
-                logger.warning("叙事 TTS 失败退积分异常: job_id=%s", job.id, exc_info=True)
         raise NarrativeError(f"配音合成失败：{e}", status_code=502) from e
 
     if not job.is_completed:
-        if points_deducted and points_svc is not None:
-            try:
-                points_svc.refund_points(user_id, points_deducted, _POINTS_SCENE, db, ref_id=job.id)
-            except Exception:  # noqa: BLE001
-                logger.warning("叙事 TTS 未完成退积分异常: job_id=%s", job.id, exc_info=True)
         raise NarrativeError("配音合成未完成，请稍后重试", status_code=504)
 
     asset = _save_tts_job_as_voice_asset(

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

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

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

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

apps/web/index.html

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

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

@@ -150,6 +150,8 @@ export interface DirectUploadPrepareResult {
    * 两个字段是同一语义的别名（后端可能只返回其一），前端任意为 true 即视为命中去重。
    */
   skip_transfer?: boolean
+  /** duplicated=true 时后端返回已存在素材的公网 URL，前端直接用而不必再调 complete */
+  url?: string
 }
 
 /** 直传完成确认返回 */

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

@@ -3,9 +3,24 @@
  */
 import apiClient from "../client"
 import { getOrCreateDefaultProject } from "../projects"
+import { ensureDefaultLibrary } from "./libraries"
 import type { DirectUploadPrepareResult, DirectUploadCompleteResult } from "./types"
 import { computeFileHash, makeClientUploadId } from "./uploadDedup"
 
+/** 根据 File.type 推断素材库 kind（image/video/voice）；无法推断时默认 image */
+function inferKindFromFile(file: File): "image" | "video" | "voice" {
+  const t = (file.type || "").toLowerCase()
+  if (t.startsWith("image/")) return "image"
+  if (t.startsWith("video/")) return "video"
+  if (t.startsWith("audio/")) return "voice"
+  // 兜底：按扩展名再判一次
+  const name = file.name.toLowerCase()
+  if (/\.(png|jpe?g|gif|webp|bmp|svg|avif)$/.test(name)) return "image"
+  if (/\.(mp4|mov|webm|avi|mkv|flv|wmv|m4v)$/.test(name)) return "video"
+  if (/\.(mp3|wav|m4a|aac|ogg|flac|opus|webm)$/.test(name)) return "voice"
+  return "image"
+}
+
 /** 预签名直传准备 */
 export const prepareDirectUpload = async (data: {
   project_id: string
@@ -108,6 +123,8 @@ const putToOSS = (
 
 /** 单个文件的上传阶段信息（供批量上传队列做状态绑定） */
 export interface DirectUploadHandle {
+  /** 实际使用的素材库（内部解析出来，便于调用方做后续 UI/缓存操作） */
+  library: { id: string; kind: "image" | "video" | "voice" }
   /** prepare 返回（含可能的预建 asset_id） */
   prepared: DirectUploadPrepareResult
   /** 直传 OSS（可重复调用用于重试） */
@@ -119,10 +136,17 @@ export interface DirectUploadHandle {
 /**
  * 准备一次直传：调 prepare 拿到签名表单（后端可能同时预建 uploading 态 asset），
  * 返回分段执行的 handle，调用方自行控制 transfer/complete 时机（便于队列并发与重试）。
+ *
+ * 修复 P0 404：library_id 改为可选；未传时自动根据文件类型在默认项目下确保对应素材库存在，
+ * 避免调用方从「全部素材库列表」里挑一个 library_id、但与默认项目 project_id 不匹配，
+ * 导致后端返回 "Asset library not found" 404。
  */
 export const prepareDirectUploadHandle = async (data: {
   file: File
-  library_id: string
+  /** 素材库 ID；未传时按文件类型自动在默认项目下 ensure-default */
+  library_id?: string
+  /** 显式指定素材库 kind；未传时按 MIME/扩展名推断 */
+  kind?: "image" | "video" | "voice"
   /** 前端算好的文件内容哈希（SHA-256 hex），prepare/complete 均携带 */
   fileHash?: string
   /** 本次逻辑上传的幂等 token，prepare/complete 一致、重试复用 */
@@ -138,9 +162,17 @@ export const prepareDirectUploadHandle = async (data: {
     throw new Error(`初始化默认项目失败，无法开始上传：${reason}`)
   }
 
+  // 解析 library_id：调用方传了就用，没传就按 kind 自动 ensure-default
+  let resolvedLibraryId = data.library_id
+  const resolvedKind = data.kind ?? inferKindFromFile(data.file)
+  if (!resolvedLibraryId) {
+    const lib = await ensureDefaultLibrary({ project_id: project.id, kind: resolvedKind })
+    resolvedLibraryId = lib.id
+  }
+
   const prepared = await prepareDirectUpload({
     project_id: project.id,
-    library_id: data.library_id,
+    library_id: resolvedLibraryId,
     filename: data.file.name,
     content_type: data.file.type || "application/octet-stream",
     file_size: data.file.size,
@@ -149,12 +181,13 @@ export const prepareDirectUploadHandle = async (data: {
   })
 
   return {
+    library: { id: resolvedLibraryId, kind: resolvedKind },
     prepared,
     transfer: (onProgress) => putToOSS(prepared, data.file, onProgress),
     complete: () =>
       completeDirectUpload({
         project_id: project.id,
-        library_id: data.library_id,
+        library_id: resolvedLibraryId,
         storage_key: prepared.storage_key,
         file_hash: data.fileHash,
         client_upload_id: data.clientUploadId,
@@ -164,10 +197,17 @@ export const prepareDirectUploadHandle = async (data: {
   }
 }
 
-/** 直传上传（大文件推荐），支持可选进度回调；一次性完成 prepare→transfer→complete */
+/** 直传上传（大文件推荐），支持可选进度回调；一次性完成 prepare→transfer→complete
+ *
+ * P0 404 修复：library_id 可选；不传时内部按文件类型自动匹配正确项目下的素材库，
+ * 保证 project_id 与 library_id 必然一致。
+ */
 export const uploadAssetDirect = async (data: {
   file: File
-  library_id: string
+  /** 素材库 ID；可选，不传按文件类型自动解析默认项目下的对应素材库（推荐用法） */
+  library_id?: string
+  /** 显式指定素材库 kind；未传时按文件 MIME/扩展名推断 */
+  kind?: "image" | "video" | "voice"
   onProgress?: (percent: number) => void
   /** 文件内容哈希；未传时自动补算（配音/封面/克隆等非队列链路统一受益） */
   fileHash?: string
@@ -180,6 +220,7 @@ export const uploadAssetDirect = async (data: {
   const handle = await prepareDirectUploadHandle({
     file: data.file,
     library_id: data.library_id,
+    kind: data.kind,
     fileHash,
     clientUploadId,
   })
@@ -188,7 +229,7 @@ export const uploadAssetDirect = async (data: {
     return {
       storage_key: handle.prepared.storage_key,
       ingest_job_id: "",
-      url: "",
+      url: handle.prepared.url || "",
       duplicated: true,
       asset_id: handle.prepared.asset_id,
     }

apps/web/src/api/client.ts

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

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

@@ -51,12 +51,18 @@ export interface GenerateCoverResponse {
 
 /** AI 生成封面 — 从最终成片中抽帧（MediaKit 选帧） */
 export async function generateCover(
-  templateId: string,
+  templateId: string | undefined | null,
   data: GenerateCoverRequest,
 ): Promise<GenerateCoverResponse> {
+  // templateId 为空时不传该参数，让后端使用默认模板配置
+  // （前端此前用 "default" 作为占位符，该 id 不存在于后端模板库会 404）
+  const params: Record<string, string> = {}
+  if (templateId && templateId !== "default") {
+    params.template_id = templateId
+  }
   const response = await apiClient.post<GenerateCoverResponse>("/generation/generate-cover", data, {
     timeout: 300000,
-    params: { template_id: templateId },
+    params,
   })
   return response.data
 }

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

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

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

@@ -3,7 +3,8 @@
  */
 
 /** 任务状态 */
-export type TaskStatus = "pending" | "waiting" | "running" | "completed" | "failed" | "cancelled"
+export type TaskStatus =
+  "pending" | "waiting" | "running" | "awaiting_cover" | "completed" | "failed" | "cancelled"
 
 /** 任务类型 */
 export type TaskType = "ingest" | "generation" | string

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

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

apps/web/src/api/viral-video/index.ts

@@ -0,0 +1,156 @@
+import apiClient from "@/api/client"
+import type {
+  GenerateViralVideoRequest,
+  HistoryResponse,
+  StyleTemplate,
+  ViralVideoJob,
+  ImageAnalysisResult,
+  CopyResult,
+  AnalyzeImagesRequest,
+  GenerateCopyRequest,
+  ConfirmCopyRequest,
+  ViralVideoModel,
+  ViralVideoModelsResponse,
+} from "./types"
+
+/** 创建爆款视频任务 */
+export function generateViralVideo(payload: GenerateViralVideoRequest) {
+  return apiClient.post<ViralVideoJob>("/viral-video/generate", payload).then((r) => r.data)
+}
+
+/** 查询单个任务 */
+export function getViralVideoJob(id: string) {
+  return apiClient.get<ViralVideoJob>(`/viral-video/${id}`).then((r) => r.data)
+}
+
+/** 用户确认/修改 AI 理解的意图后继续 */
+export function confirmViralVideoIntent(
+  id: string,
+  payload: { confirmed_copy?: string; edits?: Record<string, unknown> },
+) {
+  return apiClient
+    .post<ViralVideoJob>(`/viral-video/${id}/confirm-intent`, payload)
+    .then((r) => r.data)
+}
+
+/** 重试失败任务 */
+export function retryViralVideo(id: string) {
+  return apiClient.post<ViralVideoJob>(`/viral-video/${id}/retry`).then((r) => r.data)
+}
+
+/** 历史记录（分页） */
+export function getViralVideoHistory(params?: { page?: number; page_size?: number }) {
+  return apiClient.get<HistoryResponse>("/viral-video/history", { params }).then((r) => r.data)
+}
+
+/** 预设风格模板 */
+export function getViralStyleTemplates() {
+  return apiClient.get<StyleTemplate[]>("/viral-video/style-templates").then((r) => r.data)
+}
+
+/** 上传参考视频后触发风格分析 */
+export function analyzeViralStyle(id: string) {
+  return apiClient.post<ViralVideoJob>(`/viral-video/${id}/analyze-style`).then((r) => r.data)
+}
+
+/** 动态预估积分消耗（STEP3 参数变化时调用） */
+export function estimateViralVideoCredits(params: {
+  video_model: string
+  resolution: string
+  video_ratio: string
+  duration: number
+}) {
+  return apiClient
+    .post<{ estimated_credits: number }>("/viral-video/estimate-credits", params)
+    .then((r) => r.data)
+}
+
+/** 获取支持的视频模型列表（GET /viral-video/models）。后端返回 {models: [...]} 包装 */
+export function getViralVideoModels() {
+  return apiClient.get<ViralVideoModelsResponse>("/viral-video/models").then((r) => {
+    const data = r.data as ViralVideoModelsResponse | ViralVideoModel[] | null | undefined
+    if (Array.isArray(data)) return data
+    if (data && Array.isArray((data as ViralVideoModelsResponse).models)) {
+      return (data as ViralVideoModelsResponse).models
+    }
+    return []
+  })
+}
+/** ── 三步拆分：前端 mock 辅助函数（后端新接口上线后可替换） ── */
+
+/**
+ * 客户端图片分析 mock（后端未提供 analyze-only 端点前的占位方案）：
+ * 基于已上传图片生成一份示例识别汇览，让 STEP1→STEP2 交互可走通。
+ * 后端上线后改为调用真实接口。
+ */
+export function mockImageAnalysis(images: { name: string }[]): Promise<ImageAnalysisResult> {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      const products = images.slice(0, 3).map((img, i) => {
+        const n = img.name.replace(/\.[^.]+$/, "")
+        return {
+          name: n || `商品 ${i + 1}`,
+          spec: i === 0 ? "500ml/瓶" : i === 1 ? "300g/盒" : undefined,
+          brand: i === 0 ? "示例品牌" : undefined,
+          features:
+            i === 0
+              ? "瓶身透明、蓝色标签、白色瓶盖；标签上印有品牌Logo和产品名称；光线均匀，主体居中"
+              : i === 1
+                ? "盒装包装、主色调为米白+暖黄；正面有产品实物图；文字清晰可辨"
+                : "产品主体清晰、背景干净、色彩鲜艳，突出核心卖点",
+          label_text: i === 0 ? "包装正面印有产品名称、净含量、品牌Logo" : undefined,
+          image_index: i,
+        }
+      })
+      resolve({ products })
+    }, 1800)
+  })
+}
+
+/**
+ * 客户端文案生成 mock（后端未提供 generate-copy 端点前的占位方案）：
+ * 后端上线后改为调用真实接口。
+ */
+export function mockGenerateCopy(params: {
+  product: string
+  sellingPoints?: string[]
+  tone?: string
+  duration?: number
+  marketingPurpose?: string
+  industry?: string
+  targetCustomer?: string
+}): Promise<CopyResult> {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      const product = params.product || "这款产品"
+      const tone = params.tone || "亲切务实"
+      const purpose = params.marketingPurpose || "品牌种草"
+      resolve({
+        title: `【${purpose}】${product}，用过的人都说好！`,
+        final_copy: `你有没有发现，选对一款${params.industry || "好物"}真的能让生活省心很多？\n\n今天给大家推荐这款${product}。${tone.includes("亲切") ? "说实话，" : ""}我自己用了一段时间，最直观的感受就是——好用、省心、值得回购。\n\n✅ 亮点一：品质到位，用料扎实，细节处见用心\n✅ 亮点二：使用体验舒服，日常高频场景都能打\n✅ 亮点三：性价比很能打，这个价位真的没什么可挑的\n\n如果你也在找一款靠谱的${params.industry || "日常好物"}，真的建议试试${product}，不会让你失望。点击左下角，直接入手！`,
+        suggested_copy: `你有没有发现，选对一款${params.industry || "好物"}真的能让生活省心很多？\n\n今天给大家推荐这款${product}。${tone.includes("亲切") ? "说实话，" : ""}我自己用了一段时间，最直观的感受就是——好用、省心、值得回购。\n\n✅ 亮点一：品质到位，用料扎实，细节处见用心\n✅ 亮点二：使用体验舒服，日常高频场景都能打\n✅ 亮点三：性价比很能打，这个价位真的没什么可挑的\n\n如果你也在找一款靠谱的${params.industry || "日常好物"}，真的建议试试${product}，不会让你失望。点击左下角，直接入手！`,
+      })
+    }, 2200)
+  })
+}
+
+/** ── 三步拆分 v1.5 真实后端 API（PR #2117 合入后启用，前端可替换 mock 调用） ── */
+
+/** 阶段1：上传图片后仅做 VLM 图片分析 + 可选参考视频风格分析，完成后状态=image_analyzed */
+export function analyzeViralImages(payload: AnalyzeImagesRequest) {
+  return apiClient.post<ViralVideoJob>("/viral-video/analyze-images", payload).then((r) => r.data)
+}
+
+/** 阶段2：用户填完营销参数后生成文案+分镜+合规审核，完成后状态=copy_generated，返回 copy_result */
+export function generateViralCopy(id: string, payload: GenerateCopyRequest) {
+  return apiClient
+    .post<ViralVideoJob>(`/viral-video/${id}/generate-copy`, payload)
+    .then((r) => r.data)
+}
+
+/** 阶段3：用户确认/编辑文案后开始 TTS→渲染→上传，完成后状态=completed */
+export function confirmViralCopy(id: string, payload: ConfirmCopyRequest = {}) {
+  return apiClient
+    .post<ViralVideoJob>(`/viral-video/${id}/confirm-copy`, payload)
+    .then((r) => r.data)
+}

apps/web/src/api/viral-video/types.ts

@@ -0,0 +1,317 @@
+export type FusionLevel = "ai_full" | "ai_polish" | "user_primary"
+export const FUSION_LEVELS: { value: FusionLevel; label: string; desc: string }[] = [
+  { value: "ai_full", label: "AI 全写", desc: "给我方向，全由AI创作" },
+  { value: "ai_polish", label: "AI润色", desc: "我写草稿，AI帮我润色" },
+  { value: "user_primary", label: "按我写的来", desc: "几乎不改我的文案" },
+]
+
+export type StyleStrength = "light" | "medium" | "strict"
+export const STYLE_STRENGTHS: { value: StyleStrength; label: string }[] = [
+  { value: "light", label: "轻度借鉴" },
+  { value: "medium", label: "中度参考" },
+  { value: "strict", label: "像素级复刻" },
+]
+
+/** v1.6 前端时长下拉选项（5/10/15/20/25/30秒） */
+export const VALID_DURATIONS = [5, 10, 15, 20, 25, 30] as const
+export type VideoDuration = (typeof VALID_DURATIONS)[number]
+
+/** v1.6 支持的画幅比例 */
+export const VALID_RATIOS = ["9:16", "16:9", "1:1"] as const
+export type VideoRatio = (typeof VALID_RATIOS)[number]
+
+export type ViralVideoStatus =
+  | "pending"
+  | "running"
+  | "wait_user_confirm"
+  | "image_analyzed"
+  | "copy_generated"
+  | "completed"
+  | "failed"
+  | "cancelled"
+
+/**
+ * v1.6 后端流水线阶段。单次 Seedance 出片版：
+ * image_analysis → video_analysis(可选) → intent_parsing → script_generation → review → tts → rendering → uploading
+ */
+export type ViralVideoStage =
+  | "image_analysis"
+  | "video_analysis"
+  | "intent_parsing"
+  | "script_generation"
+  | "review"
+  | "tts"
+  | "rendering"
+  | "uploading"
+
+/** 图片+视频分析阶段：属于「分析图片」按钮的范围 */
+const IMAGE_ANALYSIS_STAGES = new Set<ViralVideoStage>(["image_analysis", "video_analysis"])
+/** 编导脚本阶段：属于「生成文案」按钮的范围 */
+const COPY_STAGES = new Set<ViralVideoStage>(["intent_parsing", "script_generation", "review"])
+/** 视频生成阶段：属于「开始生成视频」按钮的范围（v1.6: TTS+单次Seedance+上传） */
+const VIDEO_STAGES = new Set<ViralVideoStage>(["tts", "rendering", "uploading"])
+
+export function isImageAnalysisStage(stage: ViralVideoStage | undefined): boolean {
+  return !!stage && IMAGE_ANALYSIS_STAGES.has(stage)
+}
+export function isCopyStage(stage: ViralVideoStage | undefined): boolean {
+  return !!stage && COPY_STAGES.has(stage)
+}
+export function isVideoStage(stage: ViralVideoStage | undefined): boolean {
+  return !!stage && VIDEO_STAGES.has(stage)
+}
+/** 兼容旧调用：分析图片+生成文案 的所有前置阶段 */
+export function isAnalysisStage(stage: ViralVideoStage | undefined): boolean {
+  return isImageAnalysisStage(stage) || isCopyStage(stage)
+}
+
+/** 单张图片 VLM 识别出的商品信息 */
+export interface ImageProductAnalysis {
+  name?: string
+  category?: string
+  brand?: string
+  colors?: string[]
+  material_or_texture?: string
+  key_features?: string[]
+  visual_style?: string
+  scene?: string
+  target_audience_hint?: string
+  text_on_image?: string
+  /** 旧字段兼容 */
+  spec?: string
+  features?: string[] | string
+  label_text?: string
+  selling_points?: string
+  image_index?: number
+}
+
+export interface ImageAnalysisResult {
+  products?: ImageProductAnalysis[]
+}
+
+/** v1.6 编导分镜脚本 - 单镜头 */
+export interface ShotScript {
+  /** 时间区间，如 "0-3秒" */
+  time_range?: string
+  /** 景别/角度/运镜，如 "近景俯拍45度，缓慢推镜" */
+  shot_type_angle_movement?: string
+  /** 场景描述+对白 */
+  scene_and_dialogue?: string
+  /** 人物动作/表情/物品操作细节 */
+  action_details?: string
+  /** 环境音+BGM提示 */
+  audio_bgm?: string
+  /** 转场方式（硬切/淡入淡出/叠化/结束） */
+  transition?: string
+  /** 参考图片索引（0-based，对应上传产品图数组） */
+  reference_image_index?: number | null
+}
+
+/** v1.6 编导分镜脚本 - 总览 */
+export interface CopyResultOverview {
+  theme?: string
+  total_duration?: number
+  aspect_ratio?: string
+}
+
+/** v1.6 编导分镜脚本（核心输出结构，给 Seedance 做 prompt，给 TTS 取 voiceover_script） */
+export interface CopyResult {
+  overview?: CopyResultOverview
+  /** 整体场景+光线描述 */
+  scene_and_lighting?: string
+  /** 逐镜头时间轴 */
+  shots?: ShotScript[]
+  /** 硬性约束（禁止字幕/水印/变形等） */
+  hard_constraints?: string[]
+  /** 负面提示词 */
+  negative_prompts?: string[]
+  /** 完整口播稿（纯文本，用于 TTS 合成） */
+  voiceover_script?: string
+  /** 向后兼容：= voiceover_script */
+  final_copy?: string
+  /** 向后兼容：= voiceover_script */
+  suggested_copy?: string
+  title?: string
+  /** v1.5 旧字段兼容（老数据降级时可能出现） */
+  scenes?: Array<{ shot: string; narration: string; duration?: number }>
+}
+
+export interface StyleTemplate {
+  id: string
+  name: string
+  description?: string
+  thumbnail_url?: string
+  style_config?: Record<string, unknown>
+  tags?: string[]
+}
+
+export interface IntentResult {
+  intent?: string
+  key_messages?: string[]
+  tone?: string
+  target_emotion?: string
+  call_to_action?: string
+  suggested_title?: string
+  /** v1.5 旧字段兼容 */
+  product?: string
+  selling_points?: string[]
+  target_audience?: string
+  structure?: string
+  duration?: number
+  suggested_copy?: string
+}
+
+export interface ViralVideoJob {
+  id: string
+  status: ViralVideoStatus
+  images: string[]
+  reference_video_url?: string
+  style_strength?: StyleStrength
+  style_template_id?: string
+  style_guide?: string | Record<string, unknown>
+  user_copy_text?: string
+  /** v1.6: = copy_result.voiceover_script（从 copy_result 派生，向后兼容） */
+  final_copy_text?: string
+  generated_copy_text?: string
+  fusion_level?: FusionLevel
+  voice_id?: string
+  voice_mode?: "global" | "per_video"
+  voice_source?: "preset" | "library" | "clone" | "upload" | "my_voice"
+  bgm_preference?: string
+  intent_result?: IntentResult
+  intent_text?: string
+  /** v1.6 编导分镜脚本（核心产物） */
+  copy_result?: CopyResult
+  /** 向后兼容：= copy_result.shots */
+  storyboard?: ShotScript[]
+  image_analysis?: ImageAnalysisResult
+  /** 视频比例：9:16 / 16:9 / 1:1，默认 9:16 */
+  video_ratio?: string
+  /** Seedance 模型 ID（空=后端默认） */
+  video_model?: string
+  /** 视频时长（秒，5-30，默认15） */
+  duration?: number
+  progress_stage?: ViralVideoStage
+  progress_percent?: number
+  progress_message?: string
+  output_url?: string
+  result_video_url?: string
+  error_message?: string
+  error_msg?: string
+  credits_cost?: number
+  created_at?: string
+  updated_at?: string
+}
+
+export interface GenerateViralVideoRequest {
+  images: string[]
+  reference_video_url?: string
+  douyin_url?: string
+  style_strength?: StyleStrength
+  style_template_id?: string
+  user_copy_text?: string
+  fusion_level?: FusionLevel
+  voice_id?: string
+  voice_source?: "preset" | "library" | "clone" | "upload" | "my_voice"
+  bgm_preference?: string
+  industry?: string
+  target_customer?: string
+  language?: string
+  persona_id?: string
+  viral_structure?: string
+  marketing_purpose?: string
+  /** 视频时长（5-30秒，默认15） */
+  duration?: number
+  video_model?: string
+  video_ratio?: string
+  /** 三步拆分：step 控制后端执行到哪一步暂停 */
+  step?: "analyze" | "generate_copy" | "generate_video"
+}
+
+export interface HistoryResponse {
+  items: ViralVideoJob[]
+  total: number
+  page: number
+  page_size: number
+}
+
+/** v1.6 阶段1请求：图片/视频分析（POST /viral-video/analyze-images） */
+export interface AnalyzeImagesRequest {
+  images: string[]
+  reference_video_url?: string
+  style_template_id?: string
+  style_strength?: StyleStrength
+  /** TTS 音色 ID（STEP1 已选音色时传） */
+  voice_id?: string
+  /** 音色来源：preset | library | clone | upload */
+  voice_source?: "preset" | "library" | "clone" | "upload" | "my_voice"
+  /** Seedance 视频比例：9:16 | 16:9 | 1:1 */
+  video_ratio?: string
+  /** Seedance 模型 ID（空则使用服务端默认） */
+  video_model?: string
+  /** 视频时长（秒，5-30，默认15） */
+  duration?: number
+}
+
+/** v1.6 阶段2请求：填完营销参数后生成编导分镜脚本（POST /viral-video/{id}/generate-copy） */
+export interface GenerateCopyRequest {
+  industry?: string
+  target_customer?: string
+  persona_id?: string
+  viral_structure?: string
+  marketing_purpose?: string
+  bgm_preference?: string
+  /** 视频时长（秒，5-30，默认15） */
+  duration?: number
+  user_copy_text?: string
+  fusion_level?: FusionLevel
+  reference_audio_path?: string
+  reference_video_url?: string
+  style_strength?: StyleStrength
+  style_template_id?: string
+  style_guide?: string | Record<string, unknown>
+  /** TTS 音色 ID（优先级高于 persona_id） */
+  voice_id?: string
+  /** 音色来源：preset | library | clone | upload */
+  voice_source?: "preset" | "library" | "clone" | "upload" | "my_voice"
+  /** Seedance 视频比例（9:16/16:9/1:1 等） */
+  video_ratio?: string
+  /** Seedance 模型 ID（空则使用服务端默认） */
+  video_model?: string
+}
+
+/** 视频模型描述（GET /viral-video/models） */
+export interface ViralVideoModel {
+  key: string
+  display_name: string
+  supports_audio: boolean
+  supported_resolutions: string[]
+  max_duration: number
+  /** 计费模式（可选）：per_second / per_video / token 等 */
+  billing_mode?: string
+  is_default?: boolean
+}
+
+/** GET /viral-video/models 响应包装 */
+export interface ViralVideoModelsResponse {
+  models: ViralVideoModel[]
+}
+
+/** v1.6 阶段3请求：用户确认/编辑口播文案后开始单次 Seedance 出片（POST /viral-video/{id}/confirm-copy） */
+export interface ConfirmCopyRequest {
+  /** 用户编辑后的口播文案；为空则使用 AI 生成的 voiceover_script */
+  edited_copy?: string
+  /** 视频模型 key，覆盖默认 */
+  video_model?: string
+}
+
+/** 旧分镜片段结构（保留兼容；新代码请使用 ShotScript） */
+export interface StoryboardSegment {
+  order: number
+  type: string
+  description: string
+  text: string
+  duration: number
+  ken_burns?: string
+  transition?: string
+}

apps/web/src/api/voice-clone/types.ts

@@ -18,6 +18,8 @@ export interface VoiceClone {
   language: string
   gender: string
   error_message: string | null
+  /** CosyVoice 实际使用的音色 ID（status=ready 时由后端填充，用于 TTS 调用） */
+  voice_id?: string | null
   created_at: string
   updated_at: string
 }

apps/web/src/api/voice-clone/utils.ts

@@ -18,6 +18,7 @@ export const toVoiceClone = (profile: VoiceCloneProfile): VoiceClone => ({
   language: profile.language || "",
   gender: profile.gender || "",
   error_message: profile.error_message || null,
+  voice_id: profile.voice_id,
   created_at: profile.created_at,
   updated_at: profile.updated_at,
 })

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

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

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

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

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

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

apps/web/src/components/layout/PageHead/constants.ts

@@ -2,6 +2,7 @@
 export const ROUTE_TITLE_MAP: Record<string, string> = {
   "/app/dashboard": "首页",
   "/app/generate": "智能剪辑",
+  "/app/viral-video": "爆款视频",
   "/app/assets": "视频库",
   "/app/voices": "配音库",
   "/app/products": "成片库",

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

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

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

@@ -0,0 +1,458 @@
+/* ============================================================
+   TitleStylePanel 标题样式面板 — 独立共用样式（#1809 ⑦）
+
+   从 generate.css 抽取的标题样式区块，供「智能剪辑」与「AI数字人」
+   两个页面共用。AI数字人页面不引入 generate.css，直接由
+   TitleStylePanel.tsx import 本文件，保证 24 个 T 预设格子的网格布局、
+   配色描边、选中态与智能剪辑页面完全一致。
+
+   注意：本文件规则与 generate.css 中同名规则一一对应、取值相同；
+   智能剪辑页面两处同时存在时同优先级同值，不改变其原有呈现。
+   ============================================================ */
+
+/* ── 区块容器 ── */
+.xx-title-style-section {
+  margin-top: 22px;
+  padding-top: 20px;
+  border-top: 1px solid var(--border-light);
+}
+
+.xx-section-subtitle {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--text-primary);
+  margin: 0 0 16px;
+}
+
+.xx-title-style-row {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 14px;
+  margin-bottom: 14px;
+}
+
+.xx-half-field {
+  margin-bottom: 0;
+}
+
+.xx-field-label-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 8px;
+}
+
+.xx-field-label-row label {
+  margin-bottom: 0;
+}
+
+.xx-field-value {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--primary-color);
+}
+
+/* ── 共用表单字段（位置/字体下拉） ── */
+.xx-title-style-section .xx-form-field {
+  margin-bottom: 14px;
+}
+
+.xx-title-style-section .xx-form-field:last-child {
+  margin-bottom: 0;
+}
+
+.xx-title-style-section .xx-form-field label {
+  display: block;
+  font-weight: 600;
+  margin-bottom: 8px;
+  font-size: 13px;
+  color: var(--text-primary);
+}
+
+.xx-title-style-section .xx-form-field select,
+.xx-title-style-section .xx-form-field input {
+  width: 100%;
+  height: 44px;
+  border: 1px solid var(--border-color);
+  border-radius: var(--radius-sm);
+  background: var(--bg-primary);
+  padding: 0 14px;
+  font-size: 14px;
+  outline: 0;
+  transition: 0.15s ease;
+  color: var(--text-primary);
+}
+
+.xx-title-style-section .xx-form-field select:focus,
+.xx-title-style-section .xx-form-field input:focus {
+  border-color: var(--primary-color);
+  box-shadow: 0 0 0 3px rgba(79, 70, 229, 0.1);
+}
+
+/* ── 字号滑块 ── */
+.xx-slider {
+  width: 100%;
+  height: 6px;
+  -webkit-appearance: none;
+  appearance: none;
+  background: var(--border-color);
+  border-radius: 3px;
+  outline: none;
+  cursor: pointer;
+}
+
+.xx-slider::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  appearance: none;
+  width: 18px;
+  height: 18px;
+  background: var(--primary-color);
+  border-radius: 50%;
+  cursor: pointer;
+  box-shadow: 0 2px 6px rgba(79, 70, 229, 0.3);
+}
+
+.xx-slider::-moz-range-thumb {
+  width: 18px;
+  height: 18px;
+  background: var(--primary-color);
+  border-radius: 50%;
+  cursor: pointer;
+  border: none;
+  box-shadow: 0 2px 6px rgba(79, 70, 229, 0.3);
+}
+
+/* ── 标题预设卡片网格（24 个 T 格子） ── */
+.xx-title-presets-grid {
+  display: grid;
+  grid-template-columns: repeat(6, 52px);
+  gap: 1px;
+}
+
+.xx-title-preset-card {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 52px;
+  height: 52px;
+  padding: 0;
+  background: #404040;
+  border: 2px solid transparent;
+  border-radius: 8px;
+  cursor: pointer;
+  transition: all 0.15s;
+}
+
+.xx-title-preset-card:hover {
+  border-color: #666;
+  background: #4d4d4d;
+}
+
+.xx-title-preset-card.active {
+  border-color: #409eff;
+  background: #4d4d4d;
+}
+
+.xx-title-preset-preview-text {
+  font-size: 32px;
+  line-height: 1;
+  user-select: none;
+}
+
+/* ── 样式按钮组（加粗/斜体/描边/阴影） ── */
+.xx-style-btns {
+  display: flex;
+  gap: 8px;
+}
+
+.xx-style-btn {
+  width: 40px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid var(--border-color);
+  border-radius: var(--radius-sm);
+  background: var(--bg-primary);
+  cursor: pointer;
+  font-size: 15px;
+  color: var(--text-secondary);
+  transition: all 0.15s;
+}
+
+.xx-style-btn:hover {
+  border-color: var(--primary-300);
+  color: var(--primary-color);
+}
+
+.xx-style-btn.active {
+  background: var(--primary-color);
+  border-color: var(--primary-color);
+  color: #fff;
+}
+
+/* ============================================================
+   #2001 爆款标题样式面板升级 — 新增样式（ts- 前缀）
+   ============================================================ */
+
+.ts-panel {
+  position: relative;
+}
+
+/* 预览 */
+.ts-preview-wrap {
+  margin-bottom: 14px;
+  display: flex;
+  justify-content: center;
+  padding: 10px;
+  background: #0f172a;
+  border-radius: 8px;
+}
+
+/* 表单字段 */
+.ts-form-field {
+  margin-bottom: 12px;
+}
+.ts-form-field label {
+  display: block;
+  font-weight: 600;
+  margin-bottom: 6px;
+  font-size: 12px;
+  color: var(--text-primary, #1f2937);
+}
+.ts-field-label-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 6px;
+}
+.ts-field-value {
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--primary-color, #7c3aed);
+}
+.ts-row-2 {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 10px;
+}
+.ts-half {
+  margin-bottom: 0;
+}
+
+.ts-select {
+  width: 100%;
+  height: 34px;
+  border: 1px solid var(--border-color, #e5e7eb);
+  border-radius: 6px;
+  background: var(--bg-primary, #fff);
+  padding: 0 10px;
+  font-size: 13px;
+  outline: 0;
+  color: var(--text-primary, #1f2937);
+}
+.ts-select:focus {
+  border-color: var(--primary-color, #7c3aed);
+  box-shadow: 0 0 0 2px rgba(124, 58, 237, 0.1);
+}
+.ts-input {
+  width: 100%;
+  height: 34px;
+  border: 1px solid var(--border-color, #e5e7eb);
+  border-radius: 6px;
+  padding: 0 10px;
+  font-size: 13px;
+  outline: 0;
+}
+
+.ts-slider {
+  width: 100%;
+  height: 4px;
+  -webkit-appearance: none;
+  appearance: none;
+  background: #e5e7eb;
+  border-radius: 2px;
+  outline: none;
+}
+.ts-slider::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  appearance: none;
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  background: #7c3aed;
+  cursor: pointer;
+  border: 2px solid #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+}
+.ts-slider::-moz-range-thumb {
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  background: #7c3aed;
+  cursor: pointer;
+  border: 2px solid #fff;
+}
+
+/* 样式按钮 B/I/S/☁ */
+.ts-style-btns {
+  display: flex;
+  gap: 6px;
+}
+.ts-style-btn {
+  width: 34px;
+  height: 34px;
+  border-radius: 6px;
+  border: 1px solid #e5e7eb;
+  background: #fff;
+  cursor: pointer;
+  font-size: 14px;
+  transition: 0.15s;
+  color: #374151;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+.ts-style-btn:hover {
+  border-color: #7c3aed;
+  color: #7c3aed;
+}
+.ts-style-btn.active {
+  background: #faf5ff;
+  color: #6d28d9;
+  border-color: #7c3aed;
+  font-weight: 700;
+}
+
+/* 色板 */
+.ts-color-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+  align-items: center;
+}
+.ts-color-swatch {
+  width: 24px;
+  height: 24px;
+  border-radius: 4px;
+  border: 2px solid #fff;
+  box-shadow: 0 0 0 1px #e5e7eb;
+  cursor: pointer;
+  padding: 0;
+  transition: 0.15s;
+}
+.ts-color-swatch:hover {
+  transform: scale(1.1);
+}
+.ts-color-swatch.active {
+  box-shadow: 0 0 0 2px #7c3aed;
+  transform: scale(1.1);
+}
+.ts-color-custom {
+  background: repeating-conic-gradient(#ccc 0% 25%, #fff 0% 50%) 50%/8px 8px;
+  color: #666;
+  font-size: 14px;
+  line-height: 20px;
+}
+.ts-color-native {
+  width: 0;
+  height: 0;
+  border: 0;
+  padding: 0;
+}
+
+/* 预设网格 10个 - 5列 */
+.ts-presets-grid {
+  display: grid;
+  grid-template-columns: repeat(5, 1fr);
+  gap: 6px;
+}
+.ts-preset-card {
+  border: 1px solid #e5e7eb;
+  border-radius: 6px;
+  background: #fff;
+  padding: 4px;
+  cursor: pointer;
+  transition: 0.15s;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+.ts-preset-card:hover {
+  border-color: #7c3aed;
+}
+.ts-preset-card.active {
+  border-color: #7c3aed;
+  background: #faf5ff;
+  box-shadow: 0 0 0 1px #7c3aed;
+}
+.ts-preset-preview {
+  height: 34px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  border-radius: 4px;
+  background: #0f172a;
+}
+.ts-preset-preview canvas {
+  max-width: 100%;
+  max-height: 100%;
+}
+.ts-preset-meta {
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  font-size: 10px;
+  color: #4b5563;
+  justify-content: center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 0 2px 2px;
+}
+.ts-preset-emoji {
+  font-size: 11px;
+}
+.ts-preset-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.ts-toggle-row label {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 13px;
+  font-weight: 500;
+  cursor: pointer;
+  margin-bottom: 10px;
+}
+.ts-toggle-row input[type="checkbox"] {
+  width: 16px;
+  height: 16px;
+  accent-color: #7c3aed;
+}
+
+/* Tabs 紧凑样式 */
+.xx-title-style-section .ant-tabs-nav {
+  margin-bottom: 10px;
+}
+.xx-title-style-section .ant-tabs-tab {
+  font-size: 12px !important;
+  padding: 6px 8px !important;
+}
+
+/* 标题模板入口按钮（#2003） */
+.ts-template-btn {
+  border: none;
+  background: transparent;
+  color: var(--primary-color, #7c3aed);
+  font-size: 12px;
+  cursor: pointer;
+  padding: 2px 0;
+  font-weight: 500;
+}
+.ts-template-btn:hover {
+  text-decoration: underline;
+}

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

@@ -0,0 +1,445 @@
+/**
+ * 标题样式参数 Tab 面板（共享组件）
+ *
+ * 包含：基础/描边/阴影/背景/排版/封面 共 6 个 Tab
+ * 仅负责 UI 渲染和参数 patch 回调，不维护 state、不调 API
+ */
+import React, { useState } from "react"
+import { Tabs } from "antd"
+import type { TitleStyleSettings } from "./settings"
+import {
+  FONT_OPTIONS,
+  TITLE_COLOR_PALETTE,
+  STROKE_COLOR_PALETTE,
+  BG_COLOR_PALETTE,
+} from "./constants"
+
+export interface PositionOption {
+  value: string
+  label: string
+}
+
+export interface FontOption {
+  value: string
+  label: string
+  family: string
+  tag?: "hot" | "new"
+}
+
+export interface TitleStyleParamsTabProps {
+  settings: TitleStyleSettings
+  onUpdatePosition: (p: string) => void
+  onUpdateFont: (f: string) => void
+  onUpdateSize: (v: number) => void
+  onToggleBold: () => void
+  onToggleItalic: () => void
+  onToggleStroke: () => void
+  onToggleShadow: () => void
+  onUpdatePatch: (patch: Partial<TitleStyleSettings>) => void
+  positionOptions: PositionOption[]
+  fontOptions?: FontOption[]
+  /** 是否显示「封面」Tab（独立封面标题开关） */
+  showCoverToggle?: boolean
+  /** 封面独立标题开关状态 */
+  coverEnabled?: boolean
+  /** 封面开关变化 */
+  onToggleCover?: (enabled: boolean) => void
+}
+
+/* ── Slider 行 ── */
+const SliderRow: React.FC<{
+  label: string
+  value: number
+  min: number
+  max: number
+  step?: number
+  unit?: string
+  onChange: (v: number) => void
+}> = ({ label, value, min, max, step = 1, unit = "px", onChange }) => (
+  <div className="ts-form-field">
+    <div className="ts-field-label-row">
+      <label>{label}</label>
+      <span className="ts-field-value">
+        {value}
+        {unit}
+      </span>
+    </div>
+    <input
+      type="range"
+      className="ts-slider"
+      min={min}
+      max={max}
+      step={step}
+      value={value}
+      onChange={(e) => onChange(Number(e.target.value))}
+    />
+  </div>
+)
+
+/* ── 色板 ── */
+const ColorPicker: React.FC<{
+  label?: string
+  value: string
+  palette: string[]
+  onChange: (c: string) => void
+}> = ({ label, value, palette, onChange }) => {
+  const [customOpen, setCustomOpen] = useState(false)
+  return (
+    <div className="ts-form-field">
+      {label && <label>{label}</label>}
+      <div className="ts-color-row">
+        {palette.map((c) => (
+          <button
+            key={c}
+            type="button"
+            className={`ts-color-swatch${value.toLowerCase() === c.toLowerCase() ? " active" : ""}`}
+            style={{ background: c }}
+            onClick={() => onChange(c)}
+            title={c}
+          />
+        ))}
+        <button
+          type="button"
+          className="ts-color-swatch ts-color-custom"
+          onClick={() => setCustomOpen((v) => !v)}
+          title="自定义颜色"
+        >
+          +
+        </button>
+        <input
+          type="color"
+          className="ts-color-native"
+          value={value.startsWith("rgba") ? "#000000" : value}
+          onChange={(e) => {
+            onChange(e.target.value)
+            setCustomOpen(false)
+          }}
+          style={{
+            opacity: customOpen ? 1 : 0,
+            position: customOpen ? "static" : "absolute",
+            pointerEvents: customOpen ? "auto" : "none",
+            width: customOpen ? 28 : 0,
+            height: customOpen ? 28 : 0,
+            border: "none",
+            padding: 0,
+            cursor: "pointer",
+            background: "transparent",
+          }}
+        />
+      </div>
+      <div style={{ fontSize: 11, color: "#9ca3af", marginTop: 2 }}>
+        当前：<code style={{ fontSize: 11 }}>{value}</code>
+      </div>
+    </div>
+  )
+}
+
+const TitleStyleParamsTab: React.FC<TitleStyleParamsTabProps> = ({
+  settings,
+  onUpdatePosition,
+  onUpdateFont,
+  onUpdateSize,
+  onToggleBold,
+  onToggleItalic,
+  onToggleStroke,
+  onToggleShadow,
+  onUpdatePatch,
+  positionOptions,
+  fontOptions = FONT_OPTIONS,
+  showCoverToggle = false,
+  coverEnabled = false,
+  onToggleCover,
+}) => {
+  const upd = onUpdatePatch
+  return (
+    <Tabs
+      size="small"
+      defaultActiveKey="basic"
+      items={[
+        {
+          key: "basic",
+          label: "基础",
+          children: (
+            <>
+              <div className="ts-row-2">
+                <div className="ts-form-field ts-half">
+                  <label>位置</label>
+                  <select
+                    className="ts-select"
+                    value={settings.position}
+                    onChange={(e) => onUpdatePosition(e.target.value)}
+                  >
+                    {positionOptions.map((o) => (
+                      <option key={o.value} value={o.value}>
+                        {o.label}
+                      </option>
+                    ))}
+                  </select>
+                </div>
+                <div className="ts-form-field ts-half">
+                  <label>字体</label>
+                  <select
+                    className="ts-select"
+                    value={settings.font}
+                    onChange={(e) => onUpdateFont(e.target.value)}
+                  >
+                    {fontOptions.map((f) => (
+                      <option key={f.value} value={f.value}>
+                        {f.tag === "hot" ? "🔥 " : f.tag === "new" ? "🆕 " : ""}
+                        {f.label}
+                      </option>
+                    ))}
+                  </select>
+                </div>
+              </div>
+              <SliderRow
+                label="字号"
+                value={settings.size}
+                min={16}
+                max={120}
+                onChange={onUpdateSize}
+              />
+              <div className="ts-form-field">
+                <label>样式</label>
+                <div className="ts-style-btns">
+                  <button
+                    type="button"
+                    className={`ts-style-btn${settings.bold ? " active" : ""}`}
+                    onClick={onToggleBold}
+                  >
+                    <b>B</b>
+                  </button>
+                  <button
+                    type="button"
+                    className={`ts-style-btn${settings.italic ? " active" : ""}`}
+                    onClick={onToggleItalic}
+                  >
+                    <i>I</i>
+                  </button>
+                  <button
+                    type="button"
+                    className={`ts-style-btn${settings.stroke ? " active" : ""}`}
+                    onClick={() => {
+                      onToggleStroke()
+                      if (!settings.stroke && (settings.strokeWidth ?? 0) < 2)
+                        upd({ strokeWidth: 4 })
+                    }}
+                    title="描边"
+                  >
+                    S
+                  </button>
+                  <button
+                    type="button"
+                    className={`ts-style-btn${settings.shadow ? " active" : ""}`}
+                    onClick={() => {
+                      onToggleShadow()
+                      if (!settings.shadow) {
+                        upd({
+                          shadowOffsetX: 2,
+                          shadowOffsetY: 2,
+                          shadowBlur: 4,
+                          shadowColor: "rgba(0,0,0,0.8)",
+                        })
+                      }
+                    }}
+                    title="阴影"
+                  >
+                    ☁
+                  </button>
+                </div>
+              </div>
+              <ColorPicker
+                label="字色"
+                value={settings.color}
+                palette={TITLE_COLOR_PALETTE}
+                onChange={(c) => upd({ color: c })}
+              />
+            </>
+          ),
+        },
+        {
+          key: "stroke",
+          label: "描边",
+          children: (
+            <>
+              <div className="ts-toggle-row">
+                <label>
+                  <input type="checkbox" checked={settings.stroke} onChange={onToggleStroke} />
+                  启用描边
+                </label>
+              </div>
+              {settings.stroke && (
+                <>
+                  <SliderRow
+                    label="描边宽度"
+                    value={settings.strokeWidth ?? 4}
+                    min={0}
+                    max={20}
+                    onChange={(v) => upd({ strokeWidth: v })}
+                  />
+                  <ColorPicker
+                    label="描边颜色"
+                    value={settings.strokeColor ?? "#000000"}
+                    palette={STROKE_COLOR_PALETTE}
+                    onChange={(c) => upd({ strokeColor: c })}
+                  />
+                </>
+              )}
+            </>
+          ),
+        },
+        {
+          key: "shadow",
+          label: "阴影",
+          children: (
+            <>
+              <div className="ts-toggle-row">
+                <label>
+                  <input type="checkbox" checked={settings.shadow} onChange={onToggleShadow} />
+                  启用阴影
+                </label>
+              </div>
+              {settings.shadow && (
+                <>
+                  <SliderRow
+                    label="X偏移"
+                    value={settings.shadowOffsetX ?? 2}
+                    min={-20}
+                    max={20}
+                    onChange={(v) => upd({ shadowOffsetX: v })}
+                  />
+                  <SliderRow
+                    label="Y偏移"
+                    value={settings.shadowOffsetY ?? 2}
+                    min={-20}
+                    max={20}
+                    onChange={(v) => upd({ shadowOffsetY: v })}
+                  />
+                  <SliderRow
+                    label="模糊半径"
+                    value={settings.shadowBlur ?? 4}
+                    min={0}
+                    max={30}
+                    onChange={(v) => upd({ shadowBlur: v })}
+                  />
+                  <div className="ts-form-field">
+                    <label>阴影颜色</label>
+                    <input
+                      type="text"
+                      className="ts-input"
+                      value={settings.shadowColor ?? "rgba(0,0,0,0.8)"}
+                      onChange={(e) => upd({ shadowColor: e.target.value })}
+                      placeholder="rgba(0,0,0,0.8)"
+                    />
+                  </div>
+                </>
+              )}
+            </>
+          ),
+        },
+        {
+          key: "bg",
+          label: "背景",
+          children: (
+            <>
+              <div className="ts-toggle-row">
+                <label>
+                  <input
+                    type="checkbox"
+                    checked={settings.bgEnabled}
+                    onChange={() => upd({ bgEnabled: !settings.bgEnabled })}
+                  />
+                  启用背景色块
+                </label>
+              </div>
+              {settings.bgEnabled && (
+                <>
+                  <ColorPicker
+                    label="背景颜色（含透明度）"
+                    value={settings.bgColor}
+                    palette={BG_COLOR_PALETTE}
+                    onChange={(c) => upd({ bgColor: c })}
+                  />
+                  <SliderRow
+                    label="内边距"
+                    value={settings.bgPadding}
+                    min={0}
+                    max={40}
+                    onChange={(v) => upd({ bgPadding: v })}
+                  />
+                  <SliderRow
+                    label="圆角"
+                    value={settings.bgRadius}
+                    min={0}
+                    max={30}
+                    onChange={(v) => upd({ bgRadius: v })}
+                  />
+                </>
+              )}
+            </>
+          ),
+        },
+        {
+          key: "layout",
+          label: "排版",
+          children: (
+            <>
+              <SliderRow
+                label="每行最大字符数"
+                value={settings.maxCharsPerLine ?? 0}
+                min={0}
+                max={20}
+                unit=""
+                onChange={(v) => upd({ maxCharsPerLine: v })}
+              />
+              <div
+                className="ts-form-field"
+                style={{ fontSize: 11, color: "#9ca3af", marginTop: -4 }}
+              >
+                0 = 不自动换行（按 / 手动分行）
+              </div>
+              <SliderRow
+                label="行距倍数"
+                value={Math.round((settings.lineHeight ?? 1.2) * 100) / 100}
+                min={1}
+                max={2}
+                step={0.05}
+                unit=""
+                onChange={(v) => upd({ lineHeight: Number(v.toFixed(2)) })}
+              />
+              <SliderRow
+                label="顶部边距"
+                value={settings.marginTop ?? 24}
+                min={0}
+                max={200}
+                onChange={(v) => upd({ marginTop: v })}
+              />
+            </>
+          ),
+        },
+        ...(showCoverToggle
+          ? [
+              {
+                key: "cover",
+                label: "封面",
+                children: (
+                  <div className="ts-toggle-row">
+                    <label>
+                      <input
+                        type="checkbox"
+                        checked={coverEnabled}
+                        onChange={(e) => onToggleCover?.(e.target.checked)}
+                      />
+                      封面使用独立标题样式
+                    </label>
+                  </div>
+                ),
+              },
+            ]
+          : []),
+      ]}
+    />
+  )
+}
+
+export default TitleStyleParamsTab

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

@@ -1,29 +1,30 @@
 /**
- * 标题模板编辑器（v3 重构）
+ * 标题模板编辑器（公共组件）
  *
  * - Modal 弹窗 860px 宽
- * - 左侧：300px 竖屏预览区（图片背景+暗色渐变遮罩+透明 Canvas 叠字）+ 模板名称输入框
- * - 右侧：参数 Tab 面板（基础/描边/阴影/背景/排版），复用 TitleStylePanel 的 paramsOnly 模式
+ * - 左侧：300px 竖屏预览区（图片背景+暗角+透明 Canvas 叠字）+ 模板名称输入
+ * - 右侧：参数 Tab 面板（基础/描边/阴影/背景/排版），复用 TitleStyleParamsTab
  * - 底部：取消 / 保存模板 按钮
- * - 内置模板编辑时保存会创建副本（带"副本"逻辑由 handleSave 处理）
+ * - 内置模板编辑时保存会创建副本（带"副本"逻辑由 onSave 的调用方处理）
  */
 import React, { useEffect, useMemo, useState } from "react"
 import { Modal, Button, Input, message } from "antd"
-import TitleStylePanel from "../../pages/generate/components/title/TitleStylePanel"
-import TitleMiniPreview from "../../pages/generate/components/title/TitleMiniPreview"
-import { POSITION_OPTIONS } from "../../pages/generate/constants"
-import { FONT_OPTIONS } from "./constants"
-import type { TitleSettings } from "../../pages/generate/types"
-import { DEFAULT_TITLE_SETTINGS_FULL } from "../../pages/generate/types"
+import type { TitleStyleSettings } from "./settings"
+import { DEFAULT_TITLE_STYLE_SETTINGS } from "./settings"
 import { titleStyleConfigToCamel, camelToTitleStyleConfig } from "./utils"
 import type { TitleTemplate } from "./template-types"
 import type { TitleStyleConfig } from "./types"
+import { POSITION_OPTIONS } from "./position-options"
+import { FONT_OPTIONS } from "./constants"
+import TitleMiniPreview from "./TitleMiniPreview"
+import TitleStyleParamsTab from "./TitleStyleParamsTab"
+import "./TitleTemplate.css"
+import "./TitleStylePanel.css"
 
 interface Props {
   open: boolean
   template: TitleTemplate
   onClose: () => void
-  /** 用户点击保存：将编辑结果回调给父组件（父组件统一做 CRUD，避免双 hook 实例不同步） */
   onSave: (data: { name: string; emoji: string; style: Partial<TitleStyleConfig> }) => void
 }
 
@@ -31,10 +32,9 @@ interface Props {
 const EDITOR_BG = "/title-templates/portrait1.jpg"
 
 const TitleTemplateEditor: React.FC<Props> = ({ open, template, onClose, onSave }) => {
-  const [settings, setSettings] = useState<TitleSettings>(() => ({
-    ...DEFAULT_TITLE_SETTINGS_FULL,
+  const [settings, setSettings] = useState<TitleStyleSettings>(() => ({
+    ...DEFAULT_TITLE_STYLE_SETTINGS,
     ...titleStyleConfigToCamel(template.style || {}),
-    title: "预览标题文字",
   }))
   const [formName, setFormName] = useState(template.name || "")
   const [formEmoji, setFormEmoji] = useState(template.emoji || "✨")
@@ -43,16 +43,15 @@ const TitleTemplateEditor: React.FC<Props> = ({ open, template, onClose, onSave
   useEffect(() => {
     if (open) {
       setSettings({
-        ...DEFAULT_TITLE_SETTINGS_FULL,
+        ...DEFAULT_TITLE_STYLE_SETTINGS,
         ...titleStyleConfigToCamel(template.style || {}),
-        title: "预览标题文字",
       })
       setFormName(template.name || "")
       setFormEmoji(template.emoji || "✨")
     }
   }, [open, template])
 
-  const upd = (patch: Partial<TitleSettings>) => setSettings((s) => ({ ...s, ...patch }))
+  const upd = (patch: Partial<TitleStyleSettings>) => setSettings((s) => ({ ...s, ...patch }))
 
   const handleSave = () => {
     const name = formName.trim()
@@ -69,11 +68,11 @@ const TitleTemplateEditor: React.FC<Props> = ({ open, template, onClose, onSave
     }
   }
 
-  // 编辑器内的预览用 settings：字号适配竖屏
-  const previewSettings = useMemo<TitleSettings>(() => {
-    // 竖屏宽度 200px，按比例缩放字号，让预览看起来协调
-    return { ...settings, size: Math.round(settings.size * 0.55) }
-  }, [settings])
+  // 编辑器预览 settings：竖屏宽度 200px，字号按比例缩放
+  const previewSettings = useMemo<TitleStyleSettings>(
+    () => ({ ...settings, size: Math.round(settings.size * 0.55) }),
+    [settings],
+  )
 
   return (
     <Modal
@@ -140,7 +139,7 @@ const TitleTemplateEditor: React.FC<Props> = ({ open, template, onClose, onSave
         </div>
         {/* 右侧：参数 Tab */}
         <div className="ttv3-editor-right">
-          <TitleStylePanel
+          <TitleStyleParamsTab
             settings={settings}
             onUpdatePosition={(p) => upd({ position: p, posX: null, posY: null })}
             onUpdateFont={(f) => upd({ font: f })}
@@ -155,15 +154,9 @@ const TitleTemplateEditor: React.FC<Props> = ({ open, template, onClose, onSave
               })
             }
             onToggleShadow={() => upd({ shadow: !settings.shadow })}
-            onApplyPreset={() => {
-              /* 编辑器内不使用系统预设快捷键 */
-            }}
-            onUpdateStyle={(patch) => upd(patch)}
-            activePreset={null}
-            titlePresets={[]}
-            POSITION_OPTIONS={POSITION_OPTIONS}
-            FONT_OPTIONS={FONT_OPTIONS}
-            paramsOnly
+            onUpdatePatch={upd}
+            positionOptions={POSITION_OPTIONS}
+            fontOptions={FONT_OPTIONS}
           />
         </div>
       </div>

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

@@ -0,0 +1,343 @@
+/**
+ * 标题模板选择器 — 大卡片网格（共享组件）
+ *
+ * 渲染「我的模板」+「系统模板」两个分组的 3:4 竖版大圆角卡片：
+ * - 卡片上半：示例背景图 + vignette 暗角 + 透明 Canvas 大字预览
+ * - 卡片下半：emoji + 名称 + 系统/我的标签 + 始终可见的编辑/复制/导出/删除按钮
+ * - 选中紫色边框；右上角「新建模板」按钮；点编辑/新建弹 TitleTemplateEditor
+ *
+ * Props 通用化，不耦合业务 state。
+ */
+import React, { useCallback, useMemo, useState } from "react"
+import { Button, message, Popconfirm } from "antd"
+import {
+  PlusOutlined,
+  EditOutlined,
+  CopyOutlined,
+  DeleteOutlined,
+  ExportOutlined,
+  CheckOutlined,
+} from "@ant-design/icons"
+import type { TitleTemplate } from "./template-types"
+import type { TitleStyleSettings } from "./settings"
+import { DEFAULT_TITLE_STYLE_SETTINGS } from "./settings"
+import {
+  titleStyleConfigToCamel,
+  camelToTitleStyleConfig,
+  templateToPreviewSettings,
+} from "./utils"
+import { useTitleTemplates } from "./useTitleTemplates"
+import TitleMiniPreview from "./TitleMiniPreview"
+import TitleTemplateEditor from "./TitleTemplateEditor"
+import "./TitleTemplate.css"
+import "./TitleStylePanel.css"
+
+export interface TitleTemplateSelectorProps {
+  /** 当前选中模板 id（受控） */
+  value?: string | null
+  /** 选中模板时回调（templateId, fullStyleSettings, template） */
+  onChange?: (templateId: string, style: TitleStyleSettings, template: TitleTemplate) => void
+  /** 是否显示编辑器入口（新建/编辑按钮），默认 true */
+  showEditor?: boolean
+  /** 显示哪些分组，默认全部 */
+  categories?: Array<"system" | "custom">
+  /** 使用场景标识（仅作 data-attr，不影响样式） */
+  context?: string
+}
+
+/* ── 卡片预览背景图池（按 index 轮换） ── */
+const PREVIEW_BG_IMAGES = [
+  "/title-templates/portrait1.jpg",
+  "/title-templates/portrait2.jpg",
+  "/title-templates/scene1.jpg",
+]
+
+/* ── 预览容器：用 ref 测量宽度后再渲染透明 Canvas，保证文字清晰 ── */
+const FillPreview: React.FC<{
+  settings: TitleStyleSettings
+  sampleText: string
+  portrait?: boolean
+}> = ({ settings, sampleText, portrait }) => {
+  const [w, setW] = useState(0)
+  // 首次挂载后测量一次
+  const setRef = useCallback((el: HTMLDivElement | null) => {
+    if (el) setW(Math.floor(el.clientWidth))
+  }, [])
+  return (
+    <div ref={setRef} className="tt-fill-canvas-wrap">
+      {w > 0 && (
+        <TitleMiniPreview
+          settings={settings}
+          width={w}
+          sampleText={sampleText}
+          transparent
+          portrait={portrait}
+        />
+      )}
+    </div>
+  )
+}
+
+const TitleTemplateSelector: React.FC<TitleTemplateSelectorProps> = ({
+  value,
+  onChange,
+  showEditor = true,
+  categories = ["system", "custom"],
+  context,
+}) => {
+  const {
+    templates,
+    createTemplate,
+    duplicateTemplate,
+    updateTemplate,
+    deleteTemplate,
+    exportTemplate,
+  } = useTitleTemplates()
+
+  const [editingTemplate, setEditingTemplate] = useState<TitleTemplate | null>(null)
+  const [editorOpen, setEditorOpen] = useState(false)
+
+  const grouped = useMemo(
+    () => ({
+      builtin: templates.filter((t) => t.isBuiltin),
+      custom: templates.filter((t) => !t.isBuiltin),
+    }),
+    [templates],
+  )
+
+  const showSys = categories.includes("system")
+  const showMine = categories.includes("custom")
+
+  /* ── 选中模板：合成完整 TitleStyleSettings 回调给父组件 ── */
+  const handleSelectTemplate = useCallback(
+    (tpl: TitleTemplate) => {
+      const full: TitleStyleSettings = {
+        ...DEFAULT_TITLE_STYLE_SETTINGS,
+        ...titleStyleConfigToCamel(tpl.style),
+      }
+      onChange?.(tpl.id, full, tpl)
+    },
+    [onChange],
+  )
+
+  const handleRequestCreate = useCallback(() => {
+    // 新建：以当前选中模板样式为起点，否则用默认样式
+    let base: TitleStyleSettings = DEFAULT_TITLE_STYLE_SETTINGS
+    if (value) {
+      const sel = templates.find((t) => t.id === value)
+      if (sel) {
+        base = { ...DEFAULT_TITLE_STYLE_SETTINGS, ...titleStyleConfigToCamel(sel.style) }
+      }
+    }
+    const draft: TitleTemplate = {
+      id: "",
+      name: "我的标题模板",
+      emoji: "✨",
+      isBuiltin: false,
+      style: camelToTitleStyleConfig({
+        ...base,
+        position: base.position === "custom" ? "bottom" : base.position,
+      }),
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    }
+    setEditingTemplate(draft)
+    setEditorOpen(true)
+  }, [value, templates])
+
+  const handleRequestEdit = useCallback((tpl: TitleTemplate) => {
+    setEditingTemplate(tpl)
+    setEditorOpen(true)
+  }, [])
+
+  const handleDuplicate = useCallback(
+    (t: TitleTemplate) => {
+      const dup = duplicateTemplate(t.id)
+      if (dup) message.success(`已复制：${dup.name}`)
+    },
+    [duplicateTemplate],
+  )
+  const handleDelete = useCallback(
+    (t: TitleTemplate) => {
+      deleteTemplate(t.id)
+      message.success("已删除模板")
+    },
+    [deleteTemplate],
+  )
+  const handleExport = useCallback(
+    (t: TitleTemplate) => {
+      const json = exportTemplate(t.id)
+      if (!json) return
+      const blob = new Blob([json], { type: "application/json" })
+      const url = URL.createObjectURL(blob)
+      const a = document.createElement("a")
+      a.href = url
+      a.download = `${t.name}.title-template.json`
+      a.click()
+      URL.revokeObjectURL(url)
+    },
+    [exportTemplate],
+  )
+
+  const handleEditorSave = useCallback(
+    (data: { name: string; emoji: string; style: Partial<import("./types").TitleStyleConfig> }) => {
+      if (!editingTemplate) return
+      let saved: TitleTemplate
+      if (editingTemplate.isBuiltin || !editingTemplate.id) {
+        saved = createTemplate({ name: data.name, emoji: data.emoji, style: data.style })
+      } else {
+        updateTemplate(editingTemplate.id, {
+          name: data.name,
+          emoji: data.emoji,
+          style: data.style,
+        })
+        saved = {
+          ...editingTemplate,
+          name: data.name,
+          emoji: data.emoji,
+          style: data.style,
+          updatedAt: new Date().toISOString(),
+        }
+      }
+      setEditorOpen(false)
+      setEditingTemplate(null)
+      message.success(`已保存：${data.name}`)
+      handleSelectTemplate(saved)
+    },
+    [editingTemplate, createTemplate, updateTemplate, handleSelectTemplate],
+  )
+
+  /* ── 渲染单张大卡片 ── */
+  const renderCard = (t: TitleTemplate, idx: number, section: "mine" | "sys") => {
+    const isSelected = value === t.id
+    const bgIdx = idx % PREVIEW_BG_IMAGES.length
+    const bgImg = PREVIEW_BG_IMAGES[bgIdx]
+    const preview = templateToPreviewSettings(t, 42)
+    return (
+      <div
+        key={t.id}
+        className={`ttv3-card${isSelected ? " selected" : ""}`}
+        onClick={() => handleSelectTemplate(t)}
+        data-context={context}
+      >
+        <div className="ttv3-preview">
+          <img className="ttv3-bg" src={bgImg} alt="" />
+          <div className="ttv3-vignette" />
+          <FillPreview settings={preview} sampleText="预览标题文字" portrait />
+          <span className={`ttv3-badge ttv3-badge--${section}`}>
+            {section === "sys" ? "系统" : "我的"}
+          </span>
+          <span className={`ttv3-check${isSelected ? " on" : ""}`}>
+            {isSelected && <CheckOutlined />}
+          </span>
+        </div>
+        <div className="ttv3-footer">
+          <div className="ttv3-name-row">
+            <span className="ttv3-emoji">{t.emoji || "✨"}</span>
+            <span className="ttv3-name" title={t.name}>
+              {t.name}
+            </span>
+            <span className={`ttv3-tag ttv3-tag--${section}`}>
+              {section === "sys" ? "系统" : "我的"}
+            </span>
+          </div>
+          {showEditor && (
+            <div className="ttv3-actions" onClick={(e) => e.stopPropagation()}>
+              <button
+                type="button"
+                className="ttv3-act ttv3-act--primary"
+                disabled={t.isBuiltin}
+                onClick={() => handleRequestEdit(t)}
+                title={t.isBuiltin ? "系统模板不可编辑，点击复制后可编辑" : "编辑"}
+              >
+                <EditOutlined /> 编辑
+              </button>
+              <button
+                type="button"
+                className="ttv3-act"
+                onClick={() => handleDuplicate(t)}
+                title="复制"
+              >
+                <CopyOutlined /> 复制
+              </button>
+              <button
+                type="button"
+                className="ttv3-act"
+                onClick={() => handleExport(t)}
+                title="导出"
+              >
+                <ExportOutlined /> 导出
+              </button>
+              <Popconfirm title="删除该模板？" onConfirm={() => handleDelete(t)}>
+                <button
+                  type="button"
+                  className="ttv3-act ttv3-act--danger"
+                  disabled={t.isBuiltin}
+                  title={t.isBuiltin ? "系统模板不可删除" : "删除"}
+                >
+                  <DeleteOutlined /> 删除
+                </button>
+              </Popconfirm>
+            </div>
+          )}
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div className="xx-title-style-section ttv3-panel">
+      <div className="ttv3-header">
+        <span className="ttv3-title">标题模板</span>
+        {showEditor && (
+          <Button
+            type="primary"
+            size="small"
+            icon={<PlusOutlined />}
+            onClick={handleRequestCreate}
+            className="ttv3-new-btn"
+          >
+            新建模板
+          </Button>
+        )}
+      </div>
+
+      {showMine && (
+        <div className="ttv3-section">
+          <div className="ttv3-section-label">我的模板</div>
+          {grouped.custom.length === 0 ? (
+            <div className="ttv3-empty">
+              <div className="ttv3-empty-icon">✨</div>
+              <div className="ttv3-empty-text">还没有自定义模板，点右上角「新建模板」创建</div>
+            </div>
+          ) : (
+            <div className="ttv3-grid">
+              {grouped.custom.map((t, i) => renderCard(t, i, "mine"))}
+            </div>
+          )}
+        </div>
+      )}
+
+      {showSys && (
+        <div className="ttv3-section">
+          <div className="ttv3-section-label">系统模板</div>
+          <div className="ttv3-grid">{grouped.builtin.map((t, i) => renderCard(t, i, "sys"))}</div>
+        </div>
+      )}
+
+      {showEditor && editorOpen && editingTemplate && (
+        <TitleTemplateEditor
+          open={editorOpen}
+          template={editingTemplate}
+          onClose={() => {
+            setEditorOpen(false)
+            setEditingTemplate(null)
+          }}
+          onSave={handleEditorSave}
+        />
+      )}
+    </div>
+  )
+}
+
+export default TitleTemplateSelector

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

@@ -20,54 +20,84 @@ export const FONT_OPTIONS: FontOption[] = [
   {
     value: "优设标题黑",
     label: "优设标题黑",
+    // 原版"优设标题黑"为商用字体非开源；优先本地已安装字体，兜底用 Noto Sans SC（Google Fonts 已加载 wght@900，保证 bold 字重可用），再用 ZCOOL 庆科黄油体作风格兜底
     family:
-      '"YouShe Title Black","YouSheBiaoTiHei","Source Han Sans SC Heavy","Noto Sans SC","PingFang SC",sans-serif',
+      '"YouSheBiaoTiHei","YouShe Title Black","Noto Sans SC","ZCOOL QingKe HuangYou","PingFang SC","Microsoft YaHei",sans-serif',
     tag: "hot",
   },
   {
     value: "阿里普惠体Bold",
     label: "阿里普惠体Bold",
+    // 阿里普惠体需从阿里官网下载；兜底用 Noto Sans SC 900（同等字重，已在 Google Fonts wght@400;500;700;900 加载）
     family:
-      '"Alibaba PuHuiTi Bold","Alibaba PuHuiTi","Source Han Sans SC","PingFang SC",sans-serif',
+      '"Alibaba PuHuiTi","Alibaba PuHuiTi Bold","Alibaba Sans","Noto Sans SC",system-ui,"PingFang SC","Microsoft YaHei",sans-serif',
     tag: "hot",
   },
   {
     value: "抖音美好体",
     label: "抖音美好体",
-    family: '"Douyin Sans","DouyinSans","Source Han Sans SC","PingFang SC",sans-serif',
+    // 抖音美好体为版权字体；兜底用 Noto Sans SC（确保 bold 字重可用），再用 ZCOOL KuaiLe（站酷快乐体，圆润卡通风格近似）
+    family:
+      '"Douyin Sans","DouyinSans","Noto Sans SC","ZCOOL KuaiLe","PingFang SC","Microsoft YaHei",sans-serif',
     tag: "hot",
   },
   {
     value: "思源黑体Heavy",
     label: "思源黑体Heavy",
     family:
-      '"Source Han Sans SC Heavy","Noto Sans SC","Source Han Sans CN Heavy","PingFang SC",sans-serif',
+      '"Noto Sans SC","Source Han Sans SC","Source Han Sans CN Heavy","PingFang SC","Microsoft YaHei",sans-serif',
     tag: "new",
   },
   {
     value: "思源黑体",
     label: "思源黑体",
-    family: '"Source Han Sans SC","Noto Sans SC","PingFang SC","Microsoft YaHei",sans-serif',
+    family: '"Noto Sans SC","Source Han Sans SC","PingFang SC","Microsoft YaHei",sans-serif',
   },
   {
     value: "思源宋体",
     label: "思源宋体",
-    family: '"Source Han Serif SC","Noto Serif SC","Songti SC","SimSun",serif',
+    family: '"Noto Serif SC","Source Han Serif SC","Songti SC","SimSun",serif',
   },
   {
     value: "苹方",
     label: "苹方",
-    family: '"PingFang SC",-apple-system,"Helvetica Neue",sans-serif',
+    family:
+      '"PingFang SC",-apple-system,blinkmacsystemfont,"Helvetica Neue","Noto Sans SC",sans-serif',
   },
   {
     value: "微软雅黑",
     label: "微软雅黑",
-    family: '"Microsoft YaHei","PingFang SC",sans-serif',
+    family: '"Microsoft YaHei","PingFang SC","Noto Sans SC",sans-serif',
   },
   {
     value: "楷体",
     label: "楷体",
-    family: '"KaiTi","STKaiti","DFKai-SB",serif',
+    family: '"KaiTi","STKaiti","DFKai-SB","Kaiti SC",serif',
+  },
+  {
+    value: "站酷小薇体",
+    label: "站酷小薇体",
+    family: '"ZCOOL XiaoWei","Noto Serif SC",serif',
+  },
+  {
+    value: "马善政毛笔",
+    label: "马善政毛笔",
+    family: '"Ma Shan Zheng","STXingkai","KaiTi",cursive',
+  },
+  {
+    value: "龙藏体",
+    label: "龙藏体",
+    family: '"Long Cang","STXingkai","KaiTi",cursive',
+  },
+  {
+    value: "流江毛笔草",
+    label: "流江毛笔草",
+    family: '"Liu Jian Mao Cao","STXingkai",cursive',
+  },
+  {
+    value: "志莽行书",
+    label: "志莽行书",
+    family: '"Zhi Mang Xing","STXingkai",cursive',
   },
 ]
 

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

@@ -0,0 +1,19 @@
+/**
+ * 公共标题模板/样式组件统一导出
+ *
+ * 任何页面需要标题样式配置/模板选择/模板编辑，从这里 import，
+ * 不要直接 import pages/generate/components/title/* 下的内部组件。
+ */
+export { default as TitleTemplateSelector } from "./TitleTemplateSelector"
+export { default as TitleTemplateEditor } from "./TitleTemplateEditor"
+export { default as TitleStyleParamsTab } from "./TitleStyleParamsTab"
+export { default as TitleMiniPreview } from "./TitleMiniPreview"
+export { useTitleTemplates } from "./useTitleTemplates"
+export * from "./constants"
+export * from "./types"
+export * from "./template-types"
+export * from "./settings"
+export * from "./utils"
+export { POSITION_OPTIONS } from "./position-options"
+export type { PositionOption, FontOption, TitleStyleParamsTabProps } from "./TitleStyleParamsTab"
+export type { TitleTemplateSelectorProps } from "./TitleTemplateSelector"

apps/web/src/components/title/position-options.ts

@@ -0,0 +1,14 @@
+/**
+ * 标题位置选项（公共常量）
+ */
+export interface PositionOption {
+  value: string
+  label: string
+}
+
+export const POSITION_OPTIONS: PositionOption[] = [
+  { value: "top", label: "顶部" },
+  { value: "center", label: "居中" },
+  { value: "bottom", label: "底部" },
+  { value: "custom", label: "自定义" },
+]

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

@@ -0,0 +1,64 @@
+/**
+ * 标题样式设置 — 公共 camelCase 类型与默认值
+ *
+ * 本文件是 @/components/title 公共包的唯一样式类型出口，不依赖任何业务页面（generate/ai-avatar）的私有类型。
+ * - 字段与后端 snake_case TitleStyleConfig 一一对应（camelCase 版本）
+ * - DEFAULT_TITLE_STYLE_SETTINGS 用于组件内部补全默认值
+ * - aiAutoSelect / title / coverTitle 等业务状态不在本类型中——它们属于页面业务 state
+ */
+import type { TitleLineOverride } from "./types"
+
+export interface TitleStyleSettings {
+  position: string
+  font: string
+  size: number
+  bold: boolean
+  italic: boolean
+  stroke: boolean
+  shadow: boolean
+  color: string
+  posX: number | null
+  posY: number | null
+  lineHeight: number
+  marginTop: number
+  maxCharsPerLine: number
+  strokeWidth: number
+  strokeColor: string
+  shadowOffsetX: number
+  shadowOffsetY: number
+  shadowBlur: number
+  shadowColor: string
+  bgEnabled: boolean
+  bgColor: string
+  bgPadding: number
+  bgRadius: number
+  lineOverrides: TitleLineOverride[]
+}
+
+/** 公共默认样式（经典白字黑描边） */
+export const DEFAULT_TITLE_STYLE_SETTINGS: TitleStyleSettings = {
+  position: "bottom",
+  font: "思源黑体",
+  size: 56,
+  bold: true,
+  italic: false,
+  stroke: true,
+  shadow: false,
+  color: "#ffffff",
+  posX: null,
+  posY: null,
+  lineHeight: 1.2,
+  marginTop: 24,
+  maxCharsPerLine: 10,
+  strokeWidth: 5,
+  strokeColor: "#000000",
+  shadowOffsetX: 2,
+  shadowOffsetY: 2,
+  shadowBlur: 4,
+  shadowColor: "rgba(0,0,0,0.8)",
+  bgEnabled: false,
+  bgColor: "rgba(0,0,0,0.5)",
+  bgPadding: 12,
+  bgRadius: 8,
+  lineOverrides: [],
+}

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

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

apps/web/src/config/navigation.ts

@@ -18,6 +18,7 @@ import {
   ThunderboltOutlined,
   UnorderedListOutlined,
   UserOutlined,
+  FireOutlined,
 } from "@ant-design/icons"
 
 /** 导航项类型 */
@@ -76,6 +77,12 @@ export const NAV_ITEMS: NavItem[] = [
     path: "/app/ai-avatar",
     icon: React.createElement(UserOutlined),
   },
+  {
+    key: "viral-video",
+    label: "爆款视频",
+    path: "/app/viral-video",
+    icon: React.createElement(FireOutlined),
+  },
   {
     key: "history",
     label: "任务历史",
@@ -142,6 +149,12 @@ export const NAV_GROUPS: NavGroup[] = [
         path: "/app/ai-avatar",
         icon: React.createElement(UserOutlined),
       },
+      {
+        key: "viral-video",
+        label: "爆款视频",
+        path: "/app/viral-video",
+        icon: React.createElement(FireOutlined),
+      },
     ],
   },
   {

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

@@ -80,6 +80,8 @@ const AiAvatarPage: React.FC = () => {
   const [finalizeLoading, setFinalizeLoading] = useState(false)
 
   /* ── 对口型轮询 ── */
+  /** 对口型轮询总时长上限（10分钟）：超过后停止轮询并提示去历史记录查看 */
+  const LIPSYNC_POLL_MAX_MS = 10 * 60 * 1000
   const lipsyncTimerRef = useRef<ReturnType<typeof setInterval> | null>(null)
   /* ── 渲染进度轮询 ── */
   const renderTimerRef = useRef<ReturnType<typeof setInterval> | null>(null)
@@ -270,7 +272,24 @@ const AiAvatarPage: React.FC = () => {
       // 如果是预合成模式，后端会同步把状态置为 submitted（甚至可能已返回 running），
       // 但仍需轮询等 completed
       if (lipsyncTimerRef.current) clearInterval(lipsyncTimerRef.current)
+      // 轮询间隔 5 秒；单请求超时 5 分钟（见 api/aiAvatar.ts）；总轮询上限 10 分钟
+      // 单次请求失败/超时不中断轮询，继续下一轮；超过总上限后停止并提示用户去历史记录查看
       lipsyncTimerRef.current = setInterval(async () => {
+        // 总时长保护：超过 10 分钟停止轮询
+        if (Date.now() - lipsyncStartAtRef.current > LIPSYNC_POLL_MAX_MS) {
+          if (lipsyncTimerRef.current) {
+            clearInterval(lipsyncTimerRef.current)
+            lipsyncTimerRef.current = null
+          }
+          if (lipsyncTickRef.current) {
+            clearInterval(lipsyncTickRef.current)
+            lipsyncTickRef.current = null
+          }
+          setLipsyncStatus("failed")
+          setLipsyncErrorMessage("渲染时间较长，请稍后在历史记录中查看")
+          message.warning("对口型渲染时间较长，已停止自动刷新，请稍后在历史记录中查看")
+          return
+        }
         try {
           const updated = await getLipsyncJob(job.id)
           state.setLipsyncJob(updated)
@@ -296,9 +315,10 @@ const AiAvatarPage: React.FC = () => {
             setLipsyncErrorMessage(updated.error_message || "对口型生成失败")
           }
         } catch (err) {
-          console.error("[对口型] 轮询错误:", err)
+          // 单次轮询失败（含 timeout）：不中断轮询，打印日志后等下一轮
+          console.warn("[对口型] 轮询请求失败，将继续下一轮:", err)
         }
-      }, 3000)
+      }, 5000)
     } catch (err) {
       console.error("[对口型] 创建失败:", {
         status: (err as { response?: { status?: number } })?.response?.status,
@@ -580,20 +600,6 @@ const AiAvatarPage: React.FC = () => {
 
   return (
     <div className="aa-page">
-      <div className="aa-page-header">
-        <h1>AI数字人</h1>
-      </div>
-
-      {/* 步骤切换导航条 */}
-      <div className="aa-step-nav">
-        <span className={`aa-step-nav__item${currentStep === 1 ? " active" : ""}`}>
-          1. 视频 / 配音 / 文案
-        </span>
-        <span className={`aa-step-nav__item${currentStep === 2 ? " active" : ""}`}>
-          2. 对口型 / 标题 / 封面 / 生成
-        </span>
-      </div>
-
       <div className="aa-page-body">
         {/* ════ 步骤 1：出镜视频 / 配音库 / 文案 ════ */}
         {currentStep === 1 && (
@@ -726,17 +732,11 @@ const AiAvatarPage: React.FC = () => {
               <div className="aa-panel__body">
                 {currentRenderJob?.status !== "completed" ? (
                   <PanelCoverAndGenerate
-                    variant="setup"
-                    coverConfig={state.coverConfig}
-                    onCoverConfigChange={(partial) =>
-                      state.setCoverConfig((prev) => ({ ...prev, ...partial }))
-                    }
-                    renderJob={currentRenderJob}
-                    onGenerateRenderSmartCover={handleGenerateRenderSmartCover}
                     resolution={state.resolution}
                     onResolutionChange={state.setResolution}
                     isGenerating={state.isGenerating}
                     onGenerate={handleGenerate}
+                    renderJob={currentRenderJob}
                     summary={summary}
                   />
                 ) : (

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

@@ -72,7 +72,8 @@ export const previewTts = async (data: {
 }
 
 export const getLipsyncJob = async (id: string): Promise<LipsyncJob> => {
-  const response = await apiClient.get<LipsyncJob>(`/lipsync/jobs/${id}`, { timeout: 60000 })
+  // MuseTalk 渲染 8s 视频约 54s + 排队时间，给足 5 分钟超时避免单次轮询 AxiosError 中断
+  const response = await apiClient.get<LipsyncJob>(`/lipsync/jobs/${id}`, { timeout: 300_000 })
   return response.data
 }
 
@@ -91,7 +92,10 @@ export const submitRender = async (data: {
 }
 
 export const getRenderJob = async (jobId: string): Promise<RenderJob> => {
-  const response = await apiClient.get<RenderJob>(`/ai-avatar/render/${jobId}`, { timeout: 60000 })
+  // 渲染链路（对口型+B-roll+标题+合成+上传）耗时较长，给足 5 分钟超时
+  const response = await apiClient.get<RenderJob>(`/ai-avatar/render/${jobId}`, {
+    timeout: 300_000,
+  })
   return response.data
 }
 
@@ -99,15 +103,18 @@ export const cancelRenderJob = async (jobId: string): Promise<void> => {
   await apiClient.post(`/ai-avatar/render/${jobId}/cancel`)
 }
 
-/* ── 从最终渲染成片智能抽封面（POST /ai-avatar/renders/{job_id}/smart-cover） ── */
+/* ── 从最终渲染成片智能抽封面（POST /ai-avatar/render/{job_id}/smart-cover） ──
+ * #2033 共享封面组件：支持传 template_id（模板ID，传 default 走默认智能抽帧）
+ */
 export const generateRenderSmartCover = async (
   jobId: string,
+  templateId: string = "default",
 ): Promise<{ cover_url: string; status: string; message: string }> => {
   const response = await apiClient.post<{ cover_url: string; status: string; message: string }>(
     `/ai-avatar/render/${jobId}/smart-cover`,
-    {},
-    // 抽帧+评分+转存 OSS 链路较长，120s 超时
-    { timeout: 120000 },
+    templateId && templateId !== "default" ? { template_id: templateId } : {},
+    // 抽帧+评分+转存 OSS 链路较长，120s 超时；使用模板时叠加文字渲染再加 60s
+    { timeout: templateId && templateId !== "default" ? 180000 : 120000 },
   )
   return response.data
 }

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

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

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

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

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

@@ -412,7 +412,7 @@ const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpda
         onUpdateStyle={handleUpdateStyle}
         showCoverToggle
         previewWidth={280}
-        enableTemplates
+        enableTemplates={true}
         selectedTemplateId={selectedTemplateId}
         onApplyTemplate={handleApplyTemplate}
         activePreset={activePreset}

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

@@ -13,15 +13,12 @@ import CloneModal from "@/components/voice/CloneModal"
 import VoiceSelectModal from "./components/VoiceSelectModal"
 import ScriptSelectModal from "./components/ScriptSelectModal"
 import TtsVoiceModal from "./components/TtsVoiceModal"
-import GenerateHeader from "./components/GenerateHeader"
-import PreviewCountModal from "./components/PreviewCountModal"
-import GenerateStepsBar from "./components/GenerateStepsBar"
 import GenerateStepContent from "./components/GenerateStepContent"
 import GenerateStepActions from "./components/GenerateStepActions"
 import { useGenerateFormState } from "./hooks/useGenerateFormState"
 import { useStepNavigation } from "./hooks/useStepNavigation"
 import { useGenerateVideo } from "./hooks/useGenerateVideo"
-import { confirmGeneration } from "@/api/generation/confirm"
+import { finalizeGeneration } from "@/api/generation/finalize"
 
 import { useBatchVariantPlans } from "./hooks/useBatchVariantPlans"
 import { useTitleStyleUpdaters } from "./hooks/useStep4Title/useTitleStyleUpdaters"
@@ -89,7 +86,6 @@ const GeneratePage: React.FC = () => {
     style,
     autoSubtitles,
     bgm,
-    editPlanId,
     sourceEditPlanId,
     previewTaskId,
     setPreviewTaskId,
@@ -107,6 +103,7 @@ const GeneratePage: React.FC = () => {
     setPreviewCovers,
     selectedVariantIds,
     setSelectedVariantIds,
+    setSelectedTemplate,
   } = formState
 
   const isBatch = previewCount > 1
@@ -137,8 +134,8 @@ const GeneratePage: React.FC = () => {
     }
   }, [selectedVoice, isBatch, voiceModePerVideo, setVoiceLibraryIds])
 
-  /* ── 数量选择弹窗 ── */
-  const [countModalOpen, setCountModalOpen] = useState(false)
+  /* ── 标题面板模式：true = 内联大卡片模板网格（默认），false = 旧预设+参数 Tab ── */
+  const enableTemplates = true
 
   /* ── Step5 保存中状态 ── */
   const [finishing, setFinishing] = useState(false)
@@ -199,6 +196,7 @@ const GeneratePage: React.FC = () => {
     generated,
     generateError,
     generatedVideos,
+    currentTaskId,
     batchTasks,
     generate: handleGenerate,
     retry: handleRetryGenerate,
@@ -238,44 +236,48 @@ const GeneratePage: React.FC = () => {
     voiceModePerVideo,
     variantCoverUrls: previewCovers,
     selectedVariantIndexes: isBatch ? selectedVariantIds : undefined,
-    onGenerationSuccess: () => {
+    onGenerationSuccess: (status?: "completed" | "awaiting_cover") => {
       setPreviewTaskId(null)
       setStoredSourceEditPlanId(null)
+      // #2088：渲染完成后自动跳到封面选择页（step 5），不再等用户手动点「下一步」
+      // awaiting_cover 和 completed 都走封面页（completed 是旧 worker 或 finalize 后状态，仍支持选封面）
+      if (status === "awaiting_cover" || status === "completed" || !status) {
+        setCurrentStep(5)
+      }
     },
   })
 
-  /* ── 数量弹窗确认 ── */
-  const handleCountConfirm = useCallback(
-    (count: number) => {
-      setPreviewCount(count)
-      setCountModalOpen(false)
-      setPreviewTitles((prev) => {
-        const list = prev || []
-        const base = list[0] || titleSettings.title || ""
-        return Array.from({ length: count }, (_, i) => list[i] ?? (i === 0 ? base : ""))
-      })
-      setVoiceLibraryIds((prev) => {
-        const list = prev || []
-        return Array.from({ length: count }, (_, i) => list[i] ?? selectedVoice ?? "")
-      })
-      setPreviewCovers((prev) => {
-        const list = prev || []
-        return Array.from({ length: count }, (_, i) => list[i] ?? "")
-      })
-      setSelectedVariantIds(Array.from({ length: count }, (_, i) => i))
-      setCurrentStep(3)
-    },
-    [
-      setPreviewCount,
-      setPreviewTitles,
-      setVoiceLibraryIds,
-      setPreviewCovers,
-      setSelectedVariantIds,
-      setCurrentStep,
-      titleSettings.title,
-      selectedVoice,
-    ],
-  )
+  /* ── 对齐批量数组长度到 previewCount（用于进入 Step3 时） ── */
+  const ensureArraysAligned = useCallback(() => {
+    setPreviewTitles((prev) => {
+      const list = prev || []
+      if (list.length === previewCount) return list
+      const base = list[0] || titleSettings.title || ""
+      return Array.from({ length: previewCount }, (_, i) => list[i] ?? (i === 0 ? base : ""))
+    })
+    setVoiceLibraryIds((prev) => {
+      const list = prev || []
+      if (list.length === previewCount) return list
+      return Array.from({ length: previewCount }, (_, i) => list[i] ?? selectedVoice ?? "")
+    })
+    setPreviewCovers((prev) => {
+      const list = prev || []
+      if (list.length === previewCount) return list
+      return Array.from({ length: previewCount }, (_, i) => list[i] ?? "")
+    })
+    setSelectedVariantIds((prev) => {
+      if (prev && prev.length === previewCount) return prev
+      return Array.from({ length: previewCount }, (_, i) => i)
+    })
+  }, [
+    previewCount,
+    setPreviewTitles,
+    setVoiceLibraryIds,
+    setPreviewCovers,
+    setSelectedVariantIds,
+    titleSettings.title,
+    selectedVoice,
+  ])
 
   /* ── #1970：Step1 弹窗回调 ── */
   const handleVoiceModalConfirm = useCallback(
@@ -398,7 +400,7 @@ const GeneratePage: React.FC = () => {
     smartSelectedIds,
     titleSettings,
     generated,
-    onOpenCountModal: () => setCountModalOpen(true),
+    onBeforeEnterStep3: ensureArraysAligned,
     onOpenStep1Modal: () => {
       if (editMode === "random") {
         setVoiceModalOpen(true)
@@ -411,7 +413,7 @@ const GeneratePage: React.FC = () => {
   /* ── 最终成片（单视频） ── */
   const finalVideo = generatedVideos[0]
 
-  /* ── Step5 完成：调用 confirm 入库 + 跳转 ── */
+  /* ── Step5 完成：先 confirm（同步标题/封面到任务）再 finalize（正式入库成品库） ── */
   const handleFinish = useCallback(async () => {
     if (finishing) return
     // 校验：单视频必须已生成；批量必须所有已选视频有封面或确认跳过
@@ -421,7 +423,10 @@ const GeneratePage: React.FC = () => {
         return
       }
     } else {
-      if (!finalVideo) {
+      // 单视频：finalVideo 可能因 /results 接口在 awaiting_cover 阶段暂未返回
+      // GeneratedVideo 记录而为 undefined；此时 currentTaskId 已在创建任务时保存，
+      // 下面 singleTaskId 兜底逻辑会用 currentTaskId 调 finalize，不应拦截
+      if (!finalVideo && !currentTaskId) {
         message.warning("请等待视频生成完成")
         return
       }
@@ -429,31 +434,38 @@ const GeneratePage: React.FC = () => {
     setFinishing(true)
     const hide = message.loading("正在保存到视频库...", 0)
     try {
-      const taskIds =
-        batchTasks && batchTasks.length > 0
-          ? batchTasks.map((t) => t.taskId).filter(Boolean)
-          : finalVideo?.generation_task_id
-            ? [finalVideo.generation_task_id]
-            : []
+      // 收集需要 finalize 的任务 ID：批量用 batchTasks；单视频优先用 finalVideo.generation_task_id，兜底 currentTaskId
+      const singleTaskId = finalVideo?.generation_task_id || currentTaskId || ""
 
-      // 单视频/批量：为每个任务调用 confirm（传入封面）
-      if (isBatch && previewCovers.length > 0) {
+      // 单视频/批量：为每个任务调用 finalize（入库 + 绑定封面 + 自定义标题）
+      // 批量时必须按 batchTasks[i].variantIndex 对齐 previewCovers/previewTitles（taskIds 顺序不一定按变体序号）
+      if (isBatch && batchTasks.length > 0) {
         await Promise.all(
-          taskIds.map(async (taskId, idx) => {
-            const coverUrl = previewCovers[idx] || ""
-            return confirmGeneration(taskId, {
+          batchTasks.map(async (task) => {
+            const vi = task.variantIndex
+            const rawCoverUrl = previewCovers[vi] || ""
+            const coverUrl = rawCoverUrl.startsWith("blob:") ? "" : rawCoverUrl
+            const title = previewTitles[vi] || titleSettings.title || ""
+            return finalizeGeneration(task.taskId, {
               cover_url: coverUrl || undefined,
-              custom_title: previewTitles[idx] || titleSettings.title || "",
+              custom_title: title || undefined,
             })
           }),
         )
-      } else if (finalVideo?.generation_task_id) {
-        const coverUrl = coverSettings.thumbnail_url || coverSettings.upload_url || ""
-        await confirmGeneration(finalVideo.generation_task_id, {
+      } else if (singleTaskId) {
+        // 单视频：cover_url 仅在非 blob: 本地预览地址时才传；blob: URL 浏览器本地临时地址，
+        // 后端无法下载，此时不传让后端回退自动截帧封面（避免 400 保存失败）。
+        // 正常流程本地上传完成后 uploadLocalCover 会把 URL 替换为 OSS 真实 URL，这里仅兜底异常场景。
+        const rawCoverUrl = coverSettings.thumbnail_url || coverSettings.upload_url || ""
+        const coverUrl = rawCoverUrl.startsWith("blob:") ? "" : rawCoverUrl
+        await finalizeGeneration(singleTaskId, {
           cover_url: coverUrl || undefined,
-          custom_title: titleSettings.title || "",
+          custom_title: titleSettings.title || undefined,
         })
+      } else {
+        console.warn("[handleFinish] 未找到任务 ID，跳过 finalize 直接跳转")
       }
+
       hide()
       message.success("已保存到视频库")
       navigate("/app/products")
@@ -480,6 +492,7 @@ const GeneratePage: React.FC = () => {
     previewTitles,
     titleSettings.title,
     coverSettings,
+    currentTaskId,
     navigate,
   ])
 
@@ -507,10 +520,6 @@ const GeneratePage: React.FC = () => {
 
   return (
     <div className="xx-generate-page">
-      <GenerateHeader fromEditPlan={!!editPlanId} />
-
-      <GenerateStepsBar currentStep={currentStep} onStepClick={setCurrentStep} />
-
       <div className={layoutClassName}>
         {/* ════ 步骤1~2 表单 / 步骤3 标题设置 / 步骤4 确认生成进度 / 步骤5 封面 ════ */}
         <div className="xx-generate-form">
@@ -538,7 +547,7 @@ const GeneratePage: React.FC = () => {
             onUpdateStyle={styleUpdaters.updateStyle}
             activePreset={styleUpdaters.activePreset}
             titlePresets={styleUpdaters.titlePresets}
-            enableTemplates
+            enableTemplates={enableTemplates}
             selectedTemplateId={selectedTitleTemplateId}
             onApplyTemplate={(settings, tpl) => {
               styleUpdaters.applyTemplate(settings)
@@ -562,6 +571,8 @@ const GeneratePage: React.FC = () => {
             generateError={generateError}
             progress={progress}
             generatedVideos={generatedVideos}
+
+            currentTaskId={currentTaskId}
             onRetry={handleRetryGenerate}
             onRetryBatchTask={handleRetryBatchTask}
             onDismissError={handleDismissError}
@@ -576,6 +587,9 @@ const GeneratePage: React.FC = () => {
             previewCovers={previewCovers}
             onPreviewCoversChange={setPreviewCovers}
             selectedVariantIds={selectedVariantIds}
+            selectedCoverTemplate={selectedTemplate}
+            onSelectedCoverTemplateChange={setSelectedTemplate}
+            onConfirmGenerate={handleConfirmGenerate}
           />
 
           {/* ════ 步骤4（单视频）：成片播放器 ════ */}
@@ -663,14 +677,6 @@ const GeneratePage: React.FC = () => {
         </div>
       </div>
 
-      {/* 数量选择弹窗 */}
-      <PreviewCountModal
-        open={countModalOpen}
-        defaultCount={1}
-        onConfirm={handleCountConfirm}
-        onCancel={() => setCountModalOpen(false)}
-      />
-
       {/* 音色克隆弹窗 */}
       <CloneModal
         open={cloneModalOpen}

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

@@ -11,7 +11,12 @@
  *   防止长标题在窄列里溢出导致与相邻卡片进度条视觉重叠。
  */
 import React from "react"
-import { LoadingOutlined, CheckCircleFilled, CloseCircleOutlined } from "@ant-design/icons"
+import {
+  LoadingOutlined,
+  CheckCircleFilled,
+  CloseCircleOutlined,
+  ClockCircleOutlined,
+} from "@ant-design/icons"
 import type { BatchTaskState } from "../hooks/generate-video/useGenerationPolling"
 import type { GeneratedVideo } from "@/api/template-editor"
 
@@ -37,7 +42,9 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
       <div className="xx-preview-header">
         <h3>🎬 正在生成 {tasks.length} 个视频</h3>
         <span style={{ fontSize: 13, color: "var(--text-secondary, #666)" }}>
-          完成 {tasks.filter((t) => t.status === "completed").length} / {tasks.length}
+          完成{" "}
+          {tasks.filter((t) => t.status === "completed" || t.status === "awaiting_cover").length} /{" "}
+          {tasks.length}
         </span>
       </div>
       {/* #1800: grid 列宽 / gap / justify 全部交由 .xx-batch-gen-grid CSS 控制 */}
@@ -49,7 +56,7 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
             <div key={task.taskId} className={`xx-batch-gen-card status-${task.status}`}>
               <div className="xx-batch-gen-card-head">
                 <span className="xx-batch-gen-card-title" title={title}>
-                  {task.status === "completed" ? (
+                  {task.status === "completed" || task.status === "awaiting_cover" ? (
                     <CheckCircleFilled
                       className="xx-batch-gen-card-icon"
                       style={{ color: "#52c41a" }}
@@ -59,6 +66,11 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
                       className="xx-batch-gen-card-icon"
                       style={{ color: "#ef4444" }}
                     />
+                  ) : task.status === "queued" ? (
+                    <ClockCircleOutlined
+                      className="xx-batch-gen-card-icon"
+                      style={{ color: "#faad14" }}
+                    />
                   ) : (
                     <LoadingOutlined
                       className="xx-batch-gen-card-icon"
@@ -83,7 +95,22 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
                     <div className="xx-batch-gen-card-pct">{Math.round(task.progress)}%</div>
                   </>
                 )}
-                {task.status === "completed" && video && (
+                {task.status === "queued" && (
+                  <div
+                    style={{
+                      display: "flex",
+                      alignItems: "center",
+                      gap: 8,
+                      color: "var(--text-secondary, #faad14)",
+                      fontSize: 13,
+                      padding: "8px 0",
+                    }}
+                  >
+                    <ClockCircleOutlined />
+                    <span>排队等待中，前面任务完成后自动开始渲染</span>
+                  </div>
+                )}
+                {(task.status === "completed" || task.status === "awaiting_cover") && video && (
                   // 竖屏自适应容器（#1750）：成片固定 1080×1920（9:16），
                   // 视频按真实宽高比 contain 显示，黑底居中，杜绝横屏播放器左右大黑边
                   <div
@@ -111,7 +138,7 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
                     />
                   </div>
                 )}
-                {task.status === "completed" && !video && (
+                {(task.status === "completed" || task.status === "awaiting_cover") && !video && (
                   <div className="xx-batch-gen-card-done">✅ 已完成（成片可在下一步选择封面）</div>
                 )}
                 {task.status === "failed" && (

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

@@ -12,6 +12,7 @@ import Step2MaterialSelect from "../components/Step2MaterialSelect"
 import Step4TitleSettings from "../components/Step4TitleSettings"
 import Step6CoverSettings from "../components/Step6CoverSettings"
 import BatchGenerationGrid from "./BatchGenerationGrid"
+import Step3VoiceWithMode from "./Step3VoiceWithMode"
 import type { BatchTaskState } from "../hooks/generate-video/useGenerationPolling"
 import type { GeneratedVideo } from "@/api/template-editor"
 import type { TitleTemplate } from "@/components/title/template-types"
@@ -89,6 +90,12 @@ export interface GenerateStepContentProps {
   previewCovers: string[]
   onPreviewCoversChange: (urls: string[]) => void
   selectedVariantIds?: number[]
+  selectedCoverTemplate?: string
+  onSelectedCoverTemplateChange?: (templateId: string) => void
+  /** 单视频任务 ID（兜底，awaiting_cover 状态下 results 接口未入库时用） */
+  currentTaskId?: string
+  /** Step3 右上角确认生成按钮 */
+  onConfirmGenerate?: () => void | Promise<void>
 }
 
 export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) => {
@@ -142,6 +149,15 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
     previewCovers,
     onPreviewCoversChange,
     selectedVariantIds,
+    selectedCoverTemplate,
+    onSelectedCoverTemplateChange,
+    onConfirmGenerate,
+    selectedVoice,
+    onSelectedVoiceChange,
+    voiceModePerVideo,
+    onVoiceModePerVideoChange,
+    voiceLibraryIds,
+    onVoiceLibraryIdsChange,
   } = props
 
   switch (currentStep) {
@@ -175,27 +191,46 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
       )
     case 3:
       return (
-        <Step4TitleSettings
-          titleSettings={titleSettings}
-          onTitleSettingsChange={onTitleSettingsChange}
-          onUpdatePosition={onUpdatePosition}
-          onUpdateFont={onUpdateFont}
-          onUpdateSize={onUpdateSize}
-          onToggleBold={onToggleBold}
-          onToggleItalic={onToggleItalic}
-          onToggleStroke={onToggleStroke}
-          onToggleShadow={onToggleShadow}
-          onApplyPreset={onApplyPreset}
-          onUpdateStyle={onUpdateStyle}
-          activePreset={activePreset}
-          titlePresets={titlePresets}
-          enableTemplates={enableTemplates}
-          selectedTemplateId={selectedTemplateId}
-          onApplyTemplate={onApplyTemplate}
-          previewCount={previewCount}
-          previewTitles={previewTitles}
-          onPreviewTitlesChange={onPreviewTitlesChange}
-        />
+        <>
+          <Step4TitleSettings
+            titleSettings={titleSettings}
+            onTitleSettingsChange={onTitleSettingsChange}
+            onUpdatePosition={onUpdatePosition}
+            onUpdateFont={onUpdateFont}
+            onUpdateSize={onUpdateSize}
+            onToggleBold={onToggleBold}
+            onToggleItalic={onToggleItalic}
+            onToggleStroke={onToggleStroke}
+            onToggleShadow={onToggleShadow}
+            onApplyPreset={onApplyPreset}
+            onUpdateStyle={onUpdateStyle}
+            activePreset={activePreset}
+            titlePresets={titlePresets}
+            enableTemplates={enableTemplates}
+            selectedTemplateId={selectedTemplateId}
+            onApplyTemplate={onApplyTemplate}
+            previewCount={previewCount}
+            previewTitles={previewTitles}
+            onPreviewTitlesChange={onPreviewTitlesChange}
+            onConfirmGenerate={onConfirmGenerate}
+            generating={props.generating}
+            selectedCount={
+              props.previewCount && props.previewCount > 1
+                ? props.selectedVariantIds?.length || 1
+                : 1
+            }
+          />
+          {/* 批量配音选择：共用/独立切换（#2096） */}
+          <Step3VoiceWithMode
+            previewCount={previewCount}
+            selectedVoice={selectedVoice}
+            onSelectedVoiceChange={onSelectedVoiceChange}
+            voiceModePerVideo={voiceModePerVideo}
+            onVoiceModePerVideoChange={onVoiceModePerVideoChange}
+            voiceLibraryIds={voiceLibraryIds}
+            onVoiceLibraryIdsChange={onVoiceLibraryIdsChange}
+          />
+        </>
       )
     case 4:
       return (
@@ -250,6 +285,9 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           previewCovers={previewCovers}
           onPreviewCoversChange={onPreviewCoversChange}
           selectedVariantIndexes={selectedVariantIds}
+          selectedTemplate={selectedCoverTemplate}
+          onTemplateChange={onSelectedCoverTemplateChange}
+          currentTaskId={props.currentTaskId}
         />
       )
     default:

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

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

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

@@ -47,6 +47,12 @@ interface Step4TitleSettingsProps {
   enableTemplates?: boolean
   selectedTemplateId?: string | null
   onApplyTemplate?: (settings: TitleSettings, template: TitleTemplate) => void
+  /** Step3 右上角「🎬 确认生成」主按钮 */
+  onConfirmGenerate?: () => void | Promise<void>
+  /** 是否生成中 */
+  generating?: boolean
+  /** 批量模式下勾选数量 */
+  selectedCount?: number
 }
 
 const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
@@ -69,6 +75,9 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
     enableTemplates,
     selectedTemplateId,
     onApplyTemplate,
+    onConfirmGenerate,
+    generating,
+    selectedCount = 1,
   } = props
 
   const isBatch = previewCount > 1
@@ -90,7 +99,47 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
   )
 
   return (
-    <div className="xx-form-section">
+    <div className="xx-form-section" style={{ position: "relative" }}>
+      {/* ── 右上角「🎬 确认生成」主按钮 ── */}
+      {onConfirmGenerate && (
+        <button
+          type="button"
+          onClick={() => {
+            if (generating) return
+            void onConfirmGenerate()
+          }}
+          disabled={generating}
+          style={{
+            position: "absolute",
+            top: 0,
+            right: 0,
+            background: generating ? "#a78bfa" : "#7c3aed",
+            color: "#fff",
+            border: "none",
+            borderRadius: 10,
+            padding: "12px 24px",
+            fontSize: 15,
+            fontWeight: 600,
+            cursor: generating ? "not-allowed" : "pointer",
+            boxShadow: "0 4px 14px rgba(124,58,237,0.4)",
+            transition: "all .2s",
+            zIndex: 5,
+            whiteSpace: "nowrap",
+          }}
+          onMouseEnter={(e) => {
+            if (!generating) (e.currentTarget as HTMLButtonElement).style.background = "#6d28d9"
+          }}
+          onMouseLeave={(e) => {
+            if (!generating) (e.currentTarget as HTMLButtonElement).style.background = "#7c3aed"
+          }}
+        >
+          {generating
+            ? "⏳ 生成中..."
+            : selectedCount > 1
+              ? `🎬 确认生成 ${selectedCount} 个视频`
+              : "🎬 确认生成"}
+        </button>
+      )}
       <h3>📝 选择标题</h3>
 
       {!isBatch ? (
@@ -108,7 +157,7 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
           />
         </div>
       ) : (
-        /* ── 批量：N 个独立标题输入框 ── */
+        /* ── 批量：N 个独立标题输入框（两列布局 #2096） ── */
         <div className="xx-batch-titles">
           <div
             style={{
@@ -121,17 +170,25 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
             为每个视频输入独立标题。标题样式（字体/颜色/位置）全局统一。
           </div>
 
-          {Array.from({ length: previewCount }, (_, i) => (
-            <div className="xx-form-field" key={i} style={{ maxWidth: 640 }}>
-              <label>视频 {i + 1} 标题</label>
-              <TitleLibraryAutoComplete
-                placeholder={`输入或选择视频 ${i + 1} 的标题`}
-                value={previewTitles?.[i] || ""}
-                onChange={(val) => updateVariantTitle(i, val)}
-                options={titleOptions}
-              />
-            </div>
-          ))}
+          <div
+            style={{
+              display: "grid",
+              gridTemplateColumns: "repeat(2, minmax(0, 1fr))",
+              gap: 16,
+            }}
+          >
+            {Array.from({ length: previewCount }, (_, i) => (
+              <div className="xx-form-field" key={i} style={{ maxWidth: "100%" }}>
+                <label>视频 {i + 1} 标题</label>
+                <TitleLibraryAutoComplete
+                  placeholder={`输入或选择视频 ${i + 1} 的标题`}
+                  value={previewTitles?.[i] || ""}
+                  onChange={(val) => updateVariantTitle(i, val)}
+                  options={titleOptions}
+                />
+              </div>
+            ))}
+          </div>
         </div>
       )}
 

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

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

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

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

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

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

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

@@ -31,7 +31,7 @@ import {
 } from "@/components/title/constants"
 import { buildPresetPreviewSettings } from "@/components/title/utils"
 
-import TitleMiniPreview from "./TitleMiniPreview"
+import TitleMiniPreview from "@/components/title/TitleMiniPreview"
 import TitleTemplateEditor from "@/components/title/TitleTemplateEditor"
 import { useTitleTemplates } from "@/components/title/useTitleTemplates"
 import {
@@ -177,7 +177,7 @@ const ColorPicker: React.FC<{
 
 /* ── 卡片预览：用 ref 测量容器宽度后再渲染透明 Canvas，保证文字清晰 ── */
 const FillPreview: React.FC<{
-  settings: TitleSettings
+  settings: import("@/components/title/settings").TitleStyleSettings
   sampleText: string
   portrait?: boolean
 }> = ({ settings, sampleText, portrait }) => {

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

@@ -46,13 +46,9 @@ export const CLIP_COUNT_STEP = 1
 export const MAX_PREVIEW_COUNT = 10
 export const MIN_PREVIEW_COUNT = 1
 
-/* ── 标题位置选项 ── */
-export const POSITION_OPTIONS = [
-  { value: "top", label: "顶部" },
-  { value: "center", label: "居中" },
-  { value: "bottom", label: "底部" },
-  { value: "custom", label: "自定义" },
-]
+/* ── 标题位置选项（统一从公共层重导出） ── */
+export { POSITION_OPTIONS } from "@/components/title/position-options"
+export type { PositionOption } from "@/components/title/position-options"
 
 /* ── 标题字体：统一使用公共层定义（#2001） ── */
 export { getFontFamily } from "@/components/title/constants"

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

@@ -2739,6 +2739,7 @@
   justify-content: center;
   font-size: 32px;
   color: #ccc;
+  position: relative;
 }
 
 /* 卡片信息区 */
@@ -3539,10 +3540,19 @@
   vertical-align: middle;
 }
 .xx-ce-font-dot--preset {
-  background: #10b981;
+  background: #10b981; /* 绿：预置爆款中文字体 */
+}
+.xx-ce-font-dot--hand {
+  background: #f59e0b; /* 橙：手写/书法字体 */
+}
+.xx-ce-font-dot--serif {
+  background: #8b5cf6; /* 紫：衬线字体 */
+}
+.xx-ce-font-dot--mono {
+  background: #6b7280; /* 灰：等宽字体 */
 }
 .xx-ce-font-dot--system {
-  background: #3b82f6;
+  background: #3b82f6; /* 蓝：系统无衬线 */
 }
 
 /* Shadow actions */
@@ -3663,14 +3673,42 @@
   border: 1px solid #fff;
   z-index: 10;
 }
-.xx-ce-handle--0 { top: -4px; left: -4px; }
-.xx-ce-handle--1 { top: -4px; left: 50%; margin-left: -4px; }
-.xx-ce-handle--2 { top: -4px; right: -4px; }
-.xx-ce-handle--3 { top: 50%; right: -4px; margin-top: -4px; }
-.xx-ce-handle--4 { bottom: -4px; right: -4px; }
-.xx-ce-handle--5 { bottom: -4px; left: 50%; margin-left: -4px; }
-.xx-ce-handle--6 { bottom: -4px; left: -4px; }
-.xx-ce-handle--7 { top: 50%; left: -4px; margin-top: -4px; }
+.xx-ce-handle--0 {
+  top: -4px;
+  left: -4px;
+}
+.xx-ce-handle--1 {
+  top: -4px;
+  left: 50%;
+  margin-left: -4px;
+}
+.xx-ce-handle--2 {
+  top: -4px;
+  right: -4px;
+}
+.xx-ce-handle--3 {
+  top: 50%;
+  right: -4px;
+  margin-top: -4px;
+}
+.xx-ce-handle--4 {
+  bottom: -4px;
+  right: -4px;
+}
+.xx-ce-handle--5 {
+  bottom: -4px;
+  left: 50%;
+  margin-left: -4px;
+}
+.xx-ce-handle--6 {
+  bottom: -4px;
+  left: -4px;
+}
+.xx-ce-handle--7 {
+  top: 50%;
+  left: -4px;
+  margin-top: -4px;
+}
 
 /* Background element */
 .xx-ce-el-bg {
@@ -3693,6 +3731,41 @@
   z-index: -1;
 }
 
+/* Cover template selected check */
+.xx-cover-template-check {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  width: 22px;
+  height: 22px;
+  background: #7c3aed;
+  color: #fff;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  font-weight: 700;
+  z-index: 2;
+  box-shadow: 0 2px 6px rgba(124, 58, 237, 0.4);
+}
+.xx-cover-template-thumb {
+  position: relative;
+}
+
+/* Preview tip */
+.xx-ce-preview-tip {
+  text-align: center;
+  margin-top: 12px;
+  font-size: 12px;
+  color: #6b7280;
+}
+
+/* Cover editor modal base gradient */
+.xx-ce-canvas {
+  background: #1a1a2e;
+}
+
 /* Antd Slider overrides for editor */
 .xx-ce-section-body .ant-slider {
   margin: 4px 0 8px;
@@ -3716,7 +3789,12 @@
   align-items: center;
 }
 
-/* Canvas text elements — ensure proper stacking */
-.xx-ce-canvas > div {
+/* Canvas 装饰层（背景/装饰/遮罩/底色/人物/文字背景色块）不接收鼠标事件，
+   但拖拽的标题/副标题文字（内联 cursor:grab）需要接收 mousedown。
+   已通过 renderTextStyle 显式设 pointer-events 以外的样式，因此此处只关掉纯装饰层。 */
+.xx-ce-canvas-base,
+.xx-ce-el-bg,
+.xx-ce-el-portrait,
+.xx-ce-el-mask {
   pointer-events: none;
 }

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

@@ -41,8 +41,8 @@ export interface UseGenerateVideoProps {
     enabled: boolean
     music_id?: string
   }
-  /** 生成成功后的回调（用于清除持久化的 previewTaskId 等状态） */
-  onGenerationSuccess?: () => void
+  /** 生成成功后的回调（用于清除持久化的 previewTaskId 等状态）；status=awaiting_cover 表示需进封面选择 */
+  onGenerationSuccess?: (status?: "completed" | "awaiting_cover") => void
   /* ── 批量生成（#1677）── */
   /** 生成数量（1=单条旧逻辑，>1=批量） */
   previewCount?: number

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

@@ -1,4 +1,4 @@
-import { useRef, useCallback, useState } from "react"
+import { useRef, useCallback, useState, useEffect } from "react"
 import { message } from "antd"
 import axios from "axios"
 import { getGenerationTask, retryTask as retryGenerationTaskApi } from "@/api/tasks/tasks"
@@ -10,7 +10,7 @@ export interface BatchTaskState {
   taskId: string
   /** 变体序号（0-based，与标题/封面数组对齐） */
   variantIndex: number
-  status: "running" | "completed" | "failed"
+  status: "running" | "completed" | "awaiting_cover" | "failed" | "queued"
   progress: number
   error: string | null
   /** 完成后的成片视频 */
@@ -19,7 +19,7 @@ export interface BatchTaskState {
 
 interface UseGenerationPollingOptions {
   onProgress: (progress: number) => void
-  onComplete: (videos: unknown[]) => void
+  onComplete: (videos: unknown[], taskStatus?: "completed" | "awaiting_cover") => void
   onFailed: (errorMsg: string) => void
   /** 批量：单任务状态变化（第5步逐卡片展示） */
   onBatchTaskUpdate?: (taskId: string, patch: Partial<BatchTaskState>) => void
@@ -31,13 +31,19 @@ const MAX_RETRYABLE_ERRORS = 10
 const MAX_RESULTS_RETRIES = 3
 
 /**
- * 生成状态轮询 Hook（v4 — 批量任务独立状态 + 单任务重试）
+ * 生成状态轮询 Hook（v5 — awaiting_cover 状态识别 + visibilitychange 恢复 + 状态透传）
  *
  * startPolling(taskId) 轮询单个任务；
  * startPollingBatch(tasks) 并行轮询 N 个任务：
  * - 每个任务独立进度/状态/失败，通过 onBatchTaskUpdate 实时回传
  * - 全部成功才 onComplete（聚合视频按变体顺序）；任一失败不影响其他任务继续
  * - retryTask(taskId) 单独重试失败任务（重新轮询，后端任务仍在跑则直接接续）
+ *
+ * v5 修复（#2088）：
+ * 1. 单任务路径透传 taskStatus（completed / awaiting_cover）到 onComplete，外层据此区分跳转
+ * 2. 监听 visibilitychange，页面从后台切回可见时立即补拉一次，解决切后台 setInterval 被浏览器
+ *    降频/冻结导致进度卡在 56% 的问题
+ * 3. 非 4xx/5xx 网络错误按 3s 退避重试（已有 MAX_RETRYABLE_ERRORS=10 兜底）
  */
 export function useGenerationPolling({
   onProgress,
@@ -49,12 +55,15 @@ export function useGenerationPolling({
   const cancelledRef = useRef(false)
   /** 批量任务上下文：taskId → 变体序号 */
   const batchContextRef = useRef<Map<string, number>>(new Map())
+  /** 当前活跃的「立刻补拉一次」函数（visibilitychange 回调使用） */
+  const immediateTickRef = useRef<(() => void) | null>(null)
   const [, forceTick] = useState(0)
 
   const clearTimer = useCallback(() => {
     cancelledRef.current = true
     progressTimer.current.forEach((t) => clearTimeout(t))
     progressTimer.current = []
+    immediateTickRef.current = null
   }, [])
 
   /** 任务完成后拉取结果列表，带重试 */
@@ -96,7 +105,7 @@ export function useGenerationPolling({
       runId: number,
       callbacks?: {
         onTaskProgress?: (pct: number) => void
-        onTaskCompleted?: (videos: unknown[]) => void
+        onTaskCompleted?: (videos: unknown[], taskStatus?: "completed" | "awaiting_cover") => void
         onTaskFailed?: (msg: string) => void
       },
     ): Promise<unknown[]> => {
@@ -111,8 +120,9 @@ export function useGenerationPolling({
             if (cancelledRef.current || done) return
             consecutiveErrors = 0
 
-            if (task.status === "completed") {
+            if (task.status === "completed" || task.status === "awaiting_cover") {
               done = true
+              immediateTickRef.current = null
               const videos = await fetchResultsWithRetry(taskId)
               if (cancelledRef.current) return
               if (videos === null) {
@@ -121,13 +131,14 @@ export function useGenerationPolling({
                 reject(new Error(msg))
                 return
               }
-              callbacks?.onTaskCompleted?.(videos)
+              callbacks?.onTaskCompleted?.(videos, task.status as "completed" | "awaiting_cover")
               resolve(videos)
               return
             }
 
             if (task.status === "failed" || task.status === "cancelled") {
               done = true
+              immediateTickRef.current = null
               const rawMsg =
                 task.error_info?.error_message ||
                 task.error_message ||
@@ -138,6 +149,7 @@ export function useGenerationPolling({
               return
             }
 
+            // running / pending / waiting：更新进度并安排下一次轮询
             const pct = Math.max(0, Math.min(99, Math.round(Number(task.progress) || 0)))
             callbacks?.onTaskProgress?.(pct)
             if (!callbacks && runId === 0) {
@@ -149,16 +161,20 @@ export function useGenerationPolling({
             if (cancelledRef.current || done) return
             console.error("[轮询出错] taskId:", taskId, pollErr)
             const status = axios.isAxiosError(pollErr) ? pollErr.response?.status : undefined
+            // 4xx 视为不可重试（任务不存在/权限问题等），直接失败
             if (status && status >= 400 && status < 500) {
               done = true
+              immediateTickRef.current = null
               const msg = extractErrorMessage(pollErr, status)
               callbacks?.onTaskFailed?.(msg)
               reject(new Error(msg))
               return
             }
+            // 网络错误 / 5xx：3s 退避重试，最多 MAX_RETRYABLE_ERRORS 次
             consecutiveErrors += 1
             if (consecutiveErrors >= MAX_RETRYABLE_ERRORS) {
               done = true
+              immediateTickRef.current = null
               const msg = "任务状态查询连续失败，请稍后在任务列表查看结果"
               callbacks?.onTaskFailed?.(msg)
               reject(new Error(msg))
@@ -169,6 +185,18 @@ export function useGenerationPolling({
           }
         }
 
+        // 注册「立刻补拉一次」回调，供 visibilitychange 恢复时调用
+        // 注意：必须在 done 后清理，避免切换页面时误触发已结束任务的补拉
+        immediateTickRef.current = () => {
+          if (!done && !cancelledRef.current) {
+            // 清除未触发的 setTimeout，立即拉一次
+            progressTimer.current.forEach((t) => clearTimeout(t))
+            progressTimer.current = []
+            consecutiveErrors = 0
+            void poll()
+          }
+        }
+
         const timer = setTimeout(poll, 1500)
         progressTimer.current.push(timer)
       })
@@ -181,12 +209,22 @@ export function useGenerationPolling({
     (taskId: string) => {
       cancelledRef.current = false
       batchContextRef.current.clear()
-      pollSingleTask(taskId, 0)
-        .then((videos) => {
-          if (cancelledRef.current) return
+      let resolvedStatus: "completed" | "awaiting_cover" = "completed"
+      pollSingleTask(taskId, 0, {
+        onTaskProgress: (pct) => onProgress(pct),
+        onTaskCompleted: (videos, taskStatus) => {
+          resolvedStatus = taskStatus ?? "completed"
           onProgress(100)
-          onComplete(videos)
-          message.success("视频生成完成！")
+          onComplete(videos, resolvedStatus)
+        },
+        onTaskFailed: (msg) => onFailed(msg),
+      })
+        .then(() => {
+          if (cancelledRef.current) return
+          // awaiting_cover 是中间态（进封面选择页），不弹"完成"toast；completed 才弹
+          if (resolvedStatus === "completed") {
+            message.success("视频生成完成！")
+          }
         })
         .catch((err: Error) => {
           if (cancelledRef.current) return
@@ -201,7 +239,7 @@ export function useGenerationPolling({
   /**
    * 批量多任务轮询：
    * - 每个任务独立进度/状态回传 onBatchTaskUpdate
-   * * 全部完成后按变体顺序聚合视频 onComplete
+   * - 全部完成后按变体顺序聚合视频 onComplete
    * - 部分失败：整体不 onFailed（第5步逐卡片展示失败+重试按钮）；全部失败才 onFailed
    */
   const startPollingBatch = useCallback(
@@ -211,6 +249,7 @@ export function useGenerationPolling({
       const progressMap = new Map<string, number>()
       const resultMap = new Map<string, unknown[]>()
       const failureMap = new Map<string, string>()
+      const statusMap = new Map<string, "completed" | "awaiting_cover">()
       batchContextRef.current = new Map(tasks.map((t) => [t.taskId, t.variantIndex]))
 
       const reportAggregateProgress = () => {
@@ -225,7 +264,9 @@ export function useGenerationPolling({
         if (resultMap.size === tasks.length) {
           onProgress(100)
           const ordered = tasks.map((t) => resultMap.get(t.taskId) || []).flat()
-          onComplete(ordered)
+          // 批量：任一任务为 awaiting_cover，则整体透传 awaiting_cover（进封面页）
+          const anyAwaiting = Array.from(statusMap.values()).some((s) => s === "awaiting_cover")
+          onComplete(ordered, anyAwaiting ? "awaiting_cover" : "completed")
           message.success(`全部 ${tasks.length} 个视频生成完成！`)
         } else if (resultMap.size > 0) {
           // 部分失败：成功的视频聚合进成片列表（可进封面），失败卡片带重试按钮
@@ -234,7 +275,8 @@ export function useGenerationPolling({
             .filter((t) => resultMap.has(t.taskId))
             .map((t) => resultMap.get(t.taskId) || [])
             .flat()
-          onComplete(ordered)
+          const anyAwaiting = Array.from(statusMap.values()).some((s) => s === "awaiting_cover")
+          onComplete(ordered, anyAwaiting ? "awaiting_cover" : "completed")
           message.warning(
             `${failureMap.size} 个视频生成失败，可点击卡片上的「重试此视频」，成功的视频可先进入下一步`,
           )
@@ -259,10 +301,12 @@ export function useGenerationPolling({
             onBatchTaskUpdate?.(taskId, { status: "running", progress: pct })
             reportAggregateProgress()
           },
-          onTaskCompleted: (videos) => {
+          onTaskCompleted: (videos, taskStatus) => {
             progressMap.set(taskId, 100)
             resultMap.set(taskId, videos)
-            onBatchTaskUpdate?.(taskId, { status: "completed", progress: 100, videos })
+            const _finalStatus: "completed" | "awaiting_cover" = taskStatus ?? "completed"
+            statusMap.set(taskId, _finalStatus)
+            onBatchTaskUpdate?.(taskId, { status: _finalStatus, progress: 100, videos })
             reportAggregateProgress()
             checkAllSettled()
           },
@@ -293,8 +337,9 @@ export function useGenerationPolling({
       }
       pollSingleTask(taskId, Date.now(), {
         onTaskProgress: (pct) => onBatchTaskUpdate?.(taskId, { status: "running", progress: pct }),
-        onTaskCompleted: (videos) => {
-          onBatchTaskUpdate?.(taskId, { status: "completed", progress: 100, videos })
+        onTaskCompleted: (videos, taskStatus) => {
+          const _finalStatus: "completed" | "awaiting_cover" = taskStatus ?? "completed"
+          onBatchTaskUpdate?.(taskId, { status: _finalStatus, progress: 100, videos })
           message.success(`视频 ${variantIndex + 1} 重试成功`)
         },
         onTaskFailed: (msg) => onBatchTaskUpdate?.(taskId, { status: "failed", error: msg }),
@@ -307,5 +352,64 @@ export function useGenerationPolling({
     [pollSingleTask, onBatchTaskUpdate],
   )
 
-  return { startPolling, startPollingBatch, retryTask, clearTimer }
+  /**
+   * visibilitychange 恢复：页面从后台切回前台时，立刻触发一次补拉。
+   * 解决浏览器后台标签页对 setTimeout 的 1Hz 节流/冻结导致的"进度卡 56%"问题。
+   */
+  useEffect(() => {
+    const handleVisibilityChange = () => {
+      if (document.visibilityState === "visible" && immediateTickRef.current) {
+        immediateTickRef.current()
+      }
+    }
+    document.addEventListener("visibilitychange", handleVisibilityChange)
+    // 页面聚焦也兜底一次（部分浏览器 visibilitychange 触发时机不一致）
+    const handleFocus = () => {
+      if (immediateTickRef.current) immediateTickRef.current()
+    }
+    window.addEventListener("focus", handleFocus)
+    return () => {
+      document.removeEventListener("visibilitychange", handleVisibilityChange)
+      window.removeEventListener("focus", handleFocus)
+    }
+  }, [])
+
+  /**
+   * 批量队列模式：逐任务追加到轮询队列（支持串行提交、429 排队重试场景）。
+   * 与 startPollingBatch 不同的是：
+   * - 不会 reset batchContextRef；多次调用会累积
+   * - 不触发整体 onComplete / onFailed（完成判定交给外层 useEffect 按状态聚合）
+   * - 仍通过 onBatchTaskUpdate 回传单任务状态
+   */
+  const pollBatchTaskQueued = useCallback(
+    (taskId: string, variantIndex: number) => {
+      cancelledRef.current = false
+      batchContextRef.current.set(taskId, variantIndex)
+      onBatchTaskUpdate?.(taskId, {
+        taskId,
+        variantIndex,
+        status: "running",
+        progress: 0,
+        error: null,
+        videos: [],
+      })
+      pollSingleTask(taskId, Date.now(), {
+        onTaskProgress: (pct) => {
+          onBatchTaskUpdate?.(taskId, { status: "running", progress: pct })
+        },
+        onTaskCompleted: (videos, taskStatus) => {
+          const finalStatus: "completed" | "awaiting_cover" = taskStatus ?? "completed"
+          onBatchTaskUpdate?.(taskId, { status: finalStatus, progress: 100, videos })
+        },
+        onTaskFailed: (msg) => {
+          onBatchTaskUpdate?.(taskId, { status: "failed", error: msg })
+        },
+      }).catch(() => {
+        /* onTaskFailed 已处理 */
+      })
+    },
+    [pollSingleTask, onBatchTaskUpdate],
+  )
+
+  return { startPolling, startPollingBatch, pollBatchTaskQueued, retryTask, clearTimer }
 }

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

@@ -12,7 +12,7 @@
 import { useCallback, useState } from "react"
 import { message } from "antd"
 import { generateCover } from "@/api/generation"
-import { uploadAssetDirect, getAssetLibraries } from "@/api/assets"
+import { uploadAssetDirect } from "@/api/assets"
 import type { GeneratedVideo } from "@/api/template-editor"
 
 /** onCoversChange 支持直接传值或函数式 updater（函数式用于串行回写避免闭包覆盖） */
@@ -53,7 +53,7 @@ interface UseBatchCoversOptions {
 }
 
 export function useBatchCovers({
-  selectedTemplate: _selectedTemplate,
+  selectedTemplate,
   generatedVideos,
   titles,
   titleStyle,
@@ -93,7 +93,12 @@ export function useBatchCovers({
   /** 为第 index 个视频自动生成封面；返回是否成功（供 generateAll 统计） */
   const generateOne = useCallback(
     async (index: number): Promise<boolean> => {
-      const finalVideos = generatedVideos.filter((v) => v.status === "completed")
+      const finalVideos = generatedVideos.filter(
+        (v) =>
+          v.status === "completed" ||
+          v.status === "awaiting_cover" ||
+          v.status === "awaiting_cover",
+      )
       const target = finalVideos[index] || generatedVideos[index]
       if (!target) {
         message.warning("该视频尚未生成完成")
@@ -102,54 +107,57 @@ export function useBatchCovers({
       addBusy(index)
       try {
         const titleText = titles[index] || ""
-        const response = await generateCover("default", {
-          generated_video_id: target.id,
-          video_url: target.file_url || target.download_url || "",
-          cover_type: "ai_frame",
-          ...(titleText
-            ? {
-                title_config: {
-                  text: titleText,
-                  font: titleStyle.font,
-                  font_size: titleStyle.size,
-                  font_color: titleStyle.color,
-                  position: titleStyle.position,
-                  bold: titleStyle.bold,
-                  italic: titleStyle.italic,
-                  stroke: titleStyle.stroke
-                    ? {
-                        enabled: true,
-                        width: titleStyle.strokeWidth ?? 4,
-                        color: titleStyle.strokeColor ?? "#000000",
-                      }
-                    : { enabled: false },
-                  shadow: titleStyle.shadow
-                    ? {
-                        enabled: true,
-                        offset_x: titleStyle.shadowOffsetX ?? 2,
-                        offset_y: titleStyle.shadowOffsetY ?? 2,
-                        blur: titleStyle.shadowBlur ?? 4,
-                        color: titleStyle.shadowColor ?? "rgba(0,0,0,0.8)",
-                      }
-                    : { enabled: false },
-                  line_height: titleStyle.lineHeight ?? 1.2,
-                  margin_top: titleStyle.marginTop ?? 24,
-                  max_chars_per_line: titleStyle.maxCharsPerLine ?? 0,
-                  background: titleStyle.bgEnabled
-                    ? {
-                        enabled: true,
-                        color: titleStyle.bgColor,
-                        padding: titleStyle.bgPadding,
-                        radius: titleStyle.bgRadius,
-                      }
-                    : { enabled: false },
-                  line_overrides: (titleStyle.lineOverrides ?? []) as Array<
-                    Record<string, unknown>
-                  >,
-                },
-              }
-            : {}),
-        })
+        const response = await generateCover(
+          selectedTemplate && selectedTemplate !== "default" ? selectedTemplate : undefined,
+          {
+            generated_video_id: target.id,
+            video_url: target.file_url || target.download_url || "",
+            cover_type: "ai_frame",
+            ...(titleText
+              ? {
+                  title_config: {
+                    text: titleText,
+                    font: titleStyle.font,
+                    font_size: titleStyle.size,
+                    font_color: titleStyle.color,
+                    position: titleStyle.position,
+                    bold: titleStyle.bold,
+                    italic: titleStyle.italic,
+                    stroke: titleStyle.stroke
+                      ? {
+                          enabled: true,
+                          width: titleStyle.strokeWidth ?? 4,
+                          color: titleStyle.strokeColor ?? "#000000",
+                        }
+                      : { enabled: false },
+                    shadow: titleStyle.shadow
+                      ? {
+                          enabled: true,
+                          offset_x: titleStyle.shadowOffsetX ?? 2,
+                          offset_y: titleStyle.shadowOffsetY ?? 2,
+                          blur: titleStyle.shadowBlur ?? 4,
+                          color: titleStyle.shadowColor ?? "rgba(0,0,0,0.8)",
+                        }
+                      : { enabled: false },
+                    line_height: titleStyle.lineHeight ?? 1.2,
+                    margin_top: titleStyle.marginTop ?? 24,
+                    max_chars_per_line: titleStyle.maxCharsPerLine ?? 0,
+                    background: titleStyle.bgEnabled
+                      ? {
+                          enabled: true,
+                          color: titleStyle.bgColor,
+                          padding: titleStyle.bgPadding,
+                          radius: titleStyle.bgRadius,
+                        }
+                      : { enabled: false },
+                    line_overrides: (titleStyle.lineOverrides ?? []) as Array<
+                      Record<string, unknown>
+                    >,
+                  },
+                }
+              : {}),
+          },
+        )
         const url = response.cover?.image_url || response.cover?.thumbnail_url || ""
         if (url) {
           patchCover(index, url)
@@ -166,7 +174,7 @@ export function useBatchCovers({
         removeBusy(index)
       }
     },
-    [generatedVideos, titles, titleStyle, patchCover, addBusy, removeBusy],
+    [generatedVideos, titles, titleStyle, selectedTemplate, patchCover, addBusy, removeBusy],
   )
 
   /** 为第 index 个视频上传自定义封面 */
@@ -174,15 +182,9 @@ export function useBatchCovers({
     async (index: number, file: File) => {
       addUploading(index)
       try {
-        const libs = await getAssetLibraries()
-        const imageLib = libs.find((l) => l.kind === "image") || libs[0]
-        if (!imageLib) {
-          message.error("未找到素材库，请先创建")
-          return
-        }
         const result = await uploadAssetDirect({
           file,
-          library_id: imageLib.id,
+          kind: "image",
         })
         const url = result?.url || ""
         if (url) {
@@ -203,7 +205,10 @@ export function useBatchCovers({
 
   /** 一键全部自动生成（串行，避免队列限流；单个失败不阻塞，结束后分级提示） */
   const generateAll = useCallback(async () => {
-    const finalVideos = generatedVideos.filter((v) => v.status === "completed")
+    const finalVideos = generatedVideos.filter(
+      (v) =>
+        v.status === "completed" || v.status === "awaiting_cover" || v.status === "awaiting_cover",
+    )
     const total = finalVideos.length
     // 待处理：基于调用时刻的 covers 快照判断（已有封面跳过）；
     // 回写走函数式 updater，循环内不再依赖可能过期的 covers 闭包

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

@@ -2,10 +2,12 @@
  * 视频生成 Hook
  * 封装视频生成的核心逻辑、状态管理、轮询等
  */
-import { useState, useCallback, useEffect } from "react"
+import { useState, useCallback, useEffect, useRef } from "react"
 import { message } from "antd"
+import axios from "axios"
 import { type GeneratedVideo, getEditPlanClips, createClipsFromAssets } from "@/api/template-editor"
 import { createGenerationTask } from "@/api/tasks/tasks"
+import type { CreateGenerationTaskRequest } from "@/api/tasks/types"
 import type { UseGenerateVideoProps } from "./generate-video/types"
 import { getGenerationPhase } from "./generate-video/phase"
 import { useGenerationPolling, type BatchTaskState } from "./generate-video/useGenerationPolling"
@@ -13,6 +15,28 @@ import { validateGenerateInputs } from "./generate-video/buildPayload"
 import { calculateResolution } from "../utils/calculateResolution"
 import { extractBackendError, translateError } from "./generate-video/errorUtils"
 
+export type GenerationCompleteStatus = "completed" | "awaiting_cover" | null
+
+/** 判断是否是用户队列已满 429（需要排队重试而非直接报错） */
+function isUserQueueFullError(err: unknown): { waitMs: number } | null {
+  if (!axios.isAxiosError(err)) return null
+  if (err.response?.status !== 429 && err.response?.status !== 503) return null
+  const detail = (err.response?.data as { detail?: unknown })?.detail
+  const code =
+    typeof detail === "object" && detail !== null ? (detail as { code?: string }).code : undefined
+  if (code === "USER_QUEUE_FULL" || code === "SYSTEM_QUEUE_FULL") {
+    const waitSec =
+      typeof detail === "object" && detail !== null
+        ? Number((detail as { estimated_wait_seconds?: number }).estimated_wait_seconds) || 0
+        : 0
+    return { waitMs: Math.max(15_000, waitSec * 1000 || 30_000) }
+  }
+  return null
+}
+
+/** sleep */
+const sleep = (ms: number) => new Promise<void>((r) => setTimeout(r, ms))
+
 export function useGenerateVideo(props: UseGenerateVideoProps) {
   const { selectedTemplate, onGenerationSuccess } = props
 
@@ -22,9 +46,29 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
   const [generated, setGenerated] = useState(false)
   const [generateError, setGenerateError] = useState<string | null>(null)
   const [generatedVideos, setGeneratedVideos] = useState<GeneratedVideo[]>([])
+  /** #2088：任务最终状态，区分 awaiting_cover（选封面）/ completed（已完成） */
+  const [completionStatus, setCompletionStatus] = useState<GenerationCompleteStatus>(null)
+  /** 单视频模式：当前任务 ID（封面 finalize 需要） */
+  const [currentTaskId, setCurrentTaskId] = useState<string>("")
   /** 批量模式：每个正式生成任务的独立状态（第5步逐卡片展示） */
   const [batchTasks, setBatchTasks] = useState<BatchTaskState[]>([])
 
+  /** 排队中重试的定时器，unmount / 新提交时清理 */
+  const queueTimersRef = useRef<number[]>([])
+  const cancelledRef = useRef(false)
+
+  const clearQueueTimers = useCallback(() => {
+    queueTimersRef.current.forEach((id) => clearTimeout(id))
+    queueTimersRef.current = []
+  }, [])
+
+  useEffect(() => {
+    return () => {
+      cancelledRef.current = true
+      clearQueueTimers()
+    }
+  }, [clearQueueTimers])
+
   const handleBatchTaskUpdate = useCallback((taskId: string, patch: Partial<BatchTaskState>) => {
     setBatchTasks((prev) => {
       const list = prev || []
@@ -51,14 +95,15 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
 
   const handleProgress = useCallback((p: number) => setProgress(p), [])
   const handleComplete = useCallback(
-    (videos: unknown[]) => {
-      setGenerating(false)
+    (videos: unknown[], taskStatus?: "completed" | "awaiting_cover") => {
       setGenerated(true)
+      const finalStatus: GenerationCompleteStatus = taskStatus ?? "completed"
+      setCompletionStatus(finalStatus)
       setGeneratedVideos(videos as GeneratedVideo[])
       // 批量：成功任务的 videos 已通过 onBatchTaskUpdate 写入，这里同步兜底
       setBatchTasks((prev) =>
         (prev || []).map((t) =>
-          t.status === "completed" && t.videos.length === 0
+          t.status === "completed" || (t.status === "awaiting_cover" && t.videos.length === 0)
             ? {
                 ...t,
                 videos: (videos as GeneratedVideo[]).filter(
@@ -68,23 +113,35 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
             : t,
         ),
       )
-      onGenerationSuccess?.()
+      onGenerationSuccess?.(finalStatus)
     },
     [onGenerationSuccess],
   )
   const handleFailed = useCallback((errorMsg: string) => {
-    setGenerating(false)
     setGenerateError(errorMsg)
   }, [])
 
   /* 批量：任务状态变化时聚合已完成成片（含失败重试成功后补入），
-     按变体索引排序，供步骤6封面按勾选顺序逐个取视频 */
+     按变体索引排序，供步骤6封面按勾选顺序逐个取视频。
+     当全部任务都已结束（completed/awaiting_cover/failed）且无排队/渲染中任务时，关闭 generating。 */
   useEffect(() => {
     if (batchTasks.length === 0) return
     const byVariant = new Map<number, GeneratedVideo>()
+    let hasQueued = false
+    let hasRunning = false
+    let hasSuccess = false
+    let allDone = true
     batchTasks.forEach((t) => {
-      if (t.status === "completed" && t.videos && t.videos.length > 0) {
-        byVariant.set(t.variantIndex, t.videos[0] as GeneratedVideo)
+      if (t.status === "queued") hasQueued = true
+      else if (t.status === "running") hasRunning = true
+      if (t.status === "completed" || t.status === "awaiting_cover") {
+        hasSuccess = true
+        if (t.videos && t.videos.length > 0) {
+          byVariant.set(t.variantIndex, t.videos[0] as GeneratedVideo)
+        }
+      }
+      if (t.status !== "completed" && t.status !== "awaiting_cover" && t.status !== "failed") {
+        allDone = false
       }
     })
     const ordered = [...byVariant.entries()].sort((a, b) => a[0] - b[0]).map(([, v]) => v)
@@ -94,17 +151,185 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
       }
       return ordered
     })
+    if (allDone && !hasQueued && !hasRunning) {
+      setGenerating(false)
+      if (hasSuccess) {
+        setGenerated(true)
+        setCompletionStatus("awaiting_cover")
+      }
+    }
   }, [batchTasks])
 
-  const { startPolling, startPollingBatch, retryTask, clearTimer } = useGenerationPolling({
+  const { startPolling, pollBatchTaskQueued, retryTask, clearTimer } = useGenerationPolling({
     onProgress: handleProgress,
     onComplete: handleComplete,
     onFailed: handleFailed,
     onBatchTaskUpdate: handleBatchTaskUpdate,
   })
 
+  /** 根据 props 构造基础 payload（批量/单任务共用的字段） */
+  const buildBasePayload = useCallback((): Omit<
+    CreateGenerationTaskRequest,
+    "count" | "titles" | "voice_library_ids" | "cover_urls" | "variant_plan_ids"
+  > => {
+    const { width: outputWidth, height: outputHeight } = calculateResolution(
+      props.videoRatio || "9:16",
+    )
+    const editMode = props.editMode ?? "random"
+    const dedupEnabled = props.dedupEnabled !== false
+    const assetIds =
+      props.materialMode === "auto" ? props.smartSelectedIds : props.selectedMaterials
+    const coverUrl = props.coverSettings?.thumbnail_url || props.coverSettings?.upload_url || ""
+    // #1970：叙事模式下 ttsVoiceId 作为配音 id；随机模式用 selectedVoice
+    const voiceLibraryId =
+      editMode === "narrative"
+        ? props.ttsVoiceId || ""
+        : props.voiceMode === "clone"
+          ? props.selectedClonedVoice || props.selectedVoice || ""
+          : props.selectedVoice || ""
+
+    const bgmConfig = {
+      enabled: props.bgm !== false,
+      ...(props.bgmConfig?.music_id ? { preset_id: props.bgmConfig.music_id } : {}),
+    }
+
+    const titleConfig = props.titleSettings?.title
+      ? {
+          text: props.titleSettings.title,
+          font: props.titleSettings.font,
+          font_size: props.titleSettings.size,
+          font_color: props.titleSettings.color,
+          position: props.titleSettings.position,
+          ...(props.titleSettings.position === "custom" &&
+          props.titleSettings.posX != null &&
+          props.titleSettings.posY != null
+            ? {
+                pos_x: Math.round(props.titleSettings.posX),
+                pos_y: Math.round(props.titleSettings.posY),
+              }
+            : {}),
+          bold: props.titleSettings.bold,
+          italic: props.titleSettings.italic,
+          stroke: props.titleSettings.stroke
+            ? {
+                enabled: true,
+                width: props.titleSettings.strokeWidth ?? 4,
+                color: props.titleSettings.strokeColor ?? "#000000",
+              }
+            : { enabled: false },
+          shadow: props.titleSettings.shadow
+            ? {
+                enabled: true,
+                offset_x: props.titleSettings.shadowOffsetX ?? 2,
+                offset_y: props.titleSettings.shadowOffsetY ?? 2,
+                blur: props.titleSettings.shadowBlur ?? 4,
+                color: props.titleSettings.shadowColor ?? "rgba(0,0,0,0.8)",
+              }
+            : { enabled: false },
+          line_height: props.titleSettings.lineHeight ?? 1.2,
+          margin_top: props.titleSettings.marginTop ?? 24,
+          max_chars_per_line: props.titleSettings.maxCharsPerLine ?? 0,
+          ...(props.titleSettings.bgEnabled
+            ? {
+                background: {
+                  enabled: true,
+                  color: props.titleSettings.bgColor,
+                  padding: props.titleSettings.bgPadding,
+                  radius: props.titleSettings.bgRadius,
+                },
+              }
+            : { background: { enabled: false } }),
+          line_overrides: (props.titleSettings.lineOverrides ?? []).map((lo) => ({
+            line_index: lo.line_index,
+            text: lo.text,
+            size: lo.size,
+            color: lo.color,
+            bold: lo.bold,
+            italic: lo.italic,
+            stroke: lo.stroke,
+            highlights: lo.highlights?.map((h) => ({
+              word: h.word,
+              color: h.color,
+              bold: h.bold,
+              scale: h.scale,
+            })),
+          })),
+          ...(props.titleSettings.coverTitle
+            ? {
+                cover_title_config: {
+                  title: props.titleSettings.coverTitle.title,
+                  font: props.titleSettings.coverTitle.font,
+                  font_size: props.titleSettings.coverTitle.size,
+                  font_color: props.titleSettings.coverTitle.color,
+                  bold: props.titleSettings.coverTitle.bold,
+                  italic: props.titleSettings.coverTitle.italic,
+                  position: props.titleSettings.coverTitle.position,
+                  stroke: props.titleSettings.coverTitle.stroke
+                    ? {
+                        enabled: true,
+                        width: props.titleSettings.coverTitle.strokeWidth ?? 4,
+                        color: props.titleSettings.coverTitle.strokeColor ?? "#000000",
+                      }
+                    : { enabled: false },
+                  shadow: props.titleSettings.coverTitle.shadow
+                    ? {
+                        enabled: true,
+                        offset_x: props.titleSettings.coverTitle.shadowOffsetX ?? 2,
+                        offset_y: props.titleSettings.coverTitle.shadowOffsetY ?? 2,
+                        blur: props.titleSettings.coverTitle.shadowBlur ?? 4,
+                        color: props.titleSettings.coverTitle.shadowColor ?? "rgba(0,0,0,0.8)",
+                      }
+                    : { enabled: false },
+                  ...(props.titleSettings.coverTitle.bgEnabled
+                    ? {
+                        background: {
+                          enabled: true,
+                          color: props.titleSettings.coverTitle.bgColor,
+                          padding: props.titleSettings.coverTitle.bgPadding,
+                          radius: props.titleSettings.coverTitle.bgRadius,
+                        },
+                      }
+                    : { background: { enabled: false } }),
+                },
+              }
+            : {}),
+        }
+      : undefined
+
+    const payload: Omit<
+      CreateGenerationTaskRequest,
+      "count" | "titles" | "voice_library_ids" | "cover_urls" | "variant_plan_ids"
+    > = {
+      template_id: selectedTemplate,
+      asset_ids: assetIds,
+      output_width: outputWidth,
+      output_height: outputHeight,
+      cover_url: coverUrl,
+      custom_title: props.titleSettings?.title || "",
+      duration: props.duration || undefined,
+      video_ratio: props.videoRatio,
+      assembly_mode: editMode,
+      ...(editMode === "narrative" && props.selectedScript?.id
+        ? {
+            script_id: props.selectedScript.id,
+            tts_voice_id: props.ttsVoiceId || undefined,
+            tts_voice_source: props.ttsVoiceSource || undefined,
+            tts_style: props.ttsStyle || undefined,
+          }
+        : {}),
+      dedup_enabled: dedupEnabled,
+      voice_library_id: voiceLibraryId,
+      ...(props.selectedVoice && !voiceLibraryId ? { voice_ids: [props.selectedVoice] } : {}),
+      bgm_config: bgmConfig as CreateGenerationTaskRequest["bgm_config"],
+      ...(props.sourceEditPlanId ? { source_edit_plan_id: props.sourceEditPlanId } : {}),
+      ...(titleConfig ? ({ title_config: titleConfig } as Record<string, unknown>) : {}),
+    }
+
+    return payload
+  }, [props, selectedTemplate])
+
   /* ── 生成视频 ──
-     返回 true 表示任务创建成功并已开始轮询；false 表示校验未通过或创建失败 */
+     返回 true 表示任务创建成功并已开始轮询（含排队中）；false 表示校验未通过或创建失败 */
   const generate = useCallback(async (): Promise<boolean> => {
     const errorMsg = validateGenerateInputs(props)
     if (errorMsg) {
@@ -112,32 +337,28 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
       return false
     }
 
+    cancelledRef.current = false
+    clearQueueTimers()
     setGenerating(true)
     setProgress(0)
     setGenerated(false)
     setGenerateError(null)
+    setCompletionStatus(null)
     setBatchTasks([])
+    setGeneratedVideos([])
+    setCurrentTaskId("")
     clearTimer()
 
+    const basePayload = buildBasePayload()
+    const assetIds = basePayload.asset_ids
+    const isBatch = (props.previewCount || 1) > 1
+
     try {
-      const { width: outputWidth, height: outputHeight } = calculateResolution(
-        props.videoRatio || "9:16",
-      )
-      const editMode = props.editMode ?? "random"
-      const dedupEnabled = props.dedupEnabled !== false
-
-      const assetIds =
-        props.materialMode === "auto" ? props.smartSelectedIds : props.selectedMaterials
-
-      // from-assets 已由 useStep2Materials 在用户选素材时（debounce 800ms）调用，
-      // 后端已改为异步秒级返回，这里做一次轻量兜底：
-      // 单次查 clips，已有则直接放行；没有则再调一次 from-assets。
+      // from-assets 兜底：片段不存在则补一次
       if (assetIds.length > 0 && selectedTemplate) {
         try {
           const clipList = await getEditPlanClips(selectedTemplate, { limit: 500 })
           if (clipList.items.length === 0) {
-            // 片段不存在（极端情况：useStep2Materials 的 debounce 还没触发）
-            // 手动补一次 from-assets（后端秒级返回）
             await createClipsFromAssets(selectedTemplate, assetIds, "main")
           }
         } catch {
@@ -145,219 +366,185 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
         }
       }
 
-      const isBatch = (props.previewCount || 1) > 1
-      const hide = message.loading(
-        isBatch ? `正在生成 ${props.previewCount} 个视频...` : "正在生成预览视频...",
-        0,
-      )
-
-      const coverUrl = props.coverSettings?.thumbnail_url || props.coverSettings?.upload_url || ""
-
-      // #1970：叙事模式下 ttsVoiceId 作为配音 id；随机模式用 selectedVoice
-      const voiceLibraryId =
-        editMode === "narrative"
-          ? props.ttsVoiceId || ""
-          : props.voiceMode === "clone"
-            ? props.selectedClonedVoice || props.selectedVoice || ""
-            : props.selectedVoice || ""
-
-      /* ── 批量变体数组（长度1=共用，长度=count=独立，空=回退单值） ── */
-      const indexes =
-        isBatch && props.selectedVariantIndexes?.length
-          ? props.selectedVariantIndexes
-          : Array.from({ length: props.previewCount || 1 }, (_, i) => i)
-      const batchCount = isBatch ? indexes.length : 1
-
-      // 标题文字数组：批量时按勾选顺序
-      const titlesArr =
-        isBatch && (props.variantTitles?.length || 0) >= batchCount
-          ? indexes.map((i) => props.variantTitles![i] || props.titleSettings?.title || "")
-          : []
-      // 配音数组：独立配音模式按勾选顺序；否则不传（回退共用 voice_library_id）
-      const voiceArr =
-        isBatch && props.voiceModePerVideo && props.variantVoiceLibraryIds?.length
-          ? indexes.map((i) => props.variantVoiceLibraryIds![i] || voiceLibraryId)
-          : []
-      // 封面数组：批量时按勾选顺序（未设置封面的变体传空串，后端回退智能封面）
-      const coversArr =
-        isBatch && props.variantCoverUrls?.length
-          ? indexes.map((i) => props.variantCoverUrls![i] || "")
-          : []
-      // #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({
-          template_id: selectedTemplate,
-          asset_ids: assetIds,
-          output_width: outputWidth,
-          output_height: outputHeight,
-          cover_url: coverUrl,
-          custom_title: props.titleSettings?.title || "",
-          duration: props.duration || undefined,
-          video_ratio: props.videoRatio,
-          assembly_mode: editMode,
-          ...(editMode === "narrative" && props.selectedScript?.id
-            ? {
-                script_id: props.selectedScript.id,
-                tts_voice_id: props.ttsVoiceId || undefined,
-                tts_voice_source: props.ttsVoiceSource || undefined,
-                tts_style: props.ttsStyle || undefined,
-              }
-            : {}),
-          dedup_enabled: dedupEnabled,
-          voice_library_id: voiceLibraryId,
-          ...(props.selectedVoice && !voiceLibraryId ? { voice_ids: [props.selectedVoice] } : {}),
-          bgm_config: {
-            enabled: props.bgm !== false,
-            ...(props.bgmConfig?.music_id ? { preset_id: props.bgmConfig.music_id } : {}),
-          },
-          ...(props.sourceEditPlanId ? { source_edit_plan_id: props.sourceEditPlanId } : {}),
-          ...(isBatch ? { count: batchCount } : {}),
-          ...(titlesArr.length ? { titles: titlesArr } : {}),
-          ...(voiceArr.length ? { voice_library_ids: voiceArr } : {}),
-          ...(coversArr.length ? { cover_urls: coversArr } : {}),
-          ...(hasVariantPlans ? { variant_plan_ids: variantPlansArr } : {}),
-          ...(props.titleSettings?.title
-            ? {
-                title_config: {
-                  text: props.titleSettings.title,
-                  font: props.titleSettings.font,
-                  font_size: props.titleSettings.size,
-                  font_color: props.titleSettings.color,
-                  position: props.titleSettings.position,
-                  ...(props.titleSettings.position === "custom" &&
-                  props.titleSettings.posX != null &&
-                  props.titleSettings.posY != null
-                    ? {
-                        pos_x: Math.round(props.titleSettings.posX),
-                        pos_y: Math.round(props.titleSettings.posY),
-                      }
-                    : {}),
-                  bold: props.titleSettings.bold,
-                  italic: props.titleSettings.italic,
-                  stroke: props.titleSettings.stroke
-                    ? {
-                        enabled: true,
-                        width: props.titleSettings.strokeWidth ?? 4,
-                        color: props.titleSettings.strokeColor ?? "#000000",
-                      }
-                    : { enabled: false },
-                  shadow: props.titleSettings.shadow
-                    ? {
-                        enabled: true,
-                        offset_x: props.titleSettings.shadowOffsetX ?? 2,
-                        offset_y: props.titleSettings.shadowOffsetY ?? 2,
-                        blur: props.titleSettings.shadowBlur ?? 4,
-                        color: props.titleSettings.shadowColor ?? "rgba(0,0,0,0.8)",
-                      }
-                    : { enabled: false },
-                  line_height: props.titleSettings.lineHeight ?? 1.2,
-                  margin_top: props.titleSettings.marginTop ?? 24,
-                  max_chars_per_line: props.titleSettings.maxCharsPerLine ?? 0,
-                  ...(props.titleSettings.bgEnabled
-                    ? {
-                        background: {
-                          enabled: true,
-                          color: props.titleSettings.bgColor,
-                          padding: props.titleSettings.bgPadding,
-                          radius: props.titleSettings.bgRadius,
-                        },
-                      }
-                    : { background: { enabled: false } }),
-                  line_overrides: (props.titleSettings.lineOverrides ?? []).map((lo) => ({
-                    line_index: lo.line_index,
-                    text: lo.text,
-                    size: lo.size,
-                    color: lo.color,
-                    bold: lo.bold,
-                    italic: lo.italic,
-                    stroke: lo.stroke,
-                    highlights: lo.highlights?.map((h) => ({
-                      word: h.word,
-                      color: h.color,
-                      bold: h.bold,
-                      scale: h.scale,
-                    })),
-                  })),
-                  ...(props.titleSettings.coverTitle
-                    ? {
-                        cover_title_config: {
-                          title: props.titleSettings.coverTitle.title,
-                          font: props.titleSettings.coverTitle.font,
-                          font_size: props.titleSettings.coverTitle.size,
-                          font_color: props.titleSettings.coverTitle.color,
-                          bold: props.titleSettings.coverTitle.bold,
-                          italic: props.titleSettings.coverTitle.italic,
-                          position: props.titleSettings.coverTitle.position,
-                          stroke: props.titleSettings.coverTitle.stroke
-                            ? {
-                                enabled: true,
-                                width: props.titleSettings.coverTitle.strokeWidth ?? 4,
-                                color: props.titleSettings.coverTitle.strokeColor ?? "#000000",
-                              }
-                            : { enabled: false },
-                          shadow: props.titleSettings.coverTitle.shadow
-                            ? {
-                                enabled: true,
-                                offset_x: props.titleSettings.coverTitle.shadowOffsetX ?? 2,
-                                offset_y: props.titleSettings.coverTitle.shadowOffsetY ?? 2,
-                                blur: props.titleSettings.coverTitle.shadowBlur ?? 4,
-                                color:
-                                  props.titleSettings.coverTitle.shadowColor ?? "rgba(0,0,0,0.8)",
-                              }
-                            : { enabled: false },
-                          ...(props.titleSettings.coverTitle.bgEnabled
-                            ? {
-                                background: {
-                                  enabled: true,
-                                  color: props.titleSettings.coverTitle.bgColor,
-                                  padding: props.titleSettings.coverTitle.bgPadding,
-                                  radius: props.titleSettings.coverTitle.bgRadius,
-                                },
-                              }
-                            : { background: { enabled: false } }),
-                        },
-                      }
-                    : {}),
-                },
-              }
-            : {}),
-        })
-        hide()
-        const taskIds = (taskResp.items || []).map((it) => it.id).filter(Boolean)
-
-        if (taskIds.length === 0) {
-          throw new Error("创建任务成功但未返回任务 ID，请稍后在任务列表查看")
-        }
-        if (taskIds.length > 1) {
-          // 批量：任务按创建顺序与勾选变体一一对应（后端按 count 顺序创建）
-          startPollingBatch(taskIds.map((taskId, i) => ({ taskId, variantIndex: indexes[i] ?? i })))
-        } else {
+      if (!isBatch) {
+        /* ── 单视频：原逻辑（一次提交 count=1） ── */
+        const hide = message.loading("正在生成预览视频...", 0)
+        try {
+          const taskResp = await createGenerationTask({ ...basePayload, count: 1 })
+          hide()
+          const taskIds = (taskResp.items || []).map((it) => it.id).filter(Boolean)
+          if (taskIds.length === 0) {
+            throw new Error("创建任务成功但未返回任务 ID，请稍后在任务列表查看")
+          }
+          setCurrentTaskId(taskIds[0])
           startPolling(taskIds[0])
+        } catch (err) {
+          hide()
+          throw err
         }
-      } catch (err) {
-        hide()
-        throw err
+        return true
       }
+
+      /* ── 批量：支持任意数量视频，按队列容量串行提交，429 自动排队重试 ── */
+      const indexes = props.selectedVariantIndexes?.length
+        ? props.selectedVariantIndexes
+        : Array.from({ length: props.previewCount || 1 }, (_, i) => i)
+      const batchCount = indexes.length
+
+      const titlesAll =
+        (props.variantTitles?.length || 0) >= batchCount
+          ? indexes.map((i) => props.variantTitles![i] || props.titleSettings?.title || "")
+          : indexes.map(() => props.titleSettings?.title || "")
+      const voiceArrAll =
+        props.voiceModePerVideo && props.variantVoiceLibraryIds?.length
+          ? indexes.map(
+              (i) => props.variantVoiceLibraryIds![i] || basePayload.voice_library_id || "",
+            )
+          : []
+      const coversAll = props.variantCoverUrls?.length
+        ? indexes.map((i) => props.variantCoverUrls![i] || "")
+        : indexes.map(() => "")
+      const plansAll = props.variantPlanIds?.length
+        ? indexes.map((i) => props.variantPlanIds![i] || "")
+        : indexes.map(() => "")
+
+      const hasAnyVoice = voiceArrAll.some((v) => !!v)
+      const hasAnyCover = coversAll.some((u) => !!u)
+      const hasAnyPlan = plansAll.some((id) => !!id)
+
+      // 先用占位 ID 把所有变体卡片置为 queued，UI 可见
+      const placeholderIds = indexes.map((_, i) => `__queued_${Date.now()}_${i}`)
+      const initialTasks: BatchTaskState[] = indexes.map((variantIndex, i) => ({
+        taskId: placeholderIds[i],
+        variantIndex,
+        status: "queued",
+        progress: 0,
+        error: null,
+        videos: [],
+      }))
+      setBatchTasks(initialTasks)
+
+      message.loading({
+        content: `已提交 ${batchCount} 个视频任务，系统按队列容量依次渲染…`,
+        key: "batch-gen",
+        duration: 3,
+      })
+
+      /** 将占位 taskId 更新为真实 taskId（卡片引用同一对象） */
+      const replacePlaceholder = (placeholderId: string, realTaskId: string) => {
+        setBatchTasks((prev) => {
+          const idx = prev.findIndex((t) => t.taskId === placeholderId)
+          if (idx === -1) return prev
+          const next = [...prev]
+          next[idx] = { ...next[idx], taskId: realTaskId }
+          return next
+        })
+      }
+
+      /** 提交某一索引的单任务（count=1），成功后返回真实 taskId；429/503 则返回 waitMs */
+      const submitOne = async (
+        i: number,
+      ): Promise<{ queued: true; waitMs: number } | { queued: false; taskId: string }> => {
+        const body: CreateGenerationTaskRequest = {
+          ...basePayload,
+          count: 1,
+          titles: [titlesAll[i] || ""],
+          ...(hasAnyVoice
+            ? { voice_library_ids: [voiceArrAll[i] || basePayload.voice_library_id || ""] }
+            : {}),
+          ...(hasAnyCover ? { cover_urls: [coversAll[i] || ""] } : {}),
+          ...(hasAnyPlan && plansAll[i] ? { variant_plan_ids: [plansAll[i]] } : {}),
+        }
+        try {
+          const resp = await createGenerationTask(body)
+          const item = resp.items?.[0]
+          const tid = item?.id
+          if (!tid) throw new Error("创建任务成功但未返回任务 ID")
+          return { queued: false, taskId: tid }
+        } catch (err) {
+          const q = isUserQueueFullError(err)
+          if (q) return { queued: true, waitMs: q.waitMs }
+          throw err
+        }
+      }
+
+      // 串行提交：每次提交一个；429/503 则等待后重试；其它错误立即标记该任务失败
+      let fatalErr: unknown = null
+      for (let i = 0; i < batchCount; i++) {
+        if (cancelledRef.current) return false
+        const variantIndex = indexes[i]
+        const placeholderId = placeholderIds[i]
+        let attempt = 0
+        let submitted = false
+        while (!submitted) {
+          if (cancelledRef.current) return false
+          attempt++
+          try {
+            const result = await submitOne(i)
+            if (!result.queued) {
+              replacePlaceholder(placeholderId, result.taskId)
+              // 先更新到 running，再启动单任务增量轮询（不触发整体 onComplete）
+              pollBatchTaskQueued(result.taskId, variantIndex)
+              submitted = true
+            } else {
+              // 排队：保持 queued 状态，等待后重试
+              handleBatchTaskUpdate(placeholderId, {
+                taskId: placeholderId,
+                variantIndex,
+                status: "queued",
+                progress: 0,
+                error: null,
+              })
+              if (attempt === 1) {
+                message.info({
+                  content: `队列繁忙，${Math.round(result.waitMs / 1000)} 秒后自动继续提交后续视频…`,
+                  key: "batch-gen",
+                  duration: 4,
+                })
+              }
+              await sleep(Math.min(result.waitMs, 60_000))
+            }
+          } catch (err) {
+            // 非限流错误：该任务标记失败，继续后续任务（不阻断整个批量）
+            console.error("[batch generate] 任务提交失败:", err)
+            const msg = translateError(extractBackendError(err))
+            handleBatchTaskUpdate(placeholderId, {
+              taskId: placeholderId,
+              variantIndex,
+              status: "failed",
+              error: msg,
+              progress: 0,
+            })
+            submitted = true
+            if (!fatalErr) fatalErr = err
+          }
+        }
+      }
+
+      if (fatalErr) {
+        // 有任务失败但其余已成功，整体不 throw；由 UI 展示单个失败卡片
+      }
+      return true
     } catch (err: unknown) {
       console.error("[handleGenerate] 生成失败:", err)
-      setGenerating(false)
       const backendMsg = extractBackendError(err)
       console.error("[handleGenerate] 错误信息:", backendMsg, "完整错误:", err)
       const finalMsg = translateError(backendMsg)
       setGenerateError(finalMsg)
+      setGenerating(false)
       message.error(finalMsg)
       return false
     }
-    return true
-  }, [props, clearTimer, startPolling, startPollingBatch, selectedTemplate])
+  }, [
+    props,
+    clearTimer,
+    startPolling,
+    selectedTemplate,
+    buildBasePayload,
+    handleBatchTaskUpdate,
+    clearQueueTimers,
+    pollBatchTaskQueued,
+  ])
 
   const retry = useCallback(() => {
     setGenerateError(null)
@@ -367,9 +554,10 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
   /** 第5步：单独重试某个失败任务 */
   const retryBatchTask = useCallback(
     (taskId: string) => {
+      handleBatchTaskUpdate(taskId, { status: "running", progress: 0, error: null, videos: [] })
       retryTask(taskId)
     },
-    [retryTask],
+    [retryTask, handleBatchTaskUpdate],
   )
 
   const dismissError = useCallback(() => {
@@ -414,6 +602,8 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
     generated,
     generateError,
     generatedVideos,
+    completionStatus,
+    currentTaskId,
     generate,
     retry,
     retryBatchTask,

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

@@ -48,7 +48,11 @@ export function useStep6Cover({
   const [templatesError, setTemplatesError] = useState<string | null>(null)
 
   /** 最终成片：取第一个已完成视频 */
-  const finalVideo = generatedVideos.find((v) => v.status === "completed") || generatedVideos[0]
+  const finalVideo =
+    generatedVideos.find(
+      (v) =>
+        v.status === "completed" || v.status === "awaiting_cover" || v.status === "awaiting_cover",
+    ) || generatedVideos[0]
 
   /** 从后端加载封面模板列表 */
   const loadTemplates = useCallback(async () => {
@@ -171,7 +175,18 @@ export function useStep6Cover({
   }, [])
 
   const handleEditTemplate = useCallback((tpl: CoverTemplate) => {
-    setEditingTemplate(tpl)
+    // 系统模板不可修改：复制为新模板草稿，走"另存为"流程
+    if (tpl.is_system) {
+      setEditingTemplate({
+        ...tpl,
+        id: "",
+        name: tpl.name + " 副本",
+        is_system: false,
+        created_at: "",
+      })
+    } else {
+      setEditingTemplate(tpl)
+    }
     setShowCoverEditor(true)
   }, [])
 
@@ -179,20 +194,25 @@ export function useStep6Cover({
   const handleSaveTemplate = useCallback(
     async (tpl: CoverTemplate) => {
       try {
-        if (tpl.id && coverTemplates.some((t) => t.id === tpl.id)) {
+        // 系统模板或无 id（新建/副本）→ 走创建分支；否则走更新
+        const isSystem = coverTemplates.find((t) => t.id === tpl.id)?.is_system === true
+        const shouldCreate = !tpl.id || isSystem
+        if (shouldCreate) {
+          const created = await createCoverTemplate({
+            name: tpl.name || "我的封面模板",
+            config: tpl.config,
+          })
+          setCoverTemplates((prev) => [...prev, created])
+          setSelectedTemplateId(created.id || tpl.id)
+        } else {
           const updated = await updateCoverTemplate(tpl.id, {
             name: tpl.name,
             config: tpl.config,
           })
           setCoverTemplates((prev) => prev.map((t) => (t.id === tpl.id ? { ...t, ...updated } : t)))
-        } else {
-          const created = await createCoverTemplate({
-            name: tpl.name,
-            config: tpl.config,
-          })
-          setCoverTemplates((prev) => [...prev, created])
         }
         setShowCoverEditor(false)
+        setEditingTemplate(null)
       } catch (err) {
         console.error("[Step6] 保存模板失败:", err)
       }

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

@@ -4,7 +4,7 @@
  *
  * - 步骤1（选择模式）：下一步分支由外层弹窗处理（VoiceSelectModal / ScriptSelectModal），
  *   本 hook 的 goNext 仅在未选模式时拦截；外层 Modal onConfirm 里主动 setCurrentStep(2)。
- * - 步骤2（选择素材）：弹数量选择弹窗（PreviewCountModal），确认后跳步骤3。
+ * - 步骤2（选择素材）：直接进入步骤3，数组长度对齐由 onBeforeEnterStep3 保证。
  * - 步骤3 底部按钮是「确认生成视频」（由 GenerateStepActions 调 onConfirmGenerate），
  *   创建成功后跳步骤4；本 hook 的 goNext 只负责 2→3 和 4→5 的「下一步」。
  * - 步骤4（确认生成进度页）：全部渲染完成后「下一步」解锁进封面。
@@ -23,10 +23,10 @@ export interface UseStepNavigationOptions {
   titleSettings: TitleSettings
   /** 是否已完成视频生成（步骤4全部渲染完成后才能进入封面） */
   generated: boolean
-  /** 点素材下一步时弹出数量选择弹窗 */
-  onOpenCountModal: () => void
   /** 步骤1下一步：根据 editMode 打开对应弹窗（随机→配音 / 叙事→文案） */
   onOpenStep1Modal: () => void
+  /** 进入步骤3前自动对齐数组（previewTitles/voiceLibraryIds/previewCovers/selectedVariantIds）长度到 previewCount */
+  onBeforeEnterStep3?: () => void
 }
 
 export interface UseStepNavigationReturn {
@@ -42,8 +42,8 @@ export const useStepNavigation = (options: UseStepNavigationOptions): UseStepNav
     selectedMaterials,
     smartSelectedIds,
     generated,
-    onOpenCountModal,
     onOpenStep1Modal,
+    onBeforeEnterStep3,
   } = options
 
   const goNext = () => {
@@ -62,8 +62,9 @@ export const useStepNavigation = (options: UseStepNavigationOptions): UseStepNav
         message.warning("请先进行智能匹配并选择素材")
         return
       }
-      // 弹数量选择弹窗
-      onOpenCountModal()
+      // 直接进入步骤3（生成数量在 Step1 已设置）；对齐数组长度
+      onBeforeEnterStep3?.()
+      setCurrentStep(3)
       return
     }
     // 步骤4（确认生成）：全部渲染完成后才能下一步进封面

apps/web/src/pages/generate/types/cover.ts

@@ -63,9 +63,8 @@ export interface TextBackground {
   shape: TextBgShape
   width: number
   height: number
-  posX: number
-  posY: number
-  rotation: number
+  /** 相对文字的上下偏移（百分比），背景自动跟随文字位置 */
+  offsetY: number
 }
 
 /** 文字样式配置（主标题/副标题共用） */
@@ -105,11 +104,14 @@ export interface CoverEditorConfig {
   portraitEnabled: boolean
   portraitSize: number
   portraitPosition: TextPosition
+  portraitImage?: string
 
   // 背景设置
   backgroundEnabled: boolean
   backgroundSize: number
   backgroundPosition: TextPosition
+  backgroundImage?: string
+  backgroundColor?: string
 
   // 主标题
   title: TextStyleConfig
@@ -151,9 +153,7 @@ export const DEFAULT_TITLE_CONFIG: TextStyleConfig = {
     shape: "polygon",
     width: 30,
     height: 10,
-    posX: 50,
-    posY: 50,
-    rotation: 0,
+    offsetY: 0,
   },
 }
 
@@ -181,9 +181,7 @@ export const DEFAULT_SUBTITLE_CONFIG: TextStyleConfig = {
     shape: "rectangle",
     width: 100,
     height: 20,
-    posX: 50,
-    posY: 80,
-    rotation: 0,
+    offsetY: 8,
   },
 }
 
@@ -199,66 +197,109 @@ export const DEFAULT_EDITOR_CONFIG: CoverEditorConfig = {
   titleMaxChars: 4,
   subtitleMaxChars: 10,
 
-  portraitEnabled: true,
-  portraitSize: 80,
-  portraitPosition: { x: 50, y: 50 },
+  portraitEnabled: false,
+  portraitSize: 50,
+  portraitPosition: { x: 50, y: 70 },
 
   backgroundEnabled: true,
-  backgroundSize: 90,
+  backgroundSize: 100,
   backgroundPosition: { x: 50, y: 50 },
 
   title: DEFAULT_TITLE_CONFIG,
   subtitle: DEFAULT_SUBTITLE_CONFIG,
 
-  maskEnabled: true,
+  maskEnabled: false,
   maskImage: "",
   maskSize: 100,
   maskPosition: { x: 50, y: 50 },
   maskColor: "#000000",
-  maskOpacity: 100,
+  maskOpacity: 40,
   maskShape: "矩形",
 }
 
-/** 预置字体 */
-export const PRESET_FONTS = [
-  { name: "思源黑体", family: "'Noto Sans SC', sans-serif" },
-  { name: "斗鱼追光体2.0", family: "'DouYu ZhuangGuangTi', sans-serif" },
-  { name: "抖音美好体", family: "'DouYin MeiHaoTi', sans-serif" },
+/** 预置字体（已与 @/components/title/constants 字体表保持一致；自定义商业字体兜底 Google Fonts 开源中文字体） */
+// 封面编辑器预置字体：与标题样式字体列表保持一致（从 @/components/title/constants 同步），
+// 并补全西文常用系统字体，保证在中英文环境下都有可用字体。
+// 注：需要配合 index.html 引入的 Google Fonts（Noto Sans SC / ZCOOL / Ma Shan Zheng 等）。
+export interface CoverFont {
+  name: string
+  family: string
+  tag?: "preset" | "hand" | "serif" | "sans" | "mono"
+}
+
+/** 预置中文字体（爆款/常用） */
+export const PRESET_FONTS: CoverFont[] = [
+  {
+    name: "优设标题黑",
+    family:
+      '"YouSheBiaoTiHei","ZCOOL QingKe HuangYou","Noto Sans SC","PingFang SC","Microsoft YaHei",sans-serif',
+    tag: "preset",
+  },
+  {
+    name: "阿里普惠体Bold",
+    family:
+      '"Alibaba PuHuiTi","Alibaba Sans","Noto Sans SC","PingFang SC","Microsoft YaHei",sans-serif',
+    tag: "preset",
+  },
+  {
+    name: "抖音美好体",
+    family:
+      '"Douyin Sans","ZCOOL KuaiLe","Noto Sans SC","PingFang SC","Microsoft YaHei",sans-serif',
+    tag: "preset",
+  },
+  {
+    name: "思源黑体Heavy",
+    family: '"Noto Sans SC","Source Han Sans SC Heavy","PingFang SC","Microsoft YaHei",sans-serif',
+    tag: "preset",
+  },
+  {
+    name: "思源黑体",
+    family: '"Noto Sans SC","Source Han Sans SC","PingFang SC","Microsoft YaHei",sans-serif',
+    tag: "preset",
+  },
+  {
+    name: "思源宋体",
+    family: '"Noto Serif SC","Source Han Serif SC","Songti SC","SimSun",serif',
+    tag: "serif",
+  },
+  { name: "站酷小薇体", family: '"ZCOOL XiaoWei","Noto Serif SC",serif', tag: "preset" },
+  { name: "马善政毛笔", family: '"Ma Shan Zheng","STXingkai","KaiTi",cursive', tag: "hand" },
+  { name: "龙藏体", family: '"Long Cang","STXingkai",cursive', tag: "hand" },
+  { name: "楷体", family: '"KaiTi","STKaiti","DFKai-SB",serif', tag: "serif" },
+  {
+    name: "苹方",
+    family: '"PingFang SC",-apple-system,"Helvetica Neue",sans-serif',
+    tag: "sans",
+  },
+  {
+    name: "微软雅黑",
+    family: '"Microsoft YaHei","PingFang SC","Noto Sans SC",sans-serif',
+    tag: "sans",
+  },
 ]
 
-/** 系统字体 */
-export const SYSTEM_FONTS = [
-  { name: "Arial", family: "Arial, sans-serif" },
-  { name: "Helvetica", family: "Helvetica, sans-serif" },
-  { name: "Times New Roman", family: "'Times New Roman', serif" },
-  { name: "Georgia", family: "Georgia, serif" },
-  { name: "Verdana", family: "Verdana, sans-serif" },
-  { name: "Tahoma", family: "Tahoma, sans-serif" },
-  { name: "Impact", family: "Impact, sans-serif" },
-  { name: "Comic Sans MS", family: "'Comic Sans MS', cursive" },
-  { name: "Courier New", family: "'Courier New', monospace" },
-  { name: "微软雅黑", family: "'Microsoft YaHei', sans-serif" },
-  { name: "宋体", family: "SimSun, serif" },
-  { name: "黑体", family: "SimHei, sans-serif" },
-  { name: "楷体", family: "KaiTi, serif" },
-  { name: "仿宋", family: "FangSong, serif" },
-  { name: "Trebuchet MS", family: "'Trebuchet MS', sans-serif" },
-  { name: "Lucida Console", family: "'Lucida Console', monospace" },
-  { name: "Palatino", family: "Palatino, serif" },
-  { name: "Garamond", family: "Garamond, serif" },
-  { name: "Bookman", family: "Bookman, serif" },
-  { name: "Avant Garde", family: "'Avant Garde', sans-serif" },
-  { name: "Calibri", family: "Calibri, sans-serif" },
-  { name: "Cambria", family: "Cambria, serif" },
-  { name: "Candara", family: "Candara, sans-serif" },
-  { name: "Consolas", family: "Consolas, monospace" },
-  { name: "Constantia", family: "Constantia, serif" },
-  { name: "Corbel", family: "Corbel, sans-serif" },
-  { name: "Franklin Gothic", family: "'Franklin Gothic', sans-serif" },
-  { name: "Gill Sans", family: "'Gill Sans', sans-serif" },
-  { name: "Optima", family: "Optima, sans-serif" },
-  { name: "Futura", family: "Futura, sans-serif" },
-  { name: "Rockwell", family: "Rockwell, serif" },
+/** 系统字体（西文 + 通用中文） */
+export const SYSTEM_FONTS: CoverFont[] = [
+  { name: "Arial", family: "Arial, Helvetica, sans-serif", tag: "sans" },
+  { name: "Helvetica", family: "Helvetica, Arial, sans-serif", tag: "sans" },
+  { name: "Times New Roman", family: '"Times New Roman", Times, serif', tag: "serif" },
+  { name: "Georgia", family: "Georgia, serif", tag: "serif" },
+  { name: "Verdana", family: "Verdana, Geneva, sans-serif", tag: "sans" },
+  { name: "Tahoma", family: "Tahoma, Geneva, sans-serif", tag: "sans" },
+  { name: "Impact", family: 'Impact, "Arial Black", sans-serif', tag: "sans" },
+  { name: "Comic Sans MS", family: '"Comic Sans MS", cursive', tag: "hand" },
+  { name: "Courier New", family: '"Courier New", Courier, monospace', tag: "mono" },
+  { name: "宋体", family: "SimSun, 'Noto Serif SC', serif", tag: "serif" },
+  { name: "黑体", family: "SimHei, 'Noto Sans SC', sans-serif", tag: "sans" },
+  { name: "仿宋", family: "FangSong, 'Noto Serif SC', serif", tag: "serif" },
+  { name: "Trebuchet MS", family: '"Trebuchet MS", sans-serif', tag: "sans" },
+  { name: "Lucida Console", family: '"Lucida Console", Monaco, monospace', tag: "mono" },
+  { name: "Palatino", family: 'Palatino, "Palatino Linotype", serif', tag: "serif" },
+  { name: "Garamond", family: "Garamond, serif", tag: "serif" },
+  { name: "Calibri", family: "Calibri, sans-serif", tag: "sans" },
+  { name: "Cambria", family: "Cambria, serif", tag: "serif" },
+  { name: "Candara", family: "Candara, sans-serif", tag: "sans" },
+  { name: "Consolas", family: "Consolas, monospace", tag: "mono" },
 ]
 
 /** 所有字体列表 */

apps/web/src/pages/tasks/constants.tsx

@@ -45,6 +45,11 @@ export const STATUS_CONFIG: Record<
     color: "processing",
     icon: <SyncOutlined spin />,
   },
+  awaiting_cover: {
+    label: "待选封面",
+    color: "warning",
+    icon: <ClockCircleOutlined />,
+  },
   completed: {
     label: "已完成",
     color: "success",

apps/web/src/pages/viral-video/components/AssetPickerModal.tsx

@@ -0,0 +1,263 @@
+/**
+ * 爆款视频素材选择弹窗（通用版，支持 image/video/voice）
+ * 基于 ai-avatar 的 ModalAssetPicker 改造：
+ *  - kind 可传 "image" | "video" | "voice"
+ *  - 多图场景 multiple=true 时底部"确认选择"
+ *  - 单选场景点击即回调关闭
+ */
+import { useEffect, useState } from "react"
+import { getAssets, getAssetLibraries, type AssetItem, type AssetLibraryItem } from "@/api/assets"
+
+export interface AssetPickerModalProps {
+  open: boolean
+  kind: "image" | "video" | "voice"
+  multiple?: boolean
+  title?: string
+  onClose: () => void
+  onSelect: (assets: AssetItem[]) => void
+}
+
+const KIND_LABEL: Record<AssetPickerModalProps["kind"], string> = {
+  image: "图片",
+  video: "视频",
+  voice: "音频",
+}
+
+const MIME_KIND: Record<AssetPickerModalProps["kind"], string> = {
+  image: "image",
+  video: "video",
+  voice: "audio",
+}
+
+export default function AssetPickerModal({
+  open,
+  kind,
+  multiple = false,
+  title,
+  onClose,
+  onSelect,
+}: AssetPickerModalProps) {
+  const [keyword, setKeyword] = useState("")
+  const [libraries, setLibraries] = useState<AssetLibraryItem[]>([])
+  const [libraryId, setLibraryId] = useState<string>("")
+  const [assets, setAssets] = useState<AssetItem[]>([])
+  const [picked, setPicked] = useState<Set<string>>(new Set())
+  const [loadingLibs, setLoadingLibs] = useState(false)
+  const [loadingAssets, setLoadingAssets] = useState(false)
+  const [error, setError] = useState("")
+
+  useEffect(() => {
+    if (!open) return
+    setKeyword("")
+    setLibraries([])
+    setLibraryId("")
+    setAssets([])
+    setError("")
+    setPicked(new Set())
+  }, [open])
+
+  useEffect(() => {
+    if (!open) return
+    let cancelled = false
+    setLoadingLibs(true)
+    getAssetLibraries(kind)
+      .then((libs) => {
+        if (cancelled) return
+        const list = Array.isArray(libs) ? libs : []
+        setLibraries(list)
+        if (list.length > 0) setLibraryId(list[0].id)
+      })
+      .catch(() => {
+        if (!cancelled) setError("素材库加载失败，请重试")
+      })
+      .finally(() => {
+        if (!cancelled) setLoadingLibs(false)
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [open, kind])
+
+  useEffect(() => {
+    if (!open || !libraryId) return
+    let cancelled = false
+    setLoadingAssets(true)
+    const load = async () => {
+      try {
+        const { items } = await getAssets(libraryId, { page_size: 100 })
+        if (cancelled) return
+        let list = Array.isArray(items) ? items : []
+        const mimePrefix = MIME_KIND[kind]
+        list = list.filter((a) => !a.mime_type || a.mime_type.startsWith(mimePrefix))
+        const kw = keyword.trim()
+        if (kw) list = list.filter((a) => a.name?.includes(kw))
+        setAssets(list)
+        setError("")
+      } catch {
+        if (!cancelled) {
+          setError("素材加载失败，请重试")
+          setAssets([])
+        }
+      } finally {
+        if (!cancelled) setLoadingAssets(false)
+      }
+    }
+    const timer = window.setTimeout(load, 250)
+    return () => {
+      cancelled = true
+      window.clearTimeout(timer)
+    }
+  }, [open, libraryId, keyword, kind])
+
+  const thumbFor = (a: AssetItem) => {
+    if (kind === "image") return a.thumbnail_url || a.file_url
+    if (kind === "video") return a.thumbnail_url
+    return ""
+  }
+
+  const togglePick = (id: string) => {
+    if (multiple) {
+      setPicked((prev) => {
+        const n = new Set(prev)
+        if (n.has(id)) n.delete(id)
+        else n.add(id)
+        return n
+      })
+    } else {
+      const asset = assets.find((a) => a.id === id)
+      if (asset) {
+        onSelect([asset])
+        onClose()
+      }
+    }
+  }
+
+  const handleConfirm = () => {
+    const list = assets.filter((a) => picked.has(a.id))
+    if (list.length > 0) onSelect(list)
+    onClose()
+  }
+
+  if (!open) return null
+
+  return (
+    <div className="vv-modal-mask" onClick={onClose}>
+      <div className="vv-modal" onClick={(e) => e.stopPropagation()}>
+        <div className="vv-modal-head">
+          <span className="vv-modal-title">{title || `选择${KIND_LABEL[kind]}素材`}</span>
+          <button className="vv-modal-close" onClick={onClose} aria-label="关闭">
+            ×
+          </button>
+        </div>
+        <div className="vv-modal-body">
+          <div className="vv-asset-search">
+            <select
+              className="vv-input"
+              style={{ width: 170, flex: "0 0 auto" }}
+              value={libraryId}
+              onChange={(e) => setLibraryId(e.target.value)}
+              disabled={loadingLibs || libraries.length === 0}
+            >
+              {libraries.length === 0 ? (
+                <option value="">
+                  {loadingLibs ? "加载中…" : `暂无${KIND_LABEL[kind]}素材库`}
+                </option>
+              ) : (
+                libraries.map((lib) => (
+                  <option key={lib.id} value={lib.id}>
+                    📁 {lib.name}
+                  </option>
+                ))
+              )}
+            </select>
+            <input
+              className="vv-input"
+              type="text"
+              placeholder={`搜索${KIND_LABEL[kind]}名称…`}
+              value={keyword}
+              onChange={(e) => setKeyword(e.target.value)}
+            />
+          </div>
+
+          {libraries.length === 0 && !loadingLibs ? (
+            <div className="vv-modal-empty">
+              <div className="vv-empty-icon">📁</div>
+              暂无{KIND_LABEL[kind]}素材库，请先在「素材库」中创建并上传
+            </div>
+          ) : loadingAssets ? (
+            <div className="vv-modal-empty">
+              <div className="vv-empty-icon">⏳</div>
+              素材加载中…
+            </div>
+          ) : error ? (
+            <div className="vv-modal-empty">
+              <div className="vv-empty-icon">⚠️</div>
+              {error}
+            </div>
+          ) : assets.length === 0 ? (
+            <div className="vv-modal-empty">
+              <div className="vv-empty-icon">
+                {kind === "image" ? "🖼️" : kind === "video" ? "🎬" : "🎵"}
+              </div>
+              {kind === "voice" ? (
+                <>
+                  <div style={{ marginTop: 8, fontSize: 13 }}>暂无配音素材</div>
+                  <div style={{ marginTop: 4, fontSize: 12, color: "#9ca3af" }}>
+                    请先在「配音/我的音色」中上传音频文件，或在素材库管理中添加
+                  </div>
+                </>
+              ) : (
+                <>该素材库暂无{KIND_LABEL[kind]}素材</>
+              )}
+            </div>
+          ) : (
+            <div className={`vv-asset-thumbs vv-asset-${kind}`}>
+              {assets.map((asset) => {
+                const active = picked.has(asset.id)
+                const thumb = thumbFor(asset)
+                return (
+                  <div
+                    key={asset.id}
+                    className={`vv-thumb-card${active ? " selected" : ""}`}
+                    onClick={() => togglePick(asset.id)}
+                  >
+                    {thumb ? (
+                      <img src={thumb} alt={asset.name} />
+                    ) : kind === "video" ? (
+                      <video src={asset.file_url} muted preload="metadata" />
+                    ) : (
+                      <div className="vv-thumb-ph">{kind === "voice" ? "🎵" : "📄"}</div>
+                    )}
+                    {active && <div className="vv-thumb-check">✓</div>}
+                    <div className="vv-thumb-name" title={asset.name}>
+                      <span className="vv-thumb-name-txt">{asset.name}</span>
+                      {kind === "voice" &&
+                        typeof asset.duration === "number" &&
+                        asset.duration > 0 && (
+                          <span className="vv-thumb-dur">{Math.round(asset.duration)}s</span>
+                        )}
+                    </div>
+                  </div>
+                )
+              })}
+            </div>
+          )}
+        </div>
+        {multiple && (
+          <div className="vv-modal-foot">
+            <button className="vv-btn vv-btn-ghost" onClick={onClose}>
+              取消
+            </button>
+            <button
+              className="vv-btn vv-btn-primary"
+              onClick={handleConfirm}
+              disabled={picked.size === 0}
+            >
+              确认选择（{picked.size}）
+            </button>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}

apps/web/src/pages/viral-video/components/PresetVoicePickerModal.tsx

@@ -0,0 +1,355 @@
+/**
+ * 内置音色选择弹窗（浅色紫调版）
+ * - 标题「选择音色」+ 搜索框 + 分类筛选 + 3列卡片网格 + 试听 + 选中 + 完成选择
+ */
+import React, { useEffect, useMemo, useRef, useState } from "react"
+import {
+  CloseOutlined,
+  SearchOutlined,
+  PlayCircleOutlined,
+  PauseCircleOutlined,
+  UserOutlined,
+} from "@ant-design/icons"
+import { Select, Input } from "antd"
+
+export interface PresetVoice {
+  id: string
+  name: string
+  gender?: "female" | "male" | "child" | "other"
+  gender_label?: string
+  category?: string
+  avatar_url?: string
+  sample_audio_url?: string
+  desc?: string
+}
+
+interface Props {
+  open: boolean
+  voices?: PresetVoice[]
+  loading?: boolean
+  selectedId?: string
+  onClose: () => void
+  onConfirm: (voice: PresetVoice) => void
+}
+
+/** 兜底 mock 音色（后端 /api/v1/tts/presets 返回字段不够时使用） */
+const MOCK_VOICES: PresetVoice[] = [
+  // ⚠️ 兜底 mock，仅在 /voices/presets 接口不可达时使用；ID 必须与后端
+  // packages/domain/preset_voices.py PRESET_VOICES 的 voice_id 对齐（v3后缀）
+  {
+    id: "longxiaochun_v3",
+    name: "龙小淳",
+    gender: "female",
+    category: "女声",
+    desc: "知性积极女声，适合语音助手",
+  },
+  {
+    id: "longxiaoxia_v3",
+    name: "龙小夏",
+    gender: "female",
+    category: "女声",
+    desc: "沉稳权威女声，适合新闻播报",
+  },
+  {
+    id: "longsanshu_v3",
+    name: "龙三叔",
+    gender: "male",
+    category: "男声",
+    desc: "沉稳质感男声，适合有声书",
+  },
+  {
+    id: "longyue_v3",
+    name: "龙悦",
+    gender: "female",
+    category: "女声",
+    desc: "温暖磁性女声，适合广告配音",
+  },
+  {
+    id: "longshu_v3",
+    name: "龙书",
+    gender: "male",
+    category: "男声",
+    desc: "沉稳青年男声，适合教育讲解",
+  },
+  {
+    id: "longyingjing_v3",
+    name: "龙应静",
+    gender: "female",
+    category: "女声",
+    desc: "低调冷静女声，适合纪录片解说",
+  },
+  {
+    id: "longshuo_v3",
+    name: "龙硕",
+    gender: "male",
+    category: "男声",
+    desc: "博才干练男声，适合科技类内容",
+  },
+  {
+    id: "longtian_v3",
+    name: "龙甜",
+    gender: "female",
+    category: "女声",
+    desc: "活泼女声，适合短视频配音",
+  },
+]
+
+const CATEGORY_LABELS: Record<string, string> = {
+  all: "全部分类",
+  female: "女声",
+  male: "男声",
+  child: "童声",
+  dialect: "方言",
+  emotion: "情绪",
+}
+
+const GENDER_LABEL = (v: PresetVoice) => {
+  if (v.gender_label) return v.gender_label
+  const g = v.gender
+  if (g === "female") return "女声·女声"
+  if (g === "male") return "男声·男声"
+  if (g === "child") return "童声·童声"
+  return "性别未标注·其他"
+}
+
+const AVATAR_BG = (gender?: string) => {
+  if (gender === "female") return "#fce7f3"
+  if (gender === "male") return "#dbeafe"
+  if (gender === "child") return "#fef3c7"
+  return "#f3f0ff"
+}
+const AVATAR_COLOR = (gender?: string) => {
+  if (gender === "female") return "#be185d"
+  if (gender === "male") return "#1d4ed8"
+  if (gender === "child") return "#b45309"
+  return "#7c3aed"
+}
+
+const PresetVoicePickerModal: React.FC<Props> = ({
+  open,
+  voices,
+  loading,
+  selectedId,
+  onClose,
+  onConfirm,
+}) => {
+  const [keyword, setKeyword] = useState("")
+  const [category, setCategory] = useState<string>("all")
+  const [pickedId, setPickedId] = useState<string | undefined>(selectedId)
+  const [playingId, setPlayingId] = useState<string | null>(null)
+  const audioRef = useRef<HTMLAudioElement | null>(null)
+
+  useEffect(() => {
+    if (open) {
+      setKeyword("")
+      setCategory("all")
+      setPickedId(selectedId)
+      setPlayingId(null)
+    }
+  }, [open, selectedId])
+
+  // 停止播放
+  useEffect(() => {
+    return () => {
+      audioRef.current?.pause()
+      audioRef.current = null
+    }
+  }, [])
+
+  // 合并真实数据和 mock：如果真实数据 gender/category 缺失，用 mock 兜底
+  const allVoices: PresetVoice[] = useMemo(() => {
+    // 真实 API 返回的 voice_id 以 API 为准（如 longxiaochun_v3），前端不做硬编码覆盖
+    const realList: PresetVoice[] = (voices || []).map((v) => {
+      // 按 id 精确匹配 mock 获取补充元信息（id 即 voice_id，唯一稳定键）
+      const mockMatch = MOCK_VOICES.find((m) => m.id === v.id)
+      return {
+        ...v,
+        gender: v.gender || mockMatch?.gender,
+        category:
+          v.category ||
+          mockMatch?.category ||
+          (v.gender === "female" ? "女声" : v.gender === "male" ? "男声" : "其他"),
+        desc: v.desc || mockMatch?.desc,
+        sample_audio_url: v.sample_audio_url,
+      }
+    })
+    // 如果没有真实数据，使用兜底 mock（接口失败时）
+    return realList.length > 0 ? realList : MOCK_VOICES
+  }, [voices])
+
+  const categories = useMemo(() => {
+    const set = new Set<string>()
+    allVoices.forEach((v) => {
+      if (v.category) set.add(v.category)
+    })
+    return Array.from(set)
+  }, [allVoices])
+
+  const filtered = useMemo(() => {
+    const kw = keyword.trim().toLowerCase()
+    return allVoices.filter((v) => {
+      if (category !== "all") {
+        if (v.category !== category && category !== CATEGORY_LABELS[v.gender || ""]) {
+          // gender 兜底匹配
+          if (
+            !(category === "女声" && v.gender === "female") &&
+            !(category === "男声" && v.gender === "male") &&
+            !(category === "童声" && v.gender === "child") &&
+            !(category === "方言" && v.category === "方言") &&
+            !(category === "情绪" && v.category === "情绪")
+          ) {
+            return false
+          }
+        }
+      }
+      if (!kw) return true
+      return (
+        v.name?.toLowerCase().includes(kw) ||
+        v.desc?.toLowerCase().includes(kw) ||
+        v.category?.toLowerCase().includes(kw)
+      )
+    })
+  }, [allVoices, keyword, category])
+
+  const handlePreview = (v: PresetVoice) => {
+    if (!v.sample_audio_url) {
+      // 无示例音频
+      return
+    }
+    if (playingId === v.id) {
+      audioRef.current?.pause()
+      setPlayingId(null)
+      return
+    }
+    audioRef.current?.pause()
+    const a = new Audio(v.sample_audio_url)
+    a.onended = () => setPlayingId(null)
+    a.onerror = () => setPlayingId(null)
+    a.play().catch(() => {})
+    audioRef.current = a
+    setPlayingId(v.id)
+  }
+
+  const handleConfirm = () => {
+    const picked = allVoices.find((v) => v.id === pickedId)
+    if (!picked) return
+    onConfirm(picked)
+  }
+
+  if (!open) return null
+
+  return (
+    <div className="vv-modal-mask" onClick={onClose}>
+      <div className="vv-modal vv-modal-lg" onClick={(e) => e.stopPropagation()}>
+        <div className="vv-modal-head">
+          <div className="vv-modal-title">选择音色</div>
+          <button className="vv-modal-close" onClick={onClose}>
+            <CloseOutlined />
+          </button>
+        </div>
+        <div className="vv-modal-body">
+          {/* 搜索 */}
+          <Input
+            className="vv-voice-search"
+            placeholder="搜索音色名称或风格"
+            prefix={<SearchOutlined style={{ color: "#9ca3af" }} />}
+            value={keyword}
+            onChange={(e) => setKeyword(e.target.value)}
+            allowClear
+            size="large"
+          />
+          {/* 分类筛选 */}
+          <div className="vv-voice-cat-row">
+            <span className="vv-voice-cat-label">音色分类</span>
+            <Select
+              value={category}
+              onChange={setCategory}
+              style={{ width: 180 }}
+              options={[
+                { value: "all", label: "全部分类" },
+                ...[
+                  "女声",
+                  "男声",
+                  "童声",
+                  "方言",
+                  "情绪",
+                  ...categories.filter(
+                    (c) => !["女声", "男声", "童声", "方言", "情绪"].includes(c),
+                  ),
+                ].map((c) => ({ value: c, label: c })),
+              ]}
+            />
+          </div>
+          {/* 卡片网格 */}
+          <div className="vv-voice-grid">
+            {loading && filtered.length === 0 ? (
+              <div className="vv-modal-empty">加载中…</div>
+            ) : filtered.length === 0 ? (
+              <div className="vv-modal-empty">没有匹配的音色</div>
+            ) : (
+              filtered.map((v) => {
+                const isPicked = pickedId === v.id
+                const isPlaying = playingId === v.id
+                return (
+                  <div
+                    key={v.id}
+                    className={`vv-voice-card ${isPicked ? "selected" : ""}`}
+                    onClick={() => setPickedId(v.id)}
+                  >
+                    <div
+                      className="vv-voice-card-avatar"
+                      style={{ background: AVATAR_BG(v.gender), color: AVATAR_COLOR(v.gender) }}
+                    >
+                      {v.avatar_url ? (
+                        <img src={v.avatar_url} alt={v.name} />
+                      ) : (
+                        <UserOutlined style={{ fontSize: 22 }} />
+                      )}
+                    </div>
+                    <div className="vv-voice-card-name" title={v.name}>
+                      {v.name}
+                    </div>
+                    <div className="vv-voice-card-gender">{GENDER_LABEL(v)}</div>
+                    {v.desc && <div className="vv-voice-card-desc">{v.desc}</div>}
+                    <div className="vv-voice-card-actions">
+                      <button
+                        className={`vv-voice-card-btn ${isPicked ? "picked" : ""}`}
+                        onClick={(e) => {
+                          e.stopPropagation()
+                          setPickedId(v.id)
+                        }}
+                      >
+                        {isPicked ? "✓ 已选择" : "选择"}
+                      </button>
+                      <button
+                        className={`vv-voice-card-btn vv-voice-card-btn-preview ${isPlaying ? "playing" : ""} ${!v.sample_audio_url ? "disabled" : ""}`}
+                        onClick={(e) => {
+                          e.stopPropagation()
+                          handlePreview(v)
+                        }}
+                        disabled={!v.sample_audio_url}
+                      >
+                        {isPlaying ? <PauseCircleOutlined /> : <PlayCircleOutlined />}
+                        {isPlaying ? "停止" : "试听"}
+                      </button>
+                    </div>
+                  </div>
+                )
+              })
+            )}
+          </div>
+        </div>
+        <div className="vv-modal-foot">
+          <button className="vv-btn vv-btn-ghost" onClick={onClose}>
+            取消
+          </button>
+          <button className="vv-btn vv-btn-primary" onClick={handleConfirm} disabled={!pickedId}>
+            完成选择
+          </button>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default PresetVoicePickerModal

apps/web/src/pages/viral-video/hooks/useViralVideoPolling.ts

@@ -0,0 +1,74 @@
+import { useCallback, useEffect, useRef } from "react"
+import { getViralVideoJob } from "@/api/viral-video"
+import { isAnalysisStage, type ViralVideoJob, type ViralVideoStatus } from "@/api/viral-video/types"
+
+const TERMINAL: ViralVideoStatus[] = ["completed", "failed", "cancelled"]
+
+export interface UseViralVideoPollingOptions {
+  /** 轮询间隔（毫秒），默认 1500 */
+  intervalMs?: number
+}
+
+/**
+ * 爆款视频任务 HTTP 轮询 hook。
+ * 负责持续拉取任务状态并回调给上层；上层负责根据状态/阶段切换 UI 文案。
+ * 任务进入终态（completed/failed/cancelled）后自动停止。
+ */
+export function useViralVideoPolling(
+  jobId: string | null | undefined,
+  onUpdate: (job: ViralVideoJob) => void,
+  options: UseViralVideoPollingOptions = {},
+) {
+  const { intervalMs = 1500 } = options
+  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+  const stoppedRef = useRef(false)
+  const failCountRef = useRef(0)
+
+  const stop = useCallback(() => {
+    stoppedRef.current = true
+    if (timerRef.current) {
+      clearTimeout(timerRef.current)
+      timerRef.current = null
+    }
+  }, [])
+
+  const pollOnce = useCallback(
+    async (id: string) => {
+      try {
+        const job = await getViralVideoJob(id)
+        failCountRef.current = 0
+        onUpdate(job)
+        if (TERMINAL.includes(job.status)) {
+          stop()
+          return
+        }
+        if (stoppedRef.current) return
+        // 视频渲染阶段（Seedance 多段视频生成较慢）拉长轮询间隔
+        const inRender = job.progress_stage === "rendering"
+        // 分析阶段走默认间隔即可
+        const isAnalyzing = isAnalysisStage(job.progress_stage)
+        const nextDelay = inRender ? 3000 : isAnalyzing ? 2000 : intervalMs
+        timerRef.current = setTimeout(() => pollOnce(id), nextDelay)
+      } catch (_err) {
+        failCountRef.current += 1
+        if (stoppedRef.current) return
+        const delay = Math.min(intervalMs * 2 ** Math.min(failCountRef.current, 3), 10000)
+        timerRef.current = setTimeout(() => pollOnce(id), delay)
+      }
+    },
+    [intervalMs, onUpdate, stop],
+  )
+
+  useEffect(() => {
+    stoppedRef.current = false
+    failCountRef.current = 0
+    if (!jobId) {
+      stop()
+      return
+    }
+    pollOnce(jobId)
+    return stop
+  }, [jobId, pollOnce, stop])
+
+  return { stop }
+}

apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts

@@ -1,25 +1,26 @@
 import { useState, useCallback } from "react"
 import { useMutation, useQueryClient } from "@tanstack/react-query"
 import { message } from "antd"
-import {
-  uploadAssetDirect,
-  getAssetLibraries,
-  getIngestJob,
-  type AssetLibraryItem,
-} from "@/api/assets"
+import { uploadAssetDirect, getIngestJob, type AssetLibraryItem } from "@/api/assets"
 import { tagAsset } from "@/api/tags"
 import { type VoiceGender, type VoiceMaterial } from "../../../types"
 
 interface UseVoiceUploadOptions {
   voiceLibrary?: { id: string; kind: string }
-  createLibMutation: { mutateAsync: () => Promise<AssetLibraryItem>; isPending: boolean }
+  createLibMutation?: {
+    mutateAsync: () => Promise<AssetLibraryItem>
+    isPending: boolean
+  }
 }
 
 /**
  * 配音素材上传 Hook
  * 封装上传流程：获取库 → 上传文件 → 获取时长 → 创建记录 → 打标签
  */
-export function useVoiceUpload({ voiceLibrary, createLibMutation }: UseVoiceUploadOptions) {
+export function useVoiceUpload({
+  voiceLibrary,
+  createLibMutation: _createLibMutation,
+}: UseVoiceUploadOptions) {
   const queryClient = useQueryClient()
   const [uploadProgress, setUploadProgress] = useState<number | null>(null)
 
@@ -33,24 +34,12 @@ export function useVoiceUpload({ voiceLibrary, createLibMutation }: UseVoiceUplo
     }) => {
       setUploadProgress(0)
       try {
-        // 1. 获取或等待 voice library
-        let lib = voiceLibrary
-        if (!lib) {
-          if (createLibMutation.isPending) {
-            await createLibMutation.mutateAsync()
-          }
-          const libs = await queryClient.fetchQuery({
-            queryKey: ["asset-libraries"],
-            queryFn: () => getAssetLibraries(),
-          })
-          lib = libs.find((l: AssetLibraryItem) => l.kind === "voice")
-          if (!lib) throw new Error("无法创建配音库")
-        }
-
-        // 2. 上传文件（带进度，后端自动创建 ingest job）
+        // 1. 上传文件：后端自动在默认项目下确保配音库存在（P0 404 修复）
+        //    兼容 voiceLibrary 参数：若调用方已传入正确的库 ID 则直接复用，否则内部自动解析
         const complete = await uploadAssetDirect({
           file: data.file,
-          library_id: lib.id,
+          library_id: voiceLibrary?.id,
+          kind: "voice",
           onProgress: (p) => setUploadProgress(p),
         })
 

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

@@ -1,6 +1,6 @@
 import { useState, useCallback } from "react"
 import { useMutation, useQueryClient } from "@tanstack/react-query"
-import { uploadAssetDirect, getAssetLibraries, getIngestJob } from "@/api/assets"
+import { uploadAssetDirect, getIngestJob } from "@/api/assets"
 
 /**
  * 配音上传 Hook
@@ -23,18 +23,10 @@ export function useVoiceUpload({ showToast }: UseVoiceUploadProps) {
     mutationFn: async (data: { file: File; name: string; description: string }) => {
       setUploadProgress(0)
       try {
-        /* 获取或创建默认配音库 */
-        const libs = await queryClient.fetchQuery({
-          queryKey: ["asset-libraries"],
-          queryFn: () => getAssetLibraries(),
-        })
-        const lib = libs.find((l) => l.kind === "voice")
-        if (!lib) throw new Error("配音库不存在，请先在配音库页面创建")
-
-        /* 直传文件（后端会自动创建 ingest job） */
+        /* 直传文件（后端会自动在默认项目下确保配音库存在，P0 404 修复） */
         const complete = await uploadAssetDirect({
           file: data.file,
-          library_id: lib.id,
+          kind: "voice",
           onProgress: (p) => setUploadProgress(p),
         })