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

问题根因：
1. MediaKit 抽帧轮询参数过短（poll_interval=2s, max_poll_attempts=5，最多等 10s），大视频或排队场景下 MediaKit 尚未完成即放弃
2. 帧图片串行下载，每次新建 TCP 连接（httpx.get），5帧×15s 最坏 75s，加上 persist 再下载 30s，总耗时可达 105s
3. 前端传入的 video_url 可能是 OSS 私有桶裸 URL，MediaKit 无法访问导致抽帧失败

修复：
- MediaKit 抽帧参数：poll_interval 2s→3s，max_poll_attempts 5→20（最多等 60s），max_retries 0→1
- 帧下载改用 httpx.Client 连接池复用，减少连接建立开销
- 新增 _sign_video_url_for_mediakit：自动检测自家 OSS URL 并重签 7 天有效期
- 路由层增加 try/except 包裹 generate_smart_cover，异常时返回 fallback 而非 502
- 增加关键路径日志

测试：新增 3 个单测（video_url 重签、外部 URL 透传、轮询参数校验），共 15 测试全过

.gitea/workflows/ci-pipeline.yml

@@ -196,7 +196,7 @@ jobs:
     - name: Run style checks
       shell: bash
       run: bash scripts/ci/validate_style.sh
-    - name: Auto-fix formatting (black + isort + ruff)
+    - name: Auto-fix formatting (black + isort)
       if: failure()
       shell: sh
       env:
@@ -827,6 +827,9 @@ jobs:
         CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:develop"
 
         EXTRA_BUILD_ARGS="APP_VERSION=\"${GITHUB_SHA}\""
+        if [ "${{ matrix.service }}" = "web" ]; then
+          EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS NGINX_CONF=infra/docker/nginx-staging.conf"
+        fi
 
         # Worker 与 API/Web 统一走持久 builder（ci-builder-persist），共享宿主机层缓存
         NO_CACHE_FLAG=""
@@ -1023,6 +1026,9 @@ jobs:
         CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:${GITHUB_REF_NAME}"
 
         EXTRA_BUILD_ARGS="APP_VERSION=\"${GITHUB_SHA}\""
+        if [ "${{ matrix.service }}" = "web" ]; then
+          EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS NGINX_CONF=infra/docker/nginx-staging.conf"
+        fi
 
         NO_CACHE_FLAG=""
         for i in 1 2 3; do
@@ -1561,6 +1567,9 @@ jobs:
         CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:main"
 
         EXTRA_BUILD_ARGS="APP_VERSION=\"${TAG_NAME}\""
+        if [ "${{ matrix.service }}" = "web" ]; then
+          EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS NGINX_CONF=infra/docker/nginx-production.conf"
+        fi
 
         # Docker build 带重试：失败自动重试2次，第2次重试加--no-cache
         NO_CACHE_FLAG=""

.gitea/workflows/debug-web-v2.yml

@@ -1,60 +0,0 @@
-name: "Debug: Web container v2 (mount conflict)"
-on:
-  push:
-    branches: [debug/web-crash-v2]
-  workflow_dispatch:
-jobs:
-  web-diag:
-    runs-on: runtime-builder
-    timeout-minutes: 10
-    steps:
-      - name: Setup SSH and diagnose
-        shell: bash
-        env:
-          STAGING_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
-        run: |
-          set -x
-          which ssh || (apt-get update -qq && apt-get install -y -qq openssh-client)
-          mkdir -p ~/.ssh && chmod 700 ~/.ssh
-          printf "%s" "$STAGING_SSH_KEY" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          H=47.98.113.167; P=22222
-          ssh-keyscan -p $P -H $H >> ~/.ssh/known_hosts 2>/dev/null
-          ssh -p $P -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no root@$H 'bash -s' <<'REMOTE'
-          set -x
-          echo "=== Current staging containers ==="
-          docker ps -a --filter name=xiaoxia-*-staging --format "table {{.Names}}\t{{.Status}}\t{{.Image}}"
-          echo ""
-          echo "=== Web container logs (current/current-rolledback) ==="
-          docker logs xiaoxia-web-staging 2>&1 | tail -40
-          echo ""
-          echo "=== Web inspect: env & mounts ==="
-          docker inspect xiaoxia-web-staging --format 'Entrypoint: {{.Config.Entrypoint}} Cmd: {{.Config.Cmd}}'
-          docker inspect xiaoxia-web-staging --format '{{range .Config.Env}}{{.}}{{"\n"}}{{end}}' | grep -E "APP_ENV|VERSION"
-          echo "Mounts:"
-          docker inspect xiaoxia-web-staging --format '{{range .Mounts}}{{.Type}} {{.Source}} -> {{.Destination}} (rw={{.RW}}){{"\n"}}{{end}}'
-          echo ""
-          echo "=== Reproduce: rm on read-only bind mount ==="
-          docker run --rm --name nginx-ro-test \
-            -v /var/lib/xiaoxia-saas-staging/nginx-staging.conf:/etc/nginx/conf.d/default.conf:ro \
-            git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas/xiaoxia-saas-web:387514c \
-            sh -c '
-              set -x
-              echo "Before:"
-              ls -la /etc/nginx/conf.d/
-              echo "Try rm (as entrypoint does):"
-              rm -f /etc/nginx/conf.d/default.conf
-              echo "rm exitcode=$?"
-              echo "After rm:"
-              ls -la /etc/nginx/conf.d/
-              echo "Test ln:"
-              ln -s /etc/nginx/nginx-staging.conf /etc/nginx/conf.d/default.conf
-              echo "ln exitcode=$?"
-              ls -la /etc/nginx/conf.d/
-              echo "nginx -t:"
-              nginx -t 2>&1
-            ' 2>&1
-          echo ""
-          echo "=== Also test with NEW fixed image (9c0d4b1 if present) ==="
-          docker images | grep xiaoxia-saas-web | head -5
-REMOTE

alembic/versions/075_add_sentence_timings.py

@@ -1,27 +0,0 @@
-"""add sentence_timings to lipsync_jobs
-
-Revision ID: 075_add_sentence_timings
-Revises: 074_ai_avatar_render_script_id_optional
-Create Date: 2026-09-12
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "075_add_sentence_timings"
-down_revision = "074_render_script_id_optional"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("lipsync_jobs") as batch:
-        batch.add_column(
-            sa.Column("sentence_timings", sa.JSON(), nullable=True),
-        )
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("lipsync_jobs") as batch:
-        batch.drop_column("sentence_timings")

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

@@ -11,13 +11,13 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime, timezone
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import get_db_session
 from app.schemas.ai_avatar_render import (
     AiAvatarRenderJobResponse,
     CreateAiAvatarRenderRequest,
+    SmartCoverRequest,
     SmartCoverResponse,
 )
 from app.services.ai_avatar_cover_service import generate_smart_cover
@@ -77,16 +77,10 @@ def create_render_job(
         from app.tasks.ai_avatar_render import execute_ai_avatar_render
 
         execute_ai_avatar_render.delay(job.id)
-    except Exception as exc:
-        logger.exception("Celery 任务投递失败（创建）: job_id=%s err=%s", job.id, exc)
-        job.status = "failed"
-        job.error_message = f"任务提交失败：{exc}"
-        job.updated_at = datetime.now(timezone.utc)
-        svc.db.commit()
-        svc.db.refresh(job)
-        return AiAvatarRenderJobResponse.model_validate(job)
+    except Exception:
+        logger.warning("Celery 任务提交失败，渲染任务已创建但未触发执行: %s", job.id)
 
-    return AiAvatarRenderJobResponse.model_validate(job)
+    return job
 
 
 # ── GET /jobs — 任务列表 ─────────────────────────────────────────────────
@@ -178,54 +172,38 @@ def retry_render_job(
         from app.tasks.ai_avatar_render import execute_ai_avatar_render
 
         execute_ai_avatar_render.delay(job.id)
-    except Exception as exc:
-        logger.exception("Celery 任务投递失败（重试）: job_id=%s err=%s", job.id, exc)
-        job.status = "failed"
-        job.error_message = f"任务提交失败：{exc}"
-        job.updated_at = datetime.now(timezone.utc)
-        svc.db.commit()
-        svc.db.refresh(job)
-        return AiAvatarRenderJobResponse.model_validate(job)
+    except Exception:
+        logger.warning("Celery 任务提交失败，重试任务已重置但未触发执行: %s", job.id)
 
-    return AiAvatarRenderJobResponse.model_validate(job)
+    return job
 
 
-# ── POST /{job_id}/smart-cover — 从最终成片智能抽封面（步骤②）────────
+
+# ── POST /smart-cover — 智能获取封面（MediaKit 抽帧 + 评分选帧）────────
 
 
-@router.post("/{job_id}/smart-cover", response_model=SmartCoverResponse)
-def generate_render_smart_cover(
-    job_id: str,
+@router.post("/smart-cover", response_model=SmartCoverResponse)
+def generate_avatar_smart_cover(
+    body: SmartCoverRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    """从最终渲染成片智能抽帧生成封面（MediaKit 抽帧 + 评分选最佳帧 + 转存 OSS）.
+) -> SmartCoverResponse:
+    """智能获取数字人视频封面.
 
-    - 必须等渲染任务 completed 后才可调用（否则返回 400）
-    - 生成成功后自动更新 render_job 的 cover_config 与 output_cover_url
+    复用智能剪辑的 MediaKit 抽帧 + 质量评分选最佳帧逻辑（非 FFmpeg 简单截帧），
+    并将选中帧转存到自家 OSS，返回非临时的封面公网 URL。
+
+    前端「智能获取封面」按钮可直接调用本接口；不依赖渲染任务完成。
     """
-    from app.services.ai_avatar_render_service import AiAvatarRenderService
-
-    svc = AiAvatarRenderService(db)
-    job = svc.get_render_job(job_id, current_user.user.id)
-    if job is None:
-        raise HTTPException(status_code=404, detail="渲染任务不存在")
-    if job.status != "completed":
-        raise HTTPException(status_code=400, detail="请先完成视频生成")
-    video_url = (job.output_video_url or "").strip()
-    if not video_url:
-        raise HTTPException(status_code=400, detail="渲染成片视频 URL 为空")
+    video_url = (body.video_url or "").strip()
+    if not video_url.startswith(("http://", "https://")):
+        raise HTTPException(status_code=400, detail="video_url 必须是合法的 HTTP/HTTPS URL")
 
     try:
-        # 从最终成片抽帧，帧本身已含标题/B-roll，直接转存 OSS
-        cover_url = generate_smart_cover(video_url, job_id=job_id, max_frames=5)
+        cover_url = generate_smart_cover(video_url, max_frames=body.max_frames)
     except Exception as exc:
         logger.error(
-            "渲染成片智能封面生成异常: user=%s render_id=%s video_url=%s err=%s",
-            current_user.user.id,
-            job_id,
-            video_url[:80],
-            exc,
+            "智能封面生成异常: user=%s video_url=%s err=%s",
+            current_user.user.id, video_url[:80], exc,
             exc_info=True,
         )
         cover_url = ""
@@ -236,24 +214,5 @@ def generate_render_smart_cover(
             status="fallback_failed",
             message="智能抽帧失败（MediaKit 不可用或抽帧异常），请稍后重试",
         )
-
-    # 更新 render_job 的封面字段（异步写入 DB；失败不影响返回）
-    try:
-        job.cover_config = {
-            **(job.cover_config if isinstance(job.cover_config, dict) else {}),
-            "mode": "auto_frame",
-            "url": cover_url,
-        }
-        job.output_cover_url = cover_url
-        job.updated_at = datetime.now(timezone.utc)
-        db.commit()
-    except Exception as exc:
-        logger.warning("更新 render_job 封面字段失败（不影响返回）: job_id=%s err=%s", job_id, exc)
-
-    logger.info(
-        "渲染成片智能封面生成成功: user=%s render_id=%s cover_url=%s",
-        current_user.user.id,
-        job_id,
-        cover_url[:120],
-    )
+    logger.info("智能封面生成成功: user=%s cover_url=%s", current_user.user.id, cover_url[:120])
     return SmartCoverResponse(cover_url=cover_url, status="completed")

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

@@ -177,8 +177,8 @@ def _cleanup_expired_uploads() -> int:
                 meta_file.unlink()
                 cleaned += 1
                 logger.info(f"Cleaned up expired upload: {upload_id}")
-        except Exception:
-            logger.exception("Failed to cleanup upload metadata: %s", meta_file)
+        except Exception as e:
+            logger.warning(f"Failed to cleanup upload metadata {meta_file}: {e}")
 
     return cleaned
 

apps/api/app/api/routes/generation_variant_plans.py

@@ -108,7 +108,7 @@ def create_variant_plans(
             if _latest:
                 source_plan_id = _latest.id
         except Exception:
-            logger.exception("[variant-plans] 源 plan 解析失败")
+            logger.warning("[variant-plans] 源 plan 解析失败", exc_info=True)
 
     if not source_plan_id:
         raise HTTPException(
@@ -122,7 +122,7 @@ def create_variant_plans(
 
         voice_durations = _query_voice_durations(db, voices)
     except Exception:
-        logger.exception("[variant-plans] 配音时长查询失败（按占位段长选片）")
+        logger.warning("[variant-plans] 配音时长查询失败（按占位段长选片）", exc_info=True)
         voice_durations = [0.0] * request.count
 
     from app.services.edit_plan_service import EditPlanService
@@ -143,7 +143,7 @@ def create_variant_plans(
     except HTTPException:
         raise
     except Exception as e:
-        logger.exception("[variant-plans] 选片异常")
+        logger.error("[variant-plans] 选片异常: %s", e, exc_info=True)
         raise HTTPException(status_code=500, detail="选片失败，请稍后重试") from e
 
     # 组装 clips 响应

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

@@ -14,6 +14,7 @@ import logging
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import (
+    get_cosyvoice_service,
     get_db_session,
     get_voice_clone_profile_repository,
 )
@@ -23,6 +24,8 @@ from app.services.mediakit_client import MediaKitError
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 
+from packages.application.cosyvoice_service import CosyVoiceError, CosyVoiceService
+
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
@@ -31,11 +34,13 @@ router = APIRouter()
 def _get_service(
     db: Session = Depends(get_db_session),
     voice_clone_repo=Depends(get_voice_clone_profile_repository),
+    cosyvoice_service: CosyVoiceService = Depends(get_cosyvoice_service),
 ) -> LipsyncService:
-    # voice_clone_repo 用于克隆音色 profile 解析
-    # TTS 合成已移至 Celery 异步任务，无需同步注入 cosyvoice_service
+    # voice_clone_repo 用于克隆音色 profile 解析；cosyvoice_service 用于 TTS 直生
+    # （TTS 合成、音色解析、错误码归一化都在 LipsyncService 内部完成）
     return LipsyncService(
         db,
+        cosyvoice_service=cosyvoice_service,
         voice_clone_repo=voice_clone_repo,
     )
 
@@ -52,8 +57,8 @@ def create_lipsync_job(
     """提交对口型任务.
 
     #1809/#1822: 前端传 {video_url, voice_id, script_text, speed?, emotion?}，
-    后端创建任务记录（状态 tts_processing），dispatch Celery 异步任务执行 TTS 合成 + MediaKit 提交；
-    也支持直接传 {video_url, audio_url}（同步提交 MediaKit）。
+    后端内部解析音色、调 TTS 合成音频、转存 OSS，再提交 MediaKit；
+    也支持直接传 {video_url, audio_url}。
     """
     try:
         job = svc.create_job(
@@ -70,13 +75,21 @@ def create_lipsync_job(
     except ValueError as exc:
         # 参数无效（如 voice_id 格式不对、文本过长等）
         raise HTTPException(status_code=400, detail=str(exc)) from exc
+    except CosyVoiceError as exc:
+        # TTS 合成基础设施失败（API/网络/认证）
+        raise HTTPException(
+            status_code=502,
+            detail={"code": "TTSSynthesisFailed", "message": str(exc)},
+        ) from exc
     except MediaKitError as exc:
-        # 音色无权访问 → 403；参数无效 → 400；MediaKit 提交失败 → 502
+        # TTS 合成失败 / 音色无权访问 → 400/403；MediaKit 提交失败 → 502
         status_code = 502
         if exc.code in ("VoiceForbidden",):
             status_code = 403
         elif exc.code in ("InvalidInput", "TTSInvalidParam", "VoiceNotReady"):
             status_code = 400
+        elif exc.code == "TTSSynthesisFailed":
+            status_code = 502
         raise HTTPException(
             status_code=status_code,
             detail={
@@ -174,13 +187,13 @@ def cancel_lipsync_job(
     current_user: AuthenticatedUser = Depends(get_current_user),
     svc: LipsyncService = Depends(_get_service),
 ):
-    """取消对口型任务（仅 pending/tts_processing/submitted 状态可取消）."""
+    """取消对口型任务（仅 pending/submitted 状态可取消）."""
     job = svc.cancel_job(job_id, current_user.user.id)
     if job is None:
         raise HTTPException(status_code=404, detail="任务不存在")
     if job.status != "cancelled":
         raise HTTPException(
             status_code=400,
-            detail=f"任务状态 {job.status} 不可取消，仅 pending/tts_processing/submitted 可取消",
+            detail=f"任务状态 {job.status} 不可取消，仅 pending/submitted 可取消",
         )
     return job

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

@@ -65,8 +65,8 @@ def _build_asset_analyses(
                 if url:
                     video_urls.append(url)
                     valid_asset_ids.append(aid)
-            except Exception:
-                logger.exception("获取素材URL失败: asset_id=%s", aid)
+            except Exception as e:
+                logger.warning("获取素材URL失败: asset_id=%s error=%s", aid, str(e))
 
         if not video_urls:
             logger.info("无可用视频素材，跳过视频理解分析")
@@ -108,7 +108,7 @@ def _build_asset_analyses(
         return analyses
 
     except Exception as e:
-        logger.exception("MediaKit 视频理解异常，将降级到无分析模式: %s", e)
+        logger.warning("MediaKit 视频理解异常，将降级到无分析模式: %s", str(e))
         return {}
 
 
@@ -177,7 +177,7 @@ def editor_ai_recommend(
         try:
             db.rollback()
         except Exception:
-            logger.exception("db rollback failed in ai_recommend")
+            pass
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail="AI推荐结果保存失败，请稍后重试",

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

@@ -132,8 +132,8 @@ def _build_asset_url_map(
     result: dict[str, str | None] = {}
     try:
         storage = get_storage_service()
-    except Exception as e:
-        logger.exception("获取存储服务失败，跳过asset_url生成: %s", e)
+    except Exception:
+        logger.warning("获取存储服务失败，跳过asset_url生成")
         return {aid: None for aid in asset_ids}
 
     # 批量查询所有 Asset（单次 SQL IN 查询，避免 N+1）
@@ -141,7 +141,7 @@ def _build_asset_url_map(
         assets = asset_repo.find_by_ids(unique_ids)
         asset_map = {a.id: a for a in assets}
     except Exception:
-        logger.exception("批量查询素材失败: asset_ids=%s", asset_ids)
+        logger.warning("批量查询素材失败: asset_ids=%s", asset_ids, exc_info=True)
         return {aid: None for aid in asset_ids if aid}
 
     for aid in unique_ids:
@@ -156,7 +156,7 @@ def _build_asset_url_map(
                 continue
             result[aid] = storage.get_download_url(storage_key, expires_seconds=3600)
         except Exception:
-            logger.exception("生成素材签名URL失败: asset_id=%s", aid)
+            logger.warning("生成素材签名URL失败: asset_id=%s", aid, exc_info=True)
             result[aid] = None
 
     return result
@@ -486,8 +486,8 @@ def _get_mediakit_recommendations(
                 if url:
                     video_urls.append(url)
                     valid_asset_ids.append(asset_id)
-            except Exception:
-                logger.exception("获取素材URL失败: asset_id=%s", asset_id)
+            except Exception as e:
+                logger.warning("获取素材URL失败: asset_id=%s error=%s", asset_id, e)
 
         if not video_urls:
             return {}
@@ -563,7 +563,7 @@ def _get_mediakit_recommendations(
         return recommendations
 
     except Exception as e:
-        logger.exception("MediaKit 智能选片异常，降级为随机选择: %s", e)
+        logger.warning("MediaKit 智能选片异常，降级为随机选择: %s", e)
         return {}
 
 
@@ -860,7 +860,7 @@ def create_clips_from_assets_editor(
     duplicate_warning = None
     if dup_rate > 50:
         duplicate_warning = f"查重率 {dup_rate:.1f}% 超过50%，建议更换素材或模板"
-        logger.exception(
+        logger.warning(
             "from-assets 成片查重率超标: plan_id=%s dup_rate=%.1f%%",
             plan_id,
             dup_rate,
@@ -960,8 +960,8 @@ def _update_mediakit_recommendations_async(  # pragma: no cover
         # 尝试获取存储服务（用于生成视频 URL）
         try:
             storage = get_storage_service()
-        except Exception as e:
-            logger.exception("后台任务: 获取存储服务失败，跳过 SceneChange 更新: %s", e)
+        except Exception:
+            logger.warning("后台任务: 获取存储服务失败，跳过 SceneChange 更新")
             return
 
         # 获取 MediaKit 客户端
@@ -987,8 +987,8 @@ def _update_mediakit_recommendations_async(  # pragma: no cover
             if storage_key and mime.startswith("video/"):
                 try:
                     video_url = storage.get_download_url(storage_key)
-                except Exception:
-                    logger.exception("后台任务: 获取素材URL失败: asset_id=%s", asset_id)
+                except Exception as e:
+                    logger.warning("后台任务: 获取素材URL失败: asset_id=%s error=%s", asset_id, e)
 
             # 构建该素材的占用区间列表（排除已更新片段）
             def _get_other_segments(asset_id_inner, clip_id_inner):
@@ -1039,11 +1039,12 @@ def _update_mediakit_recommendations_async(  # pragma: no cover
                             asset_id,
                             len(scene_changes),
                         )
-                    except Exception:
+                    except Exception as cache_err:
                         # 缓存写入失败不影响本次片段更新
-                        logger.exception(
-                            "后台任务: 场景点缓存写入失败: asset_id=%s",
+                        logger.warning(
+                            "后台任务: 场景点缓存写入失败: asset_id=%s error=%s",
                             asset_id,
+                            cache_err,
                         )
 
             # SceneChange 未获得有效结果 → 尝试 analyze_videos 作为 fallback
@@ -1123,10 +1124,11 @@ def _update_mediakit_recommendations_async(  # pragma: no cover
                                 recommended_start + clip_duration,
                                 plan_id,
                             )
-                    except Exception:
-                        logger.exception(
-                            "后台任务: 同步素材区间记录失败，回滚本次片段更新: clip_id=%s",
+                    except Exception as me:
+                        logger.warning(
+                            "后台任务: 同步素材区间记录失败，回滚本次片段更新: clip_id=%s error=%s",
                             clip.id,
+                            me,
                         )
                         db.rollback()
                         continue
@@ -1142,8 +1144,8 @@ def _update_mediakit_recommendations_async(  # pragma: no cover
                         asset_id,
                         recommended_start,
                     )
-                except Exception:
-                    logger.exception("后台任务: 单个片段更新失败: clip_id=%s", clip.id)
+                except Exception as ue:
+                    logger.warning("后台任务: 单个片段更新失败: clip_id=%s error=%s", clip.id, ue)
                     try:
                         db.rollback()
                     except Exception:
@@ -1152,9 +1154,9 @@ def _update_mediakit_recommendations_async(  # pragma: no cover
 
         logger.info("后台任务完成: plan_id=%s 成功更新 %d 个片段", plan_id, updated_count)
 
-    except Exception:
+    except Exception as e:
         # 后台任务失败不影响已创建的片段，静默处理
-        logger.exception("后台任务异常: plan_id=%s", plan_id)
+        logger.warning("后台任务异常: plan_id=%s error=%s", plan_id, e, exc_info=True)
         if db:
             try:
                 db.rollback()

apps/api/app/api/routes/voice_clones.py

@@ -163,12 +163,12 @@ def create_voice_clone(
             celery_app.send_task("worker.process_voice_clone", args=[profile.id])
             logger.info(f"Celery task dispatched for voice clone {profile.id}")
         except Exception as e:
-            logger.exception("Failed to dispatch Celery task")
+            logger.error(f"Failed to dispatch Celery task: {e}")
             # P2-3: Celery 调度失败时标记 profile 为 failed，避免永久卡在 processing
             try:
                 workflow.process_clone_failure(profile.id, f"Celery 任务调度失败: {e}")
-            except Exception:
-                logger.exception("Failed to mark profile as failed after dispatch error")
+            except Exception as inner_e:
+                logger.error(f"Failed to mark profile as failed after dispatch error: {inner_e}")
 
     return _to_response(profile)
 
@@ -277,12 +277,12 @@ def retry_voice_clone(
             celery_app.send_task("worker.process_voice_clone", args=[profile.id])
             logger.info(f"Celery task dispatched for voice clone retry {profile.id}")
         except Exception as e:
-            logger.exception("Failed to dispatch Celery task")
+            logger.error(f"Failed to dispatch Celery task: {e}")
             # P2-3: Celery 调度失败时标记 profile 为 failed，避免永久卡在 processing
             try:
                 workflow.process_clone_failure(profile.id, f"Celery 任务调度失败: {e}")
-            except Exception:
-                logger.exception("Failed to mark profile as failed after dispatch error")
+            except Exception as inner_e:
+                logger.error(f"Failed to mark profile as failed after dispatch error: {inner_e}")
 
     return _to_response(profile)
 

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

@@ -105,8 +105,8 @@ def _resolve_preset_preview_url(
         _preset_preview_cache[voice_id] = (audio_url, time.time())
         logger.info("Preset voice preview generated: %s", voice_id)
         return audio_url
-    except Exception:
-        logger.exception("Failed to generate preset voice preview: voice_id=%s", voice_id)
+    except Exception as e:
+        logger.warning("Failed to generate preview for %s, using fallback: %s", voice_id, e)
         return fallback_url
 
 
@@ -127,7 +127,6 @@ def _resolve_all_preset_preview_urls(
         try:
             result_map[p.voice_id] = _resolve_preset_preview_url(p.voice_id, p.preview_url, cosyvoice)
         except Exception:
-            logger.exception("Failed to resolve preset preview URL: voice_id=%s", p.voice_id)
             result_map[p.voice_id] = p.preview_url
     return result_map
 
@@ -733,7 +732,7 @@ def _find_or_create_voice_library_for_extract(*, user_id, project_repository, as
             try:
                 session.rollback()
             except Exception:
-                logger.exception("session rollback failed in _find_or_create_voice_library")
+                pass
         for lib in asset_library_repository.find_by_project(project.id):
             kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
             if kind == AssetLibraryKind.VOICE.value:

apps/api/app/schemas/ai_avatar_render.py

@@ -52,9 +52,7 @@ class CreateAiAvatarRenderRequest(BaseModel):
     lipsync_job_id: str = Field(..., description="对口型任务 ID")
     script_id: str = Field("", description="文案 ID（选自文案库时传；手动输入文案直生场景可留空）")
     b_roll_segments: list[BRollSegment] = Field(default_factory=list, description="B-roll 片段列表")
-    title_config: dict[str, Any] = Field(
-        default_factory=dict, description="标题配置（可含 title_image_dataurl：前端 Canvas 渲染的标题 PNG dataURL）"
-    )
+    title_config: dict[str, Any] = Field(default_factory=dict, description="标题配置")
     cover_config: dict[str, Any] = Field(default_factory=dict, description="封面配置")
     project_id: str = Field("", description="项目 ID")
 
@@ -69,6 +67,7 @@ class CreateAiAvatarRenderRequest(BaseModel):
     @field_validator("script_id")
     @classmethod
     def validate_script_id(cls, v: str) -> str:
+        # script_id 可选：手动输入文案（TTS 直生）场景不关联文案库条目
         return (v or "").strip()
 
 
@@ -110,8 +109,15 @@ class AiAvatarRenderProgressResponse(BaseModel):
     error_message: str
 
 
+class SmartCoverRequest(BaseModel):
+    """智能封面请求 — MediaKit 抽帧 + 质量评分选最佳帧."""
+
+    video_url: str = Field(..., description="数字人视频 URL（对口型/渲染成片）")
+    max_frames: int = Field(5, ge=1, le=10, description="抽帧数量（默认 5）")
+
+
 class SmartCoverResponse(BaseModel):
-    """智能封面响应（封面从最终成片抽帧，不再叠加标题）."""
+    """智能封面响应."""
 
     cover_url: str = Field("", description="封面图公网 URL（OSS，非临时）；失败为空")
     status: str = Field("completed", description="completed / fallback_failed")

apps/api/app/schemas/lipsync.py

@@ -33,7 +33,6 @@ class LipsyncJobResponse(BaseModel):
     output_duration: float
     error_message: str
     error_code: str
-    sentence_timings: Optional[list] = None
     submitted_at: Optional[datetime] = None
     completed_at: Optional[datetime] = None
     created_at: datetime

apps/api/app/services/ai_avatar_cover_service.py

@@ -1,13 +1,10 @@
-"""AI 数字人封面服务 — MediaKit 抽帧 + 质量评分选最佳帧 + 转存 OSS.
+"""AI 数字人封面服务 — 复用智能剪辑的 MediaKit 抽帧 + 质量评分选最佳帧.
 
 与 generation_cover.py 的智能选帧能力对齐（不再用 FFmpeg 简单截帧）：
 1. MediaKit extract_frames 抽取多帧（默认 5 帧，SpecifiedFrames 策略）
 2. cover_frame_scorer.score_frames 按清晰度/亮度/色彩评分选最佳
 3. 下载最佳帧并转存 OSS，返回公网封面 URL
 
-设计原则：封面一律从最终成片（已叠加标题/B-roll）抽帧，帧本身已含标题，
-本服务**不再叠加标题**。对口型阶段的裸视频封面入口已删除（废弃）。
-
 降级：MediaKit 不可用或抽帧失败时返回空字符串，由调用方决定回退策略。
 """
 
@@ -22,18 +19,15 @@ from urllib.parse import urlparse
 
 logger = logging.getLogger(__name__)
 
-# MediaKit 抽帧轮询参数：poll_interval=1s × max_poll=15 → 最长 15s，配合前端 120s 超时足够
-COVER_POLL_INTERVAL = 1.0
-COVER_MAX_POLL_ATTEMPTS = 15
+# MediaKit 抽帧轮询参数（与 MediaKit API timeout=60s 对齐）
+COVER_POLL_INTERVAL = 3.0
+COVER_MAX_POLL_ATTEMPTS = 20  # 最多等 60 秒
 
 # 帧图片下载超时（秒）
 FRAME_DOWNLOAD_TIMEOUT = 20
 # 最佳帧下载超时（用于 persist）
 BEST_FRAME_DOWNLOAD_TIMEOUT = 30
 
-# 自家 OSS 私有桶 URL 重签有效期（供 MediaKit GPU worker 拉取）
-MEDIAKIT_URL_TTL_SECONDS = 7 * 24 * 3600
-
 
 def _sign_video_url_for_mediakit(video_url: str) -> str:
     """如果 video_url 是自家 OSS 私有桶 URL，重新签名为长有效期预签名 URL。
@@ -52,7 +46,8 @@ def _sign_video_url_for_mediakit(video_url: str) -> str:
         own_host = urlparse(public_base).netloc.lower()
         url_host = urlparse(video_url).netloc.lower()
         if own_host and url_host == own_host:
-            signed = storage.get_download_url(video_url, expires_seconds=MEDIAKIT_URL_TTL_SECONDS)
+            # 是自家 OSS URL，重签 7 天有效期供 MediaKit 拉取
+            signed = storage.get_download_url(video_url, expires_seconds=7 * 24 * 3600)
             if signed:
                 logger.info("[数字人封面] video_url 已重签（自家 OSS 私有桶）")
                 return signed
@@ -62,10 +57,19 @@ def _sign_video_url_for_mediakit(video_url: str) -> str:
 
 
 def select_best_cover_frame(video_url: str, *, max_frames: int = 5) -> str:
-    """从视频抽取多帧并评分选最佳帧，返回最佳帧的临时 URL."""
+    """从视频抽取多帧并评分选最佳帧，返回最佳帧的临时 URL.
+
+    Args:
+        video_url: 可公网访问的视频 URL
+        max_frames: 抽帧数量
+
+    Returns:
+        最佳帧图片 URL；失败返回空字符串
+    """
     if not video_url:
         return ""
 
+    # 确保 MediaKit 能访问 video_url（自家 OSS 私有桶需重签）
     video_url = _sign_video_url_for_mediakit(video_url)
 
     try:
@@ -78,9 +82,11 @@ def select_best_cover_frame(video_url: str, *, max_frames: int = 5) -> str:
             return ""
 
         logger.info(
-            "[数字人封面] 开始抽帧: video_url=%s max_frames=%d",
+            "[数字人封面] 开始抽帧: video_url=%s max_frames=%d poll_interval=%.1f max_poll=%d",
             video_url[:80],
             max_frames,
+            COVER_POLL_INTERVAL,
+            COVER_MAX_POLL_ATTEMPTS,
         )
 
         snapshots = mk.extract_frames(
@@ -98,6 +104,7 @@ def select_best_cover_frame(video_url: str, *, max_frames: int = 5) -> str:
         if len(snapshots) == 1:
             return snapshots[0].get("image_url") or snapshots[0].get("url") or ""
 
+        # 使用连接池下载各帧（复用 TCP 连接，减少延迟）
         import httpx
 
         candidates = []
@@ -125,6 +132,7 @@ def select_best_cover_frame(video_url: str, *, max_frames: int = 5) -> str:
         best = scored[0] if scored else None
         best_url = best.get("url", "") if best else ""
 
+        # 清理临时文件
         for c in candidates:
             p = c.get("image_path")
             if p:
@@ -145,15 +153,16 @@ def select_best_cover_frame(video_url: str, *, max_frames: int = 5) -> str:
         return ""
 
 
-def persist_cover_to_oss(
-    frame_url: str,
-    *,
-    job_id: str = "",
-    prefix: str = "ai-avatar/covers",
-) -> str:
-    """下载最佳帧图并转存到 OSS，返回公网封面 URL（预签名）.
+def persist_cover_to_oss(frame_url: str, *, job_id: str = "", prefix: str = "ai-avatar/covers") -> str:
+    """下载帧图并转存到 OSS，返回公网封面 URL.
 
-    封面来自最终成片抽帧，帧本身已含标题，本函数不再做任何文字/图片叠加。
+    Args:
+        frame_url: MediaKit 返回的临时帧图 URL
+        job_id: 关联任务 ID（用于 OSS key 命名）
+        prefix: OSS key 前缀
+
+    Returns:
+        OSS 公网 URL；失败回退原始 frame_url
     """
     if not frame_url:
         return ""
@@ -177,17 +186,13 @@ def persist_cover_to_oss(
         storage = get_shared_storage_service()
         token = job_id or uuid.uuid4().hex[:12]
         cover_key = f"{prefix}/{token}/cover_{uuid.uuid4().hex[:8]}.jpg"
-
         public_url = storage.upload_file(
             file_or_path=tmp_path,
             storage_key=cover_key,
             content_type="image/jpeg",
         )
         logger.info("[数字人封面] 封面已转存 OSS: key=%s", cover_key)
-        if public_url:
-            signed = storage.get_download_url(cover_key, expires_seconds=86400)
-            return signed
-        return frame_url
+        return public_url or frame_url
     except Exception:
         logger.warning("[数字人封面] 封面转存 OSS 失败，返回原始 URL", exc_info=True)
         return frame_url
@@ -199,15 +204,10 @@ def persist_cover_to_oss(
                 pass
 
 
-def generate_smart_cover(
-    video_url: str,
-    *,
-    job_id: str = "",
-    max_frames: int = 5,
-) -> str:
-    """一站式：MediaKit 智能抽帧选最佳 → 转存 OSS。失败返回空字符串。
+def generate_smart_cover(video_url: str, *, job_id: str = "", max_frames: int = 5) -> str:
+    """一站式：MediaKit 智能抽帧选最佳 → 转存 OSS，返回封面公网 URL.
 
-    封面从最终成片抽帧，不再叠加任何标题（帧本身已含）。
+    供独立封面接口与渲染管线复用。失败返回空字符串。
     """
     best_frame = select_best_cover_frame(video_url, max_frames=max_frames)
     if not best_frame:

apps/api/app/services/ai_avatar_render_service.py

@@ -9,11 +9,8 @@
 
 from __future__ import annotations
 
-import base64
-import binascii
 import logging
 import os
-import subprocess
 import tempfile
 import uuid
 from datetime import datetime, timezone
@@ -27,9 +24,8 @@ from packages.adapters.sqlalchemy_impl.models import (
     ScriptModel,
 )
 from packages.domain.video_filter_builder import (
-    build_broll_overlay_filter,
+    build_cover_extract_command,
     build_title_drawtext_filter,
-    build_title_overlay_filter,
 )
 from packages.shared.storage import get_shared_storage_service
 
@@ -200,8 +196,9 @@ class AiAvatarRenderService:
         1. 下载对口型输出视频 (20%)
         2. 构建 FFmpeg 滤镜链 (40%)
         3. 执行 FFmpeg 渲染 (80%)
-        4. 上传到 OSS (95%) — 封面不再自动生成，改由前端主动抽帧
-        5. 更新任务状态 (100%)
+        4. 提取封面 (90%)
+        5. 上传到 OSS (95%)
+        6. 更新任务状态 (100%)
         """
         job = self.db.query(AiAvatarRenderJob).filter(AiAvatarRenderJob.id == job_id).first()
         if job is None:
@@ -231,32 +228,27 @@ class AiAvatarRenderService:
             self.db.commit()
 
             # 2. 构建 FFmpeg 滤镜链 (40%)
-            # 用 ffprobe 探测输入视频分辨率，确保 B-roll 缩放与标题位置与实际输出一致。
-            # AI 数字人对口型输出为 9:16 竖屏，默认兜底 720x1280；探测失败时使用默认值不阻断渲染。
-            output_width, output_height = self._probe_video_resolution(input_video_path)
-            if output_width <= 0 or output_height <= 0:
-                output_width, output_height = 720, 1280
-                logger.info(
-                    "[数字人渲染] ffprobe 探测分辨率失败或无效，使用默认竖屏尺寸 %sx%s",
-                    output_width,
-                    output_height,
-                )
-            else:
-                logger.info("[数字人渲染] 探测输入视频分辨率: %sx%s", output_width, output_height)
+            from packages.domain.video_filter_builder import build_broll_overlay_filter
 
-            broll_filter, broll_label = build_broll_overlay_filter(
+            filter_complex = build_broll_overlay_filter(
                 b_roll_segments=job.b_roll_segments,
                 video_duration=lipsync_job.output_duration,
-                output_width=output_width,
-                output_height=output_height,
             )
 
-            # 标题叠加路径：优先前端 Canvas 渲染的 PNG 图层（所见即所得），
-            # 无 title_image_dataurl 时降级到 drawtext 重画文字。
-            title_cfg = job.title_config if isinstance(job.title_config, dict) else {}
-            title_dataurl = (title_cfg or {}).get("title_image_dataurl") if title_cfg else None
-            use_title_png = isinstance(title_dataurl, str) and title_dataurl.startswith("data:image/")
-            title_input_index = 1 + len(job.b_roll_segments or []) if use_title_png else None
+            # 标题叠加
+            title_filter = build_title_drawtext_filter(job.title_config)
+            if title_filter:
+                if filter_complex:
+                    filter_complex += f"[vout]{title_filter}[vout_titled];"
+                else:
+                    filter_complex = f"[0:v]{title_filter}[vout_titled];"
+
+            # 清理末尾分号
+            if filter_complex.endswith(";"):
+                filter_complex = filter_complex[:-1]
+
+            # 最终输出标签
+            final_label = "vout_titled" if title_filter else ("vout" if filter_complex else None)
 
             job.progress = 40
             self.db.commit()
@@ -265,126 +257,57 @@ class AiAvatarRenderService:
             with tempfile.TemporaryDirectory() as tmpdir:
                 output_video_path = os.path.join(tmpdir, "output.mp4")
 
-                # 在临时目录里解码保存标题 PNG（with 退出自动清理）
-                title_png_path: Optional[str] = None
-                extra_inputs: list[str] = []
-                title_filter = None
-                if use_title_png:
-                    try:
-                        title_png_path = os.path.join(tmpdir, f"title_{job.id}.png")
-                        self._save_title_dataurl_to_file(title_dataurl, dst_path=title_png_path)
-                        extra_inputs.append(title_png_path)
-                        logger.info(
-                            "[数字人渲染] 标题 PNG 已保存: %s (input index %d)", title_png_path, title_input_index
-                        )
-                    except Exception as exc:
-                        logger.warning("[数字人渲染] 标题 PNG 解码/保存失败，降级 drawtext: %s", exc)
-                        title_png_path = None
-                        extra_inputs = []
-
-                # 构建标题滤镜
-                final_label = None
-                if title_png_path and title_input_index is not None:
-                    title_input_label = f"[{title_input_index}:v]"
-                    base_label = f"[{broll_label}]" if broll_label else "[0:v]"
-                    title_filter = build_title_overlay_filter(
-                        title_cfg,
-                        output_width=output_width,
-                        output_height=output_height,
-                        title_png_path=title_png_path,
-                        title_input_label=title_input_label,
-                        base_label=base_label,
-                        output_label="vout_titled",
-                    )
-                    if not title_filter:
-                        # build 返回 None → 文件不存在（极端并发情况），降级 drawtext
-                        title_png_path = None
-                        extra_inputs = []
-
-                if title_png_path:
-                    # overlay 路径
-                    if broll_filter and title_filter:
-                        filter_complex = broll_filter + f";{title_filter}"
-                    elif broll_filter:
-                        filter_complex = broll_filter
-                        final_label = broll_label
-                    elif title_filter:
-                        filter_complex = title_filter
-                    else:
-                        filter_complex = ""
-                    if title_filter:
-                        final_label = "vout_titled"
-                    elif not final_label:
-                        final_label = None
-                else:
-                    # 降级：drawtext 重画文字
-                    title_filter = build_title_drawtext_filter(
-                        title_cfg,
-                        output_width=output_width,
-                        output_height=output_height,
-                    )
-                    if broll_filter and title_filter:
-                        filter_complex = broll_filter + f";[{broll_label}]{title_filter}[vout_titled]"
-                        final_label = "vout_titled"
-                    elif broll_filter:
-                        filter_complex = broll_filter
-                        final_label = broll_label
-                    elif title_filter:
-                        filter_complex = f"[0:v]{title_filter}[vout_titled]"
-                        final_label = "vout_titled"
-                    else:
-                        filter_complex = ""
-                        final_label = None
-
-                cmd_list = self._build_ffmpeg_command(
+                cmd = self._build_ffmpeg_command(
                     input_video=input_video_path,
                     b_roll_segments=job.b_roll_segments,
-                    extra_inputs=extra_inputs,
                     filter_complex=filter_complex,
                     final_label=final_label,
                     output_path=output_video_path,
                 )
 
-                try:
-                    render_result = subprocess.run(
-                        cmd_list,
-                        capture_output=True,
-                        text=True,
-                        timeout=600,
-                    )
-                except subprocess.TimeoutExpired as exc:
-                    raise AiAvatarRenderError(
-                        "FFmpeg 渲染超时（600s）",
-                        code="FFmpegTimeout",
-                    ) from exc
-
-                if render_result.returncode != 0:
-                    stderr_tail = (render_result.stderr or "").strip()[-800:]
-                    raise AiAvatarRenderError(
-                        f"FFmpeg 渲染失败，退出码: {render_result.returncode}, stderr: {stderr_tail}",
-                        code="FFmpegFailed",
-                    )
+                exit_code = os.system(cmd)
+                if exit_code != 0:
+                    raise AiAvatarRenderError(f"FFmpeg 渲染失败，退出码: {exit_code}", code="FFmpegFailed")
 
                 job.progress = 80
                 self.db.commit()
 
-                # 4/5. 上传成片到 OSS (95%) —— 已砍掉自动抽封面逻辑（步骤⑤）；
-                # 封面由前端在渲染完成后通过 /smart-cover 接口主动从成片抽帧，不阻塞渲染链路。
+                # 4. 提取封面 (90%)
+                cover_path = ""
+                if job.cover_config:
+                    cover_path = os.path.join(tmpdir, "cover.jpg")
+                    cover_cmd = build_cover_extract_command(job.cover_config, cover_path)
+                    cover_cmd = cover_cmd.replace("INPUT_VIDEO", output_video_path)
+                    cover_exit = os.system(cover_cmd)
+                    if cover_exit != 0:
+                        logger.warning("封面提取失败，跳过: %s", cover_cmd)
+                        cover_path = ""
+
+                job.progress = 90
+                self.db.commit()
+
+                # 5. 上传到 OSS (95%)
                 output_video_url = self._upload_to_oss(output_video_path, f"ai-avatar/{job_id}/output.mp4")
                 job.output_video_url = output_video_url
 
-                # 封面透传：如果用户已在 cover_config 中选定封面 URL（mode=upload 的自定义上传 或
-                # mode=auto_frame 已有的智能封面结果），直接透传到 output_cover_url，不再重新截帧。
-                if isinstance(job.cover_config, dict):
-                    _pre_cover_url = (
-                        job.cover_config.get("url")
-                        or job.cover_config.get("imageUrl")
-                        or job.cover_config.get("cover_url")
-                        or ""
-                    )
-                    if _pre_cover_url:
-                        job.output_cover_url = _pre_cover_url
-                        logger.info("[数字人渲染] 使用用户已选定封面 URL: job_id=%s", job_id)
+                # 封面：优先复用智能剪辑的 MediaKit 抽帧 + 质量评分选最佳帧；
+                # MediaKit 不可用时回退到 FFmpeg 已按 cover_config 抽取的 cover_path
+                smart_cover_url = ""
+                if output_video_url:
+                    try:
+                        from app.services.ai_avatar_cover_service import (
+                            generate_smart_cover,
+                        )
+
+                        smart_cover_url = generate_smart_cover(output_video_url, job_id=job_id, max_frames=5)
+                    except Exception:
+                        logger.warning("智能封面(MediaKit)失败，回退 FFmpeg 封面 job_id=%s", job_id, exc_info=True)
+
+                if smart_cover_url:
+                    job.output_cover_url = smart_cover_url
+                elif cover_path:
+                    output_cover_url = self._upload_to_oss(cover_path, f"ai-avatar/{job_id}/cover.jpg")
+                    job.output_cover_url = output_cover_url
 
                 # 获取输出视频时长
                 job.output_duration = lipsync_job.output_duration
@@ -399,56 +322,18 @@ class AiAvatarRenderService:
             self.db.commit()
             logger.info("渲染任务完成: %s", job_id)
 
-            # 7. 自动保存成片记录到成片库
-            if job.output_video_url:
-                try:
-                    from packages.adapters.sqlalchemy_impl.generated_video_repository import (
-                        SQLAlchemyGeneratedVideoRepository,
-                    )
-                    from packages.domain.generated_video import GeneratedVideo
-
-                    clip_name = f"AI数字人_{job_id[:8]}"
-                    # AI数字人入口是独立页面，前端可能不传 project_id（无项目概念），
-                    # 兜底为 "ai_avatar" 避免 DB 非空约束/查询问题；generation_task_id 同样兜底用 render_job_id
-                    clip_project_id = (job.project_id or "").strip() or "ai_avatar"
-                    clip_generation_task_id = (job.lipsync_job_id or "").strip() or job_id
-                    clip = GeneratedVideo.create(
-                        project_id=clip_project_id,
-                        generation_task_id=clip_generation_task_id,
-                        name=clip_name,
-                        file_url=job.output_video_url,
-                        user_id=job.user_id,
-                        duration=job.output_duration or 0.0,
-                        thumbnail_url=job.output_cover_url or None,
-                        generation_params={
-                            "source": "ai_avatar_render",
-                            "render_job_id": job.id,
-                        },
-                    )
-                    video_repo = SQLAlchemyGeneratedVideoRepository(self.db)
-                    video_repo.create(clip)
-                    logger.info("成片记录已保存到成片库: clip_id=%s, render_job=%s", clip.id, job_id)
-                except Exception:
-                    logger.error(
-                        "自动保存成片记录失败（不影响渲染任务状态）: render_job=%s",
-                        job_id,
-                        exc_info=True,
-                    )
-
         except AiAvatarRenderError as exc:
             job.status = "failed"
             job.error_message = str(exc)
             job.updated_at = datetime.now(timezone.utc)
             self.db.commit()
             logger.error("渲染任务失败 [%s]: %s", job_id, exc)
-            raise
         except Exception as exc:
             job.status = "failed"
             job.error_message = f"渲染异常: {str(exc)}"
             job.updated_at = datetime.now(timezone.utc)
             self.db.commit()
             logger.exception("渲染任务异常 [%s]", job_id)
-            raise
 
     def _download_video(self, url: str) -> str:
         """下载视频到临时文件."""
@@ -466,132 +351,32 @@ class AiAvatarRenderService:
                 os.unlink(tmp.name)
             raise
 
-    @staticmethod
-    def _save_title_dataurl_to_file(dataurl: str, *, dst_path: str | None = None, job_id: str = "") -> str:
-        """解码前端传来的 data:image/png;base64,... 并保存为本地 PNG 文件。
-
-        Args:
-            dataurl: 完整 dataURL 字符串
-            dst_path: 指定输出路径；为 None 时创建临时文件并返回路径
-            job_id: 仅在 dst_path 为空时用于临时文件命名
-
-        Returns:
-            保存后的本地文件路径
-        """
-        if not isinstance(dataurl, str) or not dataurl.startswith("data:image/"):
-            raise ValueError("title_image_dataurl 不是合法的 data:image URL")
-        # 拆分 data:image/png;base64,<payload>
-        try:
-            header, b64 = dataurl.split(",", 1)
-        except ValueError as exc:
-            raise ValueError("title_image_dataurl 缺少 base64 payload") from exc
-        if "base64" not in header:
-            raise ValueError("title_image_dataurl 不是 base64 编码")
-        try:
-            png_bytes = base64.b64decode(b64, validate=True)
-        except (binascii.Error, ValueError) as exc:
-            raise ValueError(f"title_image_dataurl base64 解码失败: {exc}") from exc
-        if not png_bytes:
-            raise ValueError("title_image_dataurl 解码后为空")
-
-        if dst_path:
-            out_path = dst_path
-            with open(out_path, "wb") as f:
-                f.write(png_bytes)
-            return out_path
-        suffix = f"_title_{job_id}.png" if job_id else "_title.png"
-        with tempfile.NamedTemporaryFile(suffix=suffix, delete=False) as tmp:
-            tmp.write(png_bytes)
-            return tmp.name
-
-    @staticmethod
-    def _probe_video_resolution(video_path: str) -> tuple[int, int]:
-        """用 ffprobe 探测视频分辨率，返回 (width, height)；失败返回 (0, 0)。"""
-        try:
-            result = subprocess.run(
-                [
-                    "ffprobe",
-                    "-v",
-                    "error",
-                    "-select_streams",
-                    "v:0",
-                    "-show_entries",
-                    "stream=width,height",
-                    "-of",
-                    "csv=p=0:s=x",
-                    video_path,
-                ],
-                capture_output=True,
-                text=True,
-                timeout=15,
-            )
-            if result.returncode == 0 and result.stdout.strip():
-                parts = result.stdout.strip().split("x")
-                if len(parts) == 2:
-                    w, h = int(parts[0]), int(parts[1])
-                    if w > 0 and h > 0:
-                        return w, h
-        except Exception as exc:
-            logger.warning("[数字人渲染] ffprobe 探测分辨率失败: %s", exc)
-        return 0, 0
-
     def _build_ffmpeg_command(
         self,
         *,
         input_video: str,
         b_roll_segments: list[dict[str, Any]],
-        extra_inputs: list[str] | None = None,
         filter_complex: str,
         final_label: Optional[str],
         output_path: str,
-    ) -> list[str]:
-        """构建 FFmpeg 命令（list 形式，shell=False）.
-
-        根因修复 #1798 P0：OSS 预签名 URL 含 `&Expires=...&Signature=...` 特殊字符，
-        os.system(shell=True) 会把 `&` 解释为后台命令分隔符，导致 -filter_complex 被
-        当成独立命令报 sh: -filter_complex: not found（exit 127 → Python 32512）。
-        list + shell=False 彻底规避 shell 转义问题。
-        """
-        cmd: list[str] = ["ffmpeg", "-i", input_video]
+    ) -> str:
+        """构建 FFmpeg 命令."""
+        # 输入文件
+        inputs = f"-i {input_video}"
         for seg in b_roll_segments:
             asset_url = seg.get("asset_url", "")
             if asset_url:
-                cmd.extend(["-i", asset_url])
-        # 额外输入（例如前端 Canvas 渲染的标题 PNG）
-        for extra in extra_inputs or []:
-            cmd.extend(["-i", extra])
+                inputs += f" -i {asset_url}"
 
+        # 滤镜
         if filter_complex and final_label:
-            cmd.extend(
-                [
-                    "-filter_complex",
-                    filter_complex,
-                    "-map",
-                    f"[{final_label}]",
-                    "-map",
-                    "0:a?",
-                ]
-            )
+            filter_arg = f'-filter_complex "{filter_complex}" -map "[{final_label}]"'
         elif filter_complex:
-            cmd.extend(["-filter_complex", filter_complex])
+            filter_arg = f'-filter_complex "{filter_complex}"'
+        else:
+            filter_arg = ""
 
-        cmd.extend(
-            [
-                "-c:v",
-                "libx264",
-                "-preset",
-                "veryfast",
-                "-crf",
-                "23",
-                "-c:a",
-                "aac",
-                "-b:a",
-                "128k",
-                "-y",
-                output_path,
-            ]
-        )
-        return cmd
+        return f"ffmpeg {inputs} {filter_arg} -c:v libx264 -preset fast -crf 23 -y {output_path}"
 
     def _upload_to_oss(self, local_path: str, oss_key: str) -> str:
         """上传文件到 OSS，返回 URL.

apps/api/app/services/lipsync_service.py

@@ -15,7 +15,6 @@ import logging
 import uuid
 from datetime import datetime, timezone
 from typing import Optional
-from urllib.parse import urlparse
 
 from app.services.mediakit_client import (
     STATUS_COMPLETED,
@@ -25,9 +24,6 @@ from app.services.mediakit_client import (
     MediaKitError,
     get_mediakit_client,
 )
-
-# Celery 异步任务：TTS 合成 + MediaKit 提交（#lipsync-speed-optimization）
-from app.tasks.lipsync_tts import tts_synthesize_and_submit
 from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl.models import LipsyncJobModel
@@ -37,10 +33,6 @@ from packages.shared.url_security import ALLOWED_AUDIO_MIME_TYPES, safe_download
 
 logger = logging.getLogger(__name__)
 
-# 传给 MediaKit GPU worker / 回给前端播放的 OSS 预签名有效期：7 天。
-# MediaKit 排队 + 拉取可能延迟，私有桶裸 URL 或 1 小时短预签名都会 403，故统一重签长有效期。
-MEDIAKIT_URL_TTL_SECONDS = 7 * 24 * 3600
-
 
 class LipsyncService:
     """对口型任务 Service."""
@@ -157,31 +149,35 @@ class LipsyncService:
         enable_video_loop: bool = False,
         project_id: str = "",
     ) -> LipsyncJobModel:
-        """创建对口型任务.
+        """创建对口型任务并提交到 MediaKit.
 
         两种输入模式：
-        - TTS 直生：voice_id + script_text（audio_url 留空）
-          → 先创建 DB 记录（状态 tts_processing），再 dispatch Celery 异步任务
-            执行 TTS 合成 + MediaKit 提交。API 响应 <1s。
+        - TTS 直生：voice_id + script_text（audio_url 留空），后端先合成音频
         - 直接音频：提供 audio_url
-          → 同步提交 MediaKit，状态直接设为 submitted。
 
         Raises:
-            MediaKitError: 参数校验失败或 MediaKit 提交失败（仅直接音频模式）
+            MediaKitError: TTS 合成或 MediaKit 提交失败
         """
-        # 0. 输入校验
+        # 0. TTS 直生模式：先合成音频（在创建 DB 记录之前完成，失败直接抛出）
         if not audio_url:
             if not (voice_id and script_text):
                 raise MediaKitError(
                     "必须提供 audio_url 或 voice_id+script_text",
                     code="InvalidInput",
                 )
-            # TTS 模式：在 HTTP 请求中同步校验音色归属，快速失败
-            self._resolve_voice_id(voice_id, user_id)
+            # 预合成：用临时 job_id 命名 OSS 对象
+            pre_job_id = str(uuid.uuid4())
+            audio_url = self._synthesize_and_persist_audio(
+                user_id=user_id,
+                job_id=pre_job_id,
+                voice_id=voice_id,
+                script_text=script_text,
+                speed=speed,
+                emotion=emotion,
+            )
 
         # 1. 创建数据库记录
         job_id = str(uuid.uuid4())
-        is_tts_mode = not bool(audio_url)
         job = LipsyncJobModel(
             id=job_id,
             user_id=user_id,
@@ -193,69 +189,31 @@ class LipsyncService:
             script_text=script_text or "",
             speed=speed,
             emotion=normalize_emotion(emotion),
-            status="tts_processing" if is_tts_mode else "pending",
+            status="pending",
         )
         self.db.add(job)
         self.db.flush()
 
-        # ⚠️ 必须先 commit 再发 Celery 任务，避免事务竞态：
-        # worker 是独立进程+独立DB连接，任务被消费（<4ms）时若本事务还未提交，
-        # worker 查询 job 会返回 None → 静默 return 不重试，job 永远卡在 tts_processing。
+        # 3. 提交到 MediaKit
+        try:
+            result = self.client.submit_lipsync(
+                video_url=video_url,
+                audio_url=audio_url,
+                enable_video_loop=enable_video_loop,
+                client_token=job_id,  # 幂等控制
+            )
+            job.mediakit_task_id = result["task_id"]
+            job.status = "submitted"
+            job.submitted_at = datetime.now(timezone.utc)
+        except MediaKitError as exc:
+            job.status = "failed"
+            job.error_message = str(exc)
+            job.error_code = exc.code
+            logger.error("提交对口型任务失败: %s", exc)
+            raise
+
         self.db.commit()
         self.db.refresh(job)
-
-        if is_tts_mode:
-            # 2a. TTS 模式：dispatch Celery 异步任务处理 TTS 合成 + MediaKit 提交
-            try:
-                tts_synthesize_and_submit.apply_async(
-                    args=(
-                        job_id,
-                        user_id,
-                        voice_id,
-                        script_text,
-                        speed,
-                        normalize_emotion(emotion),
-                    )
-                )
-            except Exception as exc:
-                # 投递失败时立即把 job 标成 failed 并写入 error_message，
-                # 前端轮询时能直接看到失败原因，不会无限卡在 tts_processing。
-                logger.exception(
-                    "Celery 任务提交失败，TTS 任务已创建但未触发执行: job_id=%s err=%s",
-                    job_id,
-                    exc,
-                )
-                job.status = "failed"
-                job.error_message = f"Celery 任务投递失败: {exc}"
-                job.error_code = "AsyncDispatchFailed"
-                job.updated_at = datetime.now(timezone.utc)
-                self.db.commit()  # 投递失败也要落库失败状态
-        else:
-            # 2b. 直接音频模式：同步签名并提交 MediaKit
-            video_url = self._sign_media_url(video_url)
-            if audio_url:
-                audio_url = self._sign_media_url(audio_url)
-                job.audio_url = audio_url
-
-            try:
-                result = self.client.submit_lipsync(
-                    video_url=video_url,
-                    audio_url=audio_url,
-                    enable_video_loop=enable_video_loop,
-                    client_token=job_id,
-                )
-                job.mediakit_task_id = result["task_id"]
-                job.status = "submitted"
-                job.submitted_at = datetime.now(timezone.utc)
-                self.db.commit()  # submitted 状态落库
-            except MediaKitError as exc:
-                job.status = "failed"
-                job.error_message = str(exc)
-                job.error_code = exc.code
-                logger.error("提交对口型任务失败: %s", exc)
-                self.db.commit()
-                raise
-
         return job
 
     # ── 查询任务 ──────────────────────────────────────────────────────────
@@ -320,26 +278,11 @@ class LipsyncService:
         if mk_status == STATUS_COMPLETED:
             result = status_data.get("result", {})
             job.status = STATUS_COMPLETED
-            temp_url = result.get("video_url", "")
-            # 先以临时 URL 立即返回前端（前端可立即播放），再异步 Celery 任务转存自家 OSS（步骤⑦）
-            job.output_video_url = temp_url
+            output_url = result.get("video_url", "")
+            # MediaKit 输出为临时 URL，转存自家 OSS 防止过期（失败则回退临时 URL）
+            job.output_video_url = self._persist_output_video(output_url, job_id, user_id)
             job.output_duration = result.get("duration", 0.0)
             job.completed_at = datetime.now(timezone.utc)
-            job.updated_at = datetime.now(timezone.utc)
-            self.db.commit()
-            # 异步转存到自家 OSS（注意：必须在 commit 之后 dispatch，避免 commit 失败任务已发出）
-            try:
-                from app.tasks.lipsync_tts import persist_output_video_task
-
-                persist_output_video_task.apply_async(args=(job_id, user_id, temp_url))
-            except Exception as exc:
-                logger.warning(
-                    "提交输出视频异步转存任务失败，保留临时 URL: job_id=%s err=%s",
-                    job_id,
-                    exc,
-                )
-            self.db.refresh(job)
-            return job
         elif mk_status == STATUS_FAILED:
             error = status_data.get("error", {})
             job.status = "failed"
@@ -373,45 +316,20 @@ class LipsyncService:
             storage_key = f"lipsync-outputs/{user_id}/{job_id}.mp4"
             permanent_url = storage.upload_file(io.BytesIO(data), storage_key, content_type="video/mp4")
             logger.info("对口型输出视频已转存 OSS: job_id=%s key=%s", job_id, storage_key)
-            return self._sign_media_url(permanent_url) or temp_url
+            return permanent_url or temp_url
         except Exception as exc:
             logger.warning("对口型输出视频转存 OSS 失败，回退临时 URL: job_id=%s err=%s", job_id, exc)
             return temp_url
 
-    def _sign_media_url(self, url: str) -> str:
-        """对自家 OSS 私有桶 URL 重签长有效期预签名，供 MediaKit 拉取 / 前端播放。
-
-        - 裸 public_url（upload_file 返回，不带签名）→ 私有桶匿名访问 403，重签。
-        - 已带签名但即将过期的 URL（如前端 1h 预签名）→ 抽 storage_key 后重签。
-        - 外部 URL（CosyVoice/MediaKit 临时链接，非本桶 host）→ 原样透传。
-        - 任何异常都降级原样返回，不阻断主流程。
-        """
-        if not url:
-            return url
-        try:
-            storage = get_shared_storage_service()
-            public_base = getattr(storage, "public_url", "")
-            if not isinstance(public_base, str) or not public_base:
-                return url  # 无法判定归属，保守透传
-            own_host = urlparse(public_base).netloc.lower()
-            host = urlparse(url).netloc.lower()
-            if not own_host or host != own_host:
-                return url  # 非自家 OSS（外部临时链接），不处理
-            signed = storage.get_download_url(url, expires_seconds=MEDIAKIT_URL_TTL_SECONDS)
-            return signed or url
-        except Exception as exc:  # noqa: BLE001 - 签名失败不阻断，降级原 URL
-            logger.warning("对口型 URL 重签失败，原样返回: url_prefix=%s err=%s", url[:80], exc)
-            return url
-
     # ── 取消任务 ──────────────────────────────────────────────────────────
 
     def cancel_job(self, job_id: str, user_id: str) -> Optional[LipsyncJobModel]:
-        """取消任务（仅 pending/tts_processing/submitted 状态可取消）."""
+        """取消任务（仅 pending/submitted 状态可取消）."""
         job = self.get_job(job_id, user_id)
         if job is None:
             return None
 
-        if job.status in ("pending", "tts_processing", "submitted"):
+        if job.status in ("pending", "submitted"):
             job.status = "cancelled"
             job.updated_at = datetime.now(timezone.utc)
             self.db.commit()

apps/api/app/tasks/lipsync_tts.py

@@ -1,550 +0,0 @@
-"""AI 数字人对口型 TTS 异步任务 — 将 TTS 合成从 HTTP 请求移至 Celery 后台执行.
-
-优化目标：将 create_job 的 API 响应时间从 6~35s 降到 <1s。
-任务流程：
-1. 创建新 DB session，加载 job 记录
-2. 调用 CosyVoice 合成音频
-3. 下载音频并转存到自家 OSS
-4. 更新 job 的 audio_url
-5. 签名 URL 并提交到 MediaKit
-6. 更新 job 状态为 submitted
-7. 异常时标记 job 为 failed
-
-注意：使用 @shared_task 而非绑定到某个 celery_app 实例，
-确保任务能被 Worker 侧 celery_app 正确注册，同时 API 侧 send_task/apply_async 仍可正常调用。
-"""
-
-import io
-import logging
-from datetime import datetime, timezone
-from urllib.parse import urlparse
-
-from celery import shared_task
-
-logger = logging.getLogger(__name__)
-
-# MediaKit 预签名 URL 有效期（7天，秒），与 LipsyncService._sign_media_url 保持一致
-_MEDIAKIT_URL_TTL_SECONDS = 7 * 24 * 3600
-
-
-def _sign_media_url(url: str) -> str:
-    """对自家 OSS 私有桶 URL 重签长有效期预签名.
-
-    - 自家 OSS URL → 重签 7 天有效期
-    - 外部临时 URL → 原样透传
-    - 任何异常降级原样返回，不阻断主流程
-    """
-    if not url:
-        return url
-    try:
-        from packages.shared.storage import get_shared_storage_service
-
-        storage = get_shared_storage_service()
-        public_base = getattr(storage, "public_url", "")
-        if not isinstance(public_base, str) or not public_base:
-            return url
-        own_host = urlparse(public_base).netloc.lower()
-        host = urlparse(url).netloc.lower()
-        if not own_host or host != own_host:
-            return url
-        signed = storage.get_download_url(url, expires_seconds=_MEDIAKIT_URL_TTL_SECONDS)
-        return signed or url
-    except Exception as exc:  # noqa: BLE001
-        logger.warning("[lipsync_tts] URL 重签失败，原样返回: url_prefix=%s err=%s", url[:80], exc)
-        return url
-
-
-def _split_script_into_sentences(script_text: str) -> list[str]:
-    """按句号/问号/感叹号/分号/逗号/换行分句（与前端 SENTENCE_SPLIT_RE 一致）.
-
-    中文短视频文案习惯用「，」断小句（如"卖花的叫花无缺，卖姜的叫姜子牙"），
-    必须把逗号也纳入分隔符，否则多句文案会被识别成一整句，导致 B-roll 时间戳错位。
-    """
-    import re
-
-    text = (script_text or "").strip()
-    if not text:
-        return []
-    parts = re.split(r"[。！？!?？！;；,，\n\r]+", text)
-    return [p.strip() for p in parts if p.strip()]
-
-
-def _compute_sentence_timings(audio_data: bytes, script_text: str, total_duration: float) -> list[dict]:
-    """基于 TTS 音频的静音检测，精确计算每句文案的起止时间.
-
-    使用 ffmpeg silencedetect 检测静音段，将静音点与句子边界对齐。
-    比字数比例估算准确得多。
-
-    Args:
-        audio_data: TTS 音频二进制数据（MP3）
-        script_text: 文案全文
-        total_duration: 音频总时长（秒）
-
-    Returns:
-        list[{"index": int, "text": str, "start_time": float, "end_time": float}]
-    """
-    import re
-    import subprocess
-    import tempfile
-
-    sentences = _split_script_into_sentences(script_text)
-    if not sentences:
-        return []
-
-    # 写入临时音频文件
-    with tempfile.NamedTemporaryFile(suffix=".mp3", delete=False) as tmp:
-        tmp.write(audio_data)
-        tmp_path = tmp.name
-
-    try:
-        # 用 ffmpeg silencedetect 检测静音段
-        result = subprocess.run(
-            [
-                "ffmpeg",
-                "-i",
-                tmp_path,
-                "-af",
-                "silencedetect=noise=-25dB:d=0.3",
-                "-f",
-                "null",
-                "-",
-            ],
-            capture_output=True,
-            text=True,
-            timeout=30,
-        )
-        stderr = result.stderr or ""
-
-        # 解析静音结束时间点（silence_end: X.XXX）
-        silence_ends = []
-        for match in re.finditer(r"silence_end:\s*([\d.]+)", stderr):
-            t = float(match.group(1))
-            if 0 < t < total_duration:
-                silence_ends.append(t)
-
-        # 如果没有检测到足够的静音点，降级为字数比例估算
-        if len(silence_ends) < len(sentences) - 1:
-            logger.warning(
-                "[sentence_timings] 静音点不足(%d < %d)，降级为字数比例估算",
-                len(silence_ends),
-                len(sentences) - 1,
-            )
-            return _estimate_sentence_timings_by_chars(sentences, total_duration)
-
-        # 贪心匹配：N-1 个句子边界对应 N-1 个静音点
-        # 按时间均匀分布期望值，选择最近的静音点
-        n_boundaries = len(sentences) - 1
-        boundaries = []
-        used_indices = set()
-
-        for i in range(n_boundaries):
-            # 期望的边界位置（按句子数量均匀分布）
-            expected_pos = (i + 1) / len(sentences) * total_duration
-            # 找最近的未使用静音点
-            best_idx = None
-            best_dist = float("inf")
-            for j, t in enumerate(silence_ends):
-                if j in used_indices:
-                    continue
-                dist = abs(t - expected_pos)
-                if dist < best_dist:
-                    best_dist = dist
-                    best_idx = j
-            if best_idx is not None:
-                used_indices.add(best_idx)
-                boundaries.append(silence_ends[best_idx])
-
-        boundaries.sort()
-
-        # 构建 sentence_timings
-        timings = []
-        prev_end = 0.0
-        for i, sent in enumerate(sentences):
-            start = prev_end
-            end = boundaries[i] if i < len(boundaries) else total_duration
-            timings.append(
-                {
-                    "index": i,
-                    "text": sent,
-                    "start_time": round(start, 2),
-                    "end_time": round(end, 2),
-                }
-            )
-            prev_end = end
-
-        return timings
-
-    except Exception as exc:
-        logger.warning("[sentence_timings] 静音检测异常，降级为字数比例估算: %s", exc)
-        return _estimate_sentence_timings_by_chars(sentences, total_duration)
-    finally:
-        import os
-
-        try:
-            os.unlink(tmp_path)
-        except Exception:
-            pass
-
-
-def _estimate_sentence_timings_by_chars(sentences: list[str], total_duration: float) -> list[dict]:
-    """降级方案：按字数比例估算句子时间（与原前端逻辑一致）."""
-    if not sentences or total_duration <= 0:
-        return []
-    total_chars = sum(len(s.replace(r"\s", "")) for s in sentences)
-    if total_chars == 0:
-        return []
-
-    timings = []
-    acc = 0
-    for i, sent in enumerate(sentences):
-        chars = len(sent.replace(r"\s", ""))
-        start = (acc / total_chars) * total_duration
-        end = ((acc + chars) / total_chars) * total_duration
-        timings.append(
-            {
-                "index": i,
-                "text": sent,
-                "start_time": round(start, 2),
-                "end_time": round(end, 2),
-            }
-        )
-        acc += chars
-    return timings
-
-
-@shared_task(
-    bind=True,
-    name="lipsync_tts.synthesize_and_submit",
-    max_retries=5,  # 事务竞态重试3次（job not found）+ TTS偶发错误2次
-    default_retry_delay=30,
-    autoretry_for=(OSError, ConnectionError),  # 网络/连接错误自动重试
-    retry_backoff=True,
-    retry_backoff_max=30,
-    soft_time_limit=180,
-    time_limit=200,
-)
-def tts_synthesize_and_submit(
-    self,
-    job_id: str,
-    user_id: str,
-    voice_id: str,
-    script_text: str,
-    speed: float,
-    emotion: str,
-):
-    """异步执行 TTS 合成 + OSS 转存 + MediaKit 提交.
-
-    在 Celery worker 中运行，不阻塞 HTTP 请求。
-    """
-    from app.services.mediakit_client import MediaKitError, get_mediakit_client
-    from sqlalchemy.orm import Session as DBSession
-
-    from packages.adapters.sqlalchemy_impl.models import LipsyncJobModel
-    from packages.application.cosyvoice_service import CosyVoiceError, CosyVoiceService
-    from packages.shared.url_security import safe_download_bytes
-
-    # SessionLocal 获取：
-    # - API 容器：app.db.SessionLocal（环境变量完整，导入即建引擎）
-    # - Worker 容器：worker_app.db.SessionLocal（Worker 自己的 settings 初始化引擎）
-    # API 侧没有 worker_app 模块 → ImportError 直接回退；
-    # Worker 侧 app.db 会因缺少 API 专有环境变量抛 pydantic ValidationError，
-    # 此时也要回退到 worker_app.db。
-    try:
-        from worker_app.db import SessionLocal  # type: ignore
-    except Exception:  # noqa: BLE001
-        from app.db import SessionLocal  # type: ignore
-
-    db: DBSession = SessionLocal()
-    try:
-        job = (
-            db.query(LipsyncJobModel)
-            .filter(
-                LipsyncJobModel.id == job_id,
-                LipsyncJobModel.user_id == user_id,
-            )
-            .first()
-        )
-
-        if job is None:
-            # 事务竞态防御：API 在 commit 前投递了任务，worker 消费时事务尚未提交。
-            # Celery 内置 autoretry_for 不支持"业务条件重试"，这里手动 retry 3 次，
-            # 间隔递增（1s/3s/7s），让 API 事务有时间提交。
-            # max_retries 由 self.request(retries) 维护；默认 self.max_retries=3 由装饰器 soft_time_limit 下方指定。
-            retries = getattr(self.request, "retries", 0)
-            max_retries = 3
-            if retries < max_retries:
-                backoff = (2**retries) + (retries * 1)  # 1s, 3s, 7s
-                logger.warning(
-                    "[lipsync_tts] Job not found yet (retry %d/%d, backoff %ds): job_id=%s",
-                    retries + 1,
-                    max_retries,
-                    backoff,
-                    job_id,
-                )
-                self.db.close()
-                raise self.retry(countdown=backoff, max_retries=max_retries)
-            logger.error(
-                "[lipsync_tts] Job not found after %d retries, giving up: job_id=%s",
-                max_retries,
-                job_id,
-            )
-            return
-
-        # 已取消的任务不再处理
-        if job.status == "cancelled":
-            logger.info("[lipsync_tts] Job already cancelled, skipping: job_id=%s", job_id)
-            return
-
-        # 1. TTS 合成
-        logger.info(
-            "[lipsync_tts] 开始 TTS 合成: job_id=%s voice_id=%s text_len=%d speed=%.2f",
-            job_id,
-            voice_id,
-            len(script_text),
-            speed,
-        )
-        try:
-            cosyvoice = CosyVoiceService()
-            result = cosyvoice.submit_synthesize_task(
-                text=script_text,
-                voice_id=voice_id,
-                speed=speed,
-                emotion=emotion,
-            )
-        except CosyVoiceError as exc:
-            logger.error("[lipsync_tts] TTS 合成失败: job_id=%s err=%s", job_id, exc)
-            job.status = "failed"
-            job.error_message = f"TTS 合成失败: {exc}"
-            job.error_code = "TTSSynthesisFailed"
-            job.updated_at = datetime.now(timezone.utc)
-            db.commit()
-            return
-        except ValueError as exc:
-            logger.error("[lipsync_tts] TTS 参数错误: job_id=%s err=%s", job_id, exc)
-            job.status = "failed"
-            job.error_message = f"TTS 参数错误: {exc}"
-            job.error_code = "TTSInvalidParam"
-            job.updated_at = datetime.now(timezone.utc)
-            db.commit()
-            return
-
-        temp_url = result.get("audio_url", "")
-        if not temp_url:
-            logger.error("[lipsync_tts] TTS 未返回音频 URL: job_id=%s", job_id)
-            job.status = "failed"
-            job.error_message = "TTS 未返回音频 URL"
-            job.error_code = "TTSNoAudio"
-            job.updated_at = datetime.now(timezone.utc)
-            db.commit()
-            return
-
-        # 2. 下载 TTS 音频到内存（用于 2.5 静音检测；不转存自家 OSS，直接使用 CosyVoice 临时 URL）
-        audio_data: bytes | None = None
-        _st_tmp_path: str | None = None
-        try:
-            audio_data = safe_download_bytes(
-                temp_url,
-                purpose="lipsync_tts_audio",
-                allowed_mime_types={
-                    "audio/mpeg",
-                    "audio/mp3",
-                    "audio/wav",
-                    "audio/x-wav",  # CosyVoice 部分接口返回 audio/x-wav，与 audio/wav 等价（RIFF/WAVE）
-                    "audio/mp4",
-                    "audio/x-m4a",
-                },
-                timeout=60.0,
-            )
-            logger.info(
-                "[lipsync_tts] TTS 音频已下载到内存: job_id=%s size=%d",
-                job_id,
-                len(audio_data) if audio_data else 0,
-            )
-        except Exception as exc:
-            # 下载失败：audio_data 保持 None，2.5 静音检测会跳过；后续仍用 temp_url 提交 MediaKit
-            logger.warning(
-                "[lipsync_tts] TTS 音频下载失败，跳过静音检测，直接使用临时 URL 提交: job_id=%s err=%s",
-                job_id,
-                exc,
-            )
-        # TTS 音频使用 CosyVoice 临时 URL，跳过自家 OSS 转存（加速，步骤⑥）
-        job.audio_url = temp_url
-        logger.info("[lipsync_tts] TTS 音频使用 CosyVoice 临时 URL（跳过 OSS 转存）: job_id=%s", job_id)
-
-        db.commit()
-
-        # 2.5 计算精确句子时间戳（基于 TTS 音频静音检测）
-        # 直接复用步骤 2 已下载到内存的 audio_data，避免重新下载
-        import os as _os
-
-        try:
-            import subprocess as _sp
-            import tempfile as _tmpf
-
-            if not audio_data:
-                logger.warning("[lipsync_tts] 无音频数据，跳过句子时间戳计算: job_id=%s", job_id)
-            else:
-                # 写入临时文件供 ffprobe/ffmpeg 使用
-                with _tmpf.NamedTemporaryFile(suffix=".mp3", delete=False) as _atmp:
-                    _atmp.write(audio_data)
-                    _st_tmp_path = _atmp.name
-
-                # ffprobe 获取音频时长
-                _probe_result = _sp.run(
-                    [
-                        "ffprobe",
-                        "-v",
-                        "error",
-                        "-show_entries",
-                        "format=duration",
-                        "-of",
-                        "default=noprint_wrappers=1:nokey=1",
-                        _st_tmp_path,
-                    ],
-                    capture_output=True,
-                    text=True,
-                    timeout=10,
-                )
-                _audio_duration = float(_probe_result.stdout.strip()) if _probe_result.stdout.strip() else 0.0
-                logger.info(
-                    "[lipsync_tts] 音频时长探测: job_id=%s duration=%.2f probe_stdout=%s probe_stderr=%s",
-                    job_id,
-                    _audio_duration,
-                    _probe_result.stdout.strip()[:50],
-                    _probe_result.stderr.strip()[:100] if _probe_result.stderr else "",
-                )
-
-                if _audio_duration > 0:
-                    _timings = _compute_sentence_timings(audio_data, script_text, _audio_duration)
-                    if _timings:
-                        job.sentence_timings = _timings
-                        logger.info(
-                            "[lipsync_tts] 句子时间戳已计算: job_id=%s sentences=%d duration=%.1f",
-                            job_id,
-                            len(_timings),
-                            _audio_duration,
-                        )
-                    else:
-                        logger.warning("[lipsync_tts] 句子时间戳计算返回空结果: job_id=%s", job_id)
-                else:
-                    logger.warning(
-                        "[lipsync_tts] ffprobe 未获取到有效时长，跳过句子时间戳: job_id=%s stdout=%s stderr=%s",
-                        job_id,
-                        _probe_result.stdout.strip()[:100],
-                        _probe_result.stderr.strip()[:200] if _probe_result.stderr else "",
-                    )
-                db.commit()
-        except Exception as _st_err:
-            logger.warning(
-                "[lipsync_tts] 句子时间戳计算失败（不影响主流程）: job_id=%s err=%s", job_id, _st_err, exc_info=True
-            )
-        finally:
-            if _st_tmp_path:
-                try:
-                    _os.unlink(_st_tmp_path)
-                except Exception:
-                    pass
-
-        # 3. 签名 URL 并提交到 MediaKit（复用模块内 _sign_media_url，避免对 LipsyncService 的耦合）
-        audio_url = _sign_media_url(job.audio_url)
-        video_url = _sign_media_url(job.video_url)
-
-        client = get_mediakit_client()
-        try:
-            mk_result = client.submit_lipsync(
-                video_url=video_url,
-                audio_url=audio_url,
-                enable_video_loop=job.enable_video_loop,
-                client_token=job_id,
-            )
-            job.mediakit_task_id = mk_result["task_id"]
-            job.status = "submitted"
-            job.submitted_at = datetime.now(timezone.utc)
-            logger.info(
-                "[lipsync_tts] 已提交 MediaKit: job_id=%s task_id=%s",
-                job_id,
-                mk_result["task_id"],
-            )
-        except MediaKitError as exc:
-            job.status = "failed"
-            job.error_message = str(exc)
-            job.error_code = exc.code
-            logger.error("[lipsync_tts] 提交 MediaKit 失败: job_id=%s err=%s", job_id, exc)
-
-        db.commit()
-
-    except Exception:
-        logger.exception("[lipsync_tts] 未预期的异常: job_id=%s", job_id)
-        try:
-            job = db.query(LipsyncJobModel).filter(LipsyncJobModel.id == job_id).first()
-            if job and job.status not in ("cancelled", "failed", "completed"):
-                job.status = "failed"
-                job.error_message = "TTS 异步任务执行异常"
-                job.error_code = "AsyncTaskError"
-                job.updated_at = datetime.now(timezone.utc)
-                db.commit()
-        except Exception:
-            logger.exception("[lipsync_tts] 回写失败状态时异常: job_id=%s", job_id)
-    finally:
-        db.close()
-
-
-@shared_task(
-    name="lipsync_tts.persist_output_video",
-    max_retries=2,
-    default_retry_delay=30,
-)
-def persist_output_video_task(job_id: str, user_id: str, temp_url: str):
-    """异步转存对口型输出视频到自家 OSS（步骤⑦ — 将同步阻塞挪到后台，加速前端响应）.
-
-    - MediaKit 返回 completed 后先以 temp_url 回前端（前端可立即播放临时 URL）
-    - Celery 后台下载 temp_url 并转存 OSS，成功后更新 job.output_video_url 为永久 URL
-    - 失败则保留 temp_url，不阻断主流程
-    """
-
-    try:
-        from worker_app.db import SessionLocal  # type: ignore
-    except Exception:  # noqa: BLE001
-        from app.db import SessionLocal  # type: ignore
-
-    from packages.adapters.sqlalchemy_impl.models import LipsyncJobModel
-    from packages.shared.storage import get_shared_storage_service
-
-    db = SessionLocal()
-    try:
-        job = db.query(LipsyncJobModel).filter(LipsyncJobModel.id == job_id, LipsyncJobModel.user_id == user_id).first()
-        if job is None:
-            logger.error("[lipsync_tts.persist] Job not found: job_id=%s", job_id)
-            return
-
-        if not temp_url:
-            logger.warning("[lipsync_tts.persist] temp_url 为空，跳过转存: job_id=%s", job_id)
-            return
-
-        try:
-            import httpx
-
-            with httpx.Client(timeout=180.0, follow_redirects=True) as client:
-                resp = client.get(temp_url)
-                resp.raise_for_status()
-                data = resp.content
-
-            storage = get_shared_storage_service()
-            storage_key = f"lipsync-outputs/{user_id}/{job_id}.mp4"
-            permanent_url = storage.upload_file(io.BytesIO(data), storage_key, content_type="video/mp4")
-            # 对自家 OSS URL 重签 7 天有效期预签名，供前端播放
-            final_url = _sign_media_url(permanent_url) if permanent_url else temp_url
-            job.output_video_url = final_url
-            job.updated_at = datetime.now(timezone.utc)
-            db.commit()
-            logger.info("[lipsync_tts.persist] 输出视频已转存 OSS: job_id=%s key=%s", job_id, storage_key)
-        except Exception as exc:
-            logger.warning(
-                "[lipsync_tts.persist] 输出视频转存失败，保留临时 URL: job_id=%s err=%s",
-                job_id,
-                exc,
-            )
-    except Exception:
-        logger.exception("[lipsync_tts.persist] 未预期异常: job_id=%s", job_id)
-    finally:
-        db.close()

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

@@ -1,6 +1,6 @@
 /**
  * 成品 / 视频相关 API 函数
- * 后端实际接口：/videos（分页：page/page_size，返回 {items, total, page, page_size}）
+ * 后端实际接口：/videos
  */
 import apiClient from "../client"
 import type {
@@ -12,39 +12,16 @@ import type {
 } from "./types"
 import { mapVideoToProductItem } from "./utils"
 
-/** 分页列表响应（前端消费用） */
-export interface ProductListResult {
-  items: ProductItem[]
-  total: number
-  page: number
-  page_size: number
-}
-
-/**
- * 获取成品列表（分页）
- * @param params 分页与筛选参数：page 默认 1，page_size 默认 20
- */
-export const getProducts = async (params?: ProductListParams): Promise<ProductListResult> => {
-  const response = await apiClient.get("/videos", {
-    params: {
-      page: 1,
-      page_size: 20,
-      ...params,
-    },
-  })
-  const data = response.data as {
-    items?: VideoItem[]
-    total?: number
-    page?: number
-    page_size?: number
-  }
-  const items: VideoItem[] = Array.isArray(data?.items) ? data.items : []
-  return {
-    items: items.map(mapVideoToProductItem),
-    total: data.total ?? items.length,
-    page: data.page ?? params?.page ?? 1,
-    page_size: data.page_size ?? params?.page_size ?? 20,
-  }
+/** 获取成品列表（支持分页和筛选） */
+export const getProducts = async (params?: ProductListParams): Promise<ProductItem[]> => {
+  const response = await apiClient.get("/videos", { params })
+  const data = response.data
+  const videos: VideoItem[] = Array.isArray(data?.items)
+    ? data.items
+    : Array.isArray(data)
+      ? data
+      : []
+  return videos.map(mapVideoToProductItem)
 }
 
 /** 获取单个成品详情 */

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

@@ -1,11 +1,10 @@
 /**
- * AI数字人 — 主页面（v3 两步骤版）
+ * AI数字人 — 主页面（两步骤版）
  * 步骤1：出镜视频 / 配音库 / 文案
- * 步骤2：对口型预览（含插入画面）/ 标题配置 / 封面&生成
+ * 步骤2：插入画面 / 对口型预览 / 标题配置 / 封面&生成
  */
 import React, { useState, useCallback, useEffect, useRef } from "react"
 import { message } from "antd"
-import { useNavigate } from "react-router-dom"
 import "./AiAvatar.css"
 import { useAiAvatar } from "./hooks/useAiAvatar"
 import { PanelVideoSelector } from "./components/PanelVideoSelector"
@@ -22,25 +21,20 @@ import {
   createLipsyncJob,
   getLipsyncJob,
   submitRender,
-  getRenderJob,
-  generateRenderSmartCover,
+  generateSmartCover,
 } from "./api/aiAvatar"
-import { getOrCreateDefaultProject } from "@/api/projects"
-import type { RenderJob } from "./types"
 import {
   normalizeEmotion,
   buildTitleConfigPayload,
   buildCoverConfigPayload,
 } from "./utils/contract"
-import { renderTitleToPngDataUrl, getVideoResolution } from "./utils/titleCanvas"
 
 /** 面板折叠状态 */
 type PanelKey = "video" | "voice" | "script" | "lipsync" | "title" | "cover"
 
 const AiAvatarPage: React.FC = () => {
   const state = useAiAvatar()
-  const navigate = useNavigate()
-  const [currentStep, setCurrentStep] = useState<1 | 2>(1)
+  const [currentStep, setCurrentStep] = useState(1)
   const [collapsed, setCollapsed] = useState<Record<PanelKey, boolean>>({
     video: false,
     voice: false,
@@ -56,45 +50,35 @@ const AiAvatarPage: React.FC = () => {
     "generating",
   )
   const [lipsyncErrorMessage, setLipsyncErrorMessage] = useState("")
-  /* ── 渲染进度弹窗 ── */
-  const [showRenderModal, setShowRenderModal] = useState(false)
-  const [renderStatus, setRenderStatus] = useState<"generating" | "completed" | "failed">(
-    "generating",
-  )
-  const [renderProgress, setRenderProgress] = useState(0)
-  const [renderErrorMessage, setRenderErrorMessage] = useState("")
-  /* ── 当前渲染任务对象（轮询更新；用于封面区判断渲染是否完成） ── */
-  const [currentRenderJob, setCurrentRenderJob] = useState<RenderJob | null>(null)
+  /* ─ 智能封面加载态 ── */
+  const [smartCoverLoading, setSmartCoverLoading] = useState(false)
 
   /* ── 对口型轮询 ── */
   const lipsyncTimerRef = useRef<ReturnType<typeof setInterval> | null>(null)
-  /* ── 渲染进度轮询 ── */
-  const renderTimerRef = useRef<ReturnType<typeof setInterval> | null>(null)
 
   const togglePanel = useCallback((key: PanelKey) => {
     setCollapsed((prev) => ({ ...prev, [key]: !prev[key] }))
   }, [])
 
   /* ── 步骤切换 ── */
+  const canGoToStep2 = useCallback(() => {
+    return state.selectedVideo && state.selectedVoice && state.scriptText.trim()
+  }, [state.selectedVideo, state.selectedVoice, state.scriptText])
+
   const handleNextStep = useCallback(() => {
-    const missing: string[] = []
-    if (!state.selectedVideo) missing.push("出镜视频")
-    if (!state.selectedVoice) missing.push("配音")
-    if (!state.scriptText.trim()) missing.push("文案")
-    if (missing.length > 0) {
-      message.warning(`请先完成${missing.join("、")}`)
+    if (!canGoToStep2()) {
+      message.warning("请先完成出镜视频、配音和文案的选择")
       return
     }
     setCurrentStep(2)
-  }, [state.selectedVideo, state.selectedVoice, state.scriptText])
+  }, [canGoToStep2])
 
   const handlePrevStep = useCallback(() => {
     setCurrentStep(1)
   }, [])
 
-  /* ── 对口型 ── */
+  /* ── 对口型 ─ */
   const handleGenerateLipsync = useCallback(async () => {
-    // ② 缺项明确提示（#1809）：不再静默 return
     const video = state.selectedVideo
     const voice = state.selectedVoice
     const text = state.scriptText.trim()
@@ -107,12 +91,10 @@ const AiAvatarPage: React.FC = () => {
       return
     }
     try {
-      // 显示生成弹窗
       setShowLipsyncModal(true)
       setLipsyncStatus("generating")
       setLipsyncErrorMessage("")
 
-      // ① 先按素材 id 拿 file_url（#1809 补充：对齐后端新参数 video_url）
       console.log("[对口型] 开始生成:", {
         videoId: video.id,
         voiceId: voice.voice_id,
@@ -131,19 +113,20 @@ const AiAvatarPage: React.FC = () => {
         message.error("获取出镜视频播放地址失败，请重新选择素材")
         return
       }
-      // ② 模式A TTS直生：video_url + voice_id + script_text，语速/情绪英文枚举透传（#1822）
       const payload = {
         voice_id: voice.voice_id,
         script_text: state.scriptText,
         video_url: videoUrl,
-        speed: state.speed, // 语速 0.5~2.0
-        emotion: normalizeEmotion(state.emotion), // natural/excited/calm/friendly
+        speed: state.speed,
+        emotion: normalizeEmotion(state.emotion),
       }
       console.log("[对口型] createLipsyncJob 请求:", payload)
       const job = await createLipsyncJob(payload)
-      console.log("[对口型] createLipsyncJob 响应:", { id: job.id, status: job.status })
+      console.log("[对口型] createLipsyncJob 响应:", {
+        id: job.id,
+        status: job.status,
+      })
       state.setLipsyncJob(job)
-      // 开始轮询
       if (lipsyncTimerRef.current) clearInterval(lipsyncTimerRef.current)
       lipsyncTimerRef.current = setInterval(async () => {
         try {
@@ -182,7 +165,6 @@ const AiAvatarPage: React.FC = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [state.selectedVideo, state.selectedVoice, state.scriptText, state.speed, state.emotion])
 
-  // 取消对口型生成
   const handleCancelLipsync = useCallback(() => {
     if (lipsyncTimerRef.current) {
       clearInterval(lipsyncTimerRef.current)
@@ -193,15 +175,13 @@ const AiAvatarPage: React.FC = () => {
     setLipsyncErrorMessage("")
   }, [])
 
-  // 清理轮询
   useEffect(() => {
     return () => {
       if (lipsyncTimerRef.current) clearInterval(lipsyncTimerRef.current)
-      if (renderTimerRef.current) clearInterval(renderTimerRef.current)
     }
   }, [])
 
-  /* ── 生成视频（含实时进度轮询） ── */
+  /* ── 生成视频 ── */
   const handleGenerate = useCallback(async () => {
     if (!state.lipsyncJob || state.lipsyncJob.status !== "completed") {
       message.warning("请先生成对口型视频，待对口型完成后再提交渲染")
@@ -209,85 +189,15 @@ const AiAvatarPage: React.FC = () => {
     }
     state.setIsGenerating(true)
     try {
-      // 确保有 project_id（AI数字人入口独立，不在项目内，自动取默认项目；#1860 P0 bugfix）
-      const defaultProject = await getOrCreateDefaultProject()
-
-      // 用 Canvas 预渲染标题为 PNG dataURL（所见即所得，后端用 overlay 直接叠加）
-      let titleImageDataUrl: string | null = null
-      if (state.titleConfig.title?.trim()) {
-        try {
-          const res = await getVideoResolution(state.lipsyncJob.output_video_url || "")
-          titleImageDataUrl = renderTitleToPngDataUrl({
-            titleConfig: state.titleConfig,
-            videoWidth: res.width,
-            videoHeight: res.height,
-          })
-        } catch (canvasErr) {
-          console.warn("[渲染] 标题 Canvas 渲染失败，降级 drawtext:", canvasErr)
-          titleImageDataUrl = null
-        }
-      }
-
-      const job = await submitRender({
+      await submitRender({
         lipsync_job_id: state.lipsyncJob.id,
         script_id: state.script?.id,
-        project_id: defaultProject.id,
-        b_roll_segments: state.bRollSegments.map((seg) => ({
-          script_segment_index: seg.script_segment_index,
-          asset_url: seg.asset.file_url || "",
-          mode: seg.mode,
-          start_time: seg.start_time,
-          end_time: seg.end_time,
-          pip_position: seg.pip_position,
-          pip_scale: seg.pip_scale,
-        })) as never,
-        title_config: buildTitleConfigPayload(state.titleConfig, titleImageDataUrl),
-        // 封面不阻塞渲染：用户未选定封面时传空 dict，后端不生成封面；渲染完成后再单独抽帧
-        cover_config:
-          state.coverConfig.smart_cover_url ||
-          (state.coverConfig.upload_url && !state.coverConfig.upload_url.startsWith("blob:"))
-            ? buildCoverConfigPayload(state.coverConfig, state.coverConfig.smart_cover_url)
-            : {},
+        b_roll_segments: state.bRollSegments as never,
+        title_config: buildTitleConfigPayload(state.titleConfig),
+        cover_config: buildCoverConfigPayload(state.coverConfig, state.coverConfig.smart_cover_url),
+        resolution: state.resolution,
       })
-
-      // 打开渲染进度弹窗，启动轮询
-      setShowRenderModal(true)
-      setRenderStatus("generating")
-      setRenderProgress(job.progress ?? 0)
-      setRenderErrorMessage("")
-      setCurrentRenderJob(job as RenderJob)
-
-      if (renderTimerRef.current) clearInterval(renderTimerRef.current)
-      renderTimerRef.current = setInterval(async () => {
-        try {
-          const updated = await getRenderJob(job.id)
-          setRenderProgress(updated.progress ?? 0)
-          setCurrentRenderJob(updated)
-          if (updated.status === "completed") {
-            if (renderTimerRef.current) clearInterval(renderTimerRef.current)
-            renderTimerRef.current = null
-            setRenderStatus("completed")
-            // 渲染完成后：如果后端已返回封面（用户预上传/预设）则同步到前端；
-            // 否则不自动设置封面，由用户在封面区点击"智能获取封面"主动抽帧（步骤③④）
-            if (updated.output_cover_url) {
-              state.setCoverConfig((prev) => ({
-                ...prev,
-                mode: "auto_frame",
-                smart_cover_url: updated.output_cover_url,
-                thumbnail_url: updated.output_cover_url,
-              }))
-            }
-            message.success("视频已生成并保存到成片库")
-          } else if (updated.status === "failed") {
-            if (renderTimerRef.current) clearInterval(renderTimerRef.current)
-            renderTimerRef.current = null
-            setRenderStatus("failed")
-            setRenderErrorMessage(updated.error_message || "渲染失败，请重试")
-          }
-        } catch (pollErr) {
-          console.error("[渲染] 轮询失败:", pollErr)
-        }
-      }, 3000)
+      message.success("渲染任务已提交，可在视频管理中查看进度")
     } catch (err) {
       console.error("渲染任务提交失败:", err)
       message.error(err instanceof Error ? err.message : "渲染任务提交失败，请重试")
@@ -295,62 +205,46 @@ const AiAvatarPage: React.FC = () => {
       state.setIsGenerating(false)
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [state.lipsyncJob, state.script, state.bRollSegments, state.titleConfig, state.coverConfig])
+  }, [
+    state.lipsyncJob,
+    state.script,
+    state.bRollSegments,
+    state.titleConfig,
+    state.coverConfig,
+    state.resolution,
+  ])
 
-  /* ── 关闭渲染进度弹窗 ── */
-  const handleCancelRender = useCallback(() => {
-    if (renderTimerRef.current) {
-      clearInterval(renderTimerRef.current)
-      renderTimerRef.current = null
+  /* ── 智能封面 ── */
+  const handleSmartCover = useCallback(async () => {
+    const videoUrl = state.lipsyncJob?.output_video_url
+    if (state.lipsyncJob?.status !== "completed" || !videoUrl) {
+      message.warning("请先生成对口型视频，完成后再智能获取封面")
+      return
     }
-    setShowRenderModal(false)
-    setRenderStatus("generating")
-    setRenderProgress(0)
-    setRenderErrorMessage("")
-  }, [])
-
-  /* ── 智能封面：从最终渲染成片抽帧（POST /renders/{id}/smart-cover，步骤③④） ── */
-  const handleGenerateRenderSmartCover = useCallback(
-    async (renderId: string): Promise<{ cover_url: string; message?: string }> => {
-      try {
-        const res = await generateRenderSmartCover(renderId)
-        if (res.cover_url) {
-          state.setCoverConfig((prev) => ({
-            ...prev,
-            mode: "auto_frame",
-            smart_cover_url: res.cover_url,
-            thumbnail_url: res.cover_url,
-          }))
-          message.success("智能封面已生成")
-          return { cover_url: res.cover_url }
-        }
-        const errMsg = res.message || "智能封面生成失败，请稍后重试"
-        message.error(errMsg)
-        return { cover_url: "", message: errMsg }
-      } catch (err) {
-        console.error("智能封面生成失败:", err)
-        const errMsg = err instanceof Error ? err.message : "智能封面生成失败，请重试"
-        message.error(errMsg)
-        return { cover_url: "", message: errMsg }
+    setSmartCoverLoading(true)
+    try {
+      const res = await generateSmartCover(videoUrl, 5)
+      if (res.cover_url) {
+        state.setCoverConfig((prev) => ({
+          ...prev,
+          mode: "auto_frame",
+          smart_cover_url: res.cover_url,
+          thumbnail_url: res.cover_url,
+        }))
+        message.success("智能封面已生成")
+      } else {
+        message.error(res.message || "智能封面生成失败，请稍后重试")
       }
-    },
-    // state.setCoverConfig 是 zustand action 引用稳定，eslint 不需要检查
+    } catch (err) {
+      console.error("智能封面生成失败:", err)
+      message.error(err instanceof Error ? err.message : "智能封面生成失败，请重试")
+    } finally {
+      setSmartCoverLoading(false)
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [],
-  )
+  }, [state.lipsyncJob])
 
   /* ── 配置汇总 ── */
-  const coverStatus: "not_ready" | "pending" | "selected" = (() => {
-    if (
-      state.coverConfig.smart_cover_url ||
-      state.coverConfig.thumbnail_url ||
-      (state.coverConfig.upload_url && !state.coverConfig.upload_url.startsWith("blob:"))
-    ) {
-      return "selected"
-    }
-    if (currentRenderJob?.status === "completed") return "pending"
-    return "not_ready"
-  })()
   const summary = {
     videoName: state.selectedVideo?.name || null,
     voiceName: state.selectedVoice?.name || null,
@@ -358,31 +252,34 @@ const AiAvatarPage: React.FC = () => {
     lipsyncStatus: state.lipsyncJob?.status || null,
     brollCount: state.bRollSegments.length,
     hasTitle: state.titleConfig.title.length > 0,
-    coverStatus,
+    hasCover: state.coverConfig.enabled,
   }
 
   return (
     <div className="aa-page">
       <div className="aa-page-header">
-        <h1>AI数字人</h1>
+        <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 className="aa-steps">
+        <div className={`aa-step ${currentStep >= 1 ? "active" : ""}`}>
+          <span className="aa-step__number">1</span>
+          <span className="aa-step__label">视频 / 配音 / 文案</span>
+        </div>
+        <div className="aa-step__connector" />
+        <div className={`aa-step ${currentStep >= 2 ? "active" : ""}`}>
+          <span className="aa-step__number">2</span>
+          <span className="aa-step__label">对口型 / 标题 / 封面 / 生成</span>
+        </div>
       </div>
 
       <div className="aa-page-body">
-        {/* ════ 步骤 1：出镜视频 / 配音库 / 文案 ════ */}
+        {/* ════ 步骤 1：出镜视频 / 配音库 / 文案 ═══ */}
         {currentStep === 1 && (
           <>
-            {/* 面板1：出镜视频 */}
-            <div className={`aa-panel aa-panel--s1${collapsed.video ? " collapsed" : ""}`}>
+            {/* 面板 1：出镜视频 */}
+            <div className={`aa-panel${collapsed.video ? " collapsed" : ""}`}>
               <div className="aa-panel__header" onClick={() => togglePanel("video")}>
                 <span className="aa-panel__title">出镜视频</span>
                 <span className="aa-panel__toggle">▼</span>
@@ -392,12 +289,13 @@ const AiAvatarPage: React.FC = () => {
                   selectedVideo={state.selectedVideo}
                   onSelectVideo={() => state.setShowAssetPicker(true)}
                   onRemoveVideo={state.removeVideo}
+                  titleConfig={state.titleConfig}
                 />
               </div>
             </div>
 
-            {/* 面板2：配音库 */}
-            <div className={`aa-panel aa-panel--s1${collapsed.voice ? " collapsed" : ""}`}>
+            {/* 面板 2：配音库 */}
+            <div className={`aa-panel${collapsed.voice ? " collapsed" : ""}`}>
               <div className="aa-panel__header" onClick={() => togglePanel("voice")}>
                 <span className="aa-panel__title">配音库</span>
                 <span className="aa-panel__toggle">▼</span>
@@ -418,10 +316,10 @@ const AiAvatarPage: React.FC = () => {
               </div>
             </div>
 
-            {/* 面板3：文案 */}
-            <div className={`aa-panel aa-panel--s1-wide${collapsed.script ? " collapsed" : ""}`}>
+            {/* 面板 3：文案 */}
+            <div className={`aa-panel${collapsed.script ? " collapsed" : ""}`}>
               <div className="aa-panel__header" onClick={() => togglePanel("script")}>
-                <span className="aa-panel__title">文案 & 对口型</span>
+                <span className="aa-panel__title">文案</span>
                 <span className="aa-panel__toggle">▼</span>
               </div>
               <div className="aa-panel__body">
@@ -430,21 +328,23 @@ const AiAvatarPage: React.FC = () => {
                   onScriptTextChange={state.setScriptText}
                   onOpenScriptModal={() => state.setShowScriptModal(true)}
                 />
-                <div className="aa-step-btn-row">
-                  <button type="button" className="aa-btn aa-btn--primary" onClick={handleNextStep}>
-                    下一步 →
-                  </button>
-                </div>
               </div>
             </div>
+
+            {/* 步骤 1 底部按钮 */}
+            <div className="aa-step-actions">
+              <button className="aa-btn aa-btn--primary" onClick={handleNextStep}>
+                下一步
+              </button>
+            </div>
           </>
         )}
 
-        {/* ════ 步骤 2：对口型预览（含插入画面）/ 标题配置 / 封面&生成 ════ */}
+        {/* ════ 步骤 2：插入画面 / 对口型预览 / 标题配置 / 封面&生成 ═══ */}
         {currentStep === 2 && (
           <>
-            {/* 面板：对口型预览 + 插入画面 */}
-            <div className={`aa-panel aa-panel--s2-wide${collapsed.lipsync ? " collapsed" : ""}`}>
+            {/* 面板 4：插入画面 & 对口型预览 */}
+            <div className={`aa-panel${collapsed.lipsync ? " collapsed" : ""}`}>
               <div className="aa-panel__header" onClick={() => togglePanel("lipsync")}>
                 <span className="aa-panel__title">对口型预览</span>
                 <span className="aa-panel__toggle">▼</span>
@@ -456,19 +356,12 @@ const AiAvatarPage: React.FC = () => {
                   bRollSegments={state.bRollSegments}
                   onOpenBRollModal={() => state.setShowBRollModal(true)}
                   onRemoveBRoll={state.removeBRollSegment}
-                  titleConfig={state.titleConfig}
-                  onTitlePositionChange={(pos) => state.updateTitleConfig(pos)}
                 />
-                <div className="aa-step-btn-row">
-                  <button type="button" className="aa-btn" onClick={handlePrevStep}>
-                    ← 上一步
-                  </button>
-                </div>
               </div>
             </div>
 
-            {/* 面板4：标题配置 */}
-            <div className={`aa-panel aa-panel--s2${collapsed.title ? " collapsed" : ""}`}>
+            {/* 面板 5：标题配置 */}
+            <div className={`aa-panel${collapsed.title ? " collapsed" : ""}`}>
               <div className="aa-panel__header" onClick={() => togglePanel("title")}>
                 <span className="aa-panel__title">标题配置</span>
                 <span className="aa-panel__toggle">▼</span>
@@ -481,8 +374,8 @@ const AiAvatarPage: React.FC = () => {
               </div>
             </div>
 
-            {/* 面板5：封面 & 生成 */}
-            <div className={`aa-panel aa-panel--s2${collapsed.cover ? " collapsed" : ""}`}>
+            {/* 面板 6：封面 & 生成 */}
+            <div className={`aa-panel${collapsed.cover ? " collapsed" : ""}`}>
               <div className="aa-panel__header" onClick={() => togglePanel("cover")}>
                 <span className="aa-panel__title">封面 & 生成</span>
                 <span className="aa-panel__toggle">▼</span>
@@ -491,11 +384,14 @@ const AiAvatarPage: React.FC = () => {
                 <PanelCoverAndGenerate
                   coverConfig={state.coverConfig}
                   onCoverConfigChange={(partial) =>
-                    state.setCoverConfig((prev) => ({ ...prev, ...partial }))
+                    state.setCoverConfig((prev) => ({
+                      ...prev,
+                      ...partial,
+                    }))
                   }
-                  titleConfig={state.titleConfig}
-                  renderJob={currentRenderJob}
-                  onGenerateRenderSmartCover={handleGenerateRenderSmartCover}
+                  onSmartCover={handleSmartCover}
+                  smartCoverLoading={smartCoverLoading}
+                  canSmartCover={state.lipsyncJob?.status === "completed"}
                   resolution={state.resolution}
                   onResolutionChange={state.setResolution}
                   isGenerating={state.isGenerating}
@@ -504,6 +400,13 @@ const AiAvatarPage: React.FC = () => {
                 />
               </div>
             </div>
+
+            {/* 步骤 2 底部按钮 */}
+            <div className="aa-step-actions">
+              <button className="aa-btn" onClick={handlePrevStep}>
+                上一步
+              </button>
+            </div>
           </>
         )}
       </div>
@@ -533,9 +436,8 @@ const AiAvatarPage: React.FC = () => {
           open={state.showBRollModal}
           onClose={() => state.setShowBRollModal(false)}
           existingSegments={state.bRollSegments}
-          scriptText={state.lipsyncJob?.script_text || state.scriptText}
+          scriptText={state.scriptText}
           outputDuration={state.lipsyncJob?.output_duration ?? 0}
-          sentenceTimings={state.lipsyncJob?.sentence_timings}
           onConfirm={state.addBRollSegment}
           onRemove={state.removeBRollSegment}
         />
@@ -563,10 +465,22 @@ const AiAvatarPage: React.FC = () => {
               {lipsyncStatus === "generating" && (
                 <>
                   <div className="aa-lipsync-spinner" />
-                  <div style={{ marginTop: 20, fontSize: 15, color: "#1a1a2e" }}>
+                  <div
+                    style={{
+                      marginTop: 20,
+                      fontSize: 15,
+                      color: "#1a1a2e",
+                    }}
+                  >
                     对口型视频生成中…
                   </div>
-                  <div style={{ marginTop: 8, fontSize: 13, color: "#8c8ca1" }}>
+                  <div
+                    style={{
+                      marginTop: 8,
+                      fontSize: 13,
+                      color: "#8c8ca1",
+                    }}
+                  >
                     请勿关闭页面，完成后将自动提示
                   </div>
                 </>
@@ -574,7 +488,13 @@ const AiAvatarPage: React.FC = () => {
               {lipsyncStatus === "completed" && (
                 <>
                   <div style={{ fontSize: 48 }}>✅</div>
-                  <div style={{ marginTop: 16, fontSize: 15, color: "#1a1a2e" }}>
+                  <div
+                    style={{
+                      marginTop: 16,
+                      fontSize: 15,
+                      color: "#1a1a2e",
+                    }}
+                  >
                     对口型视频生成完成
                   </div>
                 </>
@@ -582,11 +502,23 @@ const AiAvatarPage: React.FC = () => {
               {lipsyncStatus === "failed" && (
                 <>
                   <div style={{ fontSize: 48 }}>❌</div>
-                  <div style={{ marginTop: 16, fontSize: 15, color: "#1a1a2e" }}>
+                  <div
+                    style={{
+                      marginTop: 16,
+                      fontSize: 15,
+                      color: "#1a1a2e",
+                    }}
+                  >
                     对口型生成失败
                   </div>
                   {lipsyncErrorMessage && (
-                    <div style={{ marginTop: 8, fontSize: 13, color: "#ff4d4f" }}>
+                    <div
+                      style={{
+                        marginTop: 8,
+                        fontSize: 13,
+                        color: "#ff4d4f",
+                      }}
+                    >
                       {lipsyncErrorMessage}
                     </div>
                   )}
@@ -608,112 +540,6 @@ const AiAvatarPage: React.FC = () => {
           </div>
         </div>
       )}
-
-      {/* 渲染进度弹窗 */}
-      {showRenderModal && (
-        <div className="aa-modal-overlay">
-          <div className="aa-modal" onClick={(e) => e.stopPropagation()}>
-            <div className="aa-modal__header">
-              <span className="aa-modal__title">视频渲染</span>
-              <button className="aa-modal__close" onClick={handleCancelRender}>
-                ✕
-              </button>
-            </div>
-            <div
-              className="aa-modal__body"
-              style={{
-                display: "flex",
-                flexDirection: "column",
-                alignItems: "center",
-                padding: "40px 20px",
-              }}
-            >
-              {renderStatus === "generating" && (
-                <>
-                  <div className="aa-lipsync-spinner" />
-                  <div style={{ marginTop: 20, fontSize: 15, color: "#1a1a2e" }}>
-                    正在生成视频，请稍后
-                  </div>
-                  <div
-                    style={{
-                      marginTop: 16,
-                      fontSize: 32,
-                      fontWeight: 700,
-                      color: "#1890ff",
-                    }}
-                  >
-                    {renderProgress}%
-                  </div>
-                  <div
-                    style={{
-                      marginTop: 12,
-                      width: "80%",
-                      height: 8,
-                      backgroundColor: "#f0f0f0",
-                      borderRadius: 4,
-                      overflow: "hidden",
-                    }}
-                  >
-                    <div
-                      style={{
-                        width: `${renderProgress}%`,
-                        height: "100%",
-                        backgroundColor: "#1890ff",
-                        borderRadius: 4,
-                        transition: "width 0.5s ease",
-                      }}
-                    />
-                  </div>
-                  <div style={{ marginTop: 12, fontSize: 13, color: "#8c8ca1" }}>
-                    请勿关闭页面，完成后将自动提示
-                  </div>
-                </>
-              )}
-              {renderStatus === "completed" && (
-                <>
-                  <div style={{ fontSize: 48 }}>✅</div>
-                  <div style={{ marginTop: 16, fontSize: 15, color: "#1a1a2e" }}>
-                    视频已保存到成片库
-                  </div>
-                  <button
-                    className="aa-btn"
-                    style={{ marginTop: 16 }}
-                    onClick={() => {
-                      setShowRenderModal(false)
-                      navigate("/app/products")
-                    }}
-                  >
-                    📁 查看成片
-                  </button>
-                </>
-              )}
-              {renderStatus === "failed" && (
-                <>
-                  <div style={{ fontSize: 48 }}>❌</div>
-                  <div style={{ marginTop: 16, fontSize: 15, color: "#1a1a2e" }}>视频渲染失败</div>
-                  {renderErrorMessage && (
-                    <div style={{ marginTop: 8, fontSize: 13, color: "#ff4d4f" }}>
-                      {renderErrorMessage}
-                    </div>
-                  )}
-                </>
-              )}
-            </div>
-            <div className="aa-modal__footer">
-              {renderStatus === "generating" && (
-                <button className="aa-btn aa-btn--danger" onClick={handleCancelRender}>
-                  关闭窗口
-                </button>
-              )}
-              {renderStatus !== "generating" && (
-                <button className="aa-btn" onClick={handleCancelRender}>
-                  关闭
-                </button>
-              )}
-            </div>
-          </div>
-        </div>
-      )}
     </div>
   )
 }

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

@@ -54,7 +54,19 @@ export const createLipsyncJob = async (data: {
 }
 
 export const getLipsyncJob = async (id: string): Promise<LipsyncJob> => {
-  const response = await apiClient.get<LipsyncJob>(`/lipsync/jobs/${id}`, { timeout: 60000 })
+  const response = await apiClient.get<LipsyncJob>(`/lipsync/jobs/${id}`)
+  return response.data
+}
+
+/* ── 智能封面（MediaKit 抽帧 + 质量评分选最佳帧，独立于渲染任务） ── */
+export const generateSmartCover = async (
+  video_url: string,
+  max_frames = 5,
+): Promise<{ cover_url: string; status: string; message: string }> => {
+  const response = await apiClient.post<{ cover_url: string; status: string; message: string }>(
+    "/ai-avatar/render/smart-cover",
+    { video_url, max_frames },
+  )
   return response.data
 }
 
@@ -66,30 +78,17 @@ export const submitRender = async (data: {
   title_config?: Record<string, unknown>
   cover_config?: Record<string, unknown>
   project_id?: string
+  resolution?: string
 }): Promise<RenderJob> => {
-  // title_config 内可含 title_image_dataurl（前端 Canvas 渲染的 PNG dataURL）
   const response = await apiClient.post<RenderJob>("/ai-avatar/render", data)
   return response.data
 }
 
 export const getRenderJob = async (jobId: string): Promise<RenderJob> => {
-  const response = await apiClient.get<RenderJob>(`/ai-avatar/render/${jobId}`, { timeout: 60000 })
+  const response = await apiClient.get<RenderJob>(`/ai-avatar/render/${jobId}`)
   return response.data
 }
 
 export const cancelRenderJob = async (jobId: string): Promise<void> => {
   await apiClient.post(`/ai-avatar/render/${jobId}/cancel`)
 }
-
-/* ── 从最终渲染成片智能抽封面（POST /ai-avatar/renders/{job_id}/smart-cover） ── */
-export const generateRenderSmartCover = async (
-  jobId: string,
-): 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 },
-  )
-  return response.data
-}

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

@@ -5,12 +5,12 @@
  * - 左侧：先选素材库（video 库）→ 再选该库视频素材（已被其他 segment 使用的素材
  *   标灰 + "已选择" 遮罩，pointer-events:none 防重复选择）
  * - 右侧：文案句子列表（点选对应段落，替代原数字索引框）/ 全屏 or 画中画 / 四角位置+大小
- *   （开始/结束时间来自后端精确句子时间戳，基于 TTS 音频静音检测）
+ *   （开始/结束时间已删除，按句子字数占比 × 口播总时长自动估算）
  * - 底部：已配置的画面插入列表（可删除）
  */
 import React, { useEffect, useMemo, useState } from "react"
 import { getAssets, getAssetLibraries, type AssetItem, type AssetLibraryItem } from "@/api/assets"
-import type { BRollSegment, BRollInsertMode, PipPosition, SentenceTiming } from "../types"
+import type { BRollSegment, BRollInsertMode, PipPosition } from "../types"
 import { splitScriptIntoSentences, type ScriptSentence } from "../utils/sentences"
 
 interface ModalBRollEditorProps {
@@ -18,12 +18,10 @@ interface ModalBRollEditorProps {
   onClose: () => void
   /** 当前已有的 B-roll segments（用于标灰已选素材） */
   existingSegments: BRollSegment[]
-  /** 文案全文（优先使用对口型时锁定的 scriptText） */
+  /** 当前文案全文（用于分句） */
   scriptText: string
-  /** 对口型成片总时长（秒） */
+  /** 对口型成片总时长（秒），用于时间自动估算 */
   outputDuration: number
-  /** 后端精确句子时间戳（来自 lipsyncJob.sentence_timings） */
-  sentenceTimings?: SentenceTiming[] | null
   onConfirm: (segment: BRollSegment) => void
   onRemove: (id: string) => void
 }
@@ -45,8 +43,7 @@ const ModalBRollEditor: React.FC<ModalBRollEditorProps> = ({
   onClose,
   existingSegments,
   scriptText,
-  outputDuration: _outputDuration,
-  sentenceTimings,
+  outputDuration,
   onConfirm,
   onRemove,
 }) => {
@@ -65,10 +62,10 @@ const ModalBRollEditor: React.FC<ModalBRollEditorProps> = ({
   const [pipPosition, setPipPosition] = useState<PipPosition>("top-right")
   const [pipScale, setPipScale] = useState(0.3)
 
-  /** 文案分句（优先使用后端精确时间戳，降级为字数比例估算） */
+  /** 文案分句（⑤） */
   const sentences = useMemo(
-    () => splitScriptIntoSentences(scriptText, sentenceTimings, _outputDuration),
-    [scriptText, sentenceTimings, _outputDuration],
+    () => splitScriptIntoSentences(scriptText, outputDuration),
+    [scriptText, outputDuration],
   )
 
   /** 已被现有 segments 占用的素材 id 集合（标灰、禁止重复选择） */
@@ -145,7 +142,7 @@ const ModalBRollEditor: React.FC<ModalBRollEditorProps> = ({
     setSelectedAsset(asset)
   }
 
-  /** 确认添加一段 B-roll（⑥ 时间取所选句子的精确起止，后端静音检测 / 前端字数比例降级） */
+  /** 确认添加一段 B-roll（⑥ 时间取所选句子的估算起止） */
   const handleConfirm = () => {
     if (!selectedAsset || !selectedSentence) return
     const startTime = selectedSentence.startTime
@@ -267,9 +264,11 @@ const ModalBRollEditor: React.FC<ModalBRollEditorProps> = ({
                           >
                             <span className="aa-sentence-item__idx">{sent.index + 1}</span>
                             <span className="aa-sentence-item__text">{sent.text}</span>
-                            <span className="aa-sentence-item__time">
-                              {sent.startTime.toFixed(1)}-{sent.endTime.toFixed(1)}s
-                            </span>
+                            {outputDuration > 0 && (
+                              <span className="aa-sentence-item__time">
+                                {sent.startTime.toFixed(1)}-{sent.endTime.toFixed(1)}s
+                              </span>
+                            )}
                           </button>
                         )
                       })}
@@ -350,7 +349,7 @@ const ModalBRollEditor: React.FC<ModalBRollEditorProps> = ({
                           selectedSentence.endTime,
                           selectedSentence.startTime + 0.5,
                         ).toFixed(1)}
-                        s
+                        s （按字数自动估算）
                       </div>
                     </>
                   ) : (

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

@@ -1,30 +1,26 @@
 /**
- * AI数字人 — 面板5：分辨率/配置摘要/生成按钮/封面
- * v3 调整（步骤③④）：
- * - 布局顺序：分辨率 → 配置摘要卡片 → 🔘「开始生成视频」按钮 → （渲染完成后）封面区域
- * - 渲染未完成时封面区域显示占位态，按钮 disabled
- * - 「智能获取封面」从最终成片抽帧（调用 POST /renders/{id}/smart-cover），不再依赖 lipsync 状态
- * - 修复点 2 次 bug：内部维护 smartCoverLoading，不依赖外层异步 state 更新
+ * AI数字人 — 面板5：封面 & 生成
+ * - 竖屏 9:16 封面预览（从视频截取 / 自定义上传）
+ * - 分辨率选择（720p / 1080p / 4K）
+ * - 配置汇总卡片（出镜视频/音色/文案/对口型/B-roll/标题/封面）
+ * - 渐变紫色生成按钮
  *
  * 注意：v3 已删除"画面插入模式"，本面板不包含该选项。
  */
-import React, { useMemo, useRef, useState } from "react"
-import type { AiAvatarCoverConfig, AiAvatarTitleConfig, RenderJob } from "../types"
+import React, { useRef } from "react"
+import type { AiAvatarCoverConfig } from "../types"
 
 interface PanelCoverAndGenerateProps {
   coverConfig: AiAvatarCoverConfig
-  titleConfig: AiAvatarTitleConfig
   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
+  /** 智能获取封面（MediaKit 选帧） */
+  onSmartCover: () => void
+  smartCoverLoading: boolean
+  canSmartCover: boolean
   /** 配置汇总信息 */
   summary: {
     videoName: string | null
@@ -33,8 +29,7 @@ interface PanelCoverAndGenerateProps {
     lipsyncStatus: string | null
     brollCount: number
     hasTitle: boolean
-    /** 封面状态：'not_ready'(视频未生成) / 'pending'(视频生成了但未选) / 'selected'(已选) */
-    coverStatus: "not_ready" | "pending" | "selected"
+    hasCover: boolean
   }
 }
 
@@ -52,32 +47,19 @@ const LIPSYNC_STATUS_LABEL: Record<string, { text: string; cls: string }> = {
   failed: { text: "失败", cls: "aa-status-badge--failed" },
 }
 
-/** 字体名 → CSS font-family 映射（与后端 drawtext 对齐） */
-const FONT_FAMILY_MAP: Record<string, string> = {
-  思源黑体: "'Noto Sans SC', 'Source Han Sans SC', 'PingFang SC', 'Microsoft YaHei', sans-serif",
-  思源宋体: "'Noto Serif SC', 'Source Han Serif SC', 'SimSun', serif",
-  楷体: "KaiTi, 'STKaiti', serif",
-  黑体: "'Heiti SC', 'SimHei', 'Microsoft YaHei', sans-serif",
-}
-
-const getFontFamily = (font: string): string => FONT_FAMILY_MAP[font] || FONT_FAMILY_MAP["思源黑体"]
-
 const PanelCoverAndGenerate: React.FC<PanelCoverAndGenerateProps> = ({
   coverConfig,
-  titleConfig,
   onCoverConfigChange,
   resolution,
   onResolutionChange,
   isGenerating,
   onGenerate,
-  renderJob,
-  onGenerateRenderSmartCover,
-  onUploadCover,
+  onSmartCover,
+  smartCoverLoading,
+  canSmartCover,
   summary,
 }) => {
   const uploadInputRef = useRef<HTMLInputElement>(null)
-  // 内部维护智能封面加载态（修复点 2 次 bug：不依赖外层异步 setState 顺序）
-  const [smartCoverLoading, setSmartCoverLoading] = useState(false)
 
   /** 自定义上传封面 */
   const handleUploadClick = () => {
@@ -87,118 +69,60 @@ const PanelCoverAndGenerate: React.FC<PanelCoverAndGenerateProps> = ({
   const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0]
     if (!file) return
-    if (onUploadCover) {
-      onUploadCover(file)
-    } else {
-      // 本地预览兜底（实际上传由父级处理；blob URL 仅作本地展示）
-      const url = URL.createObjectURL(file)
-      onCoverConfigChange({ mode: "upload", upload_url: url, thumbnail_url: url })
-    }
+    // 本地预览：生成 object URL（实际上传由父级/后端链路处理）
+    const url = URL.createObjectURL(file)
+    onCoverConfigChange({ mode: "upload", upload_url: url, thumbnail_url: url })
+    // 允许重复选择同一文件
     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) {
-        onCoverConfigChange({
-          mode: "auto_frame",
-          smart_cover_url: res.cover_url,
-          thumbnail_url: res.cover_url,
-        })
-      } else {
-        // 失败由父组件 message 提示，这里不重复弹窗
-        console.warn("[智能封面] 返回空 cover_url:", res.message)
-      }
-    } catch (err) {
-      console.error("[智能封面] 调用失败:", err)
-    } finally {
-      setSmartCoverLoading(false)
-    }
+  /** 智能获取封面（调后端 MediaKit 抽帧评分选最佳帧，#1822） */
+  const handleSmartCover = () => {
+    onCoverConfigChange({ mode: "auto_frame" })
+    onSmartCover()
   }
 
   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 showTitleOverlay =
-    hasCoverImage && !smartCoverLoading && titleConfig.title.trim().length > 0
-
-  /** 计算标题叠加层的 inline 样式 */
-  const titleOverlayStyle = useMemo<React.CSSProperties>(() => {
-    const style: React.CSSProperties = {
-      position: "absolute",
-      left: "50%",
-      width: "90%",
-      transform: "translateX(-50%)",
-      textAlign: "center",
-      boxSizing: "border-box",
-      padding: "0 4px",
-      wordBreak: "break-word",
-      whiteSpace: "pre-wrap",
-      color: titleConfig.color || "#ffffff",
-      fontSize: `${(titleConfig.size || 48) * 0.35}px`,
-      fontFamily: getFontFamily(titleConfig.font),
-      fontWeight: titleConfig.bold ? "bold" : "normal",
-      fontStyle: titleConfig.italic ? "italic" : "normal",
-      lineHeight: 1.3,
-      pointerEvents: "none",
-    }
-
-    const pos = titleConfig.position || "bottom"
-    if (pos === "top") {
-      style.top = "40px"
-    } else if (pos === "center") {
-      style.top = "50%"
-      style.transform = "translate(-50%, -50%)"
-    } else if (pos === "custom" && titleConfig.pos_x != null && titleConfig.pos_y != null) {
-      style.left = `${titleConfig.pos_x}%`
-      style.top = `${titleConfig.pos_y}%`
-      style.transform = "translate(-50%, -50%)"
-    } else {
-      style.bottom = "40px"
-    }
-
-    if (titleConfig.stroke) {
-      const strokeWidth = Math.max(1, Math.round(titleConfig.size / 18))
-      ;(style as React.CSSProperties)["WebkitTextStroke"] = `${strokeWidth}px rgba(0,0,0,0.75)`
-      style.textShadow = "none"
-    } else if (titleConfig.shadow) {
-      style.textShadow = "0 2px 8px rgba(0,0,0,0.7), 0 0 2px rgba(0,0,0,0.5)"
-    } else {
-      style.textShadow = "none"
-    }
-
-    return style
-  }, [titleConfig])
-
-  /** 封面区占位文字 */
-  const coverPlaceholder = isRenderCompleted ? "暂无封面" : "视频生成后可选择封面"
-
-  /** 封面摘要状态文本 */
-  const coverSummaryNode = (() => {
-    if (summary.coverStatus === "selected") {
-      return <span className="aa-config-summary__value">已选择</span>
-    }
-    if (summary.coverStatus === "pending") {
-      return <span className="aa-config-summary__value">待选择</span>
-    }
-    return <span className="aa-config-summary__empty">生成视频后可选</span>
-  })()
 
   return (
     <div className="aa-cover-generate">
+      {/* 封面预览（竖屏 9:16） */}
+      <div className="aa-cover-preview">
+        {coverConfig.thumbnail_url ? (
+          <img src={coverConfig.thumbnail_url} alt="封面预览" />
+        ) : (
+          <span className="aa-cover-preview__placeholder">暂无封面</span>
+        )}
+      </div>
+
+      <div className="aa-cover-actions">
+        <button
+          type="button"
+          className={`aa-btn aa-btn--ghost${coverConfig.mode === "auto_frame" ? " active" : ""}`}
+          onClick={handleSmartCover}
+          disabled={smartCoverLoading || !canSmartCover}
+          title={canSmartCover ? "基于对口型成片智能选帧" : "请先完成对口型生成"}
+        >
+          {smartCoverLoading ? "⏳ 智能选帧中…" : "🎬 智能获取封面"}
+        </button>
+        <button
+          type="button"
+          className={`aa-btn aa-btn--ghost${coverConfig.mode === "upload" ? " active" : ""}`}
+          onClick={handleUploadClick}
+        >
+          📷 自定义上传
+        </button>
+        <input
+          ref={uploadInputRef}
+          type="file"
+          accept="image/*"
+          style={{ display: "none" }}
+          onChange={handleFileChange}
+        />
+      </div>
+
       {/* 分辨率选择 */}
       <div className="aa-form-field">
         <label className="aa-label">分辨率</label>
@@ -206,7 +130,6 @@ const PanelCoverAndGenerate: React.FC<PanelCoverAndGenerateProps> = ({
           className="aa-select"
           value={resolution}
           onChange={(e) => onResolutionChange(e.target.value)}
-          disabled={isGenerating}
         >
           {RESOLUTION_OPTIONS.map((opt) => (
             <option key={opt.value} value={opt.value}>
@@ -267,7 +190,11 @@ const PanelCoverAndGenerate: React.FC<PanelCoverAndGenerateProps> = ({
           </div>
           <div className="aa-config-summary__row">
             <span>封面</span>
-            {coverSummaryNode}
+            {summary.hasCover ? (
+              <span className="aa-config-summary__value">已开启</span>
+            ) : (
+              <span className="aa-config-summary__empty">未配置</span>
+            )}
           </div>
         </div>
 
@@ -285,60 +212,6 @@ const PanelCoverAndGenerate: React.FC<PanelCoverAndGenerateProps> = ({
             请先完成对口型生成
           </div>
         )}
-        {isGenerating && (
-          <div style={{ marginTop: 8, fontSize: 11, color: "#8c8ca1", textAlign: "center" }}>
-            视频生成中，请稍候…
-          </div>
-        )}
-      </div>
-
-      {/* 封面区域（视频生成后才激活；步骤③④要求：按钮在封面上方，完成后再显示封面区） */}
-      <div className="aa-cover-section" style={{ marginTop: 16 }}>
-        <div className="aa-label" style={{ marginBottom: 8 }}>
-          封面
-        </div>
-        {/* 封面预览（竖屏 9:16） */}
-        <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>}
-          {showTitleOverlay && (
-            <div style={titleOverlayStyle} aria-hidden="true">
-              {titleConfig.title}
-            </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>
     </div>
   )

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

@@ -1,10 +1,8 @@
 /**
  * AI数字人 — 对口型预览面板（步骤2用）
  * B-roll 画面插入 + 对口型视频预览 + 生成/重新生成按钮
- * v3.1: 预览容器按 1/2 缩放、标题实时叠加预览
  */
-import React, { useRef } from "react"
-import type { LipsyncJob, BRollSegment, AiAvatarTitleConfig } from "../types"
+import type { LipsyncJob, BRollSegment } from "../types"
 
 interface PanelLipsyncPreviewProps {
   lipsyncJob: LipsyncJob | null
@@ -12,10 +10,6 @@ interface PanelLipsyncPreviewProps {
   bRollSegments: BRollSegment[]
   onOpenBRollModal: () => void
   onRemoveBRoll: (id: string) => void
-  /** 标题配置（实时叠加预览用） */
-  titleConfig?: AiAvatarTitleConfig
-  /** 标题位置变更回调（拖拽结束时调用，发送百分比坐标 + position:"custom"） */
-  onTitlePositionChange?: (pos: { pos_x: number; pos_y: number; position: string }) => void
 }
 
 const BROLL_MODE_LABEL: Record<BRollSegment["mode"], string> = {
@@ -35,12 +29,7 @@ export function PanelLipsyncPreview({
   bRollSegments,
   onOpenBRollModal,
   onRemoveBRoll,
-  titleConfig,
-  onTitlePositionChange,
 }: PanelLipsyncPreviewProps) {
-  const titleDragRef = useRef<HTMLDivElement>(null)
-  const draggingTitleRef = useRef(false)
-  const previewContainerRef = useRef<HTMLDivElement>(null)
   const isGenerating = lipsyncJob?.status === "pending" || lipsyncJob?.status === "processing"
   const isDone = lipsyncJob?.status === "completed"
   const isFailed = lipsyncJob?.status === "failed"
@@ -52,75 +41,8 @@ export function PanelLipsyncPreview({
         ? "排队中…"
         : "对口型生成中…"
 
-  /** 标题叠加样式 */
-  const titleOverlayStyle: React.CSSProperties | null = titleConfig?.title
-    ? {
-        position: "absolute",
-        color: titleConfig.color || "#ffffff",
-        fontFamily: titleConfig.font || "思源黑体",
-        fontSize: `${(titleConfig.size || 48) * 0.35}px`,
-        fontWeight: titleConfig.bold ? 700 : 400,
-        fontStyle: titleConfig.italic ? "italic" : "normal",
-        textAlign: "center",
-        width: "90%",
-        padding: "4px 8px",
-        textShadow: titleConfig.shadow ? "0 2px 4px rgba(0,0,0,0.8)" : undefined,
-        WebkitTextStroke: titleConfig.stroke ? "1.5px #000" : undefined,
-        ...(titleConfig.position === "custom" &&
-        titleConfig.pos_x != null &&
-        titleConfig.pos_y != null
-          ? {
-              left: `${titleConfig.pos_x}%`,
-              top: `${titleConfig.pos_y}%`,
-              transform: "translateX(-50%) translateY(-50%)",
-            }
-          : titleConfig.position === "top"
-            ? { left: "50%", top: 8, transform: "translateX(-50%)" }
-            : titleConfig.position === "bottom"
-              ? { left: "50%", bottom: 8, transform: "translateX(-50%)" }
-              : { left: "50%", top: "50%", transform: "translateX(-50%) translateY(-50%)" }),
-      }
-    : null
-
-  const handleTitlePointerDown = (e: React.PointerEvent<HTMLDivElement>) => {
-    if (!onTitlePositionChange || !previewContainerRef.current) return
-    e.preventDefault()
-    e.stopPropagation()
-    ;(e.target as Element).setPointerCapture(e.pointerId)
-    draggingTitleRef.current = true
-    ;(e.currentTarget as HTMLDivElement).style.cursor = "grabbing"
-  }
-  const handleTitlePointerMove = (e: React.PointerEvent<HTMLDivElement>) => {
-    if (!draggingTitleRef.current || !previewContainerRef.current) return
-    e.preventDefault()
-    e.stopPropagation()
-    if (titleDragRef.current) {
-      const rect = previewContainerRef.current.getBoundingClientRect()
-      const relX = Math.max(0, Math.min(rect.width, e.clientX - rect.left))
-      const relY = Math.max(0, Math.min(rect.height, e.clientY - rect.top))
-      const xpct = (relX / rect.width) * 100
-      const ypct = (relY / rect.height) * 100
-      titleDragRef.current.style.left = `${xpct}%`
-      titleDragRef.current.style.top = `${ypct}%`
-    }
-  }
-  const handleTitlePointerUp = (e: React.PointerEvent<HTMLDivElement>) => {
-    if (!draggingTitleRef.current) return
-    draggingTitleRef.current = false
-    if (onTitlePositionChange && previewContainerRef.current) {
-      const rect = previewContainerRef.current.getBoundingClientRect()
-      const relX = Math.max(0, Math.min(rect.width, e.clientX - rect.left))
-      const relY = Math.max(0, Math.min(rect.height, e.clientY - rect.top))
-      // 发送百分比坐标（0-100），与后端 drawtext 百分比表达式对齐
-      const xpct = Math.round((relX / rect.width) * 1000) / 10
-      const ypct = Math.round((relY / rect.height) * 1000) / 10
-      onTitlePositionChange({ pos_x: xpct, pos_y: ypct, position: "custom" })
-    }
-    ;(e.currentTarget as HTMLDivElement).style.cursor = "grab"
-  }
-
   return (
-    <div className="aa-script-lipsync">
+    <div className="aa-lipsync-preview-panel">
       {/* ── B-roll 画面 ── */}
       <div className="aa-lipsync-section">
         <div className="aa-lipsync-section__title">
@@ -183,36 +105,13 @@ export function PanelLipsyncPreview({
         )}
       </div>
 
-      {/* ── 对口型预览（v3.1: 缩放1/2 + 标题叠加） ─ */}
+      {/* ── 对口型预览 ─ */}
       <div className="aa-lipsync-section">
         <div className="aa-lipsync-section__title">对口型预览</div>
 
-        <div className="aa-lipsync-preview" ref={previewContainerRef}>
+        <div className="aa-lipsync-preview">
           {isDone && lipsyncJob?.output_video_url ? (
-            <div style={{ position: "relative", width: "100%", height: "100%" }}>
-              <video src={lipsyncJob.output_video_url} controls />
-              {titleOverlayStyle && (
-                <div
-                  ref={titleDragRef}
-                  style={{
-                    ...titleOverlayStyle,
-                    cursor: onTitlePositionChange ? "grab" : "default",
-                    pointerEvents: onTitlePositionChange ? "auto" : "none",
-                  }}
-                  onPointerDown={handleTitlePointerDown}
-                  onPointerMove={handleTitlePointerMove}
-                  onPointerUp={handleTitlePointerUp}
-                  onPointerCancel={handleTitlePointerUp}
-                >
-                  {titleConfig!.title.split(/[/／]/).map((part, i) => (
-                    <span key={i}>
-                      {i > 0 && <br />}
-                      {part}
-                    </span>
-                  ))}
-                </div>
-              )}
-            </div>
+            <video src={lipsyncJob.output_video_url} controls />
           ) : isGenerating ? (
             <div style={{ width: "80%", textAlign: "center", color: "#fff" }}>
               <div style={{ fontSize: 13, marginBottom: 8 }}>

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

@@ -20,7 +20,7 @@ export function PanelScript({
   const [scriptTab, setScriptTab] = useState<ScriptTab>("library")
 
   return (
-    <div className="aa-script-lipsync">
+    <div className="aa-script-panel">
       {/* ── Tab 切换 ── */}
       <div className="aa-script-tabs">
         <button

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

@@ -2,16 +2,17 @@
  * AI数字人 — 出镜视频选择面板
  * - 未选视频：虚线上传区，点击打开素材库弹窗
  * - 已选视频：竖屏 9:16 预览播放器 + 视频信息卡片 + 移除按钮
- *
- * 注意：本面板只展示原始素材视频，不叠加标题（标题在对口型预览和最终成片上展示）
  */
 import type { AssetItem } from "@/api/assets"
+import type { AiAvatarTitleConfig } from "../types"
+import { getFontFamily } from "@/pages/generate/constants"
 
 export interface PanelVideoSelectorProps {
   selectedVideo: AssetItem | null
   /** 触发打开素材库弹窗 */
   onSelectVideo: () => void
   onRemoveVideo: () => void
+  titleConfig?: AiAvatarTitleConfig
 }
 
 /** 格式化时长（秒 → mm:ss） */
@@ -26,6 +27,7 @@ export function PanelVideoSelector({
   selectedVideo,
   onSelectVideo,
   onRemoveVideo,
+  titleConfig,
 }: PanelVideoSelectorProps) {
   /* 未选视频：虚线上传区，点击打开素材库弹窗 */
   if (!selectedVideo) {
@@ -55,13 +57,42 @@ export function PanelVideoSelector({
 
   return (
     <div>
-      {/* 竖屏 9:16 视频预览播放器（纯素材预览，不叠加标题） */}
-      <div className="aa-video-preview">
+      {/* 竖屏 9:16 视频预览播放器 + 标题实时预览 */}
+      <div className="aa-video-preview" style={{ position: "relative" }}>
         {fileUrl ? (
           <video src={fileUrl} poster={selectedVideo.thumbnail_url} controls playsInline />
         ) : (
           <div className="aa-video-preview__placeholder">视频暂不可预览</div>
         )}
+        {titleConfig?.title && (
+          <div
+            style={{
+              position: "absolute",
+              left: "50%",
+              transform: "translateX(-50%)",
+              ...(titleConfig.position === "top"
+                ? { top: "10%" }
+                : titleConfig.position === "bottom"
+                  ? { bottom: "10%" }
+                  : { top: "50%", transform: "translate(-50%, -50%)" }),
+              fontSize: Math.max(titleConfig.size, 32),
+              fontFamily: getFontFamily(titleConfig.font),
+              color: titleConfig.color,
+              fontWeight: titleConfig.bold ? 700 : 400,
+              fontStyle: titleConfig.italic ? "italic" : "normal",
+              textShadow: "0 2px 4px rgba(0,0,0,0.5)",
+              WebkitTextStroke: "2px #000",
+              pointerEvents: "none",
+              zIndex: 10,
+              maxWidth: "90%",
+              textAlign: "center",
+              whiteSpace: "pre-wrap",
+              lineHeight: 1.3,
+            }}
+          >
+            {titleConfig.title}
+          </div>
+        )}
       </div>
 
       {/* 视频信息卡片：文件名 / 时长 / 分辨率 */}

apps/web/src/pages/ai-avatar/types.ts

@@ -44,23 +44,12 @@ export interface LipsyncJob {
   status: LipsyncStatus
   progress: number
   output_video_url: string | null
-  /** 对口型成片总时长（秒），后端返回 */
-  script_text: string
+  /** 对口型成片总时长（秒），后端返回；用于 B-roll 时间自动估算（#1809 ⑥） */
   output_duration?: number
-  /** 精确句子时间戳（后端基于 TTS 音频静音检测计算） */
-  sentence_timings?: SentenceTiming[] | null
   error_message: string | null
   created_at: string
 }
 
-/* ── 句子时间戳（后端精确计算） ── */
-export interface SentenceTiming {
-  index: number
-  text: string
-  start_time: number
-  end_time: number
-}
-
 /* ── B-roll 画面插入 ── */
 export type BRollInsertMode = "fullscreen" | "pip"
 export type PipPosition = "top-left" | "top-right" | "bottom-left" | "bottom-right"
@@ -88,7 +77,7 @@ export interface AiAvatarTitleConfig {
   shadow: boolean
   color: string
   auto_subtitle: boolean
-  /** 自定义位置坐标（position=custom 时生效，百分比 0-100） */
+  /** 自定义位置坐标（position=custom 时生效，像素） */
   pos_x?: number
   pos_y?: number
 }
@@ -112,7 +101,6 @@ export interface RenderJob {
   status: RenderStatus
   progress: number
   output_video_url: string | null
-  output_cover_url: string | null
   error_message: string | null
   created_at: string
 }
@@ -122,7 +110,7 @@ export const DEFAULT_TITLE_CONFIG: AiAvatarTitleConfig = {
   title: "",
   position: "bottom",
   font: "思源黑体",
-  size: 48,
+  size: 28,
   bold: true,
   italic: false,
   stroke: false,

apps/web/src/pages/ai-avatar/utils/contract.ts

@@ -28,13 +28,10 @@ export function normalizeEmotion(raw: string | undefined | null): VoiceEmotion {
  * 后端真实字段：text(或content)、font(或font_preset)、font_size(或size)、
  * font_color(或color，可传 #RRGGBB)、position(top/center/bottom/custom)、
  * enabled、bold、stroke{enabled,width,color}、shadow{enabled,color,offset_x,offset_y}、
- * pos_x/pos_y(custom 时)、title_image_dataurl（前端 Canvas 渲染的 PNG dataURL，WYSIWYG 路径优先）。
+ * pos_x/pos_y(custom 时)。
  * 口播标题默认 position=bottom（不传后端会默认 top 跑到画面顶部）。
  */
-export function buildTitleConfigPayload(
-  cfg: AiAvatarTitleConfig,
-  titleImageDataUrl?: string | null,
-): Record<string, unknown> {
+export function buildTitleConfigPayload(cfg: AiAvatarTitleConfig): Record<string, unknown> {
   const text = (cfg.title || "").trim()
   if (!text) return {}
   const position = cfg.position || "bottom"
@@ -42,7 +39,7 @@ export function buildTitleConfigPayload(
     text,
     enabled: true,
     font: cfg.font || "思源黑体",
-    font_size: Math.round(cfg.size) || 48,
+    font_size: Math.round(cfg.size) || 36,
     font_color: cfg.color || "#ffffff",
     position,
     bold: !!cfg.bold,
@@ -56,10 +53,6 @@ export function buildTitleConfigPayload(
     payload.pos_x = cfg.pos_x
     payload.pos_y = cfg.pos_y
   }
-  // 前端 Canvas 渲染好的 PNG dataURL（所见即所得，后端优先 overlay 此图片图层）
-  if (titleImageDataUrl) {
-    payload.title_image_dataurl = titleImageDataUrl
-  }
   return payload
 }
 
@@ -74,14 +67,9 @@ export function buildCoverConfigPayload(
     // build_cover_extract_command 读取 timestamp（截帧秒数）
     timestamp: cfg.frame_time || 0,
   }
-  // 智能封面 URL（后端字段名为 url/imageUrl/cover_url 都兼容，优先 url）
-  if (smartCoverUrl) {
-    payload.url = smartCoverUrl
-    payload.cover_url = smartCoverUrl
-  }
+  if (smartCoverUrl) payload.cover_url = smartCoverUrl
   // 自定义上传：blob: 本地预览地址无法给后端，仅 OSS URL 可用
   if (cfg.mode === "upload" && cfg.upload_url && !cfg.upload_url.startsWith("blob:")) {
-    payload.url = cfg.upload_url
     payload.upload_url = cfg.upload_url
   }
   return payload

apps/web/src/pages/ai-avatar/utils/sentences.ts

@@ -1,10 +1,5 @@
 /**
- * AI数字人 — 文案分句 & B-roll 时间计算
- *
- * 数据来源优先级：
- *   1. 后端 sentence_timings（基于 TTS 音频静音检测，精确到句子边界）—— 直接使用，不重新分句
- *   2. 后端 output_duration（最终渲染视频时长） + 本地分句 —— 按字数比例估算
- *   3. 两者都没有（对口型还在生成中）—— 返回分句文本但 startTime/endTime 全部 0，等数据到位重算
+ * AI数字人 — 文案分句 & B-roll 时间自动估算（#1809 ⑤⑥）
  */
 
 export interface ScriptSentence {
@@ -16,67 +11,25 @@ export interface ScriptSentence {
   charCount: number
   /** 累计起始字数（用于时间估算） */
   startChar: number
-  /** 对口型视频内起始时间（秒）——后端精确值或前端估算 */
+  /** 估算的对口型视频内起始时间（秒） */
   startTime: number
-  /** 对口型视频内结束时间（秒）——后端精确值或前端估算 */
+  /** 估算的对口型视频内结束时间（秒） */
   endTime: number
 }
 
-/** 句子分隔符：中英文句号/问号/感叹号/分号/逗号/换行（覆盖中文短视频常用断句） */
-const SENTENCE_SPLIT_RE = /[。！？!?？！;；,，\n\r]+/
-
 /**
- * 分句并计算每句的起止时间。
- *
- * @param sentenceTimings 后端返回的精确句子时间戳（来自 lipsync_job.sentence_timings）。
- *   非空时直接按后端返回的句子列表渲染，不再本地分句（避免前后端分句不一致导致时间错位）。
- * @param outputDuration  最终视频时长（秒）。对口型预览阶段可能为 0，此时降级估算只能给 0。
+ * 按句号/问号/感叹号/分号/换行分句（兼容中英文标点）。
+ * 空文案返回空数组。时间按「该句字数 ÷ 全文总字数 × 口播总时长」线性估算。
  */
 export function splitScriptIntoSentences(
   scriptText: string,
-  sentenceTimings?:
-    { index?: number; text?: string; start_time: number; end_time: number }[] | null,
-  outputDuration: number = 0,
+  outputDuration: number,
 ): ScriptSentence[] {
   const text = (scriptText || "").trim()
   if (!text) return []
 
-  // 1. 后端返回了 sentence_timings：校验通过就直接用，跳过本地分句
-  //    校验条件放宽：只要是数组、至少1条、每条 start_time/end_time 是数字即可
-  //    （不再强制要求条数相等——后端静音检测可能按停顿切出更多/更少边界，
-  //    比如文案用逗号连写时本地只分1句、后端按停顿切4句，后端的切法才是对的）
-  if (Array.isArray(sentenceTimings) && sentenceTimings.length > 0) {
-    const valid = sentenceTimings.every(
-      (t) =>
-        t &&
-        typeof t.start_time === "number" &&
-        typeof t.end_time === "number" &&
-        isFinite(t.start_time) &&
-        isFinite(t.end_time) &&
-        t.end_time >= t.start_time,
-    )
-    if (valid) {
-      let accChar = 0
-      return sentenceTimings.map((t, i) => {
-        const sentenceText = (t.text || "").trim() || `句子${i + 1}`
-        const charCount = sentenceText.replace(/\s/g, "").length
-        const sentence: ScriptSentence = {
-          index: typeof t.index === "number" ? t.index : i,
-          text: sentenceText,
-          charCount,
-          startChar: accChar,
-          startTime: round1(t.start_time),
-          endTime: round1(t.end_time),
-        }
-        accChar += charCount
-        return sentence
-      })
-    }
-  }
-
-  // 2. 本地分句 + 按字数比例估算（降级路径）
   const rawParts = text
-    .split(SENTENCE_SPLIT_RE)
+    .split(/[。！？!?；;\n\r]+/)
     .map((part) => part.trim())
     .filter((part) => part.length > 0)
 

apps/web/src/pages/ai-avatar/utils/titleCanvas.ts

@@ -1,174 +0,0 @@
-/**
- * AI数字人 — 标题 Canvas 渲染工具
- *
- * 把标题按前端预览的 HTML/CSS 效果画到透明背景 PNG 上（与视频同分辨率），
- * 以 dataURL 形式传给后端，后端用 FFmpeg overlay 直接叠加图层，
- * 彻底解决前端 HTML/CSS 预览 ≠ FFmpeg drawtext 成片的 WYSIWYG 问题。
- */
-import type { AiAvatarTitleConfig } from "../types"
-
-export interface RenderTitlePngOptions {
-  /** 标题配置 */
-  titleConfig: AiAvatarTitleConfig
-  /** 视频宽度（像素），默认 720 */
-  videoWidth?: number
-  /** 视频高度（像素），默认 1280 */
-  videoHeight?: number
-}
-
-/**
- * 将标题渲染为透明背景 PNG 的 dataURL（data:image/png;base64,...）
- * Canvas 尺寸与视频一致，保证叠加时 1:1 像素对齐。
- *
- * 标题为空时返回 null。
- */
-export function renderTitleToPngDataUrl(opts: RenderTitlePngOptions): string | null {
-  const { titleConfig, videoWidth = 720, videoHeight = 1280 } = opts
-  if (!titleConfig) return null
-  const rawTitle = (titleConfig.title || "").trim()
-  if (!rawTitle) return null
-
-  // 按 / 或 ／ 分割为多行
-  const lines = rawTitle
-    .split(/[/／]/)
-    .map((l) => l.trim())
-    .filter((l) => l.length > 0)
-  if (lines.length === 0) return null
-
-  const canvas = document.createElement("canvas")
-  canvas.width = videoWidth
-  canvas.height = videoHeight
-  const ctx = canvas.getContext("2d")
-  if (!ctx) return null
-
-  const size = Math.max(12, Math.round(titleConfig.size || 48))
-  const bold = !!titleConfig.bold
-  const italic = !!titleConfig.italic
-  const color = titleConfig.color || "#ffffff"
-  const stroke = !!titleConfig.stroke
-  const shadow = !!titleConfig.shadow
-
-  // 字体族 fallback 链：优先中文字体
-  const fontFamily =
-    '"Noto Sans CJK SC","Source Han Sans CN","PingFang SC","Microsoft YaHei",sans-serif'
-  const fontParts: string[] = []
-  if (italic) fontParts.push("italic")
-  if (bold) fontParts.push("bold")
-  fontParts.push(`${size}px`, fontFamily)
-  ctx.font = fontParts.join(" ")
-  ctx.fillStyle = color
-  ctx.textAlign = "center"
-  ctx.textBaseline = "middle"
-
-  // 阴影（shadow=true 时开启）
-  if (shadow) {
-    ctx.shadowColor = "rgba(0,0,0,0.8)"
-    ctx.shadowBlur = 4
-    ctx.shadowOffsetX = 0
-    ctx.shadowOffsetY = 2
-  }
-
-  // 位置计算：与 PanelLipsyncPreview 的 CSS 对齐
-  // 预览用 top/bottom 8px padding + transform translateX(-50%) 居中；
-  // 这里画到整尺寸 canvas，padding 按比例放大到全分辨率（预览缩放 0.35x 时 8px ≈ 23px 全尺寸，
-  // 为更贴近原 CSS 16px 安全边距，用 16px 作为内边距）。
-  const PAD = 16
-  let centerX = videoWidth / 2
-  const position = titleConfig.position || "bottom"
-  const lineGap = size * 1.2
-  const totalTextH = lines.length * lineGap - (lineGap - size) // 所有行的总高度
-  // 文本块顶部 y（textBaseline=middle 时首行基线）
-  let firstLineY: number
-  if (
-    position === "custom" &&
-    typeof titleConfig.pos_x === "number" &&
-    typeof titleConfig.pos_y === "number"
-  ) {
-    centerX = (Math.max(0, Math.min(100, titleConfig.pos_x)) / 100) * videoWidth
-    const centerY = (Math.max(0, Math.min(100, titleConfig.pos_y)) / 100) * videoHeight
-    firstLineY = centerY - totalTextH / 2 + size / 2
-  } else if (position === "top") {
-    // 顶部：y = size/2 + PAD
-    firstLineY = size / 2 + PAD
-  } else if (position === "center") {
-    firstLineY = videoHeight / 2 - totalTextH / 2 + size / 2
-  } else {
-    // bottom（默认）
-    firstLineY = videoHeight - totalTextH - PAD + size / 2
-  }
-
-  // 描边参数（stroke=true 或 bold 默认细描边模拟粗体时都画；
-  // 注意：浏览器原生 bold 已经是粗体 glyph，Canvas 这里对 stroke=true 才加黑描边，
-  // 与预览 CSS 的 WebkitTextStroke 保持一致，不对 bold 自动加描边避免双粗）。
-  const doStroke = stroke
-  // 逐行绘制
-  lines.forEach((line, idx) => {
-    const y = firstLineY + idx * lineGap
-    if (doStroke) {
-      const prevShadowColor = ctx.shadowColor
-      const prevShadowBlur = ctx.shadowBlur
-      // 描边不要带阴影（避免黑色描边发虚）
-      ctx.shadowColor = "rgba(0,0,0,0)"
-      ctx.shadowBlur = 0
-      ctx.lineWidth = Math.max(2, size * 0.06)
-      ctx.strokeStyle = "#000000"
-      ctx.lineJoin = "round"
-      ctx.strokeText(line, centerX, y)
-      // 恢复阴影
-      if (shadow) {
-        ctx.shadowColor = "rgba(0,0,0,0.8)"
-        ctx.shadowBlur = 4
-      } else {
-        ctx.shadowColor = prevShadowColor
-        ctx.shadowBlur = prevShadowBlur
-      }
-    }
-    ctx.fillText(line, centerX, y)
-  })
-
-  try {
-    return canvas.toDataURL("image/png")
-  } catch {
-    return null
-  }
-}
-
-/**
- * 获取视频真实分辨率（HTMLVideoElement + loadedmetadata，超时 3 秒兜底 720×1280）。
- */
-export function getVideoResolution(
-  videoUrl: string,
-  timeoutMs = 3000,
-): Promise<{ width: number; height: number }> {
-  return new Promise((resolve) => {
-    if (!videoUrl) {
-      resolve({ width: 720, height: 1280 })
-      return
-    }
-    const video = document.createElement("video")
-    video.preload = "metadata"
-    video.muted = true
-    video.playsInline = true
-    video.crossOrigin = "anonymous"
-    let settled = false
-    const done = (w: number, h: number) => {
-      if (settled) return
-      settled = true
-      video.removeAttribute("src")
-      video.load()
-      resolve({ width: w, height: h })
-    }
-    const timer = window.setTimeout(() => done(720, 1280), timeoutMs)
-    video.onloadedmetadata = () => {
-      window.clearTimeout(timer)
-      const w = video.videoWidth || 720
-      const h = video.videoHeight || 1280
-      done(w, h)
-    }
-    video.onerror = () => {
-      window.clearTimeout(timer)
-      done(720, 1280)
-    }
-    video.src = videoUrl
-  })
-}

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

@@ -1,22 +1,17 @@
 /**
  * 成片库页面 — V21 设计系统
- * 卡片网格布局，支持视频内联播放/下载/分享、批量操作、筛选、无限滚动分页
+ * 卡片网格布局，支持视频内联播放/下载/分享、批量操作、筛选
  *
  * 主组件仅保留 Hook 组装与整体布局
- * 列表查询 → hooks/useProductList（useInfiniteQuery 分页）
+ * 列表查询 → hooks/useProductList
  * 操作逻辑 → hooks/useProductActions
  * 筛选栏 → components/ProductFilterBar
  * 批量操作栏 → components/ProductBatchBar
  * 空状态 → components/ProductEmptyState
  * 产品卡片 → components/ProductCard（内联视频播放）
  */
-import React, { useEffect, useRef } from "react"
-import {
-  VideoCameraOutlined,
-  DownloadOutlined,
-  ReloadOutlined,
-  LoadingOutlined,
-} from "@ant-design/icons"
+import React from "react"
+import { VideoCameraOutlined, DownloadOutlined, ReloadOutlined } from "@ant-design/icons"
 import { Button } from "@/components/ui"
 import { ProductCard } from "./components/ProductCard"
 import { ProductFilterBar } from "./components/ProductFilterBar"
@@ -29,13 +24,11 @@ import "./products.css"
 
 const ProductLibrary: React.FC = () => {
   const {
+    products,
     filteredProducts,
     isLoading,
-    isFetchingNextPage,
     isError,
     error,
-    hasNextPage,
-    fetchNextPage,
     refetch,
     searchText,
     setSearchText,
@@ -71,40 +64,19 @@ const ProductLibrary: React.FC = () => {
   } = useProductActions({
     selectedIds,
     clearSelection,
-    products: filteredProducts,
+    products,
     setPlayingProduct: () => {}, // 不再使用弹窗播放
   })
 
   const { recomputeDedup, isRecomputing } = useRecomputeDedup()
 
-  /* ── 无限滚动：IntersectionObserver 监听底部哨兵元素 ── */
-  const sentinelRef = useRef<HTMLDivElement>(null)
-
-  useEffect(() => {
-    const el = sentinelRef.current
-    if (!el) return
-    // 已有数据但正在加载中/没有更多页时不触发
-    if (isFetchingNextPage || !hasNextPage) return
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[0]?.isIntersecting) {
-          void fetchNextPage()
-        }
-      },
-      { rootMargin: "200px" },
-    )
-    observer.observe(el)
-    return () => observer.disconnect()
-  }, [fetchNextPage, hasNextPage, isFetchingNextPage])
-
-  // ── Loading 状态（仅首次加载）──
-  if (isLoading && filteredProducts.length === 0) {
+  // ── Loading 状态 ──
+  if (isLoading) {
     return <ProductEmptyState type="loading" />
   }
 
   // ── Error 状态 ──
-  if (isError && filteredProducts.length === 0) {
+  if (isError) {
     console.error("[ProductLibrary] 加载失败:", error)
     const errorMsg = error?.message || "加载失败"
     const is404 = errorMsg.includes("404") || errorMsg.includes("Not Found")
@@ -171,46 +143,22 @@ const ProductLibrary: React.FC = () => {
 
       {/* 卡片网格 */}
       {filteredProducts.length > 0 ? (
-        <>
-          <div className="xx-products-grid">
-            {filteredProducts.map((product) => (
-              <ProductCard
-                key={product.id}
-                product={product}
-                isSelected={selectedIds.has(product.id)}
-                batchMode={batchMode}
-                onToggleSelect={handleToggleSelect}
-                onDownload={handleDownload}
-                onShare={handleShare}
-                onDelete={handleDelete}
-                onPublish={handlePublish}
-                onReviewStatusChange={handleReviewStatusChange}
-              />
-            ))}
-          </div>
-
-          {/* 底部哨兵 + 状态提示 */}
-          <div
-            ref={sentinelRef}
-            style={{
-              gridColumn: "1 / -1",
-              textAlign: "center",
-              padding: "24px 0",
-              fontSize: 13,
-              color: "#8c8ca1",
-            }}
-          >
-            {isFetchingNextPage ? (
-              <>
-                <LoadingOutlined /> 加载中…
-              </>
-            ) : hasNextPage ? (
-              <span style={{ opacity: 0 }}>加载更多</span>
-            ) : (
-              <span>—— 已加载全部 ——</span>
-            )}
-          </div>
-        </>
+        <div className="xx-products-grid">
+          {filteredProducts.map((product) => (
+            <ProductCard
+              key={product.id}
+              product={product}
+              isSelected={selectedIds.has(product.id)}
+              batchMode={batchMode}
+              onToggleSelect={handleToggleSelect}
+              onDownload={handleDownload}
+              onShare={handleShare}
+              onDelete={handleDelete}
+              onPublish={handlePublish}
+              onReviewStatusChange={handleReviewStatusChange}
+            />
+          ))}
+        </div>
       ) : (
         <ProductEmptyState type="empty" />
       )}

apps/web/src/pages/products/hooks/useProductList/index.ts

@@ -1,53 +1,28 @@
 import { useMemo } from "react"
-import { useInfiniteQuery } from "@tanstack/react-query"
+import { useQuery } from "@tanstack/react-query"
 import { getProducts, type ProductItem as ApiProductItem } from "@/api/products"
 import { mapApiProduct } from "../../utils"
-import type { ProductItem } from "../../types"
 import { useProductFiltering } from "./useProductFiltering"
 import { useBatchSelection } from "./useBatchSelection"
 
 export type { Filters } from "./useProductFiltering"
 
-const PAGE_SIZE = 20
-
 export const useProductList = () => {
-  /* ── 无限滚动获取成品列表（每页 20 条） ── */
+  /* ── 获取成品列表 ── */
   const {
-    data,
+    data: apiProducts = [],
     isLoading,
-    isFetchingNextPage,
     isError,
     error,
-    hasNextPage,
-    fetchNextPage,
     refetch,
-  } = useInfiniteQuery<
-    {
-      items: ApiProductItem[]
-      total: number
-      page: number
-      page_size: number
-    },
-    Error
-  >({
+  } = useQuery<ApiProductItem[], Error>({
     queryKey: ["products"],
-    queryFn: async ({ pageParam = 1 }) =>
-      getProducts({ page: pageParam as number, page_size: PAGE_SIZE }),
-    initialPageParam: 1,
-    getNextPageParam: (lastPage) => {
-      const loadedCount = lastPage.page * lastPage.page_size
-      return loadedCount < lastPage.total ? lastPage.page + 1 : undefined
-    },
+    queryFn: () => getProducts(),
     staleTime: 30_000,
   })
 
-  // 将所有页拼接为一维数组，再做前端映射+排序
-  const apiProducts = useMemo<ApiProductItem[]>(() => {
-    if (!data?.pages) return []
-    return data.pages.flatMap((p) => p.items)
-  }, [data])
-
-  const products = useMemo<ProductItem[]>(
+  // 映射为前端类型，按创建时间倒序排列，防御非数组返回
+  const products = useMemo(
     () =>
       (Array.isArray(apiProducts) ? apiProducts : []).map(mapApiProduct).sort((a, b) => {
         if (!a.date || a.date === "—") return 1
@@ -90,11 +65,8 @@ export const useProductList = () => {
     products,
     filteredProducts,
     isLoading,
-    isFetchingNextPage,
     isError,
     error,
-    hasNextPage,
-    fetchNextPage,
     refetch,
     // 筛选
     searchText,

apps/worker/worker_app/celery_app.py

@@ -34,15 +34,9 @@ celery_app.conf.imports = (
     "worker_app.tasks.tts_synthesis",
     "worker_app.tasks.batch_download",
     "worker_app.tasks.duplication_check",
-    # #1798 AI 数字人渲染：必须在 Worker 实例上注册同名任务，否则消息无人消费（渲染卡 0%）
-    "worker_app.tasks.ai_avatar_render",
     "worker_app.tasks._startup",
     "apps.worker.video_processing.dedup",
     "worker_app.tasks.cleanup",
-    # 注意：必须用 app.* 路径，不能用 apps.api.app.* 路径！
-    # PYTHONPATH=/app/apps/api 下，app.tasks.lipsync_tts 可直接导入且不触发 apps/api/__init__.py
-    # （apps/api/__init__.py 会 from .main import app，级联加载整个 FastAPI 栈，Worker 中不需要且会导致注册失败）
-    "app.tasks.lipsync_tts",
 )
 
 # Celery Beat 定时任务调度

apps/worker/worker_app/tasks/ai_avatar_render.py

@@ -1,48 +0,0 @@
-"""AI 数字人渲染任务 — Worker 侧 Celery 任务注册.
-
-#1798 渲染进度卡在 0% 的根因：渲染任务定义在 API 侧（`app.tasks.ai_avatar_render`），
-装饰在 API 自己的 Celery 实例（`xiaoxia-saas-api`）上；而 Worker 用的是
-`worker_app.celery_app` 实例，`conf.imports` 从未导入该任务，Worker 的任务
-注册表里没有 `ai_avatar_render.execute`，消息被路由到默认 `celery` 队列后
-无人消费，任务永远停在 0%。
-
-修复：在 Worker 侧用 `worker_app.celery_app` 注册同名任务，直接调用与 API
-服务一致的 `AiAvatarRenderService.execute_render` 核心管线（业务逻辑在
-`apps.api.app.services`，worker 镜像已复制 `apps/api/app`）。任务名保持
-`ai_avatar_render.execute`，与 API 生产端 `.delay()` 的消息路由一致；未在
-task_routes 显式配置，走默认 `celery` 队列，由 transcode worker 消费。
-"""
-
-from __future__ import annotations
-
-import logging
-
-from worker_app.celery_app import celery_app
-from worker_app.db import SessionLocal
-
-logger = logging.getLogger(__name__)
-
-
-@celery_app.task(bind=True, name="ai_avatar_render.execute", max_retries=2)
-def execute_ai_avatar_render(self, job_id: str) -> dict:
-    """执行 AI 数字人渲染管线（Worker 侧入口）.
-
-    进度由 service 直接写入 DB（AiAvatarRenderJob.progress:
-    0→5→20→40→80→90→95→100），API 通过轮询 progress 字段展示。
-    """
-    logger.info("开始执行渲染任务: %s", job_id)
-    self.update_state(state="PROCESSING", meta={"progress": 0, "job_id": job_id})
-
-    session = SessionLocal()
-    try:
-        from app.services.ai_avatar_render_service import AiAvatarRenderService
-
-        service = AiAvatarRenderService(session)
-        service.execute_render(job_id)
-        return {"status": "completed", "job_id": job_id}
-    except Exception as exc:
-        logger.exception("渲染任务执行异常 [%s]: %s", job_id, exc)
-        self.update_state(state="FAILED", meta={"progress": 0, "error": str(exc)})
-        raise
-    finally:
-        session.close()

infra/docker/compose.yml

@@ -163,7 +163,7 @@ services:
     #   context: ../..
     #   dockerfile: ${WEB_DOCKERFILE:-infra/docker/web.Dockerfile}
     #   args:
-    #     (NGINX_CONF no longer needed - all configs baked into image)
+    #     NGINX_CONF: ${WEB_NGINX_CONF:-infra/docker/nginx.conf}
     
     container_name: xiaoxia-web-${ENV:-staging}
     restart: unless-stopped
@@ -178,12 +178,12 @@ services:
       - xiaoxia-net
     
     # =========================================
-    # Nginx 配置运行时覆盖（双保险：entrypoint 也按 APP_ENV 选择配置）
+    # Nginx 配置运行时覆盖
     # 确保容器使用正确环境的 nginx 配置，即使镜像构建时使用了默认配置
     # 注意: 只覆盖 /etc/nginx/conf.d/default.conf，不挂载 /usr/share/nginx/html
     # =========================================
     environment:
-      - APP_ENV=${ENV:-staging}
+      - NGINX_ENV=${ENV:-staging}
     volumes:
       - ./nginx-${ENV:-staging}.conf:/etc/nginx/conf.d/default.conf:ro
     

infra/docker/deploy-production-registry.sh

@@ -14,11 +14,11 @@ REGISTRY_TOKEN="${REGISTRY_TOKEN:-}"
 ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-production/.env}"
 GENERATED_DIR="${GENERATED_DIR:-/var/lib/xiaoxia-saas-production/generated}"
 LEGACY_ASSETS_DIR="${LEGACY_ASSETS_DIR:-/var/lib/xiaoxia-saas-production/legacy-assets}"
-REPO_DIR="${REPO_DIR:-/var/lib/xiaoxia-saas-production/repo}"
 
 if [ -z "$IMAGE_TAG" ]; then
   echo "ERROR: IMAGE_TAG is required"
   exit 1
+fi
 
 test -f "$ENV_FILE"
 mkdir -p "$GENERATED_DIR"
@@ -31,6 +31,7 @@ if [ -n "$REGISTRY_TOKEN" ]; then
   printf %s "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin 2>/dev/null || {
     echo "WARN: docker login failed, will try to pull anyway"
   }
+fi
 
 # ---- Pull 三镜像 ----
 REGISTRY_API="${REGISTRY}/xiaoxia-saas-api:${IMAGE_TAG}"
@@ -65,14 +66,17 @@ if docker inspect xiaoxia-web-production >/dev/null 2>&1; then
   if [ -d "$_tmpdir" ] && [ "$(ls -A "$_tmpdir" 2>/dev/null)" ]; then
     cp -an "$_tmpdir"/. "$LEGACY_ASSETS_DIR"/ 2>/dev/null || true
     echo "Legacy assets backed up: $(ls "$_tmpdir" | wc -l) files"
+  fi
   rm -rf "$_tmpdir"
 else
   echo "No existing web container, skipping legacy assets backup"
+fi
 
 # 清理超过 7 天的旧 assets 文件（避免无限增长）
 if [ -d "$LEGACY_ASSETS_DIR" ]; then
   find "$LEGACY_ASSETS_DIR" -type f -mtime +7 -delete 2>/dev/null || true
   echo "Legacy assets cleanup done (retain 7 days)"
+fi
 
 # ---- 确保基础设施容器在运行 ----
 echo "Checking infrastructure containers..."
@@ -80,10 +84,12 @@ for c in xiaoxia-postgres-production xiaoxia-redis-production; do
   if ! docker inspect "$c" >/dev/null 2>&1; then
     echo "ERROR: Required container not found: $c"
     exit 1
+  fi
   state=$(docker inspect -f '{{.State.Status}}' "$c")
   if [ "$state" != "running" ]; then
     echo "ERROR: Container not running: $c ($state)"
     exit 1
+  fi
 done
 
 # ---- 确保生产网络存在 ----
@@ -102,6 +108,7 @@ echo "Migrations completed."
 echo "Stopping old containers..."
 docker rm -f xiaoxia-api-production 2>/dev/null || true
 docker rm -f xiaoxia-worker-production 2>/dev/null || true
+docker rm -f xiaoxia-web-production 2>/dev/null || true
 
 # ---- 日志配置（所有容器共用） ----
 LOG_OPTS="--log-driver json-file --log-opt max-size=50m --log-opt max-file=3"
@@ -159,16 +166,15 @@ docker run -d \
 # ---- 启动 Web ----
 # Legacy assets 挂载到 /usr/share/nginx/html/assets-legacy/assets/
 # nginx 配置中 assets location 有 fallback 逻辑
-WEB_VOLUMES=""
+LEGACY_VOLUME=""
 if [ -d "$LEGACY_ASSETS_DIR" ] && [ "$(ls -A "$LEGACY_ASSETS_DIR" 2>/dev/null)" ]; then
-  WEB_VOLUMES="-v ${LEGACY_ASSETS_DIR}:/usr/share/nginx/html/assets-legacy/assets:ro"
+  LEGACY_VOLUME="-v ${LEGACY_ASSETS_DIR}:/usr/share/nginx/html/assets-legacy/assets:ro"
   echo "Web container: legacy assets mounted (fallback)"
 else
   echo "Web container: no legacy assets to mount"
 fi
 
 echo "Starting Web container..."
-docker rm -f xiaoxia-web-production 2>/dev/null || true
 docker run -d \
   --name xiaoxia-web-production \
   --network xiaoxia-net-production \
@@ -176,8 +182,7 @@ docker run -d \
   --restart unless-stopped \
   --cpus 0.5 \
   --memory 512m \
-  -e APP_ENV=production \
-  $WEB_VOLUMES \
+  $LEGACY_VOLUME \
   --health-cmd "wget --spider -q http://127.0.0.1:80" \
   --health-interval 30s \
   --health-timeout 5s \
@@ -192,6 +197,7 @@ while [ "$i" -lt 40 ]; do
   if curl -sf --max-time 5 http://127.0.0.1:8001/health >/dev/null 2>&1; then
     echo "API is healthy!"
     break
+  fi
   i=$((i + 1))
   echo "  Waiting... ($i/40)"
   sleep 3
@@ -201,6 +207,7 @@ if [ "$i" -ge 40 ]; then
   echo "ERROR: API did not become healthy within 120s"
   docker logs --tail 50 xiaoxia-api-production
   exit 1
+fi
 
 # ---- 等待 Web 健康 ----
 echo "Waiting for Web to become healthy..."
@@ -209,6 +216,7 @@ while [ "$i" -lt 15 ]; do
   if curl -sf --max-time 5 http://127.0.0.1:3002/ >/dev/null 2>&1; then
     echo "Web is healthy!"
     break
+  fi
   i=$((i + 1))
   echo "  Waiting... ($i/15)"
   sleep 2
@@ -218,6 +226,7 @@ if [ "$i" -ge 15 ]; then
   echo "ERROR: Web did not become healthy within 30s"
   docker logs --tail 30 xiaoxia-web-production
   exit 1
+fi
 
 # ---- 清理旧镜像 ----
 echo "Cleaning up old images..."

infra/docker/deploy-staging-registry.sh

@@ -124,15 +124,23 @@ docker run -d \
   "$LOCAL_WORKER"
 
 # ---- 启动 Web ----
+# Web 镜像默认打包 production nginx.conf，staging 需要挂载 staging 配置
+NGINX_CONF="${NGINX_CONF:-${COMPOSE_DIR}/nginx-staging.conf}"
+if [ ! -f "$NGINX_CONF" ]; then
+  echo "WARN: nginx config not found at $NGINX_CONF, using image default"
+  NGINX_VOLUME=""
+else
+  NGINX_VOLUME="-v ${NGINX_CONF}:/etc/nginx/conf.d/default.conf:ro"
+fi
+
 echo "Starting Web container..."
-docker rm -f xiaoxia-web-staging 2>/dev/null || true
 docker run -d \
   --name xiaoxia-web-staging \
   --network xiaoxia-net-staging \
   -p 127.0.0.1:3001:80 \
   --restart unless-stopped \
   --label com.centurylinklabs.watchtower.enable=true \
-  -e APP_ENV=staging \
+  $NGINX_VOLUME \
   --health-cmd "wget --spider -q http://127.0.0.1:80" \
   --health-interval 30s \
   --health-timeout 5s \

infra/docker/deploy-staging.sh

@@ -53,6 +53,7 @@ export API_IMAGE="${API_IMAGE:-${REGISTRY}/xiaoxia-saas-api:dev}"
 export WORKER_IMAGE="${WORKER_IMAGE:-${REGISTRY}/xiaoxia-saas-worker:dev}"
 
 # Use staging-specific nginx config (proxy_pass → xiaoxia-api-staging:8000)
+export WEB_NGINX_CONF=infra/docker/nginx-staging.conf
 
 if [ "${REBUILD_BACKEND:-0}" = "1" ] || [ "${BUILD_WEB:-0}" = "1" ]; then
   if [ "${ALLOW_STAGING_BUILDS:-false}" != "true" ]; then

infra/docker/nginx-entrypoint.sh

@@ -1,49 +0,0 @@
-#!/bin/sh
-# Select nginx config based on APP_ENV (staging/production).
-#
-# 两种运行模式：
-# 1. CI/CD 部署（staging/production）：部署脚本通过 `-v 宿主机文件:/etc/nginx/conf.d/default.conf:ro`
-#    把宿主机生成的带 resolver/docker upstream 的配置 bind mount 进来，entrypoint 不应改动。
-#    bind mount 的文件是 readonly 的，rm 会报 EBUSY ("Resource busy")，直接 exec nginx 即可。
-# 2. 本地 docker-compose / 直接 `docker run`（无外部挂载）：镜像烤入了 nginx-staging.conf 与
-#    nginx-production.conf 到 /etc/nginx/，entrypoint 根据 APP_ENV 把 default.conf 换成正确的 symlink。
-#
-# 策略：
-# - 如果 /etc/nginx/conf.d/default.conf 已经是指向目标 conf 的 symlink，什么都不做；
-# - 否则尝试 rm -f 再 ln -s；rm 失败说明是外部 bind mount（已有正确配置），不阻塞启动；
-# - 兜底：只要 conf.d 目录里有 .conf 文件（含 bind mount 来的），就直接启动 nginx。
-set -e
-
-NGINX_CONF_DIR="/etc/nginx/conf.d"
-TARGET_CONF=""
-
-case "${APP_ENV:-production}" in
-  staging)
-    TARGET_CONF="/etc/nginx/nginx-staging.conf"
-    ;;
-  *)
-    TARGET_CONF="/etc/nginx/nginx-production.conf"
-    ;;
-esac
-
-DEFAULT_CONF="$NGINX_CONF_DIR/default.conf"
-
-# 1. 已经是正确的 symlink：直接启动
-if [ -L "$DEFAULT_CONF" ] && [ "$(readlink "$DEFAULT_CONF" 2>/dev/null)" = "$TARGET_CONF" ]; then
-  exec nginx -g "daemon off;"
-fi
-
-# 2. 尝试替换为目标 symlink（无 bind mount 的场景）
-#    若 rm 失败（bind mount readonly，EBUSY/EPERM），则认为外部已注入配置，不阻塞。
-rm -f "$DEFAULT_CONF" 2>/dev/null || true
-if [ -f "$TARGET_CONF" ] && [ ! -e "$DEFAULT_CONF" ]; then
-  ln -s "$TARGET_CONF" "$DEFAULT_CONF" 2>/dev/null || true
-fi
-
-# 3. 兜底：至少要有一个 .conf 文件，否则 nginx 起不来
-if ! ls "$NGINX_CONF_DIR"/*.conf >/dev/null 2>&1; then
-  echo "ERROR: no nginx config found in $NGINX_CONF_DIR (tried $TARGET_CONF and external bind mount)" >&2
-  exit 1
-fi
-
-exec nginx -g "daemon off;"

infra/docker/web-artifact.Dockerfile

@@ -1,11 +1,7 @@
 FROM git.xiaoxiajianji.com/xiaoxia/base/nginx:alpine AS runner
+ARG NGINX_CONF=infra/docker/nginx.conf
 WORKDIR /usr/share/nginx/html
 COPY apps/web/dist ./
-# 将所有 nginx 配置烤入镜像，entrypoint 按 APP_ENV 选择
-COPY infra/docker/nginx.conf /etc/nginx/nginx-production.conf
-COPY infra/docker/nginx-staging.conf /etc/nginx/nginx-staging.conf
-COPY infra/docker/nginx-production.conf /etc/nginx/nginx-production.conf
-COPY infra/docker/nginx-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
+COPY ${NGINX_CONF} /etc/nginx/conf.d/default.conf
 EXPOSE 80
-ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["nginx", "-g", "daemon off;"]

infra/docker/web.Dockerfile

@@ -28,13 +28,9 @@ RUN --mount=type=cache,target=/app/apps/web/.tscache,sharing=locked \
 
 # Production stage with nginx
 FROM git.xiaoxiajianji.com/xiaoxia/base/nginx:alpine AS runner
+ARG NGINX_CONF=infra/docker/nginx.conf
 WORKDIR /usr/share/nginx/html
 COPY --from=builder /app/apps/web/dist ./
-# 将所有 nginx 配置烤入镜像，entrypoint 按 APP_ENV 选择
-COPY infra/docker/nginx.conf /etc/nginx/nginx-production.conf
-COPY infra/docker/nginx-staging.conf /etc/nginx/nginx-staging.conf
-COPY infra/docker/nginx-production.conf /etc/nginx/nginx-production.conf
-COPY infra/docker/nginx-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
+COPY ${NGINX_CONF} /etc/nginx/conf.d/default.conf
 EXPOSE 80
-ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["nginx", "-g", "daemon off;"]

infra/docker/worker.Dockerfile

@@ -20,7 +20,7 @@ WORKDIR /app
 
 # 设置 Python 环境变量
 ENV PATH="/opt/venv/bin:$PATH"
-ENV PYTHONPATH=/app:/app/apps/api:/app/packages
+ENV PYTHONPATH=/app:/app/packages
 ENV PYTHONUNBUFFERED=1
 ENV APP_VERSION=$APP_VERSION
 
@@ -28,10 +28,8 @@ ENV APP_VERSION=$APP_VERSION
 COPY alembic.ini /app/alembic.ini
 COPY migrations/ /app/migrations/
 COPY packages/ /app/packages/
-# PR #1844 起，worker 还需要加载 apps.api.app.tasks.lipsync_tts，
-# 该 task 依赖 app.services.* 与 app.core.celery_app（PYTHONPATH=/app/apps/api 下解析）。
-# 为避免后续新增 task 再次漏 COPY，直接把整个 apps/api/app/ 复制进 worker 镜像。
-COPY apps/api/app/ /app/apps/api/app/
+COPY apps/api/app/config.py /app/apps/api/app/config.py
+COPY apps/api/app/core/ /app/apps/api/app/core/
 
 # Worker 启动脚本
 COPY infra/docker/entrypoint-worker.sh /usr/local/bin/entrypoint-worker.sh

packages/__init__.py

@@ -1 +0,0 @@
-# xiaoxia-saas shared packages namespace

packages/adapters/__init__.py

@@ -1 +0,0 @@
-# adapter implementations namespace

packages/adapters/sqlalchemy_impl/models.py

@@ -703,9 +703,6 @@ class LipsyncJobModel(Base):
     error_message = Column(Text, nullable=False, default="")
     error_code = Column(String(100), nullable=False, default="")
 
-    # 精确句子时间戳（TTS 合成后由 silencedetect 计算，用于 B-roll 精确定位）
-    sentence_timings = Column(JSON, nullable=True)  # list[{index,text,start_time,end_time}]
-
     # 时间戳
     submitted_at = Column(DateTime, nullable=True)
     completed_at = Column(DateTime, nullable=True)

packages/domain/generated_video.py

@@ -49,17 +49,19 @@ class GeneratedVideo:
         thumbnail_url: str | None = None,
         generation_params: dict[str, Any] | None = None,
     ) -> "GeneratedVideo":
-        # project_id / generation_task_id 允许为空：AI数字人等无项目场景下，前端可能不传 project_id；
-        # lipsync 路径下 generation_task_id 也可能暂时为空。空串会被下面统一兜底为 "" 入库。
-        if not name or not name.strip():
+        if not project_id.strip():
+            raise ValueError("project_id cannot be empty")
+        if not generation_task_id.strip():
+            raise ValueError("generation_task_id cannot be empty")
+        if not name.strip():
             raise ValueError("name cannot be empty")
-        if not file_url or not file_url.strip():
+        if not file_url.strip():
             raise ValueError("file_url cannot be empty")
         return cls(
             id=uuid4().hex,
-            project_id=(project_id or "").strip(),
-            user_id=(user_id or "").strip(),
-            generation_task_id=(generation_task_id or "").strip(),
+            project_id=project_id.strip(),
+            user_id=user_id.strip(),
+            generation_task_id=generation_task_id.strip(),
             name=name.strip(),
             file_url=file_url.strip(),
             file_size=file_size,

packages/domain/video_filter_builder.py

@@ -377,30 +377,26 @@ def _append_audio_concat(parts: list[str], clip_chains: list[ClipFilterChain]) -
 
 # ── 标题 drawtext 滤镜构建（#1789）─────────────────────────────────────────────
 
-# drawtext 字体搜索路径：按优先级从高到低排列
-# 服务器使用 Noto Sans SC（思源黑体）作为默认字体。
-# - NotoSansSC-VF.ttf 是 worker-base.Dockerfile 中 COPY 的 VF 字体（含所有字重，无 Mono 变体），优先级最高
-# - .ttc 系列为 fonts-noto-cjk 包预装字体（Dockerfile 已删除含 Mono 变体的旧 .ttc，存在时作为 fallback）
-# - DejaVuSans 仅含拉丁字符不支持中文，已移除
+# drawtext 字体搜索路径：按优先级列出常见安装位置
+# 服务器使用 Noto Sans SC（思源黑体）作为默认字体
 DRAWTEXT_FONT_SEARCH_PATHS: list[str] = [
-    "/usr/share/fonts/opentype/noto/NotoSansSC-VF.ttf",
     "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
-    "/usr/share/fonts/opentype/noto/NotoSansCJK-Bold.ttc",
     "/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
     "/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
     "/usr/share/fonts/truetype/noto/NotoSansSC-Regular.ttf",
     "/usr/share/fonts/noto/NotoSansSC-Regular.ttf",
+    "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
 ]
 
-# 前端字体名 → drawtext 字体搜索关键字（匹配 DRAWTEXT_FONT_SEARCH_PATHS 中的文件名关键字）
+# 前端字体名 → drawtext 字体搜索关键字
 DRAWTEXT_FONT_MAP: dict[str, str] = {
-    "思源黑体": "NotoSansSC",
+    "思源黑体": "NotoSansCJK",
     "思源宋体": "NotoSerifCJK",
-    "苹方": "NotoSansSC",
-    "PingFang": "NotoSansSC",
-    "微软雅黑": "NotoSansSC",
+    "苹方": "NotoSansCJK",
+    "PingFang": "NotoSansCJK",
+    "微软雅黑": "NotoSansCJK",
     "楷体": "NotoSerifCJK",
-    "华康俪金黑": "NotoSansSC",
+    "华康俪金黑": "NotoSansCJK",
 }
 
 
@@ -420,11 +416,6 @@ def _escape_drawtext_text(text: str) -> str:
     return result
 
 
-# 粗体字体已由前端 Canvas 直接渲染（Canvas 使用浏览器原生粗体 glyph），
-# FFmpeg 侧不再需要查找 Bold 字体文件；drawtext 仅作为旧版前端的降级路径，
-# 通过 borderw 黑色细描边模拟粗体（见 build_title_drawtext_filter）。
-
-
 def _resolve_font_path(font_name: str) -> str:
     """解析字体名到服务器实际字体文件路径。
 
@@ -432,9 +423,6 @@ def _resolve_font_path(font_name: str) -> str:
     1. 通过 DRAWTEXT_FONT_MAP 映射前端字体名到服务器关键字
     2. 在 DRAWTEXT_FONT_SEARCH_PATHS 中查找匹配路径
     3. 未找到则返回空字符串（drawtext 使用内置默认字体）
-
-    注：粗体已由前端 Canvas 渲染时直接用浏览器 bold glyph 绘制，
-    此处仅作为旧版前端降级路径，无需切换 Bold 字体文件。
     """
     keyword = DRAWTEXT_FONT_MAP.get(font_name, font_name)
     import os
@@ -478,10 +466,8 @@ def build_title_drawtext_filter(
     if not title_config or not isinstance(title_config, dict):
         return None
 
-    # 字段名归一化：兼容 content/text/title 三套命名
-    text = (
-        title_config.get("text") or title_config.get("content") or title_config.get("title") or ""
-    ).strip()
+    # 字段名归一化：兼容 content/text、font_preset/font 两套命名
+    text = (title_config.get("text") or title_config.get("content") or "").strip()
     if not text:
         return None
 
@@ -491,13 +477,13 @@ def build_title_drawtext_filter(
 
     # ── 样式参数 ──
     font_name = title_config.get("font") or title_config.get("font_preset") or "思源黑体"
-    font_size = int(title_config.get("font_size") or title_config.get("size") or 48)
+    font_size = int(title_config.get("font_size") or title_config.get("size") or 36)
     font_color = title_config.get("font_color") or title_config.get("color") or "#ffffff"
     # 去掉 # 前缀（drawtext 用纯 hex 或颜色名）
     if font_color.startswith("#"):
         font_color = font_color[1:]
 
-    position = title_config.get("position") or "bottom"
+    position = title_config.get("position", "top")
     bold = bool(title_config.get("bold", True))
     stroke = title_config.get("stroke")
     shadow = title_config.get("shadow")
@@ -505,7 +491,7 @@ def build_title_drawtext_filter(
     # ── 构建 drawtext 参数 ──
     params: list[str] = []
 
-    # 字体文件（drawtext 降级路径：粗体通过 borderw 黑色描边模拟）
+    # 字体文件
     font_path = _resolve_font_path(font_name)
     if font_path:
         escaped_path = font_path.replace("\\", "\\\\").replace(":", "\\\\:").replace("'", "\\\\'")
@@ -518,28 +504,26 @@ def build_title_drawtext_filter(
     params.append(f"fontsize={font_size}")
     params.append(f"fontcolor={font_color}")
 
+    # 粗体：bold 在 drawtext 中通过 font 的 Bold 变体实现
+    # 若字体有 Bold 变体可用 fontfont=bold；否则通过 borderw 模拟
+    if bold:
+        # 使用 font 参数尝试加载 Bold 变体（Noto Sans SC 有 Bold 变体文件）
+        params.append("font=bold")
+
     # 描边（borderw 需要 libfreetype 支持）
-    # 之前用 borderw=3 + font_color 同色描边模拟粗体，会在小字号/竖屏视频上造成
-    # 字形偏移、边缘重影，看起来像文字被打印了两次（用户截图中的标题"曝光曝光…"）。
-    # 修复：粗体改用黑色细描边（borderw=2, 黑色），视觉上清晰加粗且不产生偏移。
-    # 用户显式开启 stroke 时按用户配置走；粗体+无stroke 默认黑色细描边。
-    border_width = 0
-    border_color = "000000"
     if stroke:
         if isinstance(stroke, bool):
             border_width = 2
-            border_color = "000000"
+            border_color = "black"
         elif isinstance(stroke, dict):
-            if stroke.get("enabled", True):
-                border_width = int(stroke.get("width", 2))
-                border_color = (stroke.get("color") or "#000000").lstrip("#")
-    elif bold:
-        # 粗体模式且未配描边：黑色细描边，模拟粗体同时保证不重影
-        border_width = 2
-        border_color = "000000"
-    if border_width > 0:
-        params.append(f"borderw={border_width}")
-        params.append(f"bordercolor={border_color}")
+            border_width = int(stroke.get("width", 2)) if stroke.get("enabled", True) else 0
+            border_color = (stroke.get("color") or "#000000").lstrip("#")
+        else:
+            border_width = 0
+            border_color = "black"
+        if border_width > 0:
+            params.append(f"borderw={border_width}")
+            params.append(f"bordercolor={border_color}")
 
     # 阴影（shadowcolor + shadowx/y）
     if shadow:
@@ -564,13 +548,8 @@ def build_title_drawtext_filter(
         and not isinstance(pos_x, bool)
         and not isinstance(pos_y, bool)
     ):
-        # pos_x/pos_y 为百分比坐标（0-100），转换为 drawtext 表达式
-        # 例如 pos_x=50 → x=(w-text_w)*0.50（水平居中偏50%）
-        #      pos_y=30 → y=(h-text_h)*0.30
-        pct_x = max(0.0, min(100.0, float(pos_x))) / 100.0
-        pct_y = max(0.0, min(100.0, float(pos_y))) / 100.0
-        params.append(f"x=(w-text_w)*{pct_x:.4f}")
-        params.append(f"y=(h-text_h)*{pct_y:.4f}")
+        params.append(f"x={int(pos_x)}")
+        params.append(f"y={int(pos_y)}")
     else:
         # 三档预设位置：top / center / bottom
         # x 始终水平居中：(w-text_w)/2
@@ -586,43 +565,6 @@ def build_title_drawtext_filter(
     return "drawtext=" + ":".join(params)
 
 
-def build_title_overlay_filter(
-    title_config: dict[str, Any],
-    output_width: int,  # noqa: ARG001 - 保留参数签名，PNG 已按视频分辨率绘制
-    output_height: int,  # noqa: ARG001
-    title_png_path: str,
-    *,
-    title_input_label: str = "[1:v]",
-    base_label: str = "[0:v]",
-    output_label: str = "vout_titled",
-) -> str | None:
-    """构建标题 PNG 图层 overlay 滤镜（WYSIWYG 路径）。
-
-    前端用 Canvas 把标题画成与视频同分辨率的透明 PNG（所见即所得），
-    后端直接 overlay=0:0 叠加即可，PNG 透明区域不遮挡视频。
-
-    Args:
-        title_config: 标题配置 dict（仅用来判断降级）
-        output_width: 输出宽度（未使用，PNG 已按该分辨率绘制）
-        output_height: 输出高度（未使用）
-        title_png_path: 已保存到本地的标题 PNG 文件路径
-        title_input_label: 标题 PNG 在 filter_complex 中的输入标签（默认 "[1:v]"）
-        base_label: 前序滤镜输出标签（如 B-roll 输出 "[vout]"）
-        output_label: overlay 输出标签名
-
-    Returns:
-        overlay 滤镜字符串；title_png_path 为空/文件不存在时返回 None（降级到 drawtext）
-    """
-    import os
-
-    if not title_png_path or not os.path.isfile(title_png_path):
-        return None
-    if not title_config or not isinstance(title_config, dict):
-        return None
-
-    return f"{base_label}{title_input_label}overlay=0:0[{output_label}]"
-
-
 # ── B-roll 叠加滤镜 ─────────────────────────────────────────────────────────
 
 
@@ -631,7 +573,7 @@ def build_broll_overlay_filter(
     video_duration: float,
     output_width: int = DEFAULT_OUTPUT_WIDTH,
     output_height: int = DEFAULT_OUTPUT_HEIGHT,
-) -> tuple[str, str | None]:
+) -> str:
     """构建 B-roll 叠加滤镜链。
 
     支持两种模式:
@@ -639,182 +581,121 @@ def build_broll_overlay_filter(
     - pip: 在对口型视频上叠加画中画 B-roll
 
     Args:
-        b_roll_segments: B-roll 片段配置列表（原始顺序，决定 FFmpeg -i 输入顺序）
+        b_roll_segments: B-roll 片段配置列表
         video_duration: 对口型视频总时长(秒)
-        output_width: 输出宽度（默认 1280；AI 数字人竖屏传 720）
-        output_height: 输出高度（默认 720；AI 数字人竖屏传 1280）
+        output_width: 输出宽度
+        output_height: 输出高度
 
     Returns:
-        (filter_complex_str, final_label)
-        - filter_complex_str: filter_complex 片段字符串（末尾无分号）
-        - final_label: 最终输出 pad 标签名，如 "vout"；无 B-roll 时返回 None
+        FFmpeg filter_complex 滤镜字符串片段
     """
     if not b_roll_segments:
-        return "", None
-
-    # 建立原始列表下标 → FFmpeg 输入下标的映射：
-    # cmd 中 [0:v] 是主视频，随后按 b_roll_segments 原始顺序追加 -i，
-    # 因此第 i 个 segment 的输入是 [{i+1}:v]
-    def _input_label(seg: dict[str, Any]) -> str:
-        # seg 必须来自 b_roll_segments；通过 id() 在原列表中查找
-        for i, s in enumerate(b_roll_segments):
-            if s is seg:
-                return f"[{i + 1}:v]"
-        # fallback: 找不到时不应发生，保守返回
-        return "[1:v]"
+        return ""
 
     parts: list[str] = []
     sorted_segments = sorted(b_roll_segments, key=lambda s: s.get("start_time", 0))
 
-    # 按模式分组
+    # 按模式分组处理
     fullscreen_segments = [s for s in sorted_segments if s.get("mode") == "fullscreen"]
     pip_segments = [s for s in sorted_segments if s.get("mode") == "pip"]
 
-    final_label = None
-
     # ── fullscreen 模式: 切分 + concat ──
     if fullscreen_segments:
-        fs_filter, fs_label = _build_fullscreen_filters(
-            fullscreen_segments, b_roll_segments, video_duration, output_width, output_height, _input_label
-        )
-        parts.append(fs_filter)
-        final_label = fs_label
-    else:
-        fs_label = None
+        parts.append(_build_fullscreen_filters(fullscreen_segments, video_duration, output_width, output_height))
 
     # ── pip 模式: overlay 滤镜 ──
     if pip_segments:
-        pip_filter, pip_label = _build_pip_filters(
-            pip_segments, output_width, output_height, _input_label, base_label=fs_label
-        )
-        parts.append(pip_filter)
-        final_label = pip_label
+        for idx, seg in enumerate(pip_segments):
+            start = seg.get("start_time", 0)
+            end = seg.get("end_time", video_duration)
+            scale = seg.get("pip_scale", 0.3)
+            position = seg.get("pip_position", "bottom_right")
+
+            pip_w = int(output_width * scale)
+            pip_h = int(output_height * scale)
+
+            # 位置映射
+            pos_map = {
+                "top_left": "10:10",
+                "top_right": "W-w-10:10",
+                "bottom_left": "10:H-h-10",
+                "bottom_right": "W-w-10:H-h-10",
+                "center": "(W-w)/2:(H-h)/2",
+            }
+            pos_expr = pos_map.get(position, pos_map["bottom_right"])
+
+            broll_input_idx = len(sorted_segments)  # placeholder for input index
+            parts.append(
+                f"[{broll_input_idx + idx}:v]scale={pip_w}:{pip_h}," f"enable='between(t,{start},{end})'[pip{idx}];"
+            )
+            # overlay onto main stream
+            if idx == 0:
+                base_label = "[vout]" if fullscreen_segments else "[0:v]"
+            else:
+                base_label = f"[pip{idx - 1}]"
+            parts.append(f"{base_label}[pip{idx}]overlay={pos_expr}:enable='between(t,{start},{end})'[vout{idx}];")
 
     result = "".join(parts)
     # 清理末尾多余分号
     if result.endswith(";"):
         result = result[:-1]
-    return result, final_label
+    return result
 
 
 def _build_fullscreen_filters(
-    sorted_fs_segments: list[dict[str, Any]],
-    all_segments: list[dict[str, Any]],
+    segments: list[dict[str, Any]],
     video_duration: float,
     output_width: int,
     output_height: int,
-    input_label_fn,
-) -> tuple[str, str]:
-    """构建 fullscreen 模式的切分 + concat 滤镜。
+) -> str:
+    """构建 fullscreen 模式的切分 + concat 滤镜.
 
-    将主视频按 B-roll 时间段切分，然后用 concat 拼接主视频片段和 B-roll 片段。
-
-    Returns:
-        (filter_str, final_label) 其中 final_label 是 concat 输出的 pad 标签
+    将对口型视频按 B-roll 时间段切分，然后用 concat 拼接 B-roll 片段。
     """
     parts: list[str] = []
     prev_end = 0.0
 
-    # 注意：这里的 idx 是 sorted_fs_segments 中的下标；
-    # 实际 FFmpeg 输入下标必须通过 input_label_fn 查询
-    for idx, seg in enumerate(sorted_fs_segments):
+    for idx, seg in enumerate(segments):
         start = seg.get("start_time", 0)
         end = seg.get("end_time", video_duration)
 
-        # 主视频片段（B-roll 之前）
+        # 保持原视频片段（B-roll 之前的部分）
         if prev_end < start:
             parts.append(f"[0:v]trim=start={prev_end}:end={start},setpts=PTS-STARTPTS[main{idx}];")
 
-        # B-roll 片段：缩放到输出分辨率并裁到对应时长
-        in_lbl = input_label_fn(seg)
+        # B-roll 片段：缩放至目标分辨率
         parts.append(
-            f"{in_lbl}scale={output_width}:{output_height}"
+            f"[{idx + 1}:v]scale={output_width}:{output_height}"
             f":force_original_aspect_ratio=decrease,"
             f"pad={output_width}:{output_height}:(ow-iw)/2:(oh-ih)/2,"
             f"trim=start=0:end={end - start},setpts=PTS-STARTPTS[br{idx}];"
         )
         prev_end = end
 
-    # 尾部主视频片段
+    # 尾部片段
     if prev_end < video_duration:
-        last_idx = len(sorted_fs_segments)
+        last_idx = len(segments)
         parts.append(f"[0:v]trim=start={prev_end}:end={video_duration},setpts=PTS-STARTPTS[main{last_idx}];")
 
     # concat 所有片段
-    segment_labels: list[str] = []
-    for idx, seg in enumerate(sorted_fs_segments):
-        start = seg.get("start_time", 0)
-        # 每段 B-roll 之前是否有主视频片段？
-        has_main_before = (idx == 0 and start > 0) or (
-            idx > 0 and sorted_fs_segments[idx - 1].get("end_time", 0) < start
-        )
-        if has_main_before:
-            segment_labels.append(f"[main{idx}]")
+    segment_labels = []
+    for idx in range(len(segments)):
+        start = segments[idx].get("start_time", 0)
+        if (idx == 0 and segments[0].get("start_time", 0) > 0) or idx > 0:
+            prev_end_prev = segments[idx - 1].get("end_time", 0) if idx > 0 else 0
+            if prev_end_prev < start:
+                segment_labels.append(f"[main{idx}]")
         segment_labels.append(f"[br{idx}]")
-    if prev_end < video_duration:
-        segment_labels.append(f"[main{len(sorted_fs_segments)}]")
 
-    final_lbl = "vout_fs"
+    if prev_end < video_duration:
+        segment_labels.append(f"[main{len(segments)}]")
+
     n = len(segment_labels)
     if n > 0:
         concat_inputs = "".join(segment_labels)
-        parts.append(f"{concat_inputs}concat=n={n}:v=1:a=0[{final_lbl}];")
+        parts.append(f"{concat_inputs}concat=n={n}:v=1:a=0[vout];")
 
-    return "".join(parts), final_lbl
-
-
-def _build_pip_filters(
-    pip_segments: list[dict[str, Any]],
-    output_width: int,
-    output_height: int,
-    input_label_fn,
-    base_label: str | None,
-) -> tuple[str, str]:
-    """构建 PIP（画中画）overlay 滤镜链。
-
-    Args:
-        pip_segments: 按时间排序的 pip 片段
-        output_width: 输出宽度
-        output_height: 输出高度
-        input_label_fn: 片段 → 输入标签的映射函数
-        base_label: 前序滤镜链输出的标签（如 fullscreen 的 vout_fs），为 None 则基于 [0:v]
-
-    Returns:
-        (filter_str, final_label)
-    """
-    parts: list[str] = []
-    cur_label = base_label  # 当前叠加到的标签
-
-    pos_map = {
-        "top_left": "10:10",
-        "top_right": "W-w-10:10",
-        "bottom_left": "10:H-h-10",
-        "bottom_right": "W-w-10:H-h-10",
-        "center": "(W-w)/2:(H-h)/2",
-    }
-
-    for idx, seg in enumerate(pip_segments):
-        start = seg.get("start_time", 0)
-        end = seg.get("end_time", 0)
-        scale = seg.get("pip_scale", 0.3)
-        position = seg.get("pip_position", "bottom_right")
-        pos_expr = pos_map.get(position, pos_map["bottom_right"])
-
-        pip_w = max(1, int(output_width * scale))
-        pip_h = max(1, int(output_height * scale))
-        enable_expr = f"enable='between(t,{start},{end})'"
-
-        in_lbl = input_label_fn(seg)
-        pip_scaled = f"pip{idx}"
-        parts.append(f"{in_lbl}scale={pip_w}:{pip_h},{enable_expr}[{pip_scaled}];")
-
-        # overlay onto the current base
-        base = f"[{cur_label}]" if cur_label else "[0:v]"
-        out_lbl = f"vout_pip{idx}" if idx < len(pip_segments) - 1 else "vout"
-        parts.append(f"{base}[{pip_scaled}]overlay={pos_expr}:{enable_expr}[{out_lbl}];")
-        cur_label = out_lbl
-
-    return "".join(parts), cur_label or "vout"
+    return "".join(parts)
 
 
 def build_cover_extract_command(

requirements.txt

@@ -13,7 +13,3 @@ pytest-cov==6.0.0
 
 # 工具
 python-dotenv==1.0.1
-
-# AI 数字人封面智能选帧（cover_frame_scorer 用 cv2/numpy 做清晰度/亮度/色彩评分）
-numpy==1.26.4
-opencv-python-headless==4.10.0.84

scripts/ci/auto_fix_formatting.py

@@ -1,13 +1,10 @@
 #!/usr/bin/env python3
-"""CI中自动修复代码格式（Python: black + isort + ruff | Frontend: prettier），并推送回原分支。
+"""CI中自动修复代码格式（Python: black + isort | Frontend: prettier），并推送回原分支。
 
 - PR事件：所有PR只要Code Quality因格式问题失败，自动修复并push回源分支
 - Push事件（develop/main）：自动修复并push回原分支，保持主干格式永远正确
 - 防循环：修复commit带 [skip ci-format-check] 标记，检测到该标记则跳过修复
-- black/isort/prettier 修格式；ruff check --fix --unsafe-fixes 自动修复
-  ruff 可修复的 lint 规则（含 F401 未使用 import 等 unsafe fix）
-- ruff 目标范围与 validate_style.sh 的检查范围对齐：apps packages tests
-  （alembic/scripts 不在 ruff 检查范围内，不做修复）
+- 只修格式（black/isort/prettier），ruff逻辑类错误不动
 当code quality检查因格式问题失败时触发。
 """
 
@@ -138,7 +135,7 @@ def get_pr_head_branch(pr_number, api_url, token):
 
 
 def fix_python(target_py_files, scan_mode):
-    """修复 Python 文件 (black 格式化 + isort 排序 + ruff lint 自动修复)"""
+    """修复 Python 文件格式 (black + isort)"""
     if not target_py_files:
         print("没有需要修复的 Python 文件，跳过")
         return
@@ -149,48 +146,14 @@ def fix_python(target_py_files, scan_mode):
     result = run(f"python3 -m black {target_str}", check=False)
     print(result.stdout[-500:] if result.stdout else "")
     if result.returncode != 0:
-        print("black执行失败，但继续尝试isort/ruff", file=sys.stderr)
+        print("black执行失败，但继续尝试isort", file=sys.stderr)
 
     print()
     print("--- isort 排序 ---")
     result = run(f"python3 -m isort {target_str}", check=False)
     print(result.stdout[-500:] if result.stdout else "")
     if result.returncode != 0:
-        print("isort执行失败，继续尝试ruff", file=sys.stderr)
-
-    # ruff lint 自动修复
-    # 与 validate_style.sh 的检查范围对齐：只修 apps/packages/tests
-    # （alembic 在 pyproject.toml 中被 exclude，scripts 不在 ruff 检查范围内）
-    ruff_scopes = ("apps/", "packages/", "tests/")
-    ruff_files = [f for f in target_py_files if f.startswith(ruff_scopes)]
-    if scan_mode != "incremental":
-        ruff_targets = "apps packages tests"
-    elif ruff_files:
-        ruff_targets = " ".join(ruff_files)
-    else:
-        ruff_targets = ""
-
-    if ruff_targets:
-        # ruff 由 style job 的 requirements-dev.txt 安装；不可用时跳过（不阻断 black/isort 的修复）
-        avail = run("python3 -m ruff --version", check=False)
-        if avail.returncode != 0:
-            print("ruff 不可用，跳过 ruff 自动修复", file=sys.stderr)
-        else:
-            print()
-            print("--- ruff lint 自动修复 (--fix --unsafe-fixes) ---")
-            # --unsafe-fixes 用于启用 F401（未使用 import）等 ruff 归类为 unsafe 的自动修复；
-            # 安全性由修复后重跑的完整 CI（单测/构建/staging 健康检查）兜底
-            result = run(
-                f"python3 -m ruff check {ruff_targets} --fix --unsafe-fixes",
-                check=False,
-            )
-            print(result.stdout[-1500:] if result.stdout else "")
-            if result.returncode != 0:
-                # 可能是仍有不可自动修复的 lint 错误（留待 style check 再次拦截），或修复过程出错
-                print("ruff 自动修复后仍有未修复项或执行失败，剩余问题由 style check 继续拦截", file=sys.stderr)
-    else:
-        print()
-        print("增量模式且无 apps/packages/tests 范围内的 Python 变更，跳过 ruff 自动修复")
+        print("isort执行失败", file=sys.stderr)
 
 
 def fix_frontend(target_fe_files, scan_mode, repo_root):
@@ -371,7 +334,7 @@ def main():
     # 提交修复
     run("git clean -fd")
     run("git add -u")
-    run('git commit -m "style: auto-format with black + isort + ruff + prettier [skip ci-format-check]"')
+    run('git commit -m "style: auto-format with black + isort + prettier [skip ci-format-check]"')
 
     # 推送（head_branch已从ensure_git_repo获取）
     print(f"\nPR来源分支: {head_branch}")

tests/unit/domain/test_generated_video.py

@@ -87,19 +87,28 @@ class TestGeneratedVideoCreate:
         assert v.file_url == "http://x/v"
 
     def test_create_empty_project_id(self):
-        """空 project_id 允许（AI数字人无项目场景）."""
-        v = GeneratedVideo.create("", "t1", "v", "http://x/v")
-        assert v.project_id == ""
+        """空 project_id 无效."""
+        try:
+            GeneratedVideo.create("", "t1", "v", "http://x/v")
+            assert False
+        except ValueError as e:
+            assert "project_id" in str(e)
 
     def test_create_whitespace_project_id(self):
-        """纯空白 project_id 归一化为空串."""
-        v = GeneratedVideo.create("   ", "t1", "v", "http://x/v")
-        assert v.project_id == ""
+        """纯空白 project_id 无效."""
+        try:
+            GeneratedVideo.create("   ", "t1", "v", "http://x/v")
+            assert False
+        except ValueError as e:
+            assert "project_id" in str(e)
 
     def test_create_empty_task_id(self):
-        """空 generation_task_id 允许."""
-        v = GeneratedVideo.create("p1", "", "v", "http://x/v")
-        assert v.generation_task_id == ""
+        """空 generation_task_id 无效."""
+        try:
+            GeneratedVideo.create("p1", "", "v", "http://x/v")
+            assert False
+        except ValueError as e:
+            assert "generation_task_id" in str(e)
 
     def test_create_empty_name(self):
         """空 name 无效."""

tests/unit/test_ai_avatar_emotion_tts_lipsync.py

@@ -132,8 +132,14 @@ def _lipsync_service_with_mocks():
 def test_create_job_tts_direct_mode_synthesizes_audio():
     svc, client, cosy = _lipsync_service_with_mocks()
 
-    with patch("app.services.lipsync_service.tts_synthesize_and_submit") as mock_task:
-        mock_task.apply_async.return_value = MagicMock(id="celery-task-123")
+    with (
+        patch("app.services.lipsync_service.get_shared_storage_service") as storage_patch,
+        patch("app.services.lipsync_service.safe_download_bytes") as dl_patch,
+    ):
+        storage = MagicMock()
+        storage.upload_file.return_value = "https://oss/tts.mp3"
+        storage_patch.return_value = storage
+        dl_patch.return_value = b"FAKEAUDIO"
 
         job = svc.create_job(
             user_id="user-1",
@@ -144,16 +150,19 @@ def test_create_job_tts_direct_mode_synthesizes_audio():
             emotion="兴奋",
         )
 
-    # v4: TTS 模式下 create_job 返回 tts_processing 状态，dispatch Celery 任务
-    assert job.status == "tts_processing"
+    # 调了 TTS 合成，带 speed/emotion
+    cosy.submit_synthesize_task.assert_called_once()
+    _, kwargs = cosy.submit_synthesize_task.call_args
+    assert kwargs["speed"] == 1.2
+    assert kwargs["emotion"] == "excited"
+    assert kwargs["voice_id"] == "cosy-v1"
+    # MediaKit 用合成后的 OSS 音频 URL 提交
+    _, submit_kwargs = client.submit_lipsync.call_args
+    assert submit_kwargs["audio_url"] == "https://oss/tts.mp3"
+    assert submit_kwargs["video_url"] == "https://oss/person.mp4"
+    # DB 记录了 TTS 字段
     assert job.emotion == "excited"
     assert job.speed == 1.2
-    # 不直接调用 CosyVoice（由 Celery 任务处理）
-    cosy.submit_synthesize_task.assert_not_called()
-    # 不直接提交 MediaKit（由 Celery 任务处理）
-    client.submit_lipsync.assert_not_called()
-    # dispatch 了 Celery 任务
-    mock_task.apply_async.assert_called_once()
 
 
 def test_create_job_direct_audio_mode_skips_tts():
@@ -171,25 +180,23 @@ def test_create_job_direct_audio_mode_skips_tts():
 
 
 def test_create_job_tts_failure_raises():
-    """v4: TTS 模式下 create_job 不再同步失败，而是 dispatch Celery 任务。
-    TTS 合成失败由 Celery 任务内部处理并更新 job 状态。"""
+    from app.services.mediakit_client import MediaKitError
+
+    from packages.application.cosyvoice_service import CosyVoiceError
+
     svc, client, cosy = _lipsync_service_with_mocks()
+    cosy.submit_synthesize_task.side_effect = CosyVoiceError("Arrearage")
 
-    with patch("app.services.lipsync_service.tts_synthesize_and_submit") as mock_task:
-        mock_task.apply_async.return_value = MagicMock(id="celery-task-456")
-
-        job = svc.create_job(
+    with pytest.raises(MediaKitError) as exc:
+        svc.create_job(
             user_id="user-1",
             video_url="https://oss/person.mp4",
             voice_id="v-1",
             script_text="文本",
         )
-
-    # create_job 成功返回 tts_processing，不直接调用 TTS
-    assert job.status == "tts_processing"
-    cosy.submit_synthesize_task.assert_not_called()
+    assert exc.value.code == "TTSSynthesisFailed"
+    # TTS 失败不应提交 MediaKit
     client.submit_lipsync.assert_not_called()
-    mock_task.apply_async.assert_called_once()
 
 
 # ── refresh 同步中间状态 ────────────────────────────────────────────────
@@ -238,32 +245,24 @@ def test_smart_cover_selects_best_frame_and_persists():
             {"url": "https://mk/f1.jpg", "score": 90.0, "image_path": cands[1]["image_path"]},
             {"url": "https://mk/f0.jpg", "score": 60.0, "image_path": cands[0]["image_path"]},
         ]
-        # httpx.Client 连接池 mock
-        client_instance = MagicMock()
         resp = MagicMock()
         resp.content = b"IMGDATA"
         resp.raise_for_status = MagicMock()
+        client_instance = MagicMock()
         client_instance.get.return_value = resp
         client_instance.__enter__ = MagicMock(return_value=client_instance)
         client_instance.__exit__ = MagicMock(return_value=False)
         http_client_cls.return_value = client_instance
-
         storage = MagicMock()
-        storage.public_url = "https://oss.example.com"
-        # video_url 不是自家 OSS，不重签
-        storage.get_download_url.side_effect = lambda url, **kw: f"{url}?signed=1"
-        storage.upload_file.return_value = "https://oss.example.com/cover.jpg"
+        storage.public_url = "https://other-oss.example.com"  # 不同host，不触发重签
+        storage.upload_file.return_value = "https://oss/cover.jpg"
         storage_patch.return_value = storage
 
-        url = cov.generate_smart_cover("https://other-host/avatar.mp4", job_id="job-1")
+        url = cov.generate_smart_cover("https://oss/avatar.mp4", job_id="job-1")
 
-    assert "signed=1" in url or url == "https://oss.example.com/cover.jpg"
+    assert url == "https://oss/cover.jpg"
     mk.extract_frames.assert_called_once()
     score_patch.assert_called_once()
-    # 验证使用了增大的轮询参数
-    call_kwargs = mk.extract_frames.call_args
-    assert call_kwargs.kwargs.get("poll_interval") == 1.0 or call_kwargs[1].get("poll_interval") == 1.0
-    assert call_kwargs.kwargs.get("max_poll_attempts") == 15 or call_kwargs[1].get("max_poll_attempts") == 15
 
 
 def test_smart_cover_returns_empty_when_mediakit_unavailable():
@@ -277,45 +276,47 @@ def test_smart_cover_returns_empty_when_mediakit_unavailable():
         mk.is_available = False
         mk_patch.return_value = mk
         storage = MagicMock()
-        storage.public_url = "https://oss.example.com"
+        storage.public_url = "https://other-oss.example.com"
         storage_patch.return_value = storage
-        url = cov.generate_smart_cover("https://oss.example.com/avatar.mp4")
+        url = cov.generate_smart_cover("https://oss/avatar.mp4")
     assert url == ""
 
 
 def test_sign_video_url_resigns_own_oss_url():
-    """自家 OSS 私有桶 URL 应被重签为长有效期预签名 URL"""
-    from app.services.ai_avatar_cover_service import _sign_video_url_for_mediakit
+    """自家 OSS 私有桶 URL 会被重签为长有效期预签名 URL"""
+    from app.services import ai_avatar_cover_service as cov
 
     with patch("packages.shared.storage.get_shared_storage_service") as storage_patch:
         storage = MagicMock()
-        storage.public_url = "https://oss.example.com"
-        storage.get_download_url.return_value = "https://oss.example.com/file.mp4?Expires=xxx&Signature=yyy"
+        storage.public_url = "https://xiaoxia-autocut.oss-cn-hangzhou.aliyuncs.com"
+        storage.get_download_url.return_value = (
+            "https://xiaoxia-autocut.oss-cn-hangzhou.aliyuncs.com/vid.mp4?Expires=999&Signature=abc"
+        )
         storage_patch.return_value = storage
 
-        result = _sign_video_url_for_mediakit("https://oss.example.com/file.mp4")
+        result = cov._sign_video_url_for_mediakit("https://xiaoxia-autocut.oss-cn-hangzhou.aliyuncs.com/vid.mp4")
 
-    assert "Signature=yyy" in result
+    assert "Signature=abc" in result
     storage.get_download_url.assert_called_once()
 
 
 def test_sign_video_url_skips_external_url():
-    """外部 URL（非自家 OSS）应原样返回，不做重签"""
-    from app.services.ai_avatar_cover_service import _sign_video_url_for_mediakit
+    """外部 URL 不会被重签"""
+    from app.services import ai_avatar_cover_service as cov
 
     with patch("packages.shared.storage.get_shared_storage_service") as storage_patch:
         storage = MagicMock()
-        storage.public_url = "https://oss.example.com"
+        storage.public_url = "https://xiaoxia-autocut.oss-cn-hangzhou.aliyuncs.com"
         storage_patch.return_value = storage
 
-        result = _sign_video_url_for_mediakit("https://external-cdn.com/video.mp4")
+        result = cov._sign_video_url_for_mediakit("https://cdn.example.com/video.mp4")
 
-    assert result == "https://external-cdn.com/video.mp4"
+    assert result == "https://cdn.example.com/video.mp4"
     storage.get_download_url.assert_not_called()
 
 
 def test_extract_frames_uses_extended_poll_params():
-    """验证 select_best_cover_frame 使用增大后的轮询参数"""
+    """验证抽帧使用了增大后的轮询参数"""
     from app.services import ai_avatar_cover_service as cov
 
     with (
@@ -326,17 +327,16 @@ def test_extract_frames_uses_extended_poll_params():
         mk.is_available = True
         mk.extract_frames.return_value = [{"image_url": "https://mk/f0.jpg"}]
         mk_patch.return_value = mk
-
         storage = MagicMock()
-        storage.public_url = "https://oss.example.com"
+        storage.public_url = "https://other-oss.example.com"
         storage_patch.return_value = storage
 
-        cov.select_best_cover_frame("https://other/avatar.mp4", max_frames=3)
+        cov.select_best_cover_frame("https://oss/video.mp4", max_frames=3)
 
-    call_kwargs = mk.extract_frames.call_args
-    assert call_kwargs.kwargs.get("poll_interval") == 1.0 or call_kwargs[1].get("poll_interval") == 1.0
-    assert call_kwargs.kwargs.get("max_poll_attempts") == 15 or call_kwargs[1].get("max_poll_attempts") == 15
-    assert call_kwargs.kwargs.get("max_retries") == 1 or call_kwargs[1].get("max_retries") == 1
+    call_kwargs = mk.extract_frames.call_args.kwargs
+    assert call_kwargs["poll_interval"] == 3.0
+    assert call_kwargs["max_poll_attempts"] == 20
+    assert call_kwargs["max_retries"] == 1
 
 
 # ── 渲染 script_id 可选（手动文案直生场景）──────────────────────────────

tests/unit/test_ai_avatar_render_routes.py

@@ -258,9 +258,8 @@ class TestBrollOverlayFilter:
     def test_empty_segments_returns_empty(self):
         from packages.domain.video_filter_builder import build_broll_overlay_filter
 
-        result, label = build_broll_overlay_filter([], 30.0)
+        result = build_broll_overlay_filter([], 30.0)
         assert result == ""
-        assert label is None
 
     def test_pip_mode_generates_overlay(self):
         from packages.domain.video_filter_builder import build_broll_overlay_filter
@@ -276,9 +275,8 @@ class TestBrollOverlayFilter:
                 "pip_scale": 0.3,
             }
         ]
-        result, label = build_broll_overlay_filter(segments, 30.0)
+        result = build_broll_overlay_filter(segments, 30.0)
         assert "overlay" in result or "scale=" in result
-        assert label == "vout"
 
     def test_fullscreen_mode_generates_concat(self):
         from packages.domain.video_filter_builder import build_broll_overlay_filter
@@ -292,9 +290,8 @@ class TestBrollOverlayFilter:
                 "end_time": 10.0,
             }
         ]
-        result, label = build_broll_overlay_filter(segments, 30.0)
+        result = build_broll_overlay_filter(segments, 30.0)
         assert "trim" in result or "concat" in result
-        assert label == "vout_fs"
 
     def test_cover_extract_command(self):
         from packages.domain.video_filter_builder import build_cover_extract_command
@@ -318,120 +315,3 @@ class TestBrollOverlayFilter:
             "/tmp/cover.jpg",
         )
         assert "scale=" in cmd
-
-
-def _make_mock_auth_user(user_id="user-1"):
-    """构造 AuthenticatedUser：current_user.user.id."""
-    auth = MagicMock()
-    auth.user.id = user_id
-    return auth
-
-
-class TestRenderSmartCoverRoute:
-    """POST /renders/{job_id}/smart-cover — 从成片智能抽封面（步骤②）."""
-
-    def test_smart_cover_job_not_found_returns_404(self):
-        """渲染任务不存在 → 404."""
-        from app.api.routes.ai_avatar_render import generate_render_smart_cover
-        from fastapi import HTTPException
-
-        mock_service = MagicMock()
-        mock_service.get_render_job.return_value = None
-        mock_db = MagicMock()
-        mock_user = _make_mock_auth_user()
-
-        # 函数内部 `from app.services.ai_avatar_render_service import AiAvatarRenderService`
-        with patch("app.services.ai_avatar_render_service.AiAvatarRenderService", return_value=mock_service):
-            with pytest.raises(HTTPException) as exc_info:
-                generate_render_smart_cover(job_id="render-missing", current_user=mock_user, db=mock_db)
-
-        assert exc_info.value.status_code == 404
-        assert "不存在" in exc_info.value.detail
-        mock_service.get_render_job.assert_called_once_with("render-missing", "user-1")
-
-    def test_smart_cover_job_not_completed_returns_400(self):
-        """任务未 completed（如 processing）→ 400."""
-        from app.api.routes.ai_avatar_render import generate_render_smart_cover
-        from fastapi import HTTPException
-
-        mock_service = MagicMock()
-        mock_job = _make_mock_render_job(status="processing", output_video_url="https://oss/video.mp4")
-        mock_service.get_render_job.return_value = mock_job
-        mock_db = MagicMock()
-        mock_user = _make_mock_auth_user()
-
-        with patch("app.services.ai_avatar_render_service.AiAvatarRenderService", return_value=mock_service):
-            with pytest.raises(HTTPException) as exc_info:
-                generate_render_smart_cover(job_id="render-1", current_user=mock_user, db=mock_db)
-
-        assert exc_info.value.status_code == 400
-        assert "先完成视频生成" in exc_info.value.detail
-
-    def test_smart_cover_empty_video_url_returns_400(self):
-        """已 completed 但 output_video_url 为空/空白 → 400."""
-        from app.api.routes.ai_avatar_render import generate_render_smart_cover
-        from fastapi import HTTPException
-
-        mock_service = MagicMock()
-        mock_job = _make_mock_render_job(status="completed", output_video_url="   ")
-        mock_service.get_render_job.return_value = mock_job
-        mock_db = MagicMock()
-        mock_user = _make_mock_auth_user()
-
-        with patch("app.services.ai_avatar_render_service.AiAvatarRenderService", return_value=mock_service):
-            with pytest.raises(HTTPException) as exc_info:
-                generate_render_smart_cover(job_id="render-1", current_user=mock_user, db=mock_db)
-
-        assert exc_info.value.status_code == 400
-        assert "URL 为空" in exc_info.value.detail
-
-    def test_smart_cover_success_updates_db_and_returns_url(self):
-        """抽帧成功 → 更新 job.cover_config / output_cover_url 并 commit，返回 completed."""
-        from app.api.routes.ai_avatar_render import generate_render_smart_cover
-
-        mock_service = MagicMock()
-        mock_job = _make_mock_render_job(
-            status="completed",
-            output_video_url="https://oss/final.mp4",
-        )
-        mock_job.cover_config = {"mode": "manual"}
-        mock_service.get_render_job.return_value = mock_job
-        mock_db = MagicMock()
-        mock_user = _make_mock_auth_user()
-
-        with (
-            patch("app.services.ai_avatar_render_service.AiAvatarRenderService", return_value=mock_service),
-            patch(
-                "app.api.routes.ai_avatar_render.generate_smart_cover", return_value="https://oss/cover.jpg"
-            ) as mock_gen,
-        ):
-            result = generate_render_smart_cover(job_id="render-1", current_user=mock_user, db=mock_db)
-
-        mock_gen.assert_called_once_with("https://oss/final.mp4", job_id="render-1", max_frames=5)
-        assert result.status == "completed"
-        assert result.cover_url == "https://oss/cover.jpg"
-        assert mock_job.output_cover_url == "https://oss/cover.jpg"
-        assert mock_job.cover_config["mode"] == "auto_frame"
-        assert mock_job.cover_config["url"] == "https://oss/cover.jpg"
-        mock_db.commit.assert_called_once()
-
-    def test_smart_cover_extract_failure_returns_fallback_failed(self):
-        """generate_smart_cover 抛异常 → fallback_failed，不抛错不写 DB."""
-        from app.api.routes.ai_avatar_render import generate_render_smart_cover
-
-        mock_service = MagicMock()
-        mock_job = _make_mock_render_job(status="completed", output_video_url="https://oss/final.mp4")
-        mock_service.get_render_job.return_value = mock_job
-        mock_db = MagicMock()
-        mock_user = _make_mock_auth_user()
-
-        with (
-            patch("app.services.ai_avatar_render_service.AiAvatarRenderService", return_value=mock_service),
-            patch("app.api.routes.ai_avatar_render.generate_smart_cover", side_effect=RuntimeError("mediakit down")),
-        ):
-            result = generate_render_smart_cover(job_id="render-1", current_user=mock_user, db=mock_db)
-
-        assert result.status == "fallback_failed"
-        assert result.cover_url == ""
-        # 失败时不写 cover_config / 不 commit
-        mock_db.commit.assert_not_called()

tests/unit/test_ai_avatar_render_service.py

@@ -519,167 +519,9 @@ class TestAiAvatarRenderService:
         # 不应执行渲染逻辑
         mock_db.commit.assert_not_called()
 
-    def test_execute_render_success_creates_clip_record(self):
-        """execute_render 完成后自动创建成片记录到成片库."""
-        from app.services.ai_avatar_render_service import AiAvatarRenderService
-
-        mock_db = _make_mock_db()
-        mock_lipsync_job = _make_mock_lipsync_job(
-            status="completed",
-            output_video_url="https://oss/lipsync.mp4",
-            output_duration=30.0,
-        )
-        mock_job = _make_mock_render_job(
-            job_id="render-ok",
-            status="pending",
-            output_video_url="",
-            output_cover_url="",
-            output_duration=0.0,
-        )
-        mock_filter = MagicMock()
-        mock_filter.first.side_effect = [mock_job, mock_lipsync_job]
-        mock_query = MagicMock()
-        mock_query.filter.return_value = mock_filter
-        mock_db.query.return_value = mock_query
-
-        svc = AiAvatarRenderService(mock_db)
-
-        with (
-            patch.object(svc, "_download_video", return_value="/tmp/video.mp4"),
-            patch.object(svc, "_upload_to_oss", side_effect=lambda path, key: f"https://oss/{key}"),
-            patch("subprocess.run") as mock_run,
-            patch("tempfile.TemporaryDirectory") as tmpdir_mock,
-            patch(
-                "app.services.ai_avatar_cover_service.generate_smart_cover", return_value="https://oss/smart_cover.jpg"
-            ),
-            patch("packages.domain.generated_video.GeneratedVideo.create") as gv_create,
-            patch(
-                "packages.adapters.sqlalchemy_impl.generated_video_repository.SQLAlchemyGeneratedVideoRepository"
-            ) as repo_cls,
-        ):
-            import subprocess as _sp
-
-            mock_run.return_value = _sp.CompletedProcess(args=[], returncode=0, stdout="", stderr="")
-            import tempfile as _tf
-
-            tmpdir_mock.return_value.__enter__ = MagicMock(return_value="/tmp/testdir")
-            tmpdir_mock.return_value.__exit__ = MagicMock(return_value=False)
-
-            mock_clip = MagicMock()
-            mock_clip.id = "clip-001"
-            gv_create.return_value = mock_clip
-            mock_repo = MagicMock()
-            repo_cls.return_value = mock_repo
-
-            svc.execute_render("render-ok")
-
-        assert mock_job.status == "completed"
-        gv_create.assert_called_once()
-        call_kwargs = gv_create.call_args
-        assert "https://oss/" in call_kwargs.kwargs["file_url"]
-        assert call_kwargs.kwargs["user_id"] == "user-1"
-        mock_repo.create.assert_called_once_with(mock_clip)
-
-    def test_execute_render_clip_failure_does_not_affect_render(self):
-        """成片创建失败不影响渲染任务标记为成功."""
-        from app.services.ai_avatar_render_service import AiAvatarRenderService
-
-        mock_db = _make_mock_db()
-        mock_lipsync_job = _make_mock_lipsync_job(
-            status="completed",
-            output_video_url="https://oss/lipsync.mp4",
-            output_duration=30.0,
-        )
-        mock_job = _make_mock_render_job(
-            job_id="render-clip-fail",
-            status="pending",
-            output_video_url="",
-            output_cover_url="",
-            output_duration=0.0,
-        )
-        mock_filter = MagicMock()
-        mock_filter.first.side_effect = [mock_job, mock_lipsync_job]
-        mock_query = MagicMock()
-        mock_query.filter.return_value = mock_filter
-        mock_db.query.return_value = mock_query
-
-        svc = AiAvatarRenderService(mock_db)
-
-        with (
-            patch.object(svc, "_download_video", return_value="/tmp/video.mp4"),
-            patch.object(svc, "_upload_to_oss", side_effect=lambda path, key: f"https://oss/{key}"),
-            patch("subprocess.run") as mock_run,
-            patch("tempfile.TemporaryDirectory") as tmpdir_mock,
-            patch("app.services.ai_avatar_cover_service.generate_smart_cover", side_effect=RuntimeError("DB error")),
-        ):
-            import subprocess as _sp
-
-            mock_run.return_value = _sp.CompletedProcess(args=[], returncode=0, stdout="", stderr="")
-            tmpdir_mock.return_value.__enter__ = MagicMock(return_value="/tmp/testdir")
-            tmpdir_mock.return_value.__exit__ = MagicMock(return_value=False)
-            svc.execute_render("render-clip-fail")
-
-        # 即使成片创建失败，渲染任务仍应标记为 completed
-        assert mock_job.status == "completed"
-
     def test_error_exception_has_code(self):
         from app.services.ai_avatar_render_service import AiAvatarRenderError
 
         err = AiAvatarRenderError("测试错误", code="TestCode")
         assert err.code == "TestCode"
         assert str(err) == "测试错误"
-
-
-class TestAiAvatarRenderCoverPassthrough:
-    """execute_render 中封面透传逻辑（320~329 行）：cover_config 含 url/imageUrl/cover_url 时直接透传到 output_cover_url."""
-
-    def _run_execute(self, mock_job, mock_lipsync_job):
-        """驱动 execute_render 跑到完成阶段的通用脚手架（mock IO 部分）."""
-        from app.services.ai_avatar_render_service import AiAvatarRenderService
-
-        mock_db = _make_mock_db()
-        mock_filter = MagicMock()
-        # query.filter 返回同一个 filter 两次（render_job 查询、lipsync 查询）
-        mock_filter.first.side_effect = [mock_job, mock_lipsync_job]
-        mock_query = MagicMock()
-        mock_query.filter.return_value = mock_filter
-        mock_db.query.return_value = mock_query
-
-        svc = AiAvatarRenderService(mock_db)
-        with (
-            patch.object(svc, "_download_video", return_value="/tmp/video.mp4"),
-            patch.object(svc, "_upload_to_oss", side_effect=lambda path, key: f"https://oss/{key}"),
-            patch("subprocess.run") as mock_run,
-            patch("tempfile.TemporaryDirectory") as tmpdir_mock,
-            patch("app.services.ai_avatar_cover_service.generate_smart_cover", return_value=""),
-            patch("packages.domain.generated_video.GeneratedVideo.create", return_value=MagicMock()),
-            patch(
-                "packages.adapters.sqlalchemy_impl.generated_video_repository.SQLAlchemyGeneratedVideoRepository"
-            ) as repo_cls,
-        ):
-            import subprocess as _sp
-
-            mock_run.return_value = _sp.CompletedProcess(args=[], returncode=0, stdout="", stderr="")
-            import tempfile as _tf
-
-            tmpdir_mock.return_value.__enter__ = MagicMock(return_value="/tmp/testdir")
-            tmpdir_mock.return_value.__exit__ = MagicMock(return_value=False)
-            repo_cls.return_value = MagicMock()
-            svc.execute_render(mock_job.id)
-        return mock_db, mock_job
-
-    def test_cover_url_in_cover_config_passthrough_to_output_cover(self):
-        """cover_config.url 存在 → 透传到 output_cover_url."""
-        mock_job = _make_mock_render_job(job_id="render-cov-1", status="pending")
-        mock_job.cover_config = {"mode": "upload", "url": "https://oss/user-cover.jpg"}
-        mock_lipsync_job = _make_mock_lipsync_job(status="completed", output_duration=10.0)
-        _, job = self._run_execute(mock_job, mock_lipsync_job)
-        assert job.output_cover_url == "https://oss/user-cover.jpg"
-
-    def test_cover_imageurl_fallback_also_passthrough(self):
-        """cover_config.imageUrl（老字段）存在 → 也透传到 output_cover_url."""
-        mock_job = _make_mock_render_job(job_id="render-cov-2", status="pending")
-        mock_job.cover_config = {"mode": "upload", "imageUrl": "https://oss/user-cover2.jpg"}
-        mock_lipsync_job = _make_mock_lipsync_job(status="completed", output_duration=10.0)
-        _, job = self._run_execute(mock_job, mock_lipsync_job)
-        assert job.output_cover_url == "https://oss/user-cover2.jpg"

tests/unit/test_cover_frame_scorer.py

@@ -43,7 +43,7 @@ class TestScoreFrame:
 
     @requires_cv2
     def test_clear_image_high_score(self):
-        """清晰、亮度适中、色彩丰富的图像应得较高分."""
+        """清晰、亮度适中、色彩丰富的图像应得高分."""
         # 创建一个清晰的渐变图像（色彩丰富、亮度适中）
         img = np.zeros((100, 100, 3), dtype=np.uint8)
         for i in range(100):
@@ -53,8 +53,7 @@ class TestScoreFrame:
         from packages.shared.cover_frame_scorer import score_frame
 
         score = score_frame(img)
-        # 渐变图清晰度中等+亮度尚可+色彩有变化，分数应明显高于模糊/全黑/全白
-        assert 40.0 <= score <= 100.0, f"清晰图像应得较高分，实际: {score}"
+        assert 50.0 <= score <= 100.0, f"清晰图像应得高分，实际: {score}"
 
     @requires_cv2
     def test_blurry_image_low_clarity(self):
@@ -77,8 +76,8 @@ class TestScoreFrame:
         from packages.shared.cover_frame_scorer import score_frame
 
         score = score_frame(img)
-        # 全黑：清晰度 0，亮度偏离130扣约24分，色彩 0 → 得分约0~7，允许cv2内部微小浮点差异
-        assert score <= 10.0, f"全黑图像应接近 0 分，实际: {score}"
+        # 全黑：清晰度 0，亮度 0，色彩 0
+        assert score <= 5.0, f"全黑图像应接近 0 分，实际: {score}"
 
     @requires_cv2
     def test_bright_image_low_brightness(self):

tests/unit/test_dedup_v2.py

@@ -180,26 +180,28 @@ class TestDetectKeyframeTimestamps:
 
     def test_cannot_open_video_raises(self):
         """无法打开视频时抛出 RuntimeError."""
+        cv2_mock = _dedup_mod.cv2
         mock_cap = MagicMock()
         mock_cap.isOpened.return_value = False
+        cv2_mock.VideoCapture.return_value = mock_cap
 
         import pytest
 
-        with patch.object(_dedup_mod.cv2, "VideoCapture", return_value=mock_cap):
-            with pytest.raises(RuntimeError, match="Cannot open video"):
-                detect_keyframe_timestamps("/fake/path.mp4")
+        with pytest.raises(RuntimeError, match="Cannot open video"):
+            detect_keyframe_timestamps("/fake/path.mp4")
 
     def test_zero_duration_returns_empty(self):
         """视频时长为 0 时返回空列表."""
+        cv2_mock = _dedup_mod.cv2
         mock_cap = MagicMock()
         mock_cap.isOpened.return_value = True
         # cv2.CAP_PROP_FPS etc. are Mock objects; configure get() to return 0 for frame_count
         mock_cap.get.return_value = 0
         mock_cap.read.return_value = (False, None)
+        cv2_mock.VideoCapture.return_value = mock_cap
 
-        with patch.object(_dedup_mod.cv2, "VideoCapture", return_value=mock_cap):
-            result = detect_keyframe_timestamps("/fake/zero.mp4")
-            assert result == []
+        result = detect_keyframe_timestamps("/fake/zero.mp4")
+        assert result == []
 
     def test_function_signature(self):
         """验证函数签名和默认参数."""

tests/unit/test_generated_video.py

@@ -47,35 +47,32 @@ class TestGeneratedVideoCreate:
         assert video.file_url == "https://example.com/video.mp4"
         assert video.user_id == "user1"
 
-    def test_create_empty_project_id_allowed(self):
-        """project_id 允许为空（AI数字人等无项目场景）。"""
-        video = GeneratedVideo.create(
-            project_id="",
-            generation_task_id="task1",
-            name="视频",
-            file_url="https://example.com/v.mp4",
-        )
-        assert video.project_id == ""
+    def test_create_empty_project_id_raises(self):
+        with pytest.raises(ValueError, match="project_id cannot be empty"):
+            GeneratedVideo.create(
+                project_id="",
+                generation_task_id="task1",
+                name="视频",
+                file_url="https://example.com/v.mp4",
+            )
 
-    def test_create_whitespace_project_id_normalized_to_empty(self):
-        """project_id 纯空白会被 strip 为空串，不抛异常。"""
-        video = GeneratedVideo.create(
-            project_id="   ",
-            generation_task_id="task1",
-            name="视频",
-            file_url="https://example.com/v.mp4",
-        )
-        assert video.project_id == ""
+    def test_create_whitespace_project_id_raises(self):
+        with pytest.raises(ValueError, match="project_id cannot be empty"):
+            GeneratedVideo.create(
+                project_id="   ",
+                generation_task_id="task1",
+                name="视频",
+                file_url="https://example.com/v.mp4",
+            )
 
-    def test_create_empty_generation_task_id_allowed(self):
-        """generation_task_id 允许为空（兼容部分异步链路）。"""
-        video = GeneratedVideo.create(
-            project_id="proj1",
-            generation_task_id="",
-            name="视频",
-            file_url="https://example.com/v.mp4",
-        )
-        assert video.generation_task_id == ""
+    def test_create_empty_generation_task_id_raises(self):
+        with pytest.raises(ValueError, match="generation_task_id cannot be empty"):
+            GeneratedVideo.create(
+                project_id="proj1",
+                generation_task_id="",
+                name="视频",
+                file_url="https://example.com/v.mp4",
+            )
 
     def test_create_empty_name_raises(self):
         with pytest.raises(ValueError, match="name cannot be empty"):

tests/unit/test_generated_video_domain.py

@@ -75,35 +75,32 @@ class TestGeneratedVideoCreate:
         assert video.file_url == "https://example.com/out.mp4"
         assert video.user_id == "user_003"
 
-    def test_create_empty_project_id_allowed(self):
-        """project_id 允许为空（AI数字人等无项目场景）。"""
-        video = GeneratedVideo.create(
-            project_id="",
-            generation_task_id="t",
-            name="n",
-            file_url="u",
-        )
-        assert video.project_id == ""
+    def test_create_empty_project_id_raises(self):
+        with pytest.raises(ValueError, match="project_id"):
+            GeneratedVideo.create(
+                project_id="",
+                generation_task_id="t",
+                name="n",
+                file_url="u",
+            )
 
-    def test_create_whitespace_project_id_normalized(self):
-        """project_id 纯空白归一化为空串。"""
-        video = GeneratedVideo.create(
-            project_id="   ",
-            generation_task_id="t",
-            name="n",
-            file_url="u",
-        )
-        assert video.project_id == ""
+    def test_create_whitespace_project_id_raises(self):
+        with pytest.raises(ValueError, match="project_id"):
+            GeneratedVideo.create(
+                project_id="   ",
+                generation_task_id="t",
+                name="n",
+                file_url="u",
+            )
 
-    def test_create_empty_generation_task_id_allowed(self):
-        """generation_task_id 允许为空。"""
-        video = GeneratedVideo.create(
-            project_id="p",
-            generation_task_id="",
-            name="n",
-            file_url="u",
-        )
-        assert video.generation_task_id == ""
+    def test_create_empty_generation_task_id_raises(self):
+        with pytest.raises(ValueError, match="generation_task_id"):
+            GeneratedVideo.create(
+                project_id="p",
+                generation_task_id="",
+                name="n",
+                file_url="u",
+            )
 
     def test_create_empty_name_raises(self):
         with pytest.raises(ValueError, match="name"):

tests/unit/test_generated_video_verification_code.py

@@ -45,25 +45,25 @@ class TestGeneratedVideo:
         assert video.duplicate_of is None
         assert video.generation_params == {}
 
-    def test_create_empty_project_id_allowed(self):
-        """project_id 允许为空（AI数字人场景），空白归一化为空串."""
-        video = GeneratedVideo.create(
-            project_id="  ",
-            generation_task_id="t1",
-            name="v.mp4",
-            file_url="https://x.com/v.mp4",
-        )
-        assert video.project_id == ""
+    def test_create_empty_project_id_raises(self):
+        """空project_id抛异常."""
+        with pytest.raises(ValueError, match="project_id"):
+            GeneratedVideo.create(
+                project_id="  ",
+                generation_task_id="t1",
+                name="v.mp4",
+                file_url="https://x.com/v.mp4",
+            )
 
-    def test_create_empty_task_id_allowed(self):
-        """generation_task_id 允许为空."""
-        video = GeneratedVideo.create(
-            project_id="p1",
-            generation_task_id="",
-            name="v.mp4",
-            file_url="https://x.com/v.mp4",
-        )
-        assert video.generation_task_id == ""
+    def test_create_empty_task_id_raises(self):
+        """空generation_task_id抛异常."""
+        with pytest.raises(ValueError, match="generation_task_id"):
+            GeneratedVideo.create(
+                project_id="p1",
+                generation_task_id="",
+                name="v.mp4",
+                file_url="https://x.com/v.mp4",
+            )
 
     def test_create_empty_name_raises(self):
         """空name抛异常."""

tests/unit/test_lipsync_routes.py

@@ -208,21 +208,24 @@ class TestLipsyncServiceUnit:
     """Service 层单元测试（纯 mock，不依赖数据库）— #1809 更新."""
 
     def test_create_job_success(self, mock_mediakit, mock_cosyvoice):
-        """TTS 直生——v4 异步模式：create_job 只创建 DB 记录 + dispatch Celery 任务."""
+        """v3: TTS 直生——service 内部 submit_synthesize_task 合成后转存 OSS，再提交 MediaKit."""
         from app.services.lipsync_service import LipsyncService
 
         mock_db = MagicMock()
         mock_repo = MagicMock()
         mock_repo.get.return_value = None  # 预置音色，原样返回 voice_id
 
-        with patch(
-            "app.services.lipsync_service.tts_synthesize_and_submit"
-        ) as mock_task:
-            mock_task.apply_async.return_value = MagicMock(id="celery-task-123")
+        with (
+            patch("app.services.lipsync_service.get_shared_storage_service") as storage_patch,
+            patch("app.services.lipsync_service.safe_download_bytes") as dl_patch,
+        ):
+            storage_patch.return_value.upload_file.return_value = "https://my-oss/tts.mp3"
+            dl_patch.return_value = b"audio-bytes"
 
             svc = LipsyncService(
                 mock_db,
                 client=mock_mediakit,
+                cosyvoice_service=mock_cosyvoice,
                 voice_clone_repo=mock_repo,
             )
 
@@ -235,23 +238,32 @@ class TestLipsyncServiceUnit:
                 emotion="兴奋",
             )
 
-        # TTS 模式：异步返回，状态为 tts_processing
-        assert job.status == "tts_processing"
-        assert not job.audio_url  # TTS 音频尚未合成（默认空字符串）
-        # 不直接调用 CosyVoice
-        mock_cosyvoice.submit_synthesize_task.assert_not_called()
-        # dispatch 了 Celery 任务
-        mock_task.apply_async.assert_called_once()
+        assert job.status == "submitted"
+        assert job.mediakit_task_id == "mk-task-123"
+        # TTS 直生走 submit_synthesize_task，带语速/情绪
+        mock_cosyvoice.submit_synthesize_task.assert_called_once()
+        _, kwargs = mock_cosyvoice.submit_synthesize_task.call_args
+        assert kwargs["text"] == "大家好，欢迎来到直播间"
+        assert kwargs["voice_id"] == "longxiaochun_v3"
+        assert kwargs["speed"] == 1.2
+        assert kwargs["emotion"] == "excited"  # 兴奋→excited
         # job 记录透传字段
         assert job.speed == 1.2
         assert job.emotion == "excited"
-        # MediaKit 尚未提交（由 Celery 任务处理）
-        mock_mediakit.submit_lipsync.assert_not_called()
+        # MediaKit 用转存后的 OSS audio_url
+        call_kwargs = mock_mediakit.submit_lipsync.call_args
+        assert call_kwargs.kwargs["audio_url"] == "https://my-oss/tts.mp3"
 
     def test_create_job_tts_failure(self, mock_mediakit):
-        """v4: TTS 模式下 create_job 不再同步失败，而是 dispatch Celery 任务。
-        TTS 合成失败由 Celery 任务内部处理（见 test_lipsync_speed_optimization.py）。"""
+        """v3: TTS 合成失败时，CosyVoiceError 被包装为 MediaKitError(TTSSynthesisFailed)，
+        在建 DB 记录之前抛出，不提交 MediaKit。"""
         from app.services.lipsync_service import LipsyncService
+        from app.services.mediakit_client import MediaKitError
+
+        from packages.application.cosyvoice_service import CosyVoiceError
+
+        mock_cosyvoice = MagicMock()
+        mock_cosyvoice.submit_synthesize_task.side_effect = CosyVoiceError("Arrearage 欠费")
 
         mock_db = MagicMock()
         mock_repo = MagicMock()
@@ -260,41 +272,38 @@ class TestLipsyncServiceUnit:
         svc = LipsyncService(
             mock_db,
             client=mock_mediakit,
+            cosyvoice_service=mock_cosyvoice,
             voice_clone_repo=mock_repo,
         )
 
-        with patch(
-            "app.services.lipsync_service.tts_synthesize_and_submit"
-        ) as mock_task:
-            mock_task.apply_async.return_value = MagicMock(id="celery-task-456")
-
-            job = svc.create_job(
+        with pytest.raises(MediaKitError) as exc_info:
+            svc.create_job(
                 user_id="user-1",
                 video_url="https://example.com/video.mp4",
                 voice_id="longxiaochun_v3",
                 script_text="测试文本",
             )
+        assert exc_info.value.code == "TTSSynthesisFailed"
 
-        # TTS 模式下 create_job 成功返回，状态为 tts_processing
-        assert job.status == "tts_processing"
+        # 不应提交到 MediaKit
         mock_mediakit.submit_lipsync.assert_not_called()
-        mock_task.apply_async.assert_called_once()
 
-    def test_create_job_api_failure(self, mock_mediakit):
-        """MediaKit 提交失败（直传音频模式同步触发）."""
+    def test_create_job_api_failure(self, mock_mediakit, mock_cosyvoice):
+        """MediaKit 提交失败."""
         from app.services.lipsync_service import LipsyncService
         from app.services.mediakit_client import MediaKitError
 
         mock_mediakit.submit_lipsync.side_effect = MediaKitError("API 调用失败", code="SubmitFailed")
 
         mock_db = MagicMock()
-        svc = LipsyncService(mock_db, client=mock_mediakit)
+        svc = LipsyncService(mock_db, client=mock_mediakit, cosyvoice_service=mock_cosyvoice)
 
         with pytest.raises(MediaKitError, match="API 调用失败"):
             svc.create_job(
                 user_id="user-1",
                 video_url="https://example.com/video.mp4",
-                audio_url="https://example.com/audio.mp3",
+                voice_id="longxiaochun_v3",
+                script_text="测试文本",
             )
 
     def test_get_job_delegates_to_db(self, mock_mediakit, mock_cosyvoice):
@@ -425,21 +434,24 @@ class TestLipsyncServiceUnit:
         assert result.status == "completed"
 
     def test_create_job_stores_tts_audio_url(self, mock_mediakit, mock_cosyvoice):
-        """v4: TTS 模式下 create_job 返回 tts_processing 状态，audio_url 尚未设置（由 Celery 任务处理）."""
+        """v3: TTS 直生模式下 job.audio_url 为转存到自家 OSS 的永久地址."""
         from app.services.lipsync_service import LipsyncService
 
         mock_db = MagicMock()
         mock_repo = MagicMock()
         mock_repo.get.return_value = None
 
-        with patch(
-            "app.services.lipsync_service.tts_synthesize_and_submit"
-        ) as mock_task:
-            mock_task.apply_async.return_value = MagicMock(id="celery-task-789")
+        with (
+            patch("app.services.lipsync_service.get_shared_storage_service") as storage_patch,
+            patch("app.services.lipsync_service.safe_download_bytes") as dl_patch,
+        ):
+            storage_patch.return_value.upload_file.return_value = "https://my-oss/permanent.mp3"
+            dl_patch.return_value = b"audio-bytes"
 
             svc = LipsyncService(
                 mock_db,
                 client=mock_mediakit,
+                cosyvoice_service=mock_cosyvoice,
                 voice_clone_repo=mock_repo,
             )
             job = svc.create_job(
@@ -449,11 +461,8 @@ class TestLipsyncServiceUnit:
                 script_text="这是一段测试文本",
             )
 
-        # TTS 模式下 create_job 返回 tts_processing 状态
-        assert job.status == "tts_processing"
-        # audio_url 尚未设置（由 Celery 任务异步处理），模型默认为空字符串
-        assert not job.audio_url
-        mock_task.apply_async.assert_called_once()
+        # job.audio_url 是转存 OSS 后的永久地址
+        assert job.audio_url == "https://my-oss/permanent.mp3"
 
     def test_create_job_direct_audio_skips_tts(self, mock_mediakit, mock_cosyvoice):
         """v3: 直接音频模式（传 audio_url）不触发 TTS，原样把 audio_url 提交 MediaKit."""
@@ -539,9 +548,9 @@ class TestErrorHandling:
         assert exc_info.value.code == "VoiceNotReady"
 
     def test_tts_value_error_mapped_to_invalid_param(self, mock_mediakit):
-        """v4: TTS 模式下 create_job 不再同步调用 CosyVoice，
-        而是 dispatch Celery 任务。ValueError 由 Celery 任务内部处理。"""
+        """v3: CosyVoice 抛 ValueError（参数无效）被包装为 TTSInvalidParam（路由映射 400）."""
         from app.services.lipsync_service import LipsyncService
+        from app.services.mediakit_client import MediaKitError
 
         mock_cosyvoice = MagicMock()
         mock_cosyvoice.submit_synthesize_task.side_effect = ValueError("voice_id 为空")
@@ -553,27 +562,18 @@ class TestErrorHandling:
         svc = LipsyncService(
             mock_db,
             client=mock_mediakit,
+            cosyvoice_service=mock_cosyvoice,
             voice_clone_repo=mock_repo,
         )
 
-        with patch(
-            "app.services.lipsync_service.tts_synthesize_and_submit"
-        ) as mock_task:
-            mock_task.apply_async.return_value = MagicMock(id="celery-task-789")
-
-            # TTS 模式下 create_job 不再同步失败
-            job = svc.create_job(
+        with pytest.raises(MediaKitError) as exc_info:
+            svc.create_job(
                 user_id="user-1",
                 video_url="https://example.com/video.mp4",
                 voice_id="some-voice",
                 script_text="test",
             )
-
-        # 确认返回 tts_processing 状态
-        assert job.status == "tts_processing"
-        # TTS 合成由 Celery 任务处理，不直接调用 CosyVoice
-        mock_cosyvoice.submit_synthesize_task.assert_not_called()
-        mock_task.apply_async.assert_called_once()
+        assert exc_info.value.code == "TTSInvalidParam"
 
     def test_missing_both_inputs_raises_invalid_input(self, mock_mediakit, mock_cosyvoice):
         """v3: 既无 audio_url 又无 voice_id+script_text 时抛 InvalidInput（路由映射 400）."""
@@ -596,113 +596,3 @@ class TestErrorHandling:
         assert exc_info.value.code == "InvalidInput"
         mock_cosyvoice.submit_synthesize_task.assert_not_called()
         mock_mediakit.submit_lipsync.assert_not_called()
-
-
-class TestSignMediaUrl403Fix:
-    """#1839 私有桶 OSS URL 重签：MediaKit GPU worker 拉取裸/过期 URL 会 403.
-
-    - 自家 OSS 的裸 public_url / 已过期短预签名 → 重签 7 天长有效期
-    - 外部临时 URL（CosyVoice/MediaKit）→ 原样透传
-    - 签名异常 → 降级原 URL，不阻断
-    """
-
-    OSS_PUBLIC_BASE = "https://xiaoxia-autocut.oss-cn-hangzhou.aliyuncs.com"
-
-    def _svc(self, mock_mediakit, mock_cosyvoice):
-        from app.services.lipsync_service import LipsyncService
-
-        return LipsyncService(
-            MagicMock(),
-            client=mock_mediakit,
-            cosyvoice_service=mock_cosyvoice,
-            voice_clone_repo=MagicMock(),
-        )
-
-    def test_own_oss_unsigned_url_gets_resigned(self, mock_mediakit, mock_cosyvoice):
-        """裸 public_url（不带签名，私有桶匿名 403）必须被重签."""
-        from app.services.lipsync_service import MEDIAKIT_URL_TTL_SECONDS
-
-        svc = self._svc(mock_mediakit, mock_cosyvoice)
-        raw = f"{self.OSS_PUBLIC_BASE}/lipsync-tts/user-1/audio.mp3"
-        signed = raw + "?Expires=999&Signature=abc&OSSAccessKeyId=key"
-
-        storage = MagicMock()
-        storage.public_url = self.OSS_PUBLIC_BASE
-        storage.get_download_url.return_value = signed
-        with patch("app.services.lipsync_service.get_shared_storage_service", return_value=storage):
-            out = svc._sign_media_url(raw)
-
-        assert out == signed
-        storage.get_download_url.assert_called_once_with(raw, expires_seconds=MEDIAKIT_URL_TTL_SECONDS)
-        assert MEDIAKIT_URL_TTL_SECONDS == 7 * 24 * 3600
-
-    def test_own_oss_expired_presign_gets_resigned(self, mock_mediakit, mock_cosyvoice):
-        """已带过期签名的旧预签名 URL 也要抽 key 后重签（不把旧 query 带进新签名）."""
-        svc = self._svc(mock_mediakit, mock_cosyvoice)
-        old = f"{self.OSS_PUBLIC_BASE}/avatar/video.mp4?Expires=111&Signature=old"
-        fresh = f"{self.OSS_PUBLIC_BASE}/avatar/video.mp4?Expires=999&Signature=fresh"
-
-        storage = MagicMock()
-        storage.public_url = self.OSS_PUBLIC_BASE
-        storage.get_download_url.return_value = fresh
-        with patch("app.services.lipsync_service.get_shared_storage_service", return_value=storage):
-            out = svc._sign_media_url(old)
-
-        assert out == fresh
-        # 传给 get_download_url 的是原始完整 URL（内部抽 key），有效期 7 天
-        called_url = storage.get_download_url.call_args.args[0]
-        assert called_url == old
-
-    def test_external_url_passthrough(self, mock_mediakit, mock_cosyvoice):
-        """CosyVoice/MediaKit 外部临时链接不处理，原样透传."""
-        svc = self._svc(mock_mediakit, mock_cosyvoice)
-        external = "https://cv-tts.cosyvoice.aliyuncs.com/output/x.mp3"
-
-        storage = MagicMock()
-        storage.public_url = self.OSS_PUBLIC_BASE
-        with patch("app.services.lipsync_service.get_shared_storage_service", return_value=storage):
-            out = svc._sign_media_url(external)
-
-        assert out == external
-        storage.get_download_url.assert_not_called()
-
-    def test_empty_url_returns_empty(self, mock_mediakit, mock_cosyvoice):
-        svc = self._svc(mock_mediakit, mock_cosyvoice)
-        assert svc._sign_media_url("") == ""
-
-    def test_sign_error_falls_back_to_raw(self, mock_mediakit, mock_cosyvoice):
-        """签名抛异常时降级返回原 URL，不阻断对口型提交."""
-        svc = self._svc(mock_mediakit, mock_cosyvoice)
-        raw = f"{self.OSS_PUBLIC_BASE}/lipsync-tts/u/a.mp3"
-
-        storage = MagicMock()
-        storage.public_url = self.OSS_PUBLIC_BASE
-        storage.get_download_url.side_effect = RuntimeError("oss down")
-        with patch("app.services.lipsync_service.get_shared_storage_service", return_value=storage):
-            out = svc._sign_media_url(raw)
-
-        assert out == raw
-
-    def test_create_job_resigns_oss_urls_before_submit(self, mock_mediakit, mock_cosyvoice):
-        """端到端：create_job 提交 MediaKit 前，自家 OSS 的 video_url 必须是重签后的长签名 URL."""
-        svc = self._svc(mock_mediakit, mock_cosyvoice)
-        raw_video = f"{self.OSS_PUBLIC_BASE}/avatar/person.mp4"
-        signed_video = raw_video + "?Expires=999&Signature=fresh"
-        raw_audio = f"{self.OSS_PUBLIC_BASE}/direct/audio.mp3"
-        signed_audio = raw_audio + "?Expires=999&Signature=afresh"
-
-        storage = MagicMock()
-        storage.public_url = self.OSS_PUBLIC_BASE
-        storage.get_download_url.side_effect = lambda u, expires_seconds=0: (
-            signed_video if u == raw_video else signed_audio
-        )
-        with patch("app.services.lipsync_service.get_shared_storage_service", return_value=storage):
-            svc.create_job(
-                user_id="user-1",
-                video_url=raw_video,
-                audio_url=raw_audio,
-            )
-
-        kw = mock_mediakit.submit_lipsync.call_args.kwargs
-        assert kw["video_url"] == signed_video
-        assert kw["audio_url"] == signed_audio

tests/unit/test_lipsync_speed_optimization.py

@@ -1,334 +0,0 @@
-"""AI 数字人口型视频生成速度优化 — 单元测试.
-
-验证两个优化点：
-1. FFmpeg 编码 preset 从 fast 改为 veryfast（提速 30~50%）
-2. TTS 合成从同步改为 Celery 异步任务（API 响应从 6~35s 降到 <1s）
-
-Issue: lipsync-speed-optimization
-"""
-
-import os
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-os.environ.setdefault("JWT_SECRET_KEY", "dev-secret-key-for-testing")
-
-
-# ═══════════════════════════════════════════════════════════════════════════════
-# 优化1: FFmpeg 编码提速 — preset veryfast
-# ═══════════════════════════════════════════════════════════════════════════════
-
-
-class TestFFmpegPresetOptimization:
-    """验证 FFmpeg 编码命令从 -preset fast 改为 -preset veryfast."""
-
-    def test_preset_is_veryfast(self):
-        """_build_ffmpeg_command 输出必须包含 -preset veryfast."""
-        from app.services.ai_avatar_render_service import AiAvatarRenderService
-
-        svc = AiAvatarRenderService.__new__(AiAvatarRenderService)
-        cmd = svc._build_ffmpeg_command(
-            input_video="https://example.com/video.mp4",
-            b_roll_segments=[],
-            filter_complex="",
-            final_label=None,
-            output_path="/tmp/output.mp4",
-        )
-        # cmd 现在是 list[str]；preset 与值是相邻两个元素
-        assert "-preset" in cmd, f"期望包含 -preset，实际命令: {cmd}"
-        preset_idx = cmd.index("-preset")
-        assert cmd[preset_idx + 1] == "veryfast", f"期望 veryfast，实际: {cmd}"
-
-    def test_preset_veryfast_with_filter(self):
-        """带滤镜场景下也必须使用 veryfast."""
-        from app.services.ai_avatar_render_service import AiAvatarRenderService
-
-        svc = AiAvatarRenderService.__new__(AiAvatarRenderService)
-        cmd = svc._build_ffmpeg_command(
-            input_video="https://example.com/video.mp4",
-            b_roll_segments=[],
-            filter_complex="overlay=0:0",
-            final_label="[v]",
-            output_path="/tmp/output.mp4",
-        )
-        assert "-preset" in cmd
-        assert cmd[cmd.index("-preset") + 1] == "veryfast"
-        assert "-filter_complex" in cmd
-
-    def test_preset_not_fast(self):
-        """确保不再使用旧的 -preset fast."""
-        from app.services.ai_avatar_render_service import AiAvatarRenderService
-
-        svc = AiAvatarRenderService.__new__(AiAvatarRenderService)
-        cmd = svc._build_ffmpeg_command(
-            input_video="https://example.com/video.mp4",
-            b_roll_segments=[],
-            filter_complex="",
-            final_label=None,
-            output_path="/tmp/output.mp4",
-        )
-        # 确保是 veryfast 而不是 fast
-        assert "-preset" in cmd
-        preset_idx = cmd.index("-preset")
-        assert cmd[preset_idx + 1] == "veryfast"
-        # 禁止 fast 单独作为 preset 值（veryfast 包含 "fast" 子串，不影响）
-        assert cmd[preset_idx + 1] != "fast"
-
-
-# ═══════════════════════════════════════════════════════════════════════════════
-# 优化2: TTS 合成 Celery 异步化
-# ═══════════════════════════════════════════════════════════════════════════════
-
-
-def _make_service_with_mocks():
-    """构造 LipsyncService 测试实例及 mock 依赖."""
-    from app.services.lipsync_service import LipsyncService
-
-    db = MagicMock()
-    client = MagicMock()
-    client.is_available = True
-    client.submit_lipsync.return_value = {
-        "success": True,
-        "task_id": "mk-1",
-        "request_id": "req-1",
-    }
-    cosy = MagicMock()
-    cosy.submit_synthesize_task.return_value = {
-        "audio_url": "https://tts/raw.mp3",
-        "request_id": "tts-req",
-        "audio_duration": 3.0,
-    }
-    svc = LipsyncService(db, client=client, cosyvoice_service=cosy, voice_clone_repo=MagicMock())
-    # _resolve_voice_id 默认原样返回（repo.get 返回 None）
-    svc._voice_clone_repo.get.return_value = None
-    return svc, client, cosy
-
-
-class TestCreateJobAsyncTTS:
-    """验证 TTS 模式改为 Celery 异步后的行为."""
-
-    def test_tts_mode_returns_tts_processing_status(self):
-        """TTS 模式下 create_job 立即返回，状态为 tts_processing."""
-        svc, client, cosy = _make_service_with_mocks()
-
-        with patch("app.services.lipsync_service.tts_synthesize_and_submit") as mock_task:
-            mock_task.apply_async = MagicMock()
-
-            job = svc.create_job(
-                user_id="user-1",
-                video_url="https://example.com/video.mp4",
-                voice_id="longxiaochun_v3",
-                script_text="大家好",
-                speed=1.0,
-                emotion="",
-            )
-
-        assert job.status == "tts_processing"
-
-    def test_tts_mode_dispatches_celery_task(self):
-        """TTS 模式必须 dispatch Celery 异步任务."""
-        svc, client, cosy = _make_service_with_mocks()
-
-        with patch("app.services.lipsync_service.tts_synthesize_and_submit") as mock_task:
-            mock_task.apply_async = MagicMock()
-
-            svc.create_job(
-                user_id="user-1",
-                video_url="https://example.com/video.mp4",
-                voice_id="v-1",
-                script_text="测试文本",
-            )
-
-        mock_task.apply_async.assert_called_once()
-        call_kwargs = mock_task.apply_async.call_args
-        args = call_kwargs.kwargs.get("args") or call_kwargs[1].get("args", call_kwargs[0][0] if call_kwargs[0] else ())
-        assert args[1] == "user-1"  # user_id
-        assert args[2] == "v-1"  # voice_id
-        assert args[3] == "测试文本"  # script_text
-
-    def test_tts_mode_celery_dispatch_failure_marks_job_failed(self):
-        """Celery dispatch 失败时，job 标为 failed 并写入 error_message，前端轮询能直接看到错误."""
-        svc, client, cosy = _make_service_with_mocks()
-
-        with patch("app.services.lipsync_service.tts_synthesize_and_submit") as mock_task:
-            mock_task.apply_async = MagicMock(side_effect=Exception("Celery broker down"))
-
-            job = svc.create_job(
-                user_id="user-1",
-                video_url="https://example.com/video.mp4",
-                voice_id="v-1",
-                script_text="测试文本",
-            )
-
-        # job 已创建且状态标为 failed
-        assert job is not None
-        assert job.status == "failed"
-        assert "Celery 任务投递失败" in job.error_message
-        assert job.error_code == "AsyncDispatchFailed"
-        # MediaKit 未被调用
-        client.submit_lipsync.assert_not_called()
-
-    def test_tts_mode_voice_validation_still_sync(self):
-        """TTS 模式下音色校验仍在 HTTP 请求中同步执行."""
-        from app.services.mediakit_client import MediaKitError
-
-        svc, client, cosy = _make_service_with_mocks()
-        # 模拟音色属于其他用户
-        other_profile = MagicMock()
-        other_profile.user_id = "user-other"
-        svc._voice_clone_repo.get.return_value = other_profile
-
-        with patch("app.tasks.lipsync_tts.tts_synthesize_and_submit"):
-            with pytest.raises(MediaKitError) as exc:
-                svc.create_job(
-                    user_id="user-1",
-                    video_url="https://example.com/video.mp4",
-                    voice_id="clone-profile-id",
-                    script_text="测试",
-                )
-        assert exc.value.code == "VoiceForbidden"
-
-    def test_tts_mode_missing_input_raises_immediately(self):
-        """缺少 voice_id 或 script_text 时立即报错，不 dispatch Celery 任务."""
-        from app.services.mediakit_client import MediaKitError
-
-        svc, client, cosy = _make_service_with_mocks()
-
-        with patch("app.tasks.lipsync_tts.tts_synthesize_and_submit") as mock_task:
-            mock_task.delay = MagicMock()
-
-            with pytest.raises(MediaKitError) as exc:
-                svc.create_job(
-                    user_id="user-1",
-                    video_url="https://example.com/video.mp4",
-                    # 缺少 voice_id 和 script_text
-                )
-            assert exc.value.code == "InvalidInput"
-
-        # Celery 任务未被 dispatch
-        mock_task.delay.assert_not_called()
-        # TTS 和 MediaKit 均未调用
-        cosy.submit_synthesize_task.assert_not_called()
-        client.submit_lipsync.assert_not_called()
-
-
-class TestCreateJobDirectAudio:
-    """验证直接音频模式不受异步化影响."""
-
-    def test_direct_audio_still_submits_synchronously(self):
-        """直接音频模式仍然同步提交 MediaKit，状态为 submitted."""
-        svc, client, cosy = _make_service_with_mocks()
-
-        with patch("app.tasks.lipsync_tts.tts_synthesize_and_submit") as mock_task:
-            mock_task.delay = MagicMock()
-
-            job = svc.create_job(
-                user_id="user-1",
-                video_url="https://example.com/video.mp4",
-                audio_url="https://example.com/audio.mp3",
-            )
-
-        assert job.status == "submitted"
-        assert job.mediakit_task_id == "mk-1"
-        client.submit_lipsync.assert_called_once()
-        # TTS Celery 任务不应被调用
-        mock_task.delay.assert_not_called()
-
-    def test_direct_audio_skips_tts(self):
-        """直接音频模式不调用 CosyVoice TTS."""
-        svc, client, cosy = _make_service_with_mocks()
-
-        job = svc.create_job(
-            user_id="user-1",
-            video_url="https://example.com/video.mp4",
-            audio_url="https://example.com/audio.mp3",
-        )
-
-        cosy.submit_synthesize_task.assert_not_called()
-        call_kwargs = client.submit_lipsync.call_args
-        assert call_kwargs.kwargs["audio_url"] == "https://example.com/audio.mp3"
-
-
-class TestCancelJobTtsProcessing:
-    """验证 tts_processing 状态的任务可以被取消."""
-
-    def test_cancel_tts_processing(self):
-        """tts_processing 状态的任务可以成功取消."""
-        svc, client, cosy = _make_service_with_mocks()
-
-        mock_job = MagicMock()
-        mock_job.status = "tts_processing"
-        mock_job.id = "job-1"
-        svc.get_job = MagicMock(return_value=mock_job)
-
-        result = svc.cancel_job("job-1", "user-1")
-        assert result.status == "cancelled"
-
-    def test_cancel_pending_still_works(self):
-        """pending 状态仍可取消."""
-        svc, client, cosy = _make_service_with_mocks()
-
-        mock_job = MagicMock()
-        mock_job.status = "pending"
-        mock_job.id = "job-1"
-        svc.get_job = MagicMock(return_value=mock_job)
-
-        result = svc.cancel_job("job-1", "user-1")
-        assert result.status == "cancelled"
-
-    def test_cancel_submitted_still_works(self):
-        """submitted 状态仍可取消."""
-        svc, client, cosy = _make_service_with_mocks()
-
-        mock_job = MagicMock()
-        mock_job.status = "submitted"
-        mock_job.id = "job-1"
-        svc.get_job = MagicMock(return_value=mock_job)
-
-        result = svc.cancel_job("job-1", "user-1")
-        assert result.status == "cancelled"
-
-
-class TestCreateJobCommitOrder:
-    """验证事务顺序修复：create_job 必须先 commit 再发 Celery 任务，避免 worker 消费时 job 不可见。"""
-
-    def test_commit_called_before_apply_async_in_tts_mode(self):
-        """TTS 模式：db.commit() 必须在 apply_async() 之前调用，防止 worker 查不到 job 永远卡在 tts_processing。"""
-        svc, client, cosy = _make_service_with_mocks()
-        call_order: list[str] = []
-
-        def track_commit():
-            call_order.append("commit")
-
-        def track_apply_async(*args, **kwargs):
-            call_order.append("apply_async")
-
-        svc.db.commit.side_effect = track_commit
-
-        with patch("app.services.lipsync_service.tts_synthesize_and_submit") as mock_task:
-            mock_task.apply_async = MagicMock(side_effect=track_apply_async)
-            svc.create_job(
-                user_id="user-1",
-                video_url="https://example.com/video.mp4",
-                voice_id="v-1",
-                script_text="测试",
-            )
-
-        # 至少有一次 commit 在 apply_async 之前
-        assert "commit" in call_order, "db.commit 必须被调用"
-        assert "apply_async" in call_order, "apply_async 必须被调用"
-        assert call_order.index("commit") < call_order.index(
-            "apply_async"
-        ), f"事务顺序错误：commit 必须在 apply_async 之前，实际顺序 {call_order}"
-
-    def test_job_not_found_retry_mechanism_exists(self):
-        """worker 侧 job not found 必须有重试机制（self.retry），而不是静默 return。"""
-        import inspect
-
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        source = inspect.getsource(tts_synthesize_and_submit.run)
-        assert (
-            "self.retry" in source or "retry" in source
-        ), "tts_synthesize_and_submit 在 job not found 时必须重试，防止静默失败"

tests/unit/test_lipsync_tts.py

@@ -1,628 +0,0 @@
-"""AI 数字人口型 TTS Celery 异步任务 — 单元测试.
-
-覆盖 lipsync_tts.py 的全部主要分支：
-- Job 不存在/cancelled/正常/异常路径
-- TTS 合成、音频下载、OSS 上传、MediaKit 提交
-- CosyVoiceError/ValueError/MediaKitError/顶层异常等错误码
-"""
-
-import os
-import sys
-import types
-from types import ModuleType
-from unittest.mock import MagicMock, patch
-
-os.environ.setdefault("JWT_SECRET_KEY", "dev-secret-key-for-testing")
-
-
-class _FakeQuery:
-    """模拟 SQLAlchemy query.filter().first() 链式调用."""
-
-    def __init__(self, job):
-        self._job = job
-
-    def filter(self, *args, **kwargs):
-        return self
-
-    def first(self):
-        return self._job
-
-
-def _make_fake_job(**kwargs):
-    """构造可 setattr 的 job 记录."""
-    job = MagicMock()
-    job.id = kwargs.get("job_id", "job-1")
-    job.user_id = kwargs.get("user_id", "user-1")
-    job.status = kwargs.get("status", "tts_processing")
-    job.audio_url = kwargs.get("audio_url", "")
-    job.video_url = kwargs.get("video_url", "https://oss/video.mp4")
-    job.mediakit_task_id = kwargs.get("mediakit_task_id", "")
-    job.enable_video_loop = kwargs.get("enable_video_loop", False)
-    job.error_code = ""
-    job.error_message = ""
-    job.submitted_at = None
-    job.updated_at = None
-    return job
-
-
-def _build_session(job):
-    """构造 mock DB session + factory. 返回 (session, factory)."""
-    session = MagicMock()
-    session.query.return_value = _FakeQuery(job)
-    session.commit = MagicMock()
-    session.close = MagicMock()
-    factory = MagicMock(return_value=session)
-    return session, factory
-
-
-def _apply_all_patches(
-    *,
-    job=None,
-    cosyvoice_service=None,
-    cosyvoice_side_effect=None,
-    cosyvoice_error=None,
-    download_bytes=b"AUDIO",
-    download_error=None,
-    storage=None,
-    mk_client=None,
-    mk_submit_return=None,
-    mk_submit_error=None,
-):
-    """统一构造测试需要的 patch 列表.
-
-    lipsync_tts.run() 在函数体内部懒 import 多个模块，通过 sys.modules 注入
-    伪造包路径避免真实导入；对存在的模块用 patch() 替换返回值/side_effect。
-    """
-    # SessionLocal 通过懒探测获取（Worker 用 worker_app.db，API 用 app.db），
-    # 测试环境里两个模块都能被真实导入，必须同时 mock 保证用的是 fake session。
-    fake_app_db = ModuleType("app.db")
-    fake_worker_db = ModuleType("worker_app.db")
-    session, factory = _build_session(job)
-    fake_app_db.SessionLocal = factory
-    fake_worker_db.SessionLocal = factory
-
-    patches = [
-        patch.dict(sys.modules, {"app.db": fake_app_db, "worker_app.db": fake_worker_db}),
-        patch(
-            "app.tasks.lipsync_tts._sign_media_url",
-            side_effect=lambda url: url + "?signed" if url else url,
-        ),
-    ]
-
-    # CosyVoice
-    if cosyvoice_service is not None:
-        cosy_instance = cosyvoice_service
-    else:
-        cosy_instance = MagicMock()
-        if cosyvoice_side_effect is not None:
-            cosy_instance.submit_synthesize_task.side_effect = cosyvoice_side_effect
-        elif cosyvoice_error is not None:
-            cosy_instance.submit_synthesize_task.side_effect = cosyvoice_error
-        else:
-            cosy_instance.submit_synthesize_task.return_value = {"audio_url": "https://tts/raw.mp3"}
-    patches.append(patch("packages.application.cosyvoice_service.CosyVoiceService", return_value=cosy_instance))
-
-    # safe_download_bytes
-    if download_error is not None:
-        patches.append(patch("packages.shared.url_security.safe_download_bytes", side_effect=download_error))
-    else:
-        patches.append(patch("packages.shared.url_security.safe_download_bytes", return_value=download_bytes))
-
-    # Storage
-    if storage is None:
-        storage = MagicMock()
-        storage.public_url = "https://oss.example.com"
-        storage.upload_file.return_value = "https://oss.example.com/tts.mp3"
-    patches.append(patch("packages.shared.storage.get_shared_storage_service", return_value=storage))
-
-    # MediaKit client
-    if mk_client is not None:
-        patches.append(patch("app.services.mediakit_client.get_mediakit_client", return_value=mk_client))
-    else:
-        client = MagicMock()
-        if mk_submit_error is not None:
-            client.submit_lipsync.side_effect = mk_submit_error
-        else:
-            client.submit_lipsync.return_value = mk_submit_return or {"task_id": "mk-1"}
-        patches.append(patch("app.services.mediakit_client.get_mediakit_client", return_value=client))
-
-    return session, patches
-
-
-class TestTtsSynthesizeAndSubmit:
-    """测试 Celery 任务 tts_synthesize_and_submit.run 的所有分支."""
-
-    def test_job_not_found_returns_early(self):
-        """Job 不存在 → 日志报错直接返回，不抛异常."""
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        session, patches = _apply_all_patches(job=None)
-        entered = [p.__enter__() for p in patches]
-        try:
-            tts_synthesize_and_submit.run("missing-job", "user-1", "v1", "你好", 1.0, "")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        session.commit.assert_not_called()
-        session.close.assert_called_once()
-
-    def test_cancelled_job_skipped(self):
-        """Job 已 cancelled → 跳过不处理，不调用 TTS/MediaKit."""
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        job = _make_fake_job(status="cancelled")
-        session, patches = _apply_all_patches(job=job)
-        entered = [p.__enter__() for p in patches]
-        try:
-            tts_synthesize_and_submit.run("job-1", "user-1", "v1", "你好", 1.0, "")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        # cancelled 不应 commit，不应触发 TTS/MediaKit
-        session.commit.assert_not_called()
-        session.close.assert_called_once()
-
-    def test_happy_path_tts_to_mediakit(self):
-        """完整正常流程：TTS 合成 → OSS 上传 → 签名 → 提交 MediaKit → submitted."""
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        job = _make_fake_job()
-        mk_client = MagicMock()
-        mk_client.submit_lipsync.return_value = {"task_id": "mk-999"}
-        session, patches = _apply_all_patches(job=job, mk_client=mk_client)
-        entered = [p.__enter__() for p in patches]
-        try:
-            tts_synthesize_and_submit.run("job-1", "user-1", "v1", "你好世界", 1.0, "happy")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        assert job.status == "submitted"
-        assert job.mediakit_task_id == "mk-999"
-        assert job.error_code == ""
-        mk_client.submit_lipsync.assert_called_once()
-        call_kwargs = mk_client.submit_lipsync.call_args.kwargs
-        assert call_kwargs["client_token"] == "job-1"
-        # CosyVoice 临时 URL 经 _sign_media_url 透传（mock 统一追加 ?signed），
-        # 自家 OSS 才会被重签，外部 URL 原样透传；job.audio_url 存原始临时 URL
-        assert call_kwargs["audio_url"] == "https://tts/raw.mp3?signed"
-        assert job.audio_url == "https://tts/raw.mp3"
-        session.commit.assert_called()
-        session.close.assert_called_once()
-
-    def test_cosyvoice_error_marks_tts_synthesis_failed(self):
-        """CosyVoiceError → failed, error_code=TTSSynthesisFailed."""
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        from packages.application.cosyvoice_service import CosyVoiceError
-
-        job = _make_fake_job()
-        session, patches = _apply_all_patches(job=job, cosyvoice_error=CosyVoiceError("tts boom"))
-        entered = [p.__enter__() for p in patches]
-        try:
-            tts_synthesize_and_submit.run("job-1", "user-1", "v1", "你好", 1.0, "")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        assert job.status == "failed"
-        assert job.error_code == "TTSSynthesisFailed"
-        session.close.assert_called_once()
-
-    def test_value_error_marks_tts_invalid_param(self):
-        """ValueError（参数错误）→ failed, error_code=TTSInvalidParam."""
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        job = _make_fake_job()
-        session, patches = _apply_all_patches(job=job, cosyvoice_side_effect=ValueError("bad param"))
-        entered = [p.__enter__() for p in patches]
-        try:
-            tts_synthesize_and_submit.run("job-1", "user-1", "v1", "你好", -1.0, "")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        assert job.status == "failed"
-        assert job.error_code == "TTSInvalidParam"
-        session.close.assert_called_once()
-
-    def test_no_audio_url_marks_tts_no_audio(self):
-        """TTS 返回空 audio_url → failed, error_code=TTSNoAudio."""
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        job = _make_fake_job()
-        cosy = MagicMock()
-        cosy.submit_synthesize_task.return_value = {"audio_url": ""}
-        session, patches = _apply_all_patches(job=job, cosyvoice_service=cosy)
-        entered = [p.__enter__() for p in patches]
-        try:
-            tts_synthesize_and_submit.run("job-1", "user-1", "v1", "你好", 1.0, "")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        assert job.status == "failed"
-        assert job.error_code == "TTSNoAudio"
-        session.close.assert_called_once()
-
-    def test_oss_upload_failure_falls_back_to_temp_url(self):
-        """OSS 上传失败 → 回退临时 URL，仍然 submitted."""
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        job = _make_fake_job()
-        storage = MagicMock()
-        storage.public_url = "https://oss.example.com"
-        storage.upload_file.side_effect = RuntimeError("oss down")
-        mk_client = MagicMock()
-        mk_client.submit_lipsync.return_value = {"task_id": "mk-7"}
-        session, patches = _apply_all_patches(job=job, storage=storage, mk_client=mk_client)
-        entered = [p.__enter__() for p in patches]
-        try:
-            tts_synthesize_and_submit.run("job-1", "user-1", "v1", "你好", 1.0, "")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        # 上传失败后 audio_url 回退为临时 TTS URL，仍继续提交到 MediaKit
-        assert job.audio_url == "https://tts/raw.mp3"
-        assert job.status == "submitted"
-        assert job.mediakit_task_id == "mk-7"
-        mk_client.submit_lipsync.assert_called_once()
-        session.close.assert_called_once()
-
-    def test_mediakit_error_marks_mediakit_unavailable(self):
-        """MediaKit 提交失败 → failed, error_code=MediaKitUnavailable."""
-        from app.services.mediakit_client import MediaKitError
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        job = _make_fake_job()
-        mk_err = MediaKitError("mk down", code="MediaKitUnavailable")
-        session, patches = _apply_all_patches(job=job, mk_submit_error=mk_err)
-        entered = [p.__enter__() for p in patches]
-        try:
-            tts_synthesize_and_submit.run("job-1", "user-1", "v1", "你好", 1.0, "")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        assert job.status == "failed"
-        assert job.error_code == "MediaKitUnavailable"
-        session.close.assert_called_once()
-
-    def test_top_level_exception_marks_async_task_error(self):
-        """顶层未预期异常 → failed, error_code=AsyncTaskError."""
-        from app.tasks.lipsync_tts import tts_synthesize_and_submit
-
-        job = _make_fake_job()
-        fake_app_db = ModuleType("app.db")
-        fake_worker_db = ModuleType("worker_app.db")
-        session, factory = _build_session(job)
-        fake_app_db.SessionLocal = factory
-        fake_worker_db.SessionLocal = factory
-
-        # CosyVoiceService 在 __init__ 抛 RuntimeError（非 CosyVoiceError/ValueError）
-        fake_cosy_mod = ModuleType("packages.application.cosyvoice_service")
-
-        class _CosyVoiceErrorForTest(Exception):
-            pass
-
-        class _BoomService:
-            def __init__(self):
-                raise RuntimeError("top-level boom")
-
-        fake_cosy_mod.CosyVoiceError = _CosyVoiceErrorForTest
-        fake_cosy_mod.CosyVoiceService = _BoomService
-
-        with patch.dict(
-            sys.modules,
-            {
-                "app.db": fake_app_db,
-                "worker_app.db": fake_worker_db,
-                "packages.application.cosyvoice_service": fake_cosy_mod,
-            },
-        ):
-            tts_synthesize_and_submit.run("job-1", "user-1", "v1", "你好", 1.0, "")
-
-        assert job.status == "failed"
-        assert job.error_code == "AsyncTaskError"
-        session.close.assert_called()
-
-
-class TestSignMediaUrl:
-    """覆盖模块内 _sign_media_url 的所有分支（CI 增量覆盖率需要）."""
-
-    def test_empty_url_returns_empty(self):
-        from app.tasks.lipsync_tts import _sign_media_url
-
-        assert _sign_media_url("") == ""
-        assert _sign_media_url(None) is None
-
-    def test_own_oss_url_signed(self):
-        """自家 OSS URL → 调用 storage.get_download_url 签名."""
-        from app.tasks.lipsync_tts import _sign_media_url
-
-        fake_storage = MagicMock()
-        fake_storage.public_url = "https://oss.example.com/"
-        fake_storage.get_download_url.return_value = "https://oss.example.com/a?sig=xyz"
-
-        with patch("packages.shared.storage.get_shared_storage_service", return_value=fake_storage):
-            result = _sign_media_url("https://oss.example.com/lipsync/a.mp3")
-
-        assert result == "https://oss.example.com/a?sig=xyz"
-        fake_storage.get_download_url.assert_called_once()
-
-    def test_external_url_passthrough(self):
-        """外部 URL（不是自家 OSS host）→ 原样透传，不签名."""
-        from app.tasks.lipsync_tts import _sign_media_url
-
-        fake_storage = MagicMock()
-        fake_storage.public_url = "https://oss.example.com/"
-
-        with patch("packages.shared.storage.get_shared_storage_service", return_value=fake_storage):
-            result = _sign_media_url("https://tts.example.com/raw.mp3")
-
-        assert result == "https://tts.example.com/raw.mp3"
-        fake_storage.get_download_url.assert_not_called()
-
-    def test_storage_exception_falls_back(self):
-        """storage 调用异常 → 降级原样返回，不抛错."""
-        from app.tasks.lipsync_tts import _sign_media_url
-
-        with patch(
-            "packages.shared.storage.get_shared_storage_service",
-            side_effect=RuntimeError("storage down"),
-        ):
-            result = _sign_media_url("https://oss.example.com/a.mp3")
-
-        assert result == "https://oss.example.com/a.mp3"
-
-    def test_no_public_url_passthrough(self):
-        """storage.public_url 为空 → 原样透传."""
-        from app.tasks.lipsync_tts import _sign_media_url
-
-        fake_storage = MagicMock()
-        fake_storage.public_url = ""
-
-        with patch("packages.shared.storage.get_shared_storage_service", return_value=fake_storage):
-            result = _sign_media_url("https://anything.example.com/a.mp3")
-
-        assert result == "https://anything.example.com/a.mp3"
-        fake_storage.get_download_url.assert_not_called()
-
-
-class TestPersistOutputVideoTask:
-    """persist_output_video_task：下载 MediaKit 临时视频 → 上传自有 OSS → 更新 DB."""
-
-    def _make_persist_job(self, **kwargs):
-        job = MagicMock()
-        job.id = kwargs.get("job_id", "job-1")
-        job.user_id = kwargs.get("user_id", "user-1")
-        job.output_video_url = kwargs.get("output_video_url", "https://temp.mk/output.mp4")
-        job.updated_at = None
-        return job
-
-    def _persist_patches(self, *, job, video_bytes=b"FAKEMP4", download_side_effect=None, upload_url=None):
-        """统一 patch：SessionLocal、httpx.Client、storage、_sign_media_url."""
-        fake_app_db = ModuleType("app.db")
-        fake_worker_db = ModuleType("worker_app.db")
-        session, factory = _build_session(job)
-        fake_app_db.SessionLocal = factory
-        fake_worker_db.SessionLocal = factory
-
-        # httpx.Client 上下文管理器
-        fake_response = MagicMock()
-        fake_response.content = video_bytes
-        fake_response.raise_for_status = MagicMock()
-        fake_client = MagicMock()
-        fake_client.get.return_value = fake_response
-        fake_client_cm = MagicMock()
-        fake_client_cm.__enter__ = MagicMock(return_value=fake_client)
-        fake_client_cm.__exit__ = MagicMock(return_value=False)
-        FakeHttpxClient = MagicMock(return_value=fake_client_cm)
-        if download_side_effect is not None:
-            fake_client.get.side_effect = download_side_effect
-
-        # storage
-        storage = MagicMock()
-        storage.public_url = "https://oss.example.com/"
-        storage.upload_file.return_value = upload_url or "https://oss.example.com/lipsync-outputs/user-1/job-1.mp4"
-        # _sign_media_url 内部会调 storage.get_download_url，必须mock返回字符串
-        _upload_url = upload_url or "https://oss.example.com/lipsync-outputs/user-1/job-1.mp4"
-        storage.get_download_url.return_value = _upload_url + "?signed"
-
-        fake_httpx = ModuleType("httpx")
-        fake_httpx.Client = FakeHttpxClient
-
-        patches = [
-            patch.dict(
-                sys.modules,
-                {"app.db": fake_app_db, "worker_app.db": fake_worker_db, "httpx": fake_httpx},
-            ),
-            patch("packages.shared.storage.get_shared_storage_service", return_value=storage),
-            patch("app.tasks.lipsync_tts._sign_media_url", side_effect=lambda url: url + "?signed" if url else url),
-        ]
-        return session, fake_client, storage, patches
-
-    def test_success_download_upload_updates_db(self):
-        """正常路径：下载 temp_url → 上传 OSS → 签名 → 写回 DB commit."""
-        from app.tasks.lipsync_tts import persist_output_video_task
-
-        job = self._make_persist_job(output_video_url="https://temp.mk/x.mp4")
-        session, fake_client, storage, patches = self._persist_patches(
-            job=job, video_bytes=b"VIDEODATA", upload_url="https://oss.example.com/lipsync-outputs/user-1/job-1.mp4"
-        )
-        entered = [p.__enter__() for p in patches]
-        try:
-            persist_output_video_task("job-1", "user-1", "https://temp.mk/x.mp4")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        fake_client.get.assert_called_once_with("https://temp.mk/x.mp4")
-        storage.upload_file.assert_called_once()
-        call_args = storage.upload_file.call_args.args
-        # 上传的 key 必须是 lipsync-outputs/{user_id}/{job_id}.mp4
-        assert call_args[1] == "lipsync-outputs/user-1/job-1.mp4"
-        # upload_file 返回永久 URL，再被 _sign_media_url 追加 ?signed
-        assert job.output_video_url == "https://oss.example.com/lipsync-outputs/user-1/job-1.mp4?signed"
-        assert job.updated_at is not None
-        session.commit.assert_called_once()
-        session.close.assert_called_once()
-
-    def test_download_failure_keeps_temp_url_no_commit(self):
-        """下载失败（raise）→ 记录 warning、保留 temp_url、不抛异常."""
-        from app.tasks.lipsync_tts import persist_output_video_task
-
-        job = self._make_persist_job(output_video_url="https://temp.mk/x.mp4")
-        session, fake_client, storage, patches = self._persist_patches(
-            job=job, download_side_effect=RuntimeError("network down")
-        )
-        entered = [p.__enter__() for p in patches]
-        try:
-            persist_output_video_task("job-1", "user-1", "https://temp.mk/x.mp4")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        storage.upload_file.assert_not_called()
-        # output_video_url 保持原值（temp_url）
-        assert job.output_video_url == "https://temp.mk/x.mp4"
-        # 内层 except 不会 commit
-        # 注：若内部发生 commit 说明测试失败
-        session.close.assert_called_once()
-
-    def test_empty_temp_url_skips_persist(self):
-        """temp_url 为空 → 直接返回，不下载不上传."""
-        from app.tasks.lipsync_tts import persist_output_video_task
-
-        job = self._make_persist_job(output_video_url="")
-        session, fake_client, storage, patches = self._persist_patches(job=job)
-        entered = [p.__enter__() for p in patches]
-        try:
-            persist_output_video_task("job-1", "user-1", "")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        fake_client.get.assert_not_called()
-        storage.upload_file.assert_not_called()
-        session.commit.assert_not_called()
-        session.close.assert_called_once()
-
-    def test_job_not_found_returns_early(self):
-        """DB 中找不到 job → 直接返回，不抛错."""
-        from app.tasks.lipsync_tts import persist_output_video_task
-
-        session, fake_client, storage, patches = self._persist_patches(job=None)
-        entered = [p.__enter__() for p in patches]
-        try:
-            persist_output_video_task("missing", "user-1", "https://temp.mk/x.mp4")
-        finally:
-            for p in reversed(patches):
-                p.__exit__(None, None, None)
-
-        fake_client.get.assert_not_called()
-        storage.upload_file.assert_not_called()
-        session.commit.assert_not_called()
-        session.close.assert_called_once()
-
-
-class TestLipsyncServiceRefreshCompletedAsyncPersist:
-    """refresh_job_status 在 completed 分支异步转存的单元测试（补 0% 覆盖的 316~335 行）."""
-
-    def test_refresh_completed_dispatches_persist_task(self):
-        """completed 分支：设置 temp_url → commit → dispatch persist_output_video_task.apply_async."""
-        from app.services.lipsync_service import LipsyncService
-
-        mock_job = MagicMock()
-        mock_job.id = "job-1"
-        mock_job.user_id = "user-1"
-        mock_job.mediakit_task_id = "mk-1"
-        mock_job.status = "submitted"
-        mock_job.output_video_url = ""
-        mock_job.output_duration = 0.0
-
-        mock_db = MagicMock()
-        mock_query = MagicMock()
-        mock_filter = MagicMock()
-        mock_filter.first.return_value = mock_job
-        mock_query.filter.return_value = mock_filter
-        mock_db.query.return_value = mock_query
-
-        mock_client = MagicMock()
-        mock_client.get_task_status.return_value = {
-            "status": "completed",
-            "result": {"video_url": "https://temp.mk/out.mp4", "duration": 25.5},
-        }
-
-        fake_persist_task = MagicMock()
-        svc = LipsyncService(mock_db, client=mock_client, cosyvoice_service=MagicMock())
-        with patch.dict("sys.modules", {}):
-            # 直接 patch 懒 import 路径
-            with patch("app.tasks.lipsync_tts.persist_output_video_task", fake_persist_task, create=False):
-                # 但懒 import 发生在函数内部 from app.tasks.lipsync_tts import persist_output_video_task
-                # 通过 patch sys.modules 的方式提供
-                import sys as _sys
-
-                fake_mod = MagicMock()
-                fake_mod.persist_output_video_task = fake_persist_task
-                _sys.modules["app.tasks.lipsync_tts"] = fake_mod
-                try:
-                    result = svc.refresh_job_status("job-1", "user-1")
-                finally:
-                    _sys.modules.pop("app.tasks.lipsync_tts", None)
-
-        assert result.status == "completed"
-        assert result.output_video_url == "https://temp.mk/out.mp4"
-        assert result.output_duration == 25.5
-        mock_db.commit.assert_called()
-        # 必须在 commit 之后 dispatch
-        fake_persist_task.apply_async.assert_called_once()
-        kwargs = fake_persist_task.apply_async.call_args.kwargs
-        assert kwargs["args"] == ("job-1", "user-1", "https://temp.mk/out.mp4")
-
-    def test_refresh_completed_dispatch_exception_does_not_break_return(self):
-        """apply_async 抛异常（如 Celery 不可用）→ 捕获 warning，仍返回 completed job."""
-        from app.services.lipsync_service import LipsyncService
-
-        mock_job = MagicMock()
-        mock_job.id = "job-2"
-        mock_job.user_id = "user-1"
-        mock_job.mediakit_task_id = "mk-2"
-        mock_job.status = "submitted"
-        mock_job.output_video_url = ""
-        mock_job.output_duration = 0.0
-
-        mock_db = MagicMock()
-        mock_query = MagicMock()
-        mock_filter = MagicMock()
-        mock_filter.first.return_value = mock_job
-        mock_query.filter.return_value = mock_filter
-        mock_db.query.return_value = mock_query
-
-        mock_client = MagicMock()
-        mock_client.get_task_status.return_value = {
-            "status": "completed",
-            "result": {"video_url": "https://temp.mk/out2.mp4", "duration": 10.0},
-        }
-
-        fake_persist_task = MagicMock()
-        fake_persist_task.apply_async.side_effect = ConnectionError("celery down")
-
-        svc = LipsyncService(mock_db, client=mock_client, cosyvoice_service=MagicMock())
-        import sys as _sys
-
-        fake_mod = MagicMock()
-        fake_mod.persist_output_video_task = fake_persist_task
-        _sys.modules["app.tasks.lipsync_tts"] = fake_mod
-        try:
-            result = svc.refresh_job_status("job-2", "user-1")
-        finally:
-            _sys.modules.pop("app.tasks.lipsync_tts", None)
-
-        # 即便 dispatch 失败，主流程不受影响：仍然返回 completed + temp_url
-        assert result.status == "completed"
-        assert result.output_video_url == "https://temp.mk/out2.mp4"
-        fake_persist_task.apply_async.assert_called_once()

tests/unit/test_sentence_timings.py

@@ -1,171 +0,0 @@
-"""Tests for sentence timing functions in lipsync_tts."""
-
-import os
-import subprocess
-import tempfile
-import unittest
-from unittest.mock import MagicMock, patch
-
-from apps.api.app.tasks.lipsync_tts import (
-    _compute_sentence_timings,
-    _estimate_sentence_timings_by_chars,
-    _split_script_into_sentences,
-)
-
-
-class TestSplitScriptIntoSentences(unittest.TestCase):
-    """Tests for _split_script_into_sentences."""
-
-    def test_empty_string(self):
-        self.assertEqual(_split_script_into_sentences(""), [])
-
-    def test_none(self):
-        self.assertEqual(_split_script_into_sentences(None), [])
-
-    def test_whitespace_only(self):
-        self.assertEqual(_split_script_into_sentences("   \n  "), [])
-
-    def test_single_sentence(self):
-        self.assertEqual(_split_script_into_sentences("你好世界。"), ["你好世界"])
-
-    def test_multiple_sentences_chinese(self):
-        result = _split_script_into_sentences("第一句。第二句！第三句？")
-        self.assertEqual(result, ["第一句", "第二句", "第三句"])
-
-    def test_english_punctuation(self):
-        result = _split_script_into_sentences("Hello World! How are you?")
-        self.assertEqual(result, ["Hello World", "How are you"])
-
-    def test_semicolons(self):
-        result = _split_script_into_sentences("第一部分；第二部分;第三部分")
-        self.assertEqual(result, ["第一部分", "第二部分", "第三部分"])
-
-    def test_newlines(self):
-        result = _split_script_into_sentences("第一行\n第二行\n第三行")
-        self.assertEqual(result, ["第一行", "第二行", "第三行"])
-
-    def test_no_trailing_punctuation(self):
-        result = _split_script_into_sentences("没有标点的句子")
-        self.assertEqual(result, ["没有标点的句子"])
-
-
-class TestEstimateSentenceTimingsByChars(unittest.TestCase):
-    """Tests for _estimate_sentence_timings_by_chars."""
-
-    def test_empty_sentences(self):
-        self.assertEqual(_estimate_sentence_timings_by_chars([], 10.0), [])
-
-    def test_zero_duration(self):
-        self.assertEqual(_estimate_sentence_timings_by_chars(["hello"], 0), [])
-
-    def test_negative_duration(self):
-        self.assertEqual(_estimate_sentence_timings_by_chars(["hello"], -5.0), [])
-
-    def test_single_sentence(self):
-        result = _estimate_sentence_timings_by_chars(["hello"], 10.0)
-        self.assertEqual(len(result), 1)
-        self.assertAlmostEqual(result[0]["start_time"], 0.0)
-        self.assertAlmostEqual(result[0]["end_time"], 10.0)
-
-    def test_two_equal_sentences(self):
-        result = _estimate_sentence_timings_by_chars(["你好", "世界"], 10.0)
-        self.assertEqual(len(result), 2)
-        self.assertAlmostEqual(result[0]["start_time"], 0.0)
-        self.assertAlmostEqual(result[0]["end_time"], 5.0)
-        self.assertAlmostEqual(result[1]["start_time"], 5.0)
-        self.assertAlmostEqual(result[1]["end_time"], 10.0)
-
-    def test_unequal_char_distribution(self):
-        result = _estimate_sentence_timings_by_chars(["ABCD", "EF"], 9.0)
-        self.assertEqual(len(result), 2)
-        self.assertAlmostEqual(result[0]["start_time"], 0.0)
-        self.assertAlmostEqual(result[0]["end_time"], 6.0)  # 4/6 * 9 = 6
-        self.assertAlmostEqual(result[1]["start_time"], 6.0)
-        self.assertAlmostEqual(result[1]["end_time"], 9.0)
-
-    def test_timing_structure(self):
-        result = _estimate_sentence_timings_by_chars(["句子一", "句子二"], 6.0)
-        for item in result:
-            self.assertIn("index", item)
-            self.assertIn("text", item)
-            self.assertIn("start_time", item)
-            self.assertIn("end_time", item)
-
-
-class TestComputeSentenceTimings(unittest.TestCase):
-    """Tests for _compute_sentence_timings."""
-
-    def test_empty_script_returns_empty(self):
-        self.assertEqual(_compute_sentence_timings(b"fake_audio", "", 10.0), [])
-
-    def test_none_script_returns_empty(self):
-        self.assertEqual(_compute_sentence_timings(b"fake_audio", None, 10.0), [])
-
-    @patch("os.unlink")
-    @patch.object(tempfile, "NamedTemporaryFile")
-    @patch.object(subprocess, "run")
-    def test_silence_detection_insufficient_fallback(self, mock_run, mock_tmpfile, mock_unlink):
-        """When silence detection finds too few points, fallback to char estimation."""
-        mock_run.return_value = MagicMock(stderr="", returncode=0)
-        mock_tmp = MagicMock()
-        mock_tmp.name = "/tmp/fake.mp3"
-        mock_tmp.__enter__ = MagicMock(return_value=mock_tmp)
-        mock_tmp.__exit__ = MagicMock(return_value=False)
-        mock_tmpfile.return_value = mock_tmp
-
-        result = _compute_sentence_timings(b"fake_audio", "第一句。第二句。第三句。", 10.0)
-
-        # Should fallback to char estimation with 3 sentences
-        self.assertEqual(len(result), 3)
-        self.assertAlmostEqual(result[0]["start_time"], 0.0)
-
-    @patch("os.unlink")
-    @patch.object(tempfile, "NamedTemporaryFile")
-    @patch.object(subprocess, "run")
-    def test_silence_detection_with_enough_points(self, mock_run, mock_tmpfile, mock_unlink):
-        """When silence detection finds enough points, use them for boundaries."""
-        mock_run.return_value = MagicMock(
-            stderr="[silencedetect] silence_end: 3.5 | silence_duration: 0.4\n"
-            "[silencedetect] silence_end: 7.0 | silence_duration: 0.3\n",
-            returncode=0,
-        )
-        mock_tmp = MagicMock()
-        mock_tmp.name = "/tmp/fake.mp3"
-        mock_tmp.__enter__ = MagicMock(return_value=mock_tmp)
-        mock_tmp.__exit__ = MagicMock(return_value=False)
-        mock_tmpfile.return_value = mock_tmp
-
-        result = _compute_sentence_timings(b"fake_audio", "第一句。第二句。第三句。", 10.0)
-
-        self.assertEqual(len(result), 3)
-        self.assertAlmostEqual(result[0]["start_time"], 0.0)
-        self.assertAlmostEqual(result[0]["end_time"], 3.5)
-        self.assertAlmostEqual(result[1]["start_time"], 3.5)
-        self.assertAlmostEqual(result[1]["end_time"], 7.0)
-        self.assertAlmostEqual(result[2]["start_time"], 7.0)
-        self.assertAlmostEqual(result[2]["end_time"], 10.0)
-
-    @patch("os.unlink")
-    @patch.object(tempfile, "NamedTemporaryFile")
-    @patch.object(subprocess, "run")
-    def test_ffmpeg_exception_fallback(self, mock_run, mock_tmpfile, mock_unlink):
-        """When ffmpeg raises an exception, fallback to char estimation."""
-        mock_run.side_effect = Exception("ffmpeg not found")
-        mock_tmp = MagicMock()
-        mock_tmp.name = "/tmp/fake.mp3"
-        mock_tmp.__enter__ = MagicMock(return_value=mock_tmp)
-        mock_tmp.__exit__ = MagicMock(return_value=False)
-        mock_tmpfile.return_value = mock_tmp
-
-        result = _compute_sentence_timings(b"fake_audio", "句子一。句子二。", 6.0)
-
-        # Should fallback to char estimation
-        self.assertEqual(len(result), 2)
-        self.assertAlmostEqual(result[0]["start_time"], 0.0)
-        self.assertAlmostEqual(result[0]["end_time"], 3.0)
-        self.assertAlmostEqual(result[1]["start_time"], 3.0)
-        self.assertAlmostEqual(result[1]["end_time"], 6.0)
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/unit/test_video_filter_builder.py

@@ -13,7 +13,6 @@
 
 from __future__ import annotations
 
-import os
 import unittest
 from dataclasses import FrozenInstanceError
 from unittest.mock import patch
@@ -30,12 +29,10 @@ from packages.domain.video_filter_builder import (
     ClipFilterChain,
     _escape_drawtext_text,
     _resolve_font_path,
-    build_broll_overlay_filter,
     build_clip_filter,
     build_concat_filter,
     build_filter_complex,
     build_title_drawtext_filter,
-    build_title_overlay_filter,
     build_xfade_filter,
     chain_filters,
     has_audio,
@@ -905,10 +902,9 @@ class TestResolveFontPath(unittest.TestCase):
 
     @patch("os.path.isfile")
     def test_unknown_font_fallback(self, mock_isfile):
-        # DejaVuSans 已从 fallback 列表移除（不支持 CJK），用 VF 路径模拟
-        mock_isfile.side_effect = lambda p: "NotoSansSC-VF" in p
+        mock_isfile.side_effect = lambda p: "DejaVu" in p
         result = _resolve_font_path("UnknownFont")
-        self.assertIn("NotoSansSC-VF", result)
+        self.assertIn("DejaVu", result)
 
     @patch("os.path.isfile")
     def test_no_fonts_available(self, mock_isfile):
@@ -931,11 +927,9 @@ class TestResolveFontPath(unittest.TestCase):
 
     @patch("os.path.isfile")
     def test_font_fallback_skips_nonexistent(self, mock_isfile):
-        # 所有中文字体路径都不存在时，fallback 返回第一个存在的文件；
-        # DejaVuSans 已从列表移除（不支持 CJK），使用 VF 字体路径模拟存在文件
-        mock_isfile.side_effect = lambda p: "NotoSansSC-VF" in p
+        mock_isfile.side_effect = lambda p: "DejaVu" in p
         result = _resolve_font_path("不存在字体")
-        self.assertIn("NotoSansSC-VF", result)
+        self.assertIn("DejaVu", result)
 
 
 class TestDrawtextFontFileIncluded(unittest.TestCase):
@@ -1034,37 +1028,6 @@ class TestDrawtextBoldFalse(unittest.TestCase):
         self.assertIsNotNone(result)
         self.assertNotIn("font=bold", result)
 
-    def test_bold_true_does_not_use_font_bold_param(self):
-        """粗体模式不得使用 `font=bold`——该参数无效，会导致 filter_complex 解析失败（exit 234）。"""
-        result = build_title_drawtext_filter({"text": "标题", "bold": True})
-        self.assertIsNotNone(result)
-        self.assertNotIn("font=bold", result)
-        # 粗体应通过 borderw 实现
-        self.assertIn("borderw=", result)
-
-    @patch("packages.domain.video_filter_builder._resolve_font_path")
-    def test_bold_default_uses_black_stroke_when_no_bold_font(self, mock_font):
-        """默认 bold=true 且无 Bold 字体文件时，使用黑色细描边（borderw=2 + 黑），
-        不得使用与文字同色的 borderw>=3（否则会造成竖屏小字号重影）。"""
-        mock_font.return_value = ""  # 无粗体字体
-        result = build_title_drawtext_filter({"text": "标题"})
-        self.assertIsNotNone(result)
-        self.assertIn("borderw=2", result)
-        # 黑描边：要么是 black 关键字，要么是 000000
-        self.assertTrue("bordercolor=black" in result or "bordercolor=000000" in result)
-        self.assertNotIn("borderw=3", result)
-
-    @patch("packages.domain.video_filter_builder._resolve_font_path")
-    def test_bold_with_user_stroke_preserves_user_color(self, mock_font):
-        """用户显式开启 stroke 时，stroke 颜色/宽度优先于默认粗体黑边。"""
-        mock_font.return_value = ""
-        result = build_title_drawtext_filter(
-            {"text": "标题", "bold": True, "stroke": {"width": 4, "color": "#ffffff"}}
-        )
-        self.assertIsNotNone(result)
-        self.assertIn("borderw=4", result)
-        self.assertIn("bordercolor=ffffff", result)  # 去掉 # 前缀
-
 
 class TestDrawtextPositionBranches(unittest.TestCase):
     """位置相关分支覆盖。"""
@@ -1091,23 +1054,12 @@ class TestDrawtextPositionBranches(unittest.TestCase):
         self.assertIn("y=h-text_h-50", result)
 
     @patch("packages.domain.video_filter_builder._resolve_font_path")
-    def test_position_custom_with_percentage_coords(self, mock_font):
-        """自定义位置：百分比坐标转换为 drawtext 表达式."""
-        mock_font.return_value = ""
-        # pos_x=50, pos_y=30 → x=(w-text_w)*0.5000, y=(h-text_h)*0.3000
-        result = build_title_drawtext_filter({"text": "标题", "position": "custom", "pos_x": 50, "pos_y": 30})
-        self.assertIsNotNone(result)
-        self.assertIn("x=(w-text_w)*0.5000", result)
-        self.assertIn("y=(h-text_h)*0.3000", result)
-
-    @patch("packages.domain.video_filter_builder._resolve_font_path")
-    def test_position_custom_clamped_to_100(self, mock_font):
-        """自定义位置：超过100的坐标被截断到100%."""
+    def test_position_custom_with_float_coords(self, mock_font):
         mock_font.return_value = ""
         result = build_title_drawtext_filter({"text": "标题", "position": "custom", "pos_x": 100.7, "pos_y": 200.3})
         self.assertIsNotNone(result)
-        self.assertIn("x=(w-text_w)*1.0000", result)
-        self.assertIn("y=(h-text_h)*1.0000", result)
+        self.assertIn("x=100", result)
+        self.assertIn("y=200", result)
 
     @patch("packages.domain.video_filter_builder._resolve_font_path")
     def test_position_custom_bool_coords_fallback(self, mock_font):
@@ -1164,97 +1116,5 @@ class TestDrawtextNotDictConfig(unittest.TestCase):
         self.assertIsNone(build_title_drawtext_filter([1, 2, 3]))
 
 
-class TestTitleOverlay(unittest.TestCase):
-    """build_title_overlay_filter 单元测试（WYSIWYG PNG 叠加路径）。"""
-
-    def test_overlay_filter_format(self):
-        """PNG 文件存在时返回正确的 overlay 滤镜字符串。"""
-        import tempfile
-
-        with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as tmp:
-            tmp.write(b"\x89PNG\r\n\x1a\n")
-            tmp_path = tmp.name
-        try:
-            result = build_title_overlay_filter(
-                {"text": "标题"},
-                output_width=720,
-                output_height=1280,
-                title_png_path=tmp_path,
-                title_input_label="[2:v]",
-                base_label="[vout]",
-                output_label="vout_titled",
-            )
-            self.assertIsNotNone(result)
-            self.assertIn("[vout][2:v]overlay=0:0[vout_titled]", result)
-        finally:
-            os.unlink(tmp_path)
-
-    def test_overlay_default_labels(self):
-        """不传 label 参数时使用默认 [0:v] / [1:v] / vout_titled。"""
-        import tempfile
-
-        with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as tmp:
-            tmp.write(b"\x89PNG\r\n\x1a\n")
-            tmp_path = tmp.name
-        try:
-            result = build_title_overlay_filter(
-                {"text": "标题"},
-                output_width=720,
-                output_height=1280,
-                title_png_path=tmp_path,
-            )
-            self.assertEqual(result, "[0:v][1:v]overlay=0:0[vout_titled]")
-        finally:
-            os.unlink(tmp_path)
-
-    def test_overlay_returns_none_when_png_missing(self):
-        """PNG 文件不存在时返回 None，供调用方降级到 drawtext。"""
-        result = build_title_overlay_filter(
-            {"text": "标题"},
-            output_width=720,
-            output_height=1280,
-            title_png_path="/nonexistent/path/title.png",
-        )
-        self.assertIsNone(result)
-
-    def test_overlay_returns_none_for_empty_config(self):
-        """title_config 为空/非 dict 时返回 None。"""
-        import tempfile
-
-        with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as tmp:
-            tmp.write(b"\x89PNG\r\n\x1a\n")
-            tmp_path = tmp.name
-        try:
-            self.assertIsNone(
-                build_title_overlay_filter(
-                    None,
-                    output_width=720,
-                    output_height=1280,
-                    title_png_path=tmp_path,
-                )
-            )
-            self.assertIsNone(
-                build_title_overlay_filter(
-                    "not a dict",
-                    output_width=720,
-                    output_height=1280,
-                    title_png_path=tmp_path,
-                )
-            )
-        finally:
-            os.unlink(tmp_path)
-
-    def test_overlay_returns_none_for_empty_path(self):
-        """title_png_path 为空字符串时返回 None。"""
-        self.assertIsNone(
-            build_title_overlay_filter(
-                {"text": "标题"},
-                output_width=720,
-                output_height=1280,
-                title_png_path="",
-            )
-        )
-
-
 if __name__ == "__main__":
     unittest.main()