feat(viral-video): 分镜脚本生成阶段接入 WebSocket 流式预览

- 新增 useViralVideoWebSocket hook：订阅 /api/v1/viral-video/ws/{job_id}，
  消费 viral_video:script_delta 事件，失败自动重连最多3次（指数退避），
  超出后静默交给 HTTP 轮询 fallback（与后端降级策略一致）
- 文案生成中（step2_generating）：WebSocket 有 delta 时在文案框内实时渲染
  LLM 原始输出（等宽字体+闪烁光标+字数统计），无 delta 时保持原 spinner loading
- 离开生成态时自动清空流式缓冲，终态 copy_generated 由轮询接管，继续用原
  storyboard 结构化渲染，不影响后续编辑/出片流程
- CSS：vv-streaming-* 系列类，复用 vv-storyboard 固定高度+内部滚动布局

.ci-trigger

@@ -1 +1,2 @@
-trigger staging deploy for bec75a07 (viral-video error isolation) at 2026-10-11 19:39:29
+CI trigger file - safe to delete
+retrigger at 2026-09-15 20:31:24 UTC

alembic/versions/105_narration_first.py

@@ -28,17 +28,10 @@ depends_on = None
 
 
 def _tpl(prompt_type: str, version: int) -> dict:
-    """取模板：先按指定版本找，找不到则取该类型最新版本（兼容 v3→v4 升级）。"""
-    # 先按指定版本找
     for t in DEFAULT_TEMPLATES:
         if t["prompt_type"] == prompt_type and t["version"] == version:
             return t
-    # 找不到则取最新版本
-    candidates = [t for t in DEFAULT_TEMPLATES if t["prompt_type"] == prompt_type]
-    if candidates:
-        latest = max(candidates, key=lambda x: x["version"])
-        return latest
-    raise RuntimeError("default template missing: %s" % prompt_type)
+    raise RuntimeError("default template missing: %s v%s" % (prompt_type, version))
 
 
 def _upsert(bind, t: dict) -> None:

alembic/versions/108_storyboard_v4_multivoice.py

@@ -1,235 +0,0 @@
-# -*- coding: utf-8 -*-
-"""storyboard v4 - 多角色对话 + 废除旁白 + visual 5要素
-
-Revision ID: 108_storyboard_v4_multivoice
-Revises: 107
-Create Date: 2026-10-10
-
-变更：
-1. storyboard v4: 废除旁白思维，所有voiceover必须是角色台词
-   - 增加<speaker>标签，每镜必须标注说话人
-   - visual强制5要素结构（景别/运镜/动作/环境/光线），每镜不少于30字
-   - voiceover_script用[speaker:xxx]标记格式
-2. 旧版storyboard模板is_active设为false
-3. 检查image_analysis和review是否有active模板，没有则插入保底版本
-"""
-
-from sqlalchemy import text
-
-from alembic import op
-
-revision = "108_storyboard_v4_multivoice"
-down_revision = "107"
-branch_labels = None
-depends_on = None
-
-# ── storyboard v4 system_prompt ──────────────────────────────────────
-V4_STORYBOARD_SYSTEM = """你是一名懂短视频的编导和口播文案高手。你会拿到图片的真实观察、营销目的和用户参数，请一次性完成对营销意图的理解，并产出可直接拍摄/生成的分镜脚本。不要单独输出"意图解析"，意图要直接体现在台词和分镜里。
-
-## 核心设计原则（必须严格遵守）
-1. **废除旁白思维**：所有视频类型——无论对话短剧/口播带货/获客引流/品牌故事——voiceover 必须是人物说的话（第一人称或角色对白），绝对不能出现第三人称旁白解说。观众看的是人在演、在说。
-2. **严禁第三人称解说性台词**：如"接下来展示...""这款产品..."这类上帝视角描述禁止出现在 voiceover 中。
-3. **短剧类营销目的**（对话短剧/反转短剧/悬念短剧/情绪短片）：双角色对话格式"甲：xxx 乙：xxx"，镜头在角色间切换。
-4. **口播类**（口播带货/促销转化/功能演示/痛点解决/获客引流/账号涨粉/活动通知/场景种草）：第一人称对镜头说话，像真人出镜。
-
-## 输出格式（XML，严格按结构输出，不要输出额外解释）
-<script>
-  <copy_display_markdown><![CDATA[直接展示给用户看的成片文案，用 Markdown 写成流畅叙述]]></copy_display_markdown>
-  <clips>
-    <clip index="1">
-      <time_range>0-3秒</time_range>
-      <speaker>说话人标识（如"店主""顾客""主播"）</speaker>
-      <voiceover>这一镜的角色台词（人物说的话，不是旁白）</voiceover>
-      <visual>【景别】【镜头运动】【人物动作/表情】【环境/道具】【光线氛围】5要素结构，不少于30字</visual>
-      <reference_image_index>0</reference_image_index>
-    </clip>
-  </clips>
-  <voiceover_script>把所有 clip 的 voiceover 连成完整台词稿，用 [speaker:xxx] 标记每个说话段落</voiceover_script>
-  <theme>一句话主题</theme>
-  <negative>【反套路化要求】
-禁止使用"家人们谁懂啊""绝绝子""宝子们""家人们""太绝了""yyds"等烂大街网络词；
-禁止固定模板化开头；语言要像真人朋友之间的分享，自然、具体、有信息量。</negative>
-</script>
-
-## 写作要求
-1. **台词（voiceover）**：像真人面对镜头说话或角色对白，短句、口语化、有停顿有情绪，开头 3 秒给出钩子；不要书面腔，不要机械报参数。严禁第三人称解说。
-2. **说话人（speaker）**：每个 clip 必须标注说话人标识，如"店主""顾客""主播""我"等。短剧类必须有至少 2 个不同角色。
-3. **画面描述（visual）**：强制 5 要素结构——【景别】【镜头运动】【人物动作/表情】【环境/道具】【光线氛围】，每镜 visual 不少于 30 字，要具体到"闭眼听台词能想象出画面"。
-4. **voiceover_script 格式**：用 [speaker:xxx] 标记每个说话段落，如"[speaker:店主]你是不是也觉得...[speaker:顾客]是啊，怎么回事？"
-5. copy_display_markdown：直接展示给最终用户的文案，用 Markdown 写成自然、流畅、有感染力的成片文案。
-6. 内容必须来自图片观察与用户给出的信息，不编造卖点、不夸大、不使用绝对化用语和虚假承诺。
-7. reference_image_index 填本镜参考图片序号（从 0 开始），没有合适参考图填 -1。
-8. 分镜数量与时长匹配总时长，节奏紧凑。
-9. **口播字数硬约束**（必须严格遵守）：按每秒约 2.5~3 个中文字（正常口播语速）计算：
-   - 5秒视频：voiceover_script 总字数 12~15 字
-   - 10秒视频：voiceover_script 总字数 25~30 字
-   - 15秒视频：voiceover_script 总字数 35~45 字
-   - 20秒视频：voiceover_script 总字数 50~60 字
-   - 30秒视频：voiceover_script 总字数 75~90 字
-   - 宁可少写也不要多写，超长会导致 TTS 音频超出视频时长限制
-10. **镜头数量硬约束**：5秒1~2镜、10秒3镜、15秒3~4镜、20秒4~5镜、30秒6~8镜
-11. **时间轴硬约束**：第一个clip从0秒开始，最后一个clip结束于total_duration秒，相邻clip首尾相接
-12. 必须严格按<marketing_purpose><target_audience><persona><viral_structure><language><industry>指定的参数写文案和分镜
-13. 镜头间动作衔接要自然，画面描述要具体到能直接拍摄/生成"""
-
-V4_STORYBOARD_USER = """<marketing_purpose>{marketing_purpose}</marketing_purpose>
-<industry>{industry}</industry>
-<image_analysis>
-{image_summary}
-</image_analysis>
-<user_parameters>
-<theme_hint>{theme_hint}</theme_hint>
-<duration>{duration}秒</duration>
-<aspect_ratio>{aspect_ratio}</aspect_ratio>
-<tone>{tone}</tone>
-<target_audience>{target_audience}</target_audience>
-<persona>{persona_hint}</persona>
-<viral_structure>{viral_structure_hint}</viral_structure>
-<language>{language_hint}</language>
-<extra_requirements>{extra_requirements}</extra_requirements>
-</user_parameters>
-{video_style_section}
-请严格按 XML 结构输出分镜脚本。"""
-
-V4_STORYBOARD_EXAMPLE = """<script>
-  <copy_display_markdown><![CDATA[# 在御众堂，把松弛的自己一点点找回来
-产后妈妈最懂那种力不从心，推开门，暖光和一杯热茶先接住了你……]]></copy_display_markdown>
-  <clips>
-    <clip index="1">
-      <time_range>0-3秒</time_range>
-      <speaker>店主</speaker>
-      <voiceover>生完娃，是不是连照镜子的勇气都没了？</voiceover>
-      <visual>【中近景】【缓推】【妈妈疲惫看向镜子】【暖光店内环境】【柔和暖光】</visual>
-      <reference_image_index>0</reference_image_index>
-    </clip>
-    <clip index="2">
-      <time_range>3-6秒</time_range>
-      <speaker>顾客</speaker>
-      <voiceover>是啊，怎么回事？</voiceover>
-      <visual>【近景】【固定】【顾客表情惊讶】【店内休息区】【暖色调】</visual>
-      <reference_image_index>0</reference_image_index>
-    </clip>
-  </clips>
-  <voiceover_script>[speaker:店主]生完娃，是不是连照镜子的勇气都没了？[speaker:顾客]是啊，怎么回事？</voiceover_script>
-  <theme>产后妈妈走进御众堂重拾状态</theme>
-  <negative>模糊、畸变、夸大疗效、绝对化用语</negative>
-</script>"""
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-
-    # 1. 查询 storyboard 当前最大 version
-    result = conn.execute(
-        text("SELECT MAX(version) FROM viral_video_prompt_templates WHERE prompt_type = :pt"),
-        {"pt": "storyboard"},
-    )
-    max_version = result.scalar() or 0
-    new_version = max_version + 1
-
-    # 2. 旧版 storyboard 模板 is_active 设为 false
-    conn.execute(
-        text("UPDATE viral_video_prompt_templates SET is_active = false WHERE prompt_type = :pt"),
-        {"pt": "storyboard"},
-    )
-
-    # 3. 防御性插入新版 storyboard 模板
-    existing = conn.execute(
-        text("SELECT id FROM viral_video_prompt_templates " "WHERE prompt_type = :pt AND version = :ver"),
-        {"pt": "storyboard", "ver": new_version},
-    ).fetchone()
-
-    if not existing:
-        conn.execute(
-            text(
-                "INSERT INTO viral_video_prompt_templates "
-                "(name, prompt_type, version, system_prompt, user_prompt_template, example_output, is_active) "
-                "VALUES (:name, :pt, :ver, :sys, :usr, :ex, :active)"
-            ),
-            {
-                "name": "编导分镜v4-多角色对话版",
-                "pt": "storyboard",
-                "ver": new_version,
-                "sys": V4_STORYBOARD_SYSTEM,
-                "usr": V4_STORYBOARD_USER,
-                "ex": V4_STORYBOARD_EXAMPLE,
-                "active": True,
-            },
-        )
-
-    # 4. 检查 image_analysis 是否有 active 模板，没有则插入保底
-    ia_active = conn.execute(
-        text("SELECT COUNT(*) FROM viral_video_prompt_templates WHERE prompt_type = :pt AND is_active = true"),
-        {"pt": "image_analysis"},
-    ).scalar()
-
-    if ia_active == 0:
-        # 插入保底 image_analysis 模板（简化版）
-        ia_max = (
-            conn.execute(
-                text("SELECT MAX(version) FROM viral_video_prompt_templates WHERE prompt_type = :pt"),
-                {"pt": "image_analysis"},
-            ).scalar()
-            or 0
-        )
-        conn.execute(
-            text(
-                "INSERT INTO viral_video_prompt_templates "
-                "(name, prompt_type, version, system_prompt, user_prompt_template, example_output, is_active) "
-                "VALUES (:name, :pt, :ver, :sys, :usr, :ex, :active)"
-            ),
-            {
-                "name": "图片分析保底版",
-                "pt": "image_analysis",
-                "ver": ia_max + 1,
-                "sys": "你是一名擅长观察和写作的品牌内容编导。分析图片并输出JSON。",
-                "usr": "请分析这张图片。图片地址：{image_url}",
-                "ex": '{"images": [{"type": "store", "name": "门店", "summary_markdown": "描述"}]}',
-                "active": True,
-            },
-        )
-
-    # 5. 检查 review 是否有 active 模板
-    review_active = conn.execute(
-        text("SELECT COUNT(*) FROM viral_video_prompt_templates WHERE prompt_type = :pt AND is_active = true"),
-        {"pt": "review"},
-    ).scalar()
-
-    if review_active == 0:
-        rv_max = (
-            conn.execute(
-                text("SELECT MAX(version) FROM viral_video_prompt_templates WHERE prompt_type = :pt"),
-                {"pt": "review"},
-            ).scalar()
-            or 0
-        )
-        conn.execute(
-            text(
-                "INSERT INTO viral_video_prompt_templates "
-                "(name, prompt_type, version, system_prompt, user_prompt_template, example_output, is_active) "
-                "VALUES (:name, :pt, :ver, :sys, :usr, :ex, :active)"
-            ),
-            {
-                "name": "文案审核保底版",
-                "pt": "review",
-                "ver": rv_max + 1,
-                "sys": "你是短视频广告合规审核专家。审核文案输出XML。",
-                "usr": "请审核：{fusion_text}",
-                "ex": "<review><passed>true</passed></review>",
-                "active": True,
-            },
-        )
-
-
-def downgrade() -> None:
-    # 恢复旧版 storyboard 为 active
-    conn = op.get_bind()
-    conn.execute(
-        text("UPDATE viral_video_prompt_templates SET is_active = true WHERE prompt_type = :pt AND version < :ver"),
-        {"pt": "storyboard", "ver": 4},
-    )
-    # 删除新版
-    conn.execute(
-        text("DELETE FROM viral_video_prompt_templates WHERE prompt_type = :pt AND version >= :ver"),
-        {"pt": "storyboard", "ver": 4},
-    )

