fix: 移除 MCI 插帧，60fps 输入直接输出 25fps 结果

- 移除 Step 8 的 minterpolate MCI 运动补偿插帧（CPU密集，343帧超6分钟导致超时504） - 高帧率视频降帧至 25fps 后直接输出，对口型数字人场景完全够用 - 插帧失败不再导致整个任务 504，直接降级返回 25fps 结果
perf: RTX3060 12G显存适配，batch_size上限从2提升到8
2026-09-21 19:13:42 +08:00 · 2026-09-21 18:58:04 +08:00
37 changed files with 3565 additions and 4004 deletions
@@ -93,7 +93,7 @@ def register_worker(
    svc: GpuLipsyncService = Depends(_get_svc),
    _token: str = Depends(_verify_gpu_token),
 ):
-    worker, cancel_task = svc.register_worker(
+    svc.register_worker(
        worker_id=body.worker_id,
        hostname=body.hostname,
        gpu_name=body.gpu_name,
@@ -101,7 +101,7 @@ def register_worker(
        capabilities=body.capabilities,
        task_id=body.task_id,
    )
-    return GpuWorkerRegisterResponse(ok=True, server_time=datetime.now(UTC), message="ok", cancel_task=cancel_task)
+    return GpuWorkerRegisterResponse(ok=True, server_time=datetime.now(UTC), message="ok")


 # ── GET /lipsync/poll — Worker 轮询拉任务 ─────────────────────────
@@ -346,13 +346,13 @@ def cancel_lipsync_job(
    current_user: AuthenticatedUser = Depends(get_current_user),
    svc: LipsyncService = Depends(_get_service),
 ):
-    """取消对口型任务（仅 pending/tts_processing/submitted/processing 状态可取消）."""
+    """取消对口型任务（仅 pending/tts_processing/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/processing 可取消",
+            detail=f"任务状态 {job.status} 不可取消，仅 pending/tts_processing/submitted 可取消",
        )
    return job
@@ -36,7 +36,6 @@ class GpuWorkerRegisterResponse(BaseModel):
    ok: bool = True
    server_time: datetime
    message: str = "ok"
-    cancel_task: bool = Field(False, description="当前心跳任务是否已被用户取消；为 true 时 Worker 应终止推理")


 # ── 轮询任务 ────────────────────────────────────────────────────
@@ -50,16 +50,13 @@ class GpuLipsyncService:
        free_vram_mb: int = 0,
        capabilities: str = "musetalk",
        task_id: Optional[str] = None,
-    ) -> tuple[GpuWorkerModel, bool]:
+    ) -> GpuWorkerModel:
        """Worker 注册/心跳。

        task_id 非空时（Worker 推理期间的任务级心跳），同步把对应 processing
        任务的 last_heartbeat_at 续到当前时间，使长推理不会被
        ``_recover_timed_out_tasks`` 误回退。任务已结束 / 不属于该 worker
        （如已被超时回收重新派发）时忽略，不报错。
-
-        返回 ``(worker, cancel_task)``：当心跳任务已被用户取消时
-        ``cancel_task=True``，Worker 应尽快终止推理并释放 GPU。
        """
        now = datetime.now(UTC)
        worker = self.db.query(GpuWorkerModel).filter(GpuWorkerModel.worker_id == worker_id).one_or_none()
@@ -80,11 +77,10 @@ class GpuLipsyncService:
            worker.free_vram_mb = free_vram_mb
            worker.capabilities = capabilities or worker.capabilities
            worker.last_heartbeat_at = now
-        cancel_task = False
        if task_id:
-            cancel_task = self._touch_task_heartbeat(task_id, worker_id, now)
+            self._touch_task_heartbeat(task_id, worker_id, now)
        self.db.commit()
-        return worker, cancel_task
+        return worker

    # ── 轮询拉任务（Worker 调用） ──────────────────────────────────

@@ -170,11 +166,6 @@ class GpuLipsyncService:
            task.result_duration = duration_seconds or 0.0
            task.error_msg = ""
            task.finished_at = now
-        elif task.status == "cancelled":
-            # 用户已取消的任务，Worker 终止后上报失败，保持 cancelled 状态不回退
-            task.finished_at = now
-            task.error_msg = (error_msg or "用户取消")[:2000]
-            logger.info("GPU 任务 %s 已被用户取消，保持 cancelled 状态", task_id)
        else:
            # 失败：若仍可重试（已尝试次数 < MAX_ATTEMPTS）→ 回退 pending；否则 → failed
            if task.attempt < MAX_ATTEMPTS:
@@ -259,21 +250,15 @@ class GpuLipsyncService:
    def _result_key(self, task_id: str) -> str:
        return f"{self.RESULT_PREFIX}{task_id}.mp4"

-    def _touch_task_heartbeat(self, task_id: str, worker_id: str, now: datetime) -> bool:
+    def _touch_task_heartbeat(self, task_id: str, worker_id: str, now: datetime) -> None:
        """Worker 推理期间的任务级心跳：只刷新属于该 worker 且仍在 processing 的任务。

        任务不存在 / 已被超时回收重新派发 / 已完成 → 静默忽略（此时旧 worker 的
        结果上报会被结果接口按最终态处理）。
-
-        返回 ``cancel_task``：任务已被用户取消时为 True，Worker 应终止推理。
        """
        task = self.db.get(GpuLipsyncTaskModel, task_id)
        if task is None:
-            return False
-        # 任务已被用户取消 → 通知 Worker 终止推理
-        if task.status == "cancelled":
-            logger.info("任务心跳检测到已取消 task=%s worker=%s，通知 Worker 终止", task_id, worker_id)
-            return True
+            return
        if task.status != "processing" or task.worker_id != worker_id:
            logger.info(
                "忽略过期任务心跳 task=%s worker=%s（status=%s owner=%s）",
@@ -282,11 +267,10 @@ class GpuLipsyncService:
                task.status,
                task.worker_id,
            )
-            return False
+            return
        task.last_heartbeat_at = now
        task.updated_at = now
        self.db.flush()
-        return False

    def _touch_worker(self, worker_id: str, now: datetime) -> None:
        if not worker_id:
@@ -387,7 +371,9 @@ class GpuLipsyncService:
            task = self.db.get(GpuLipsyncTaskModel, task_id)
            if task is None:
                return None
-            if task.status in ("done", "failed", "cancelled"):
+            if task.status == "done":
+                return task
+            if task.status == "failed":
                return task
            # pending/processing 继续等
            if time.monotonic() >= deadline:
@@ -783,32 +783,12 @@ class LipsyncService:
    # ── 取消任务 ──────────────────────────────────────────────────────────

    def cancel_job(self, job_id: str, user_id: str) -> Optional[LipsyncJobModel]:
-        """取消任务（pending/tts_processing/submitted/processing 状态可取消）.
-
-        当 job 走 GPU 路径（mediakit_task_id 以 "gpu:" 开头）且状态为 processing 时，
-        同步将关联的 GpuLipsyncTask 标记为 cancelled，以便 Worker 心跳时检测到取消信号。
-        """
+        """取消任务（仅 pending/tts_processing/submitted 状态可取消）."""
        job = self.get_job(job_id, user_id)
        if job is None:
            return None

-        if job.status in ("pending", "tts_processing", "submitted", "processing"):
-            # GPU 路径：同步标记关联的 GPU 任务为 cancelled
-            if job.status == "processing" and job.mediakit_task_id and job.mediakit_task_id.startswith("gpu:"):
-                gpu_task_id = job.mediakit_task_id[4:]  # 去掉 "gpu:" 前缀
-                try:
-                    from packages.adapters.sqlalchemy_impl.models import GpuLipsyncTaskModel
-
-                    gpu_task = self.db.get(GpuLipsyncTaskModel, gpu_task_id)
-                    if gpu_task and gpu_task.status == "processing":
-                        gpu_task.status = "cancelled"
-                        gpu_task.error_msg = "用户取消"
-                        gpu_task.updated_at = datetime.now(UTC)
-                        gpu_task.finished_at = datetime.now(UTC)
-                        logger.info("GPU 任务 %s 已被用户取消（通过 job_id=%s）", gpu_task_id, job_id)
-                except Exception as exc:
-                    logger.warning("标记 GPU 任务取消失败（不影响 job 取消）: %s", exc)
-
+        if job.status in ("pending", "tts_processing", "submitted"):
            job.status = "cancelled"
            job.updated_at = datetime.now(UTC)
            self.db.commit()
@@ -98,14 +98,6 @@ def lipsync_gpu_process_async(self, job_id: str, user_id: str, gpu_task_id: str)
            _fallback_to_mediakit(db, job)
            return

-        if final_task.status == "cancelled":
-            # 用户已取消任务，不回退 MediaKit，直接标记 job 为 cancelled
-            job.status = "cancelled"
-            job.updated_at = datetime.now(UTC)
-            db.commit()
-            logger.info("[lipsync_gpu_async] GPU 任务已被用户取消: job_id=%s", job_id)
-            return
-
        if final_task.status != "done":
            logger.warning(
                "[lipsync_gpu_async] GPU 失败，回退 MediaKit: job_id=%s gpu_task=%s status=%s",
@@ -23,8 +23,6 @@
    "@tanstack/react-query": "^5.45.0",
    "antd": "^5.18.0",
    "axios": "^1.7.2",
-    "classnames": "^2.5.1",
-    "dayjs": "^1.11.23",
    "mp4box": "^2.4.1",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
@@ -1,391 +0,0 @@
-/* ============================================================
-   标题模板系统 v3（按 sketch 重构）
-   - 大卡片网格（图片背景 + 透明 Canvas 叠字 + 始终可见操作按钮）
-   - 编辑器弹窗（左竖屏预览 + 右参数 Tab）
-   ============================================================ */
-
-/* ── 面板容器（模板模式） ── */
-.ttv3-panel {
-  display: flex;
-  flex-direction: column;
-  gap: 14px;
-}
-.ttv3-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.ttv3-title {
-  font-size: 15px;
-  font-weight: 600;
-  color: var(--text-primary, #1f2937);
-}
-.ttv3-new-btn.ant-btn {
-  background: linear-gradient(135deg, #6c5ce7, #a29bfe);
-  border: none;
-  border-radius: 20px;
-  font-size: 12px;
-  height: 28px;
-  padding: 0 14px;
-  font-weight: 500;
-  box-shadow: 0 2px 8px rgba(108, 92, 231, 0.25);
-}
-.ttv3-new-btn.ant-btn:hover {
-  background: linear-gradient(135deg, #5b4cdb, #8c83f5) !important;
-  color: #fff !important;
-}
-.ttv3-section-label {
-  font-size: 12px;
-  color: #888;
-  font-weight: 500;
-  margin-bottom: 8px;
-}
-.ttv3-section {
-  margin-bottom: 6px;
-}
-
-/* ── 空状态 ── */
-.ttv3-empty {
-  background: #f8f8fc;
-  border-radius: 12px;
-  padding: 28px 16px;
-  text-align: center;
-  color: #aaa;
-}
-.ttv3-empty-icon {
-  font-size: 28px;
-  margin-bottom: 6px;
-}
-.ttv3-empty-text {
-  font-size: 12px;
-}
-
-/* ── 卡片网格：minmax(180px,1fr) 自适应 ── */
-.ttv3-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
-  gap: 12px;
-}
-
-/* ── 卡片：3:4 竖版，圆角 14px ── */
-.ttv3-card {
-  background: #fff;
-  border-radius: 14px;
-  border: 3px solid #e8e8ed;
-  cursor: pointer;
-  transition: all 0.15s ease;
-  overflow: hidden;
-  padding: 0;
-  font-family: inherit;
-  text-align: left;
-}
-.ttv3-card:hover {
-  border-color: #c5c0f0;
-  transform: translateY(-2px);
-  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.1);
-}
-.ttv3-card.selected {
-  border-color: #6c5ce7;
-  box-shadow: 0 4px 16px rgba(108, 92, 231, 0.25);
-}
-
-/* ── 卡片预览区（3:4） ── */
-.ttv3-preview {
-  width: 100%;
-  aspect-ratio: 3/4;
-  position: relative;
-  overflow: hidden;
-  border-radius: 11px 11px 0 0;
-}
-.ttv3-bg {
-  position: absolute;
-  inset: 0;
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-  display: block;
-}
-/* 暗色渐变遮罩：顶部15%半透明黑 + 中部透明 + 底部45%黑 */
-.ttv3-vignette {
-  position: absolute;
-  inset: 0;
-  background: linear-gradient(
-    180deg,
-    rgba(0, 0, 0, 0.45) 0%,
-    rgba(0, 0, 0, 0.15) 15%,
-    transparent 30%,
-    transparent 55%,
-    rgba(0, 0, 0, 0.6) 100%
-  );
-  z-index: 1;
-  pointer-events: none;
-}
-/* 透明 Canvas 标题填充整个预览区 */
-.ttv3-preview .tt-fill-canvas-wrap {
-  position: absolute;
-  inset: 0;
-  z-index: 2;
-}
-.ttv3-preview .tt-fill-canvas-wrap canvas {
-  width: 100% !important;
-  height: 100% !important;
-  border-radius: 0;
-  display: block;
-}
-
-/* ── 左上角角标（系统/我的） ── */
-.ttv3-badge {
-  position: absolute;
-  top: 8px;
-  left: 8px;
-  font-size: 10px;
-  padding: 2px 8px;
-  border-radius: 8px;
-  font-weight: 500;
-  color: #fff;
-  z-index: 3;
-  backdrop-filter: blur(4px);
-}
-.ttv3-badge--sys {
-  background: rgba(108, 92, 231, 0.88);
-}
-.ttv3-badge--mine {
-  background: rgba(0, 184, 148, 0.88);
-}
-
-/* ── 右上角勾选圆圈 ── */
-.ttv3-check {
-  position: absolute;
-  top: 8px;
-  right: 8px;
-  width: 24px;
-  height: 24px;
-  border-radius: 50%;
-  background: rgba(0, 0, 0, 0.3);
-  border: 2px solid rgba(255, 255, 255, 0.7);
-  z-index: 3;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 12px;
-  color: transparent;
-  transition: all 0.15s;
-}
-.ttv3-check.on {
-  background: #6c5ce7;
-  border-color: #fff;
-  color: #fff;
-}
-
-/* ── 卡片底栏（名称 + 操作按钮） ── */
-.ttv3-footer {
-  padding: 10px 10px 12px;
-}
-.ttv3-name-row {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  margin-bottom: 8px;
-  font-size: 13px;
-  font-weight: 500;
-  white-space: nowrap;
-  overflow: hidden;
-  color: #1f2937;
-}
-.ttv3-emoji {
-  font-size: 14px;
-  flex-shrink: 0;
-}
-.ttv3-name {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  flex: 1;
-  min-width: 0;
-}
-.ttv3-tag {
-  font-size: 10px;
-  padding: 1px 6px;
-  border-radius: 6px;
-  font-weight: 500;
-  flex-shrink: 0;
-}
-.ttv3-tag--sys {
-  background: #f0ecff;
-  color: #6c5ce7;
-}
-.ttv3-tag--mine {
-  background: #e6f9f4;
-  color: #00b894;
-}
-
-/* ── 操作按钮：始终可见，等宽排列 ── */
-.ttv3-actions {
-  display: flex;
-  gap: 5px;
-}
-.ttv3-act {
-  flex: 1;
-  padding: 5px 0;
-  border: 1px solid #e8e8ed;
-  background: #fff;
-  border-radius: 7px;
-  font-size: 11px;
-  cursor: pointer;
-  color: #666;
-  font-weight: 500;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 3px;
-  transition: all 0.15s;
-  font-family: inherit;
-}
-.ttv3-act:hover:not(:disabled) {
-  background: #f5f5fa;
-  border-color: #d5d3e8;
-}
-.ttv3-act--primary {
-  background: #6c5ce7;
-  color: #fff;
-  border-color: #6c5ce7;
-}
-.ttv3-act--primary:hover:not(:disabled) {
-  background: #5b4cdb;
-  border-color: #5b4cdb;
-}
-.ttv3-act--danger {
-  color: #e74c3c;
-}
-.ttv3-act--danger:hover:not(:disabled) {
-  background: #fef2f2;
-}
-.ttv3-act:disabled {
-  opacity: 0.35;
-  cursor: not-allowed;
-}
-
-/* ── FillPreview 公共容器 ── */
-.tt-fill-canvas-wrap {
-  position: relative;
-}
-
-/* ── params-only（编辑器右侧）去掉多余 margin ── */
-.ttv3-params-only {
-  padding: 0;
-}
-.ttv3-params-only .ant-tabs {
-  margin: 0;
-}
-
-/* ============================================================
-   编辑器 Modal（v3）
-   ============================================================ */
-.ttv3-modal .ant-modal-content {
-  border-radius: 16px;
-  overflow: hidden;
-  padding: 0;
-}
-.ttv3-modal .ant-modal-header {
-  padding: 16px 20px;
-  margin: 0;
-  border-bottom: 1px solid #f0f0f0;
-}
-.ttv3-modal .ant-modal-body {
-  padding: 0;
-  max-height: 75vh;
-}
-.ttv3-modal .ant-modal-footer {
-  padding: 14px 20px;
-  margin: 0;
-  border-top: 1px solid #f0f0f0;
-}
-
-/* 编辑器两栏布局 */
-.ttv3-editor {
-  display: flex;
-  min-height: 500px;
-}
-.ttv3-editor-left {
-  width: 300px;
-  padding: 20px;
-  background: #f8f8fc;
-  flex-shrink: 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 12px;
-  border-right: 1px solid #f0f0f0;
-}
-.ttv3-editor-canvas {
-  width: 200px;
-  aspect-ratio: 9/16;
-  border-radius: 12px;
-  overflow: hidden;
-  position: relative;
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12);
-  flex-shrink: 0;
-}
-.ttv3-editor-bg {
-  position: absolute;
-  inset: 0;
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}
-.ttv3-editor-canvas-inner {
-  position: absolute;
-  inset: 0;
-  z-index: 2;
-}
-.ttv3-editor-canvas-inner canvas {
-  width: 100% !important;
-  height: 100% !important;
-  border-radius: 0;
-  display: block;
-}
-.ttv3-editor-form {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
-.ttv3-form-row {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-.ttv3-form-row label {
-  font-size: 12px;
-  font-weight: 600;
-  color: #333;
-  white-space: nowrap;
-  min-width: 44px;
-}
-.ttv3-form-row--grow {
-  flex: 1;
-}
-.ttv3-form-row--grow .ant-input {
-  flex: 1;
-}
-
-.ttv3-editor-right {
-  flex: 1;
-  padding: 16px 20px;
-  overflow-y: auto;
-  min-width: 0;
-}
-
-/* 侧栏较窄时（380px 侧栏）：强制 2 列，卡片稍微紧凑 */
-@media (max-width: 540px) {
-  .ttv3-grid {
-    grid-template-columns: repeat(2, 1fr);
-    gap: 10px;
-  }
-  .ttv3-act {
-    font-size: 10px;
-    padding: 4px 0;
-  }
-  .ttv3-act .anticon {
-    display: none;
-  }
-}
@@ -1,174 +0,0 @@
-/**
- * 标题模板编辑器（v3 重构）
- *
- * - Modal 弹窗 860px 宽
- * - 左侧：300px 竖屏预览区（图片背景+暗色渐变遮罩+透明 Canvas 叠字）+ 模板名称输入框
- * - 右侧：参数 Tab 面板（基础/描边/阴影/背景/排版），复用 TitleStylePanel 的 paramsOnly 模式
- * - 底部：取消 / 保存模板 按钮
- * - 内置模板编辑时保存会创建副本（带"副本"逻辑由 handleSave 处理）
- */
-import React, { useEffect, useMemo, useState } from "react"
-import { Modal, Button, Input, message } from "antd"
-import TitleStylePanel from "../../pages/generate/components/title/TitleStylePanel"
-import TitleMiniPreview from "../../pages/generate/components/title/TitleMiniPreview"
-import { POSITION_OPTIONS } from "../../pages/generate/constants"
-import { FONT_OPTIONS } from "./constants"
-import type { TitleSettings } from "../../pages/generate/types"
-import { DEFAULT_TITLE_SETTINGS_FULL } from "../../pages/generate/types"
-import { titleStyleConfigToCamel, camelToTitleStyleConfig } from "./utils"
-import type { TitleTemplate } from "./template-types"
-import type { TitleStyleConfig } from "./types"
-
-interface Props {
-  open: boolean
-  template: TitleTemplate
-  onClose: () => void
-  /** 用户点击保存：将编辑结果回调给父组件（父组件统一做 CRUD，避免双 hook 实例不同步） */
-  onSave: (data: { name: string; emoji: string; style: Partial<TitleStyleConfig> }) => void
-}
-
-/** 编辑器预览用的背景图（复用卡片池第一张） */
-const EDITOR_BG = "/title-templates/portrait1.jpg"
-
-const TitleTemplateEditor: React.FC<Props> = ({ open, template, onClose, onSave }) => {
-  const [settings, setSettings] = useState<TitleSettings>(() => ({
-    ...DEFAULT_TITLE_SETTINGS_FULL,
-    ...titleStyleConfigToCamel(template.style || {}),
-    title: "预览标题文字",
-  }))
-  const [formName, setFormName] = useState(template.name || "")
-  const [formEmoji, setFormEmoji] = useState(template.emoji || "✨")
-  const [saving, setSaving] = useState(false)
-
-  useEffect(() => {
-    if (open) {
-      setSettings({
-        ...DEFAULT_TITLE_SETTINGS_FULL,
-        ...titleStyleConfigToCamel(template.style || {}),
-        title: "预览标题文字",
-      })
-      setFormName(template.name || "")
-      setFormEmoji(template.emoji || "✨")
-    }
-  }, [open, template])
-
-  const upd = (patch: Partial<TitleSettings>) => setSettings((s) => ({ ...s, ...patch }))
-
-  const handleSave = () => {
-    const name = formName.trim()
-    if (!name) {
-      message.warning("请填写模板名称")
-      return
-    }
-    setSaving(true)
-    try {
-      const snake = camelToTitleStyleConfig(settings)
-      onSave({ name, emoji: formEmoji, style: snake })
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  // 编辑器内的预览用 settings：字号适配竖屏
-  const previewSettings = useMemo<TitleSettings>(() => {
-    // 竖屏宽度 200px，按比例缩放字号，让预览看起来协调
-    return { ...settings, size: Math.round(settings.size * 0.55) }
-  }, [settings])
-
-  return (
-    <Modal
-      title={
-        !template.id
-          ? "新建模板"
-          : template.isBuiltin
-            ? `基于「${template.name}」创建模板`
-            : `编辑模板：${template.name}`
-      }
-      open={open}
-      onCancel={onClose}
-      width={860}
-      footer={
-        <div style={{ display: "flex", gap: 10, justifyContent: "flex-end" }}>
-          <Button onClick={onClose}>取消</Button>
-          <Button type="primary" loading={saving} onClick={handleSave}>
-            保存模板
-          </Button>
-        </div>
-      }
-      destroyOnClose
-      className="ttv3-modal"
-      styles={{ body: { padding: 0 } }}
-    >
-      <div className="ttv3-editor">
-        {/* 左侧：竖屏预览 + 名称 */}
-        <div className="ttv3-editor-left">
-          <div className="ttv3-editor-canvas">
-            <img className="ttv3-editor-bg" src={EDITOR_BG} alt="" />
-            <div className="ttv3-vignette" />
-            <div className="ttv3-editor-canvas-inner">
-              <TitleMiniPreview
-                settings={previewSettings}
-                width={200}
-                sampleText="预览标题文字"
-                transparent
-                portrait
-              />
-            </div>
-          </div>
-          <div className="ttv3-editor-form">
-            <div className="ttv3-form-row">
-              <label>图标</label>
-              <Input
-                value={formEmoji}
-                maxLength={2}
-                style={{ textAlign: "center", width: 64 }}
-                onChange={(e) => setFormEmoji(e.target.value)}
-              />
-            </div>
-            <div className="ttv3-form-row ttv3-form-row--grow">
-              <label>
-                模板名称<span style={{ color: "#ef4444" }}>*</span>
-              </label>
-              <Input
-                placeholder="给模板起个名字"
-                value={formName}
-                maxLength={20}
-                onChange={(e) => setFormName(e.target.value)}
-              />
-            </div>
-          </div>
-        </div>
-        {/* 右侧：参数 Tab */}
-        <div className="ttv3-editor-right">
-          <TitleStylePanel
-            settings={settings}
-            onUpdatePosition={(p) => upd({ position: p, posX: null, posY: null })}
-            onUpdateFont={(f) => upd({ font: f })}
-            onUpdateSize={(v) => upd({ size: v })}
-            onToggleBold={() => upd({ bold: !settings.bold })}
-            onToggleItalic={() => upd({ italic: !settings.italic })}
-            onToggleStroke={() =>
-              upd({
-                stroke: !settings.stroke,
-                strokeWidth:
-                  !settings.stroke && (settings.strokeWidth ?? 0) < 2 ? 4 : settings.strokeWidth,
-              })
-            }
-            onToggleShadow={() => upd({ shadow: !settings.shadow })}
-            onApplyPreset={() => {
-              /* 编辑器内不使用系统预设快捷键 */
-            }}
-            onUpdateStyle={(patch) => upd(patch)}
-            activePreset={null}
-            titlePresets={[]}
-            POSITION_OPTIONS={POSITION_OPTIONS}
-            FONT_OPTIONS={FONT_OPTIONS}
-            paramsOnly
-          />
-        </div>
-      </div>
-    </Modal>
-  )
-}
-
-export default TitleTemplateEditor
@@ -127,7 +127,6 @@ export interface TitlePreset {
 }

 const BASE: Partial<TitleStyleConfig> = {
-  position: "bottom",
  line_overrides: [],
  cover_title_config: null,
 }
@@ -1,28 +0,0 @@
-/**
- * 标题模板系统类型（#2003）
- *
- * 设计：
- * - 内置系统模板（从 TITLE_PRESETS 自动派生，不可编辑/删除，可"复制为我的"）
- * - 用户自定义模板（保存在 localStorage，可编辑/复制/导出/删除）
- * - 模板存完整 TitleStyleConfig（snake_case），与后端契约一致
- */
-import type { TitleStyleConfig } from "./types"
-
-export interface TitleTemplate {
-  /** 唯一 ID：系统模板 `sys:<presetKey>`，用户模板 `usr:<uuid>` */
-  id: string
-  /** 模板名称（必填，保存时校验） */
-  name: string
-  /** 模板描述（可选） */
-  description?: string
-  /** 是否为系统内置（不可删除/编辑源） */
-  isBuiltin: boolean
-  /** emoji（展示用，可选） */
-  emoji?: string
-  /** 创建时间（ISO 字符串，系统模板=固定值） */
-  createdAt: string
-  /** 更新时间 */
-  updatedAt: string
-  /** 完整样式配置（snake_case，与后端 title_config 对齐） */
-  style: Partial<TitleStyleConfig>
-}
@@ -1,213 +0,0 @@
-/**
- * 标题模板 CRUD Hook（#2003）
- *
- * - 内存态 + localStorage 持久化
- * - 系统模板（来自 TITLE_PRESETS）始终前置、不可删除/编辑源
- * - 用户模板 CRUD：新增/复制/更新/删除/导出/导入
- */
-import { useCallback, useEffect, useMemo, useState } from "react"
-import { TITLE_PRESETS } from "./constants"
-import type { TitleStyleConfig } from "./types"
-import type { TitleTemplate } from "./template-types"
-
-const STORAGE_KEY = "xiaoxia.title.templates.v1"
-
-function uid(): string {
-  return "usr:" + Math.random().toString(36).slice(2, 10) + Date.now().toString(36)
-}
-
-/** 把 TITLE_PRESETS 转为内置 TitleTemplate 列表 */
-function buildBuiltinTemplates(): TitleTemplate[] {
-  const now = "2026-09-22T00:00:00+08:00"
-  return TITLE_PRESETS.map((p) => ({
-    id: `sys:${p.key}`,
-    name: p.label,
-    description: "系统内置模板",
-    isBuiltin: true,
-    emoji: p.emoji,
-    createdAt: now,
-    updatedAt: now,
-    style: { ...p.style },
-  }))
-}
-
-function loadUserTemplates(): TitleTemplate[] {
-  if (typeof window === "undefined") return []
-  try {
-    const raw = window.localStorage.getItem(STORAGE_KEY)
-    if (!raw) return []
-    const parsed = JSON.parse(raw)
-    if (!Array.isArray(parsed)) return []
-    return parsed.filter((t) => t && !t.isBuiltin && t.id.startsWith("usr:"))
-  } catch {
-    return []
-  }
-}
-
-function saveUserTemplates(list: TitleTemplate[]) {
-  if (typeof window === "undefined") return
-  try {
-    window.localStorage.setItem(STORAGE_KEY, JSON.stringify(list))
-  } catch {
-    /* ignore quota */
-  }
-}
-
-export interface UseTitleTemplatesResult {
-  templates: TitleTemplate[]
-  builtin: TitleTemplate[]
-  custom: TitleTemplate[]
-  /** 新建自定义模板：传入样式（snake_case），返回新建模板 id */
-  createTemplate: (input: {
-    name: string
-    description?: string
-    emoji?: string
-    style: Partial<TitleStyleConfig>
-  }) => TitleTemplate
-  /** 复制模板（内置模板也可复制，自动加"副本"后缀） */
-  duplicateTemplate: (id: string) => TitleTemplate | null
-  /** 更新自定义模板（系统模板不可改） */
-  updateTemplate: (id: string, patch: Partial<Omit<TitleTemplate, "id" | "isBuiltin">>) => void
-  /** 删除自定义模板 */
-  deleteTemplate: (id: string) => void
-  /** 导出单个模板为 JSON 字符串 */
-  exportTemplate: (id: string) => string | null
-  /** 导入 JSON 字符串作为新模板，返回新建模板 */
-  importTemplate: (json: string) => TitleTemplate | null
-  /** 根据 id 查询模板 */
-  getById: (id: string) => TitleTemplate | undefined
-}
-
-export function useTitleTemplates(): UseTitleTemplatesResult {
-  const [custom, setCustom] = useState<TitleTemplate[]>(() => loadUserTemplates())
-
-  // 跨 tab 同步
-  useEffect(() => {
-    const onStorage = (e: StorageEvent) => {
-      if (e.key === STORAGE_KEY) setCustom(loadUserTemplates())
-    }
-    window.addEventListener("storage", onStorage)
-    return () => window.removeEventListener("storage", onStorage)
-  }, [])
-
-  const builtin = useMemo(() => buildBuiltinTemplates(), [])
-  const templates = useMemo(() => [...builtin, ...custom], [builtin, custom])
-
-  const persist = useCallback((next: TitleTemplate[]) => {
-    setCustom(next)
-    saveUserTemplates(next)
-  }, [])
-
-  const getById = useCallback((id: string) => templates.find((t) => t.id === id), [templates])
-
-  const createTemplate = useCallback<UseTitleTemplatesResult["createTemplate"]>(
-    ({ name, description, emoji, style }) => {
-      const now = new Date().toISOString()
-      const t: TitleTemplate = {
-        id: uid(),
-        name: name.trim() || "未命名模板",
-        description: description?.trim() || undefined,
-        emoji: emoji || "✨",
-        isBuiltin: false,
-        createdAt: now,
-        updatedAt: now,
-        style: { ...style },
-      }
-      persist([...custom, t])
-      return t
-    },
-    [custom, persist],
-  )
-
-  const duplicateTemplate = useCallback<UseTitleTemplatesResult["duplicateTemplate"]>(
-    (id) => {
-      const src = templates.find((t) => t.id === id)
-      if (!src) return null
-      const now = new Date().toISOString()
-      const t: TitleTemplate = {
-        id: uid(),
-        name: `${src.name} 副本`,
-        description: src.description,
-        emoji: src.emoji,
-        isBuiltin: false,
-        createdAt: now,
-        updatedAt: now,
-        style: { ...src.style },
-      }
-      persist([...custom, t])
-      return t
-    },
-    [templates, custom, persist],
-  )
-
-  const updateTemplate = useCallback<UseTitleTemplatesResult["updateTemplate"]>(
-    (id, patch) => {
-      if (id.startsWith("sys:")) return
-      const next = custom.map((t) =>
-        t.id === id
-          ? { ...t, ...patch, id: t.id, isBuiltin: false, updatedAt: new Date().toISOString() }
-          : t,
-      )
-      persist(next)
-    },
-    [custom, persist],
-  )
-
-  const deleteTemplate = useCallback<UseTitleTemplatesResult["deleteTemplate"]>(
-    (id) => {
-      if (id.startsWith("sys:")) return
-      persist(custom.filter((t) => t.id !== id))
-    },
-    [custom, persist],
-  )
-
-  const exportTemplate = useCallback<UseTitleTemplatesResult["exportTemplate"]>(
-    (id) => {
-      const t = templates.find((x) => x.id === id)
-      if (!t) return null
-      return JSON.stringify(
-        {
-          name: t.name,
-          description: t.description,
-          emoji: t.emoji,
-          style: t.style,
-          exportedAt: new Date().toISOString(),
-        },
-        null,
-        2,
-      )
-    },
-    [templates],
-  )
-
-  const importTemplate = useCallback<UseTitleTemplatesResult["importTemplate"]>(
-    (json) => {
-      try {
-        const data = JSON.parse(json)
-        if (!data || typeof data !== "object" || !data.style) return null
-        return createTemplate({
-          name: data.name || "导入模板",
-          description: data.description,
-          emoji: data.emoji || "✨",
-          style: data.style,
-        })
-      } catch {
-        return null
-      }
-    },
-    [createTemplate],
-  )
-
-  return {
-    templates,
-    builtin,
-    custom,
-    createTemplate,
-    duplicateTemplate,
-    updateTemplate,
-    deleteTemplate,
-    exportTemplate,
-    importTemplate,
-    getById,
-  }
-}
@@ -1,125 +0,0 @@
-/**
- * 标题样式工具（#2001 / 模板系统 #2003）
- *
- * - snake_case TitleStyleConfig ↔ camelCase TitleSettings 互转
- * - preset 归一化预览（修复"标题"两字大小不一）
- */
-import type { TitleStyleConfig } from "./types"
-import type { TitleSettings } from "../../pages/generate/types"
-import { TITLE_PRESETS } from "./constants"
-import { DEFAULT_TITLE_SETTINGS_FULL } from "../../pages/generate/types"
-import type { TitleTemplate } from "./template-types"
-
-/** snake_case TitleStyleConfig → camelCase TitleSettings（仅覆盖已知字段） */
-export function titleStyleConfigToCamel(s: Partial<TitleStyleConfig>): Partial<TitleSettings> {
-  const out: Partial<TitleSettings> = {}
-  if (s.font != null) out.font = s.font
-  if (s.size != null) out.size = s.size
-  if (s.color != null) out.color = s.color
-  if (s.bold != null) out.bold = s.bold
-  if (s.italic != null) out.italic = s.italic
-  if (s.position != null) out.position = s.position as TitleSettings["position"]
-  if (s.pos_x != null) out.posX = s.pos_x
-  if (s.pos_y != null) out.posY = s.pos_y
-  if (s.line_height != null) out.lineHeight = s.line_height
-  if (s.margin_top != null) out.marginTop = s.margin_top
-  if (s.max_chars_per_line != null) out.maxCharsPerLine = s.max_chars_per_line
-  if (s.stroke != null) out.stroke = s.stroke
-  if (s.stroke_width != null) out.strokeWidth = s.stroke_width
-  if (s.stroke_color != null) out.strokeColor = s.stroke_color
-  if (s.shadow != null) out.shadow = s.shadow
-  if (s.shadow_offset_x != null) out.shadowOffsetX = s.shadow_offset_x
-  if (s.shadow_offset_y != null) out.shadowOffsetY = s.shadow_offset_y
-  if (s.shadow_blur != null) out.shadowBlur = s.shadow_blur
-  if (s.shadow_color != null) out.shadowColor = s.shadow_color
-  if (s.bg_enabled != null) out.bgEnabled = s.bg_enabled
-  if (s.bg_color != null) out.bgColor = s.bg_color
-  if (s.bg_padding != null) out.bgPadding = s.bg_padding
-  if (s.bg_radius != null) out.bgRadius = s.bg_radius
-  if (s.line_overrides != null) out.lineOverrides = s.line_overrides
-  return out
-}
-
-/** camelCase TitleSettings patch → snake_case TitleStyleConfig patch */
-export function camelToTitleStyleConfig(p: Partial<TitleSettings>): Partial<TitleStyleConfig> {
-  const out: Partial<TitleStyleConfig> = {}
-  if (p.font != null) out.font = p.font
-  if (p.size != null) out.size = p.size
-  if (p.color != null) out.color = p.color
-  if (p.bold != null) out.bold = p.bold
-  if (p.italic != null) out.italic = p.italic
-  if (p.position != null) out.position = p.position as TitleStyleConfig["position"]
-  if (p.posX != null) out.pos_x = p.posX
-  if (p.posY != null) out.pos_y = p.posY
-  if (p.lineHeight != null) out.line_height = p.lineHeight
-  if (p.marginTop != null) out.margin_top = p.marginTop
-  if (p.maxCharsPerLine != null) out.max_chars_per_line = p.maxCharsPerLine
-  if (p.stroke != null) out.stroke = p.stroke
-  if (p.strokeWidth != null) out.stroke_width = p.strokeWidth
-  if (p.strokeColor != null) out.stroke_color = p.strokeColor
-  if (p.shadow != null) out.shadow = p.shadow
-  if (p.shadowOffsetX != null) out.shadow_offset_x = p.shadowOffsetX
-  if (p.shadowOffsetY != null) out.shadow_offset_y = p.shadowOffsetY
-  if (p.shadowBlur != null) out.shadow_blur = p.shadowBlur
-  if (p.shadowColor != null) out.shadow_color = p.shadowColor
-  if (p.bgEnabled != null) out.bg_enabled = p.bgEnabled
-  if (p.bgColor != null) out.bg_color = p.bgColor
-  if (p.bgPadding != null) out.bg_padding = p.bgPadding
-  if (p.bgRadius != null) out.bg_radius = p.bgRadius
-  if (p.lineOverrides != null) out.line_overrides = p.lineOverrides
-  return out
-}
-
-/**
- * 把 preset style（snake_case）归一化为固定字号的 TitleSettings，
- * 用于"预设卡片"缩略预览——所有卡片视觉上"标题"两字大小一致，便于辨识。
- * 描边/阴影/背景padding 按 fixedSize / 原始 size 比例缩放，避免粗描边爆框。
- */
-export function buildPresetPreviewSettings(
-  base: TitleSettings,
-  presetKey: string,
-  fixedSize = 56,
-): TitleSettings {
-  const preset = TITLE_PRESETS.find((p) => p.key === presetKey)
-  if (!preset) return base
-  const origSize = preset.style.size ?? fixedSize
-  const ratio = fixedSize / origSize
-  const scale = (v: number | undefined, fallback: number): number =>
-    v != null ? Math.round(v * ratio) : fallback
-  return {
-    ...base,
-    ...titleStyleConfigToCamel(preset.style),
-    size: fixedSize,
-    strokeWidth: scale(preset.style.stroke_width, base.strokeWidth) ?? base.strokeWidth,
-    shadowOffsetX: scale(preset.style.shadow_offset_x, base.shadowOffsetX) ?? base.shadowOffsetX,
-    shadowOffsetY: scale(preset.style.shadow_offset_y, base.shadowOffsetY) ?? base.shadowOffsetY,
-    shadowBlur: scale(preset.style.shadow_blur, base.shadowBlur) ?? base.shadowBlur,
-    bgPadding: scale(preset.style.bg_padding, base.bgPadding) ?? base.bgPadding,
-    lineOverrides: [],
-  }
-}
-
-/**
- * 把 TitleTemplate 渲染为完整 TitleSettings（带默认值），用于卡片预览。
- * 与模板选择器中保持一致，抽出共用。
- */
-export function templateToPreviewSettings(t: TitleTemplate, fixedSize = 48): TitleSettings {
-  const base: TitleSettings = {
-    ...DEFAULT_TITLE_SETTINGS_FULL,
-    ...titleStyleConfigToCamel(t.style),
-  }
-  // 预览时用固定字号保证所有卡片字大小一致；描边/阴影/padding按比例缩放
-  const origSize = t.style.size ?? base.size
-  if (origSize && origSize !== fixedSize) {
-    const ratio = fixedSize / origSize
-    base.size = fixedSize
-    if (base.strokeWidth != null)
-      base.strokeWidth = Math.max(1, Math.round(base.strokeWidth * ratio))
-    if (base.shadowOffsetX != null) base.shadowOffsetX = Math.round(base.shadowOffsetX * ratio)
-    if (base.shadowOffsetY != null) base.shadowOffsetY = Math.round(base.shadowOffsetY * ratio)
-    if (base.shadowBlur != null) base.shadowBlur = Math.round(base.shadowBlur * ratio)
-    if (base.bgPadding != null) base.bgPadding = Math.round(base.bgPadding * ratio)
-  }
-  base.lineOverrides = []
-  return base
-}
@@ -10,8 +10,6 @@
 import React, { useMemo, useState, useEffect } from "react"
 import { Input } from "antd"
 import TitleStylePanel from "@/pages/generate/components/title/TitleStylePanel"
-import type { TitleTemplate } from "@/components/title/template-types"
-
 import TitleLibraryAutoComplete from "@/pages/generate/components/title/TitleLibraryAutoComplete"
 import type { TitleOption } from "@/pages/generate/components/title/TitleLibraryAutoComplete"
 import type { TitleSettings } from "@/pages/generate/types"
@@ -31,7 +29,6 @@ interface PanelTitleConfigProps {
 const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpdate }) => {
  /** TitleStylePanel 内部高亮的预设 key（面板本地状态） */
  const [activePreset, setActivePreset] = useState<string | null>(null)
-  const [selectedTemplateId, setSelectedTemplateId] = useState<string | null>(null)

  /** 标题库选项（#1894：从文案库 scripts[].title 取候选） */
  const [titleOptions, setTitleOptions] = useState<TitleOption[]>([])
@@ -332,40 +329,6 @@ const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpda
    onUpdate(snake)
  }

-  /** 应用模板（来自内联网格 onApplyTemplate）：camelCase TitleSettings → snake_case AiAvatarTitleConfig */
-  const handleApplyTemplate = (settings: TitleSettings, tpl: TitleTemplate) => {
-    setActivePreset(null)
-    setSelectedTemplateId(tpl.id)
-    onUpdate({
-      title: titleConfig.title,
-      font: settings.font,
-      size: settings.size,
-      color: settings.color,
-      bold: settings.bold,
-      italic: settings.italic,
-      position: settings.position,
-      stroke: settings.stroke,
-      stroke_width: settings.strokeWidth,
-      stroke_color: settings.strokeColor,
-      shadow: settings.shadow,
-      shadow_offset_x: settings.shadowOffsetX,
-      shadow_offset_y: settings.shadowOffsetY,
-      shadow_blur: settings.shadowBlur,
-      shadow_color: settings.shadowColor,
-      bg_enabled: settings.bgEnabled,
-      bg_color: settings.bgColor,
-      bg_padding: settings.bgPadding,
-      bg_radius: settings.bgRadius,
-      line_height: settings.lineHeight,
-      margin_top: settings.marginTop,
-      max_chars_per_line: settings.maxCharsPerLine,
-      line_overrides: [],
-      pos_x: settings.posX ?? undefined,
-      pos_y: settings.posY ?? undefined,
-      cover_title_config: null,
-    })
-  }
-
  return (
    <div className="aa-title-config">
      {/* 主标题输入 — TextArea 多行 + 标题库选择 */}
@@ -412,9 +375,6 @@ const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpda
        onUpdateStyle={handleUpdateStyle}
        showCoverToggle
        previewWidth={280}
-        enableTemplates
-        selectedTemplateId={selectedTemplateId}
-        onApplyTemplate={handleApplyTemplate}
        activePreset={activePreset}
        titlePresets={
          TITLE_PRESETS as unknown as React.ComponentProps<typeof TitleStylePanel>["titlePresets"]
@@ -42,9 +42,6 @@ const GeneratePage: React.FC = () => {

  /* ── 表单状态 ── */
  const formState = useGenerateFormState()
-  /* ── 标题模板（#2003）当前选中模板 id ── */
-  const [selectedTitleTemplateId, setSelectedTitleTemplateId] = useState<string | null>(null)
-
  /* ── 积分状态 ── */
  const { balance, dailyUsage, rules, init: initPoints } = usePointsStore()
  useEffect(() => {
@@ -580,19 +577,7 @@ const GeneratePage: React.FC = () => {
                  bold: titleSettings.bold,
                  italic: titleSettings.italic,
                  stroke: titleSettings.stroke,
-                  strokeWidth: titleSettings.strokeWidth,
-                  strokeColor: titleSettings.strokeColor,
                  shadow: titleSettings.shadow,
-                  shadowOffsetX: titleSettings.shadowOffsetX,
-                  shadowOffsetY: titleSettings.shadowOffsetY,
-                  shadowBlur: titleSettings.shadowBlur,
-                  shadowColor: titleSettings.shadowColor,
-                  bgEnabled: titleSettings.bgEnabled,
-                  bgColor: titleSettings.bgColor,
-                  bgPadding: titleSettings.bgPadding,
-                  bgRadius: titleSettings.bgRadius,
-                  lineHeight: titleSettings.lineHeight,
-                  maxCharsPerLine: titleSettings.maxCharsPerLine,
                  posX: titleSettings.posX,
                  posY: titleSettings.posY,
                }}
@@ -658,12 +643,6 @@ const GeneratePage: React.FC = () => {
            onUpdateStyle={styleUpdaters.updateStyle}
            activePreset={styleUpdaters.activePreset}
            titlePresets={styleUpdaters.titlePresets}
-            enableTemplates
-            selectedTemplateId={selectedTitleTemplateId}
-            onApplyTemplate={(settings, tpl) => {
-              styleUpdaters.applyTemplate(settings)
-              setSelectedTitleTemplateId(tpl.id)
-            }}
            bgm={bgm}
            bgmConfig={bgmConfig}
            coverSettings={coverSettings}
@@ -140,19 +140,7 @@ const CanvasPreviewGrid: React.FC<CanvasPreviewGridProps> = ({
                  bold: titleSettings.bold,
                  italic: titleSettings.italic,
                  stroke: titleSettings.stroke,
-                  strokeWidth: titleSettings.strokeWidth,
-                  strokeColor: titleSettings.strokeColor,
                  shadow: titleSettings.shadow,
-                  shadowOffsetX: titleSettings.shadowOffsetX,
-                  shadowOffsetY: titleSettings.shadowOffsetY,
-                  shadowBlur: titleSettings.shadowBlur,
-                  shadowColor: titleSettings.shadowColor,
-                  bgEnabled: titleSettings.bgEnabled,
-                  bgColor: titleSettings.bgColor,
-                  bgPadding: titleSettings.bgPadding,
-                  bgRadius: titleSettings.bgRadius,
-                  lineHeight: titleSettings.lineHeight,
-                  maxCharsPerLine: titleSettings.maxCharsPerLine,
                  posX: titleSettings.posX,
                  posY: titleSettings.posY,
                }}
@@ -17,7 +17,7 @@ import type { EditPlanClip } from "@/api/template-editor"
 import { useSegmentScheduler, type PlaybackSegment } from "../hooks/useSegmentScheduler"
 import { usePreviewAudio } from "../hooks/usePreviewAudio"
 import { PreviewControls } from "./PreviewControls"
-import { getFontFamily } from "@/components/title/constants"
+import { getFontFamily } from "../constants"

 interface FrontendPreviewPlayerProps {
  assets: AssetItem[]
@@ -36,18 +36,6 @@ interface FrontendPreviewPlayerProps {
    italic?: boolean
    stroke?: boolean
    shadow?: boolean
-    strokeWidth?: number
-    strokeColor?: string
-    shadowOffsetX?: number
-    shadowOffsetY?: number
-    shadowBlur?: number
-    shadowColor?: string
-    bgEnabled?: boolean
-    bgColor?: string
-    bgPadding?: number
-    bgRadius?: number
-    lineHeight?: number
-    maxCharsPerLine?: number
    posX?: number | null
    posY?: number | null
  }
@@ -261,25 +249,10 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
  const titleSidePct = (TITLE_MARGIN_SIDE / playRes.width) * 100
  const titleTopPct = (TITLE_MARGIN_TOP / playRes.height) * 100
  const titleBottomPct = (TITLE_MARGIN_BOTTOM / playRes.height) * 100
-  // 标题缩放到容器：字号 px = (settings.size / playRes.height) * containerHeight
-  // 描边/阴影：读 titleSettings 真实值，按容器比例缩放
-  const titleStrokeWidth = Math.max(
-    1,
-    ((titleSettings?.strokeWidth ?? 4) / playRes.height) * containerHeight,
-  )
-  const titleStrokeColor = titleSettings?.strokeColor ?? "#000000"
-  const titleShadowBlur = ((titleSettings?.shadowBlur ?? 4) / playRes.height) * containerHeight
-  const titleShadowOffsetX =
-    ((titleSettings?.shadowOffsetX ?? 2) / playRes.height) * containerHeight
-  const titleShadowOffsetY =
-    ((titleSettings?.shadowOffsetY ?? 2) / playRes.height) * containerHeight
-  const titleShadowColor = titleSettings?.shadowColor ?? "rgba(0,0,0,0.8)"
-  const titleShadowStr = `${titleShadowOffsetX}px ${titleShadowOffsetY}px ${titleShadowBlur}px ${titleShadowColor}`
-  // 标题背景色块
-  const titleBgEnabled = !!titleSettings?.bgEnabled
-  const titleBgColor = titleSettings?.bgColor ?? "rgba(0,0,0,0.5)"
-  const titleBgPadding = ((titleSettings?.bgPadding ?? 12) / playRes.height) * containerHeight
-  const titleBgRadius = ((titleSettings?.bgRadius ?? 8) / playRes.height) * containerHeight
+  const titleScale = containerHeight > 0 ? containerHeight / playRes.height : 1
+  const titleStrokeWidth = Math.max(1, 2 * titleScale)
+  const titleShadowBlur = 4 * titleScale
+  const titleShadowOffset = 2 * titleScale

  // ── Video 播放器（默认路径，浏览器原生硬件解码） ──
  const {
@@ -588,18 +561,14 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
                color: titleSettings.color || "#ffffff",
                fontWeight: titleSettings.bold ? 700 : 400,
                fontStyle: titleSettings.italic ? "italic" : "normal",
-                lineHeight: titleSettings.lineHeight ?? 1.05,
+                lineHeight: 1.05,
                wordBreak: "break-word",
                WebkitTextStroke: titleSettings.stroke
-                  ? `${titleStrokeWidth}px ${titleStrokeColor}`
+                  ? `${titleStrokeWidth}px #000000`
                  : undefined,
-                textShadow: titleSettings.shadow ? titleShadowStr : undefined,
-                background: titleBgEnabled ? titleBgColor : undefined,
-                padding: titleBgEnabled
-                  ? `${titleBgPadding}px ${titleBgPadding * 1.5}px`
+                textShadow: titleSettings.shadow
+                  ? `${titleShadowOffset}px ${titleShadowOffset}px ${titleShadowBlur}px rgba(0,0,0,0.8)`
                  : undefined,
-                borderRadius: titleBgEnabled ? `${titleBgRadius}px` : undefined,
-                display: titleBgEnabled ? "inline-block" : undefined,
              }}
            >
              {(effectiveTitle || "").split(/[/／]/).map((part, i) => (
@@ -16,7 +16,6 @@ import Step6CoverSettings from "../components/Step6CoverSettings"
 import BatchGenerationGrid from "./BatchGenerationGrid"
 import type { BatchTaskState } from "../hooks/generate-video/useGenerationPolling"
 import type { GeneratedVideo } from "@/api/template-editor"
-import type { TitleTemplate } from "@/components/title/template-types"

 export interface GenerateStepContentProps {
  currentStep: number
@@ -60,9 +59,6 @@ export interface GenerateStepContentProps {
    emoji?: string
    style: Record<string, unknown>
  }>
-  enableTemplates?: boolean
-  selectedTemplateId?: string | null
-  onApplyTemplate?: (settings: import("../types").TitleSettings, template: TitleTemplate) => void
  /* ── 封面 ── */
  coverSettings: CoverConfig
  onCoverSettingsChange: (settings: CoverConfig) => void
@@ -130,9 +126,6 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
    onToggleShadow,
    onApplyPreset,
    onUpdateStyle,
-    enableTemplates,
-    selectedTemplateId,
-    onApplyTemplate,
    activePreset,
    titlePresets,
    coverSettings,
@@ -208,9 +201,6 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
          onUpdateStyle={onUpdateStyle}
          activePreset={activePreset}
          titlePresets={titlePresets}
-          enableTemplates={enableTemplates}
-          selectedTemplateId={selectedTemplateId}
-          onApplyTemplate={onApplyTemplate}
          previewCount={previewCount}
          previewTitles={previewTitles}
          onPreviewTitlesChange={onPreviewTitlesChange}
@@ -19,7 +19,6 @@ import AiTitleGenerator from "./title/AiTitleGenerator"
 import TitleLibraryAutoComplete from "./title/TitleLibraryAutoComplete"
 import TitleStylePanel from "./title/TitleStylePanel"
 import { AI_TITLE_TEMPLATES } from "../constants"
-import type { TitleTemplate } from "@/components/title/template-types"

 interface Step4TitleSettingsProps {
  titleSettings: TitleSettings
@@ -50,9 +49,6 @@ interface Step4TitleSettingsProps {
  /** 每个变体的标题文字（长度=previewCount） */
  previewTitles?: string[]
  onPreviewTitlesChange?: (titles: string[]) => void
-  enableTemplates?: boolean
-  selectedTemplateId?: string | null
-  onApplyTemplate?: (settings: TitleSettings, template: TitleTemplate) => void
 }

 /** 从本地 AI 标题模板池按主题词生成 N 个不同标题（与单视频 AI 生成同源） */
@@ -102,9 +98,6 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
    previewCount = 1,
    previewTitles,
    onPreviewTitlesChange,
-    enableTemplates,
-    selectedTemplateId,
-    onApplyTemplate,
  } = props

  const isBatch = previewCount > 1
@@ -307,9 +300,6 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
        titlePresets={titlePresets}
        POSITION_OPTIONS={POSITION_OPTIONS}
        FONT_OPTIONS={FONT_OPTIONS}
-        enableTemplates={enableTemplates}
-        selectedTemplateId={selectedTemplateId}
-        onApplyTemplate={onApplyTemplate}
      />
    </div>
  )
@@ -12,20 +12,16 @@
 */
 import React, { useEffect, useRef } from "react"
 import type { TitleSettings } from "../../types"
-import { getFontFamily } from "@/components/title/constants"
+import { getFontFamily } from "../../constants"

 interface Props {
  settings: TitleSettings
  width?: number
  sampleText?: string
-  /** 背景（预览用，默认深色渐变模拟视频底），transparent=true 时忽略 */
+  /** 背景（预览用，默认深色渐变模拟视频底） */
  background?: string
-  /** 高度（可选，默认按 portrait 选比例） */
+  /** 高度（可选，默认 width/2） */
  height?: number
-  /** 透明背景（卡片/编辑器预览叠加在图片上时使用） */
-  transparent?: boolean
-  /** 纵向竖屏预览（9:16），true 时 aspect=16/9 适配手机视频比例 */
-  portrait?: boolean
 }

 /** 按 maxCharsPerLine 自动换行 */
@@ -60,11 +56,9 @@ const TitleMiniPreview: React.FC<Props> = ({
  sampleText,
  background = "linear-gradient(135deg,#1f2937,#111827)",
  height,
-  transparent = false,
-  portrait = false,
 }) => {
  const canvasRef = useRef<HTMLCanvasElement>(null)
-  const h = height ?? Math.round(width * (portrait ? 16 / 9 : 1 / 1.8))
+  const h = height ?? Math.round(width / 1.8)
  const text = (sampleText || settings.title || "预览标题").trim() || "预览标题"

  useEffect(() => {
@@ -80,11 +74,9 @@ const TitleMiniPreview: React.FC<Props> = ({
    ctx.scale(dpr, dpr)
    ctx.clearRect(0, 0, width, h)

-    // 背景（transparent 时跳过，用于叠加在图片上）
-    if (!transparent) {
-      ctx.fillStyle = "#111827"
-      ctx.fillRect(0, 0, width, h)
-    }
+    // 背景
+    ctx.fillStyle = "#111827"
+    ctx.fillRect(0, 0, width, h)

    // 分辨率缩放：以 360 宽为基准（对应 720p 的一半）
    const scale = width / 360
@@ -129,8 +121,7 @@ const TitleMiniPreview: React.FC<Props> = ({
      startY = h / 2 - totalH / 2 + size / 2
    } else {
      // bottom
-      const botMargin = portrait ? r(24) : r(16)
-      startY = h - totalH - botMargin + size / 2
+      startY = h - totalH - r(16) + size / 2
    }
    let centerX = width / 2
    if (settings.position === "custom" && settings.posX != null) {
@@ -190,7 +181,7 @@ const TitleMiniPreview: React.FC<Props> = ({
    ctx.shadowBlur = prevShadow.b
    ctx.shadowOffsetX = prevShadow.ox
    ctx.shadowOffsetY = prevShadow.oy
-  }, [settings, width, h, text, transparent, portrait, background])
+  }, [settings, width, h, text])

  return (
    <canvas
@@ -199,7 +190,7 @@ const TitleMiniPreview: React.FC<Props> = ({
        borderRadius: 6,
        display: "block",
        maxWidth: "100%",
-        background: transparent ? "transparent" : background,
+        background,
      }}
    />
  )
@@ -4,7 +4,7 @@
 * 避免 -webkit-text-stroke 在 Chromium 中吞掉填充色的问题
 */
 import React from "react"
-import { getFontFamily } from "@/components/title/constants"
+import { getFontFamily } from "../../constants"

 interface TitlePresetItem {
  key: string
@@ -442,17 +442,3 @@
  font-size: 12px !important;
  padding: 6px 8px !important;
 }
-
-/* 标题模板入口按钮（#2003） */
-.ts-template-btn {
-  border: none;
-  background: transparent;
-  color: var(--primary-color, #7c3aed);
-  font-size: 12px;
-  cursor: pointer;
-  padding: 2px 0;
-  font-weight: 500;
-}
-.ts-template-btn:hover {
-  text-decoration: underline;
-}
@@ -54,8 +54,39 @@ export const POSITION_OPTIONS = [
  { value: "custom", label: "自定义" },
 ]

-/* ── 标题字体：统一使用公共层定义（#2001） ── */
-export { getFontFamily } from "@/components/title/constants"
+/* ── 标题字体选项（#2001：新增 4 款爆款字体） ── */
+export const FONT_OPTIONS = [
+  "优设标题黑",
+  "阿里普惠体Bold",
+  "抖音美好体",
+  "思源黑体Heavy",
+  "思源黑体",
+  "思源宋体",
+  "苹方",
+  "微软雅黑",
+  "楷体",
+]
+
+/* ── 标题字体 CSS font-family 映射（中文显示名 → 浏览器可识别的字体栈） ── */
+export const FONT_FAMILY_MAP: Record<string, string> = {
+  优设标题黑:
+    '"YouSheBiaoTiHei","YouShe Title Black","Source Han Sans SC Heavy","Noto Sans SC","PingFang SC",sans-serif',
+  阿里普惠体Bold:
+    '"Alibaba PuHuiTi Bold","Alibaba PuHuiTi","Source Han Sans SC","PingFang SC",sans-serif',
+  抖音美好体: '"Douyin Sans","DouyinSansBold","Source Han Sans SC Heavy","PingFang SC",sans-serif',
+  思源黑体Heavy:
+    '"Source Han Sans SC Heavy","Noto Sans SC Heavy","Source Han Sans CN Heavy","PingFang SC",sans-serif',
+  思源黑体: '"Source Han Sans SC", "Noto Sans SC", "PingFang SC", "Microsoft YaHei", sans-serif',
+  思源宋体: '"Source Han Serif SC", "Noto Serif SC", "Songti SC", "SimSun", serif',
+  苹方: '"PingFang SC", -apple-system, "Helvetica Neue", sans-serif',
+  PingFang: '"PingFang SC", -apple-system, "Helvetica Neue", sans-serif',
+  微软雅黑: '"Microsoft YaHei", "PingFang SC", sans-serif',
+  楷体: '"KaiTi", "STKaiti", "DFKai-SB", serif',
+}
+
+export function getFontFamily(font: string): string {
+  return FONT_FAMILY_MAP[font] || FONT_FAMILY_MAP["思源黑体"]
+}

 /* ── 标题样式预设 ── */
 export const TITLE_PRESETS = [
@@ -1,7 +1,6 @@
 import { useCallback, useMemo } from "react"
 import { TITLE_PRESETS } from "../../constants"
 import { TITLE_PRESETS as NEW_TITLE_PRESETS } from "@/components/title/constants"
-import { titleStyleConfigToCamel } from "@/components/title/utils"
 import type { TitleSettings } from "../../types"

 interface UseTitleStyleUpdatersOptions {
@@ -17,24 +16,8 @@ export function useTitleStyleUpdaters({
  titleSettings,
  onTitleSettingsChange,
 }: UseTitleStyleUpdatersOptions) {
-  /** 匹配预设：对新预设（snake→camel 后）全字段比；旧预设只比 color/bold/italic/stroke/shadow */
+  /** 匹配预设：只用 color/bold/italic/stroke/shadow，不再匹配 size */
  const getActivePreset = (settings: TitleSettings): string | null => {
-    // 新预设匹配：font/size/color/bold/stroke/shadow/bg 全部对齐才算命中
-    for (const p of NEW_TITLE_PRESETS) {
-      const camel = titleStyleConfigToCamel(p.style)
-      if (
-        (camel.font ?? null) === (settings.font ?? null) &&
-        (camel.color ?? null) === (settings.color ?? null) &&
-        (camel.bold ?? null) === (settings.bold ?? null) &&
-        (camel.italic ?? null) === (settings.italic ?? null) &&
-        (camel.stroke ?? null) === (settings.stroke ?? null) &&
-        (camel.shadow ?? null) === (settings.shadow ?? null) &&
-        (camel.bgEnabled ?? null) === (settings.bgEnabled ?? null)
-      ) {
-        return p.key
-      }
-    }
-    // fallback 旧预设（legacy）
    for (const p of TITLE_PRESETS) {
      if (
        settings.color === p.style.color &&
@@ -108,31 +91,24 @@ export function useTitleStyleUpdaters({
  }, [titleSettings, onTitleSettingsChange])

  const toggleStroke = useCallback(() => {
-    onTitleSettingsChange({
-      ...titleSettings,
-      stroke: !titleSettings.stroke,
-      // 开启描边时若宽度过小给个默认值（让滑块可见可调）
-      strokeWidth:
-        !titleSettings.stroke && (titleSettings.strokeWidth ?? 0) < 2
-          ? 4
-          : titleSettings.strokeWidth,
-    })
+    onTitleSettingsChange({ ...titleSettings, stroke: !titleSettings.stroke })
  }, [titleSettings, onTitleSettingsChange])

  const toggleShadow = useCallback(() => {
    onTitleSettingsChange({ ...titleSettings, shadow: !titleSettings.shadow })
  }, [titleSettings, onTitleSettingsChange])

-  /** 应用预设：正确把 snake_case 的 preset.style 转为 camelCase 再 spread */
+  /** 应用预设（支持新预设细粒度字段） */
  const applyPreset = useCallback(
    (presetKey: string) => {
+      // 优先匹配新预设（10个爆款预设），fallback 旧预设
      const newPreset = NEW_TITLE_PRESETS.find((p) => p.key === presetKey)
      const oldPreset = TITLE_PRESETS.find((p) => p.key === presetKey)
      if (newPreset) {
        onTitleSettingsChange({
          ...titleSettings,
-          ...titleStyleConfigToCamel(newPreset.style),
-          // 封面独立标题保持不变（不清空，避免破坏封面定制）
+          ...(newPreset.style as Partial<TitleSettings>),
+          // 清除逐行覆盖
          lineOverrides: [],
        })
        return
@@ -140,47 +116,11 @@ export function useTitleStyleUpdaters({
      if (!oldPreset) return
      onTitleSettingsChange({
        ...titleSettings,
-        color: oldPreset.style.color as string,
-        bold: oldPreset.style.bold as boolean,
-        italic: oldPreset.style.italic as boolean,
-        stroke: oldPreset.style.stroke as boolean,
-        shadow: oldPreset.style.shadow as boolean,
-      })
-    },
-    [titleSettings, onTitleSettingsChange],
-  )
-
-  /** 应用模板：用模板（camelCase TitleSettings）覆盖样式字段，保留 title/aiAutoSelect */
-  const applyTemplate = useCallback(
-    (tpl: TitleSettings) => {
-      onTitleSettingsChange({
-        ...titleSettings,
-        // 覆盖样式字段
-        position: tpl.position,
-        posX: tpl.posX,
-        posY: tpl.posY,
-        font: tpl.font,
-        size: tpl.size,
-        bold: tpl.bold,
-        italic: tpl.italic,
-        stroke: tpl.stroke,
-        shadow: tpl.shadow,
-        color: tpl.color,
-        lineHeight: tpl.lineHeight,
-        marginTop: tpl.marginTop,
-        maxCharsPerLine: tpl.maxCharsPerLine,
-        strokeWidth: tpl.strokeWidth,
-        strokeColor: tpl.strokeColor,
-        shadowOffsetX: tpl.shadowOffsetX,
-        shadowOffsetY: tpl.shadowOffsetY,
-        shadowBlur: tpl.shadowBlur,
-        shadowColor: tpl.shadowColor,
-        bgEnabled: tpl.bgEnabled,
-        bgColor: tpl.bgColor,
-        bgPadding: tpl.bgPadding,
-        bgRadius: tpl.bgRadius,
-        lineOverrides: [],
-        // coverTitle 保留用户当前值，不强制覆盖
+        color: oldPreset.style.color,
+        bold: oldPreset.style.bold,
+        italic: oldPreset.style.italic,
+        stroke: oldPreset.style.stroke,
+        shadow: oldPreset.style.shadow,
      })
    },
    [titleSettings, onTitleSettingsChange],
@@ -209,7 +149,6 @@ export function useTitleStyleUpdaters({
    toggleStroke,
    toggleShadow,
    applyPreset,
-    applyTemplate,
    updateStyle,
  }
 }
@@ -108,14 +108,11 @@ def _check_musetalk_health() -> tuple[bool, dict]:
        return False, {"error": str(exc)}


-def _register(task_id: Optional[str] = None) -> tuple[bool, bool]:
+def _register(task_id: Optional[str] = None) -> bool:
    """向服务端注册 / 心跳，附带 GPU 信息。

    推理期间的心跳线程传 task_id：服务端会同步刷新该 processing 任务的
-    last_heartbeat_at，防止长推理被误判超时回收。同时服务端会检查该任务
-    是否已被用户取消，若是则返回 cancel_task=True。
-
-    返回 (ok, cancel_task)。
+    last_heartbeat_at，防止长推理被误判超时回收。
    """
    ok, info = _check_musetalk_health()
    if isinstance(info, dict):
@@ -145,14 +142,12 @@ def _register(task_id: Optional[str] = None) -> tuple[bool, bool]:
            timeout=15,
        )
        if r.status_code == 200:
-            resp_body = r.json()
-            cancel_task = resp_body.get("cancel_task", False)
-            return True, cancel_task
+            return True
        logger.error("注册/心跳失败: HTTP %d body=%s", r.status_code, r.text[:300])
-        return False, False
+        return False
    except Exception as exc:
        logger.error("注册/心跳异常: %s", exc)
-        return False, False
+        return False


 def _probe_gpu_name() -> str:
@@ -334,9 +329,6 @@ class TaskHeartbeat(threading.Thread):
    期间无法发送，服务端会因任务 last_heartbeat_at 停滞而误判超时回退 pending。
    本线程每 task_heartbeat_interval 秒（默认 30s）POST /gpu/register 并
    携带当前 task_id，让服务端持续续期任务心跳；任务处理结束 stop()。
-
-    同时检测服务端返回的 cancel_task 信号：若为 True，说明用户已取消任务，
-    立即调用 _cancel_musetalk() 终止本地推理，并设置 cancelled 标志供主流程检查。
    """

    def __init__(self, task_id: str, interval: float):
@@ -344,21 +336,13 @@ class TaskHeartbeat(threading.Thread):
        self.task_id = task_id
        self.interval = max(5.0, interval)
        self._stop_event = threading.Event()
-        self.cancelled = False  # 外部可读的取消标志

    def run(self) -> None:
        # 先立即发一次，再按间隔循环（首次心跳失败不影响主流程）
        while not self._stop_event.is_set():
            try:
-                ok, cancel_task = _register(self.task_id)
-                if ok:
+                if _register(self.task_id):
                    logger.debug("任务 %s 心跳已发送", self.task_id)
-                if cancel_task:
-                    logger.warning("任务 %s 已被用户取消，正在终止本地推理...", self.task_id)
-                    self.cancelled = True
-                    _cancel_musetalk()
-                    self._stop_event.set()
-                    return
            except Exception as exc:  # noqa: BLE001
                logger.warning("任务 %s 心跳异常（忽略）: %s", self.task_id, exc)
            self._stop_event.wait(self.interval)
@@ -385,17 +369,9 @@ def _handle_task(task: dict) -> None:
            if not _download(task["video_url"], video_path):
                _report_result(task_id, False, 0.0, "下载人物视频失败")
                return
-            if hb.cancelled:
-                logger.info("任务 %s 在下载阶段被用户取消", task_id)
-                _report_result(task_id, False, 0.0, "用户取消任务")
-                return
            if not _download(task["audio_url"], audio_path):
                _report_result(task_id, False, 0.0, "下载驱动音频失败")
                return
-            if hb.cancelled:
-                logger.info("任务 %s 在下载阶段被用户取消", task_id)
-                _report_result(task_id, False, 0.0, "用户取消任务")
-                return

            # 2. 输入时长前置校验：短视频 MuseTalk 会 division by zero，
            #    直接上报 failed，不浪费 GPU 时间。ffprobe 不可用/读失败（0.0）
@@ -416,20 +392,12 @@ def _handle_task(task: dict) -> None:
            err = ""
            retryable = False
            for attempt in range(Config.task_max_retry + 1):
-                if hb.cancelled:
-                    logger.info("任务 %s 在推理前被用户取消", task_id)
-                    _report_result(task_id, False, 0.0, "用户取消任务")
-                    return
                if attempt > 0:
                    logger.info("任务 %s 第 %d 次重试（瞬时错误）...", task_id, attempt + 1)
                    time.sleep(2)
                success, duration, err, retryable = _call_musetalk(video_path, audio_path, out_path)
                if success or not retryable:
                    break
-            if hb.cancelled:
-                logger.info("任务 %s 被用户取消（推理已终止）", task_id)
-                _report_result(task_id, False, 0.0, "用户取消任务")
-                return
            if not success:
                logger.error("任务 %s 推理失败: %s", task_id, err)
                _report_result(task_id, False, 0.0, err)
@@ -499,8 +467,7 @@ def main() -> int:
            # 心跳
            now = time.time()
            if now - last_heartbeat >= Config.heartbeat_interval:
-                ok, _ = _register()
-                if ok:
+                if _register():
                    last_heartbeat = now

            # 轮询任务
@@ -526,12 +526,13 @@ def _load_musetalk_models():
                        gfpgan_key = "params_ema" if "params_ema" in gfpgan_ckpt else "params"
                        gfpgan_model.load_state_dict(gfpgan_ckpt[gfpgan_key], strict=True)
                        gfpgan_model.eval()
-                        # GFPGAN 始终使用 FP32 推理，避免 FP16 色偏导致紫/灰色块
+                        if Config.use_float16:
+                            gfpgan_model = gfpgan_model.half()
                        gfpgan_model = gfpgan_model.to(device)
                        del gfpgan_ckpt
                        _gfpgan_loaded = True
                        _gfpgan_load_error = None
-                        logger.info("GFPGAN 加载完成 (FP32，避免色偏)")
+                        logger.info("GFPGAN 加载完成 (FP16=%s)", Config.use_float16)
                    else:
                        _gfpgan_loaded = False
                        _gfpgan_load_error = f"模型文件不存在: {gfpgan_path}"
@@ -805,9 +806,8 @@ def _run_inference(
            crop = frame[y1:y2_eff, x1:x2]
            if crop.size == 0:
                continue
-            # 直接传 BGR 给 VAE：VAE 内部 preprocess_img 已做 BGR→RGB 转换，
-            # 此处再 cvtColor 会造成双重转换、R/B 通道互换（蓝色块根因）。
-            crop_resized = cv2.resize(crop, (256, 256), interpolation=cv2.INTER_LANCZOS4)
+            crop_rgb = cv2.cvtColor(crop, cv2.COLOR_BGR2RGB)
+            crop_resized = cv2.resize(crop_rgb, (256, 256), interpolation=cv2.INTER_LANCZOS4)
            # 使用 VAE 的 get_latents_for_unet 得到 8 通道输入
            # get_latents_for_unet 内部: preprocess(half_mask=True) encode + preprocess(half_mask=False) encode → cat → [1,8,32,32]
            latents = vae.get_latents_for_unet(crop_resized).detach().cpu()
@@ -920,30 +920,25 @@ def _run_inference(
                _ff_proc.stdin.write(ori_frame.tobytes())
                continue

-            # GFPGAN 人脸超分增强（FP32 推理，避免 FP16 色偏）
-            # 色彩通道约定：ori_frame / res_frame / _face_up 均为 BGR（OpenCV 默认）；
-            # GFPGAN 输出用 return_rgb=True 拿到 RGB，再转 BGR，与后续 face_parsing 融合保持一致。
+            # GFPGAN 人脸超分增强
            if gfpgan_enhancer is not None:
                try:
                    _fh, _fw = res_frame_resized.shape[:2]
                    _face_up = cv2.resize(res_frame_resized, (512, 512),
                                          interpolation=cv2.INTER_LANCZOS4)
                    _face_rgb = cv2.cvtColor(_face_up, cv2.COLOR_BGR2RGB).astype(np.float32) / 255.0
-                    _face_t = torch.from_numpy(_face_rgb.transpose(2, 0, 1)).unsqueeze(0)
-                    # GFPGAN 始终 FP32，避免 FP16 精度导致色偏；归一化到 [-1, 1]
+                    _face_t = torch.from_numpy(_face_rgb.transpose(2,0,1)).unsqueeze(0)
                    _face_t = ((_face_t - 0.5) / 0.5).to(device)
+                    if Config.use_float16:
+                        _face_t = _face_t.half()
                    with torch.no_grad():
-                        _out = gfpgan_enhancer(_face_t, return_rgb=True, weight=0.35)[0]
-                    # 输出 tensor: RGB, [-1, 1] 范围 → clamp → 映射到 [0, 255] uint8
-                    _out = _out.squeeze(0).float().cpu().clamp_(-1.0, 1.0)
-                    _out = ((_out + 1.0) / 2.0 * 255.0).numpy().transpose(1, 2, 0)
-                    _out_rgb = _out.astype(np.uint8)
-                    # RGB → BGR，与 ori_frame 保持一致，确保 face_parsing 融合时通道正确
-                    _out_bgr = cv2.cvtColor(_out_rgb, cv2.COLOR_RGB2BGR)
-
+                        _out = gfpgan_enhancer(_face_t, return_rgb=False, weight=0.5)[0]
+                    _out = _out.squeeze(0).float().cpu().clamp_(-1,1)
+                    _out = ((_out + 1)/2*255).numpy().transpose(1,2,0)
+                    _out_bgr = cv2.cvtColor(_out.astype(np.uint8), cv2.COLOR_RGB2BGR)
                    res_frame_resized = cv2.resize(_out_bgr, (_fw, _fh),
                                                    interpolation=cv2.INTER_LANCZOS4)
-                    del _face_t, _out, _out_rgb, _out_bgr
+                    del _face_t, _out, _out_bgr
                except Exception as _gfpgan_err:
                    logger.warning("GFPGAN 增强失败（帧 %d），使用原图: %s", i, _gfpgan_err)

@@ -990,7 +985,7 @@ def _run_inference(
    if video_downsampled:
        logger.info("输入视频 %.1f fps，降帧至 %.1f fps 推理后直接输出（不做插帧还原）", original_fps, inference_fps)

-    _mux_video_with_audio(final_video, audio_path, output_path)
+    shutil.copy2(str(final_video), str(output_path))

    try:
        torch.cuda.empty_cache()
@@ -18,10 +18,6 @@ def build_engine(
    pool_timeout: int = 30,
    pool_recycle: int = 3600,
 ):
-    # SQLite 不支持 QueuePool 的 pool_size/max_overflow/pool_timeout，
-    # 传了会在 create_engine 阶段直接 TypeError，这里只对非 SQLite 传连接池参数。
-    if _is_sqlite(database_url):
-        return create_engine(database_url, pool_recycle=pool_recycle)
    return create_engine(
        database_url,
        pool_size=pool_size,
@@ -68,9 +68,7 @@ def test_register_payload_includes_task_id_only_when_provided(worker, monkeypatc

    class _Resp:
        status_code = 200
-
-        def json(self):
-            return {"worker_id": captured[-1]["worker_id"], "cancel_task": False}
+        text = ""

    def _fake_post(url, json=None, headers=None, timeout=None):
        captured.append(json)
@@ -79,9 +77,7 @@ def test_register_payload_includes_task_id_only_when_provided(worker, monkeypatc
    monkeypatch.setattr(worker.requests, "post", _fake_post)
    monkeypatch.setattr(worker, "_check_musetalk_health", lambda: (True, {}))

-    _ok, _cancel = worker._register("task-abc")
-    assert _ok is True
-    assert _cancel is False
+    assert worker._register("task-abc") is True
    assert captured[-1]["task_id"] == "task-abc"
    assert captured[-1]["worker_id"]

@@ -97,7 +93,7 @@ def test_task_heartbeat_thread_sends_and_stops(worker, monkeypatch):

    def _fake_register(task_id=None):
        calls.append(task_id)
-        return True, False
+        return True

    monkeypatch.setattr(worker, "_register", _fake_register)
    hb = worker.TaskHeartbeat("task-hb1", interval=5)
@@ -109,50 +105,6 @@ def test_task_heartbeat_thread_sends_and_stops(worker, monkeypatch):
    assert calls and all(c == "task-hb1" for c in calls)


-def test_task_heartbeat_cancel_calls_musetalk_cancel(worker, monkeypatch):
-    """心跳响应 cancel_task=True → 调 _cancel_musetalk 并设置 cancelled 标志。"""
-    cancel_calls = []
-
-    monkeypatch.setattr(worker, "_register", lambda *a, **k: (True, True))
-    monkeypatch.setattr(worker, "_cancel_musetalk", lambda: cancel_calls.append(1))
-
-    hb = worker.TaskHeartbeat("task-cancel-1", interval=5)
-    hb.start()
-    hb.join(timeout=2)  # 检测到取消后线程自行 return
-    assert not hb.is_alive()
-    assert hb.cancelled is True
-    assert cancel_calls == [1]
-
-
-def test_handle_task_reports_cancelled_after_musetalk_abort(worker, monkeypatch):
-    """推理被 /cancel 终止后，hb.cancelled=True → 上报失败而非重试。"""
-    reports = []
-
-    monkeypatch.setattr(worker, "_register", lambda *a, **k: (True, False))
-    monkeypatch.setattr(worker, "_download", lambda url, path: True)
-    monkeypatch.setattr(worker, "_probe_duration", lambda path: 12.0)
-    # 模拟推理被终止（/inference 返回错误）
-    monkeypatch.setattr(worker, "_call_musetalk", lambda v, a, o: (False, 0.0, "推理被取消", False))
-    monkeypatch.setattr(
-        worker,
-        "_report_result",
-        lambda task_id, success, duration=0.0, error_msg="": reports.append(error_msg) or True,
-    )
-
-    # 让 TaskHeartbeat 在主线程检查时报告已取消
-    orig_hb_init = worker.TaskHeartbeat
-
-    def _hb(task_id, interval):
-        h = orig_hb_init(task_id, interval)
-        h.cancelled = True
-        return h
-
-    monkeypatch.setattr(worker, "TaskHeartbeat", _hb)
-
-    worker._handle_task({"task_id": "t-canceled", "video_url": "u", "audio_url": "u"})
-    assert reports == ["用户取消任务"]
-
-
 # ── 短视频前置拦截 ─────────────────────────────────────────────────


@@ -163,7 +115,7 @@ def test_handle_task_short_video_reports_failed_without_inference(worker, monkey
    audio.write_bytes(b"fake-audio")
    reports = []

-    monkeypatch.setattr(worker, "_register", lambda *a, **k: (True, False))
+    monkeypatch.setattr(worker, "_register", lambda *a, **k: True)
    monkeypatch.setattr(worker, "_download", lambda url, path: True)
    # ffprobe 读出 1.2s → 低于 3s 阈值
    monkeypatch.setattr(worker, "_probe_duration", lambda path: 1.2)
@@ -196,7 +148,7 @@ def test_handle_task_short_video_reports_failed_without_inference(worker, monkey
 def test_handle_task_probe_failure_does_not_block(worker, monkeypatch):
    """ffprobe 不可用（duration=0.0）时不能误杀，应继续推理."""
    reports = []
-    monkeypatch.setattr(worker, "_register", lambda *a, **k: (True, False))
+    monkeypatch.setattr(worker, "_register", lambda *a, **k: True)
    monkeypatch.setattr(worker, "_download", lambda url, path: True)
    monkeypatch.setattr(worker, "_probe_duration", lambda path: 0.0)
    monkeypatch.setattr(
@@ -262,7 +214,7 @@ def test_handle_task_retries_once_for_transient_then_succeeds(worker, monkeypatc
            return False, 0.0, "MuseTalk HTTP 503: busy", True
        return True, 6.5, "", False

-    monkeypatch.setattr(worker, "_register", lambda *a, **k: (True, False))
+    monkeypatch.setattr(worker, "_register", lambda *a, **k: True)
    monkeypatch.setattr(worker, "_download", lambda url, path: True)
    monkeypatch.setattr(worker, "_probe_duration", lambda path: 12.0)
    monkeypatch.setattr(worker, "_call_musetalk", _fake_call)
@@ -287,7 +239,7 @@ def test_handle_task_no_retry_for_deterministic_failure(worker, monkeypatch):
        return False, 0.0, "MuseTalk HTTP 400: bad input", False

    reports = []
-    monkeypatch.setattr(worker, "_register", lambda *a, **k: (True, False))
+    monkeypatch.setattr(worker, "_register", lambda *a, **k: True)
    monkeypatch.setattr(worker, "_download", lambda url, path: True)
    monkeypatch.setattr(worker, "_probe_duration", lambda path: 12.0)
    monkeypatch.setattr(worker, "_call_musetalk", _fake_call)
@@ -1,89 +0,0 @@
-"""GPU Worker 路由单测 — #2009 取消链路.
-
-直接调用路由函数（不经 HTTP 栈），显式注入 svc / _token 以跳过 Depends。
-CI 增量映射: gpu_lipsync.py (route) → test_gpu_lipsync_routes.py
-"""
-
-from __future__ import annotations
-
-import json
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-
-def _payload(**overrides):
-    from app.schemas.gpu_lipsync import GpuWorkerRegisterRequest
-
-    data = {
-        "worker_id": "w-1",
-        "hostname": "gpu-host",
-        "gpu_name": "RTX3060",
-        "free_vram_mb": 10000,
-        "capabilities": json.dumps({"musetalk": True}),
-    }
-    data.update(overrides)
-    return GpuWorkerRegisterRequest(**data)
-
-
-def test_register_returns_cancel_task_true_when_cancelled():
-    """心跳接口在任务已取消时必须把 cancel_task=True 透传给 Worker."""
-    fake_worker = MagicMock()
-    fake_worker.worker_id = "w-1"
-    fake_worker.hostname = "gpu-host"
-    fake_worker.gpu_name = "RTX3060"
-    fake_worker.free_vram_mb = 10000
-    fake_worker.capabilities = "musetalk"
-    fake_svc = MagicMock()
-    fake_svc.register_worker.return_value = (fake_worker, True)
-
-    from app.api.routes.gpu_lipsync import register_worker as route
-
-    resp = route(_payload(task_id="task-cancelled"), svc=fake_svc, _token="t")
-
-    assert resp.cancel_task is True
-    assert resp.ok is True
-    fake_svc.register_worker.assert_called_once()
-    kwargs = fake_svc.register_worker.call_args.kwargs
-    assert kwargs["task_id"] == "task-cancelled"
-
-
-def test_register_returns_cancel_task_false_normal():
-    """正常心跳 cancel_task=False."""
-    fake_worker = MagicMock()
-    fake_worker.worker_id = "w-1"
-    fake_worker.hostname = "gpu-host"
-    fake_worker.gpu_name = "RTX3060"
-    fake_worker.free_vram_mb = 10000
-    fake_worker.capabilities = "musetalk"
-    fake_svc = MagicMock()
-    fake_svc.register_worker.return_value = (fake_worker, False)
-
-    from app.api.routes.gpu_lipsync import register_worker as route
-
-    resp = route(_payload(), svc=fake_svc, _token="t")
-
-    assert resp.cancel_task is False
-
-
-def test_cancel_route_accepts_processing_status():
-    """cancel 路由允许 processing 状态（GPU 推理中），不再 400。"""
-    fake_job = MagicMock()
-    fake_job.status = "cancelled"
-
-    svc = MagicMock()
-    svc.cancel_job.return_value = fake_job
-
-    current_user = MagicMock()
-    current_user.user.id = "u1"
-
-    from app.api.routes.lipsync import cancel_lipsync_job as route
-
-    result = route("job-1", current_user, svc)
-
-    svc.cancel_job.assert_called_once_with("job-1", "u1")
-    assert result.status == "cancelled"
-
-
-if __name__ == "__main__":
-    pytest.main([__file__, "-q"])
@@ -173,10 +173,10 @@ def test_timed_out_task_is_redispatched(svc):


 def test_register_worker_creates_then_updates(svc):
-    w, _cancel = svc.register_worker("w-1", hostname="pc1", gpu_name="RTX2060", free_vram_mb=3500)
+    w = svc.register_worker("w-1", hostname="pc1", gpu_name="RTX2060", free_vram_mb=3500)
    assert w.worker_id == "w-1"
    assert w.gpu_name == "RTX2060"
-    w2, _cancel2 = svc.register_worker("w-1", hostname="pc1", gpu_name="RTX2060", free_vram_mb=2000)
+    w2 = svc.register_worker("w-1", hostname="pc1", gpu_name="RTX2060", free_vram_mb=2000)
    assert w2.free_vram_mb == 2000  # 更新
    assert w2.created_at == w.created_at  # 没新建

@@ -195,7 +195,7 @@ def test_register_with_task_id_refreshes_task_heartbeat(svc):
        {"last_heartbeat_at": old_hb - timedelta(seconds=300)}
    )
    svc.db.commit()
-    _w, _c = svc.register_worker("w-1", task_id=t.id)
+    svc.register_worker("w-1", task_id=t.id)
    svc.db.refresh(t)
    assert t.last_heartbeat_at > old_hb
    assert t.status == "processing"  # 心跳不改变状态
@@ -213,7 +213,7 @@ def test_register_task_heartbeat_ignores_finished_or_foreign_task(svc):
    svc.poll_task("w-1")
    done = svc.report_result(t.id, "w-1", success=True, duration_seconds=10.0)
    hb_when_done = done.last_heartbeat_at
-    _w, _c = svc.register_worker("w-1", task_id=t.id)
+    svc.register_worker("w-1", task_id=t.id)
    svc.db.refresh(t)
    assert t.status == "done"
    assert t.last_heartbeat_at == hb_when_done  # 没被改写
@@ -232,61 +232,17 @@ def test_register_task_heartbeat_ignores_finished_or_foreign_task(svc):
        {"last_heartbeat_at": owner_hb - timedelta(seconds=600)}
    )
    svc.db.commit()
-    _w2, _c2 = svc.register_worker("w-1", task_id=t2.id)  # 旧 worker 迟到心跳
+    svc.register_worker("w-1", task_id=t2.id)  # 旧 worker 迟到心跳
    svc.db.refresh(t2)
    assert t2.worker_id == "w-2"
    assert t2.status == "processing"
    assert t2.last_heartbeat_at == owner_hb

    # 场景 3：不存在的 task_id 不报错
-    _wn, _cn = svc.register_worker("w-1", task_id="nonexistent-id")
+    svc.register_worker("w-1", task_id="nonexistent-id")
    assert svc.db.get(GpuLipsyncTaskModel, "nonexistent-id") is None


-def test_register_task_heartbeat_detects_cancelled(svc):
-    """取消链路：任务已 cancelled 时，register 心跳必须返回 cancel_task=True."""
-    t = svc.create_task(video_url="v", audio_url="a")
-    svc.poll_task("w-1")
-    svc.db.refresh(t)
-    # 用户取消：直接把任务置为 cancelled
-    t.status = "cancelled"
-    t.finished_at = datetime.now(UTC)
-    svc.db.commit()
-
-    _w, cancel_task = svc.register_worker("w-1", task_id=t.id)
-    assert cancel_task is True
-    svc.db.refresh(t)
-    assert t.status == "cancelled"  # 心跳不改写已取消状态
-
-
-def test_report_result_cancelled_stays_cancelled(svc):
-    """Worker 终止取消任务后上报失败，report_result 必须保持 cancelled 不回退 pending."""
-    t = svc.create_task(video_url="v", audio_url="a")
-    svc.poll_task("w-1")
-    svc.db.refresh(t)
-    t.status = "cancelled"
-    svc.db.commit()
-
-    result = svc.report_result(t.id, "w-1", success=False, error_msg="推理被终止")
-    assert result.status == "cancelled"
-    assert result.finished_at is not None
-    assert "推理被终止" in (result.error_msg or "")
-
-
-def test_wait_for_result_returns_when_cancelled(svc):
-    """wait_for_result 将 cancelled 视为终态，立即返回，Celery 不回退 MediaKit."""
-    t = svc.create_task(video_url="v", audio_url="a")
-    svc.poll_task("w-1")
-    svc.db.refresh(t)
-    t.status = "cancelled"
-    t.finished_at = datetime.now(UTC)
-    svc.db.commit()
-
-    result = svc.wait_for_result(t.id, timeout_seconds=5, poll_interval=0.1)
-    assert result is not None
-    assert result.status == "cancelled"
-
-
 def test_default_gpu_task_timeout_is_900(svc):
    """#1970 默认超时 300→900，覆盖 RTX2060 长视频推理."""
    assert svc.settings.gpu_task_timeout_seconds == 900
@@ -248,41 +248,3 @@ class TestSignMediaUrl:
        with patch.object(task_mod, "get_shared_storage_service", side_effect=RuntimeError("x")):
            url = "https://own-bucket.oss-cn-beijing.aliyuncs.com/a.wav"
            assert task_mod._sign_media_url(url) == url
-
-
-def test_cancelled_gpu_task_does_not_fallback_mediakit(monkeypatch):
-    """GPU 任务被用户取消 → Celery 任务直接标记 cancelled，不回退 MediaKit。"""
-    job = MagicMock()
-    job.id = "job-1"
-    job.status = "processing"
-    job.mediakit_task_id = "gpu:gpu-task-1"
-
-    gpu_task = MagicMock()
-    gpu_task.status = "cancelled"
-    gpu_task.error_msg = "用户取消"
-
-    fake_gpu_svc = MagicMock()
-    fake_gpu_svc.wait_for_result.return_value = gpu_task
-    gpu_service_cls = MagicMock(return_value=fake_gpu_svc)
-
-    fake_db = MagicMock()
-    fake_db.query.return_value.filter_by.return_value.first.return_value = job
-
-    # 直接替换 sys.modules 里的 gpu_lipsync_service 模块（全量跑时它可能已被
-    # 其他测试换成 MagicMock），保证任务函数内 from...import 一定拿到我们的类；
-    # 并替换 _get_db_session 绕开 worker_app / app.db 两条 import 分支。
-    import sys
-    from types import SimpleNamespace
-
-    fake_mod = SimpleNamespace(GpuLipsyncService=gpu_service_cls)
-    monkeypatch.setitem(sys.modules, "app.services.gpu_lipsync_service", fake_mod)
-    monkeypatch.setattr(task_mod, "_get_db_session", lambda: fake_db)
-    monkeypatch.setattr(task_mod, "logger", MagicMock())
-
-    task_mod.lipsync_gpu_process_async.run("job-1", "u1", "gpu-task-1")
-
-    assert job.status == "cancelled"
-    assert not str(job.mediakit_task_id).startswith("mk-")
-    fake_db.commit.assert_called()
-    fake_gpu_svc.wait_for_result.assert_called_once()
-    gpu_service_cls.assert_called_once_with(fake_db)
@@ -323,126 +323,3 @@ class TestGpuServiceHelpers:
        svc = GpuLipsyncService(db=fake_db)
        fake_db.query.return_value.filter.return_value.first.return_value = None
        assert svc.has_available_worker() is False
-
-
-# ── cancel_job 取消链路 (#2009) ─────────────────────────────────────
-
-
-def _build_sqlite_session():
-    from sqlalchemy import create_engine
-    from sqlalchemy.orm import sessionmaker
-
-    from packages.adapters.sqlalchemy_impl import models as _  # noqa: F401
-    from packages.adapters.sqlalchemy_impl.models import Base
-
-    engine = create_engine("sqlite:///:memory:", future=True)
-    Base.metadata.create_all(engine)
-    Session = sessionmaker(bind=engine, future=True)
-    return Session()
-
-
-def _make_real_job(db, *, status="processing", mediakit_task_id="gpu:gpu-task-1"):
-    import uuid
-
-    from packages.adapters.sqlalchemy_impl.models import LipsyncJobModel
-
-    job = LipsyncJobModel(
-        id=str(uuid.uuid4()),
-        user_id="u1",
-        project_id="p1",
-        video_url="videos/v.mp4",
-        audio_url="audios/a.wav",
-        enable_video_loop=True,
-        mediakit_task_id=mediakit_task_id,
-        status=status,
-    )
-    db.add(job)
-    db.commit()
-    return job
-
-
-def test_cancel_processing_gpu_job_marks_gpu_task_cancelled():
-    """processing 的 GPU job 取消时，关联 GpuLipsyncTask 必须同步置 cancelled."""
-    import uuid
-
-    from packages.adapters.sqlalchemy_impl.models import GpuLipsyncTaskModel
-
-    db = _build_sqlite_session()
-    gpu_task_id = str(uuid.uuid4())
-    gpu_task = GpuLipsyncTaskModel(
-        id=gpu_task_id,
-        video_url="v",
-        audio_url="a",
-        status="processing",
-        worker_id="w-1",
-        attempt=1,
-    )
-    db.add(gpu_task)
-    db.commit()
-
-    job = _make_real_job(db, mediakit_task_id=f"gpu:{gpu_task_id}")
-    from app.services.lipsync_service import LipsyncService
-
-    svc = LipsyncService(db=db, client=MagicMock())
-    result = svc.cancel_job(job.id, "u1")
-
-    assert result.status == "cancelled"
-    db.refresh(gpu_task)
-    assert gpu_task.status == "cancelled"
-    assert gpu_task.error_msg == "用户取消"
-    assert gpu_task.finished_at is not None
-
-
-def test_cancel_processing_gpu_job_skips_non_processing_gpu_task():
-    """GPU task 已不在 processing（如已 done）时，取消 job 不应改它，也不报错."""
-    import uuid
-
-    from packages.adapters.sqlalchemy_impl.models import GpuLipsyncTaskModel
-
-    db = _build_sqlite_session()
-    gpu_task_id = str(uuid.uuid4())
-    gpu_task = GpuLipsyncTaskModel(
-        id=gpu_task_id, video_url="v", audio_url="a", status="done", worker_id="w-1", attempt=1
-    )
-    db.add(gpu_task)
-    db.commit()
-
-    job = _make_real_job(db, mediakit_task_id=f"gpu:{gpu_task_id}")
-    from app.services.lipsync_service import LipsyncService
-
-    svc = LipsyncService(db=db, client=MagicMock())
-    result = svc.cancel_job(job.id, "u1")
-
-    assert result.status == "cancelled"
-    db.refresh(gpu_task)
-    assert gpu_task.status == "done"  # 没被动
-
-
-def test_cancel_processing_non_gpu_job_does_not_touch_gpu_table():
-    """mediakit_task_id 不是 gpu: 前缀（普通 MediaKit 任务）时，不查 GPU task."""
-    db = _build_sqlite_session()
-    job = _make_real_job(db, mediakit_task_id="mk-task-99")
-    from app.services.lipsync_service import LipsyncService
-
-    svc = LipsyncService(db=db, client=MagicMock())
-    result = svc.cancel_job(job.id, "u1")
-    assert result.status == "cancelled"
-
-
-def test_cancel_completed_job_unchanged():
-    """completed 状态不可取消，cancel_job 原样返回."""
-    db = _build_sqlite_session()
-    job = _make_real_job(db, status="completed", mediakit_task_id="gpu:x")
-    from app.services.lipsync_service import LipsyncService
-
-    svc = LipsyncService(db=db, client=MagicMock())
-    result = svc.cancel_job(job.id, "u1")
-    assert result.status == "completed"
-
-
-def test_cancel_job_not_found_returns_none():
-    db = _build_sqlite_session()
-    from app.services.lipsync_service import LipsyncService
-
-    svc = LipsyncService(db=db, client=MagicMock())
-    assert svc.cancel_job("nonexistent", "u1") is None
Author	SHA1	Message	Date
saas-backend	95d24537cb	fix: 移除 MCI 插帧，60fps 输入直接输出 25fps 结果 - 移除 Step 8 的 minterpolate MCI 运动补偿插帧（CPU密集，343帧超6分钟导致超时504） - 高帧率视频降帧至 25fps 后直接输出，对口型数字人场景完全够用 - 插帧失败不再导致整个任务 504，直接降级返回 25fps 结果	2026-09-21 19:13:42 +08:00
saas-backend	a34a9a7844	perf: RTX3060 12G显存适配，batch_size上限从2提升到8 CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2s Details CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 2s Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m35s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m46s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m9s Details CI/CD Pipeline / Validate - Style (pull_request) Successful in 3m7s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 4m8s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 4m25s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 5m15s Details AI Code Review / AI Code Review (pull_request) Successful in 6m34s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 7m20s Details CI/CD Pipeline / Validate - Security (pull_request) Successful in 7m23s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / CI Gate (pull_request) Successful in 1s Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 4m57s Details ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 23s Details Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 4m14s Details - RTX3060 12G显存 + FP16 + GFPGAN场景下，batch=8约用7-8GB，留足余量 - 推理速度提升约4倍（相比之前的batch=2硬限制）	2026-09-21 18:58:04 +08:00