apps/api/app/api/routes/admin/ditto_emotion.py

@@ -1,18 +1,13 @@
 """Ditto 数字人表情后台配置 — #2246.
 
 路由前缀 /api/v1/admin/ditto-emotion，全部使用 _verify_internal_api_key 鉴权
-（X-API-Key header）。仅开放 6 项白名单配置：
+（X-API-Key header）。仅开放 5 项白名单配置：
 - ditto_emotion_enabled / ditto_emotion_model / ditto_emotion_temperature
-- ditto_emotion_prompt / ditto_blend_frames / doubao_api_key
-注意：doubao_api_key 属于密钥，GET 只返回脱敏占位，绝不返回明文。
-ditto_emotion_model 为自由文本（支持火山方舟 ep- 接入点 ID），
-推荐选项 model_options 从 system_config 的 ditto_emotion_model_options（JSON 数组）读取。
+- ditto_emotion_prompt / ditto_blend_frames
 """
 
 from __future__ import annotations
 
-import json
-import re
 from typing import Any
 
 from fastapi import APIRouter, Depends
@@ -35,6 +30,12 @@ router = APIRouter(
     dependencies=[Depends(_verify_internal_api_key)],
 )
 
+MODEL_OPTIONS = [
+    "doubao-seed-2-1-lite-250915",
+    "doubao-seed-2-1-pro-250915",
+    "deepseek-v3",
+]
+
 # key → (类型, 分类)
 _WHITELIST: dict[str, str] = {
     "ditto_emotion_enabled": SETTING_TYPE_BOOL,
@@ -42,7 +43,6 @@ _WHITELIST: dict[str, str] = {
     "ditto_emotion_temperature": SETTING_TYPE_FLOAT,
     "ditto_emotion_prompt": SETTING_TYPE_STRING,
     "ditto_blend_frames": SETTING_TYPE_INT,
-    "doubao_api_key": SETTING_TYPE_STRING,
 }
 
 _DESCRIPTIONS: dict[str, str] = {
@@ -51,13 +51,8 @@ _DESCRIPTIONS: dict[str, str] = {
     "ditto_emotion_temperature": "模型温度，0-1，越低越稳定保守。",
     "ditto_emotion_prompt": "情绪分析提示词，核心调优入口，必须包含 {文案} 占位符。",
     "ditto_blend_frames": "表情切换过渡帧数（6-30），越大越柔和。",
-    "doubao_api_key": "豆包/火山方舟 API Key（用于情绪分析LLM调用）",
 }
 
-# 密钥类配置：GET 脱敏、PUT 响应不回显明文
-_SECRET_KEYS = {"doubao_api_key"}
-_SECRET_PLACEHOLDER = "***已配置***"
-
 
 def _settings():
     return get_api_settings()
@@ -67,45 +62,17 @@ def _default_value(key: str) -> Any:
     return getattr(_settings(), key)
 
 
-def _model_options_from_db(service) -> list[str]:
-    """模型推荐选项：从 system_config 读 ditto_emotion_model_options（JSON 数组字符串）。
-
-    未配置 / 非法 JSON / 非数组 JSON 均返回空数组；数组元素统一转字符串。
-    """
-    raw = service.get_config("ditto_emotion_model_options", "") or ""
-    if not str(raw).strip():
-        return []
-    try:
-        data = json.loads(raw)
-    except (TypeError, ValueError):
-        return []
-    if not isinstance(data, list):
-        return []
-    return [str(x) for x in data if isinstance(x, (str, int, float))]
-
-
 def _build_config_item(key: str) -> dict[str, Any]:
-    service = get_system_config_service()
-    if key in _SECRET_KEYS:
-        # 密钥不回明文、不暴露 env 默认值：DB 或 env 任一侧已配置即视为已配置
-        db_value = service.get_config(key, None)
-        configured = bool((db_value or "").strip()) or bool((getattr(_settings(), key, "") or "").strip())
-        return {
-            "key": key,
-            "type": _WHITELIST[key],
-            "description": _DESCRIPTIONS.get(key, ""),
-            "default": "",
-            "value": _SECRET_PLACEHOLDER if configured else "",
-        }
     item: dict[str, Any] = {
         "key": key,
         "type": _WHITELIST[key],
         "description": _DESCRIPTIONS.get(key, ""),
         "default": _default_value(key),
     }
+    service = get_system_config_service()
     item["value"] = service.get_config(key, _default_value(key))
     if key == "ditto_emotion_model":
-        item["model_options"] = _model_options_from_db(service)
+        item["model_options"] = list(MODEL_OPTIONS)
     return item
 
 
@@ -141,15 +108,8 @@ def _validate_value(key: str, value: Any) -> Any:
             raise ValueError(f"{key} 必须是字符串")
         if key == "ditto_emotion_prompt" and value.strip() and "{文案}" not in value:
             raise ValueError("提示词必须包含 {文案} 占位符")
-        if key == "ditto_emotion_model":
-            if not value.strip():
-                raise ValueError(f"{key} 不能为空字符串")
-            if len(value) > 200:
-                raise ValueError(f"{key} 长度不能超过 200 字符")
-            if not re.fullmatch(r"[A-Za-z0-9_-]+", value):
-                raise ValueError(f"{key} 只能包含字母、数字、连字符和下划线")
-        if key == "doubao_api_key" and not value.strip():
-            raise ValueError(f"{key} 不能为空字符串")
+        if key == "ditto_emotion_model" and value not in MODEL_OPTIONS:
+            raise ValueError(f"模型必须是以下之一：{', '.join(MODEL_OPTIONS)}")
     return value
 
 
@@ -181,9 +141,9 @@ def update_config(
             key,
             value,
             setting_type=_WHITELIST[key],
-            updated_by=str(x_api_key)[:8] if x_api_key and x_api_key is not True else None,
+            updated_by=x_api_key[:8] if x_api_key else None,
         )
-        updated[key] = _SECRET_PLACEHOLDER if key in _SECRET_KEYS else value
+        updated[key] = value
     return {"ok": True, "updated": updated}
 
 

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

@@ -701,7 +701,7 @@ def retry_viral_video_job(
                 )
         # 差额为 0 则不调整
 
-    # 重置状态（从阶段1重新开始，清空上一次产物避免脏数据）
+    # 重置状态
     job.retry_count += 1
     job.status = ViralVideoStatus.PENDING
     job.error_msg = "" if not is_stale_running else "任务执行超时，已重置重试"
@@ -710,20 +710,11 @@ def retry_viral_video_job(
     job.current_stage = ""
     job.phase_message = ""
     job.heartbeat_at = None
-    # 重试时清空上次产物（参考 resume_from_image_analyzed 逻辑）
-    job.intent_result = None
-    job.copy_result = None
-    job.storyboard = None
-    job.generated_copy_text = ""
-    job.result_video_url = ""
-    job.pre_trusted_images = None
-    job.credits_cost = 0.0
     repo.update(job)
 
-    # 重新入队：从图片分析阶段1重新跑（旧 run_viral_video_pipeline 只跑到 wait_user_confirm 就停，
-    # 会导致前端永远转圈或文案确认页卡死后 confirm-copy 返回 409）
+    # 重新入队
     try:
-        celery_app.send_task("worker.run_viral_video_analyze", args=[job.id])
+        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,

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

@@ -65,22 +65,6 @@ export function isAnalysisStage(stage: ViralVideoStage | undefined): boolean {
   return isImageAnalysisStage(stage) || isCopyStage(stage)
 }
 
-/** 从 job 对象取到有效阶段（兼容 progress_stage/current_stage 两种字段名） */
-export function getJobStage(
-  job: { current_stage?: ViralVideoStage; progress_stage?: ViralVideoStage } | null | undefined,
-): ViralVideoStage | undefined {
-  if (!job) return undefined
-  return job.current_stage || job.progress_stage
-}
-
-/** 从 job 对象取到阶段提示文案（兼容 phase_message/progress_message） */
-export function getJobPhaseMessage(
-  job: { phase_message?: string; progress_message?: string } | null | undefined,
-): string {
-  if (!job) return ""
-  return job.phase_message || job.progress_message || ""
-}
-
 /** 单张图片 VLM 识别结果（v8 叙述优先，仅保留最少结构化字段） */
 export interface ImageProductAnalysis {
   /** store / product / person / scene */
@@ -105,8 +89,6 @@ export interface ImageAnalysisResult {
 export interface ShotScript {
   /** 时间区间，如 "0-3秒" */
   time_range?: string
-  /** 说话人角色，如 "店主"、"顾客" */
-  speaker?: string
   /** 景别/角度/运镜，如 "近景俯拍45度，缓慢推镜" */
   shot_type_angle_movement?: string
   /** 场景描述+对白 */
@@ -207,14 +189,8 @@ export interface ViralVideoJob {
   video_model?: string
   /** 视频时长（秒，5-30，默认15） */
   duration?: number
-  /** 后端真实字段名（snake_case）：当前细粒度阶段 */
-  current_stage?: ViralVideoStage
-  /** 后端真实字段名：当前阶段中文提示文案 */
-  phase_message?: string
-  /** @deprecated 兼容旧前端：使用 current_stage */
   progress_stage?: ViralVideoStage
   progress_percent?: number
-  /** @deprecated 兼容旧前端：使用 phase_message */
   progress_message?: string
   output_url?: string
   result_video_url?: string

apps/web/src/pages/viral-video/ViralVideoPage.css

@@ -1020,11 +1020,6 @@
   border-radius: 10px;
   padding: 10px 12px;
   margin-top: 8px;
-  display: flex;
-  flex-direction: column;
-  flex: 1 1 auto;
-  min-height: 260px;
-  overflow: hidden;
 }
 .vv-copy-head {
   display: flex;
@@ -1055,8 +1050,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  flex: 1 1 auto;
-  min-height: 260px;
+  height: 360px;
   padding: 28px 16px;
   gap: 10px;
   background: #fff;
@@ -1093,8 +1087,7 @@
 .vv-storyboard {
   display: flex;
   flex-direction: column;
-  flex: 1 1 auto;
-  min-height: 260px;
+  height: 360px;
   padding: 10px 12px;
   background: #fff;
   border: 1px solid #e5e7eb;
@@ -1447,8 +1440,7 @@
 /* ── Preview ──────────────── */
 .vv-preview {
   aspect-ratio: 9 / 16;
-  max-height: 100%;
-  max-width: 100%;
+  max-height: 360px;
   background: #fff;
   border: 1px dashed #e5e7eb;
   border-radius: 10px;
@@ -2155,120 +2147,3 @@
   font-size: 12px;
   color: #9ca3af;
 }
-
-/* ── 三列等高布局（2026-10-10 fix） ──
- * vv-page 作为纵向 flex 容器，tabs 固定 + grid 占满剩余高度；
- * vv-grid 改用 grid-auto-rows:1fr 强制三列等高；
- * 每列的卡片使用 flex column + min-height:0，正文区域 flex:1 并内部滚动。
- */
-.vv-page {
-  display: flex;
-  flex-direction: column;
-  /* 减去顶部导航 56px 和自身 padding 16*2=32px，给 Tabs + 三列区留一屏 */
-  height: calc(100vh - 56px);
-  min-height: 640px; /* 小窗口保底 */
-  overflow: hidden;
-}
-.vv-tabs {
-  flex-shrink: 0;
-}
-.vv-grid {
-  flex: 1 1 auto;
-  min-height: 0;
-  align-items: stretch; /* 覆盖原来的 start，强制行内格子撑满行高 */
-  grid-auto-rows: 1fr; /* 每行所有格子等高 */
-  overflow: hidden;
-}
-.vv-col {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  min-height: 0;
-  min-width: 0;
-}
-/* 列内的卡片（.vv-section）默认允许收缩，正文区域接管滚动 */
-.vv-col > .vv-section {
-  display: flex;
-  flex-direction: column;
-  min-height: 0;
-  flex-shrink: 1;
-}
-/* STEP1/STEP2 唯一卡片：撑满列高 */
-.vv-col > .vv-section:only-child {
-  flex: 1 1 auto;
-}
-/* STEP3 右侧两卡片：配置固定不缩，预览区吸剩余空间 */
-.vv-col > .vv-section-preview {
-  flex: 1 1 auto;
-  min-height: 0;
-}
-.vv-section-preview .vv-section-body.vv-preview-body {
-  flex: 1 1 auto;
-  min-height: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 12px;
-  overflow: hidden;
-}
-.vv-section-preview .vv-preview {
-  max-height: 100%;
-  height: 100%;
-  aspect-ratio: auto;
-  width: 100%;
-}
-
-/* 列内 .vv-credits / .vv-error / 主按钮 不参与收缩，永远固定在底部可见 */
-.vv-col > .vv-credits,
-.vv-col > .vv-error,
-.vv-col > .vv-btn-primary {
-  flex-shrink: 0;
-}
-.vv-col > .vv-credits {
-  margin-top: 0;
-}
-
-/* 可滚动 section 正文 */
-.vv-section-body.vv-section-body-scroll {
-  flex: 1 1 auto;
-  min-height: 0;
-  display: flex;
-  flex-direction: column;
-  padding: 14px 16px 14px;
-  overflow: hidden;
-}
-.vv-scroll-inner {
-  flex: 1 1 auto;
-  min-height: 0;
-  overflow-y: auto;
-  padding-right: 6px;
-  display: flex;
-  flex-direction: column;
-  /* 美化滚动条（紫白主题） */
-  scrollbar-width: thin;
-  scrollbar-color: #d8c4ff transparent;
-}
-.vv-scroll-inner::-webkit-scrollbar {
-  width: 6px;
-}
-.vv-scroll-inner::-webkit-scrollbar-thumb {
-  background: #d8c4ff;
-  border-radius: 3px;
-}
-.vv-scroll-inner::-webkit-scrollbar-thumb:hover {
-  background: #c4a8ff;
-}
-.vv-scroll-inner::-webkit-scrollbar-track {
-  background: transparent;
-}
-
-/* 主按钮始终顶在 section-body 底部（在 vv-scroll-inner 之外） */
-.vv-section-body.vv-section-body-scroll > .vv-btn-primary {
-  margin-top: 10px;
-  flex-shrink: 0;
-}
-
-/* STEP1 文件列表改为根据可用空间自适应，不再用 max-height:260px 硬编码 */
-.vv-file-list {
-  max-height: none;
-}

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

@@ -1,11 +1,6 @@
 import { useCallback, useEffect, useRef } from "react"
 import { getViralVideoJob } from "@/api/viral-video"
-import {
-  isAnalysisStage,
-  getJobStage,
-  type ViralVideoJob,
-  type ViralVideoStatus,
-} from "@/api/viral-video/types"
+import { isAnalysisStage, type ViralVideoJob, type ViralVideoStatus } from "@/api/viral-video/types"
 
 const TERMINAL: ViralVideoStatus[] = ["completed", "failed", "cancelled"]
 
@@ -49,21 +44,14 @@ export function useViralVideoPolling(
         }
         if (stoppedRef.current) return
         // 视频渲染阶段（Seedance 多段视频生成较慢）拉长轮询间隔
-        const stage = getJobStage(job)
-        const inRender = stage === "rendering"
+        const inRender = job.progress_stage === "rendering"
         // 分析阶段走默认间隔即可
-        const isAnalyzing = isAnalysisStage(stage)
+        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
-        // P2-5: 连续失败 20 次（约 2 分钟）后熔断，避免后端挂掉时前端无限轮询
-        if (failCountRef.current >= 20) {
-          console.warn("[viral-video] 轮询连续失败 20 次，停止轮询，请刷新页面重试")
-          stop()
-          return
-        }
         const delay = Math.min(intervalMs * 2 ** Math.min(failCountRef.current, 3), 10000)
         timerRef.current = setTimeout(() => pollOnce(id), delay)
       }

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

@@ -17,11 +17,6 @@ export interface ViralVideoWSError {
   message: string
 }
 
-export interface ViralVideoTerminalEvent {
-  type: "viral_video:completed" | "viral_video:failed" | "viral_video:copy_generated"
-  job_id: string
-}
-
 export interface UseViralVideoWSOptions {
   /** delta 事件回调（script_delta 推送时触发） */
   onDelta?: (ev: ViralVideoDeltaEvent) => void
@@ -29,8 +24,6 @@ export interface UseViralVideoWSOptions {
   onError?: (err: ViralVideoWSError) => void
   /** 连接建立回调 */
   onOpen?: () => void
-  /** P2-6: 收到终态事件（copy_generated/completed/failed）时回调，上层应立即主动拉取一次最新 job，减少终态延迟 */
-  onTerminal?: (ev: ViralVideoTerminalEvent) => void
 }
 
 const WS_SCHEME =
@@ -50,18 +43,16 @@ function buildWsUrl(jobId: string): string {
  */
 export function useViralVideoWS(
   jobId: string | null | undefined,
-  { onDelta, onError, onOpen, onTerminal }: UseViralVideoWSOptions = {},
+  { onDelta, onError, onOpen }: UseViralVideoWSOptions = {},
 ) {
   const wsRef = useRef<WebSocket | null>(null)
   const manualCloseRef = useRef(false)
   const onDeltaRef = useRef(onDelta)
   const onErrorRef = useRef(onError)
   const onOpenRef = useRef(onOpen)
-  const onTerminalRef = useRef<UseViralVideoWSOptions["onTerminal"]>()
   onDeltaRef.current = onDelta
   onErrorRef.current = onError
   onOpenRef.current = onOpen
-  onTerminalRef.current = onTerminal
 
   const close = useCallback(() => {
     manualCloseRef.current = true
@@ -104,15 +95,9 @@ export function useViralVideoWS(
             const payload = JSON.parse(ev.data)
             if (payload?.type === "viral_video:script_delta" && payload.data) {
               onDeltaRef.current?.(payload as ViralVideoDeltaEvent)
-            } else if (
-              payload?.type === "viral_video:completed" ||
-              payload?.type === "viral_video:failed" ||
-              payload?.type === "viral_video:copy_generated"
-            ) {
-              // P2-6: 收到终态事件时主动通知上层立即拉取，降低终态延迟（不用等下一个轮询周期）
-              onTerminalRef.current?.(payload as ViralVideoTerminalEvent)
             }
-            // 心跳/其他事件忽略
+            // copy_generated/completed/failed 等终态事件由 HTTP 轮询统一处理，
+            // 此处仅消费 delta 做流式预览，不重复推状态。
           } catch {
             // 心跳/非 JSON 消息忽略
           }

apps/worker/worker_app/tasks/viral_video.py

@@ -355,44 +355,10 @@ def _vision_fallback(idx: int, reason: str, extra: dict | None = None) -> dict:
     return d
 
 
-def _refresh_oss_signed_url(raw: str) -> str:
-    """把我们自己 OSS 的 URL 重新签新鲜签名（默认2小时），避免前端上传时签的1h URL
-    在阶段3被Wan/Seedance下载时过期（用户在文案页停留超过1小时导致Failed to download）。
-    - 我们 OSS 域名的URL：提取storage_key，走get_download_url重签
-    - 外链（公网资源、Ark/Seedream t2i产物等）：原样返回
-    - storage_key（无scheme）：走get_download_url签公网URL
-    """
-    if not raw or not isinstance(raw, str):
-        return raw
-    s = raw.strip()
-    if not s:
-        return s
-    try:
-        from packages.shared.storage import get_storage_service
-
-        svc = get_storage_service()
-        bucket = getattr(svc, "bucket_name", "") or ""
-        if s.startswith("http://") or s.startswith("https://"):
-            from urllib.parse import urlparse
-
-            parsed = urlparse(s)
-            host = (parsed.hostname or "").lower()
-            is_our_oss = bool(bucket) and host.endswith(".aliyuncs.com") and host.startswith(f"{bucket}.")
-            if is_our_oss:
-                return svc.get_download_url(s, expires_seconds=7200)
-            return s  # 外链原样返回
-        return svc.get_download_url(s.lstrip("/"), expires_seconds=7200)
-    except Exception as _e:
-        logger.warning("[爆款视频] URL重签失败回退原值: %s err=%s", s[:80], _e)
-        return s
-
-
 def _normalize_image_url(raw: str, idx: int) -> str:
     """将 job.images 中的 storage_key/相对路径/空值统一归一化为可公网访问 URL。
-    - OSS URL（含前端上传的签名URL）：统一通过 _refresh_oss_signed_url 重签2h，
-      避免用户在文案页停留超过1小时导致阶段3 Wan/Seedance 下载时签名过期
-    - 外链（Ark/Seedream t2i产物、公网资源）：原样返回
-    - storage_key：签新鲜公网URL
+    - http(s):// → 直接用
+    - 其他 → storage_key，通过 SharedStorageService.get_url() 转公网 URL
     - 空值/非字符串 → 抛 ValueError
     """
     if not raw or not isinstance(raw, str):
@@ -400,14 +366,17 @@ def _normalize_image_url(raw: str, idx: int) -> str:
     url = raw.strip()
     if not url:
         raise ValueError(f"图片 #{idx} URL 为空白字符串")
-    signed = _refresh_oss_signed_url(url)
-    if not signed:
-        raise ValueError(f"图片 #{idx} URL={url[:100]!r} 归一化失败")
-    if signed != url and (url.startswith("http://") or url.startswith("https://")):
-        logger.info("[爆款视频] 图片 #%d OSS URL 重签2h: %s", idx, signed[:120])
-    elif not url.startswith("http"):
-        logger.info("[爆款视频] 图片 #%d storage_key → 签名URL(2h): %s", idx, signed[:120])
-    return signed
+    if url.startswith("http://") or url.startswith("https://"):
+        return url
+    storage_key = url.lstrip("/")
+    try:
+        from packages.shared.storage import get_storage_service
+
+        url = get_storage_service().get_url(storage_key)
+    except Exception as _e:
+        raise ValueError(f"图片 #{idx} storage_key={storage_key!r} 转公网URL失败: {_e}") from _e
+    logger.info("[爆款视频] 图片 #%d storage_key → 公网URL: %s", idx, url[:120])
+    return url
 
 
 # ── v8 图片分析结构归一化（老数据兼容只在这里做一次）────────────────────
@@ -492,9 +461,7 @@ def _step_video_analysis(job: ViralVideoJob) -> dict | None:
     try:
         from viral_video.video_analyzer import analyze_video_style
 
-        # 参考视频URL重签（同样防止上传后停留过久签名过期）
-        video_url = _refresh_oss_signed_url(job.reference_video_url)
-        style_guide = analyze_video_style(video_url)
+        style_guide = analyze_video_style(job.reference_video_url)
         return style_guide if isinstance(style_guide, dict) else None
     except ImportError as e:
         logger.info("[爆款视频] video_analyzer 模块未就绪(%s)，使用占位风格分析", e)
@@ -558,67 +525,6 @@ def _viral_structure_hint(structure: str) -> str:
     return "【爆款结构：未指定】自由组织，保证开头有钩子、中段有卖点、结尾有行动引导"
 
 
-def _marketing_purpose_hint(mp: str) -> str:
-    """根据营销目的提供创作指导 hint。
-
-    覆盖前端 20 个 PURPOSES，分 4 类指导：
-    - 短剧类：多角色对话，格式"角色：台词"，禁止旁白，角色间镜头切换
-    - 口播类：第一人称对镜头说话，真人出镜感
-    - 门店类：店主或探店博主出镜讲解+场景展示
-    - 品牌类：主演出镜说话或角色对白，禁止上帝视角旁白
-    """
-    mp = (mp or "").strip()
-    if not mp:
-        return ""
-
-    # 短剧类（多角色对话）
-    if any(k in mp for k in ["对话短剧", "反转短剧", "悬念短剧", "情绪短片"]):
-        return "【短剧模式】必须双/多角色对话格式，台词用'角色：xxx'格式，镜头在角色间切换，禁止第三人称旁白解说。"
-
-    # 口播类（第一人称对镜头说话）
-    if any(
-        k in mp
-        for k in ["口播带货", "促销转化", "功能演示", "痛点解决", "获客引流", "账号涨粉", "活动通知", "场景种草"]
-    ):
-        return "【口播模式】第一人称对镜头说话，像真人出镜，有语气停顿和情绪，禁止第三人称旁白。"
-
-    # 门店类（店主/探店博主出镜）
-    if any(k in mp for k in ["门店发现", "到店实录", "招牌体验", "同城团购"]):
-        return "【门店模式】店主或探店博主出镜讲解+场景展示，第一人称或角色对白，禁止上帝视角旁白。"
-
-    # 品牌类（主演出镜或角色对白）
-    if any(k in mp for k in ["品牌主张", "品牌故事", "生活方式", "创意概念"]):
-        return "【品牌模式】主演出镜说话或角色对白，禁止上帝视角旁白，要有品牌调性和情感共鸣。"
-
-    # 未匹配的营销目的：通用 hint
-    return "【通用模式】避免上帝视角旁白，优先第一人称或角色对话。"
-
-
-def _target_customer_hint(tc: str) -> str:
-    """根据目标客户提供台词风格指导。"""
-    tc = (tc or "").strip()
-    if not tc:
-        return ""
-
-    # 年轻人
-    if any(k in tc for k in ["18-25", "年轻", "学生", "Z世代", "95后", "00后"]):
-        return "【目标年轻客群】台词要活泼、有梗、节奏快，可用网络流行语。"
-
-    # 中年人
-    if any(k in tc for k in ["30-45", "中年", "家庭", "宝妈", "职场"]):
-        return "【目标中年客群】台词要实用、有共鸣，强调性价比和品质。"
-
-    # 老年人
-    if any(k in tc for k in ["50+", "老年", "退休", "银发"]):
-        return "【目标老年客群】台词要清晰、慢节奏，强调健康和实惠。"
-
-    # 高端
-    if any(k in tc for k in ["高端", "商务", "精英", "白领"]):
-        return "【目标高端客群】台词要专业、有格调，强调品质和身份。"
-
-    return ""
-
-
 def _language_hint(language: str) -> str:
     """根据 language 代码返回语言提示。"""
     lang = (language or "zh-CN").strip().lower()
@@ -858,9 +764,8 @@ def _script_from_xml(raw: str, job: ViralVideoJob) -> dict | None:
         ref_idx = xp.attr_int(ref_raw, -1) if ref_raw not in (None, "") else -1
         if not isinstance(ref_idx, int) or ref_idx < 0:
             ref_idx = None
-        speaker = xp.text_of(body, "speaker") or "主播"
         if voice:
-            voice_parts.append(f"[speaker:{speaker}]{voice}")
+            voice_parts.append(voice)
         shot = {
             "time_range": a.get("time_range") or xp.text_of(body, "time_range") or f"{i * 3}-{(i + 1) * 3}秒",
             "shot_type_angle_movement": visual or "中景平视，固定镜头",
@@ -1354,45 +1259,6 @@ def _resolve_tts_voice_id(job: ViralVideoJob) -> str:
     return raw_voice_id or default_voice
 
 
-def _parse_speaker_segments(text: str) -> list[tuple[str, str]]:
-    """解析 voiceover_script 中的 [speaker:xxx] 标记，返回 [(speaker, text), ...] 列表。"""
-    import re
-
-    if not text:
-        return []
-
-    # 匹配 [speaker:xxx]text 格式
-    pattern = r"\[speaker:([^\]]+)\]([^\[]*)"
-    matches = re.findall(pattern, text)
-
-    if not matches:
-        # 没有 speaker 标记，返回单个默认角色
-        return [("主播", text)]
-
-    return [(speaker.strip(), seg_text.strip()) for speaker, seg_text in matches if seg_text.strip()]
-
-
-def _get_speaker_voice_id(speaker: str, main_voice_id: str, is_main_voice_male: bool = True) -> str:
-    """根据角色名分配合适的音色 ID。
-
-    主角（店主/主播/老板等）使用用户选择的音色，配角自动分配异性音色。
-    """
-    # 主角列表
-    main_speakers = ["店主", "主播", "老板", "我", "主讲人", "店长"]
-
-    # 配角列表
-    sub_speakers = ["顾客", "客人", "朋友", "闺蜜", "路人", "店员"]
-
-    if speaker in main_speakers or not any(s in speaker for s in sub_speakers):
-        return main_voice_id
-
-    # 配角分配异性音色
-    if is_main_voice_male:
-        return "longxiaochun"  # 女声
-    else:
-        return "longsanshu"  # 男声
-
-
 def _step_tts(job: ViralVideoJob, voiceover_script: str):
     """步骤 5: CosyVoice 整段配音 → 返回本地 MP3 Path；失败返回 None。
 
@@ -1862,13 +1728,11 @@ def _step_render(job: ViralVideoJob, copy_result: dict, tts_audio_url: str | Non
     # reference_audios: TTS 音频驱动口型
     ref_audios = [tts_audio_url] if tts_audio_url else []
     # reference_images: 产品图（除首帧外的其他图作为多参考；首帧通过 image_url 传）
-    # 阶段3进入时再次重签URL（用户可能在文案页停留超1h，阶段1签的URL已过期）
-    images = [_refresh_oss_signed_url(u) for u in (job.images or []) if u]
+    images = list(job.images or [])
     first_image = images[0] if images else None
     rest_images = images[1:30] if len(images) > 1 else []
-    # reference_videos: 参考视频（可选，也重签）
-    _ref_vid = _refresh_oss_signed_url(getattr(job, "reference_video_url", "") or "")
-    ref_videos = [_ref_vid] if _ref_vid else []
+    # reference_videos: 参考视频（可选）
+    ref_videos = [job.reference_video_url] if getattr(job, "reference_video_url", "") else []
 
     tmpdir = Path(tempfile.mkdtemp(prefix=f"viral_{job.id}_"))
     logger.info(
@@ -2058,7 +1922,7 @@ def run_viral_video_pipeline(self: Task, job_id: str) -> dict:
 
         job.mark_running()
         _save_job(repo, job, session)
-        _hb_stop, _ = _start_heartbeat_thread(job_id)
+        _hb_stop, _hb_thread = _start_heartbeat_thread(job_id)
         _set_stage(job, repo, session, ViralVideoStage.IMAGE_ANALYSIS, "正在分析商品特征...")
 
         image_analysis = _step_image_analysis(job)
@@ -2108,16 +1972,8 @@ def run_viral_video_pipeline(self: Task, job_id: str) -> dict:
     except Retry:
         raise
     except Exception as e:
-        logger.error("[爆款视频][pipeline] 旧一键流水线失败 job_id=%s: %s", job_id, e, exc_info=True)
-        _err_stage = ""
-        try:
-            _r = SQLAlchemyViralVideoJobRepository(session)
-            _j = _r.get(job_id)
-            if _j is not None and getattr(_j, "current_stage", None):
-                _err_stage = _j.current_stage
-        except Exception:
-            pass
-        _mark_failed_and_notify(job_id, session, None, None, str(e), _err_stage)
+        logger.error("[爆款视频] 流水线异常: %s", e, exc_info=True)
+        _mark_failed_and_notify(job_id, session, None, None, str(e), "")
         return {"ok": False, "job_id": job_id, "error": str(e)}
     finally:
         if _hb_stop is not None:
@@ -2140,16 +1996,8 @@ def resume_viral_video_pipeline(self: Task, job_id: str) -> dict:
     except Retry:
         raise
     except Exception as e:
-        logger.error("[爆款视频][resume-pipeline] 恢复流水线失败 job_id=%s: %s", job_id, e, exc_info=True)
-        _err_stage = ""
-        try:
-            _r = SQLAlchemyViralVideoJobRepository(session)
-            _j = _r.get(job_id)
-            if _j is not None and getattr(_j, "current_stage", None):
-                _err_stage = _j.current_stage
-        except Exception:
-            pass
-        _mark_failed_and_notify(job_id, session, None, None, str(e), _err_stage)
+        logger.error("[爆款视频] 恢复流水线异常: %s", e, exc_info=True)
+        _mark_failed_and_notify(job_id, session, None, None, str(e), "")
         return {"ok": False, "job_id": job_id, "error": str(e)}
     finally:
         if session:
@@ -2185,14 +2033,13 @@ def run_video_style_analysis(self: Task, job_id: str) -> dict:
 
 def _mark_failed_and_notify(job_id: str, session, repo, job, err_msg: str, stage: str = "") -> None:
     """标记任务失败并通知。若传入的 session 已失效（因前面异常导致 rollback 状态），
-    会自动 fallback 到新建 SessionLocal 重新标记，确保状态一定落库。
-    BUG 修复：失败时持久化 stage 到 current_stage，前端才能正确归因错误。"""
+    会自动 fallback 到新建 SessionLocal 重新标记，确保状态一定落库。"""
     try:
         # 尝试用传入的 session 标记
         marked = False
         if job is not None and not job.is_terminal and session is not None:
             try:
-                job.mark_failed(err_msg, stage=stage)
+                job.mark_failed(err_msg)
                 _save_job(repo, job, session)
                 marked = True
             except Exception as se:
@@ -2208,7 +2055,7 @@ def _mark_failed_and_notify(job_id: str, session, repo, job, err_msg: str, stage
                 r = SQLAlchemyViralVideoJobRepository(ssn)
                 j = r.get(job_id)
                 if j is not None and not j.is_terminal:
-                    j.mark_failed(err_msg, stage=stage)
+                    j.mark_failed(err_msg)
                     r.update(j)
                     ssn.commit()
             finally:
@@ -2247,7 +2094,7 @@ def run_viral_video_analyze(self: Task, job_id: str) -> dict:
 
         job.mark_running()
         _save_job(repo, job, session)
-        _hb_stop, _ = _start_heartbeat_thread(job_id)
+        _hb_stop, _hb_thread = _start_heartbeat_thread(job_id)
         _set_stage(job, repo, session, ViralVideoStage.IMAGE_ANALYSIS, "正在分析商品特征...")
 
         image_analysis = _step_image_analysis(job)
@@ -2338,7 +2185,7 @@ def run_viral_video_generate_copy(self: Task, job_id: str) -> dict:
             return {"ok": False, "error": f"unexpected status: {job.status}"}
         job.touch_heartbeat()
         _save_job(repo, job, session)
-        _hb_stop, _ = _start_heartbeat_thread(job_id)
+        _hb_stop, _hb_thread = _start_heartbeat_thread(job_id)
 
         # v8：意图理解并入分镜生成，一次 LLM 调用；流式推送 script_delta 给前端
         image_analysis = normalize_image_analysis(job.image_analysis)
@@ -2719,7 +2566,7 @@ def run_viral_video_render(self: Task, job_id: str) -> dict:
             return {"ok": False, "error": f"unexpected status: {job.status}"}
         job.touch_heartbeat()
         _save_job(repo, job, session)
-        _hb_stop, _ = _start_heartbeat_thread(job_id)
+        _hb_stop, _hb_thread = _start_heartbeat_thread(job_id)
         return _run_render_pipeline(job_id, session, repo, job)
     except Retry:
         raise

infra/docker/nginx-production.conf

@@ -40,9 +40,7 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_read_timeout 3600s;
+        proxy_read_timeout 300s;
         proxy_send_timeout 300s;
         proxy_request_buffering off;
     }

infra/docker/nginx-staging.conf

@@ -39,9 +39,7 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_read_timeout 3600s;
+        proxy_read_timeout 300s;
         proxy_send_timeout 300s;
         proxy_request_buffering off;
     }

packages/application/ditto_emotion_service.py

@@ -211,7 +211,6 @@ class DittoEmotionService:
 
         self.settings = settings or get_api_settings()
         self._client = None
-        self._client_api_key: str | None = None
 
     def _cfg(self, key: str) -> Any:
         """优先读后台 system_config，未配置则回退到 settings（env 默认）."""
@@ -237,16 +236,10 @@ class DittoEmotionService:
         return hashlib.md5(text.strip().encode("utf-8")).hexdigest()
 
     def _get_llm_client(self):
-        """创建/复用 DoubaoClient；API Key 优先读后台配置（DB），fallback 环境变量。
+        if self._client is None:
+            from packages.shared.ai_client import get_doubao_client
 
-        后台可能随时改 doubao_api_key，每次调用前对比 key，变化则重建 client。
-        """
-        api_key = (self._cfg("doubao_api_key") or "").strip()
-        if self._client is None or self._client_api_key != api_key:
-            from packages.shared.ai_client import DoubaoClient
-
-            self._client = DoubaoClient(api_key=api_key)
-            self._client_api_key = api_key
+            self._client = get_doubao_client()
         return self._client
 
     def _call_llm(self, text: str) -> list[EmotionSegment]:
@@ -316,7 +309,7 @@ def _cached_analyze(service: DittoEmotionService, cache_key: str, text: str) ->
     # 如果 LLM 返回空（比如分句数量不匹配），尝试直接对预分句结果分析
     if not segments:
         pre_splits = split_sentences(text)
-        if len(pre_splits) >= 1:
+        if len(pre_splits) > 1:
             # 用预分句结果兜底：全中性低强度
             segments = [EmotionSegment(text=s, emo=EMO_NEUTRAL, intensity=0.1) for s in pre_splits]
     return segments

packages/domain/viral_video.py

@@ -244,13 +244,6 @@ class ViralVideoJob:
         self.heartbeat_at = _now
         self.status = ViralVideoStatus.RUNNING
         self.updated_at = _now
-        # 清空上一次渲染留下的错误/产物（参考 resume_from_image_analyzed 对齐）
-        self.error_msg = ""
-        self.result_video_url = ""
-        self.current_stage = ""
-        self.phase_message = ""
-        self.completed_at = None
-        self.credits_cost = 0.0
 
     def resume_from_confirm(self) -> None:
         if self.status != ViralVideoStatus.WAIT_USER_CONFIRM:
@@ -267,12 +260,9 @@ class ViralVideoJob:
         self.completed_at = datetime.now(timezone.utc)
         self.updated_at = datetime.now(timezone.utc)
 
-    def mark_failed(self, error_msg: str, stage: str = "") -> None:
+    def mark_failed(self, error_msg: str) -> None:
         self.status = ViralVideoStatus.FAILED
         self.error_msg = error_msg
-        # 失败时持久化失败阶段，避免前端错误归因
-        if stage:
-            self.current_stage = stage
         self.completed_at = datetime.now(timezone.utc)
         self.updated_at = datetime.now(timezone.utc)
 

packages/shared/dashscope_client.py

@@ -67,12 +67,10 @@ def _classify_dashscope_error(status_code: int, body: str, task_msg: str = "") -
         return "invalid_param", f"Wan 3.0 参数错误：{msg_in_body or body[:200]}"
     if status_code == 0:
         return "network_error", "Wan 3.0 服务连接失败（网络超时），请稍后重试。"
-    # 任务内失败（异步轮询结果）：此时 HTTP 200 只是查询成功，不代表任务成功，提示文案不要带 HTTP 200 以免误导
+    # 任务内失败
     if task_msg and any(kw in task_msg.lower() for kw in ("portrait", "真人", "人脸", "violation", "blocked")):
         return "portrait_intercept", "Wan 3.0 视频内容被安全策略拦截，请调整文案或参考图后重试。"
     detail = msg_in_body or body[:200]
-    if task_msg and status_code == 200:
-        return "task_failed", f"Wan 3.0 视频生成失败：{detail}"
     return "unknown", f"Wan 3.0 视频生成失败（HTTP {status_code}）：{detail}"
 
 

scripts/ci/mypy_check.sh

@@ -10,22 +10,7 @@ source "${SCRIPT_DIR}/ci_env.sh"
 
 
 echo "=== Installing mypy ==="
-# pip�容错: 默认�(阿里云)缺文件时fallback到清�/官方�(2026-10-10 librt-0.6.0 metadata 404)
-MYPY_SPEC="mypy<1.19"
-INSTALL_OK=0
-python3 -m pip install -q "$MYPY_SPEC" && INSTALL_OK=1 || true
-if [ "$INSTALL_OK" != "1" ]; then
-  echo "WARN: default pip index failed, retry tsinghua mirror..."
-  python3 -m pip install -q -i https://pypi.tuna.tsinghua.edu.cn/simple "$MYPY_SPEC" && INSTALL_OK=1 || true
-fi
-if [ "$INSTALL_OK" != "1" ]; then
-  echo "WARN: tsinghua mirror failed, retry pypi.org..."
-  python3 -m pip install -q -i https://pypi.org/simple "$MYPY_SPEC" && INSTALL_OK=1 || true
-fi
-if [ "$INSTALL_OK" != "1" ]; then
-  echo "ERROR: pip install mypy failed on all indexes"
-  exit 1
-fi
+python3 -m pip install -q mypy
 mypy --version
 echo ""
 echo "=== Running mypy type check (hard gate mode) ==="

scripts/ci_staging_deploy.sh

@@ -108,10 +108,8 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_read_timeout 3600s;
-        proxy_send_timeout 3600s;
+        proxy_read_timeout 300s;
+        proxy_send_timeout 300s;
         proxy_request_buffering off;
     }
 

tests/unit/test_ditto_emotion_service.py

@@ -223,60 +223,3 @@ class TestPromptLoading:
         custom = "分析情绪: {文案}"
         svc = _make_service(enabled=True, prompt=custom)
         assert svc._get_prompt_template() == custom
-
-
-# ── _get_llm_client：DB 配置 api_key 优先 + 变化重建 ─────────────
-class TestGetLLMClient:
-    def test_uses_config_api_key(self):
-        svc = _make_service(enabled=True)
-        with patch.object(svc, "_cfg", return_value="sk-from-db") as mock_cfg:
-            with patch("packages.shared.ai_client.DoubaoClient") as MockClient:
-                svc._get_llm_client()
-                mock_cfg.assert_called_with("doubao_api_key")
-                assert MockClient.call_args.kwargs["api_key"] == "sk-from-db"
-
-    def test_rebuilds_client_when_key_changes(self):
-        svc = _make_service(enabled=True)
-        keys = iter(["sk-key-v1", "sk-key-v2"])
-        with patch.object(svc, "_cfg", side_effect=lambda k: next(keys)):
-            with patch("packages.shared.ai_client.DoubaoClient") as MockClient:
-                MockClient.side_effect = lambda **kw: MagicMock(api_key=kw["api_key"])
-                c1 = svc._get_llm_client()
-                c2 = svc._get_llm_client()
-                assert c1 is not c2
-                assert MockClient.call_count == 2
-
-    def test_reuses_client_when_key_unchanged(self):
-        svc = _make_service(enabled=True)
-        with patch.object(svc, "_cfg", return_value="sk-same"):
-            with patch("packages.shared.ai_client.DoubaoClient") as MockClient:
-                MockClient.side_effect = lambda **kw: MagicMock(api_key=kw["api_key"])
-                c1 = svc._get_llm_client()
-                c2 = svc._get_llm_client()
-                assert c1 is c2
-                assert MockClient.call_count == 1
-
-    def test_empty_key_falls_back_to_doubao_client_default(self):
-        """DB/env 都没配时传空串，由 DoubaoClient 内部 fallback env / 标记不可用."""
-        svc = _make_service(enabled=True)
-        with patch.object(svc, "_cfg", return_value=""):
-            with patch("packages.shared.ai_client.DoubaoClient") as MockClient:
-                svc._get_llm_client()
-                assert MockClient.call_args.kwargs["api_key"] == ""
-
-
-# ── 单句兜底：LLM 返回空时单句也走中性兜底（>= 1）────────────────
-class TestSingleSentenceFallback:
-    def test_single_sentence_gets_neutral_fallback(self):
-        import packages.application.ditto_emotion_service as m
-
-        svc = _make_service(enabled=True)
-        m._cached_analyze.cache_clear()
-        try:
-            with patch.object(svc, "_call_llm", return_value=[]):
-                segs = svc.analyze("独一无二单句兜底测试文案abc123")
-                assert len(segs) == 1
-                assert segs[0].emo == EMO_NEUTRAL
-                assert segs[0].intensity == 0.1
-        finally:
-            m._cached_analyze.cache_clear()

tests/unit/test_system_config.py

@@ -6,8 +6,6 @@ Ditto 单例 reset 联动、PUT 校验。
 
 from __future__ import annotations
 
-from unittest.mock import MagicMock
-
 import pytest
 from sqlalchemy import create_engine, event
 from sqlalchemy.orm import sessionmaker
@@ -276,153 +274,14 @@ class TestAdminRouteValidation:
         # 允许留空（使用默认）
         assert route._validate_value("ditto_emotion_prompt", "") == ""
 
-    def test_validate_model_free_text(self):
+    def test_validate_model_options(self):
         route = self._route()
-        # 空 / 超长 / 非法字符拒绝
         with pytest.raises(ValueError):
-            route._validate_value("ditto_emotion_model", "   ")
-        with pytest.raises(ValueError):
-            route._validate_value("ditto_emotion_model", "a" * 201)
-        with pytest.raises(ValueError):
-            route._validate_value("ditto_emotion_model", "模型.带特殊字符")
-        with pytest.raises(ValueError):
-            route._validate_value("ditto_emotion_model", "has space")
-        # ep- 接入点 ID、裸模型名、下划线均放行
-        assert route._validate_value("ditto_emotion_model", "ep-20260721114705-b568m") == "ep-20260721114705-b568m"
-        assert (
-            route._validate_value("ditto_emotion_model", "doubao-seed-2-1-pro-250915") == "doubao-seed-2-1-pro-250915"
-        )
-        assert route._validate_value("ditto_emotion_model", "deepseek_v3") == "deepseek_v3"
+            route._validate_value("ditto_emotion_model", "gpt-4")
+        assert route._validate_value("ditto_emotion_model", "deepseek-v3") == "deepseek-v3"
 
     def test_validate_bool(self):
         route = self._route()
         with pytest.raises(ValueError):
             route._validate_value("ditto_emotion_enabled", "yes")
         assert route._validate_value("ditto_emotion_enabled", True) is True
-
-    def test_validate_api_key(self):
-        route = self._route()
-        with pytest.raises(ValueError):
-            route._validate_value("doubao_api_key", "   ")
-        with pytest.raises(ValueError):
-            route._validate_value("doubao_api_key", 123)
-        assert route._validate_value("doubao_api_key", "sk-abc123") == "sk-abc123"
-
-    def test_whitelist_contains_api_key(self):
-        route = self._route()
-        assert "doubao_api_key" in route._WHITELIST
-        assert "doubao_api_key" in route._DESCRIPTIONS
-
-
-class TestAdminRouteSecretMasking:
-    """doubao_api_key GET 脱敏 + PUT 响应脱敏."""
-
-    def _route(self):
-        from apps.api.app.api.routes.admin import ditto_emotion as route
-
-        return route
-
-    def _mock_service(self, values):
-        svc = MagicMock()
-        svc.get_config = lambda key, default=None: values.get(key, default)
-        return svc
-
-    def test_get_config_masks_db_configured_key(self, monkeypatch):
-        route = self._route()
-        monkeypatch.setattr(
-            route,
-            "get_system_config_service",
-            lambda: self._mock_service({"doubao_api_key": "sk-real-secret-key"}),
-        )
-        monkeypatch.setattr(route, "_settings", lambda: MagicMock(doubao_api_key=""))
-        item = route._build_config_item("doubao_api_key")
-        assert item["value"] == route._SECRET_PLACEHOLDER
-        assert item["default"] == ""
-        assert "sk-real-secret-key" not in str(item)
-
-    def test_get_config_masks_env_configured_key(self, monkeypatch):
-        route = self._route()
-        monkeypatch.setattr(
-            route,
-            "get_system_config_service",
-            lambda: self._mock_service({}),
-        )
-        monkeypatch.setattr(route, "_settings", lambda: MagicMock(doubao_api_key="sk-env-key"))
-        item = route._build_config_item("doubao_api_key")
-        assert item["value"] == route._SECRET_PLACEHOLDER
-        assert "sk-env-key" not in str(item)
-
-    def test_get_config_empty_when_unconfigured(self, monkeypatch):
-        route = self._route()
-        monkeypatch.setattr(
-            route,
-            "get_system_config_service",
-            lambda: self._mock_service({}),
-        )
-        monkeypatch.setattr(route, "_settings", lambda: MagicMock(doubao_api_key=""))
-        item = route._build_config_item("doubao_api_key")
-        assert item["value"] == ""
-
-    def test_get_config_never_leaks_plaintext(self, monkeypatch):
-        route = self._route()
-        secret = "sk-top-secret-12345"
-        monkeypatch.setattr(
-            route,
-            "get_system_config_service",
-            lambda: self._mock_service({"doubao_api_key": secret}),
-        )
-        monkeypatch.setattr(route, "_settings", lambda: MagicMock(doubao_api_key=secret))
-        result = route.get_config()
-        assert secret not in str(result)
-
-    def test_put_response_masks_secret(self, monkeypatch):
-        route = self._route()
-        svc = self._mock_service({})
-        svc.set_config = MagicMock(return_value="sk-new-key")
-        monkeypatch.setattr(route, "get_system_config_service", lambda: svc)
-        payload = route.ConfigUpdatePayload(configs={"doubao_api_key": "sk-new-key"})
-        result = route.update_config(payload, x_api_key="test-key")
-        assert result["ok"] is True
-        assert result["updated"]["doubao_api_key"] == route._SECRET_PLACEHOLDER
-        assert "sk-new-key" not in str(result)
-        # 落库值必须是明文（服务要用），只有响应脱敏
-        assert svc.set_config.call_args[0][1] == "sk-new-key"
-
-
-class TestAdminRouteModelOptions:
-    """model_options 从 DB 的 ditto_emotion_model_options（JSON 数组）读取."""
-
-    def _route(self):
-        from apps.api.app.api.routes.admin import ditto_emotion as route
-
-        return route
-
-    def _mock_service(self, values):
-        svc = MagicMock()
-        svc.get_config = lambda key, default=None: values.get(key, default)
-        return svc
-
-    def _build(self, monkeypatch, values):
-        route = self._route()
-        monkeypatch.setattr(route, "get_system_config_service", lambda: self._mock_service(values))
-        return route._build_config_item("ditto_emotion_model")
-
-    def test_options_from_db_json(self, monkeypatch):
-        item = self._build(monkeypatch, {"ditto_emotion_model_options": '["ep-aaa", "ep-bbb"]'})
-        assert item["model_options"] == ["ep-aaa", "ep-bbb"]
-
-    def test_options_empty_when_unconfigured(self, monkeypatch):
-        item = self._build(monkeypatch, {})
-        assert item["model_options"] == []
-
-    def test_options_invalid_json(self, monkeypatch):
-        item = self._build(monkeypatch, {"ditto_emotion_model_options": "{not-json"})
-        assert item["model_options"] == []
-
-    def test_options_non_array_json(self, monkeypatch):
-        item = self._build(monkeypatch, {"ditto_emotion_model_options": '{"a": 1}'})
-        assert item["model_options"] == []
-
-    def test_options_elements_stringified(self, monkeypatch):
-        item = self._build(monkeypatch, {"ditto_emotion_model_options": '["ep-aaa", 123, null, true]'})
-        assert item["model_options"] == ["ep-aaa", "123", "True"]

tests/unit/test_viral_video_p0.py

@@ -400,7 +400,7 @@ class TestMarkFailedAndNotifySessionFallback:
         job.mark_failed.assert_called()
         # fallback路径：新session上repo.get(job-1)被调用，且新job被mark_failed并commit
         fake_repo.get.assert_called_with("job-1")
-        fake_job_in_db.mark_failed.assert_called_with("boom", stage="render")
+        fake_job_in_db.mark_failed.assert_called_with("boom")
         fake_repo.update.assert_called_with(fake_job_in_db)
         fake_ssn.commit.assert_called()
         fake_ssn.close.assert_called()
@@ -419,7 +419,7 @@ class TestMarkFailedAndNotifySessionFallback:
             with patch.object(vv, "_emit_progress") as mock_emit:
                 # 不mock SessionLocal，如果fallback被错误触发会抛AttributeError
                 vv._mark_failed_and_notify("job-2", session, repo, job, "err", stage="copy")
-        job.mark_failed.assert_called_with("err", stage="copy")
+        job.mark_failed.assert_called_with("err")
         mock_save.assert_called()
         mock_emit.assert_called_once()
 

tests/unit/test_viral_video_routes.py

@@ -144,7 +144,7 @@ class TestRetryViralVideo:
 
         assert job.status == ViralVideoStatus.PENDING
         assert job.retry_count == 2
-        mock_send.assert_called_once_with("worker.run_viral_video_analyze", args=["job-retry"])
+        mock_send.assert_called_once_with("worker.run_viral_video_pipeline", args=["job-retry"])
         assert resp.id == "job-retry"
 
     def test_retry_without_body_keeps_original_params(self):