Merge pull request 'release v0.1.136: 智能剪辑批量变体P0修复+AI数字人MOV支持+代码审查重构' (#1886) from release/v0.1.136 into main

- Copy ci-canary.yml from develop (PR #1636) to enable 30-min health checks on main
- Disable pr-auto-scan.yml schedule on main (was still running */15, causing failure spam)
- Relates: PR #1635 (develop already had schedule disabled)

.ci-trigger

@@ -1,2 +1,2 @@
 CI trigger file - safe to delete
-retrigger at 2026-09-15 20:31:24 UTC
+updated!

.env.example

@@ -196,10 +196,3 @@ DOUBAO_MODEL=doubao-seed-1-6-250615
 DOUBAO_BASE_URL=https://ark.cn-beijing.volces.com/api/v3
 DOUBAO_TIMEOUT=30
 DOUBAO_MAX_RETRIES=2
-
-# ==================== 积分/会员系统 (#1895) ====================
-# 积分扣点总开关：默认 false（对现有用户零影响）。
-# P2 阶段各业务路由逐个接入 @points_gate 时，用
-#   `if settings.points_enabled: ...`
-# 包裹扣点逻辑；所有路由接入完成并验证通过后再在 staging/prod 打开。
-POINTS_ENABLED=false

CHANGELOG.md

@@ -494,5 +494,3 @@
 - [Fixed] Bug 修复
 - [Security] 安全相关更新
 - [Performance] 性能优化
----
-- 2026-09-16: fix extract-from-douyin 异常路径全部返回业务码（消除500） #1963

alembic/versions/076_membership_points.py

@@ -1,133 +0,0 @@
-"""add membership & points system
-
-Revision ID: 076_membership_points
-Revises: 075_add_sentence_timings
-Create Date: 2026-09-15
-"""
-
-import sqlalchemy as sa
-from sqlalchemy import text
-
-from alembic import op
-
-revision = "076_membership_points"
-down_revision = "075_add_sentence_timings"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # 1. users 表新增字段
-    with op.batch_alter_table("users") as batch:
-        batch.add_column(
-            sa.Column("is_member", sa.Boolean(), nullable=False, server_default=sa.text("false")),
-        )
-        batch.add_column(
-            sa.Column("member_type", sa.String(20), nullable=True),
-        )
-        batch.add_column(
-            sa.Column("member_expires_at", sa.DateTime(), nullable=True),
-        )
-        batch.add_column(
-            sa.Column("points_balance", sa.Integer(), nullable=False, server_default=sa.text("0")),
-        )
-
-    # 2. points_accounts 积分账户表
-    op.create_table(
-        "points_accounts",
-        sa.Column("id", sa.String(36), primary_key=True),
-        sa.Column("user_id", sa.String(36), nullable=False, unique=True, index=True),
-        sa.Column("balance", sa.Integer(), nullable=False, server_default=sa.text("0")),
-        sa.Column("total_earned", sa.Integer(), nullable=False, server_default=sa.text("0")),
-        sa.Column("total_spent", sa.Integer(), nullable=False, server_default=sa.text("0")),
-        sa.Column(
-            "created_at",
-            sa.DateTime(),
-            nullable=False,
-            server_default=sa.text("NOW()"),
-        ),
-        sa.Column(
-            "updated_at",
-            sa.DateTime(),
-            nullable=False,
-            server_default=sa.text("NOW()"),
-        ),
-    )
-
-    # 3. points_transactions 积分流水表
-    op.create_table(
-        "points_transactions",
-        sa.Column("id", sa.String(36), primary_key=True),
-        sa.Column("user_id", sa.String(36), nullable=False, index=True),
-        sa.Column("account_id", sa.String(36), nullable=False, index=True),
-        sa.Column("type", sa.String(20), nullable=False, index=True),
-        sa.Column("source", sa.String(50), nullable=False, index=True),
-        sa.Column("amount", sa.Integer(), nullable=False),
-        sa.Column("balance_after", sa.Integer(), nullable=False),
-        sa.Column("description", sa.String(255), nullable=False, server_default=""),
-        sa.Column("ref_id", sa.String(100), nullable=False, server_default=""),
-        sa.Column(
-            "created_at",
-            sa.DateTime(),
-            nullable=False,
-            server_default=sa.text("NOW()"),
-        ),
-    )
-
-    # 4. points_orders 积分/会员订单表
-    op.create_table(
-        "points_orders",
-        sa.Column("id", sa.String(36), primary_key=True),
-        sa.Column("user_id", sa.String(36), nullable=False, index=True),
-        sa.Column("order_type", sa.String(20), nullable=False),
-        sa.Column("product_code", sa.String(50), nullable=False),
-        sa.Column("amount_cents", sa.Integer(), nullable=False),
-        sa.Column("original_amount_cents", sa.Integer(), nullable=False, server_default=sa.text("0")),
-        sa.Column("discount", sa.Float(), nullable=False, server_default=sa.text("1.0")),
-        sa.Column("points_amount", sa.Integer(), nullable=False, server_default=sa.text("0")),
-        sa.Column("status", sa.String(20), nullable=False, server_default="pending", index=True),
-        sa.Column("payment_method", sa.String(50), nullable=True),
-        sa.Column("payment_id", sa.String(100), nullable=True),
-        sa.Column("paid_at", sa.DateTime(), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(),
-            nullable=False,
-            server_default=sa.text("NOW()"),
-        ),
-    )
-
-    # 5. daily_usage_records 每日使用记录表
-    op.create_table(
-        "daily_usage_records",
-        sa.Column("id", sa.String(36), primary_key=True),
-        sa.Column("user_id", sa.String(36), nullable=False, index=True),
-        sa.Column("usage_date", sa.DateTime(), nullable=False),
-        sa.Column("usage_type", sa.String(50), nullable=False, server_default="free_clip"),
-        sa.Column("count", sa.Integer(), nullable=False, server_default=sa.text("0")),
-        sa.Column(
-            "updated_at",
-            sa.DateTime(),
-            nullable=False,
-            server_default=sa.text("NOW()"),
-        ),
-        sa.UniqueConstraint(
-            "user_id",
-            "usage_date",
-            "usage_type",
-            name="uq_daily_usage_user_date_type",
-        ),
-    )
-
-
-def downgrade() -> None:
-    op.drop_table("daily_usage_records")
-    op.drop_table("points_orders")
-    op.drop_table("points_transactions")
-    op.drop_table("points_accounts")
-
-    with op.batch_alter_table("users") as batch:
-        batch.drop_column("points_balance")
-        batch.drop_column("member_expires_at")
-        batch.drop_column("member_type")
-        batch.drop_column("is_member")

alembic/versions/077_merge_title_libs.py

@@ -1,67 +0,0 @@
-"""#1894: merge title_libraries into scripts — add title_text/title_category/title_config
-
-Revision ID: 077_merge_title_libs
-Revises: 076_membership_points
-Create Date: 2026-09-15
-"""
-
-import sqlalchemy as sa
-
-from alembic import context, op
-
-revision = "077_merge_title_libs"
-down_revision = "076_membership_points"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("scripts") as batch:
-        batch.add_column(
-            sa.Column("title_text", sa.String(500), nullable=False, server_default=""),
-        )
-        batch.add_column(
-            sa.Column("title_category", sa.String(50), nullable=False, server_default=""),
-        )
-        batch.add_column(
-            sa.Column("title_config", sa.JSON, nullable=False, server_default="{}"),
-        )
-
-    if context.get_context().dialect.name == "postgresql":
-        conn = op.get_bind()
-        result = conn.execute(sa.text("SELECT to_regclass('public.title_libraries')"))
-        if result.scalar() is not None:
-            conn.execute(sa.text("""
-                    INSERT INTO scripts
-                        (id, user_id, title, content, segments, tags,
-                         title_text, title_category, title_config,
-                         created_at, updated_at)
-                    SELECT
-                        gen_random_uuid()::TEXT,
-                        tl.user_id,
-                        COALESCE(tl.name, '迁移标题'),
-                        COALESCE(tl.text, ''),
-                        '[]'::JSONB,
-                        COALESCE(tl.tags, '[]'::JSONB),
-                        COALESCE(tl.text, ''),
-                        COALESCE(tl.category, ''),
-                        COALESCE(tl."metadata", '{}'::JSONB),
-                        tl.created_at,
-                        tl.updated_at
-                    FROM title_libraries tl
-                    WHERE tl.is_active = true
-                      AND NOT EXISTS (
-                        SELECT 1 FROM scripts s
-                        WHERE s.user_id = tl.user_id
-                          AND s.title_text = COALESCE(tl.text, '')
-                          AND s.title_category = COALESCE(tl.category, '')
-                          AND s.created_at = tl.created_at
-                      )
-                    """))
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("scripts") as batch:
-        batch.drop_column("title_config")
-        batch.drop_column("title_category")
-        batch.drop_column("title_text")

apps/api/app/api/router.py

@@ -6,7 +6,6 @@ from app.api.routes.assets import router as assets_router
 from app.api.routes.auth import router as auth_router
 from app.api.routes.chunked_upload import router as chunked_upload_router
 from app.api.routes.classification_jobs import router as classification_jobs_router
-from app.api.routes.clips_standalone import router as clips_standalone_router
 from app.api.routes.cover_templates import router as cover_templates_router
 from app.api.routes.duplication import router as duplication_router
 from app.api.routes.feature_flags import router as feature_flags_router
@@ -18,10 +17,8 @@ from app.api.routes.health import router as health_check_router
 from app.api.routes.ingest_jobs import router as ingest_jobs_router
 from app.api.routes.internal_render import router as internal_render_router
 from app.api.routes.lipsync import router as lipsync_router
-from app.api.routes.points import points_router, usage_router
 from app.api.routes.projects import router as projects_router
 from app.api.routes.scripts import router as scripts_router
-from app.api.routes.scripts_ai import router as scripts_ai_router
 from app.api.routes.share import router as share_router
 from app.api.routes.subscription import router as subscription_router
 from app.api.routes.tags import router as tags_router
@@ -159,10 +156,6 @@ api_router.include_router(
     prefix="/templates",
     tags=["Template"],
 )
-api_router.include_router(
-    clips_standalone_router,
-    tags=["Clips"],
-)
 api_router.include_router(
     templates_editor_router,
     prefix="/templates/{template_id}/editor",
@@ -191,23 +184,8 @@ api_router.include_router(
     prefix="/scripts",
     tags=["ScriptLibrary"],
 )
-api_router.include_router(
-    scripts_ai_router,
-    prefix="/scripts",
-    tags=["ScriptLibrary AI"],
-)
 api_router.include_router(
     ai_avatar_render_router,
     prefix="/ai-avatar/render",
     tags=["AI Avatar Render"],
 )
-api_router.include_router(
-    points_router,
-    prefix="/points",
-    tags=["Points"],
-)
-api_router.include_router(
-    usage_router,
-    prefix="/usage",
-    tags=["Usage"],
-)

apps/api/app/api/routes/_default_template.py

@@ -1,91 +0,0 @@
-"""默认模板兜底共享逻辑（P0 #1922）.
-
-提供 get_or_create_default_template_id(db, user_id) 共享函数，
-供 templates.py 列表查询、clips_standalone.py 独立端点、dependencies.py
-resolve_draft_plan_id 三处复用，避免三处各写一套兜底逻辑产生分叉。
-
-根因：PR#1918 清理模板管理 API 时误删了 GET /templates 自动创建默认模板
-兜底，前端 PR#1913 去掉空 tid 拦截后首次进入生成页拼出
-/templates//editor/clips/from-assets（双斜杠）→ FastAPI 404，阻断新用户首次
-生成。
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Optional
-
-from sqlalchemy.orm import Session
-
-logger = logging.getLogger(__name__)
-
-
-def get_or_create_default_template_id(db: Session, user_id: str) -> Optional[str]:
-    """获取或自动创建默认配音模板的 id。
-
-    判定逻辑（不做异常降级，只有确实创建失败时才回滚重查）：
-    1. 查用户名下 is_active=True 且有 TemplateClipConfig 的模板 → 返回其 id；
-    2. 无则调用 CreateTemplateUseCase 创建一条默认 voice_over 模板；
-    3. 创建异常时 rollback 再重查一次（防并发唯一键冲突），重查仍无返回 None。
-    """
-    from packages.adapters.sqlalchemy_impl.models import (
-        TemplateClipConfigModel,
-        TemplateModel,
-    )
-    from packages.adapters.sqlalchemy_impl.template_repository import (
-        SQLAlchemyTemplateRepository,
-    )
-    from packages.application.template.commands import (
-        CreateTemplateCommand,
-        SegmentCommand,
-    )
-    from packages.application.template.use_cases import CreateTemplateUseCase
-
-    existing = (
-        db.query(TemplateModel)
-        .filter(TemplateModel.user_id == user_id, TemplateModel.is_active.is_(True))
-        .order_by(TemplateModel.created_at.asc())
-        .first()
-    )
-    if existing is not None:
-        has_seg = (
-            db.query(TemplateClipConfigModel.id).filter(TemplateClipConfigModel.template_id == existing.id).first()
-        )
-        if has_seg:
-            return existing.id
-
-    try:
-        repo = SQLAlchemyTemplateRepository(db)
-        cmd = CreateTemplateCommand(
-            user_id=user_id,
-            name="默认配音模板",
-            mode="voice_over",
-            category="default",
-            tags=[],
-            title_config={},
-            subtitle_config={},
-            bgm_config={},
-            estimated_duration=0.0,
-            segments=[SegmentCommand(segment_order=0, duration_min=1.0, duration_max=30.0)],
-        )
-        tpl = CreateTemplateUseCase(repo).execute(cmd)
-        db.commit()
-        logger.info("auto-created default voice_over template: id=%s user=%s", tpl.id, user_id)
-        return tpl.id
-    except Exception:
-        db.rollback()
-        # 重查：可能并发请求已建好
-        existing = (
-            db.query(TemplateModel)
-            .filter(TemplateModel.user_id == user_id, TemplateModel.is_active.is_(True))
-            .order_by(TemplateModel.created_at.asc())
-            .first()
-        )
-        if existing is not None:
-            has_seg = (
-                db.query(TemplateClipConfigModel.id).filter(TemplateClipConfigModel.template_id == existing.id).first()
-            )
-            if has_seg:
-                return existing.id
-        logger.exception("failed to auto-create default template user=%s", user_id)
-        return None

apps/api/app/api/routes/_helpers.py

@@ -1,6 +1,6 @@
 """路由层共享辅助函数 — 消除跨文件重复定义。"""
 
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any
 
 from fastapi import HTTPException, status
@@ -138,4 +138,4 @@ def format_utc_datetime(dt: datetime | None) -> str:
         return dt
     if dt.tzinfo is None:
         return dt.isoformat() + "Z"
-    return dt.astimezone(UTC).isoformat().replace("+00:00", "Z")
+    return dt.astimezone(timezone.utc).isoformat().replace("+00:00", "Z")

apps/api/app/api/routes/ai.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-from typing import Literal
+from typing import List, Literal
 
 from app.services.ai_service import TITLE_STYLES, generate_smart_titles, semantic_match_assets
 from fastapi import APIRouter
@@ -31,7 +31,7 @@ class GenerateTitlesRequest(BaseModel):
 class GenerateTitlesResponse(BaseModel):
     """智能标题生成响应."""
 
-    titles: list[str] = Field(..., description="生成的标题列表")
+    titles: List[str] = Field(..., description="生成的标题列表")
     style: str = Field(..., description="实际使用的风格")
     source: str = Field(..., description="来源：doubao 或 fallback")
     description: str = Field(..., description="原始描述")
@@ -53,7 +53,7 @@ class AssetMatchItem(BaseModel):
 
     id: str = Field(..., description="素材ID")
     name: str = Field(default="", description="素材名称")
-    tags: list[str] = Field(default_factory=list, description="标签列表")
+    tags: List[str] = Field(default_factory=list, description="标签列表")
     description: str = Field(default="", description="素材描述")
 
 
@@ -61,7 +61,7 @@ class SemanticMatchRequest(BaseModel):
     """语义匹配请求."""
 
     description: str = Field(..., min_length=1, max_length=500, description="目标视频内容描述")
-    assets: list[AssetMatchItem] = Field(..., min_length=1, max_length=100, description="待匹配素材列表")
+    assets: List[AssetMatchItem] = Field(..., min_length=1, max_length=100, description="待匹配素材列表")
     top_k: int = Field(default=0, ge=0, le=100, description="返回前K个，0返回全部")
 
 
@@ -75,7 +75,7 @@ class SemanticMatchResultItem(AssetMatchItem):
 class SemanticMatchResponse(BaseModel):
     """语义匹配响应."""
 
-    matches: list[SemanticMatchResultItem] = Field(..., description="按匹配度降序排列的素材列表")
+    matches: List[SemanticMatchResultItem] = Field(..., description="按匹配度降序排列的素材列表")
     source: str = Field(..., description="来源：doubao / fallback")
     description: str = Field(..., description="原始描述")
     total: int = Field(..., description="输入素材总数")
@@ -99,7 +99,7 @@ def generate_titles(request: GenerateTitlesRequest):
     return GenerateTitlesResponse(**result)
 
 
-@router.get("/titles/styles", response_model=list[TitleStyleInfo])
+@router.get("/titles/styles", response_model=List[TitleStyleInfo])
 def list_title_styles():
     """获取支持的标题风格列表."""
     return [

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

@@ -11,7 +11,7 @@
 from __future__ import annotations
 
 import logging
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import get_db_session
@@ -29,8 +29,6 @@ from app.services.ai_avatar_render_service import (
 from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 
-from packages.middleware.points_gate import points_gate
-
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
@@ -44,12 +42,10 @@ def _get_service(db: Session = Depends(get_db_session)) -> AiAvatarRenderService
 
 
 @router.post("", response_model=AiAvatarRenderJobResponse, status_code=201)
-@points_gate("ai_digital_human", per_unit=15)
 def create_render_job(
     body: CreateAiAvatarRenderRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),
     svc: AiAvatarRenderService = Depends(_get_service),
-    db: Session = Depends(get_db_session),
 ):
     """提交 AI 数字人渲染任务.
 
@@ -86,7 +82,7 @@ def create_render_job(
         logger.exception("Celery 任务投递失败（创建）: job_id=%s err=%s", job.id, exc)
         job.status = "failed"
         job.error_message = f"任务提交失败：{exc}"
-        job.updated_at = datetime.now(UTC)
+        job.updated_at = datetime.now(timezone.utc)
         svc.db.commit()
         svc.db.refresh(job)
         return AiAvatarRenderJobResponse.model_validate(job)
@@ -187,7 +183,7 @@ def retry_render_job(
         logger.exception("Celery 任务投递失败（重试）: job_id=%s err=%s", job.id, exc)
         job.status = "failed"
         job.error_message = f"任务提交失败：{exc}"
-        job.updated_at = datetime.now(UTC)
+        job.updated_at = datetime.now(timezone.utc)
         svc.db.commit()
         svc.db.refresh(job)
         return AiAvatarRenderJobResponse.model_validate(job)
@@ -250,7 +246,7 @@ def generate_render_smart_cover(
             "url": cover_url,
         }
         job.output_cover_url = cover_url
-        job.updated_at = datetime.now(UTC)
+        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)

apps/api/app/api/routes/assets.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Optional
+from typing import Any, List, Optional
 
 from app.api.routes._helpers import check_project_access, format_utc_datetime
 from app.auth import AuthenticatedUser, get_current_user
@@ -390,7 +390,7 @@ def update_asset_review_status(
     return _to_asset_response(updated)
 
 
-@router.post("/batch", response_model=list[AssetResponse])
+@router.post("/batch", response_model=List[AssetResponse])
 def batch_get_assets(
     request: BatchGetRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),

apps/api/app/api/routes/auth.py

@@ -13,7 +13,7 @@ from typing import Optional
 import jwt
 from app.auth import AuthenticatedUser, blacklist_token, get_current_user
 from app.config import settings
-from app.dependencies import get_auth_email_service, get_auth_session_store, get_db_session, get_user_repository
+from app.dependencies import get_auth_email_service, get_auth_session_store, get_user_repository
 from fastapi import APIRouter, Depends, Header, HTTPException, Request, status
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from pydantic import BaseModel, EmailStr, field_validator
@@ -126,7 +126,6 @@ async def register(
     request: RegisterRequest,
     user_repository: UserRepository = Depends(get_user_repository),
     email_service=Depends(get_auth_email_service),
-    db=Depends(get_db_session),
 ) -> RegisterResponse:
     use_case = RegisterUserUseCase(
         user_repository=user_repository,
@@ -144,22 +143,6 @@ async def register(
     if error or response is None:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=_translate_auth_error(error))
 
-    # 新用户注册赠送 50 积分（失败不影响注册）
-    if settings.points_enabled:
-        try:
-            from packages.domain.points_service import PointsService
-            _svc = PointsService()
-            _svc.add_points(
-                user_id=response.user_id,
-                amount=50,
-                source="task_reward",
-                db=db,
-                description="新用户注册赠送",
-            )
-        except Exception as _bonus_err:
-            import logging
-            logging.getLogger(__name__).warning("注册送积分失败: user_id=%s err=%s", response.user_id, _bonus_err)
-
     return RegisterResponse(
         user_id=response.user_id,
         email=response.email,

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

@@ -8,7 +8,7 @@ import json
 import logging
 import shutil
 import tempfile
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from typing import Any
 from uuid import uuid4
@@ -156,7 +156,7 @@ def _cleanup_expired_uploads() -> int:
     if not CHUNK_STORAGE_ROOT.exists():
         return 0
 
-    now = datetime.now(UTC)
+    now = datetime.now(timezone.utc)
     cleaned = 0
 
     for meta_file in CHUNK_STORAGE_ROOT.glob("*.meta.json"):
@@ -166,7 +166,7 @@ def _cleanup_expired_uploads() -> int:
 
             expires_at = datetime.fromisoformat(meta["expires_at"])
             if expires_at.tzinfo is None:
-                expires_at = expires_at.replace(tzinfo=UTC)
+                expires_at = expires_at.replace(tzinfo=timezone.utc)
 
             # Only cleanup uploads that are not actively being uploaded
             if expires_at < now and meta.get("status") != "uploading":
@@ -226,7 +226,7 @@ async def init_chunked_upload(
 
     # Generate upload ID
     upload_id = uuid4().hex
-    now = datetime.now(UTC)
+    now = datetime.now(timezone.utc)
     expires_at = now + timedelta(hours=CHUNK_EXPIRY_HOURS)
 
     # Create chunk directory
@@ -421,9 +421,9 @@ async def upload_chunk(
     # Check expiry
     expires_at = datetime.fromisoformat(meta["expires_at"])
     if expires_at.tzinfo is None:
-        expires_at = expires_at.replace(tzinfo=UTC)
+        expires_at = expires_at.replace(tzinfo=timezone.utc)
 
-    if expires_at < datetime.now(UTC):
+    if expires_at < datetime.now(timezone.utc):
         raise HTTPException(status_code=status.HTTP_410_GONE, detail="Upload has expired")
 
     # Validate chunk index

apps/api/app/api/routes/clips_standalone.py

@@ -1,90 +0,0 @@
-"""独立的从素材创建片段端点（不依赖 template_id 路径参数）.
-
-POST /api/v1/clips/from-assets
-- 与 /api/v1/templates/{template_id}/editor/clips/from-assets 功能一致
-- 区别：template_id 从 body 传入（可选），为空时后端自动创建/查找默认模板
-- 解决前端首次加载时 templateId 为空导致双斜杠 404 的问题（P0 #1922）
-- 内部复用 resolve_draft_plan_id 和 create_clips_from_assets_editor 的核心逻辑
-"""
-
-from __future__ import annotations
-
-import logging
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_asset_repository, get_db_session
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, status
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.asset_repository import SQLAlchemyAssetRepository
-
-from ._default_template import get_or_create_default_template_id
-from .templates_editor.clips import create_clips_from_assets_editor
-from .templates_editor.dependencies import resolve_draft_plan_id
-from .templates_editor.schemas import ClipsFromAssetsRequest, ClipsFromAssetsResponse
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Clips"])
-
-
-class StandaloneClipsRequest(ClipsFromAssetsRequest):
-    """扩展请求：template_id 可选（不传则后端自动兜底默认模板）。"""
-
-    template_id: str | None = None
-
-
-def _get_editor_services_direct(db: Session) -> tuple[EditTemplateService, EditPlanService]:
-    """直接构造服务实例（非 Depends 版本，供独立端点内部调用）。"""
-    return EditTemplateService(db), EditPlanService(db)
-
-
-@router.post("/clips/from-assets", response_model=ClipsFromAssetsResponse)
-def create_clips_from_assets(
-    body: StandaloneClipsRequest,
-    background_tasks: BackgroundTasks,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    asset_repo: SQLAlchemyAssetRepository = Depends(get_asset_repository),
-) -> ClipsFromAssetsResponse:
-    """从素材批量创建片段（template_id 可选，为空自动兜底）。"""
-    user_id = str(current_user.user.id)
-    services = _get_editor_services_direct(db)
-
-    # 1. 解析/兜底 template_id，拿到 plan_id
-    template_id = (body.template_id or "").strip()
-    if not template_id:
-        template_id = get_or_create_default_template_id(db, user_id)
-        if not template_id:
-            raise HTTPException(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                detail="无法自动创建默认模板，请刷新页面重试",
-            )
-    plan_id = resolve_draft_plan_id(
-        template_id=template_id,
-        services=services,
-        current_user=current_user,
-        db=db,
-        auto_create_default=False,  # 上面已兜底过
-    )
-
-    # 2. 构造标准化请求（去除独立端扩展字段），复用原端点核心逻辑
-    core_body = ClipsFromAssetsRequest(
-        asset_ids=body.asset_ids,
-        clip_type=body.clip_type,
-        clip_count=body.clip_count,
-        required_clips_count=body.required_clips_count,
-    )
-
-    # 3. 直接调用原端点函数（此时所有 Depends 依赖已手动传入）
-    return create_clips_from_assets_editor(
-        template_id=template_id,
-        body=core_body,
-        background_tasks=background_tasks,
-        plan_id=plan_id,
-        services=services,
-        asset_repo=asset_repo,
-        db=db,
-        current_user=current_user,
-    )

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

@@ -11,7 +11,7 @@ from __future__ import annotations
 import ipaddress
 import logging
 import re
-from typing import Any, Optional
+from typing import Any, List, Optional
 from urllib.parse import urlparse
 
 from app.auth import AuthenticatedUser, get_current_user
@@ -27,7 +27,6 @@ from packages.adapters.sqlalchemy_impl.generation_task_repository import (
 )
 from packages.application import ListGeneratedVideosByTaskUseCase
 from packages.domain.config_schemas import normalize_plan_config
-from packages.middleware.points_gate import points_gate
 from packages.shared.storage import get_shared_storage_service
 
 from .templates_editor.dependencies import get_draft_plan_id, get_editor_services
@@ -42,7 +41,7 @@ router = APIRouter(tags=["Generation"])
 class GenerateCoverRequest(BaseModel):
     """AI 封面生成请求体"""
 
-    asset_ids: list[str] = Field(default_factory=list, description="素材 ID 列表（确定视频来源）")
+    asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表（确定视频来源）")
     cover_type: str = Field(
         default="ai_frame",
         description="封面类型: ai_frame / manual / upload / ai_regenerate",
@@ -332,7 +331,6 @@ def _is_trusted_media_url(url: str) -> bool:
 
 
 @router.post("/generate-cover", response_model=GenerateCoverResponse)
-@points_gate("ai_cover")
 def generate_cover(
     body: GenerateCoverRequest,
     template_id: str = Query(..., description="模板 ID"),
@@ -768,12 +766,7 @@ def generate_cover(
             storage_svc = get_shared_storage_service()
             mk_client = get_mediakit_client()
             # 从 plan.config 读取完整标题样式，E2 从源素材抽帧时叠加（源素材本身无标题）
-            # #1901 统一读 "title"，兼容老数据 "title_config"
             _e2_title_cfg = (plan.config or {}).get("title", {}) or {}
-            if not isinstance(_e2_title_cfg, dict) or not (_e2_title_cfg.get("text") or "").strip():
-                _alt = (plan.config or {}).get("title_config", {}) or {}
-                if isinstance(_alt, dict):
-                    _e2_title_cfg = _alt
             if not isinstance(_e2_title_cfg, dict):
                 _e2_title_cfg = {}
             _e2_title_text = (_e2_title_cfg.get("text", "") or "").strip() if _e2_title_cfg.get("enabled", True) else ""

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

@@ -43,7 +43,6 @@ from packages.application import (
     GetGenerationTaskUseCase,
     ListGeneratedVideosByTaskUseCase,
 )
-from packages.middleware.points_gate import points_gate
 
 logger = logging.getLogger(__name__)
 
@@ -272,7 +271,6 @@ def _variant_value(values: list[str], index: int, fallback: str = "") -> str:
 
 
 @router.post("/preview", response_model=BatchPreviewGenerationTaskResponse, status_code=201)
-@points_gate("ai_video", quantity_field="preview_count")
 def create_preview_generation_task(
     request: CreatePreviewGenerationTaskRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),

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

@@ -42,7 +42,6 @@ from packages.application import (
     ListGeneratedVideosByTaskUseCase,
 )
 from packages.domain.smart_match import smart_select_assets
-from packages.middleware.points_gate import points_gate
 
 logger = logging.getLogger(__name__)
 
@@ -212,7 +211,6 @@ def _resolve_project_and_library(
 
 
 @router.post("/tasks", response_model=BatchGenerationTaskResponse)
-@points_gate("ai_video", quantity_field="count")
 def create_generation_task(
     request: CreateGenerationTaskRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),

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

@@ -30,74 +30,6 @@ logger = logging.getLogger(__name__)
 router = APIRouter()
 
 
-def _get_or_create_default_template_id(db: Session, user_id: str) -> str | None:
-    """为用户查找一个有效模板；若不存在则自动创建默认配音模板。
-
-    前端 #1911 删除了模板选择 UI，当调用方未传 template_id/source_edit_plan_id
-    时（如剪辑页首次进入直接选片），后端兜底查找/创建默认模板，避免 400。
-
-    Returns:
-        template_id（字符串）；失败时返回 None。
-    """
-
-    from packages.adapters.sqlalchemy_impl.models import TemplateClipConfigModel, TemplateModel
-    from packages.adapters.sqlalchemy_impl.template_repository import SQLAlchemyTemplateRepository
-    from packages.application.template.commands import CreateTemplateCommand, SegmentCommand
-    from packages.application.template.use_cases import CreateTemplateUseCase
-
-    # 1. 先查已有有效模板（is_active=True 且存在片段配置）
-    existing = (
-        db.query(TemplateModel)
-        .filter(
-            TemplateModel.user_id == user_id,
-            TemplateModel.is_active.is_(True),
-        )
-        .order_by(TemplateModel.created_at.asc())
-        .first()
-    )
-    if existing is not None:
-        # 验证该模板是否有片段配置；若没有继续尝试创建默认
-        has_seg = (
-            db.query(TemplateClipConfigModel.id).filter(TemplateClipConfigModel.template_id == existing.id).first()
-        )
-        if has_seg:
-            return existing.id
-
-    # 2. 无有效模板 → 自动创建默认配音模板
-    try:
-        repo = SQLAlchemyTemplateRepository(db)
-        cmd = CreateTemplateCommand(
-            user_id=user_id,
-            name="默认配音模板",
-            mode="voice_over",
-            category="default",
-            tags=[],
-            title_config={},
-            subtitle_config={},
-            bgm_config={},
-            estimated_duration=0.0,
-            segments=[
-                SegmentCommand(
-                    segment_order=0,
-                    duration_min=1.0,
-                    duration_max=30.0,
-                    material_type=None,
-                ),
-            ],
-        )
-        use_case = CreateTemplateUseCase(repo)
-        tpl = use_case.execute(cmd)
-        logger.info(
-            "[variant-plans] 自动创建默认模板: user=%s tpl=%s",
-            user_id,
-            tpl.id,
-        )
-        return tpl.id
-    except Exception:
-        logger.exception("[variant-plans] 自动创建默认模板失败: user=%s", user_id)
-        return None
-
-
 class VariantPlanRequest(BaseModel):
     """轻量选片请求体（与前端 variantPlans.ts 契约一致）。"""
 
@@ -111,8 +43,8 @@ class VariantPlanRequest(BaseModel):
 
     @model_validator(mode="after")
     def _validate(self) -> "VariantPlanRequest":
-        # 不再强制要求 template_id / source_edit_plan_id：
-        # 后端在路由内会自动查找/创建默认模板兜底（#1911 后前端不再显式选模板）。
+        if not self.template_id.strip() and not self.source_edit_plan_id.strip():
+            raise ValueError("template_id 与 source_edit_plan_id 至少需要提供一个")
         try:
             resolve_variant_voice_ids(
                 count=self.count,
@@ -162,15 +94,8 @@ def create_variant_plans(
     from app.services.generation_common import resolve_latest_plan_by_template
 
     source_plan_id = request.source_edit_plan_id.strip()
-    template_id = request.template_id.strip()
-
-    # P0 兜底：前端 #1911 已删除模板选择 UI，调用方可能不传 template_id；
-    # 此时自动为该用户查找/创建默认模板。
-    if not source_plan_id and not template_id:
-        template_id = _get_or_create_default_template_id(db, user_id) or ""
-
-    if not source_plan_id and template_id:
-        source_plan_id = resolve_latest_plan_by_template(db, template_id=template_id, user_id=user_id) or ""
+    if not source_plan_id and request.template_id.strip():
+        source_plan_id = resolve_latest_plan_by_template(db, template_id=request.template_id, user_id=user_id) or ""
 
     if not source_plan_id:
         raise HTTPException(

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

@@ -1,4 +1,4 @@
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 
 import psycopg
 import redis
@@ -13,7 +13,7 @@ router = APIRouter(tags=["Health"])
 async def health_check():
     return {
         "status": "healthy",
-        "timestamp": datetime.now(UTC).isoformat(),
+        "timestamp": datetime.now(timezone.utc).isoformat(),
         "version": settings.APP_VERSION,
     }
 
@@ -33,7 +33,7 @@ async def startup_check():
     all_ready = all(check["status"] == "healthy" for check in checks.values())
     response = {
         "status": "started" if all_ready else "starting",
-        "timestamp": datetime.now(UTC).isoformat(),
+        "timestamp": datetime.now(timezone.utc).isoformat(),
         "checks": checks,
     }
     if not all_ready:

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

@@ -12,11 +12,8 @@
 from __future__ import annotations
 
 import logging
-import math
-from datetime import UTC
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.config import settings
 from app.dependencies import (
     get_db_session,
     get_voice_clone_profile_repository,
@@ -32,9 +29,6 @@ from app.services.mediakit_client import MediaKitError
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 
-from packages.domain.points_rules import calculate_points_cost
-from packages.domain.points_service import PointsService
-
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
@@ -58,40 +52,8 @@ def _get_service(
 def create_lipsync_job(
     body: CreateLipsyncJobRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
     svc: LipsyncService = Depends(_get_service),
 ):
-    user_id = current_user.user.id
-
-    # ── 积分扣点（#1895 P2） ──
-    _points_deducted = 0
-    _points_scene = "ai_digital_human"
-    _points_svc = PointsService() if settings.points_enabled else None
-    if _points_svc is not None:
-        # 口型同步：TTS 模式按 script_text 估时长（240字/分钟）；音频直传按 audio_duration（秒→分钟）
-        if body.audio_url and body.audio_duration and body.audio_duration > 0:
-            est_minutes = max(1.0, math.ceil(body.audio_duration / 60.0))
-        elif body.script_text:
-            est_minutes = max(1.0, math.ceil(len(body.script_text) / 240))
-        else:
-            est_minutes = 1.0
-        _points_deducted = calculate_points_cost(
-            _points_scene,
-            is_member=getattr(current_user.user, "is_member", False),
-            duration_minutes=est_minutes,
-            member_type=getattr(current_user.user, "member_type", None),
-        )
-        _deduct_res = _points_svc.deduct_points(user_id, _points_deducted, _points_scene, db)
-        if not _deduct_res["success"]:
-            raise HTTPException(
-                status_code=402,
-                detail={
-                    "code": "INSUFFICIENT_POINTS",
-                    "message": f"积分不足，需要 {_points_deducted} 积分，当前余额 {_deduct_res['balance']}",
-                    "required": _points_deducted,
-                    "balance": _deduct_res["balance"],
-                },
-            )
     """提交对口型任务.
 
     三种模式：
@@ -103,7 +65,7 @@ def create_lipsync_job(
     """
     try:
         job = svc.create_job(
-            user_id=user_id,
+            user_id=current_user.user.id,
             video_url=body.video_url,
             audio_url=body.audio_url,
             audio_duration=body.audio_duration,
@@ -116,18 +78,8 @@ def create_lipsync_job(
             project_id=body.project_id,
         )
     except ValueError as exc:
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"对口型 ValueError 退积分异常: err={refund_err}")
         raise HTTPException(status_code=400, detail=str(exc)) from exc
     except MediaKitError as exc:
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"对口型 MediaKitError 退积分异常: err={refund_err}")
         status_code = 502
         if exc.code in ("VoiceForbidden",):
             status_code = 403
@@ -143,24 +95,11 @@ def create_lipsync_job(
         ) from exc
     except Exception as exc:
         logger.error("创建对口型任务异常: %s", exc, exc_info=True)
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"对口型异常退积分异常: err={refund_err}")
         raise HTTPException(
             status_code=400,
             detail=f"创建对口型任务失败: {exc}",
         ) from exc
 
-    # 创建成功但状态为 failed（同步路径失败已抛异常到上面 except；此处处理 Celery 调度失败等）
-    # 若任务已创建且状态为 failed，退费
-    if _points_deducted > 0 and _points_svc is not None and getattr(job, "status", None) == "failed":
-        try:
-            _points_svc.refund_points(user_id, _points_deducted, _points_scene, db, ref_id=job.id)
-        except Exception as refund_err:
-            logger.warning(f"对口型任务失败退积分异常: job_id={job.id}, err={refund_err}")
-
     return job
 
 
@@ -171,34 +110,8 @@ def create_lipsync_job(
 def preview_tts(
     body: AiAvatarTtsPreviewRequest,
     current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
     svc: LipsyncService = Depends(_get_service),
 ):
-    user_id = current_user.user.id
-
-    # ── 积分扣点（#1895 P2） ──
-    _points_deducted = 0
-    _points_scene = "ai_digital_human"
-    _points_svc = PointsService() if settings.points_enabled else None
-    if _points_svc is not None:
-        est_minutes = max(1.0, math.ceil(len(body.script_text or "") / 240)) if body.script_text else 1.0
-        _points_deducted = calculate_points_cost(
-            _points_scene,
-            is_member=getattr(current_user.user, "is_member", False),
-            duration_minutes=est_minutes,
-            member_type=getattr(current_user.user, "member_type", None),
-        )
-        _deduct_res = _points_svc.deduct_points(user_id, _points_deducted, _points_scene, db)
-        if not _deduct_res["success"]:
-            raise HTTPException(
-                status_code=402,
-                detail={
-                    "code": "INSUFFICIENT_POINTS",
-                    "message": f"积分不足，需要 {_points_deducted} 积分，当前余额 {_deduct_res['balance']}",
-                    "required": _points_deducted,
-                    "balance": _deduct_res["balance"],
-                },
-            )
     """步骤1「生成配音」同步 TTS 预合成.
 
     同步执行 TTS 合成 → 下载音频 → ffprobe 时长 → 句子时间戳计算，
@@ -207,18 +120,13 @@ def preview_tts(
     """
     try:
         result = svc.preview_tts(
-            user_id=user_id,
+            user_id=current_user.user.id,
             voice_id=body.voice_id,
             script_text=body.script_text,
             speed=body.speed,
             emotion=body.emotion,
         )
     except MediaKitError as exc:
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"TTS 预合成 MediaKitError 退积分异常: err={refund_err}")
         status_code = 400
         if exc.code in ("VoiceForbidden",):
             status_code = 403
@@ -233,11 +141,6 @@ def preview_tts(
         ) from exc
     except Exception as exc:
         logger.error("TTS 预合成异常: %s", exc, exc_info=True)
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"TTS 预合成异常退积分异常: err={refund_err}")
         raise HTTPException(
             status_code=400,
             detail=f"TTS 合成失败: {exc}",
@@ -290,22 +193,7 @@ def get_lipsync_job(
         raise HTTPException(status_code=404, detail="任务不存在")
 
     if job.status not in ("completed", "failed"):
-        # 三层防御 ①：如果距上次更新超过 30 秒，同步刷新一次（避免 background task
-        # 静默失败导致前端永远看到 running）；否则挂后台异步刷新（避免阻塞轮询）。
-        from datetime import datetime as _dt
-
-        _now = _dt.now(UTC)
-        _stale = job.updated_at is None or (_now - job.updated_at).total_seconds() > 30
-        if _stale:
-            try:
-                refreshed = svc.refresh_job_status(job_id, current_user.user.id)
-                if refreshed is not None:
-                    job = refreshed
-            except Exception as exc:  # noqa: BLE001
-                logger.error("同步刷新对口型状态失败 job_id=%s err=%s", job_id, exc, exc_info=True)
-                background.add_task(svc.refresh_job_status, job_id, current_user.user.id)
-        else:
-            background.add_task(svc.refresh_job_status, job_id, current_user.user.id)
+        background.add_task(svc.refresh_job_status, job_id, current_user.user.id)
 
     return job
 

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

@@ -1,339 +0,0 @@
-"""积分 & 会员 API 路由 (#1895)
-
-导出两个 router：
-- points_router: 积分相关路由，前缀 /points
-- usage_router: 每日额度路由，前缀 /usage
-"""
-
-from __future__ import annotations
-
-import logging
-from datetime import datetime, timedelta, timezone
-from typing import Optional
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session
-from app.schemas.points import (
-    DailyUsageResponse,
-    MembershipStatusResponse,
-    PointRuleItem,
-    PointsBalanceResponse,
-    PointsCheckRequest,
-    PointsCheckResponse,
-    PointsDeductRequest,
-    PointsOrderResponse,
-    PointsPackageItem,
-    PointsPackagesResponse,
-    PointsRechargeRequest,
-    PointsRefundRequest,
-    PointsRulesResponse,
-    PointsTransactionsResponse,
-    SimpleMessageResponse,
-)
-from fastapi import APIRouter, Depends, HTTPException, Query
-from sqlalchemy.orm import Session
-
-from packages.domain.points_rules import (
-    FREE_USER_MULTIPLIER,
-    MEMBER_DISCOUNT,
-    POINTS_PACKAGES,
-    POINTS_SCENES,
-    calculate_points_cost,
-)
-from packages.domain.points_service import PointsService
-
-logger = logging.getLogger(__name__)
-
-# ── 两个 router ──
-points_router = APIRouter()
-usage_router = APIRouter()
-
-
-def _get_service() -> PointsService:
-    return PointsService()
-
-
-def _is_member(user: AuthenticatedUser) -> bool:
-    """判断用户是否为付费会员。"""
-    return getattr(user.user, "is_member", False)
-
-
-def _member_type(user: AuthenticatedUser) -> str | None:
-    return getattr(user.user, "member_type", None)
-
-
-# ════════════════════════════════════════════════════════════════
-# 积分相关路由 (prefix=/points)
-# ════════════════════════════════════════════════════════════════
-
-
-@points_router.get("/balance", response_model=PointsBalanceResponse)
-def get_balance(
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    """查询当前用户积分余额 + 会员状态。"""
-    svc = _get_service()
-    account = svc.get_or_create_account(current_user.user.id, db)
-    return PointsBalanceResponse(
-        balance=account["balance"],
-        total_earned=account["total_earned"],
-        total_spent=account["total_spent"],
-        is_member=_is_member(current_user),
-        member_type=_member_type(current_user),
-        member_expires_at=getattr(current_user.user, "member_expires_at", None),
-    )
-
-
-@points_router.get("/transactions", response_model=PointsTransactionsResponse)
-def get_transactions(
-    page: int = Query(1, ge=1),
-    page_size: int = Query(20, ge=1, le=100),
-    type: Optional[str] = Query(None, description="筛选类型: add/deduct"),
-    source: Optional[str] = Query(None, description="筛选来源场景"),
-    start_date: Optional[datetime] = Query(None),
-    end_date: Optional[datetime] = Query(None),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    """查询积分流水（分页+筛选）。"""
-    svc = _get_service()
-    result = svc.get_transactions(
-        user_id=current_user.user.id,
-        db=db,
-        page=page,
-        page_size=page_size,
-        type_filter=type,
-        source_filter=source,
-        start_date=start_date,
-        end_date=end_date,
-    )
-    return PointsTransactionsResponse(**result)
-
-
-@points_router.get("/rules", response_model=PointsRulesResponse)
-def get_rules(
-    _current_user: AuthenticatedUser = Depends(get_current_user),
-):
-    """查询所有积分消耗规则。"""
-    rules = []
-    for scene_key, scene_data in POINTS_SCENES.items():
-        rules.append(
-            PointRuleItem(
-                scene_key=scene_key,
-                name=scene_data["name"],
-                base_points=scene_data["base_points"],
-                unit=scene_data["unit"],
-                extra_per_30s=scene_data.get("extra_per_30s"),
-                description=scene_data.get("description", ""),
-            )
-        )
-    return PointsRulesResponse(
-        rules=rules,
-        free_user_multiplier=FREE_USER_MULTIPLIER,
-    )
-
-
-@points_router.get("/packages", response_model=PointsPackagesResponse)
-def get_packages(
-    current_user: AuthenticatedUser = Depends(get_current_user),
-):
-    """查询可购买的积分包列表。"""
-    packages = []
-    for code, pkg in POINTS_PACKAGES.items():
-        unit_price = f"¥{pkg['price_cents'] / 100 / pkg['points']:.3f}/积分"
-        packages.append(
-            PointsPackageItem(
-                code=code,
-                name=pkg["name"],
-                points=pkg["points"],
-                price_cents=pkg["price_cents"],
-                unit_price=unit_price,
-            )
-        )
-    mt = _member_type(current_user)
-    discount = MEMBER_DISCOUNT.get(mt) if mt else None
-    return PointsPackagesResponse(packages=packages, user_discount=discount)
-
-
-@points_router.post("/check", response_model=PointsCheckResponse)
-def check_points(
-    body: PointsCheckRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    """消费前检查余额是否足够。未知 scene_key 返回 400（而非 500）。"""
-    if body.scene_key not in POINTS_SCENES:
-        raise HTTPException(
-            status_code=400,
-            detail={
-                "code": "UNKNOWN_SCENE",
-                "message": f"未知场景: {body.scene_key}",
-                "valid_scenes": sorted(POINTS_SCENES.keys()),
-            },
-        )
-    is_mem = _is_member(current_user)
-    mt = _member_type(current_user)
-
-    # 混剪场景先检查免费额度
-    is_free_quota = False
-    if body.scene_key == "ai_video" and not is_mem:
-        svc = _get_service()
-        if svc.check_daily_free_clip(current_user.user.id, db):
-            is_free_quota = True
-
-    required = calculate_points_cost(
-        body.scene_key,
-        is_mem,
-        quantity=body.quantity or 1,
-        duration_minutes=body.duration_minutes or 0,
-        member_type=mt,
-    )
-
-    svc = _get_service()
-    account = svc.get_or_create_account(current_user.user.id, db)
-    balance = account["balance"]
-
-    return PointsCheckResponse(
-        allowed=is_free_quota or balance >= required,
-        required_points=required,
-        current_balance=balance,
-        remaining_after=balance - required,
-        is_free_quota=is_free_quota,
-    )
-
-
-@points_router.post("/deduct", response_model=SimpleMessageResponse)
-def deduct_points(
-    body: PointsDeductRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    """积分扣减（内部服务调用）。"""
-    svc = _get_service()
-    result = svc.deduct_points(
-        user_id=current_user.user.id,
-        amount=body.amount,
-        source=body.scene_key,
-        db=db,
-        description=body.description or "",
-        ref_id=body.ref_id or "",
-    )
-    if not result["success"]:
-        raise HTTPException(
-            status_code=402,
-            detail={
-                "code": "INSUFFICIENT_POINTS",
-                "message": f"积分不足，需要 {body.amount}，余额 {result['balance']}",
-            },
-        )
-    return SimpleMessageResponse(
-        success=True,
-        message=f"扣减 {body.amount} 积分成功",
-        data={"transaction_id": result["transaction_id"], "balance": result["balance"]},
-    )
-
-
-@points_router.post("/refund", response_model=SimpleMessageResponse)
-def refund_points(
-    body: PointsRefundRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    """积分退还（内部服务调用）。"""
-    from packages.adapters.sqlalchemy_impl.models import PointsTransactionModel
-
-    txn = (
-        db.query(PointsTransactionModel)
-        .filter(PointsTransactionModel.id == body.transaction_id)
-        .first()
-    )
-    if txn is None:
-        raise HTTPException(status_code=404, detail="交易记录不存在")
-    if txn.user_id != current_user.user.id:
-        raise HTTPException(status_code=403, detail="无权退还他人积分")
-
-    svc = _get_service()
-    result = svc.refund_points(
-        user_id=current_user.user.id,
-        amount=txn.amount,
-        source=txn.source,
-        db=db,
-        ref_id=body.transaction_id,
-        description=body.reason or f"退还: {txn.description}",
-    )
-    if not result["success"]:
-        raise HTTPException(status_code=500, detail="退还失败")
-    return SimpleMessageResponse(
-        success=True,
-        message=f"退还 {txn.amount} 积分成功",
-        data={"transaction_id": result["transaction_id"], "balance": result["balance"]},
-    )
-
-
-@points_router.post("/recharge", response_model=PointsOrderResponse)
-def create_recharge_order(
-    body: PointsRechargeRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    """创建积分充值订单。pay_params 在支付通道接入后填入 prepay_id/payment_url；当前为空 dict。"""
-    svc = _get_service()
-    try:
-        order = svc.create_order(
-            user_id=current_user.user.id,
-            order_type="points",
-            product_code=body.package_id,
-            db=db,
-        )
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e)) from None
-
-    package = POINTS_PACKAGES.get(body.package_id, {})
-    now = datetime.now(timezone.utc)
-    expire_at = now + timedelta(hours=48)
-    # TODO: 接入微信/支付宝后填充真实 prepay_id / payment_url
-    order["points_amount"] = package.get("points", 0)
-    order["pay_params"] = {}
-    order["expire_at"] = expire_at.isoformat()
-    return PointsOrderResponse(**order)
-
-
-@points_router.get("/subscription/membership", response_model=MembershipStatusResponse)
-def get_membership_status(
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    """获取当前用户会员状态（聚合信息）。"""
-    svc = _get_service()
-    account = svc.get_or_create_account(current_user.user.id, db)
-    is_mem = _is_member(current_user)
-    max_resolution = "1080p" if is_mem else "720p"
-
-    return MembershipStatusResponse(
-        is_member=is_mem,
-        member_type=_member_type(current_user),
-        member_expires_at=getattr(current_user.user, "member_expires_at", None),
-        points_balance=account["balance"],
-        max_resolution=max_resolution,
-    )
-
-
-# ════════════════════════════════════════════════════════════════
-# 每日额度路由 (prefix=/usage)
-# ════════════════════════════════════════════════════════════════
-
-
-@usage_router.get("/daily", response_model=DailyUsageResponse)
-def get_daily_usage(
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    """查询今日免费混剪额度使用情况。"""
-    svc = _get_service()
-    result = svc.get_daily_usage(current_user.user.id, db)
-    return DailyUsageResponse(**result)
-
-
-# 为了向后兼容，也导出一个不带后缀的 router（方便旧引用）
-router = points_router

apps/api/app/api/routes/scripts.py

@@ -36,9 +36,6 @@ def _to_response(script) -> ScriptResponse:
             for s in segments
         ],
         tags=script.tags or [],
-        title_text=getattr(script, "title_text", "") or "",
-        title_category=getattr(script, "title_category", "") or "",
-        title_config=getattr(script, "title_config", None) or {},
         created_at=script.created_at,
         updated_at=script.updated_at,
     )
@@ -73,9 +70,6 @@ def create_script(
         content=request.content,
         segments=[s.model_dump() for s in request.segments],
         tags=request.tags,
-        title_text=request.title_text or "",
-        title_category=request.title_category or "",
-        title_config=request.title_config or {},
     )
     return _to_response(script)
 
@@ -110,9 +104,6 @@ def update_script(
             content=request.content,
             segments=[s.model_dump() for s in request.segments] if request.segments is not None else None,
             tags=request.tags,
-            title_text=request.title_text,
-            title_category=request.title_category,
-            title_config=request.title_config,
         )
     except ScriptNotFoundError as exc:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Script not found") from exc

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

@@ -1,290 +0,0 @@
-"""Scripts AI 能力路由 — Issue #1893.
-
-三个 AI 工具接口（均挂载在 /api/v1/scripts 前缀下）：
-- POST /extract-from-douyin  从抖音视频提取文案（yt-dlp 下载 + ASR 转写）
-- POST /ai-rewrite           AI 文案改写（复用豆包 LLM）
-- POST /ai-generate-titles   AI 标题生成（复用 generate_smart_titles）
-"""
-
-from __future__ import annotations
-
-import logging
-import os
-import re
-import tempfile
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session
-from app.schemas.scripts_ai import (
-    AiGenerateTitlesRequest,
-    AiGenerateTitlesResponse,
-    AiRewriteRequest,
-    AiRewriteResponse,
-    ExtractFromDouyinRequest,
-    ExtractFromDouyinResponse,
-)
-from app.services.script_asr_service import (
-    ASRNotConfiguredError,
-    ASRTranscriptionError,
-    transcribe_to_text,
-)
-from fastapi import APIRouter, Depends, HTTPException, status
-from sqlalchemy.orm import Session
-
-from packages.middleware.points_gate import points_gate
-from packages.shared.ai_client import get_doubao_client
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter()
-
-# 抖音 URL 校验：支持短链 v.douyin.com 和长链 www.douyin.com/video/
-_DOUYIN_URL_RE = re.compile(
-    r"^(https?://)?(v\.douyin\.com/\S+|www\.douyin\.com/video/\S+)$",
-    re.IGNORECASE,
-)
-
-
-def _validate_douyin_url(url: str) -> None:
-    """校验抖音 URL 格式，不合法时抛 HTTPException(400)."""
-    if not url or not url.strip():
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="链接不能为空",
-        )
-    if not _DOUYIN_URL_RE.match(url.strip()):
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="无效的抖音链接，仅支持 v.douyin.com 短链或 www.douyin.com/video/ 长链",
-        )
-
-
-# ── 1. 从抖音视频提取文案 ─────────────────────────────────────────────────────
-
-
-@router.post(
-    "/extract-from-douyin",
-    response_model=ExtractFromDouyinResponse,
-)
-@points_gate("douyin_extract")
-def extract_from_douyin(
-    request: ExtractFromDouyinRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-) -> ExtractFromDouyinResponse:
-    """从抖音视频下载无水印视频并通过 ASR 提取文案."""
-    source_url = request.url.strip()
-    _validate_douyin_url(source_url)
-
-    # 确保 URL 有 scheme（yt-dlp 需要完整 URL）
-    url_for_download = source_url
-    if not re.match(r"^https?://", url_for_download, re.IGNORECASE):
-        url_for_download = "https://" + url_for_download
-
-    text: str = ""
-    duration: float = 0.0
-
-    try:
-        with tempfile.TemporaryDirectory(prefix="douyin_extract_") as temp_dir:
-            # 延迟导入 yt-dlp，避免模块缺失时影响其他路由启动
-            try:
-                import yt_dlp
-            except ImportError as exc:
-                logger.error("yt-dlp 未安装，抖音提取功能不可用: %s", exc)
-                raise HTTPException(
-                    status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
-                    detail="抖音提取功能暂不可用（缺少依赖 yt-dlp）",
-                ) from exc
-
-            ydl_opts = {
-                "format": "best[ext=mp4]/best",
-                "outtmpl": f"{temp_dir}/%(id)s.%(ext)s",
-                "quiet": True,
-                "no_warnings": True,
-                "noplaylist": True,
-            }
-
-            try:
-                ydl = yt_dlp.YoutubeDL(ydl_opts)
-                info = ydl.extract_info(url_for_download, download=True)
-            except yt_dlp.utils.DownloadError as exc:
-                # yt-dlp 官方异常类型：HTTP 错误、短链失效、视频下架等
-                msg = str(exc)
-                logger.warning("抖音下载失败: url=%s error=%s", source_url, msg)
-                # 404/视频不存在/不可下载 → 400；网络问题/上游异常 → 502
-                is_bad_url = any(
-                    kw in msg.lower() for kw in ("404", "not found", "unable to download webpage", "unsupported url", "no video formats")
-                )
-                raise HTTPException(
-                    status_code=status.HTTP_400_BAD_REQUEST if is_bad_url else status.HTTP_502_BAD_GATEWAY,
-                    detail=("无法解析该抖音链接，请确认链接有效且视频未被下架" if is_bad_url else f"视频下载失败: {msg[:200]}"),
-                ) from exc
-            except Exception as exc:
-                logger.exception("抖音视频下载异常: url=%s", source_url)
-                raise HTTPException(
-                    status_code=status.HTTP_502_BAD_GATEWAY,
-                    detail=f"视频下载失败: {str(exc)[:200]}",
-                ) from exc
-
-            if info is None:
-                raise HTTPException(
-                    status_code=status.HTTP_400_BAD_REQUEST,
-                    detail="无法解析该抖音链接",
-                )
-
-            video_path = ydl.prepare_filename(info)
-            try:
-                duration = float(info.get("duration") or 0)
-            except (TypeError, ValueError):
-                duration = 0.0
-
-            # 校验下载的文件是否真的存在（某些 yt-dlp 版本可能 info 成功但未下载到文件）
-            if not os.path.isfile(video_path) or os.path.getsize(video_path) == 0:
-                logger.error("yt-dlp 未产生有效视频文件: path=%s", video_path)
-                raise HTTPException(
-                    status_code=status.HTTP_502_BAD_GATEWAY,
-                    detail="视频下载异常：未获取到有效文件",
-                )
-
-            # ASR 转写（兜底捕获所有异常，避免 500）
-            try:
-                text = transcribe_to_text(video_path)
-            except ASRNotConfiguredError as exc:
-                raise HTTPException(
-                    status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
-                    detail=str(exc),
-                ) from exc
-            except ASRTranscriptionError as exc:
-                raise HTTPException(
-                    status_code=status.HTTP_502_BAD_GATEWAY,
-                    detail=str(exc),
-                ) from exc
-            except Exception as exc:
-                logger.exception("ASR 转写异常: path=%s", video_path)
-                raise HTTPException(
-                    status_code=status.HTTP_502_BAD_GATEWAY,
-                    detail=f"语音识别失败: {str(exc)[:200]}",
-                ) from exc
-
-    except HTTPException:
-        raise
-    except Exception as exc:
-        # 最后兜底：任何未捕获异常都转成 502/400，不允许冒泡成 500
-        logger.exception("抖音文案提取未预期异常: url=%s", source_url)
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"抖音文案提取失败: {str(exc)[:200]}",
-        ) from exc
-
-    return ExtractFromDouyinResponse(
-        text=text,
-        duration_seconds=duration,
-        source_url=source_url,
-    )
-
-
-# ── 2. AI 文案改写 ───────────────────────────────────────────────────────────
-
-
-@router.post(
-    "/ai-rewrite",
-    response_model=AiRewriteResponse,
-)
-@points_gate("ai_rewrite")
-def ai_rewrite(
-    request: AiRewriteRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-) -> AiRewriteResponse:
-    """使用豆包大模型改写文案."""
-    content = (request.content or "").strip()
-    if not content:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="文案内容不能为空",
-        )
-
-    style = request.style or "口语化"
-
-    client = get_doubao_client()
-    if not client.is_available:
-        raise HTTPException(
-            status_code=status.HTTP_502_BAD_GATEWAY,
-            detail="AI 服务不可用，请联系管理员配置豆包大模型 API Key",
-        )
-
-    system_prompt = (
-        "你是一个专业的短视频文案改写专家。请对以下文案进行改写，"
-        "要求：保留原意、口语化、适合短视频口播、调整语序避免查重。"
-    )
-    if style:
-        system_prompt += f"\n风格要求：{style}"
-
-    user_prompt = f"请改写以下文案：\n\n{content}"
-
-    messages = [
-        {"role": "system", "content": system_prompt},
-        {"role": "user", "content": user_prompt},
-    ]
-
-    try:
-        rewritten = client.chat_completion(
-            messages=messages,
-            temperature=0.8,
-            max_tokens=2048,
-        )
-    except Exception as exc:
-        logger.error("AI 改写调用失败: %s", exc)
-        raise HTTPException(
-            status_code=status.HTTP_502_BAD_GATEWAY,
-            detail=f"AI 改写失败: {exc}",
-        ) from exc
-
-    if not rewritten:
-        raise HTTPException(
-            status_code=status.HTTP_502_BAD_GATEWAY,
-            detail="AI 改写未返回有效结果",
-        )
-
-    return AiRewriteResponse(
-        original=content,
-        rewritten=rewritten.strip(),
-        style=style,
-    )
-
-
-# ── 3. AI 标题生成 ───────────────────────────────────────────────────────────
-
-
-@router.post(
-    "/ai-generate-titles",
-    response_model=AiGenerateTitlesResponse,
-)
-@points_gate("ai_title")
-def ai_generate_titles(
-    request: AiGenerateTitlesRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-) -> AiGenerateTitlesResponse:
-    """使用现有 generate_smart_titles 生成标题."""
-    content = (request.content or "").strip()
-    if not content:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="文案内容不能为空",
-        )
-
-    # count 限制在 1-5（Pydantic ge=1 le=5 已校验），但为兼容直接调用场景截断
-    count = max(1, min(5, request.count))
-
-    from app.services.ai_service import generate_smart_titles
-
-    result = generate_smart_titles(
-        description=content,
-        style="viral",
-        count=count,
-    )
-
-    titles = result.get("titles", [])[:count]
-
-    return AiGenerateTitlesResponse(titles=titles)

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

@@ -4,8 +4,8 @@ from __future__ import annotations
 
 import logging
 from dataclasses import replace
-from datetime import UTC, datetime
-from typing import Any
+from datetime import datetime, timezone
+from typing import List
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import get_user_repository
@@ -67,7 +67,7 @@ def _get_plan_price(plan_id: str, billing_cycle: str) -> float:
 
 def _build_subscription_info(user: AuthenticatedUser) -> SubscriptionInfo:
     """构建订阅信息响应"""
-    now = datetime.now(UTC)
+    now = datetime.now(timezone.utc)
     if user.user.subscription_expires_at:
         period_end = user.user.subscription_expires_at.isoformat()
         period_start = now.isoformat()
@@ -100,43 +100,10 @@ async def get_current_subscription(
     return _build_subscription_info(current_user)
 
 
-@router.get("/plans")
-def list_membership_plans(
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> dict[str, list[dict[str, Any]]]:
-    """查询所有会员档位（供前端会员购买页展示）。
-
-    返回 points 积分体系下的会员档位（月卡/季卡/年卡），含价格、时长、积分折扣等信息。
-    """
-    from packages.domain.points_rules import MEMBER_DISCOUNT, MEMBERSHIP_PRICES
-
-    plans: list[dict[str, Any]] = []
-    for plan_id, info in MEMBERSHIP_PRICES.items():
-        days = info["duration_days"]
-        monthly_cents = round(info["price_cents"] * 30 / days)
-        features: dict[str, Any] = {"max_resolution": "1080p"}
-        if plan_id == "monthly":
-            features.update({"free_clips_daily": 2})
-        elif plan_id == "quarterly":
-            features.update({"free_clips_daily": 5})
-        elif plan_id == "yearly":
-            features.update({"free_clips_daily": "unlimited"})
-        plans.append({
-            "plan_id": plan_id,
-            "name": info["name"],
-            "price_cents": info["price_cents"],
-            "monthly_price_cents": monthly_cents,
-            "duration_days": days,
-            "points_discount": MEMBER_DISCOUNT.get(plan_id, 1.0),
-            "features": features,
-        })
-    return {"plans": plans}
-
-
-@router.get("/billing-records", response_model=list[BillingRecord])
+@router.get("/billing-records", response_model=List[BillingRecord])
 async def get_billing_records(
     current_user: AuthenticatedUser = Depends(get_current_user),
-) -> list[BillingRecord]:
+) -> List[BillingRecord]:
     """获取账单记录列表"""
     from packages.adapters.sqlalchemy_impl.billing_repository import SQLAlchemyBillingRepository
     from packages.adapters.sqlalchemy_impl.session import SessionLocal
@@ -284,7 +251,7 @@ async def payment_callback(
 
         # 计算到期时间
         days = 365 if billing_cycle == "yearly" else 30
-        expires_at = datetime.now(UTC) + timedelta(days=days)
+        expires_at = datetime.now(timezone.utc) + timedelta(days=days)
         repo.update_subscription_on_payment(user_id, plan, expires_at)
 
         return {"success": True, "message": "支付成功", "record_id": record_id}

apps/api/app/api/routes/templates.py

@@ -1,13 +1,4 @@
-"""Template 列表路由（供生成页自动选模板）.
-
-保留：
-- GET /templates：列表查询（生成页使用）
-- 默认模板自动创建兜底逻辑（复用 _default_template.get_or_create_default_template_id）
-
-其他模板 CRUD / 分类 / 标签 / 收藏 / 复制 / 校验 / 使用统计等 HTTP 端点
-已在 PR#1918 中删除（前端 PR#1911 已删除 my-templates / editing-planner /
-templates 管理页面）。
-"""
+"""Template CRUD + generate + category routes."""
 
 from __future__ import annotations
 
@@ -16,19 +7,53 @@ import logging
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import get_db_session
 from app.schemas.template import (
+    CategoryResponse,
+    CopyTemplateRequest,
+    CreateCategoryRequest,
+    CreateTemplateRequest,
+    GenerateWarningResponse,
+    ListCategoriesResponse,
+    ListTagsResponse,
     ListTemplatesResponse,
+    SegmentResponse,
     TemplateResponse,
+    TemplateUsageResponse,
+    ToggleFavoriteResponse,
+    UpdateTemplateRequest,
+    ValidateTemplateRequest,
+    ValidateTemplateResponse,
 )
-from fastapi import APIRouter, Depends, Query
+from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
 from sqlalchemy.orm import Session
 
 logger = logging.getLogger(__name__)
 
 from packages.adapters.sqlalchemy_impl.template_repository import SQLAlchemyTemplateRepository
-from packages.application.template.commands import ListTemplatesFilter
-from packages.application.template.use_cases import CountTemplatesUseCase, ListTemplatesUseCase
-
-from ._default_template import get_or_create_default_template_id
+from packages.application.template.commands import (
+    CopyTemplateCommand,
+    CreateCategoryCommand,
+    CreateTemplateCommand,
+    ListTemplatesFilter,
+    SegmentCommand,
+    UpdateTemplateCommand,
+    ValidateTemplateCommand,
+)
+from packages.application.template.use_cases import (
+    CopyTemplateUseCase,
+    CountTemplatesUseCase,
+    CreateCategoryUseCase,
+    CreateTemplateUseCase,
+    DeleteCategoryUseCase,
+    DeleteTemplateUseCase,
+    GetTemplateUseCase,
+    ListCategoriesUseCase,
+    ListTagsUseCase,
+    ListTemplatesUseCase,
+    NotFoundError,
+    UpdateTemplateUseCase,
+    ValidateTemplateUseCase,
+    ValidationError,
+)
 
 router = APIRouter()
 
@@ -37,32 +62,354 @@ def _get_template_repository(session: Session = Depends(get_db_session)) -> SQLA
     return SQLAlchemyTemplateRepository(session)
 
 
-@router.get("", response_model=ListTemplatesResponse, summary="获取模板列表")
+def _segment_to_response(seg) -> SegmentResponse:
+    return SegmentResponse(
+        id=seg.id,
+        template_id=seg.template_id,
+        segment_order=seg.segment_order,
+        duration_min=seg.duration_min,
+        duration_max=seg.duration_max,
+        material_type=seg.material_type,
+        created_at=seg.created_at,
+        updated_at=seg.updated_at,
+    )
+
+
+def _to_response(template, usage_count: int = 0) -> TemplateResponse:
+    return TemplateResponse(
+        id=template.id,
+        user_id=template.user_id,
+        name=template.name,
+        mode=template.mode,
+        category=template.category,
+        tags=template.tags,
+        title_config=template.title_config,
+        subtitle_config=template.subtitle_config,
+        bgm_config=template.bgm_config,
+        estimated_duration=template.estimated_duration,
+        segments=[_segment_to_response(s) for s in getattr(template, "segments", [])],
+        is_active=template.is_active,
+        usage_count=usage_count,
+        created_at=template.created_at,
+        updated_at=template.updated_at,
+    )
+
+
+# ── Template CRUD ──
+
+
+@router.get("", response_model=ListTemplatesResponse)
 def list_templates(
-    mode: str | None = Query(None, description="编辑模式：generic/vlog/storyboard，不传返回全部"),
+    skip: int = Query(0, ge=0),
+    limit: int = Query(50, ge=1, le=200),
     category: str | None = Query(None, description="按分类筛选"),
     tag: str | None = Query(None, description="按标签筛选"),
-    page: int = Query(1, ge=1, description="页码，从 1 开始"),
-    page_size: int = Query(20, ge=1, le=100, description="每页条数，默认 20"),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    repo: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
-    db: Session = Depends(get_db_session),
-):
-    """获取用户可用的模板列表（仅返回 active 状态）。"""
-    user_id = str(current_user.user.id)
-    # P0 兜底：无有效模板时自动创建默认配音模板（解决新用户首次进入生成页 404）
-    get_or_create_default_template_id(db, user_id)
+    keyword: str | None = Query(None, description="按名称关键词搜索"),
+    mode: str | None = Query(None, description="按剪辑模式筛选"),
+    valid_only: bool = Query(
+        False,
+        description="仅返回已配置片段的模板（剪辑页传 true；模板编辑器不传，可查看全部模板含草稿）",
+    ),
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> ListTemplatesResponse:
+    user_id = authenticated_user.user.id
+    try:
+        tpl_filter = ListTemplatesFilter(
+            category=category,
+            tag=tag,
+            keyword=keyword,
+            mode=mode,
+            valid_only=valid_only,
+        )
+        use_case = ListTemplatesUseCase(template_repository)
+        templates = use_case.execute(user_id, skip=skip, limit=limit, filter=tpl_filter)
+        count_use_case = CountTemplatesUseCase(template_repository)
+        total = count_use_case.execute(user_id, filter=tpl_filter)
 
-    list_uc = ListTemplatesUseCase(repo)
-    count_uc = CountTemplatesUseCase(repo)
-    filters = ListTemplatesFilter(
-        category=category,
-        tag=tag,
-        mode=mode,
-        valid_only=True,  # 仅返回 active + 有片段配置
+        # 批量查询使用次数
+        items = []
+        for t in templates:
+            usage = template_repository.get_usage_count(t.id)
+            items.append(_to_response(t, usage_count=usage))
+    except Exception:
+        logger.exception("list_templates 查询失败: user_id=%s", user_id)
+        return ListTemplatesResponse(items=[], total=0)
+    return ListTemplatesResponse(
+        items=items,
+        total=total,
     )
-    skip = (page - 1) * page_size
-    templates = list_uc.execute(user_id, skip=skip, limit=page_size, filter=filters)
-    total = count_uc.execute(user_id, filter=filters)
-    items = [TemplateResponse.model_validate(tpl, from_attributes=True) for tpl in templates]
-    return ListTemplatesResponse(items=items, total=total)
+
+
+@router.get("/{template_id}", response_model=TemplateResponse)
+def get_template(
+    template_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> TemplateResponse:
+    user_id = authenticated_user.user.id
+    try:
+        use_case = GetTemplateUseCase(template_repository)
+        template = use_case.execute(template_id, user_id)
+        usage = template_repository.get_usage_count(template_id)
+    except Exception as _e:
+        logger.exception("get_template 查询失败: template_id=%s", template_id)
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="模板查询失败") from _e
+    if template is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
+    return _to_response(template, usage_count=usage)
+
+
+@router.post("", response_model=TemplateResponse, status_code=status.HTTP_201_CREATED)
+def create_template(
+    request: CreateTemplateRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> TemplateResponse:
+    user_id = authenticated_user.user.id
+    command = CreateTemplateCommand(
+        user_id=user_id,
+        name=request.name,
+        mode=request.mode,
+        category=request.category,
+        tags=request.tags,
+        title_config=request.title_config,
+        subtitle_config=request.subtitle_config,
+        bgm_config=request.bgm_config,
+        estimated_duration=request.estimated_duration,
+        segments=[
+            SegmentCommand(
+                segment_order=s.segment_order,
+                duration_min=s.duration_min,
+                duration_max=s.duration_max,
+                material_type=s.material_type,
+            )
+            for s in request.segments
+        ],
+    )
+    use_case = CreateTemplateUseCase(template_repository)
+    try:
+        template = use_case.execute(command)
+    except ValidationError as exc:
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
+    return _to_response(template)
+
+
+@router.patch("/{template_id}", response_model=TemplateResponse)
+def update_template(
+    template_id: str,
+    request: UpdateTemplateRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> TemplateResponse:
+    user_id = authenticated_user.user.id
+    command = UpdateTemplateCommand(
+        template_id=template_id,
+        user_id=user_id,
+        name=request.name,
+        mode=request.mode,
+        category=request.category,
+        tags=request.tags,
+        title_config=request.title_config,
+        subtitle_config=request.subtitle_config,
+        bgm_config=request.bgm_config,
+        estimated_duration=request.estimated_duration,
+        segments=(
+            [
+                SegmentCommand(
+                    segment_order=s.segment_order,
+                    duration_min=s.duration_min,
+                    duration_max=s.duration_max,
+                    material_type=s.material_type,
+                )
+                for s in request.segments
+            ]
+            if request.segments is not None
+            else None
+        ),
+    )
+    use_case = UpdateTemplateUseCase(template_repository)
+    try:
+        template = use_case.execute(command)
+    except NotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
+    except ValidationError as exc:
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
+    return _to_response(template)
+
+
+@router.delete("/{template_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
+def delete_template(
+    template_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> Response:
+    user_id = authenticated_user.user.id
+    use_case = DeleteTemplateUseCase(template_repository)
+    deleted = use_case.execute(template_id, user_id)
+    if not deleted:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
+    return
+
+
+@router.post("/{template_id}/copy", response_model=TemplateResponse, status_code=status.HTTP_201_CREATED)
+def copy_template(
+    template_id: str,
+    request: CopyTemplateRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> TemplateResponse:
+    """复制模板（含所有片段配置）"""
+    user_id = authenticated_user.user.id
+    command = CopyTemplateCommand(
+        template_id=template_id,
+        user_id=user_id,
+        new_name=request.new_name,
+    )
+    use_case = CopyTemplateUseCase(template_repository)
+    try:
+        template = use_case.execute(command)
+    except NotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
+    except ValidationError as exc:
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
+    return _to_response(template)
+
+
+@router.get("/{template_id}/usage", response_model=TemplateUsageResponse)
+def get_template_usage(
+    template_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> TemplateUsageResponse:
+    """获取模板使用次数（关联的剪辑计划数量）"""
+    user_id = authenticated_user.user.id
+    # 鉴权：确保模板存在且属于当前用户
+    use_case = GetTemplateUseCase(template_repository)
+    template = use_case.execute(template_id, user_id)
+    if template is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
+    usage = template_repository.get_usage_count(template_id)
+    return TemplateUsageResponse(template_id=template_id, usage_count=usage)
+
+
+@router.post("/{template_id}/toggle-favorite", response_model=ToggleFavoriteResponse)
+def toggle_favorite(
+    template_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> ToggleFavoriteResponse:
+    """切换模板收藏状态（当前为兼容端点，始终返回 false）"""
+    user_id = authenticated_user.user.id
+    use_case = GetTemplateUseCase(template_repository)
+    try:
+        template = use_case.execute(template_id, user_id)
+    except Exception as _e:
+        logger.exception("toggle_favorite 查询失败: template_id=%s", template_id)
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
+    if template is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
+    return ToggleFavoriteResponse(id=template_id, is_favorite=False)
+
+
+# ── Validate template ──
+
+
+@router.post("/{template_id}/validate", response_model=ValidateTemplateResponse)
+def validate_template(
+    template_id: str,
+    request: ValidateTemplateRequest = ValidateTemplateRequest(),
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> ValidateTemplateResponse:
+    user_id = authenticated_user.user.id
+    command = ValidateTemplateCommand(
+        template_id=template_id,
+        user_id=user_id,
+        voiceover_duration=request.voiceover_duration,
+    )
+    use_case = ValidateTemplateUseCase(template_repository)
+    try:
+        result = use_case.execute(command)
+    except NotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
+    except ValidationError as exc:
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
+
+    return ValidateTemplateResponse(
+        template=_to_response(result.template),
+        warnings=[GenerateWarningResponse(code=w.code, message=w.message, details=w.details) for w in result.warnings],
+    )
+
+
+# ── Category CRUD ──
+
+
+@router.get("/categories/list", response_model=ListCategoriesResponse)
+def list_categories(
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> ListCategoriesResponse:
+    user_id = authenticated_user.user.id
+    try:
+        use_case = ListCategoriesUseCase(template_repository)
+        categories = use_case.execute(user_id)
+    except Exception:
+        logger.exception("list_categories 查询失败: user_id=%s", user_id)
+        return ListCategoriesResponse(items=[])
+    return ListCategoriesResponse(
+        items=[CategoryResponse(id=c.id, user_id=c.user_id, name=c.name, created_at=c.created_at) for c in categories],
+    )
+
+
+@router.post("/categories", response_model=CategoryResponse, status_code=status.HTTP_201_CREATED)
+def create_category(
+    request: CreateCategoryRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> CategoryResponse:
+    user_id = authenticated_user.user.id
+    command = CreateCategoryCommand(user_id=user_id, name=request.name)
+    use_case = CreateCategoryUseCase(template_repository)
+    category = use_case.execute(command)
+    return CategoryResponse(
+        id=category.id,
+        user_id=category.user_id,
+        name=category.name,
+        created_at=category.created_at,
+    )
+
+
+@router.delete(
+    "/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response
+)
+def delete_category(
+    category_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> Response:
+    user_id = authenticated_user.user.id
+    use_case = DeleteCategoryUseCase(template_repository)
+    deleted = use_case.execute(category_id, user_id)
+    if not deleted:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Category not found")
+    return Response(status_code=204)
+
+
+# ── Tags ──
+
+
+@router.get("/tags/list", response_model=ListTagsResponse)
+def list_tags(
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
+) -> ListTagsResponse:
+    """获取用户所有模板标签（去重排序）"""
+    user_id = authenticated_user.user.id
+    try:
+        use_case = ListTagsUseCase(template_repository)
+        tags = use_case.execute(user_id)
+    except Exception:
+        logger.exception("list_tags 查询失败: user_id=%s", user_id)
+        return ListTagsResponse(items=[])
+    return ListTagsResponse(items=tags)

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

@@ -28,7 +28,7 @@ from .adjustments import router as adjustments_router
 from .ai_features import router as ai_features_router
 from .bgm import router as bgm_router
 from .clips import router as clips_router
-from .dependencies import get_draft_plan_id, get_editor_services, resolve_draft_plan_id  # noqa: F401
+from .dependencies import get_draft_plan_id, get_editor_services  # noqa: F401
 from .draft import router as draft_router
 from .effects import router as effects_router
 from .export import router as export_router

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

@@ -622,10 +622,8 @@ def create_clips_from_assets_editor(
     """从素材批量创建片段（按模板segment配置创建，MediaKit异步更新）.
 
     逻辑：
-    1. 从模板读取 segments，片段数量优先级：显式 clip_count（1-10）→ 旧字段
-       required_clips_count（兼容，超10截断）→ 默认 3（产品默认 3 段）。
-       片段数大于模板 segment 数时按顺序循环复用 segment 配置。
-    2. 每个片段时长在对应 segment 的 duration_min ~ duration_max 之间随机取值（保留一位小数）
+    1. 从模板读取 segments，片段数量 = segment 数量（忽略前端传的 required_clips_count）
+    2. 每个片段时长在 segment 的 duration_min ~ duration_max 之间随机取值（保留一位小数）
     3. 素材按片段顺序轮询分配，素材不够时同一素材切多个片段
     4. 使用 replace_all_clips_transactional 原子性地清空旧片段并创建新的（随机起始时间）
     5. 立即返回响应（目标 <1秒）
@@ -650,22 +648,6 @@ def create_clips_from_assets_editor(
             detail="模板未配置片段",
         )
 
-    # 1.5 归一化片段数量：
-    # 优先级：显式 clip_count → 旧字段 required_clips_count（由 schema 归一化到 clip_count）
-    # → 默认 3（产品默认 3 段）。按 N 循环复用 segment 配置；N <= len(segments) 时截取前 N 个
-    # （保持向后兼容：原模板有 N 个 segment、前端不传 clip_count 且 N<=10 时按模板段数创建；
-    # 默认模板仅有 1 个通用 segment 时按 clip_count=3 循环生成 3 段）。
-    requested_clip_count = getattr(body, "clip_count", None)
-    if requested_clip_count is None:
-        # schema 未显式传 clip_count 且无 legacy：使用模板 segments 数量，若超出 10 则截断
-        requested_clip_count = len(segments) if 1 <= len(segments) <= 10 else 3
-    requested_clip_count = max(1, min(int(requested_clip_count), 10))
-    effective_segments: list[tuple[int, float, float]] = []
-    for i in range(requested_clip_count):
-        src = segments[i % len(segments)]
-        effective_segments.append((i, float(src[1]), float(src[2])))
-    segments = effective_segments
-
     # 防御：schema validator 已过滤 null/空串，这里再归一化一次，
     # 避免异常入参（undefined → null）导致后续 /assets/{id} 404 / 422
     asset_ids = [str(aid).strip() for aid in (body.asset_ids or []) if isinstance(aid, str) and aid.strip()]

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

@@ -2,16 +2,13 @@
 
 核心依赖：
 - get_editor_services: 获取模板+计划服务
-- get_draft_plan_id: Depends 形式的路径依赖（template_id 路径参数必填）
-- resolve_draft_plan_id: 纯函数版本，供 clips_standalone 等非路径参数场景复用
-  （支持空 tid 时自动兜底创建默认模板）
+- get_draft_plan_id: 根据 template_id 获取或创建草稿，返回 plan_id
 """
 
 from __future__ import annotations
 
 import logging
 
-from app.api.routes._default_template import get_or_create_default_template_id
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import get_db_session
 from app.services.edit_plan_service import EditPlanService
@@ -33,61 +30,50 @@ def get_editor_services(
     return EditTemplateService(db), EditPlanService(db)
 
 
-def resolve_draft_plan_id(
+def get_draft_plan_id(
     template_id: str,
-    services: tuple[EditTemplateService, EditPlanService],
-    current_user: AuthenticatedUser,
-    db: Session,
-    auto_create_default: bool = True,
+    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
+    current_user: AuthenticatedUser = Depends(get_current_user),
+    db: Session = Depends(get_db_session),
 ) -> str:
-    """根据 template_id 获取或创建草稿，返回 plan_id（纯函数，不带 Depends）。
+    """路径依赖：根据 template_id 获取或创建草稿，返回 plan_id.
 
-    当 auto_create_default=True 且 template_id 为空时，自动调用
-    get_or_create_default_template_id 创建默认模板（用于 clips_standalone
-    等非路径参数场景）。
+    这是模板编辑器路由的核心依赖——所有编辑器端点都先经过这里，
+    确保 template_id → plan_id 的映射始终存在。
+
+    模板读取遵循单一数据源、显式判定（不使用异常降级）：
+    - 用户自建模板在旧表 ``templates``（归属 user_id，is_active=True）；
+    - 全局模板在新表 ``edit_templates``（无 user_id，全局可读）。
+    模板不存在、已删除或不归属于当前用户时，一律返回 404。
     """
     tpl_svc, plan_svc = services
     user_id = str(current_user.user.id)
 
-    # 0. 空 tid 兜底
-    if not template_id:
-        if auto_create_default:
-            tid = get_or_create_default_template_id(db, user_id)
-            if not tid:
-                raise HTTPException(
-                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    detail="无法自动创建默认模板，请刷新页面重试",
-                )
-            template_id = tid
-        else:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="template_id 不能为空",
-            )
-
-    # 1. 门禁：校验模板存在且可访问
+    # 0. 门禁：校验模板存在且可访问（即使草稿已缓存命中也要校验，
+    #    避免模板被删除/无权访问后仍可通过既有草稿 plan 继续操作）。
     old_repo = SQLAlchemyTemplateRepository(db)
     old_template = old_repo.get_active(template_id, user_id)
     is_global_template = tpl_svc.get_template(template_id) is not None
     if old_template is None and not is_global_template:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="模板不存在")
 
-    # 2. 草稿已存在 → 直接返回
+    # 1. 草稿已存在 → 直接返回
     draft = tpl_svc.get_template_draft(template_id)
     if draft is not None:
         return draft.id
 
-    # 3. 全局模板（新系统）→ 用新服务创建草稿
+    # 2. 全局模板（新系统）→ 用新服务创建草稿
     if is_global_template:
         draft = tpl_svc.create_template_draft(template_id, user_id=user_id)
         return draft.id
 
-    # 4. 旧模板（templates 表）→ 基于旧模板创建草稿计划
+    # 3. 旧模板（templates 表）→ 基于旧模板创建草稿计划
     from app.services.plan_generator_service import PlanGeneratorService
 
     from packages.domain.edit_template import EditTemplate, EditTemplateStatus
     from packages.domain.template_clip_config import ClipType, TemplateClipConfig
 
+    # 构造伪 EditTemplate 对象（只填 generate_from_template 需要的字段）
     pseudo_template = EditTemplate(
         id=old_template.id,
         name=old_template.name,
@@ -95,6 +81,7 @@ def resolve_draft_plan_id(
         status=EditTemplateStatus.ACTIVE,
     )
 
+    # 将旧模板 segments 转换为 clip_configs
     clip_configs: list[TemplateClipConfig] = []
     for seg in old_template.segments or []:
         clip_configs.append(
@@ -118,6 +105,7 @@ def resolve_draft_plan_id(
     )
     plan = result["plan"]
 
+    # 标记为模板草稿（后续可复用 tpl_svc.get_template_draft 的查找逻辑）
     plan_svc.update_plan_config(plan.id, {"is_template_draft": True})
 
     logger.info(
@@ -127,23 +115,3 @@ def resolve_draft_plan_id(
         user_id,
     )
     return plan.id
-
-
-def get_draft_plan_id(
-    template_id: str,
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-) -> str:
-    """路径依赖：根据 template_id 获取或创建草稿，返回 plan_id.
-
-    Depends 版本：路径参数 template_id 由 FastAPI 保证非空，不自动兜底。
-    兜底逻辑走 resolve_draft_plan_id(auto_create_default=False)。
-    """
-    return resolve_draft_plan_id(
-        template_id=template_id,
-        services=services,
-        current_user=current_user,
-        db=db,
-        auto_create_default=False,
-    )

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

@@ -6,9 +6,9 @@
 from __future__ import annotations
 
 import re as _re
-from typing import Any, Optional
+from typing import Any, List, Optional
 
-from pydantic import BaseModel, Field, model_validator, validator
+from pydantic import BaseModel, Field, validator
 
 _EXPORT_RESOLUTION_PATTERN = _re.compile(r"^\d+x\d+$")
 _EXPORT_VALID_QUALITY_PRESETS = {"ultra_fast", "fast", "balanced", "high", "best"}
@@ -21,7 +21,7 @@ _EXPORT_VALID_FORMATS = {"mp4", "mov"}
 class AIRecommendRequest(BaseModel):
     """AI 推荐片段方案请求体"""
 
-    asset_ids: list[str] = Field(default_factory=list, description="素材 ID 列表")
+    asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表")
     editing_mode: str = Field(default="one_take", description="剪辑模式: one_take / pip / voice_over / voice_pip")
     target_duration: float = Field(default=30.0, ge=1.0, le=600.0, description="目标时长（秒）")
 
@@ -44,7 +44,7 @@ class AIRecommendResponse(BaseModel):
     """AI 推荐片段方案响应体"""
 
     plan_id: str = Field(..., description="剪辑计划 ID")
-    clips: list[AIRecommendClipItem] = Field(..., description="推荐的片段列表")
+    clips: List[AIRecommendClipItem] = Field(..., description="推荐的片段列表")
     config: dict[str, Any] = Field(..., description="推荐的 plan config（cover/title/subtitle/bgm）")
     total_duration: float = Field(..., ge=0.0, description="推荐方案总时长（秒）")
     confidence: float = Field(..., ge=0.0, le=1.0, description="AI 推荐置信度 (0~1)")
@@ -137,7 +137,7 @@ class ClipReorderItem(BaseModel):
 class ClipReorderRequest(BaseModel):
     """片段重排序请求"""
 
-    items: list[ClipReorderItem] = Field(..., min_length=1, max_length=500, description="重排序条目列表")
+    items: List[ClipReorderItem] = Field(..., min_length=1, max_length=500, description="重排序条目列表")
 
 
 class ClipReorderResponse(BaseModel):
@@ -151,7 +151,7 @@ class ClipReorderResponse(BaseModel):
 class ClipBatchDeleteRequest(BaseModel):
     """批量删除片段请求"""
 
-    clip_ids: list[str] = Field(..., min_length=1, max_length=500, description="要删除的片段ID列表")
+    clip_ids: List[str] = Field(..., min_length=1, max_length=500, description="要删除的片段ID列表")
 
 
 class ClipBatchDeleteResponse(BaseModel):
@@ -162,26 +162,13 @@ class ClipBatchDeleteResponse(BaseModel):
     message: str = ""
 
 
-# sentinel：区分「前端未传 clip_count」和「显式传 0/None」
-_UNSET = object()
-
-
 class ClipsFromAssetsRequest(BaseModel):
     """从素材批量创建片段请求"""
 
-    asset_ids: list[str] = Field(..., min_length=1, max_length=200, description="素材 ID 列表，按顺序追加到时间线末尾")
+    asset_ids: List[str] = Field(..., min_length=1, max_length=200, description="素材 ID 列表，按顺序追加到时间线末尾")
     clip_type: str = Field(default="main", description="片段类型，默认 main")
-    clip_count: Optional[int] = Field(
-        default=None,
-        ge=1,
-        le=10,
-        description="片段数量（1-10）；不传时使用旧字段 required_clips_count；两者都不传时回退为模板 segments 数量（默认 3 段）。",
-    )
     required_clips_count: Optional[int] = Field(
-        default=None,
-        ge=1,
-        le=200,
-        description="[已废弃] 旧字段，请使用 clip_count；仅作向后兼容——clip_count 未显式传入时才回退本字段（超10截断到10）。",
+        default=None, ge=1, le=200, description="要求创建的片段数量；不传则等于素材数量"
     )
 
     @validator("asset_ids", pre=True)
@@ -193,23 +180,6 @@ class ClipsFromAssetsRequest(BaseModel):
             return v
         return [x for x in v if isinstance(x, str) and x.strip()]
 
-    @model_validator(mode="before")
-    @classmethod
-    def _backfill_clip_count(cls, data: Any) -> Any:
-        """兼容旧字段 required_clips_count：仅当新字段 clip_count 未显式传入时才回退旧字段；
-        两者都没传时保持 clip_count=None，路由层按模板 segments 数量兜底。旧字段超 10 截断到 10。"""
-        if not isinstance(data, dict):
-            return data
-        has_new = "clip_count" in data and data["clip_count"] is not None
-        if not has_new:
-            legacy = data.get("required_clips_count")
-            if legacy is not None:
-                try:
-                    data["clip_count"] = max(1, min(int(legacy), 10))
-                except (TypeError, ValueError):
-                    pass
-        return data
-
 
 class ClipsFromAssetsResponse(BaseModel):
     """从素材批量创建片段响应"""
@@ -218,7 +188,7 @@ class ClipsFromAssetsResponse(BaseModel):
     created_count: int
     plan_id: str = ""
     message: str = ""
-    clip_ids: list[str] = Field(default_factory=list, description="创建的片段ID列表")
+    clip_ids: List[str] = Field(default_factory=list, description="创建的片段ID列表")
     duplicate_warning: Optional[str] = Field(default=None, description="查重率超标警告")
     exhaustion_warning: Optional[str] = Field(default=None, description="素材耗尽警告")
 
@@ -302,7 +272,7 @@ class ExportPresetItem(BaseModel):
 class ExportPresetListResponse(BaseModel):
     """导出预设列表响应"""
 
-    items: list[ExportPresetItem]
+    items: List[ExportPresetItem]
     total: int
 
 
@@ -316,7 +286,7 @@ class FilterPresetResponse(BaseModel):
     name: str
     category: str
     description: str
-    tags: list[str] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
 
 
 class FilterConfigResponse(BaseModel):
@@ -346,7 +316,7 @@ class FilterUpdateRequest(BaseModel):
 class FilterPresetListResponse(BaseModel):
     """滤镜预设列表响应"""
 
-    items: list[FilterPresetResponse]
+    items: List[FilterPresetResponse]
     total: int
 
 
@@ -360,7 +330,7 @@ class TransitionPresetResponse(BaseModel):
     name: str
     category: str
     description: str
-    tags: list[str] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
     default_duration: float
     min_duration: float
     max_duration: float
@@ -402,7 +372,7 @@ class BatchTransitionResponse(BaseModel):
 class TransitionPresetListResponse(BaseModel):
     """转场预设列表响应"""
 
-    items: list[TransitionPresetResponse]
+    items: List[TransitionPresetResponse]
     total: int
 
 
@@ -458,7 +428,7 @@ class EditorClipResponse(BaseModel):
 class EditorClipListResponse(BaseModel):
     """片段列表响应"""
 
-    items: list[EditorClipResponse]
+    items: List[EditorClipResponse]
     total: int
 
 
@@ -496,7 +466,7 @@ class EditorClipBatchItem(BaseModel):
 class EditorClipBatchUpdateRequest(BaseModel):
     """批量替换clips请求（全量覆盖）"""
 
-    clips: list[EditorClipBatchItem] = Field(default_factory=list)
+    clips: List[EditorClipBatchItem] = Field(default_factory=list)
 
 
 class EditorClipBatchUpdateResponse(BaseModel):
@@ -584,4 +554,4 @@ class EditorTimelineResponse(BaseModel):
 
     plan_id: str
     total_duration: float
-    scenes: list[EditorTimelineSceneResponse]
+    scenes: List[EditorTimelineSceneResponse]

apps/api/app/api/routes/titles.py

@@ -1,13 +1,7 @@
-"""Title library CRUD routes.
-
-.. deprecated::
-    标题库 API 已废弃（#1894），标题配置已整合到 scripts 模型。
-    所有接口保留向后兼容，但返回 Warning header 并记录日志。
-"""
+"""Title library CRUD routes."""
 
 from __future__ import annotations
 
-import logging
 from typing import Optional
 
 from app.api.routes._helpers import get_user_plan
@@ -41,21 +35,6 @@ from packages.application.title_library.use_cases import (
 from packages.ports.user_repository import UserRepository
 
 router = APIRouter()
-logger = logging.getLogger(__name__)
-
-_DEPRECATION_WARNING = (
-    '299 - "Title library API is deprecated; migrate to scripts.title_text/'
-    'title_category/title_config (issue #1894)"'
-)
-
-
-def _deprecation_headers() -> dict:
-    """返回 deprecation Warning header (ASCII-only, RFC 7234 §5.5)."""
-    return {"Warning": _DEPRECATION_WARNING, "Deprecation": "true"}
-
-
-def _log_deprecation(endpoint: str) -> None:
-    logger.warning("[Deprecated] title_library API 调用: %s — %s", endpoint, _DEPRECATION_WARNING)
 
 
 def _get_title_repository(session: Session = Depends(get_db_session)) -> SQLAlchemyTitleLibraryRepository:
@@ -80,17 +59,12 @@ def _to_response(item) -> TitleLibraryItemResponse:
 
 @router.get("", response_model=ListTitleLibraryResponse)
 def list_titles(
-    response: Response,
     category: Optional[str] = Query(None),
     skip: int = Query(0, ge=0),
     limit: int = Query(50, ge=1, le=200),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> ListTitleLibraryResponse:
-    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
-    _log_deprecation("list_titles")
-    for k, v in _deprecation_headers().items():
-        response.headers[k] = v
     user_id = authenticated_user.user.id
     use_case = ListTitleLibraryUseCase(title_repository)
     items = use_case.execute(user_id, category=category, skip=skip, limit=limit)
@@ -103,7 +77,6 @@ def list_titles(
 
 @router.post("/pick", response_model=TitleLibraryItemResponse)
 def pick_title(
-    response: Response,
     category: Optional[str] = Query(None, description="按分类筛选，不填则从全部标题中选"),
     exclude_ids: Optional[str] = Query(
         None,
@@ -112,15 +85,10 @@ def pick_title(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> TitleLibraryItemResponse:
-    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代.
-
-    智能选择一个标题。
+    """智能选择一个标题。
 
     策略：优先使用次数少的，从最少的前5个中随机选一个，兼顾公平和多样性。
     """
-    _log_deprecation("pick_title")
-    for k, v in _deprecation_headers().items():
-        response.headers[k] = v
     user_id = authenticated_user.user.id
     exclude_list: list[str] = []
     if exclude_ids:
@@ -145,14 +113,9 @@ def pick_title(
 @router.get("/{title_id}", response_model=TitleLibraryItemResponse)
 def get_title(
     title_id: str,
-    response: Response,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> TitleLibraryItemResponse:
-    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
-    _log_deprecation("get_title")
-    for k, v in _deprecation_headers().items():
-        response.headers[k] = v
     user_id = authenticated_user.user.id
     use_case = GetTitleLibraryUseCase(title_repository)
     item = use_case.execute(title_id, user_id)
@@ -163,16 +126,11 @@ def get_title(
 
 @router.post("", response_model=TitleLibraryItemResponse, status_code=status.HTTP_201_CREATED)
 def create_title(
-    response: Response,
     request: CreateTitleLibraryRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
     user_repository: UserRepository = Depends(get_user_repository),
 ) -> TitleLibraryItemResponse:
-    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
-    _log_deprecation("create_title")
-    for k, v in _deprecation_headers().items():
-        response.headers[k] = v
     user_id = authenticated_user.user.id
     plan_name = get_user_plan(user_id, user_repository)
     command = CreateTitleLibraryCommand(
@@ -197,15 +155,10 @@ def create_title(
 @router.put("/{title_id}", response_model=TitleLibraryItemResponse)
 def update_title(
     title_id: str,
-    response: Response,
     request: UpdateTitleLibraryRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> TitleLibraryItemResponse:
-    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
-    _log_deprecation("update_title")
-    for k, v in _deprecation_headers().items():
-        response.headers[k] = v
     user_id = authenticated_user.user.id
     command = UpdateTitleLibraryCommand(
         title_id=title_id,
@@ -227,14 +180,9 @@ def update_title(
 @router.delete("/{title_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
 def delete_title(
     title_id: str,
-    response: Response,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> Response:
-    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
-    _log_deprecation("delete_title")
-    for k, v in _deprecation_headers().items():
-        response.headers[k] = v
     user_id = authenticated_user.user.id
     use_case = DeleteTitleLibraryUseCase(title_repository)
     deleted = use_case.execute(title_id, user_id)

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

@@ -4,14 +4,12 @@ from __future__ import annotations
 
 import json
 import logging
-import math
 import subprocess
 import tempfile
 from pathlib import Path
 from typing import Any, Optional
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.config import settings
 from app.core.celery_app import celery_app
 from app.core.storage import get_storage_service
 from app.dependencies import (
@@ -53,8 +51,6 @@ from packages.application.tts_job.use_cases import (
 )
 from packages.application.tts_job.workflow import TTSWorkflowService
 from packages.domain import Asset, AssetLibrary, AssetLibraryKind, AssetStatus, ClassificationStatus
-from packages.domain.points_rules import calculate_points_cost
-from packages.domain.points_service import PointsService
 from packages.domain.voice_presets import list_voices
 from packages.ports.asset_library_repository import AssetLibraryRepository
 from packages.ports.asset_repository import AssetRepository
@@ -132,7 +128,6 @@ def _to_response(job, sign_url=None) -> TTSJobResponse:
 def synthesize(
     request: TTSSynthesizeRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
     repository: SQLAlchemyTTSJobRepository = Depends(_get_repository),
     cosyvoice_service: CosyVoiceService = Depends(get_cosyvoice_service),
     voice_clone_repo=Depends(get_voice_clone_profile_repository),
@@ -144,31 +139,6 @@ def synthesize(
     """
     user_id = authenticated_user.user.id
 
-    # ── 积分扣点（#1895 P2） ──
-    _points_deducted = 0
-    _points_scene = "ai_voice"
-    _points_svc = PointsService() if settings.points_enabled else None
-    if _points_svc is not None:
-        # 中文按 ~240 字/分钟粗估时长，至少按 1 分钟扣 1 分
-        est_minutes = max(1.0, math.ceil(len(request.text) / 240))
-        _points_deducted = calculate_points_cost(
-            _points_scene,
-            is_member=getattr(authenticated_user.user, "is_member", False),
-            duration_minutes=est_minutes,
-            member_type=getattr(authenticated_user.user, "member_type", None),
-        )
-        _deduct_res = _points_svc.deduct_points(user_id, _points_deducted, _points_scene, db)
-        if not _deduct_res["success"]:
-            raise HTTPException(
-                status_code=402,
-                detail={
-                    "code": "INSUFFICIENT_POINTS",
-                    "message": f"积分不足，需要 {_points_deducted} 积分，当前余额 {_deduct_res['balance']}",
-                    "required": _points_deducted,
-                    "balance": _deduct_res["balance"],
-                },
-            )
-
     # 解析 voice_id：前端可能传克隆音色 profile UUID（而非 CosyVoice voice_id），
     # 与 /tts/preview 保持一致：命中 profile → 校验归属 → 取 CosyVoice voice_id
     actual_voice_id = request.voice_id
@@ -207,7 +177,6 @@ def synthesize(
     synthesis_meta = {
         "speed": request.speed,
         "emotion": request.emotion or "",
-        "language": request.language or "zh-CN",
     }
     if request.metadata_:
         synthesis_meta.update(request.metadata_)
@@ -228,7 +197,6 @@ def synthesize(
         cosyvoice_service=cosyvoice_service,
     )
 
-    synthesis_error: Exception | None = None
     try:
         job = workflow.start_synthesis(job.id)
     except Exception as e:
@@ -236,17 +204,10 @@ def synthesize(
         # 但 DB 异常、网络异常等意外错误可能逃逸。
         # 与音色克隆接口保持一致：标记 failed，返回 201，不抛 500。
         logger.error(f"TTS 合成异常: job_id={job.id}, error={e}", exc_info=True)
-        synthesis_error = e
         try:
             job = workflow.process_synthesis_failure(job.id, str(e))
         except Exception as inner_e:
             logger.error(f"标记 TTS job 失败时出错: job_id={job.id}, error={inner_e}")
-    # 合成失败且已扣积分 → 退费
-    if synthesis_error is not None and _points_deducted > 0 and _points_svc is not None:
-        try:
-            _points_svc.refund_points(user_id, _points_deducted, _points_scene, db, ref_id=job.id)
-        except Exception as refund_err:
-            logger.warning(f"TTS 合失败退积分异常: job_id={job.id}, err={refund_err}")
 
     # 若任务处于 processing 状态（异步模式），触发 Celery 后台轮询
     if job.status.value == "processing":
@@ -261,17 +222,10 @@ def synthesize(
                 celery_app.send_task("worker.process_tts_synthesis", args=[job.id])
         except Exception as e:
             # Celery 调度失败，标记 job 为 failed
-            # e used below for refund context
             try:
                 workflow.process_synthesis_failure(job.id, f"Celery 任务调度失败: {e}")
             except Exception as inner_e:
                 logger.error(f"Celery 调度后标记失败时出错: job_id={job.id}, error={inner_e}")
-            # 调度失败退费
-            if _points_deducted > 0 and _points_svc is not None:
-                try:
-                    _points_svc.refund_points(user_id, _points_deducted, _points_scene, db, ref_id=job.id)
-                except Exception as refund_err:
-                    logger.warning(f"Celery 调度失败退积分异常: job_id={job.id}, err={refund_err}")
 
     return TTSSynthesizeResponse(
         job_id=job.id,
@@ -508,17 +462,10 @@ def save_tts_job_to_library(
         try:
             proc = subprocess.run(
                 [
-                    "ffprobe",
-                    "-v",
-                    "quiet",
-                    "-print_format",
-                    "json",
-                    "-show_format",
-                    str(tmp_path),
+                    "ffprobe", "-v", "quiet", "-print_format", "json",
+                    "-show_format", str(tmp_path),
                 ],
-                capture_output=True,
-                text=True,
-                timeout=10,
+                capture_output=True, text=True, timeout=10,
             )
             if proc.returncode == 0:
                 fmt = json.loads(proc.stdout).get("format", {})
@@ -598,7 +545,6 @@ def save_tts_job_to_library(
 def preview_tts(
     request: TTSPreviewRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
     cosyvoice_service: CosyVoiceService = Depends(get_cosyvoice_service),
     voice_clone_repo=Depends(get_voice_clone_profile_repository),
 ) -> TTSPreviewResponse:
@@ -607,31 +553,6 @@ def preview_tts(
     用于前端预览配音效果，限制文本长度 200 字以内。
     支持预设音色和克隆音色：克隆音色传的是 profile UUID，需解析为 CosyVoice voice_id。
     """
-    user_id = authenticated_user.user.id
-    # ── 积分扣点（#1895 P2） ──
-    _points_deducted = 0
-    _points_scene = "ai_voice"
-    _points_svc = PointsService() if settings.points_enabled else None
-    if _points_svc is not None:
-        est_minutes = max(1.0, math.ceil(len(request.text) / 240))
-        _points_deducted = calculate_points_cost(
-            _points_scene,
-            is_member=getattr(authenticated_user.user, "is_member", False),
-            duration_minutes=est_minutes,
-            member_type=getattr(authenticated_user.user, "member_type", None),
-        )
-        _deduct_res = _points_svc.deduct_points(user_id, _points_deducted, _points_scene, db)
-        if not _deduct_res["success"]:
-            raise HTTPException(
-                status_code=402,
-                detail={
-                    "code": "INSUFFICIENT_POINTS",
-                    "message": f"积分不足，需要 {_points_deducted} 积分，当前余额 {_deduct_res['balance']}",
-                    "required": _points_deducted,
-                    "balance": _deduct_res["balance"],
-                },
-            )
-
     # 解析 voice_id：前端可能传 VoiceCloneProfile UUID 或预设音色 ID
     actual_voice_id = request.voice_id
     profile = voice_clone_repo.get(request.voice_id)
@@ -655,18 +576,17 @@ def preview_tts(
             voice_id=actual_voice_id,
             speed=request.speed,
             emotion=request.emotion,
-            language=getattr(request, "language", "zh-CN"),
         )
-    except (CosyVoiceError, ValueError) as e:
-        # 合成失败退费
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"TTS 预览失败退积分异常: {refund_err}")
-        if isinstance(e, CosyVoiceError):
-            raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=f"TTS 合成失败: {e}") from e
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e)) from e
+    except CosyVoiceError as e:
+        raise HTTPException(
+            status_code=status.HTTP_502_BAD_GATEWAY,
+            detail=f"TTS 合成失败: {e}",
+        ) from e
+    except ValueError as e:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=str(e),
+        ) from e
 
     return TTSPreviewResponse(
         audio_url=result.audio_url,

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

@@ -3,17 +3,14 @@
 from __future__ import annotations
 
 import logging
-import math
 from typing import Optional
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.config import settings
 from app.core.celery_app import celery_app
 from app.core.storage import get_storage_service
 from app.dependencies import (
     get_asset_repository,
     get_cosyvoice_service,
-    get_db_session,
     get_project_repository,
     get_voice_clone_profile_repository,
 )
@@ -25,7 +22,6 @@ from app.schemas.voice_clone import (
     VoiceCloneStatusResponse,
 )
 from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
-from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl.voice_clone_profile_repository import (
     SQLAlchemyVoiceCloneProfileRepository,
@@ -42,11 +38,6 @@ from packages.application.voice_clone.use_cases import (
 from packages.application.voice_clone.workflow import (
     VoiceCloneWorkflowService,
 )
-from packages.domain.points_rules import calculate_points_cost
-from packages.domain.points_service import PointsService
-
-# remove duplicate
-_DUMMY_DELETED = ()
 from packages.ports.asset_repository import AssetRepository
 from packages.ports.project_repository import ProjectRepository
 from packages.shared.storage import SharedStorageService
@@ -296,101 +287,22 @@ def retry_voice_clone(
     return _to_response(profile)
 
 
-_ALLOWED_PREVIEW_EMOTIONS = {
-    "",
-    # 7 种标准英文枚举（CosyVoice v3 官方值）
-    "neutral",
-    "happy",
-    "sad",
-    "angry",
-    "surprised",
-    "fearful",
-    "disgusted",
-    # 前端中文 7 标签
-    "中立",
-    "开心",
-    "难过",
-    "生气",
-    "惊讶",
-    "恐惧",
-    "厌恶",
-    # 旧英文 4 枚举 + 常见中文别名兼容
-    "natural",
-    "excited",
-    "calm",
-    "friendly",
-    "自然",
-    "愉快",
-    "高兴",
-    "快乐",
-    "兴奋",
-    "悲伤",
-    "愤怒",
-    "惊奇",
-    "吃惊",
-    "害怕",
-    "讨厌",
-    # 灵应 P1 指定别名
-    "中性",
-    "伤心",
-    "沉稳",
-    "亲切",
-}
-
-
 @router.get("/{clone_id}/preview", response_model=VoiceClonePreviewResponse)
 def get_voice_clone_preview(
     clone_id: str,
     text: str = Query("", description="自定义试听文本，为空则使用默认示例"),
-    speed: float = Query(1.0, ge=0.5, le=2.0, description="语速，0.5-2.0，默认 1.0"),
-    emotion: str = Query(
-        "",
-        description="情绪：neutral/happy/sad/angry/surprised/fearful/disgusted，兼容旧值 natural/excited/calm/friendly，空为默认自然",
-    ),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
     repository: SQLAlchemyVoiceCloneProfileRepository = Depends(get_voice_clone_profile_repository),
     cosyvoice: CosyVoiceService = Depends(get_cosyvoice_service),
 ) -> VoiceClonePreviewResponse:
     """获取克隆音色试听音频（实时 TTS 合成）。
 
     - 克隆音色必须处于 ready 状态
-    - 使用默认试听文本时，结果缓存 7 天（仅默认 text+speed=1.0+emotion=空 组合缓存）
-    - 可传入自定义 text/speed/emotion 试听不同效果
+    - 使用默认试听文本时，结果缓存 7 天
+    - 可传入自定义 text 参数试听不同文本
     """
     import time
 
-    user_id = authenticated_user.user.id
-    _points_deducted = 0
-    _points_scene = "voice_clone_synth"
-    _points_svc = PointsService() if settings.points_enabled else None
-    _preview_text_for_points = text.strip() or CLONE_PREVIEW_TEMPLATE
-    if _points_svc is not None:
-        est_minutes = max(1.0, math.ceil(len(_preview_text_for_points) / 240))
-        _points_deducted = calculate_points_cost(
-            _points_scene,
-            is_member=getattr(authenticated_user.user, "is_member", False),
-            duration_minutes=est_minutes,
-            member_type=getattr(authenticated_user.user, "member_type", None),
-        )
-        _deduct_res = _points_svc.deduct_points(user_id, _points_deducted, _points_scene, db)
-        if not _deduct_res["success"]:
-            raise HTTPException(
-                status_code=402,
-                detail={
-                    "code": "INSUFFICIENT_POINTS",
-                    "message": f"积分不足，需要 {_points_deducted} 积分，当前余额 {_deduct_res['balance']}",
-                    "required": _points_deducted,
-                    "balance": _deduct_res["balance"],
-                },
-            )
-
-    if emotion not in _ALLOWED_PREVIEW_EMOTIONS:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"不支持的 emotion 值: {emotion}，可选: neutral/happy/sad/angry/surprised/fearful/disgusted 或中文 中立/中性/开心/难过/伤心/生气/愤怒/惊讶/吃惊/恐惧/害怕/厌恶/讨厌 或留空",
-        )
-
     use_case = GetVoiceCloneUseCase(repository)
     try:
         profile = use_case.execute(clone_id, authenticated_user.user.id)
@@ -403,8 +315,8 @@ def get_voice_clone_preview(
             detail=f"Voice clone is not ready (current status: {profile.status})",
         )
 
-    # 仅默认试听文本 + 默认 speed + 默认 emotion 时使用缓存
-    use_cache = (not text.strip()) and abs(speed - 1.0) < 1e-6 and (not emotion)
+    # 有自定义文本时不缓存
+    use_cache = not text.strip()
 
     if use_cache and clone_id in _clone_preview_cache:
         audio_url, duration, file_size, cached_text, cached_at = _clone_preview_cache[clone_id]
@@ -425,20 +337,12 @@ def get_voice_clone_preview(
             text=preview_text,
             voice_id=profile.voice_id,
             format="mp3",
-            speed=speed,
-            emotion=emotion,
+            speed=1.0,
         )
-    except (CosyVoiceError, ValueError) as e:
-        if _points_deducted > 0 and _points_svc is not None:
-            try:
-                _points_svc.refund_points(user_id, _points_deducted, _points_scene, db)
-            except Exception as refund_err:
-                logger.warning(f"克隆音色试听失败退积分异常: clone_id={clone_id}, err={refund_err}")
-        if isinstance(e, CosyVoiceError):
-            raise HTTPException(status_code=502, detail=f"TTS 合成失败: {e}") from e
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e)) from e
+    except CosyVoiceError as e:
+        raise HTTPException(status_code=502, detail=f"TTS 合成失败: {e}") from e
 
-    # 缓存（仅默认参数组合）
+    # 缓存（仅默认试听文本）
     if use_cache:
         _clone_preview_cache[clone_id] = (
             result.audio_url,

apps/api/app/dependencies.py

@@ -6,7 +6,7 @@ ensuring proper lifecycle management and testability.
 
 from __future__ import annotations
 
-from collections.abc import Generator
+from typing import Generator
 
 import redis
 from app.config import settings

apps/api/app/middleware/monitoring.py

@@ -4,7 +4,7 @@
 
 import logging
 import time
-from collections.abc import Callable
+from typing import Callable
 
 from fastapi import Request
 from starlette.middleware.base import BaseHTTPMiddleware

apps/api/app/middleware/prometheus_metrics.py

@@ -10,7 +10,7 @@ Exposes:
 
 import re
 import time
-from collections.abc import Callable
+from typing import Callable
 
 from fastapi import Request, Response
 from prometheus_client import (

apps/api/app/schemas/lipsync.py

@@ -67,10 +67,7 @@ class CreateLipsyncJobRequest(BaseModel):
     voice_id: str = Field("", description="音色 ID（预置音色或克隆音色 profile UUID）")
     script_text: str = Field("", description="要合成的文案（直生模式必填，最长 5000 字符）")
     speed: float = Field(1.0, ge=0.5, le=2.0, description="语速（0.5-2.0），默认 1.0")
-    emotion: str = Field(
-        "",
-        description="情绪（英文枚举 neutral/happy/sad/angry/surprised/fearful/disgusted，或中文 中立/开心/难过/生气/惊讶/恐惧/厌恶；空为默认自然）",
-    )
+    emotion: str = Field("", description="情绪（natural/excited/calm/friendly 或中文 自然/兴奋/沉稳/亲切）")
 
     enable_video_loop: bool = Field(
         True, description="音频长于视频时是否循环画面（AI数字人默认开启，防止音频长于视频被截断）"
@@ -123,11 +120,7 @@ class AiAvatarTtsPreviewRequest(BaseModel):
     voice_id: str = Field(..., min_length=1, max_length=128, description="音色 ID")
     script_text: str = Field(..., min_length=1, max_length=5000, description="要合成的文案")
     speed: float = Field(1.0, ge=0.5, le=2.0, description="语速（0.5-2.0），默认 1.0")
-    emotion: str = Field(
-        "neutral",
-        max_length=32,
-        description="情绪（英文枚举 neutral/happy/sad/angry/surprised/fearful/disgusted，或中文 中立/开心/难过/生气/惊讶/恐惧/厌恶；默认 neutral）",
-    )
+    emotion: str = Field("natural", max_length=32, description="情绪")
 
 
 class AiAvatarTtsPreviewResponse(BaseModel):

apps/api/app/schemas/points.py

@@ -1,209 +0,0 @@
-"""积分 & 会员相关 Pydantic Schema (#1895)"""
-
-from __future__ import annotations
-
-from datetime import datetime
-from typing import Any, Optional
-
-from pydantic import BaseModel, Field
-
-# ============ 余额 & 账户 ============
-
-
-class PointsBalanceResponse(BaseModel):
-    """积分余额 + 会员状态"""
-
-    balance: int = Field(..., description="当前积分余额")
-    total_earned: int = Field(..., description="累计获得积分")
-    total_spent: int = Field(..., description="累计消耗积分")
-    is_member: bool = Field(default=False, description="是否付费会员")
-    member_type: Optional[str] = Field(None, description="会员类型: monthly/quarterly/yearly")
-    member_expires_at: Optional[datetime] = Field(None, description="会员到期时间")
-
-
-# ============ 流水 ============
-
-
-class PointsTransactionItem(BaseModel):
-    """单条积分流水"""
-
-    id: str
-    type: str = Field(..., description="类型: add/deduct")
-    source: str = Field(..., description="来源场景")
-    amount: int
-    balance_after: int
-    description: str = ""
-    ref_id: str = ""
-    created_at: Optional[str] = None
-
-
-class PointsTransactionsResponse(BaseModel):
-    """积分流水分页响应"""
-
-    items: list[PointsTransactionItem]
-    total: int
-    page: int
-    page_size: int
-
-
-# ============ 规则 & 积分包 ============
-
-
-class PointRuleItem(BaseModel):
-    """单条积分规则"""
-
-    scene_key: str
-    name: str
-    base_points: int
-    unit: str
-    extra_per_30s: Optional[int] = None
-    description: str = Field(default="", description="规则中文说明，例如 AI 配音每分钟消耗 X 积分")
-
-
-class PointsRulesResponse(BaseModel):
-    """所有积分消耗规则"""
-
-    rules: list[PointRuleItem]
-    free_user_multiplier: float = Field(..., description="免费用户积分上浮系数")
-
-
-class PointsPackageItem(BaseModel):
-    """积分包信息"""
-
-    code: str
-    name: str
-    points: int
-    price_cents: int
-    unit_price: str = Field("", description="单价描述，如 ¥0.099/积分")
-
-
-class PointsPackagesResponse(BaseModel):
-    """可购买的积分包列表"""
-
-    packages: list[PointsPackageItem]
-    user_discount: Optional[float] = Field(None, description="当前用户折扣（会员）")
-
-
-# ============ 消费前检查 ============
-
-
-class PointsCheckRequest(BaseModel):
-    """消费前余额检查请求"""
-
-    scene_key: str
-    duration_minutes: Optional[float] = None
-    quantity: Optional[int] = 1
-
-
-class PointsCheckResponse(BaseModel):
-    """消费前余额检查响应"""
-
-    allowed: bool
-    required_points: int
-    current_balance: int
-    remaining_after: int
-    is_free_quota: bool = False
-
-
-# ============ 手动扣减 / 退还（内部接口） ============
-
-
-class PointsDeductRequest(BaseModel):
-    """积分扣减请求"""
-
-    scene_key: str
-    amount: int
-    description: Optional[str] = ""
-    ref_id: Optional[str] = ""
-
-
-class PointsRefundRequest(BaseModel):
-    """积分退还请求"""
-
-    transaction_id: str
-    reason: Optional[str] = ""
-
-
-class PointsRechargeRequest(BaseModel):
-    """积分充值请求"""
-
-    package_id: str = Field(..., description="积分包 code，如 starter_pack")
-
-
-# ============ 订单 ============
-
-
-class PointsOrderResponse(BaseModel):
-    """订单信息"""
-
-    id: str
-    order_type: str
-    product_code: str
-    amount_cents: int
-    points_amount: int = Field(0, description="本次充值/购买可获得的积分（仅 points 类型订单有意义）")
-    status: str
-    pay_params: dict[str, Any] = Field(
-        default_factory=dict, description="拉起支付所需参数（payment_url/prepay_id 等），支付通道接入后填充"
-    )
-    expire_at: Optional[str] = Field(None, description="订单过期时间（ISO 8601），默认创建后 48 小时")
-    created_at: Optional[str] = None
-
-
-# ============ 每日额度 ============
-
-
-class DailyUsageResponse(BaseModel):
-    """今日免费额度使用情况"""
-
-    free_clips_used: int
-    free_clips_limit: int
-    free_clips_remaining: int
-    reset_at: str
-
-
-# ============ 会员状态（聚合） ============
-
-
-class MembershipStatusResponse(BaseModel):
-    """当前用户会员状态（聚合信息）"""
-
-    is_member: bool
-    member_type: Optional[str] = None
-    member_expires_at: Optional[datetime] = None
-    points_balance: int
-    max_resolution: str = Field(
-        default="1080p",
-        description="可用最高分辨率: 720p(free) / 1080p(paid)",
-    )
-
-
-# ============ 订阅档位 ============
-
-
-class MembershipPlanItem(BaseModel):
-    """单个会员档位"""
-
-    plan_id: str = Field(..., description="档位标识: monthly/quarterly/yearly")
-    name: str = Field(..., description="档位名称，例如 月卡")
-    monthly_price_cents: int = Field(..., description="折算月价（分）")
-    price_cents: int = Field(..., description="该档位总价（分）")
-    duration_days: int = Field(..., description="时长（天）")
-    points_discount: float = Field(..., description="该档位积分折扣，如 0.9 表示 9 折")
-    features: dict[str, Any] = Field(default_factory=dict, description="档位权益（max_resolution 等）")
-
-
-class MembershipPlansResponse(BaseModel):
-    """所有会员档位列表"""
-
-    plans: list[MembershipPlanItem]
-
-
-# ============ 通用响应 ============
-
-
-class SimpleMessageResponse(BaseModel):
-    """简单消息响应"""
-
-    success: bool
-    message: str
-    data: Optional[dict[str, Any]] = None

apps/api/app/schemas/script.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -20,11 +20,8 @@ class ScriptResponse(BaseModel):
     user_id: str
     title: str
     content: str
-    segments: list[ScriptSegment] = Field(default_factory=list)
-    tags: list[str] = Field(default_factory=list)
-    title_text: str = ""
-    title_category: str = ""
-    title_config: Dict[str, Any] = Field(default_factory=dict)
+    segments: List[ScriptSegment] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
     created_at: datetime
     updated_at: datetime
 
@@ -37,18 +34,12 @@ class ScriptListResponse(BaseModel):
 class CreateScriptRequest(BaseModel):
     title: str = Field(..., min_length=1, max_length=255)
     content: str = ""
-    segments: list[ScriptSegment] = Field(default_factory=list)
-    tags: list[str] = Field(default_factory=list)
-    title_text: str = ""
-    title_category: str = ""
-    title_config: Optional[Dict[str, Any]] = None
+    segments: List[ScriptSegment] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
 
 
 class UpdateScriptRequest(BaseModel):
     title: Optional[str] = Field(None, min_length=1, max_length=255)
     content: Optional[str] = None
-    segments: Optional[list[ScriptSegment]] = None
-    tags: Optional[list[str]] = None
-    title_text: Optional[str] = None
-    title_category: Optional[str] = None
-    title_config: Optional[Dict[str, Any]] = None
+    segments: Optional[List[ScriptSegment]] = None
+    tags: Optional[List[str]] = None

apps/api/app/schemas/scripts_ai.py

@@ -1,60 +0,0 @@
-"""Scripts AI 能力 Pydantic schemas — Issue #1893.
-
-抖音文案提取、AI 改写、AI 标题生成的请求/响应模型。
-"""
-
-from __future__ import annotations
-
-from typing import List, Optional
-
-from pydantic import BaseModel, Field
-
-# ── 抖音文案提取 ─────────────────────────────────────────────────────────────
-
-
-class ExtractFromDouyinRequest(BaseModel):
-    """从抖音视频提取文案请求."""
-
-    url: str = Field(..., description="抖音视频链接（短链或长链）")
-
-
-class ExtractFromDouyinResponse(BaseModel):
-    """从抖音视频提取文案响应."""
-
-    text: str = Field(..., description="ASR 识别出的文案文本")
-    duration_seconds: float = Field(..., description="视频时长（秒）")
-    source_url: str = Field(..., description="原始视频链接")
-
-
-# ── AI 改写 ─────────────────────────────────────────────────────────────────
-
-
-class AiRewriteRequest(BaseModel):
-    """AI 文案改写请求."""
-
-    content: str = Field(..., description="原文内容")
-    style: Optional[str] = Field("口语化", description="改写风格，如 口语化/正式/活泼")
-
-
-class AiRewriteResponse(BaseModel):
-    """AI 文案改写响应."""
-
-    original: str = Field(..., description="原文")
-    rewritten: str = Field(..., description="改写后的文案")
-    style: str = Field(..., description="使用的改写风格")
-
-
-# ── AI 标题生成 ──────────────────────────────────────────────────────────────
-
-
-class AiGenerateTitlesRequest(BaseModel):
-    """AI 标题生成请求."""
-
-    content: str = Field(..., description="文案内容")
-    count: int = Field(3, ge=1, le=5, description="生成标题数量（1-5，默认3）")
-
-
-class AiGenerateTitlesResponse(BaseModel):
-    """AI 标题生成响应."""
-
-    titles: List[str] = Field(..., description="生成的标题列表")

apps/api/app/schemas/template.py

@@ -1,14 +1,9 @@
-"""Template API schemas（精简版：仅保留列表接口 + 默认模板自动兜底所需字段）.
-
-前端 PR#1911 删除 my-templates / editing-planner / templates 管理页后，
-模板 CRUD / 分类 / 标签 / 收藏 / 复制 / 校验 / 使用统计等端点全部下线，
-对应 Request/Response 模型也一并清理。
-"""
+"""Template API schemas."""
 
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any, Optional
+from typing import Any, Dict, List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -42,12 +37,12 @@ class TemplateResponse(BaseModel):
     name: str
     mode: str
     category: str = ""
-    tags: list[str] = Field(default_factory=list)
-    title_config: dict[str, Any] = Field(default_factory=dict)
-    subtitle_config: dict[str, Any] = Field(default_factory=dict)
-    bgm_config: dict[str, Any] = Field(default_factory=dict)
+    tags: List[str] = Field(default_factory=list)
+    title_config: Dict[str, Any] = Field(default_factory=dict)
+    subtitle_config: Dict[str, Any] = Field(default_factory=dict)
+    bgm_config: Dict[str, Any] = Field(default_factory=dict)
     estimated_duration: float = 0.0
-    segments: list[SegmentResponse] = Field(default_factory=list)
+    segments: List[SegmentResponse] = Field(default_factory=list)
     is_active: bool = True
     is_favorite: bool = False
     usage_count: int = 0
@@ -55,29 +50,96 @@ class TemplateResponse(BaseModel):
     updated_at: datetime
 
 
+class ToggleFavoriteResponse(BaseModel):
+    id: str
+    is_favorite: bool
+
+
 class ListTemplatesResponse(BaseModel):
-    items: list[TemplateResponse]
+    items: List[TemplateResponse]
     total: int = 0
 
 
-# ── Template Request（保留给内部 _get_or_create_default_template_id 兜底创建默认模板使用）──
+# ── Template Request ──
 
 
 class CreateTemplateRequest(BaseModel):
     name: str
     mode: str
     category: str = ""
-    tags: list[str] = Field(default_factory=list)
-    title_config: dict[str, Any] = Field(default_factory=dict)
-    subtitle_config: dict[str, Any] = Field(default_factory=dict)
-    bgm_config: dict[str, Any] = Field(default_factory=dict)
+    tags: List[str] = Field(default_factory=list)
+    title_config: Dict[str, Any] = Field(default_factory=dict)
+    subtitle_config: Dict[str, Any] = Field(default_factory=dict)
+    bgm_config: Dict[str, Any] = Field(default_factory=dict)
     estimated_duration: float = 0.0
-    segments: list[SegmentRequest] = Field(default_factory=list)
+    segments: List[SegmentRequest] = Field(default_factory=list)
+
+
+class UpdateTemplateRequest(BaseModel):
+    name: Optional[str] = None
+    mode: Optional[str] = None
+    category: Optional[str] = None
+    tags: Optional[List[str]] = None
+    title_config: Optional[Dict[str, Any]] = None
+    subtitle_config: Optional[Dict[str, Any]] = None
+    bgm_config: Optional[Dict[str, Any]] = None
+    estimated_duration: Optional[float] = None
+    segments: Optional[List[SegmentRequest]] = None
+
+
+# ── Validate ──
+
+
+class ValidateTemplateRequest(BaseModel):
+    voiceover_duration: Optional[float] = None  # 配音实际时长（秒）
 
 
 class GenerateWarningResponse(BaseModel):
-    """兼容老 import（如校验逻辑内部复用）；模板管理页已下线，可按需进一步清理。"""
-
     code: str
     message: str
-    details: dict[str, Any] = Field(default_factory=dict)
+    details: Dict[str, Any] = Field(default_factory=dict)
+
+
+class ValidateTemplateResponse(BaseModel):
+    template: TemplateResponse
+    warnings: List[GenerateWarningResponse] = Field(default_factory=list)
+
+
+# ── Category ──
+
+
+class CategoryResponse(BaseModel):
+    id: str
+    user_id: str
+    name: str
+    created_at: datetime
+
+
+class CreateCategoryRequest(BaseModel):
+    name: str
+
+
+class ListCategoriesResponse(BaseModel):
+    items: List[CategoryResponse]
+
+
+# ── Copy Template ──
+
+
+class CopyTemplateRequest(BaseModel):
+    new_name: str
+
+
+# ── Tags ──
+
+
+class ListTagsResponse(BaseModel):
+    items: List[str]
+
+
+# ── Usage Stats ──
+
+
+class TemplateUsageResponse(BaseModel):
+    template_id: str
+    usage_count: int

apps/api/app/schemas/title_library.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Optional
+from typing import List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -15,7 +15,7 @@ class TitleLibraryItemResponse(BaseModel):
     text: str
     category: str = "default"
     description: str = ""
-    tags: list[str] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
     usage_count: int = 0
     is_active: bool = True
     created_at: datetime
@@ -32,7 +32,7 @@ class CreateTitleLibraryRequest(BaseModel):
     text: str = Field(..., min_length=1, max_length=500)
     category: str = "default"
     description: str = ""
-    tags: list[str] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
 
 
 class UpdateTitleLibraryRequest(BaseModel):
@@ -40,4 +40,4 @@ class UpdateTitleLibraryRequest(BaseModel):
     text: Optional[str] = Field(None, min_length=1, max_length=500)
     category: Optional[str] = None
     description: Optional[str] = None
-    tags: Optional[list[str]] = None
+    tags: Optional[List[str]] = None

apps/api/app/schemas/tts.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any, Optional
+from typing import Any, Dict, List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -16,14 +16,11 @@ class TTSSynthesizeRequest(BaseModel):
     output_name: str = Field("", description="输出文件名")
     language: str = Field("zh-CN", description="语言")
     speed: float = Field(1.0, ge=0.5, le=2.0, description="语速")
-    emotion: str = Field(
-        "",
-        description="情绪（中文/英文：自然/兴奋/沉稳/亲切/开心/悲伤/愤怒/惊讶/恐惧/厌恶 等；通过 instruction 自然语言指令控制）",
-    )
+    emotion: str = Field("", description="情绪（natural/excited/calm/friendly，或中文 自然/兴奋/沉稳/亲切）")
     voice_model: str = Field("", description="语音模型名称")
     voice_clone_profile_id: str = Field("", description="关联的音色克隆档案 ID")
     format: str = Field("mp3", description="输出格式（mp3/wav/pcm）")
-    metadata_: Optional[dict[str, Any]] = Field(default=None, alias="metadata", description="额外元数据")
+    metadata_: Optional[Dict[str, Any]] = Field(default=None, alias="metadata", description="额外元数据")
 
     class Config:
         populate_by_name = True
@@ -49,7 +46,7 @@ class TTSJobResponse(BaseModel):
     error_message: str = ""
     retry_count: int = 0
     max_retries: int = 3
-    metadata_: Optional[dict[str, Any]] = Field(default=None, alias="metadata", description="额外元数据")
+    metadata_: Optional[Dict[str, Any]] = Field(default=None, alias="metadata", description="额外元数据")
     started_at: Optional[datetime] = None
     completed_at: Optional[datetime] = None
     created_at: datetime
@@ -83,7 +80,7 @@ class TTSSynthesizeResponse(BaseModel):
 class ListTTSJobResponse(BaseModel):
     """TTS 任务列表响应。"""
 
-    items: list[TTSJobResponse]
+    items: List[TTSJobResponse]
     total: int
     page: int
     page_size: int
@@ -113,8 +110,7 @@ class TTSPreviewRequest(BaseModel):
     text: str = Field(..., min_length=1, max_length=200, description="合成文本，限制 200 字")
     voice_id: str = Field(..., min_length=1, description="音色 ID")
     speed: float = Field(1.0, ge=0.5, le=2.0, description="语速")
-    emotion: str = Field("", description="情绪（中文/英文：自然/兴奋/沉稳/亲切/开心/悲伤/愤怒/惊讶/恐惧/厌恶 等）")
-    language: str = Field("zh-CN", description="语言（zh-CN/en-US 等）")
+    emotion: str = Field("", description="情绪（natural/excited/calm/friendly，或中文）")
     pitch: float = Field(1.0, ge=0.5, le=2.0, description="音调（预留，当前未使用）")
 
 

apps/api/app/schemas/video_share.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Optional
+from typing import List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -61,7 +61,7 @@ class ShareResponse(BaseModel):
 class ShareListResponse(BaseModel):
     """分享列表响应."""
 
-    items: list[ShareResponse]
+    items: List[ShareResponse]
     total: int = 0
     skip: int = 0
     limit: int = 20

apps/api/app/schemas/voice.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Literal, Optional
+from typing import List, Literal, Optional
 
 from pydantic import BaseModel, Field
 
@@ -56,7 +56,7 @@ class UnifiedVoiceItemResponse(BaseModel):
     status: str = "completed"
     """状态"""
 
-    tags: list[str] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
     """标签列表"""
 
     # 克隆音色特有字段
@@ -113,7 +113,7 @@ class PresetVoiceItemResponse(BaseModel):
     preview_url: str = ""
     """预览音频 URL"""
 
-    tags: list[str] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
     """标签列表"""
 
 

apps/api/app/schemas/voice_clone.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any, Optional
+from typing import Any, Dict, List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -19,7 +19,7 @@ class CreateVoiceCloneRequest(BaseModel):
     language: str = Field("zh-CN", description="语言")
     gender: str = Field("unknown", description="性别")
     max_retries: int = Field(3, ge=1, le=10, description="最大重试次数")
-    metadata_: Optional[dict[str, Any]] = Field(default=None, alias="metadata", description="额外元数据")
+    metadata_: Optional[Dict[str, Any]] = Field(default=None, alias="metadata", description="额外元数据")
 
     class Config:
         populate_by_name = True
@@ -41,7 +41,7 @@ class VoiceCloneProfileResponse(BaseModel):
     error_message: str = ""
     retry_count: int = 0
     max_retries: int = 3
-    metadata_: Optional[dict[str, Any]] = Field(default=None, alias="metadata", description="额外元数据")
+    metadata_: Optional[Dict[str, Any]] = Field(default=None, alias="metadata", description="额外元数据")
     created_at: datetime
     updated_at: datetime
 
@@ -62,7 +62,7 @@ class VoiceCloneStatusResponse(BaseModel):
 class ListVoiceCloneResponse(BaseModel):
     """音色克隆列表响应。"""
 
-    items: list[VoiceCloneProfileResponse]
+    items: List[VoiceCloneProfileResponse]
     total: int
 
 

apps/api/app/schemas/voice_library.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Optional
+from typing import List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -21,7 +21,7 @@ class VoiceLibraryItemResponse(BaseModel):
     file_size: int = 0
     status: str = "completed"
     project_id: Optional[str] = None
-    tags: list[str] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
     created_at: datetime
     updated_at: datetime
 
@@ -42,7 +42,7 @@ class CreateVoiceLibraryRequest(BaseModel):
     file_size: int = 0
     status: str = "completed"
     project_id: Optional[str] = None
-    tags: list[str] = Field(default_factory=list)
+    tags: List[str] = Field(default_factory=list)
 
 
 class UpdateVoiceLibraryRequest(BaseModel):
@@ -55,4 +55,4 @@ class UpdateVoiceLibraryRequest(BaseModel):
     duration: Optional[float] = None
     file_size: Optional[int] = None
     status: Optional[str] = None
-    tags: Optional[list[str]] = None
+    tags: Optional[List[str]] = None

apps/api/app/services/ai_avatar_render_service.py

@@ -16,7 +16,7 @@ import os
 import subprocess
 import tempfile
 import uuid
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any, Optional
 
 from sqlalchemy.orm import Session
@@ -117,7 +117,7 @@ class AiAvatarRenderService:
         self.db.add(job)
         self.db.flush()
 
-        job.submitted_at = datetime.now(UTC)
+        job.submitted_at = datetime.now(timezone.utc)
         self.db.commit()
         self.db.refresh(job)
         return job
@@ -164,7 +164,7 @@ class AiAvatarRenderService:
             return None
         if job.status in ("pending", "submitted"):
             job.status = "cancelled"
-            job.updated_at = datetime.now(UTC)
+            job.updated_at = datetime.now(timezone.utc)
             self.db.commit()
             self.db.refresh(job)
         return job
@@ -186,7 +186,7 @@ class AiAvatarRenderService:
         job.output_duration = 0.0
         job.started_at = None
         job.completed_at = None
-        job.updated_at = datetime.now(UTC)
+        job.updated_at = datetime.now(timezone.utc)
         self.db.commit()
         self.db.refresh(job)
         return job
@@ -215,9 +215,9 @@ class AiAvatarRenderService:
         try:
             # 更新状态为 processing
             job.status = "processing"
-            job.started_at = datetime.now(UTC)
+            job.started_at = datetime.now(timezone.utc)
             job.progress = 5
-            job.updated_at = datetime.now(UTC)
+            job.updated_at = datetime.now(timezone.utc)
             self.db.commit()
 
             # 获取对口型任务信息
@@ -394,8 +394,8 @@ class AiAvatarRenderService:
             # 6. 完成
             job.status = "completed"
             job.progress = 100
-            job.completed_at = datetime.now(UTC)
-            job.updated_at = datetime.now(UTC)
+            job.completed_at = datetime.now(timezone.utc)
+            job.updated_at = datetime.now(timezone.utc)
             self.db.commit()
             logger.info("渲染任务完成: %s", job_id)
 
@@ -406,14 +406,14 @@ class AiAvatarRenderService:
         except AiAvatarRenderError as exc:
             job.status = "failed"
             job.error_message = str(exc)
-            job.updated_at = datetime.now(UTC)
+            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(UTC)
+            job.updated_at = datetime.now(timezone.utc)
             self.db.commit()
             logger.exception("渲染任务异常 [%s]", job_id)
             raise
@@ -494,7 +494,7 @@ class AiAvatarRenderService:
             # 同步更新 cover_config，保持 smart-cover 路径一致
             if isinstance(job.cover_config, dict):
                 job.cover_config = {**job.cover_config, "mode": "auto_frame", "url": cover_url.strip()}
-            job.updated_at = datetime.now(UTC)
+            job.updated_at = datetime.now(timezone.utc)
             self.db.commit()
 
         return self._persist_to_library(job, cover_url=cover_url)

apps/api/app/services/ai_service.py

@@ -13,7 +13,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Optional
+from typing import Any, Dict, List, Optional
 
 from packages.domain.ai_parsing import generate_titles_fallback as _generate_titles_fallback_base
 from packages.domain.ai_parsing import keyword_match_fallback as _semantic_match_fallback_base
@@ -64,7 +64,7 @@ def _generate_titles_fallback(
     description: str,
     style: str = "viral",
     count: int = 5,
-) -> list[str]:
+) -> List[str]:
     """本地降级：基于模板规则生成标题（薄包装，转发到 ai_parsing 模块）."""
     style_info = TITLE_STYLES.get(style, TITLE_STYLES["viral"])
     return _generate_titles_fallback_base(description, style_info, count)
@@ -74,7 +74,7 @@ def generate_smart_titles(
     description: str,
     style: str = "viral",
     count: int = 5,
-) -> dict[str, Any]:
+) -> Dict[str, Any]:
     """生成智能标题.
 
     Args:
@@ -164,16 +164,16 @@ def generate_smart_titles(
 
 def _semantic_match_fallback(
     description: str,
-    assets: list[dict[str, Any]],
-) -> list[dict[str, Any]]:
+    assets: List[Dict[str, Any]],
+) -> List[Dict[str, Any]]:
     """本地降级：基于关键词的简单匹配（薄包装，转发到 ai_parsing 模块）."""
     return _semantic_match_fallback_base(description, assets)
 
 
 def _parse_semantic_match_response(
     content: str,
-    asset_ids: list[str],
-) -> Optional[dict[str, float]]:
+    asset_ids: List[str],
+) -> Optional[Dict[str, float]]:
     """从模型返回中解析素材匹配度（薄包装，转发到 ai_parsing 模块）."""
     result = _parse_semantic_match_base(content, asset_ids)
     if result is None:
@@ -183,9 +183,9 @@ def _parse_semantic_match_response(
 
 def semantic_match_assets(
     description: str,
-    assets: list[dict[str, Any]],
+    assets: List[Dict[str, Any]],
     top_k: int = 0,
-) -> dict[str, Any]:
+) -> Dict[str, Any]:
     """智能素材语义匹配.
 
     根据用户描述，评估每个素材的语义匹配度并排序。
@@ -336,13 +336,13 @@ class AIService:
         description: str,
         style: str = "viral",
         count: int = 5,
-    ) -> dict[str, Any]:
+    ) -> Dict[str, Any]:
         return generate_smart_titles(description, style, count)
 
     def semantic_match(
         self,
         description: str,
-        assets: list[dict[str, Any]],
+        assets: List[Dict[str, Any]],
         top_k: int = 0,
-    ) -> dict[str, Any]:
+    ) -> Dict[str, Any]:
         return semantic_match_assets(description, assets, top_k)

apps/api/app/services/asset_segment_tracker.py

@@ -28,8 +28,8 @@ from __future__ import annotations
 
 import json
 import logging
-from collections.abc import Callable
-from datetime import UTC, datetime
+from datetime import datetime, timezone
+from typing import Callable
 
 from sqlalchemy.orm import Session
 
@@ -57,7 +57,7 @@ _REUSE_OVERLAP_RATIO = 0.6
 
 
 def _now_iso() -> str:
-    return datetime.now(UTC).isoformat()
+    return datetime.now(timezone.utc).isoformat()
 
 
 def _read_meta(model) -> dict:
@@ -156,7 +156,7 @@ def record_used_segments(
             r["plan_id"] = plan_id
             meta[USED_RANGES_KEY] = ranges
             model.classification_result = json.dumps(meta, ensure_ascii=False)
-            model.updated_at = datetime.now(UTC)
+            model.updated_at = datetime.now(timezone.utc)
             return
 
     ranges.append(
@@ -171,7 +171,7 @@ def record_used_segments(
     )
     meta[USED_RANGES_KEY] = ranges
     model.classification_result = json.dumps(meta, ensure_ascii=False)
-    model.updated_at = datetime.now(UTC)
+    model.updated_at = datetime.now(timezone.utc)
 
 
 def remove_used_segment(
@@ -215,7 +215,7 @@ def remove_used_segment(
     if removed:
         meta[USED_RANGES_KEY] = remaining
         model.classification_result = json.dumps(meta, ensure_ascii=False)
-        model.updated_at = datetime.now(UTC)
+        model.updated_at = datetime.now(timezone.utc)
     return removed
 
 
@@ -231,7 +231,7 @@ def reset_used_segments(db: Session, asset_id: str) -> None:
     if meta.get(USED_RANGES_KEY):
         meta[USED_RANGES_KEY] = []
         model.classification_result = json.dumps(meta, ensure_ascii=False)
-        model.updated_at = datetime.now(UTC)
+        model.updated_at = datetime.now(timezone.utc)
         logger.info("[片段追踪] 素材区间记录手动清空: asset_id=%s", asset_id)
 
 

apps/api/app/services/edit_plan_service.py

@@ -7,7 +7,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Optional
+from typing import Any, Dict, List, Optional
 
 from app.services.asset_segment_tracker import (
     REUSE_RATIO_LIMIT,
@@ -206,7 +206,7 @@ class EditPlanService:
         status: Optional[EditPlanClipStatus] = None,
         skip: int = 0,
         limit: int = 100,
-    ) -> list[EditPlanClip]:
+    ) -> List[EditPlanClip]:
         """列出计划的片段"""
         # 确保计划存在
         self.get_plan_or_raise(plan_id)
@@ -503,7 +503,7 @@ class EditPlanService:
         source = self.get_plan_or_raise(source_plan_id)
 
         # 分页读取源 plan 全部片段
-        clips: list[EditPlanClip] = []
+        clips: List[EditPlanClip] = []
         skip, page = 0, 500
         while True:
             batch = self._clip_repo.list_by_plan(source_plan_id, skip=skip, limit=page)
@@ -665,7 +665,7 @@ class EditPlanService:
         source = self.get_plan_or_raise(source_plan_id)
 
         # 分页读取源 plan 全部片段
-        clips: list[EditPlanClip] = []
+        clips: List[EditPlanClip] = []
         skip, page = 0, 500
         while True:
             batch = self._clip_repo.list_by_plan(source_plan_id, skip=skip, limit=page)
@@ -797,7 +797,7 @@ class EditPlanService:
         except Exception:
             pass
 
-        clips: list[EditPlanClip] = []
+        clips: List[EditPlanClip] = []
         skip, page = 0, 500
         while True:
             batch = self._clip_repo.list_by_plan(plan_id, skip=skip, limit=page)
@@ -1063,7 +1063,7 @@ class EditPlanService:
 
     # ── 片段分割与合并 ──────────────────────────────────────────────────────
 
-    def split_clip(self, clip_id: str, split_time: float) -> dict[str, Any]:
+    def split_clip(self, clip_id: str, split_time: float) -> Dict[str, Any]:
         """将一个片段从指定位置分割为两个片段
 
         Args:
@@ -1151,7 +1151,7 @@ class EditPlanService:
             "right_clip": created_right,
         }
 
-    def merge_clips(self, clip_ids: list[str]) -> EditPlanClip:
+    def merge_clips(self, clip_ids: List[str]) -> EditPlanClip:
         """合并多个连续片段为一个片段
 
         Args:
@@ -1217,7 +1217,7 @@ class EditPlanService:
 
     # ── 渲染生成流程 ────────────────────────────────────────────────────────
 
-    def get_generation_status(self, plan_id: str) -> dict[str, Any]:
+    def get_generation_status(self, plan_id: str) -> Dict[str, Any]:
         """获取渲染进度状态
 
         Returns:
@@ -1364,7 +1364,7 @@ class EditPlanService:
         )
         return count
 
-    def update_plan_config(self, plan_id: str, config_updates: dict[str, Any]) -> EditPlan:
+    def update_plan_config(self, plan_id: str, config_updates: Dict[str, Any]) -> EditPlan:
         """更新计划配置（合并更新）
 
         Args:

apps/api/app/services/edit_template_service.py

@@ -7,7 +7,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Optional
+from typing import Any, List, Optional
 
 from sqlalchemy.orm import Session
 
@@ -76,7 +76,7 @@ class EditTemplateService:
         active_only: bool = False,
         skip: int = 0,
         limit: int = 50,
-    ) -> list[EditTemplate]:
+    ) -> List[EditTemplate]:
         """列出模板
 
         Args:
@@ -227,7 +227,7 @@ class EditTemplateService:
         clip_type: Optional[ClipType] = None,
         skip: int = 0,
         limit: int = 100,
-    ) -> list[TemplateClipConfig]:
+    ) -> List[TemplateClipConfig]:
         """列出模板的片段配置
 
         注意：本方法要求模板存在于新表 ``edit_templates``（全局模板库），
@@ -253,7 +253,7 @@ class EditTemplateService:
         clip_type: Optional[ClipType] = None,
         skip: int = 0,
         limit: int = 100,
-    ) -> list[TemplateClipConfig]:
+    ) -> List[TemplateClipConfig]:
         """编辑器读取模板片段配置的单一数据源入口.
 
         片段配置主表是 ``template_clip_configs``（直接读取，不抛异常、不降级）。
@@ -404,8 +404,8 @@ class EditTemplateService:
     def reorder_clip_configs(
         self,
         template_id: str,
-        config_ids: list[str],
-    ) -> list[TemplateClipConfig]:
+        config_ids: List[str],
+    ) -> List[TemplateClipConfig]:
         """重新排序片段配置
 
         Args:
@@ -560,7 +560,7 @@ class EditTemplateService:
         )
 
         # 5. 转换每个片段为模板片段配置
-        created_configs: list[TemplateClipConfig] = []
+        created_configs: List[TemplateClipConfig] = []
         for clip_config_obj in clips_to_template_clip_configs(created_template.id, clips):
             created = self._clip_config_repo.create(clip_config_obj)
             created_configs.append(created)

apps/api/app/services/generation_common.py

@@ -82,12 +82,8 @@ def writeback_edit_plan_config(
         merged["generation_task_id"] = task_id
 
         if title_config:
-            # #1901 统一字段名为 "title"（worker sync_configs_to_plan 写的是 "title"）
-            # 先读取新旧两个 key，判断标题文字是否变化
-            old_title_cfg = merged.get("title", {}) or {}
-            if not isinstance(old_title_cfg, dict) or not (old_title_cfg.get("text") or "").strip():
-                old_title_cfg = merged.get("title_config", {}) or {}
-            old_title_text = (old_title_cfg.get("text") or "").strip() if isinstance(old_title_cfg, dict) else ""
+            old_title_config = merged.get("title_config", {}) or {}
+            old_title_text = (old_title_config.get("text") or "").strip()
             new_title_text = (title_config.get("text") or "").strip()
             if old_title_text != new_title_text:
                 if "cover" in merged:
@@ -98,17 +94,7 @@ def writeback_edit_plan_config(
                         old_title_text,
                         new_title_text,
                     )
-            # 字段名归一化（font_size→size, font_preset→font, font_color→color），与 worker sync_configs_to_plan 保持一致
-            normalized = dict(title_config)
-            if "font_size" in normalized and "size" not in normalized:
-                normalized["size"] = normalized["font_size"]
-            if "font_preset" in normalized and "font" not in normalized:
-                normalized["font"] = normalized["font_preset"]
-            if "font_color" in normalized and "color" not in normalized:
-                normalized["color"] = normalized["font_color"]
-            merged["title"] = normalized
-            # 清掉旧 key，避免双字段并存
-            merged.pop("title_config", None)
+            merged["title_config"] = title_config
 
         plan_model.config = merged
         db.commit()

apps/api/app/services/lipsync_service.py

@@ -17,7 +17,7 @@ from __future__ import annotations
 import io
 import logging
 import uuid
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Optional
 from urllib.parse import urlparse
 
@@ -35,7 +35,7 @@ from app.tasks.lipsync_tts import tts_synthesize_and_submit
 from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl.models import LipsyncJobModel
-from packages.application.cosyvoice_service import CosyVoiceError
+from packages.application.cosyvoice_service import CosyVoiceError, normalize_emotion
 from packages.domain.sentence_timings import (
     compute_sentence_timings,
     probe_audio_duration,
@@ -121,8 +121,7 @@ class LipsyncService:
                 text=script_text,
                 voice_id=actual_voice_id,
                 speed=speed,
-                emotion=emotion,  # normalize 在 CosyVoiceService 内部完成
-                language="zh",
+                emotion=normalize_emotion(emotion),
             )
         except CosyVoiceError as exc:
             raise MediaKitError(f"TTS 合成失败: {exc}", code="TTSSynthesisFailed") from exc
@@ -229,7 +228,7 @@ class LipsyncService:
             )
             job.mediakit_task_id = result["task_id"]
             job.status = "submitted"
-            job.submitted_at = datetime.now(UTC)
+            job.submitted_at = datetime.now(timezone.utc)
             self.db.commit()
             logger.info(
                 "[lipsync] 直传音频已提交 MediaKit: job_id=%s task_id=%s",
@@ -305,7 +304,7 @@ class LipsyncService:
             voice_id=voice_id or "",
             script_text=script_text or "",
             speed=speed,
-            emotion=emotion or "",
+            emotion=normalize_emotion(emotion) if is_tts_mode else (emotion or ""),
             # 音频直传（含预合成）直接进入 pending（后续同步改为 submitted）；TTS 模式进入 tts_processing
             status="tts_processing" if is_tts_mode else "pending",
         )
@@ -326,7 +325,7 @@ class LipsyncService:
                         voice_id,
                         script_text,
                         speed,
-                        emotion or "",
+                        normalize_emotion(emotion),
                     )
                 )
             except Exception as exc:
@@ -338,7 +337,7 @@ class LipsyncService:
                 job.status = "failed"
                 job.error_message = f"Celery 任务投递失败: {exc}"
                 job.error_code = "AsyncDispatchFailed"
-                job.updated_at = datetime.now(UTC)
+                job.updated_at = datetime.now(timezone.utc)
                 self.db.commit()
         else:
             # 2b/2c. 直接音频 / 预合成音频：同步路径
@@ -360,7 +359,7 @@ class LipsyncService:
         voice_id: str,
         script_text: str,
         speed: float = 1.0,
-        emotion: str = "neutral",
+        emotion: str = "natural",
     ) -> dict:
         """同步做 TTS 合成 + 下载 + ffprobe + 句子时间戳计算.
 
@@ -383,8 +382,7 @@ class LipsyncService:
                 text=script_text,
                 voice_id=actual_voice_id,
                 speed=speed,
-                emotion=emotion,  # normalize 在 CosyVoiceService 内部完成
-                language="zh",
+                emotion=normalize_emotion(emotion),
             )
         except CosyVoiceError as exc:
             raise MediaKitError(f"TTS 合成失败: {exc}", code="TTSSynthesisFailed") from exc
@@ -491,52 +489,39 @@ class LipsyncService:
         mk_status = status_data.get("status", STATUS_RUNNING)
         logger.info("MediaKit 对口型状态 [%s]: %s", job_id, mk_status)
 
-        try:
-            if mk_status == STATUS_COMPLETED:
-                result = status_data.get("result", {})
-                job.status = STATUS_COMPLETED
-                temp_url = result.get("video_url", "")
-                job.output_video_url = temp_url
-                job.output_duration = result.get("duration", 0.0)
-                job.completed_at = datetime.now(UTC)
-                job.updated_at = datetime.now(UTC)
-                self.db.commit()
-                # 异步转存自家 OSS
-                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,
-                    )
-            elif mk_status == STATUS_FAILED:
-                error = status_data.get("error", {})
-                job.status = "failed"
-                job.error_message = error.get("message", "任务执行失败")
-                job.error_code = error.get("code", "TaskFailed")
-                job.completed_at = datetime.now(UTC)
-            else:
-                # 中间状态（running/processing/queued 等）同步到 DB，避免前端永远卡在 submitted
-                if isinstance(mk_status, str) and mk_status:
-                    job.status = mk_status
-            job.updated_at = datetime.now(UTC)
+        if mk_status == STATUS_COMPLETED:
+            result = status_data.get("result", {})
+            job.status = STATUS_COMPLETED
+            temp_url = result.get("video_url", "")
+            job.output_video_url = temp_url
+            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()
-        except Exception as exc:  # noqa: BLE001 - DB 提交失败必须记录日志并重试，否则后台任务静默失败
-            logger.error(
-                "refresh_job_status 提交 DB 失败 job_id=%s mk_status=%s err=%s",
-                job_id,
-                mk_status,
-                exc,
-                exc_info=True,
-            )
+            # 异步转存自家 OSS
             try:
-                self.db.rollback()
-            except Exception:
-                pass
-            # DB commit 失败不 raise，返回当前 job 对象让下次轮询再试
+                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"
+            job.error_message = error.get("message", "任务执行失败")
+            job.error_code = error.get("code", "TaskFailed")
+            job.completed_at = datetime.now(timezone.utc)
+        else:
+            if isinstance(mk_status, str) and mk_status:
+                job.status = mk_status
+        job.updated_at = datetime.now(timezone.utc)
+        self.db.commit()
         self.db.refresh(job)
         return job
 
@@ -589,7 +574,7 @@ class LipsyncService:
 
         if job.status in ("pending", "tts_processing", "submitted"):
             job.status = "cancelled"
-            job.updated_at = datetime.now(UTC)
+            job.updated_at = datetime.now(timezone.utc)
             self.db.commit()
             self.db.refresh(job)
 

apps/api/app/services/plan_generator_service.py

@@ -14,7 +14,7 @@ from __future__ import annotations
 
 import logging
 import random
-from typing import Any
+from typing import Any, List
 
 from sqlalchemy.orm import Session
 
@@ -62,8 +62,8 @@ class PlanGeneratorService:
     def generate_from_template(
         self,
         template: EditTemplate,
-        clip_configs: list[TemplateClipConfig],
-        asset_ids: list[str],
+        clip_configs: List[TemplateClipConfig],
+        asset_ids: List[str],
         *,
         project_id: str = "",
         created_by_user_id: str = "",
@@ -135,7 +135,7 @@ class PlanGeneratorService:
             )
 
         # 5. 持久化所有 clips 并计算总时长
-        created_clips: list[EditPlanClip] = []
+        created_clips: List[EditPlanClip] = []
         total_duration = 0.0
         for clip in clips:
             saved = self._clip_repo.create(clip)
@@ -184,15 +184,15 @@ class PlanGeneratorService:
     def _create_clips_from_configs(
         self,
         plan_id: str,
-        clip_configs: list[TemplateClipConfig],
-    ) -> list[EditPlanClip]:
+        clip_configs: List[TemplateClipConfig],
+    ) -> List[EditPlanClip]:
         """从 TemplateClipConfig 列表创建 EditPlanClip 列表（未持久化）.
 
         委托给 plan_generator_utils.create_clips_from_configs 纯函数。
         """
         return create_clips_from_configs(plan_id, clip_configs)
 
-    def _map_clip_types_for_mode(self, clips: list[EditPlanClip], editing_mode: str) -> None:
+    def _map_clip_types_for_mode(self, clips: List[EditPlanClip], editing_mode: str) -> None:
         """将 MAIN 类型片段按 editing_mode 映射为对应角色类型.
 
         委托给 plan_generator_utils.map_clip_types_for_mode 纯函数。
@@ -204,7 +204,7 @@ class PlanGeneratorService:
         plan_id: str,
         editing_mode: str,
         asset_count: int,
-    ) -> list[EditPlanClip]:
+    ) -> List[EditPlanClip]:
         """无 clip_configs 时，根据 editing_mode 生成默认 clip 结构.
 
         委托给 plan_generator_utils.generate_default_clips 纯函数。
@@ -213,8 +213,8 @@ class PlanGeneratorService:
 
     def _distribute_assets(
         self,
-        clips: list[EditPlanClip],
-        asset_ids: list[str],
+        clips: List[EditPlanClip],
+        asset_ids: List[str],
         editing_mode: str,
         *,
         random_selection: bool = False,
@@ -259,7 +259,7 @@ class PlanGeneratorService:
             external_used_segments=external_used_segments,
         )
 
-    def _fetch_asset_scene_points(self, asset_ids: list[str]) -> dict[str, list[float]]:
+    def _fetch_asset_scene_points(self, asset_ids: List[str]) -> dict[str, list[float]]:
         """从素材 metadata 读取场景切换点缓存（无缓存的素材不包含在结果中）。"""
         points_map: dict[str, list[float]] = {}
         if not self._asset_repo:
@@ -272,7 +272,7 @@ class PlanGeneratorService:
                     points_map[asset_id] = points
         return points_map
 
-    def _sort_assets_by_smart_score(self, asset_ids: list[str]) -> list[str]:
+    def _sort_assets_by_smart_score(self, asset_ids: List[str]) -> List[str]:
         """按 smart_match 综合评分降序排列素材 ID（注入随机噪声）。
 
         评分高的素材（质量好、时长合适、新鲜、使用次数少）倾向排在前面；
@@ -295,7 +295,7 @@ class PlanGeneratorService:
         )
         return [aid for aid, _ in scored]
 
-    def _fetch_asset_durations(self, asset_ids: list[str]) -> dict[str, float]:
+    def _fetch_asset_durations(self, asset_ids: List[str]) -> dict[str, float]:
         """从数据库获取素材时长信息.
 
         Args:

apps/api/app/services/script_asr_service.py

@@ -1,59 +0,0 @@
-"""文案提取 ASR 服务封装 — Issue #1893.
-
-将已有的 ASR 服务工厂封装为面向文案提取场景的简单接口：
-- transcribe_to_text(video_path) -> str：将视频/音频转写为纯文本
-- 未配置 ASR 时抛 ASRNotConfiguredError（路由层映射为 503）
-- ASR 调用失败时抛 ASRTranscriptionError（路由层映射为 502）
-"""
-
-from __future__ import annotations
-
-import logging
-from pathlib import Path
-
-from packages.ports.asr_service import ASRServiceError
-
-logger = logging.getLogger(__name__)
-
-
-class ASRNotConfiguredError(Exception):
-    """ASR 服务未配置."""
-
-
-class ASRTranscriptionError(Exception):
-    """ASR 转写失败."""
-
-
-def transcribe_to_text(media_path: str | Path) -> str:
-    """将视频/音频文件转写为纯文本.
-
-    Args:
-        media_path: 媒体文件路径
-
-    Returns:
-        转写出的文本
-
-    Raises:
-        ASRNotConfiguredError: ASR 服务未配置
-        ASRTranscriptionError: ASR 调用失败
-    """
-    # 延迟导入，避免循环依赖和启动时副作用
-    from apps.worker.services.asr_service_factory import get_asr_service
-
-    asr = get_asr_service()
-    if asr is None:
-        raise ASRNotConfiguredError("ASR 服务未配置，请联系管理员配置火山 MediaKit 或阿里云 ASR 密钥")
-
-    try:
-        timeline = asr.transcribe(Path(media_path))
-        # 拼接所有分段的文本
-        text = "".join(seg.text for seg in timeline.segments)
-        return text.strip()
-    except ASRNotConfiguredError:
-        raise
-    except ASRServiceError as exc:
-        logger.error("ASR 转写失败: %s", exc)
-        raise ASRTranscriptionError(f"语音识别失败: {exc}") from exc
-    except Exception as exc:
-        logger.error("ASR 转写异常: %s", exc)
-        raise ASRTranscriptionError(f"语音识别失败: {exc}") from exc

apps/api/app/services/script_service.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 import uuid
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Optional
 
 from sqlalchemy.orm import Session
@@ -51,9 +51,6 @@ class ScriptService:
         content: str = "",
         segments: list | None = None,
         tags: list | None = None,
-        title_text: str = "",
-        title_category: str = "",
-        title_config: dict | None = None,
     ) -> ScriptModel:
         script = ScriptModel(
             id=str(uuid.uuid4()),
@@ -62,9 +59,6 @@ class ScriptService:
             content=content,
             segments=segments if segments is not None else [],
             tags=tags if tags is not None else [],
-            title_text=title_text or "",
-            title_category=title_category or "",
-            title_config=title_config if title_config is not None else {},
         )
         self.db.add(script)
         self.db.commit()
@@ -89,9 +83,6 @@ class ScriptService:
         content: Optional[str] = None,
         segments: Optional[list] = None,
         tags: Optional[list] = None,
-        title_text: Optional[str] = None,
-        title_category: Optional[str] = None,
-        title_config: Optional[dict] = None,
     ) -> ScriptModel:
         script = self.get_script(script_id, user_id)
         if title is not None:
@@ -102,27 +93,11 @@ class ScriptService:
             script.segments = segments
         if tags is not None:
             script.tags = tags
-        if title_text is not None:
-            script.title_text = title_text
-        if title_category is not None:
-            script.title_category = title_category
-        if title_config is not None:
-            script.title_config = title_config
-        script.updated_at = datetime.now(UTC)
+        script.updated_at = datetime.now(timezone.utc)
         self.db.commit()
         self.db.refresh(script)
         return script
 
-    # ── title config ─────────────────────────────────────────────────────
-
-    def get_title_config_for_script(self, script_id: str, user_id: str) -> dict:
-        """从 script 读取标题配置，返回可直接用于渲染的 title_config dict."""
-        script = self.get_script(script_id, user_id)
-        config = dict(script.title_config or {})
-        if not config.get("text") and script.title_text:
-            config["text"] = script.title_text
-        return config
-
     # ── delete ────────────────────────────────────────────────────────────
 
     def delete_script(self, script_id: str, user_id: str) -> bool:

apps/api/app/tasks/lipsync_tts.py

@@ -20,7 +20,7 @@ _estimate_sentence_timings_by_chars 等内部函数已复用共享实现，避
 
 import io
 import logging
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from urllib.parse import urlparse
 
 from celery import shared_task
@@ -160,14 +160,13 @@ def tts_synthesize_and_submit(
                 voice_id=voice_id,
                 speed=speed,
                 emotion=emotion,
-                language="zh",
             )
         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(UTC)
+            job.updated_at = datetime.now(timezone.utc)
             db.commit()
             return
         except ValueError as exc:
@@ -175,7 +174,7 @@ def tts_synthesize_and_submit(
             job.status = "failed"
             job.error_message = f"TTS 参数错误: {exc}"
             job.error_code = "TTSInvalidParam"
-            job.updated_at = datetime.now(UTC)
+            job.updated_at = datetime.now(timezone.utc)
             db.commit()
             return
 
@@ -185,7 +184,7 @@ def tts_synthesize_and_submit(
             job.status = "failed"
             job.error_message = "TTS 未返回音频 URL"
             job.error_code = "TTSNoAudio"
-            job.updated_at = datetime.now(UTC)
+            job.updated_at = datetime.now(timezone.utc)
             db.commit()
             return
 
@@ -271,7 +270,7 @@ def tts_synthesize_and_submit(
             )
             job.mediakit_task_id = mk_result["task_id"]
             job.status = "submitted"
-            job.submitted_at = datetime.now(UTC)
+            job.submitted_at = datetime.now(timezone.utc)
             logger.info(
                 "[lipsync_tts] 已提交 MediaKit: job_id=%s task_id=%s",
                 job_id,
@@ -283,18 +282,6 @@ def tts_synthesize_and_submit(
             job.error_code = exc.code
             logger.error("[lipsync_tts] 提交 MediaKit 失败: job_id=%s err=%s", job_id, exc)
 
-        # 三层防御 ③：链式触发 Celery 兜底轮询——MediaKit 提交成功后由 worker
-        # 主动拉取状态到终态，不依赖前端轮询触发的 FastAPI background task
-        # （background task 可能静默失败导致永久卡 running）。
-        if job.status == "submitted" and job.mediakit_task_id:
-            try:
-                poll_mediakit_status.apply_async(
-                    kwargs={"job_id": job_id, "user_id": user_id},
-                    countdown=10,  # 10 秒后开始轮询，给 MediaKit 一点处理时间
-                )
-            except Exception as exc:  # noqa: BLE001
-                logger.warning("[lipsync_tts] 提交兜底轮询任务失败（不影响主流程）: job_id=%s err=%s", job_id, exc)
-
         db.commit()
 
     except Exception:
@@ -305,7 +292,7 @@ def tts_synthesize_and_submit(
                 job.status = "failed"
                 job.error_message = "TTS 异步任务执行异常"
                 job.error_code = "AsyncTaskError"
-                job.updated_at = datetime.now(UTC)
+                job.updated_at = datetime.now(timezone.utc)
                 db.commit()
         except Exception:
             logger.exception("[lipsync_tts] 回写失败状态时异常: job_id=%s", job_id)
@@ -313,99 +300,6 @@ def tts_synthesize_and_submit(
         db.close()
 
 
-@shared_task(
-    bind=True,
-    name="lipsync_tts.poll_mediakit_status",
-    max_retries=60,  # 最多轮询 60 次
-    default_retry_delay=10,  # 每次间隔 10 秒（总兜底时长 10 分钟）
-)
-def poll_mediakit_status(self, job_id: str, user_id: str):
-    """Celery 兜底轮询：TTS 提交 MediaKit 后，由 worker 主动拉取状态直到终态。
-
-    不依赖前端轮询，避免 background task 静默失败导致任务永久卡 running/submitted。
-    """
-    from sqlalchemy.orm import Session as DBSession
-
-    from packages.adapters.sqlalchemy_impl.models import LipsyncJobModel
-
-    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:
-            logger.warning("[lipsync_poll] Job not found: job_id=%s", job_id)
-            return
-
-        # 已终态，不需要再轮询
-        if job.status in ("completed", "failed", "cancelled"):
-            return
-
-        if not job.mediakit_task_id:
-            logger.warning("[lipsync_poll] Job has no mediakit_task_id: job_id=%s status=%s", job_id, job.status)
-            return
-
-        from app.services.lipsync_service import STATUS_COMPLETED as _SC
-        from app.services.lipsync_service import STATUS_FAILED as _SF
-        from app.services.lipsync_service import LipsyncService
-        from app.services.mediakit_client import MediaKitError, get_mediakit_client
-
-        client = get_mediakit_client()
-        try:
-            status_data = client.get_task_status(job.mediakit_task_id)
-        except MediaKitError as exc:
-            logger.warning("[lipsync_poll] 拉取 MediaKit 状态失败，将重试: job_id=%s err=%s", job_id, exc)
-            raise self.retry(exc=exc) from exc
-
-        mk_status = status_data.get("status", "running")
-
-        if mk_status in ("succeeded", _SC):
-
-            svc = LipsyncService(db)
-            result = status_data.get("result", {})
-            job.status = "completed"
-            output_url = result.get("video_url", "")
-            try:
-                job.output_video_url = svc._persist_output_video(output_url, job_id, user_id)
-            except Exception as exc:  # noqa: BLE001
-                logger.warning("[lipsync_poll] 转存 OSS 失败，保留临时 URL: job_id=%s err=%s", job_id, exc)
-                job.output_video_url = output_url
-            job.output_duration = result.get("duration", 0.0)
-            job.completed_at = datetime.now(UTC)
-            job.updated_at = datetime.now(UTC)
-            db.commit()
-            logger.info("[lipsync_poll] 任务完成: job_id=%s", job_id)
-        elif mk_status in ("failed", "error", _SF):
-            error = status_data.get("error", {})
-            job.status = "failed"
-            job.error_message = error.get("message", "任务执行失败")
-            job.error_code = error.get("code", "TaskFailed")
-            job.completed_at = datetime.now(UTC)
-            job.updated_at = datetime.now(UTC)
-            db.commit()
-            logger.info("[lipsync_poll] 任务失败: job_id=%s err=%s", job_id, job.error_message)
-        else:
-            # 中间状态，更新时间戳，继续重试
-            job.updated_at = datetime.now(UTC)
-            if isinstance(mk_status, str) and mk_status:
-                job.status = mk_status
-            db.commit()
-            logger.debug("[lipsync_poll] 任务仍在 %s，继续轮询: job_id=%s", mk_status, job_id)
-            raise self.retry()
-    except Exception as exc:
-        logger.exception("[lipsync_poll] 未预期异常: job_id=%s", job_id)
-        try:
-            db.rollback()
-        except Exception:
-            pass
-        raise self.retry(exc=exc) from exc
-    finally:
-        db.close()
-
-
 @shared_task(
     name="lipsync_tts.persist_output_video",
     max_retries=2,
@@ -446,7 +340,7 @@ def persist_output_video_task(job_id: str, user_id: str, temp_url: str):
             permanent_url = storage.upload_file(io.BytesIO(data), storage_key, content_type="video/mp4")
             final_url = _sign_media_url(permanent_url) if permanent_url else temp_url
             job.output_video_url = final_url
-            job.updated_at = datetime.now(UTC)
+            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:

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

@@ -40,6 +40,7 @@ async function loginWithRetry(
 
 type ProjectResponse = { id: string }
 type LibraryResponse = { id: string }
+type TemplateResponse = { id: string }
 type AssetListResponse = {
   items: Array<{
     id: string
@@ -49,10 +50,10 @@ type AssetListResponse = {
 }
 
 test.describe("Core generation flow", () => {
-  test.describe.configure({ timeout: 600_000 })
+  test.describe.configure({ timeout: 360_000 })
 
-  test("walks through wizard with count modal and starts generation", async ({ page, request }) => {
-    test.setTimeout(600_000)
+  test("walks through 6-step wizard and starts generation", async ({ page, request }) => {
+    test.setTimeout(360_000)
 
     await routeBrowserApiToTestApi(page)
     const suffix = Date.now().toString(36)
@@ -125,17 +126,28 @@ test.describe("Core generation flow", () => {
       )
       .toBe("ready")
 
-    // #1926 P0 fix: POST /templates CRUD endpoint removed; GET /templates
-    // now auto-creates a default template for new users. Use the first one.
-    const templatesResp = await request.get(`${apiBase}/templates`, { headers })
-    expect(templatesResp.status(), await templatesResp.text()).toBe(200)
-    const templatesData = (await templatesResp.json()) as {
-      items: Array<{ id: string }>
-    }
-    expect(Array.isArray(templatesData.items)).toBe(true)
-    expect(templatesData.items.length).toBeGreaterThan(0)
-    const templateId = templatesData.items[0].id
-    expect(templateId).toBeTruthy()
+    // Create an editing template so the generate page has at least one template
+    // (templates are now loaded from API; new users have none by default)
+    const template = await request.post(`${apiBase}/templates`, {
+      headers,
+      data: {
+        name: `E2E 测试模板 ${suffix}`,
+        mode: "pip",
+        estimated_duration: 30,
+        segments: [
+          {
+            segment_order: 1,
+            duration_min: 5,
+            duration_max: 30,
+            material_type: "video",
+          },
+        ],
+        tags: ["e2e"],
+      },
+    })
+    expect(template.status(), await template.text()).toBe(201)
+    const templateData = (await template.json()) as TemplateResponse
+    expect(templateData.id).toBeTruthy()
 
     // Set auth in localStorage
     await page.addInitScript(
@@ -169,9 +181,18 @@ test.describe("Core generation flow", () => {
       timeout: 20_000,
     })
 
-    // 5步向导：素材→数量弹窗→配音→标题→确认生成→封面（#1911 删除选模板步骤，后端自动使用默认模板；
-    // #1677 批量生成在选完素材后弹「要生成几个视频？」数量弹窗，默认1，回车确认）
-    // Step 1: select material (card grid UI)
+    // Step 1: template - default selected, click next
+    await expect(page.locator(".xx-choice-item.selected")).toBeVisible()
+    await page.getByRole("button", { name: "下一步" }).click()
+
+    // Step1 下一步弹出数量选择弹窗（Issue #1677 固定6步：模板→素材→配音→标题→确认生成→封面）
+    // 单视频流程：默认 1 个，点击「生成 1 个视频」进入步骤2
+    await expect(page.getByRole("heading", { name: "要生成几个视频？" })).toBeVisible({
+      timeout: 10_000,
+    })
+    await page.getByRole("button", { name: "生成 1 个视频" }).click()
+
+    // Step 2: select material (card grid UI)
     await expect(page.getByRole("heading", { name: /选择素材/ })).toBeVisible()
     const librarySelect = page.locator("select").first()
     await librarySelect.selectOption({ label: libraryName })
@@ -184,17 +205,11 @@ test.describe("Core generation flow", () => {
     await expect(materialCard.getByTestId("material-card-check")).toBeVisible({ timeout: 5_000 })
     await page.getByRole("button", { name: "下一步" }).click()
 
-    // #1677 数量弹窗：默认值1，点击「生成 1 个视频」确认（新用户单视频冒烟路径）
-    await expect(page.getByRole("heading", { name: "要生成几个视频？" })).toBeVisible({
-      timeout: 5_000,
-    })
-    await page.getByRole("button", { name: "生成 1 个视频" }).click()
-
-    // Step 2: voice（新注册用户无配音素材时展示空状态 h3「🎙️ 选择配音」，仍可点「下一步」跳过）
+    // Step 3: voice (可选步骤，新注册用户无配音素材，直接跳过)
     await expect(page.getByRole("heading", { name: /选择配音/ })).toBeVisible({ timeout: 15000 })
     await page.getByRole("button", { name: "下一步" }).click()
 
-    // Step 3: title（新顺序：标题在预览之前）
+    // Step 4: title（新顺序：标题在预览之前）
     await expect(page.getByRole("heading", { name: /选择标题/ })).toBeVisible({ timeout: 15000 })
     // 等待组件完全渲染
     await page.waitForTimeout(2000)
@@ -207,14 +222,7 @@ test.describe("Core generation flow", () => {
     const titleText = `E2E Test ${suffix}`
     await titleInput.fill(titleText)
 
-    // 步骤3（标题页）底部操作栏按钮是「下一步 →」，点击后进入步骤4
-    // 步骤4底部才是「✨ 确认生成视频」按钮
-    const nextBtn = page.locator(".xx-step-actions .xx-btn-primary").filter({ hasText: "下一步" })
-    await expect(nextBtn).toBeVisible({ timeout: 15_000 })
-    await nextBtn.click()
-
-    // Step 4：「确认生成」页面——此处底部是「✨ 确认生成视频」按钮
-    // 注意：Step4 主内容区是实时预览画布，没有 h3 「🎬 确认生成」标题，标题由顶部步骤条展示
+    // Step 4（标题+实时预览）：确认生成按钮已移到标题页，点击直接创建最终渲染任务
     // 等待前端实时预览就绪：未就绪时右侧 FrontendPreviewPlayer 显示「准备预览素材...」占位，
     // 就绪（previewReady：素材已解析 + 模板已选中）后占位消失；否则按钮会被校验拦截弹 warning
     await page
@@ -222,25 +230,19 @@ test.describe("Core generation flow", () => {
       .waitFor({ state: "detached", timeout: 30_000 })
       .catch(() => {})
 
-    // 定位底部操作栏的「✨ 确认生成视频」按钮
-    // 使用底部操作栏 xx-step-actions 作用域，避免命中其他 primary 按钮
-    const confirmBtn = page
-      .locator(".xx-step-actions .xx-btn-primary")
-      .filter({ hasText: "确认生成" })
-    await expect(confirmBtn).toBeVisible({ timeout: 30_000 })
-    await expect(confirmBtn).toBeEnabled({ timeout: 30_000 })
-
-    // Wait for generation API to be called — 先挂监听再点击，避免竞态
+    // Wait for generation API to be called
+    // 前端直接创建生成任务：POST /generation/tasks
     const generatePromise = page.waitForResponse(
       (response) => {
         const url = response.url()
         const path = new URL(url).pathname
         return response.request().method() === "POST" && path.endsWith("/generation/tasks")
       },
-      { timeout: 60_000 },
+      { timeout: 30_000 },
     )
 
-    await confirmBtn.click()
+    // 点击「确认生成视频」
+    await page.locator(".xx-btn-primary").filter({ hasText: "确认生成视频" }).first().click()
 
     // Verify generation was triggered
     const genResp = await generatePromise
@@ -260,26 +262,19 @@ test.describe("Core generation flow", () => {
       expect(genData.items.length).toBeGreaterThan(0)
       expect(genData.items[0].id).toBeTruthy()
 
-      // 单视频（N=1）：点击「确认生成视频」后跳步骤 5「确认生成」进度页，展示进度卡
-      // 注意：进度页底部按钮变为 disabled 的「⏳ 视频渲染中…」
-      await expect(page.getByText("视频渲染中")).toBeVisible({ timeout: 30_000 })
+      // 单视频（N=1）：点击「确认生成视频」后跳 Step 5「确认生成」，展示实时渲染进度
+      await expect(page.getByRole("heading", { name: "🎬 确认生成" })).toBeVisible({
+        timeout: 30_000,
+      })
 
-      // 等待渲染完成：单视频成片播放器渲染（带「⬇️ 下载」按钮），最长等待 3 分钟
-      // 注意：message.success「视频生成完成」toast 3秒后自动消失，不能作为稳定断言点
-      await expect(page.getByRole("button", { name: "⬇️ 下载" })).toBeVisible({ timeout: 420_000 })
+      // 等待渲染完成：进度卡变为「视频生成完成」（最长等待 3 分钟）
+      await expect(page.getByText("视频生成完成")).toBeVisible({ timeout: 180_000 })
 
-      // #1954 修复：生成完成后步骤4底部应显示「下一步：选择封面」按钮
-      // 等待底部主按钮从「⏳/确认生成」切换为「下一步：选择封面」
-      const nextCoverBtn = page
-        .locator(".xx-step-actions > .xx-btn-primary")
-        .filter({ hasText: "选择封面" })
-      await expect(nextCoverBtn).toBeVisible({ timeout: 15_000 })
-      await nextCoverBtn.click()
-
-      // 断言进入步骤5封面页：主内容出现「选择封面」标题
-      await expect(page.getByText("🖼️ 选择封面")).toBeVisible({ timeout: 10_000 })
-      // 底部操作栏主按钮应消失（封面是最后一步，只剩「← 上一步」）
-      await expect(page.locator(".xx-step-actions > .xx-btn-primary")).toHaveCount(0)
+      // 全部完成后「下一步：选择封面」解锁，点击进入 Step 6
+      await page.getByRole("button", { name: /下一步：选择封面/ }).click()
+      await expect(page.getByRole("heading", { name: /选择封面/ })).toBeVisible({
+        timeout: 30_000,
+      })
     } else {
       console.log(`[E2E] Generate API returned ${genResp.status()}, wizard flow test still passes`)
       // 创建失败时停留在标题页并展示错误提示

apps/web/src/api/points/index.ts

@@ -1,345 +0,0 @@
-/**
- * 积分系统 API 封装
- * 对齐后端 staging 实测最终契约（2026-09-16）
- *
- * 当前 POINTS_API_MOCK=true：使用 MOCK_* 常量 + setTimeout 模拟延迟，
- * 等后端 P0（支付通道接入、change-plan 校验）稳定后切 false 联调。
- *
- * 会员/订阅 API 在 @/api/subscription 中定义，避免重复封装。
- */
-import apiClient from "../client"
-import type {
-  PointsBalance,
-  PointsRulesResponse,
-  PointsPackagesResponse,
-  PointsTransaction,
-  PointsTransactionsResponse,
-  PointsCheckRequest,
-  PointsCheckResponse,
-  CreateRechargeOrderRequest,
-  CreateRechargeOrderResponse,
-  DailyUsage,
-  MembershipResponse,
-} from "./types"
-
-/** 模拟网络延迟（ms） */
-const MOCK_DELAY = 500
-
-/* ================================================================
- * Mock 数据
- * ================================================================ */
-
-/** mock 余额（无 free_clips_* 字段，已拆分到 dailyUsage） */
-const MOCK_BALANCE: PointsBalance = {
-  balance: 258,
-  total_earned: 500,
-  total_spent: 242,
-  is_member: false,
-  member_type: null,
-  member_expires_at: null,
-}
-
-const MOCK_RULES: PointsRulesResponse = {
-  rules: [
-    {
-      scene_key: "ai_voice",
-      name: "AI 配音",
-      base_points: 2,
-      unit: "次",
-      description: "单次配音消耗 2 积分，超 30 秒每 30 秒 +1 积分",
-      extra_per_30s: 1,
-    },
-    {
-      scene_key: "ai_video",
-      name: "AI 视频生成",
-      base_points: 8,
-      unit: "条",
-      description: "单条视频 8 积分起，按视频时长加收",
-      extra_per_30s: 3,
-    },
-    {
-      scene_key: "ai_digital_human",
-      name: "AI 数字人",
-      base_points: 15,
-      unit: "次",
-      description: "数字人生成 15 积分起",
-      extra_per_30s: 5,
-    },
-    {
-      scene_key: "voice_clone_train",
-      name: "声音克隆训练",
-      base_points: 20,
-      unit: "次",
-      description: "声音模型训练一次性消耗 20 积分",
-    },
-    {
-      scene_key: "voice_clone_synth",
-      name: "声音克隆合成",
-      base_points: 3,
-      unit: "次",
-      description: "使用克隆声音合成音频每次 3 积分",
-    },
-    {
-      scene_key: "douyin_extract",
-      name: "抖音文案提取",
-      base_points: 1,
-      unit: "次",
-      description: "提取抖音视频文案每次 1 积分",
-    },
-    {
-      scene_key: "ai_rewrite",
-      name: "AI 文案改写",
-      base_points: 2,
-      unit: "次",
-      description: "AI 改写文案每次 2 积分",
-    },
-    {
-      scene_key: "ai_title",
-      name: "AI 标题生成",
-      base_points: 1,
-      unit: "次",
-      description: "AI 生成标题每次 1 积分，一次生成多条",
-    },
-    {
-      scene_key: "ai_cover",
-      name: "AI 封面生成",
-      base_points: 3,
-      unit: "次",
-      description: "AI 生成封面每次 3 积分",
-    },
-  ],
-  free_user_multiplier: 1.15,
-}
-
-const MOCK_PACKAGES: PointsPackagesResponse = {
-  packages: [
-    { code: "points_100", name: "100 积分", points: 100, price_cents: 990, unit_price: 0.099 },
-    { code: "points_500", name: "500 积分", points: 500, price_cents: 4490, unit_price: 0.0898 },
-    { code: "points_1000", name: "1000 积分", points: 1000, price_cents: 7990, unit_price: 0.0799 },
-    {
-      code: "points_3000",
-      name: "3000 积分",
-      points: 3000,
-      price_cents: 19900,
-      unit_price: 0.0663,
-    },
-  ],
-  user_discount: null,
-}
-
-const MOCK_TRANSACTIONS: PointsTransaction[] = [
-  {
-    id: 1,
-    type: "deduct",
-    source: "ai_video",
-    amount: 10,
-    balance_after: 248,
-    description: "AI 视频生成 ×1（非会员倍率）",
-    ref_id: "task_abc123",
-    created_at: "2026-09-16T08:30:00Z",
-  },
-  {
-    id: 2,
-    type: "add",
-    source: "recharge",
-    amount: 100,
-    balance_after: 258,
-    description: "充值 100 积分",
-    ref_id: "order_xyz789",
-    created_at: "2026-09-15T14:20:00Z",
-  },
-  {
-    id: 3,
-    type: "deduct",
-    source: "ai_voice",
-    amount: 3,
-    balance_after: 158,
-    description: "AI 配音 ×1（45s 加收）",
-    ref_id: "",
-    created_at: "2026-09-15T10:15:00Z",
-  },
-  {
-    id: 4,
-    type: "add",
-    source: "sign_up",
-    amount: 60,
-    balance_after: 161,
-    description: "新用户注册赠送",
-    ref_id: "",
-    created_at: "2026-09-10T09:00:00Z",
-  },
-  {
-    id: 5,
-    type: "deduct",
-    source: "ai_title",
-    amount: 1,
-    balance_after: 101,
-    description: "AI 标题生成 ×1",
-    ref_id: "",
-    created_at: "2026-09-14T16:45:00Z",
-  },
-]
-
-const MOCK_DAILY_USAGE: DailyUsage = {
-  free_clips_used: 1,
-  free_clips_limit: 3,
-  free_clips_remaining: 2,
-  reset_at: new Date(Date.now() + 8 * 3600_000).toISOString(),
-}
-
-const MOCK_MEMBERSHIP: MembershipResponse = {
-  is_member: false,
-  member_type: null,
-  member_expires_at: null,
-  points_balance: 258,
-  max_resolution: "720p",
-}
-
-/* ================================================================
- * 积分 API
- * ================================================================ */
-
-/** 获取积分余额 */
-export async function getPointsBalance(): Promise<PointsBalance> {
-  if (process.env.POINTS_API_MOCK === "true") {
-    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
-    return { ...MOCK_BALANCE }
-  }
-  const { data } = await apiClient.get(`/points/balance`)
-  return data
-}
-
-/** 获取积分消耗规则 */
-export async function getPointsRules(): Promise<PointsRulesResponse> {
-  if (process.env.POINTS_API_MOCK === "true") {
-    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
-    return { rules: [...MOCK_RULES.rules], free_user_multiplier: MOCK_RULES.free_user_multiplier }
-  }
-  const { data } = await apiClient.get(`/points/rules`)
-  return data
-}
-
-/** 获取充值包列表 */
-export async function getPointsPackages(): Promise<PointsPackagesResponse> {
-  if (process.env.POINTS_API_MOCK === "true") {
-    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
-    return { packages: MOCK_PACKAGES.packages.map((p) => ({ ...p })), user_discount: null }
-  }
-  const { data } = await apiClient.get(`/points/packages`)
-  return data
-}
-
-/**
- * 获取积分流水（分页）
- */
-export async function getPointsTransactions(
-  page = 1,
-  pageSize = 20,
-): Promise<PointsTransactionsResponse> {
-  if (process.env.POINTS_API_MOCK === "true") {
-    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
-    const start = (page - 1) * pageSize
-    const items = MOCK_TRANSACTIONS.slice(start, start + pageSize)
-    return {
-      items: items.map((t) => ({ ...t })),
-      total: MOCK_TRANSACTIONS.length,
-      page,
-      page_size: pageSize,
-    }
-  }
-  const { data } = await apiClient.get(`/points/transactions`, {
-    params: { page, page_size: pageSize },
-  })
-  return data
-}
-
-/**
- * 创建充值订单
- * 注意：当前 pay_params 返回空对象 {}（支付通道未接入），
- * 前端可以完成订单创建 UI，但无法发起真实支付，待后续支付通道接入后联调。
- */
-export async function createPointsOrder(
-  data: CreateRechargeOrderRequest,
-): Promise<CreateRechargeOrderResponse> {
-  if (process.env.POINTS_API_MOCK === "true") {
-    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY * 2))
-    const pkg = MOCK_PACKAGES.packages.find((p) => p.code === data.package_id)
-    if (!pkg) throw new Error("充值包不存在")
-    return {
-      id: `mock_order_${Date.now()}`,
-      order_type: "points_recharge",
-      product_code: pkg.code,
-      amount_cents: pkg.price_cents,
-      points_amount: pkg.points,
-      status: "pending",
-      pay_params: {},
-      expire_at: new Date(Date.now() + 30 * 60_000).toISOString(),
-      created_at: new Date().toISOString(),
-    }
-  }
-  const { data: d } = await apiClient.post(`/points/recharge`, data)
-  return d
-}
-
-/**
- * 积分预检查（消耗前调用）
- */
-export async function checkPoints(data: PointsCheckRequest): Promise<PointsCheckResponse> {
-  if (process.env.POINTS_API_MOCK === "true") {
-    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
-    const rule = MOCK_RULES.rules.find((r) => r.scene_key === data.scene_key)
-    if (!rule) {
-      throw {
-        error: {
-          code: 400,
-          message: `未知场景：${data.scene_key}`,
-          valid_scenes: MOCK_RULES.rules.map((r) => r.scene_key),
-        },
-      }
-    }
-    const durationExtra =
-      data.duration_minutes && data.duration_minutes > 0.5 && rule.extra_per_30s
-        ? Math.ceil((data.duration_minutes * 60 - 30) / 30) * rule.extra_per_30s
-        : 0
-    const base = (rule.base_points + durationExtra) * data.quantity
-    const balance = MOCK_BALANCE.balance
-    const multiplier = MOCK_BALANCE.is_member ? 1 : MOCK_RULES.free_user_multiplier
-    const required = Math.ceil(base * multiplier)
-    // 免费额度抵扣
-    const isFreeQuota = !MOCK_BALANCE.is_member && MOCK_DAILY_USAGE.free_clips_remaining > 0
-    const finalRequired = isFreeQuota ? 0 : required
-    return {
-      allowed: balance >= finalRequired,
-      required_points: finalRequired,
-      current_balance: balance,
-      remaining_after: balance - finalRequired,
-      is_free_quota: isFreeQuota,
-    }
-  }
-  const { data: d2 } = await apiClient.post(`/points/check`, data)
-  return d2
-}
-
-/* ================================================================
- * 每日免费额度 + 会员聚合信息（新接口）
- * ================================================================ */
-
-/** 获取每日免费额度使用情况 */
-export async function getDailyUsage(): Promise<DailyUsage> {
-  if (process.env.POINTS_API_MOCK === "true") {
-    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
-    return { ...MOCK_DAILY_USAGE }
-  }
-  const { data } = await apiClient.get(`/usage/daily`)
-  return data
-}
-
-/** 获取会员聚合信息（创作页可用来判断 max_resolution） */
-export async function getMembership(): Promise<MembershipResponse> {
-  if (process.env.POINTS_API_MOCK === "true") {
-    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
-    return { ...MOCK_MEMBERSHIP }
-  }
-  const { data } = await apiClient.get(`/points/subscription/membership`)
-  return data
-}

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

@@ -1,227 +0,0 @@
-/**
- * 积分系统类型定义
- * 对齐后端 staging 实测最终契约（2026-09-16）
- *
- * Base path: /api/v1/
- * 会员/订阅相关类型请从 @/api/subscription/types 引入，本文件仅保留积分核心类型。
- */
-
-/* ================================================================
- * 场景键
- * ================================================================ */
-/**
- * 积分消耗场景键（9 个）
- * - ai_script 已拆分为 douyin_extract / ai_rewrite / ai_title，前端禁止再传 ai_script
- */
-export type PointsSource =
-  | "ai_voice" // AI 配音
-  | "ai_video" // AI 视频生成
-  | "ai_digital_human" // AI 数字人
-  | "voice_clone_train" // 声音克隆训练
-  | "voice_clone_synth" // 声音克隆合成
-  | "douyin_extract" // 抖音提取文案
-  | "ai_rewrite" // AI 文案改写
-  | "ai_title" // AI 标题生成
-  | "ai_cover" // AI 封面生成
-
-/** 非消耗场景 source 前缀（用于流水 source 字段） */
-export type PointsSourceExtra =
-  PointsSource | `refund:${string}` | "recharge" | "sign_up" | "bind_phone" | "gift" | "admin"
-
-/* ================================================================
- * 通用
- * ================================================================ */
-/** ISO 8601 时间字符串 */
-export type ISODate = string
-
-/* ================================================================
- * 积分余额（GET /points/balance）
- * ================================================================ */
-export interface PointsBalance {
-  /** 当前可用积分 */
-  balance: number
-  /** 累计获得积分 */
-  total_earned: number
-  /** 累计消耗积分 */
-  total_spent: number
-  /** 是否为付费会员 */
-  is_member: boolean
-  /** 会员类型（monthly/quarterly/yearly，非会员 null）。推荐使用 /subscription/current 的 plan_id+billing_cycle 做判断 */
-  member_type: "monthly" | "quarterly" | "yearly" | null
-  /** 会员到期时间 */
-  member_expires_at: ISODate | null
-}
-
-/* ================================================================
- * 积分规则（GET /points/rules）
- * ================================================================ */
-export interface PointsRule {
-  scene_key: PointsSource
-  /** 场景中文名 */
-  name: string
-  /** 基准消耗积分（points_per_use 改名） */
-  base_points: number
-  /** 单位描述，如「次」「分钟」「个」 */
-  unit: string
-  /** 超过30秒后每30秒额外积分（视频/语音类） */
-  extra_per_30s?: number
-  /** 场景说明（后端已补回） */
-  description?: string
-}
-
-export interface PointsRulesResponse {
-  rules: PointsRule[]
-  /** 非会员消耗倍率（如 1.15） */
-  free_user_multiplier: number
-}
-
-/* ================================================================
- * 充值包（GET /points/packages）
- * ================================================================ */
-export interface PointsPackage {
-  /** 包编码（id 改名） */
-  code: string
-  name: string
-  points: number
-  /** 原价，单位分 */
-  price_cents: number
-  /** 每积分单价（元），展示用 */
-  unit_price: number
-}
-
-export interface PointsPackagesResponse {
-  packages: PointsPackage[]
-  /** 当前用户折扣（会员折扣或活动折扣），null 表示无折扣 */
-  user_discount: number | null
-}
-
-/**
- * 充值包前端展示辅助：折后价（分）
- * 后端废弃 4 档 discounted_price_for_*，前端按 price_cents * (user_discount ?? 1) 计算。
- */
-export function getDiscountPriceCents(pkg: PointsPackage, userDiscount: number | null): number {
-  return Math.round(pkg.price_cents * (userDiscount ?? 1))
-}
-
-/* ================================================================
- * 积分流水（GET /points/transactions）
- * ================================================================ */
-export type PointsTxType = "add" | "deduct"
-
-export interface PointsTransaction {
-  id: number
-  /** 流水类型：add=获得/退款，deduct=消耗 */
-  type: PointsTxType
-  /**
-   * 消耗/获得来源：
-   * - 消耗场景直接用 PointsSource 值
-   * - 充值/退款/赠送使用 recharge / refund:<source> / sign_up / bind_phone / gift / admin
-   */
-  source: string
-  /** 变动数量（绝对值，正负由 type 决定） */
-  amount: number
-  /** 变动后余额 */
-  balance_after: number
-  /** 中文描述 */
-  description: string
-  /** 关联订单/任务 ID，空字符串 "" 表示无关联（不是 null） */
-  ref_id: string
-  created_at: ISODate
-}
-
-export interface PointsTransactionsResponse {
-  items: PointsTransaction[]
-  total: number
-  page: number
-  page_size: number
-}
-
-/* ================================================================
- * 创建充值订单（POST /points/recharge）
- * ================================================================ */
-export interface CreateRechargeOrderRequest {
-  /** 充值包 code（字段名保留 package_id 与后端一致） */
-  package_id: string
-}
-
-export interface CreateRechargeOrderResponse {
-  id: string
-  order_type: string
-  product_code: string
-  /** 订单金额（分） */
-  amount_cents: number
-  /** 充值积分数量 */
-  points_amount: number
-  status: string
-  /**
-   * 支付参数（支付通道未接入时返回空对象 {}，前端可透传）
-   */
-  pay_params: Record<string, unknown>
-  /** 订单过期时间 */
-  expire_at: ISODate
-  created_at: ISODate
-}
-
-/* ================================================================
- * 积分预检查（POST /points/check）
- * ================================================================ */
-export interface PointsCheckRequest {
-  scene_key: PointsSource
-  /** 数量（units 改名） */
-  quantity: number
-  /** 预计时长（分钟），可选 */
-  duration_minutes?: number
-}
-
-export interface PointsCheckResponse {
-  /** 是否可以执行 */
-  allowed: boolean
-  /** 需要消耗积分 */
-  required_points: number
-  /** 当前余额 */
-  current_balance: number
-  /** 扣除后剩余 */
-  remaining_after: number
-  /** 是否走免费额度 */
-  is_free_quota: boolean
-}
-
-/* ================================================================
- * 每日使用情况（GET /usage/daily，新接口）
- * ================================================================ */
-export interface DailyUsage {
-  /** 今日已用免费次数 */
-  free_clips_used: number
-  /** 每日免费次数上限 */
-  free_clips_limit: number
-  /** 今日剩余免费次数 */
-  free_clips_remaining: number
-  /** 额度重置时间 */
-  reset_at: ISODate
-}
-
-/* ================================================================
- * 会员聚合信息（GET /points/subscription/membership，新接口）
- * ================================================================ */
-export interface MembershipResponse {
-  is_member: boolean
-  /** 会员类型（monthly/quarterly/yearly，非会员 null） */
-  member_type: "monthly" | "quarterly" | "yearly" | null
-  member_expires_at: ISODate | null
-  /** 当前积分余额（冗余，可与 balance 互校） */
-  points_balance: number
-  /** 最大分辨率，如 "720p" / "1080p" / "4k" */
-  max_resolution: string
-}
-
-/* ================================================================
- * 错误响应（统一格式 {error:{code,message}}）
- * ================================================================ */
-export interface ApiError {
-  error: {
-    code: number
-    message: string
-    /** 部分场景会返回，如 unknown scene_key */
-    valid_scenes?: PointsSource[]
-  }
-}

apps/web/src/api/scripts/index.ts

@@ -1,3 +1,2 @@
 export * from "./scripts"
 export * from "./types"
-export * from "./scripts-ai"

apps/web/src/api/scripts/scripts-ai.ts

@@ -1,87 +0,0 @@
-/**
- * 文案库 AI 能力 API（#1893）
- * 三个端点均走真实后端，不参与 SCRIPTS_API_MOCK 开关。
- */
-import apiClient from "../client"
-
-/** ── 1. 从抖音视频提取文案（下载 + ASR） */
-export interface ExtractFromDouyinRequest {
-  url: string
-}
-export interface ExtractFromDouyinResponse {
-  text: string
-  duration_seconds?: number
-  source_url?: string
-}
-
-export async function extractScriptFromDouyin(
-  body: ExtractFromDouyinRequest,
-  opts?: { signal?: AbortSignal },
-): Promise<ExtractFromDouyinResponse> {
-  const res = await apiClient.post<ExtractFromDouyinResponse>(
-    "/scripts/extract-from-douyin",
-    body,
-    {
-      // ASR 可能较慢，给足超时
-      timeout: 60_000,
-      signal: opts?.signal,
-    },
-  )
-  return res.data
-}
-
-/** ── 2. AI 改写文案 */
-export type RewriteStyle = "口语化" | "正式" | "活泼" | "治愈" | "励志"
-
-export const REWRITE_STYLE_OPTIONS: { value: RewriteStyle; label: string }[] = [
-  { value: "口语化", label: "口语化" },
-  { value: "正式", label: "正式" },
-  { value: "活泼", label: "活泼" },
-  { value: "治愈", label: "治愈" },
-  { value: "励志", label: "励志" },
-]
-
-export interface AiRewriteRequest {
-  content: string
-  style?: RewriteStyle
-}
-export interface AiRewriteResponse {
-  original: string
-  rewritten: string
-  style: RewriteStyle
-}
-
-export async function aiRewriteScript(
-  body: AiRewriteRequest,
-  opts?: { signal?: AbortSignal },
-): Promise<AiRewriteResponse> {
-  const res = await apiClient.post<AiRewriteResponse>("/scripts/ai-rewrite", body, {
-    timeout: 60_000,
-    signal: opts?.signal,
-  })
-  return res.data
-}
-
-/** ── 3. AI 生成标题 */
-export interface AiGenerateTitlesRequest {
-  content: string
-  count?: number
-}
-export interface AiGenerateTitlesResponse {
-  titles: string[]
-}
-
-export async function aiGenerateTitles(
-  body: AiGenerateTitlesRequest,
-  opts?: { signal?: AbortSignal },
-): Promise<AiGenerateTitlesResponse> {
-  const res = await apiClient.post<AiGenerateTitlesResponse>(
-    "/scripts/ai-generate-titles",
-    { content: body.content, count: body.count ?? 3 },
-    {
-      timeout: 30_000,
-      signal: opts?.signal,
-    },
-  )
-  return res.data
-}

apps/web/src/api/scripts/scripts.ts

@@ -1,195 +1,37 @@
 /**
- * 文案库 API（#1811 v2）
- * CRUD + 搜索/分类/分页；后端未就绪时使用 mock 数据（SCRIPTS_API_MOCK=true）
+ * 文案库 API
+ * 对接后端 /api/v1/scripts（CRUD + 列表解包）
  */
 import apiClient from "../client"
 import type {
   ScriptItem,
-  ScriptListParams,
   ScriptListResponse,
-  ScriptUpsertRequest,
-  ScriptCategory,
+  CreateScriptRequest,
+  UpdateScriptRequest,
 } from "./types"
 
-/** 是否启用 mock（后端合入后改为 false） */
-export const SCRIPTS_API_MOCK = true
-
-// ==================== Mock 数据 ====================
-
-const MOCK_CATEGORIES: ScriptCategory[] = [
-  "promo",
-  "vlog",
-  "knowledge",
-  "story",
-  "emotion",
-  "other",
-]
-
-const SAMPLE_TITLES: Record<ScriptCategory, string[]> = {
-  promo: ["新品上市限时特惠", "618大促开场", "品牌故事宣传片"],
-  vlog: ["周末citywalk记录", "打工人的一天", "探店vlog"],
-  knowledge: ["3分钟学会XX", "冷知识科普", "行业深度解读"],
-  story: ["励志小故事", "情感故事一则", "反转剧情"],
-  emotion: ["深夜emo时刻", "治愈系文案", "朋友圈金句"],
-  other: ["通用开场白", "节日祝福", "万能结尾"],
-}
-
-const SAMPLE_TAGS = ["热门", "新品", "节日", "情感", "干货", "搞笑", "治愈", "励志"]
-
-function genMockScripts(): ScriptItem[] {
-  const items: ScriptItem[] = []
-  const now = Date.now()
-  let idx = 0
-  for (const cat of MOCK_CATEGORIES) {
-    const titles = SAMPLE_TITLES[cat]
-    for (let i = 0; i < titles.length; i++) {
-      idx++
-      const title = titles[i]
-      const content = `这是一条【${cat}】分类下的示例文案，标题为「${title}」。\n\n正文可以包含多段落，每段对应一个片段（segments）。\n\n此为 mock 数据，后端接口就绪后会自动切换为真实数据。`
-      const segments = content.split(/\n\n+/).filter(Boolean)
-      const tagCount = 1 + (idx % 3)
-      const tags: string[] = []
-      for (let t = 0; t < tagCount; t++) {
-        tags.push(SAMPLE_TAGS[(idx + t) % SAMPLE_TAGS.length])
-      }
-      items.push({
-        id: `mock_${idx}`,
-        title,
-        content,
-        segments,
-        tags,
-        title_text: title,
-        title_category: cat,
-        title_config: {
-          font: "default",
-          color: "#ffffff",
-          stroke: "#000000",
-          position: (["top", "center", "bottom"] as const)[idx % 3],
-          size: 48,
-          bold: idx % 2 === 0,
-          italic: false,
-        },
-        char_count: content.length,
-        use_count: Math.floor(Math.random() * 50),
-        created_at: new Date(now - idx * 86400_000 * 2).toISOString(),
-        updated_at: new Date(now - idx * 86400_000).toISOString(),
-      })
-    }
-  }
-  return items
-}
-
-const MOCK_SCRIPTS = genMockScripts()
-
-// ==================== 真实 API ====================
-
-/** 获取文案列表（支持分页/搜索/分类） */
-export async function getScripts(params: ScriptListParams = {}): Promise<ScriptListResponse> {
-  if (SCRIPTS_API_MOCK) {
-    const page = params.page ?? 1
-    const pageSize = params.page_size ?? 20
-    let items = [...MOCK_SCRIPTS]
-    if (params.keyword) {
-      const kw = params.keyword.toLowerCase()
-      items = items.filter(
-        (s) => s.title.toLowerCase().includes(kw) || s.content.toLowerCase().includes(kw),
-      )
-    }
-    if (params.category && params.category !== "all") {
-      items = items.filter((s) => s.title_category === params.category)
-    }
-    if (params.tag) {
-      items = items.filter((s) => s.tags?.includes(params.tag as string))
-    }
-    const total = items.length
-    const start = (page - 1) * pageSize
-    const pageItems = items.slice(start, start + pageSize)
-    return new Promise((r) =>
-      setTimeout(() => r({ items: pageItems, total, page, page_size: pageSize }), 200),
-    )
-  }
-  const res = await apiClient.get<ScriptListResponse>("/scripts", { params })
-  return res.data
-}
-
-/** 获取单条文案详情 */
-export async function getScript(id: string): Promise<ScriptItem> {
-  if (SCRIPTS_API_MOCK) {
-    const item = MOCK_SCRIPTS.find((s) => s.id === id)
-    return new Promise((r) => setTimeout(() => r(item ?? MOCK_SCRIPTS[0]), 120))
-  }
-  const res = await apiClient.get<ScriptItem>(`/scripts/${id}`)
-  return res.data
+/** 获取文案列表 — 必须解包 items（后端返回 {items,total}）*/
+export const getScripts = async (): Promise<ScriptItem[]> => {
+  const response = await apiClient.get<ScriptListResponse | ScriptItem[]>("/scripts")
+  const data = response.data as unknown
+  if (Array.isArray(data)) return data
+  const items = (data as { items?: ScriptItem[] })?.items
+  return Array.isArray(items) ? items : []
 }
 
 /** 新建文案 */
-export async function createScript(data: ScriptUpsertRequest): Promise<ScriptItem> {
-  if (SCRIPTS_API_MOCK) {
-    const segments =
-      data.segments && data.segments.length > 0
-        ? data.segments
-        : data.content.split(/\n\n+/).filter(Boolean)
-    const item: ScriptItem = {
-      id: `mock_${Date.now()}`,
-      ...data,
-      segments,
-      char_count: data.content.length,
-      use_count: 0,
-      tags: data.tags ?? [],
-      created_at: new Date().toISOString(),
-      updated_at: new Date().toISOString(),
-    }
-    MOCK_SCRIPTS.unshift(item)
-    return new Promise((r) => setTimeout(() => r(item), 200))
-  }
-  const res = await apiClient.post<ScriptItem>("/scripts", data)
-  return res.data
+export const createScript = async (data: CreateScriptRequest): Promise<ScriptItem> => {
+  const response = await apiClient.post<ScriptItem>("/scripts", data)
+  return response.data
 }
 
 /** 更新文案 */
-export async function updateScript(id: string, data: ScriptUpsertRequest): Promise<ScriptItem> {
-  if (SCRIPTS_API_MOCK) {
-    const idx = MOCK_SCRIPTS.findIndex((s) => s.id === id)
-    const segments =
-      data.segments && data.segments.length > 0
-        ? data.segments
-        : data.content.split(/\n\n+/).filter(Boolean)
-    const updated: ScriptItem = {
-      ...MOCK_SCRIPTS[idx],
-      ...data,
-      segments,
-      char_count: data.content.length,
-      tags: data.tags ?? MOCK_SCRIPTS[idx]?.tags ?? [],
-      updated_at: new Date().toISOString(),
-    }
-    if (idx >= 0) MOCK_SCRIPTS[idx] = updated
-    return new Promise((r) => setTimeout(() => r(updated), 200))
-  }
-  const res = await apiClient.put<ScriptItem>(`/scripts/${id}`, data)
-  return res.data
+export const updateScript = async (id: string, data: UpdateScriptRequest): Promise<ScriptItem> => {
+  const response = await apiClient.put<ScriptItem>(`/scripts/${id}`, data)
+  return response.data
 }
 
 /** 删除文案 */
-export async function deleteScript(id: string): Promise<void> {
-  if (SCRIPTS_API_MOCK) {
-    const idx = MOCK_SCRIPTS.findIndex((s) => s.id === id)
-    if (idx >= 0) MOCK_SCRIPTS.splice(idx, 1)
-    return new Promise((r) => setTimeout(r, 150))
-  }
+export const deleteScript = async (id: string): Promise<void> => {
   await apiClient.delete(`/scripts/${id}`)
 }
-
-/** 复制文案（返回新副本） */
-export async function duplicateScript(id: string): Promise<ScriptItem> {
-  const orig = await getScript(id)
-  const copy = await createScript({
-    title: `${orig.title}（副本）`,
-    content: orig.content,
-    segments: orig.segments,
-    tags: orig.tags,
-    title_text: orig.title_text,
-    title_category: orig.title_category,
-    title_config: orig.title_config,
-  })
-  return copy
-}

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

@@ -1,97 +1,24 @@
 /**
- * 文案库 API — 类型定义（#1811 v2 完整字段版）
- * 字段对齐后端契约：title / content / segments / tags / title_text / title_category / title_config
- * 同时保留 char_count / use_count / timestamps 等展示字段
+ * 文案库 API — 类型定义
+ * 对接后端 /api/v1/scripts
  */
-
-/** 标题配置（字体、颜色、位置、字号） */
-export interface ScriptTitleConfig {
-  /** 字体预设 key，如 "default" / "bold" / "handwritten" */
-  font?: string
-  /** 文字颜色（CSS color） */
-  color?: string
-  /** 描边色 */
-  stroke?: string
-  /** 位置：top / center / bottom */
-  position?: "top" | "center" | "bottom"
-  /** 字号（px） */
-  size?: number
-  /** 是否加粗 */
-  bold?: boolean
-  /** 是否斜体 */
-  italic?: boolean
-}
-
-/** 文案分类（可枚举，也支持自定义） */
-export type ScriptCategory =
-  | "promo" // 营销推广
-  | "vlog" // Vlog/日常
-  | "knowledge" // 知识科普
-  | "story" // 故事剧情
-  | "emotion" // 情感语录
-  | "other" // 其他
-
-export const SCRIPT_CATEGORY_LABEL: Record<ScriptCategory, string> = {
-  promo: "营销推广",
-  vlog: "Vlog 日常",
-  knowledge: "知识科普",
-  story: "故事剧情",
-  emotion: "情感语录",
-  other: "其他",
-}
-
-/** 文案条目 */
 export interface ScriptItem {
   id: string
-  /** 名称（标题） */
   title: string
-  /** 正文 */
   content: string
-  /** 分段（按段落切分，供后端/生成步骤逐段使用） */
-  segments?: string[]
-  /** 标签（逗号分隔或数组，列表展示用 Tag） */
-  tags?: string[]
-  /** 配套标题文本（选填，"使用"跳创作页时会预填到标题） */
-  title_text?: string
-  /** 分类 */
-  title_category?: ScriptCategory
-  /** 标题样式配置（字体/颜色/位置/字号） */
-  title_config?: ScriptTitleConfig
-  /** 正文字符数（后端返回，前端用于展示） */
-  char_count?: number
-  /** 使用次数（后端返回） */
-  use_count?: number
+  char_count: number
   created_at: string
   updated_at?: string
 }
 
-/** 列表查询参数（支持搜索/分类/分页） */
-export interface ScriptListParams {
-  page?: number
-  page_size?: number
-  /** 标题/正文模糊搜索 */
-  keyword?: string
-  /** 分类筛选 */
-  category?: ScriptCategory | "all"
-  /** 标签筛选 */
-  tag?: string
-}
-
-/** 列表响应 */
 export interface ScriptListResponse {
   items: ScriptItem[]
   total: number
-  page: number
-  page_size: number
 }
 
-/** 创建/编辑请求 */
-export interface ScriptUpsertRequest {
+export interface CreateScriptRequest {
   title: string
   content: string
-  segments?: string[]
-  tags?: string[]
-  title_text?: string
-  title_category?: ScriptCategory
-  title_config?: ScriptTitleConfig
 }
+
+export type UpdateScriptRequest = Partial<CreateScriptRequest>

apps/web/src/api/subscription/index.ts

@@ -1,30 +1,24 @@
 /**
  * 订阅 API — 目录化入口
- * 对齐后端 staging 最终契约（2026-09-16）
+ * 保持与原 subscription.ts 相同导出，向后兼容
  */
 
 // 类型
 export type {
-  PlanId,
   PlanType,
   SubscriptionStatus,
   BillingStatus,
   BillingCycle,
+  Plan,
   SubscriptionInfo,
-  SubscriptionPlan,
-  SubscriptionPlansResponse,
   BillingRecord,
   ChangePlanRequest,
   ChangePlanResponse,
-  ToggleAutoRenewRequest,
 } from "./types"
 
-export { PLAN_LABEL, BILLING_CYCLE_LABEL } from "./types"
-
 // API 函数
 export {
   getCurrentSubscription,
-  getSubscriptionPlans,
   getBillingRecords,
   changePlan,
   cancelSubscription,

apps/web/src/api/subscription/subscription.ts

@@ -1,154 +1,47 @@
 /**
- * 订阅/会员 API 封装
- * 对齐后端 staging 实测最终契约（2026-09-16）
- *
- * Base path: /api/v1/
- * 所有请求走 apiClient（已配置 baseURL=/api/v1 和 token 拦截器）。
+ * 订阅相关 API 函数
  */
 import apiClient from "../client"
 import type {
-  SubscriptionInfo,
-  SubscriptionPlan,
-  SubscriptionPlansResponse,
   BillingRecord,
   ChangePlanRequest,
   ChangePlanResponse,
-  ToggleAutoRenewRequest,
+  SubscriptionInfo,
 } from "./types"
 
-const MOCK_DELAY = 500
-
-const MOCK_SUBSCRIPTION: SubscriptionInfo = {
-  id: "sub_mock_001",
-  plan_id: "free",
-  plan_name: "免费版",
-  status: "active",
-  billing_cycle: "monthly",
-  current_period_start: new Date(Date.now() - 30 * 86400_000).toISOString(),
-  current_period_end: new Date(Date.now() + 30 * 86400_000).toISOString(),
-  amount: 0,
-  auto_renew: false,
-  created_at: new Date(Date.now() - 30 * 86400_000).toISOString(),
-}
-
-const MOCK_PLANS: SubscriptionPlan[] = [
-  {
-    plan_id: "free",
-    name: "免费版",
-    price_cents: 0,
-    monthly_price_cents: 0,
-    duration_days: 0,
-    points_discount: 1,
-    features: { max_resolution: "720p", free_clips_daily: 3 },
-  },
-  {
-    plan_id: "monthly",
-    name: "月度会员",
-    price_cents: 1990,
-    monthly_price_cents: 1990,
-    duration_days: 30,
-    points_discount: 0.9,
-    features: { max_resolution: "1080p", free_clips_daily: 10 },
-  },
-  {
-    plan_id: "quarterly",
-    name: "季度会员",
-    price_cents: 3990,
-    monthly_price_cents: 1330,
-    duration_days: 90,
-    points_discount: 0.85,
-    features: { max_resolution: "1080p", free_clips_daily: 15 },
-  },
-  {
-    plan_id: "yearly",
-    name: "年度会员",
-    price_cents: 15900,
-    monthly_price_cents: 1325,
-    duration_days: 365,
-    points_discount: 0.8,
-    features: { max_resolution: "4k", free_clips_daily: 30 },
-  },
-]
-
-const MOCK_BILLING: BillingRecord[] = []
-
-const isMock = () => (process.env.POINTS_API_MOCK as string | undefined) === "true"
-
-/** 获取当前订阅 */
+/** 获取当前订阅信息 */
 export const getCurrentSubscription = async (): Promise<SubscriptionInfo> => {
-  if (isMock()) {
-    await new Promise((r) => setTimeout(r, MOCK_DELAY))
-    return { ...MOCK_SUBSCRIPTION }
-  }
-  const { data } = await apiClient.get("/subscription/current")
-  return data
+  const response = await apiClient.get("/subscription/current")
+  return response.data
 }
 
-/** 获取所有订阅档位 */
-export const getSubscriptionPlans = async (): Promise<SubscriptionPlansResponse> => {
-  if (isMock()) {
-    await new Promise((r) => setTimeout(r, MOCK_DELAY))
-    return { plans: MOCK_PLANS.map((p) => ({ ...p, features: { ...p.features } })) }
-  }
-  const { data } = await apiClient.get("/subscription/plans")
-  return data
-}
-
-/** 获取账单记录 */
+/** 获取账单记录列表 */
 export const getBillingRecords = async (): Promise<BillingRecord[]> => {
-  if (isMock()) {
-    await new Promise((r) => setTimeout(r, MOCK_DELAY))
-    return MOCK_BILLING.map((r) => ({ ...r }))
-  }
-  const { data } = await apiClient.get("/subscription/billing-records")
-  return data
+  const response = await apiClient.get("/subscription/billing-records")
+  return response.data
 }
 
 /** 升级/降级套餐 */
 export const changePlan = async (request: ChangePlanRequest): Promise<ChangePlanResponse> => {
-  if (isMock()) {
-    await new Promise((r) => setTimeout(r, MOCK_DELAY * 2))
-    const plan = MOCK_PLANS.find((p) => p.plan_id === request.target_plan_id)
-    if (!plan) return { success: false, message: "套餐不存在" }
-    const newSub: SubscriptionInfo = {
-      ...MOCK_SUBSCRIPTION,
-      plan_id: plan.plan_id,
-      plan_name: plan.name,
-      billing_cycle: request.billing_cycle,
-      amount: plan.price_cents,
-      status: "pending",
-      current_period_start: new Date().toISOString(),
-      current_period_end: new Date(Date.now() + plan.duration_days * 86400_000).toISOString(),
-      auto_renew: true,
-    }
-    return {
-      success: true,
-      message: "订阅变更成功（mock，支付通道待接入）",
-      new_subscription: newSub,
-    }
-  }
-  const { data } = await apiClient.post("/subscription/change-plan", request)
-  return data
+  const response = await apiClient.post("/subscription/change-plan", request)
+  return response.data
 }
 
-/** 取消订阅（到期后失效） */
-export const cancelSubscription = async (): Promise<{ success: boolean; message: string }> => {
-  if (isMock()) {
-    await new Promise((r) => setTimeout(r, MOCK_DELAY))
-    return { success: true, message: "已取消订阅，到期后将不再续费" }
-  }
-  const { data } = await apiClient.post("/subscription/cancel")
-  return data
+/** 取消订阅 */
+export const cancelSubscription = async (): Promise<{
+  success: boolean
+  message: string
+}> => {
+  const response = await apiClient.post("/subscription/cancel")
+  return response.data
 }
 
 /** 切换自动续费 */
 export const toggleAutoRenew = async (
-  req: ToggleAutoRenewRequest,
+  enabled: boolean,
 ): Promise<{ success: boolean; message: string }> => {
-  if (isMock()) {
-    await new Promise((r) => setTimeout(r, MOCK_DELAY))
-    return { success: true, message: req.enabled ? "已开启自动续费" : "已关闭自动续费" }
-  }
-  const { data } = await apiClient.post("/subscription/toggle-auto-renew", req)
-  return data
+  const response = await apiClient.post("/subscription/toggle-auto-renew", {
+    enabled,
+  })
+  return response.data
 }

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

@@ -1,115 +1,65 @@
 /**
- * 订阅/会员类型定义
- * 对齐后端 staging 实测最终契约（2026-09-16）
- *
- * Base path: /api/v1/
+ * 订阅相关类型定义
  */
 
-/** 订阅计划 ID */
-export type PlanId = "free" | "monthly" | "quarterly" | "yearly"
-
-/** 计费周期 */
-export type BillingCycle = "monthly" | "yearly"
+/** 套餐类型 */
+export type PlanType = "free" | "standard" | "pro" | "enterprise"
 
 /** 订阅状态 */
-export type SubscriptionStatus = "active" | "expired" | "cancelled" | "pending"
+export type SubscriptionStatus = "active" | "expired" | "cancelled" | "trial"
 
 /** 账单状态 */
 export type BillingStatus = "paid" | "pending" | "failed" | "refunded"
 
-/* ================================================================
- * 当前订阅（GET /subscription/current）
- * ================================================================ */
+/** 计费周期 */
+export type BillingCycle = "monthly" | "yearly"
+
+/** 套餐信息 */
+export interface Plan {
+  id: PlanType
+  name: string
+  price: number | null
+  yearly_price?: number | null
+  description: string
+  recommended: boolean
+  features: string[]
+}
+
+/** 当前订阅信息 */
 export interface SubscriptionInfo {
   id: string
-  plan_id: PlanId
+  plan_id: PlanType
   plan_name: string
   status: SubscriptionStatus
-  /** 当前计费周期：monthly 对月卡/季卡按自然月续费；yearly 对年卡 */
   billing_cycle: BillingCycle
   current_period_start: string
   current_period_end: string
-  /** 本期金额（分） */
   amount: number
   auto_renew: boolean
   created_at: string
 }
 
-/* ================================================================
- * 订阅计划（GET /subscription/plans）
- * ================================================================ */
-export interface SubscriptionPlan {
-  plan_id: PlanId
-  /** 中文名 */
-  name: string
-  /** 价格（分），年卡/季卡为总价 */
-  price_cents: number
-  /** 折算月价（分），对比用 */
-  monthly_price_cents: number
-  /** 时长（天） */
-  duration_days: number
-  /** 积分折扣（0.9 = 9折，1 = 无折扣） */
-  points_discount: number
-  features: {
-    max_resolution: string
-    free_clips_daily: number
-    [key: string]: unknown
-  }
-}
-
-export interface SubscriptionPlansResponse {
-  plans: SubscriptionPlan[]
-}
-
-/* ================================================================
- * 账单（GET /subscription/billing-records）
- * ================================================================ */
+/** 账单记录 */
 export interface BillingRecord {
   id: string
-  /** 订单类型：subscribe/renew/upgrade/refund */
-  order_type: string
-  plan_id: PlanId
-  /** 金额（分） */
-  amount_cents: number
+  plan_name: string
+  amount: number
+  billing_cycle: BillingCycle
   status: BillingStatus
+  payment_method: string
   created_at: string
-  paid_at?: string
+  invoice_url?: string
 }
 
-/* ================================================================
- * 变更/取消/开关自动续费
- * ================================================================ */
+/** 升级/降级请求 */
 export interface ChangePlanRequest {
-  target_plan_id: PlanId
+  target_plan_id: PlanType
   billing_cycle: BillingCycle
 }
 
+/** 升级/降级响应 */
 export interface ChangePlanResponse {
   success: boolean
   message: string
   new_subscription?: SubscriptionInfo
 }
-
-export interface ToggleAutoRenewRequest {
-  enabled: boolean
-}
-
-/* ================================================================
- * 中文标签映射
- * ================================================================ */
-export const PLAN_LABEL: Record<PlanId, string> = {
-  free: "免费版",
-  monthly: "月度会员",
-  quarterly: "季度会员",
-  yearly: "年度会员",
-}
-
-export const BILLING_CYCLE_LABEL: Record<BillingCycle, string> = {
-  monthly: "月付",
-  yearly: "年付",
-}
-
-/**
- * @deprecated 旧命名保留别名，新代码请直接用 PlanId
- */
-export type PlanType = PlanId

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

@@ -85,13 +85,9 @@ export async function batchDeleteEditPlanClips(
   return response.data
 }
 
-/**
- * 从素材批量创建片段（追加到时间线末尾）。
- * #1921 修复：templateId 为空时调用新端点 POST /clips/from-assets，避免拼出双斜杠
- * `/templates//editor/clips/from-assets` 导致 404；有 templateId 时保持原路径向后兼容。
- */
+/** 从素材批量创建片段（追加到时间线末尾） */
 export async function createClipsFromAssets(
-  templateId: string | undefined | null,
+  templateId: string,
   assetIds: string[],
   clipType = "main",
   requiredClipsCount?: number,
@@ -104,15 +100,16 @@ export async function createClipsFromAssets(
   if (requiredClipsCount !== undefined) {
     body.required_clips_count = requiredClipsCount
   }
-  // 新端点（#1921）：templateId 为空时，body 不传 template_id，由后端兜底创建默认模板
-  const hasTid = !!templateId
-  const url = hasTid ? `/templates/${templateId}/editor/clips/from-assets` : "/clips/from-assets"
   // from-assets 后端会调用 MediaKit 智能选片（最长 60s），单独延长超时
-  const response = await apiClient.post<ClipsFromAssetsResponse>(url, body, {
-    timeout: 60000,
-    signal: opts?.signal,
-    // _silentErrorToast 由 api/client.ts 响应拦截器读取（抑制全局错误 toast，#1777）
-    ...(opts?.silentErrorToast ? ({ _silentErrorToast: true } as Record<string, unknown>) : {}),
-  })
+  const response = await apiClient.post<ClipsFromAssetsResponse>(
+    `/templates/${templateId}/editor/clips/from-assets`,
+    body,
+    {
+      timeout: 60000,
+      signal: opts?.signal,
+      // _silentErrorToast 由 api/client.ts 响应拦截器读取（抑制全局错误 toast，#1777）
+      ...(opts?.silentErrorToast ? ({ _silentErrorToast: true } as Record<string, unknown>) : {}),
+    },
+  )
   return response.data
 }

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

@@ -16,7 +16,6 @@ export interface TTSSynthesizeRequest {
   voice_id?: string
   output_name?: string
   language?: string
-  emotion?: string
   speed?: number
   voice_model?: string
   voice_clone_profile_id?: string
@@ -104,8 +103,7 @@ export interface TTSPreviewRequest {
   voice_id: string
   speed?: number
   pitch?: number
-  language?: string
-  emotion?: string // 情绪参数：neutral/happy/sad/angry/surprised/fearful/disgusted（后端 normalize_emotion() 兼容旧 natural/excited/calm/friendly 与中文标签）
+  emotion?: string // 情绪参数：natural/excited/calm/friendly
 }
 
 /** TTS 试听响应 */

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

@@ -96,12 +96,9 @@ export const retryVoiceClone = async (id: string): Promise<VoiceCloneProfile> =>
 export const getVoiceClonePreview = async (
   cloneId: string,
   text?: string,
-  options?: { speed?: number; emotion?: string },
 ): Promise<VoiceClonePreviewResponse> => {
   const searchParams = new URLSearchParams()
   if (text) searchParams.set("text", text)
-  if (options?.speed !== undefined) searchParams.set("speed", String(options.speed))
-  if (options?.emotion) searchParams.set("emotion", options.emotion)
   const qs = searchParams.toString()
   const response = await apiClient.get<VoiceClonePreviewResponse>(
     `/voice-clones/${cloneId}/preview${qs ? `?${qs}` : ""}`,

apps/web/src/components/common/PointsBadge/PointsBadge.css

@@ -1,116 +0,0 @@
-/* Header 积分徽章 & Popover 样式 */
-.xx-points-badge {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  padding: 5px 12px;
-  border-radius: 999px;
-  border: 1px solid var(--border-color, #e5e7eb);
-  background: var(--bg-tertiary, #fafafa);
-  color: var(--text-secondary, #6b7280);
-  font-size: 13px;
-  font-weight: 600;
-  cursor: pointer;
-  transition: all 0.15s ease;
-  line-height: 1;
-  height: 32px;
-}
-
-.xx-points-badge:hover {
-  border-color: var(--primary-color, #6366f1);
-  color: var(--primary-color, #6366f1);
-  background: var(--primary-soft, #eef2ff);
-}
-
-.xx-points-badge.zero {
-  color: #faad14;
-  border-color: #ffe58f;
-  background: #fffbe6;
-}
-
-.xx-points-badge.low {
-  color: #fa8c16;
-  border-color: #ffd591;
-  background: #fff7e6;
-}
-
-.xx-points-badge-icon {
-  font-size: 14px;
-  color: #8b5cf6;
-}
-
-.xx-points-badge.zero .xx-points-badge-icon,
-.xx-points-badge.low .xx-points-badge-icon {
-  color: inherit;
-}
-
-.xx-points-badge-val {
-  font-variant-numeric: tabular-nums;
-}
-
-/* Popover */
-.xx-points-popover {
-  width: 260px;
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.xx-points-popover-top {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.xx-points-popover-balance {
-  display: flex;
-  align-items: baseline;
-  gap: 6px;
-}
-
-.xx-points-icon {
-  color: #8b5cf6;
-  font-size: 18px;
-}
-
-.xx-points-value {
-  font-size: 22px;
-  font-weight: 800;
-  color: var(--text-primary, #111827);
-  font-variant-numeric: tabular-nums;
-}
-
-.xx-points-unit {
-  color: var(--text-secondary, #6b7280);
-  font-size: 12px;
-}
-
-.xx-points-warn {
-  margin: 0 !important;
-  padding: 8px 10px;
-  background: #fffbe6;
-  border-radius: var(--radius-sm, 6px);
-  font-size: 12px;
-}
-
-.xx-points-expire {
-  font-size: 12px;
-  display: block;
-}
-
-.xx-points-popover-stats {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 12px;
-  padding: 10px;
-  background: var(--bg-tertiary, #fafafa);
-  border-radius: var(--radius-sm, 6px);
-}
-
-.xx-points-stat-val {
-  font-size: 16px;
-  font-weight: 700;
-  color: var(--text-primary, #111827);
-  margin-top: 2px;
-  font-variant-numeric: tabular-nums;
-}

apps/web/src/components/common/PointsBadge/index.tsx

@@ -1,131 +0,0 @@
-/**
- * Header 右上角积分徽章
- * - 余额 <10 时橙色告警
- * - 点击弹出 Popover：余额、会员信息、充值入口、积分明细入口
- *
- * 字段对齐新契约：
- * - balance.is_member / balance.member_type 保留但降级；推荐用 membership.member_type
- * - 免费额度、会员 max_resolution 在 popover 展示
- */
-import React, { useEffect } from "react"
-import { Popover, Button, Tag, Space, Typography, Badge } from "antd"
-import {
-  ThunderboltOutlined,
-  CrownOutlined,
-  RightOutlined,
-  WarningOutlined,
-} from "@ant-design/icons"
-import { useNavigate } from "react-router-dom"
-import { usePointsStore } from "@/store/pointsStore"
-import "./PointsBadge.css"
-
-const { Text, Paragraph } = Typography
-
-const MEMBER_LABEL: Record<string, string> = {
-  monthly: "月卡会员",
-  quarterly: "季卡会员",
-  yearly: "年卡会员",
-}
-
-const PointsBadge: React.FC = () => {
-  const navigate = useNavigate()
-  const { balance, membership, subscription, dailyUsage, init, loading } = usePointsStore()
-
-  useEffect(() => {
-    if (!balance) init()
-  }, [balance, init])
-
-  // 余额：优先用 membership.points_balance（冗余字段），降级 balance.balance
-  const bal = membership?.points_balance ?? balance?.balance ?? 0
-  const lowBalance = bal > 0 && bal < 10
-  const zero = bal === 0
-  const isMember = membership?.is_member ?? balance?.is_member ?? false
-  const memberKey =
-    membership?.member_type ??
-    (subscription?.plan_id && subscription.plan_id !== "free" ? subscription.plan_id : null)
-  const memberLabel = memberKey ? MEMBER_LABEL[memberKey] || "付费会员" : "免费会员"
-  const maxRes = membership?.max_resolution
-
-  const freeRemain = dailyUsage?.free_clips_remaining ?? 0
-
-  const popContent = (
-    <div className="xx-points-popover">
-      <div className="xx-points-popover-top">
-        <div className="xx-points-popover-balance">
-          <ThunderboltOutlined className="xx-points-icon" />
-          <span className="xx-points-value">{loading ? "…" : bal}</span>
-          <span className="xx-points-unit">积分</span>
-        </div>
-        <Tag color={isMember ? "gold" : "default"} icon={<CrownOutlined />}>
-          {memberLabel}
-        </Tag>
-      </div>
-
-      {(zero || lowBalance) && (
-        <Paragraph type="warning" className="xx-points-warn">
-          <WarningOutlined /> 积分不足，充值后可继续使用 AI 功能
-        </Paragraph>
-      )}
-
-      {!isMember && dailyUsage && freeRemain > 0 && (
-        <Text type="secondary" className="xx-points-expire">
-          今日剩余免费次数：{freeRemain}/{dailyUsage.free_clips_limit}
-        </Text>
-      )}
-
-      {balance?.member_expires_at && isMember && (
-        <Text type="secondary" className="xx-points-expire">
-          会员到期：{new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}
-          {maxRes ? ` · ${maxRes}` : ""}
-        </Text>
-      )}
-
-      <div className="xx-points-popover-stats">
-        <div>
-          <Text type="secondary">累计获得</Text>
-          <div className="xx-points-stat-val">+{balance?.total_earned ?? 0}</div>
-        </div>
-        <div>
-          <Text type="secondary">累计消耗</Text>
-          <div className="xx-points-stat-val">-{balance?.total_spent ?? 0}</div>
-        </div>
-      </div>
-
-      <Space direction="vertical" style={{ width: "100%" }} size={8}>
-        <Button
-          type="primary"
-          icon={<ThunderboltOutlined />}
-          block
-          onClick={() => navigate("/points/recharge")}
-        >
-          充值积分
-        </Button>
-        <Button block onClick={() => navigate("/points/transactions")}>
-          积分明细
-          <RightOutlined />
-        </Button>
-        {!isMember && (
-          <Button block type="link" onClick={() => navigate("/subscription")}>
-            <CrownOutlined /> 升级会员享折扣
-          </Button>
-        )}
-      </Space>
-    </div>
-  )
-
-  return (
-    <Popover content={popContent} placement="bottomRight" trigger="click" arrow={false}>
-      <button
-        type="button"
-        className={`xx-points-badge ${zero ? "zero" : lowBalance ? "low" : ""}`}
-      >
-        <Badge dot={zero} color={zero ? "#faad14" : undefined}>
-          <ThunderboltOutlined className="xx-points-badge-icon" />
-        </Badge>
-        <span className="xx-points-badge-val">{loading ? "…" : bal}</span>
-      </button>
-    </Popover>
-  )
-}
-
-export default PointsBadge

apps/web/src/components/common/PointsCost/PointsCost.css

@@ -1,67 +0,0 @@
-/* 功能按钮旁的积分消耗提示 */
-.xx-points-cost {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  font-size: 12px;
-  color: var(--text-secondary, #6b7280);
-  font-weight: 500;
-  white-space: nowrap;
-}
-
-.xx-points-cost.free,
-.xx-points-cost.free-quota {
-  color: #10b981;
-}
-
-.xx-points-cost.insufficient {
-  color: #ef4444;
-}
-
-.xx-points-gem {
-  font-size: 12px;
-  line-height: 1;
-}
-
-.xx-points-num {
-  font-weight: 700;
-  font-variant-numeric: tabular-nums;
-  color: inherit;
-}
-
-.xx-points-unit-label {
-  color: var(--text-tertiary, #9ca3af);
-}
-
-.xx-points-tag-free {
-  display: inline-flex;
-  align-items: center;
-  padding: 1px 6px;
-  border-radius: 4px;
-  background: #d1fae5;
-  color: #059669;
-  font-size: 11px;
-  font-weight: 600;
-}
-
-.xx-points-free-user-tag {
-  display: inline-flex;
-  align-items: center;
-  padding: 1px 6px;
-  border-radius: 4px;
-  background: #fef3c7;
-  color: #d97706;
-  font-size: 10px;
-  font-weight: 600;
-  margin-left: 4px;
-}
-
-.xx-points-desc {
-  color: var(--text-tertiary, #9ca3af);
-  font-size: 11px;
-}
-
-.xx-points-warn-icon {
-  color: #ef4444;
-  margin-left: 2px;
-}

apps/web/src/components/common/PointsCost/index.tsx

@@ -1,169 +0,0 @@
-/**
- * 功能操作按钮旁的"消耗积分"提示
- * 例：[生成配音] 💎 -1 积分
- *  - 根据 scene_key 自动读取规则（来自 store.rules）
- *  - 免费用户自动计算 ×free_user_multiplier 向上取整
- *  - 会员 floor(base × points_discount)
- *  - 余额不足时显示红色告警 + 充值提示
- *
- * 字段对齐新契约：
- *  - rule.points_per_use → base_points
- *  - balance.free_clips_remaining → dailyUsage.free_clips_remaining
- *  - props.units → 保留兼容，新代码优先用 quantity
- */
-import React, { useMemo } from "react"
-import { Tooltip } from "antd"
-import { WarningOutlined } from "@ant-design/icons"
-import { usePointsStore } from "@/store/pointsStore"
-import type { PointsSource } from "@/api/points/types"
-import "./PointsCost.css"
-
-interface Props {
-  /** 消耗场景 key */
-  scene: PointsSource
-  /** 数量（新字段），默认 1 */
-  quantity?: number
-  /** 预计时长（分钟），可选 */
-  durationMinutes?: number
-  /** 是否显示为紧凑模式（仅图标+数字，不显示单位文字） */
-  compact?: boolean
-  /** 余额不足时，是否显示充值提示 */
-  showRechargeHint?: boolean
-  /** 自定义 class */
-  className?: string
-  /**
-   * @deprecated 旧字段保留兼容，内部映射为 quantity
-   */
-  units?: number
-}
-
-/** 单位中文 */
-const UNIT_LABEL: Record<string, string> = {
-  分钟: "分钟",
-  条: "条",
-  次: "次",
-  张: "张",
-}
-
-const PointsCost: React.FC<Props> = ({
-  scene,
-  quantity,
-  units,
-  durationMinutes,
-  compact = false,
-  showRechargeHint = true,
-  className = "",
-}) => {
-  const { balance, dailyUsage, rules, membership } = usePointsStore()
-  const qty = quantity ?? units ?? 1
-
-  const { cost, isFreeQuota, rule, isFreeUser, insufficient, freeRemain } = useMemo(() => {
-    const isMem = membership?.is_member ?? balance?.is_member ?? false
-    if (!rules || !balance) {
-      return {
-        cost: 0,
-        isFreeQuota: false,
-        rule: null,
-        isFreeUser: !isMem,
-        insufficient: false,
-        freeRemain: 0,
-      }
-    }
-    const rule = rules.rules.find((r) => r.scene_key === scene)
-    if (!rule)
-      return {
-        cost: 0,
-        isFreeQuota: false,
-        rule: null,
-        isFreeUser: !isMem,
-        insufficient: false,
-        freeRemain: 0,
-      }
-    // 免费训练不扣费
-    if (rule.base_points === 0) {
-      return {
-        cost: 0,
-        isFreeQuota: false,
-        rule,
-        isFreeUser: !isMem,
-        insufficient: false,
-        freeRemain: 0,
-      }
-    }
-
-    // 计算 base
-    let baseCost: number
-    if (scene === "ai_video" && rule.extra_per_30s) {
-      const minutes = durationMinutes ?? qty
-      const segments = Math.max(1, Math.ceil(minutes * 2))
-      baseCost = rule.base_points + rule.extra_per_30s * (segments - 1)
-    } else {
-      baseCost = rule.base_points * Math.max(1, qty)
-    }
-
-    // 非会员 + 今日免费额度 → 免费
-    const freeRemain = dailyUsage?.free_clips_remaining ?? 0
-    const isFree = scene === "ai_video" && !isMem && freeRemain > 0
-
-    const multiplier = rules.free_user_multiplier ?? 1.15
-    const cost = isFree ? 0 : isMem ? Math.floor(baseCost) : Math.ceil(baseCost * multiplier)
-    const insufficient = !isFree && balance.balance < cost
-    return {
-      cost,
-      isFreeQuota: isFree,
-      rule,
-      isFreeUser: !isMem,
-      insufficient,
-      freeRemain,
-    }
-  }, [rules, balance, dailyUsage, membership, scene, qty, durationMinutes])
-
-  if (!rule || !balance) {
-    return <span className={`xx-points-cost ${className}`} />
-  }
-
-  if (rule.base_points === 0) {
-    return (
-      <span className={`xx-points-cost free ${className}`}>
-        <span className="xx-points-tag-free">免费</span>
-      </span>
-    )
-  }
-
-  if (isFreeQuota) {
-    return (
-      <Tooltip title={`今日免费额度剩余 ${freeRemain} 条，不扣积分`}>
-        <span className={`xx-points-cost free-quota ${className}`}>
-          <span className="xx-points-tag-free">免费</span>
-          {!compact && <span className="xx-points-desc">（今日剩余 {freeRemain} 条）</span>}
-        </span>
-      </Tooltip>
-    )
-  }
-
-  const unitLabel = compact
-    ? ""
-    : `/${qty > 1 ? `${qty}${UNIT_LABEL[rule.unit] ?? rule.unit}` : rule.unit}`
-
-  return (
-    <span
-      className={`xx-points-cost ${insufficient ? "insufficient" : ""} ${isFreeUser ? "free-user" : ""} ${className}`}
-    >
-      <span className="xx-points-gem">💎</span>
-      <span className="xx-points-num">-{cost}</span>
-      {unitLabel && <span className="xx-points-unit-label">积分{unitLabel}</span>}
-      {isFreeUser && !compact && (
-        <Tooltip title={`免费用户消耗 ×${rules?.free_user_multiplier ?? 1.15}，开通会员享标准价`}>
-          <span className="xx-points-free-user-tag">非会员</span>
-        </Tooltip>
-      )}
-      {insufficient && showRechargeHint && (
-        <Tooltip title={`积分不足，需 ${cost} 积分，当前余额 ${balance.balance}`}>
-          <WarningOutlined className="xx-points-warn-icon" />
-        </Tooltip>
-      )}
-    </span>
-  )
-}
-
-export default PointsCost

apps/web/src/components/layout/Header.css

@@ -1,5 +1,4 @@
-/* Phase 1 Header 样式 + 手机端适配
-   v2: 增加积分徽章、升级按钮、会员金冠 */
+/* Phase 1 Header 样式 + 手机端适配 */
 .xx-top-nav {
   height: 68px;
   position: sticky;
@@ -78,40 +77,10 @@
 .xx-right-section {
   display: flex;
   align-items: center;
-  gap: 10px;
+  gap: 12px;
   flex-shrink: 0;
 }
 
-/* v2: 顶部积分徽章 */
-.xx-header-points {
-  cursor: pointer;
-}
-
-/* v2: 升级会员按钮 */
-.xx-upgrade-btn {
-  background: linear-gradient(135deg, #f59e0b, #ef4444);
-  border: none;
-  font-weight: 700;
-  box-shadow: 0 2px 8px rgba(245, 158, 11, 0.3);
-}
-
-.xx-upgrade-btn:hover {
-  background: linear-gradient(135deg, #d97706, #dc2626) !important;
-  color: #fff !important;
-}
-
-/* v2: 会员金冠按钮 */
-.xx-crown-btn {
-  font-weight: 700;
-  color: #d97706;
-  padding: 2px 8px;
-}
-
-.xx-crown-btn:hover {
-  background: rgba(245, 158, 11, 0.1) !important;
-  color: #b45309 !important;
-}
-
 .xx-user-menu {
   display: flex;
   align-items: center;
@@ -146,29 +115,6 @@
   gap: var(--space-xs);
 }
 
-/* v2: 手机端积分/会员行 */
-.xx-mobile-points-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 10px;
-  padding: 8px 4px 16px;
-  margin-bottom: 12px;
-  border-bottom: 1px solid var(--border-color);
-}
-
-.xx-mobile-member-tag {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  font-size: 12px;
-  font-weight: 700;
-  color: #d97706;
-  background: #fef3c7;
-  padding: 4px 10px;
-  border-radius: 999px;
-}
-
 .xx-mobile-nav-item {
   display: flex;
   align-items: center;
@@ -211,7 +157,6 @@
 
   .xx-top-nav-inner {
     padding: 0 12px;
-    gap: 6px;
   }
 
   .xx-brand-text {
@@ -232,19 +177,6 @@
   .xx-username {
     display: none;
   }
-
-  /* 手机端：缩小升级按钮文字 */
-  .xx-upgrade-btn {
-    padding: 0 8px !important;
-    font-size: 12px !important;
-    height: 28px;
-  }
-
-  .xx-crown-btn {
-    padding: 0 4px !important;
-    font-size: 12px !important;
-    height: 28px;
-  }
 }
 
 /* 小屏幕平板：导航文字缩小 */
@@ -256,14 +188,4 @@
   .xx-nav-links button {
     font-size: 13px;
   }
-
-  .xx-header-points {
-    transform: scale(0.9);
-    transform-origin: center;
-  }
-
-  .xx-upgrade-btn {
-    font-size: 12px !important;
-    padding: 0 10px !important;
-  }
 }

apps/web/src/components/layout/Header.tsx

@@ -1,27 +1,15 @@
 /**
  * Phase 1 Header 重构
  * 扁平化导航菜单 + 手机端汉堡菜单
- * v2: 增加积分徽章、升级会员入口、我的积分入口
  */
-import React, { useEffect, useState } from "react"
-import { Avatar, Badge, Button, Dropdown, Drawer, Space, Tooltip } from "antd"
-import {
-  LogoutOutlined,
-  SettingOutlined,
-  UserOutlined,
-  MenuOutlined,
-  CrownFilled,
-  ThunderboltOutlined,
-  HistoryOutlined,
-  WalletOutlined,
-} from "@ant-design/icons"
+import React, { useState } from "react"
+import { Avatar, Dropdown, Drawer, Space } from "antd"
+import { LogoutOutlined, SettingOutlined, UserOutlined, MenuOutlined } from "@ant-design/icons"
 import { useLocation, useNavigate } from "react-router-dom"
 import { useAuthStore } from "@/store/authStore"
 import { useLogout } from "@/hooks/useAuth"
 import type { MenuProps } from "antd"
 import { NAV_ITEMS } from "@/config/navigation"
-import PointsBadge from "@/components/common/PointsBadge"
-import { usePointsStore } from "@/store/pointsStore"
 import "./Header.css"
 
 const Header: React.FC = () => {
@@ -31,18 +19,6 @@ const Header: React.FC = () => {
   const logoutMutation = useLogout()
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false)
 
-  // 积分与会员状态
-  const { balance, init } = usePointsStore()
-  useEffect(() => {
-    init()
-    // 每 60s 刷新一次（余额可能变化）
-    const t = setInterval(() => init(), 60_000)
-    return () => clearInterval(t)
-  }, [init])
-
-  const isMember = !!balance?.is_member
-  const memberType = balance?.member_type ?? null
-
   /** 用户下拉菜单 */
   const menuItems: MenuProps["items"] = [
     {
@@ -57,30 +33,6 @@ const Header: React.FC = () => {
       label: "订阅管理",
       onClick: () => navigate("/app/subscription"),
     },
-    // v2: 我的积分入口
-    {
-      key: "points-center",
-      icon: <ThunderboltOutlined />,
-      label: (
-        <Space>
-          我的积分
-          {balance && <span style={{ color: "#8b5cf6", fontWeight: 700 }}>{balance.balance}</span>}
-        </Space>
-      ),
-      onClick: () => navigate("/app/points"),
-    },
-    {
-      key: "points-history",
-      icon: <HistoryOutlined />,
-      label: "积分明细",
-      onClick: () => navigate("/app/points/transactions"),
-    },
-    {
-      key: "recharge",
-      icon: <WalletOutlined />,
-      label: "充值积分",
-      onClick: () => navigate("/app/points/recharge"),
-    },
     { type: "divider" },
     {
       key: "logout",
@@ -92,6 +44,7 @@ const Header: React.FC = () => {
 
   /** 判断导航项是否激活 */
   const isActive = (path: string) => {
+    // 首页特殊处理：/ 和 /app/dashboard 都算激活
     if (path === "/app/dashboard") {
       return (
         location.pathname === "/" ||
@@ -125,47 +78,6 @@ const Header: React.FC = () => {
         </nav>
 
         <div className="xx-right-section">
-          {/* v2: 积分徽章（顶部显示） */}
-          <PointsBadge />
-
-          {/* v2: 升级会员入口（仅免费用户显示） */}
-          {!isMember && (
-            <Tooltip title="升级会员解锁无限混剪、批量导出，积分 8 折起">
-              <Button
-                type="primary"
-                size="small"
-                icon={<CrownFilled />}
-                className="xx-upgrade-btn"
-                onClick={() => navigate("/app/subscription")}
-              >
-                升级会员
-              </Button>
-            </Tooltip>
-          )}
-
-          {/* v2: 付费会员显示金冠标识 */}
-          {isMember && (
-            <Tooltip
-              title={`${memberType === "yearly" ? "年卡" : memberType === "quarterly" ? "季卡" : "月卡"}会员${
-                balance?.member_expires_at
-                  ? ` · 到期 ${new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}`
-                  : ""
-              }`}
-            >
-              <Badge dot color="gold">
-                <Button
-                  type="text"
-                  size="small"
-                  icon={<CrownFilled style={{ color: "#f59e0b" }} />}
-                  className="xx-crown-btn"
-                  onClick={() => navigate("/app/subscription")}
-                >
-                  {memberType === "yearly" ? "年卡" : memberType === "quarterly" ? "季卡" : "会员"}
-                </Button>
-              </Badge>
-            </Tooltip>
-          )}
-
           {/* 手机端汉堡菜单按钮 */}
           <button className="xx-hamburger" type="button" onClick={() => setMobileMenuOpen(true)}>
             <MenuOutlined />
@@ -191,31 +103,6 @@ const Header: React.FC = () => {
         width={260}
         className="xx-mobile-drawer"
       >
-        {/* 手机端积分/会员入口 */}
-        {balance && (
-          <div className="xx-mobile-points-row">
-            <PointsBadge />
-            {!isMember ? (
-              <Button
-                size="small"
-                type="primary"
-                icon={<CrownFilled />}
-                onClick={() => {
-                  navigate("/app/subscription")
-                  setMobileMenuOpen(false)
-                }}
-              >
-                升级
-              </Button>
-            ) : (
-              <span className="xx-mobile-member-tag">
-                <CrownFilled style={{ color: "#f59e0b" }} />{" "}
-                {memberType === "yearly" ? "年卡" : memberType === "quarterly" ? "季卡" : "月卡"}
-              </span>
-            )}
-          </div>
-        )}
-
         <div className="xx-mobile-nav">
           {NAV_ITEMS.map((item) => (
             <button

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

@@ -4,6 +4,7 @@ export const ROUTE_TITLE_MAP: Record<string, string> = {
   "/app/generate": "智能剪辑",
   "/app/assets": "视频库",
   "/app/voices": "配音库",
+  "/app/titles": "标题库",
   "/app/products": "成片库",
   "/app/templates": "模板库",
   "/app/history": "任务历史",

apps/web/src/config/navigation.ts

@@ -6,15 +6,17 @@ import React from "react"
 import {
   DashboardOutlined,
   FileOutlined,
+  FileTextOutlined,
   AudioOutlined,
+  AppstoreOutlined,
   EditOutlined,
+  FolderOutlined,
   VideoCameraOutlined,
   HistoryOutlined,
   TrophyOutlined,
   ScanOutlined,
   ControlOutlined,
   CrownOutlined,
-  ThunderboltOutlined,
   UnorderedListOutlined,
   UserOutlined,
 } from "@ant-design/icons"
@@ -50,6 +52,12 @@ export const NAV_ITEMS: NavItem[] = [
     path: "/app/assets",
     icon: React.createElement(FileOutlined),
   },
+  {
+    key: "titles",
+    label: "标题库",
+    path: "/app/titles",
+    icon: React.createElement(FileTextOutlined),
+  },
   {
     key: "scripts",
     label: "文案库",
@@ -62,6 +70,24 @@ export const NAV_ITEMS: NavItem[] = [
     path: "/app/voices",
     icon: React.createElement(AudioOutlined),
   },
+  {
+    key: "templates",
+    label: "模板库",
+    path: "/app/templates",
+    icon: React.createElement(AppstoreOutlined),
+  },
+  {
+    key: "editing-planner",
+    label: "剪辑模板",
+    path: "/app/editing-planner",
+    icon: React.createElement(EditOutlined),
+  },
+  {
+    key: "my-templates",
+    label: "我的模板",
+    path: "/app/my-templates",
+    icon: React.createElement(FolderOutlined),
+  },
 
   {
     key: "generate",
@@ -99,18 +125,6 @@ export const NAV_ITEMS: NavItem[] = [
     path: "/app/tasks",
     icon: React.createElement(UnorderedListOutlined),
   },
-  {
-    key: "subscription",
-    label: "会员订阅",
-    path: "/app/subscription",
-    icon: React.createElement(CrownOutlined),
-  },
-  {
-    key: "points",
-    label: "积分中心",
-    path: "/app/points",
-    icon: React.createElement(ThunderboltOutlined),
-  },
 ]
 
 /** 侧边栏导航分组（Sidebar 分组列表使用） */
@@ -136,6 +150,12 @@ export const NAV_GROUPS: NavGroup[] = [
         path: "/app/ai-avatar",
         icon: React.createElement(UserOutlined),
       },
+      {
+        key: "editing-planner",
+        label: "剪辑模板",
+        path: "/app/editing-planner",
+        icon: React.createElement(EditOutlined),
+      },
     ],
   },
   {
@@ -153,6 +173,12 @@ export const NAV_GROUPS: NavGroup[] = [
         path: "/app/voices",
         icon: React.createElement(AudioOutlined),
       },
+      {
+        key: "titles",
+        label: "标题库",
+        path: "/app/titles",
+        icon: React.createElement(FileTextOutlined),
+      },
       {
         key: "scripts",
         label: "文案库",
@@ -165,6 +191,18 @@ export const NAV_GROUPS: NavGroup[] = [
         path: "/app/products",
         icon: React.createElement(TrophyOutlined),
       },
+      {
+        key: "templates",
+        label: "模板库",
+        path: "/app/templates",
+        icon: React.createElement(AppstoreOutlined),
+      },
+      {
+        key: "my-templates",
+        label: "我的模板",
+        path: "/app/my-templates",
+        icon: React.createElement(FolderOutlined),
+      },
     ],
   },
   {
@@ -196,16 +234,10 @@ export const NAV_GROUPS: NavGroup[] = [
       },
       {
         key: "subscription",
-        label: "会员订阅",
+        label: "订阅管理",
         path: "/app/subscription",
         icon: React.createElement(CrownOutlined),
       },
-      {
-        key: "points",
-        label: "积分中心",
-        path: "/app/points",
-        icon: React.createElement(ThunderboltOutlined),
-      },
     ],
   },
 ]

apps/web/src/index.css

@@ -25,6 +25,15 @@ body {
   background-color: var(--bg-secondary);
 }
 
+/* ── 自定义字体 ── */
+@font-face {
+  font-family: "华康俪金黑";
+  src: url("/fonts/DFLiJinHei-W8.ttf") format("truetype");
+  font-weight: 700;
+  font-style: normal;
+  font-display: swap;
+}
+
 /* 滚动条 - V21 样式 */
 ::-webkit-scrollbar {
   width: 8px;

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

@@ -55,7 +55,7 @@ export const createLipsyncJob = async (data: {
   script_text?: string
   /** 语速 0.5~2.0，默认 1.0（TTS 直生模式用） */
   speed?: number
-  /** 情绪英文枚举：neutral/happy/sad/angry/surprised/fearful/disgusted（TTS 直生模式用；前端经 normalizeEmotion 归一化） */
+  /** 情绪英文枚举：natural/excited/calm/friendly（TTS 直生模式用） */
   emotion?: string
   enable_video_loop?: boolean
   project_id?: string

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

@@ -13,8 +13,7 @@ import {
   type VoiceEmotion,
   type VoiceLanguage,
   VOICE_EMOTION_OPTIONS,
-  PRESET_VOICE_LANGUAGE_OPTIONS,
-  CLONE_VOICE_LANGUAGE_OPTIONS,
+  VOICE_LANGUAGE_OPTIONS,
 } from "../types"
 
 interface PanelVoiceSelectorProps {
@@ -92,12 +91,6 @@ export function PanelVoiceSelector({
 
   const NO_PREVIEW_TIP = "该音色暂无试听音频，请先用此音色生成一段配音后再试听"
 
-  // 系统预置音色仅支持 zh/en；克隆音色支持全语言
-  const languageOptions =
-    voiceSource === "clone" ? CLONE_VOICE_LANGUAGE_OPTIONS : PRESET_VOICE_LANGUAGE_OPTIONS
-  // 当前语言不在可选列表（切回预置时 ja/ko/cantonese/mandarin 失效）→ 自动回退到中文
-  const effectiveLanguage = languageOptions.some((o) => o.value === language) ? language : "zh"
-
   /** 用指定 URL 真实播放（抽取公共） */
   const playAudioUrl = (voiceId: string, url: string) => {
     // 临时兼容：后端 /tts/preview 返回 HTTP URL，staging 是 HTTPS，Mixed Content 会阻止加载
@@ -296,12 +289,10 @@ export function PanelVoiceSelector({
             <select
               id="aa-voice-language"
               className="aa-select"
-              value={effectiveLanguage}
-              onChange={(e) => {
-                onLanguageChange(e.target.value as VoiceLanguage)
-              }}
+              value={language}
+              onChange={(e) => onLanguageChange(e.target.value as VoiceLanguage)}
             >
-              {languageOptions.map((opt) => (
+              {VOICE_LANGUAGE_OPTIONS.map((opt) => (
                 <option key={opt.value} value={opt.value}>
                   {opt.label}
                 </option>

apps/web/src/pages/ai-avatar/hooks/useAiAvatar.ts

@@ -34,9 +34,9 @@ export function useAiAvatar() {
   /* ── 面板2：配音库 ── */
   const [voiceSource, setVoiceSource] = useState<VoiceSource>("preset")
   const [selectedVoice, setSelectedVoice] = useState<UnifiedVoiceItem | null>(null)
-  const [emotion, setEmotion] = useState<VoiceEmotion>("neutral")
+  const [emotion, setEmotion] = useState<VoiceEmotion>("natural")
   const [speed, setSpeed] = useState(1.0)
-  const [language, setLanguage] = useState<VoiceLanguage>("zh")
+  const [language, setLanguage] = useState<VoiceLanguage>("mandarin")
 
   /* ── 面板3：文案 & 对口型 ── */
   const [script, setScript] = useState<Script | null>(null)

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

@@ -6,42 +6,25 @@ import type { AssetItem } from "@/api/assets"
 /* ── 音色来源切换 ── */
 export type VoiceSource = "preset" | "clone"
 
-/* ── 情绪（对齐 CosyVoice 7 种情绪） ── */
-export type VoiceEmotion =
-  "neutral" | "happy" | "sad" | "angry" | "surprised" | "fearful" | "disgusted"
+/* ── 情绪 ── */
+export type VoiceEmotion = "natural" | "excited" | "calm" | "friendly"
 
 export const VOICE_EMOTION_OPTIONS: { value: VoiceEmotion; label: string }[] = [
-  { value: "neutral", label: "自然" },
-  { value: "happy", label: "开心" },
-  { value: "sad", label: "难过" },
-  { value: "angry", label: "生气" },
-  { value: "surprised", label: "惊讶" },
-  { value: "fearful", label: "恐惧" },
-  { value: "disgusted", label: "厌恶" },
+  { value: "natural", label: "自然" },
+  { value: "excited", label: "兴奋" },
+  { value: "calm", label: "沉稳" },
+  { value: "friendly", label: "亲切" },
 ]
 
 /* ── 语言 ── */
-/** 系统预置音色支持的语言（zh/en） */
-export type PresetVoiceLanguage = "zh" | "en"
-/** 克隆音色支持的完整语言列表 */
-export type CloneVoiceLanguage = "zh" | "en" | "ja" | "ko"
-export type VoiceLanguage = PresetVoiceLanguage | CloneVoiceLanguage
+export type VoiceLanguage = "mandarin" | "english" | "cantonese"
 
-export const PRESET_VOICE_LANGUAGE_OPTIONS: { value: PresetVoiceLanguage; label: string }[] = [
-  { value: "zh", label: "中文" },
-  { value: "en", label: "English" },
+export const VOICE_LANGUAGE_OPTIONS: { value: VoiceLanguage; label: string }[] = [
+  { value: "mandarin", label: "普通话" },
+  { value: "english", label: "English" },
+  { value: "cantonese", label: "粤语" },
 ]
 
-export const CLONE_VOICE_LANGUAGE_OPTIONS: { value: CloneVoiceLanguage; label: string }[] = [
-  { value: "zh", label: "中文" },
-  { value: "en", label: "English" },
-  { value: "ja", label: "日本語" },
-  { value: "ko", label: "한국어" },
-]
-
-/** 默认（预置音色）语言选项 */
-export const VOICE_LANGUAGE_OPTIONS = PRESET_VOICE_LANGUAGE_OPTIONS
-
 /* ── 对口型任务状态 ── */
 export type LipsyncStatus = "idle" | "pending" | "processing" | "completed" | "failed"
 

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

@@ -6,50 +6,21 @@
  */
 import type { AiAvatarTitleConfig, AiAvatarCoverConfig, VoiceEmotion } from "../types"
 
-/* ── 情绪：中文/旧枚举 → CosyVoice 7 种英文枚举 ── */
-const EMOTION_ALIAS: Record<string, VoiceEmotion> = {
-  // 新英文枚举
-  neutral: "neutral",
-  happy: "happy",
-  sad: "sad",
-  angry: "angry",
-  surprised: "surprised",
-  fearful: "fearful",
-  disgusted: "disgusted",
-  // 旧英文枚举（4 种，向前兼容）
-  natural: "neutral",
-  excited: "happy",
-  calm: "neutral",
-  friendly: "happy",
-  // 中文
-  自然: "neutral",
-  开心: "happy",
-  难过: "sad",
-  生气: "angry",
-  惊讶: "surprised",
-  恐惧: "fearful",
-  厌恶: "disgusted",
-  // 旧中文
-  兴奋: "happy",
-  沉稳: "neutral",
-  亲切: "happy",
+/* ── 情绪：中文 → 英文（防御性映射；state 默认已是英文） ── */
+const EMOTION_ZH_TO_EN: Record<string, VoiceEmotion> = {
+  自然: "natural",
+  兴奋: "excited",
+  沉稳: "calm",
+  亲切: "friendly",
 }
-const VALID_EMOTIONS: VoiceEmotion[] = [
-  "neutral",
-  "happy",
-  "sad",
-  "angry",
-  "surprised",
-  "fearful",
-  "disgusted",
-]
+const VALID_EMOTIONS: VoiceEmotion[] = ["natural", "excited", "calm", "friendly"]
 
-/** 归一化为后端英文枚举 neutral/happy/sad/angry/surprised/fearful/disgusted；非法/空值回退 neutral。 */
+/** 归一化为后端英文枚举 natural/excited/calm/friendly；非法/空值回退 natural。 */
 export function normalizeEmotion(raw: string | undefined | null): VoiceEmotion {
-  if (!raw) return "neutral"
+  if (!raw) return "natural"
   const v = raw.trim()
   if ((VALID_EMOTIONS as string[]).includes(v)) return v as VoiceEmotion
-  return EMOTION_ALIAS[v] ?? "neutral"
+  return EMOTION_ZH_TO_EN[v] ?? "natural"
 }
 
 /* ── 标题：前端 state → 后端 build_title_drawtext_filter 字段（单个 title_config dict） ── */

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

@@ -22,8 +22,8 @@ export interface ScriptSentence {
   endTime: number
 }
 
-/** 句子分隔符：中英文句号/问号/感叹号/分号/换行（按句断，不在逗号处切；保持与后端一致） */
-const SENTENCE_SPLIT_RE = /[。！？!?？！;；\n\r]+/
+/** 句子分隔符：中英文句号/问号/感叹号/分号/逗号/换行（覆盖中文短视频常用断句） */
+const SENTENCE_SPLIT_RE = /[。！？!?？！;；,，\n\r]+/
 
 /**
  * 分句并计算每句的起止时间。

apps/web/src/pages/editing-planner/EditingPlanner.tsx

@@ -0,0 +1,326 @@
+/**
+ * 模板编辑器 — 制作/编辑剪辑模板
+ * 四行布局：顶栏(42px) → 模式栏(48px) → 三栏主体 → 底栏(40px)
+ *
+ * 主组件仅保留 Hook 组装与整体布局
+ * 全局配置 → hooks/useGlobalSettings
+ * 配音素材 → hooks/useVoiceMaterials
+ * 撤销重做 → hooks/useUndoRedo
+ * 抽屉管理 → hooks/useEditorDrawers
+ * 播放控制 → hooks/usePlaybackControl
+ * 片段操作 → hooks/useClipOperations
+ * 模板管理 → hooks/useTemplateManagement
+ */
+import React, { useState } from "react"
+import { useSearchParams } from "react-router-dom"
+import { MODE_LABELS } from "@/api/editing-planner"
+import { MODE_LIST } from "./constants"
+import MediaPanel from "./components/MediaPanel"
+import PreviewPlayer from "./components/PreviewPlayer"
+import TimelinePanel from "./components/TimelinePanel"
+import TopBar from "./components/TopBar"
+import ModeBar from "./components/ModeBar"
+import RightPanel from "./components/RightPanel"
+import StatusBar from "./components/StatusBar"
+import EditorDrawers from "./components/EditorDrawers"
+import SaveModal from "./components/SaveModal"
+
+import { useUndoRedo } from "./hooks/useUndoRedo"
+import { useEditorDrawers } from "./hooks/useEditorDrawers"
+import { usePlaybackControl } from "./hooks/usePlaybackControl"
+import { useClipOperations } from "./hooks/useClipOperations"
+import { useTemplateManagement, FILTER_CATEGORIES } from "./hooks/useTemplateManagement"
+import { useGlobalSettings } from "./hooks/useGlobalSettings"
+import { useVoiceMaterials } from "./hooks/useVoiceMaterials"
+
+import type { ClipData } from "./types"
+import "./EditingPlanner.css"
+
+const EditingPlanner: React.FC = () => {
+  const [searchParams] = useSearchParams()
+  const urlTemplateId = searchParams.get("templateId") || ""
+  const urlPlanId = searchParams.get("planId") || ""
+
+  /* ── 片段（撤销/重做） ── */
+  const {
+    state: clips,
+    set: setClips,
+    undo,
+    redo,
+    canUndo,
+    canRedo,
+    reset: resetClips,
+  } = useUndoRedo<ClipData[]>([])
+
+  /* ── 全局配置 ── */
+  const {
+    titleConfig,
+    setTitleConfig,
+    subtitleSettings,
+    setSubtitleSettings,
+    bgmSettings,
+    setBgmSettings,
+    watermarkSettings,
+    setWatermarkSettings,
+    introOutroSettings,
+    setIntroOutroSettings,
+    pipSettings,
+    setPipSettings,
+    filterSettings,
+    setFilterSettings,
+    chromaKeySettings,
+    setChromaKeySettings,
+    stickerSettings,
+    setStickerSettings,
+  } = useGlobalSettings()
+
+  /* ── 右侧栏 Tab ── */
+  const [rightTab, setRightTab] = useState<"properties" | "clips">("properties")
+
+  /* ── 配音素材 ── */
+  const {
+    voiceMaterials,
+    loading: voiceMaterialsLoading,
+    refetch: refetchVoiceMaterials,
+  } = useVoiceMaterials()
+
+  /* ── 派生计算 ── */
+  const totalDuration = clips.reduce((sum, c) => sum + c.duration, 0)
+
+  /* ── Hook: 抽屉管理 ── */
+  const drawers = useEditorDrawers()
+
+  /* ── Hook: 播放控制 ── */
+  const playback = usePlaybackControl(totalDuration)
+
+  /* ── Hook: 片段操作 ── */
+  const clipOps = useClipOperations({ clips, setClips })
+
+  /* ── Hook: 模板管理 ── */
+  const tpl = useTemplateManagement({
+    urlTemplateId,
+    urlPlanId,
+    resetClips,
+    setClips,
+    setSelectedClipId: clipOps.setSelectedClipId,
+    setTitleConfig,
+    setSubtitleSettings,
+    setBgmSettings,
+    clips,
+    totalDuration,
+    titleConfig,
+    subtitleSettings,
+    bgmSettings,
+    watermarkSettings,
+    introOutroSettings,
+    pipSettings,
+    filterSettings,
+    chromaKeySettings,
+    stickerSettings,
+  })
+
+  /* ──────────── 渲染 ──────────── */
+
+  return (
+    <div className="ep-v8-root">
+      {/* ═══ 第1行：顶栏 42px ═══ */}
+      <TopBar
+        currentTemplate={tpl.currentTemplate}
+        canUndo={canUndo}
+        canRedo={canRedo}
+        onUndo={undo}
+        onRedo={redo}
+        onOpenSaveModal={tpl.handleOpenSaveModal}
+      />
+
+      {/* ═══ 第2行：模式栏 56px ═══ */}
+      <ModeBar
+        modeList={MODE_LIST}
+        currentMode={tpl.currentMode}
+        onModeChange={tpl.handleModeChange}
+      />
+
+      {/* ═══ 第3行：三栏主体 ═══ */}
+      <div className="ep-main-body">
+        {/* 左栏 220px：模板列表 */}
+        <MediaPanel
+          templates={tpl.filteredTemplates}
+          loading={tpl.loadingTemplates}
+          searchQuery={tpl.searchQuery}
+          currentFilter={tpl.currentFilter}
+          filterCategories={FILTER_CATEGORIES}
+          loadedTemplateId={tpl.loadedTemplateId}
+          onLoadTemplate={tpl.handleLoadTemplate}
+          onSearchChange={tpl.setSearchQuery}
+          onFilterChange={tpl.setCurrentFilter}
+        />
+
+        {/* 中栏 flex-1 */}
+        <div className="ep-center-col">
+          {/* 上半部：视频预览 + 封面预览 */}
+          <PreviewPlayer
+            clips={clips}
+            selectedClipId={clipOps.selectedClipId}
+            isPlaying={playback.isPlaying}
+            titleConfig={titleConfig}
+            subtitleSettings={{
+              enabled: subtitleSettings.enabled,
+              position: subtitleSettings.position,
+              font: subtitleSettings.font,
+              size: subtitleSettings.fontSize,
+              animation: subtitleSettings.animation,
+            }}
+            onClipSelect={clipOps.handleClipSelect}
+            onPlayPause={() => playback.setIsPlaying(!playback.isPlaying)}
+          />
+
+          {/* 下半部：水平时间线 */}
+          <TimelinePanel
+            clips={clips}
+            selectedClipId={clipOps.selectedClipId}
+            currentMode={tpl.currentMode}
+            onClipSelect={clipOps.handleClipSelect}
+            onClipReorder={clipOps.handleClipReorder}
+            onClipRemove={clipOps.handleClipRemove}
+            onAddClip={clipOps.handleAddClip}
+            onClipTrim={clipOps.handleClipTrim}
+            onClipSplit={clipOps.handleClipSplit}
+            onClipResetTrim={clipOps.handleClipResetTrim}
+            currentTime={playback.currentTime}
+            pixelsPerSecond={playback.pixelsPerSecond}
+            onZoomChange={playback.handleZoomChange}
+            onSeek={playback.handleSeek}
+            totalDuration={totalDuration}
+          />
+        </div>
+
+        {/* 右栏 260px：设置面板 */}
+        <RightPanel
+          titleConfig={titleConfig}
+          onTitleConfigChange={setTitleConfig}
+          rightTab={rightTab}
+          onTabChange={setRightTab}
+          selectedClip={clipOps.selectedClip}
+          subtitleSettings={subtitleSettings}
+          bgmSettings={bgmSettings}
+          clipsCount={clips.length}
+          totalDuration={totalDuration}
+          currentMode={tpl.currentMode}
+          onSubtitleSettingsChange={(partial) =>
+            setSubtitleSettings((prev) => ({ ...prev, ...partial }))
+          }
+          onBgmSettingsChange={(partial) => setBgmSettings((prev) => ({ ...prev, ...partial }))}
+          onClipUpdate={clipOps.handleClipUpdate}
+          onOpenBgmDrawer={() => drawers.setBgmDrawerOpen(true)}
+          onOpenSubtitleDrawer={() => drawers.setSubtitleDrawerOpen(true)}
+          voiceMaterials={voiceMaterials}
+          voiceMaterialsLoading={voiceMaterialsLoading}
+          onRefreshVoiceMaterials={refetchVoiceMaterials}
+          onClipVoiceSelect={clipOps.handleClipVoiceSelect}
+          onOpenTransitionDrawer={drawers.openTransitionDrawer}
+          onOpenSpeedDrawer={drawers.openSpeedDrawer}
+          onOpenTtsDrawer={drawers.openTtsDrawer}
+          onOpenWatermarkDrawer={() => drawers.setWatermarkDrawerOpen(true)}
+          onOpenIntroOutroDrawer={() => drawers.setIntroOutroDrawerOpen(true)}
+          onOpenPipDrawer={() => drawers.setPipDrawerOpen(true)}
+          onOpenFilterDrawer={() => drawers.setFilterDrawerOpen(true)}
+          onOpenGreenScreenDrawer={() => drawers.setChromaKeyDrawerOpen(true)}
+          onOpenStickerDrawer={() => drawers.setStickerDrawerOpen(true)}
+          clips={clips}
+          selectedClipId={clipOps.selectedClipId}
+          onClipSelect={clipOps.handleClipSelect}
+          onClipMoveUp={(clipId) => {
+            const idx = clips.findIndex((c) => c.id === clipId)
+            if (idx > 0) clipOps.handleClipReorder(idx, idx - 1)
+          }}
+          onClipMoveDown={(clipId) => {
+            const idx = clips.findIndex((c) => c.id === clipId)
+            if (idx < clips.length - 1) clipOps.handleClipReorder(idx, idx + 1)
+          }}
+          onClipRemove={clipOps.handleClipRemove}
+          onClipAdd={() => clipOps.handleAddClip("pip", 3)}
+        />
+      </div>
+
+      {/* ═══ 第4行：底栏 40px ═══ */}
+      <StatusBar
+        clipsCount={clips.length}
+        totalDuration={totalDuration}
+        currentModeLabel={MODE_LABELS[tpl.currentMode]}
+        templateSegments={tpl.currentTemplate?.segments.length || 0}
+      />
+
+      {/* ═══ 弹窗 ═══ */}
+      <SaveModal
+        open={tpl.saveModalOpen}
+        loading={tpl.saveLoading}
+        isUpdate={!!tpl.loadedTemplateId}
+        draftName={tpl.draftName}
+        draftCategory={tpl.draftCategory}
+        draftTags={tpl.draftTags}
+        categories={tpl.categories}
+        estimatedDuration={totalDuration}
+        onNameChange={tpl.setDraftName}
+        onCategoryChange={tpl.setDraftCategory}
+        onTagsChange={tpl.setDraftTags}
+        onSave={tpl.handleSave}
+        onCancel={() => tpl.setSaveModalOpen(false)}
+      />
+
+      {/* ═══ Drawer 集合 ═══ */}
+      <EditorDrawers
+        bgmDrawerOpen={drawers.bgmDrawerOpen}
+        bgmSettings={bgmSettings}
+        onBgmSettingsChange={setBgmSettings}
+        onCloseBgmDrawer={() => drawers.setBgmDrawerOpen(false)}
+        subtitleDrawerOpen={drawers.subtitleDrawerOpen}
+        subtitleSettings={subtitleSettings}
+        onSubtitleSettingsChange={setSubtitleSettings}
+        onCloseSubtitleDrawer={() => drawers.setSubtitleDrawerOpen(false)}
+        transitionDrawerOpen={drawers.transitionDrawerOpen}
+        transitionTargetClipId={drawers.transitionTargetClipId}
+        clips={clips}
+        onTransitionChange={(config) =>
+          clipOps.handleTransitionChange(drawers.transitionTargetClipId, config)
+        }
+        onCloseTransitionDrawer={() => drawers.setTransitionDrawerOpen(false)}
+        speedDrawerOpen={drawers.speedDrawerOpen}
+        speedTargetClipId={drawers.speedTargetClipId}
+        onSpeedChange={(config) => clipOps.handleSpeedChange(drawers.speedTargetClipId, config)}
+        onApplySpeedAll={clipOps.handleApplySpeedAll}
+        onCloseSpeedDrawer={() => drawers.setSpeedDrawerOpen(false)}
+        ttsDrawerOpen={drawers.ttsDrawerOpen}
+        ttsTargetClipId={drawers.ttsTargetClipId}
+        onTtsChange={(config) => clipOps.handleTtsChange(drawers.ttsTargetClipId, config)}
+        onCloseTtsDrawer={() => drawers.setTtsDrawerOpen(false)}
+        watermarkDrawerOpen={drawers.watermarkDrawerOpen}
+        watermarkSettings={watermarkSettings}
+        onWatermarkChange={setWatermarkSettings}
+        onCloseWatermarkDrawer={() => drawers.setWatermarkDrawerOpen(false)}
+        introOutroDrawerOpen={drawers.introOutroDrawerOpen}
+        introOutroSettings={introOutroSettings}
+        onIntroOutroChange={setIntroOutroSettings}
+        onCloseIntroOutroDrawer={() => drawers.setIntroOutroDrawerOpen(false)}
+        pipDrawerOpen={drawers.pipDrawerOpen}
+        pipSettings={pipSettings}
+        totalDuration={totalDuration}
+        onPipChange={setPipSettings}
+        onClosePipDrawer={() => drawers.setPipDrawerOpen(false)}
+        filterDrawerOpen={drawers.filterDrawerOpen}
+        filterSettings={filterSettings}
+        onFilterChange={setFilterSettings}
+        onCloseFilterDrawer={() => drawers.setFilterDrawerOpen(false)}
+        chromaKeyDrawerOpen={drawers.chromaKeyDrawerOpen}
+        chromaKeySettings={chromaKeySettings}
+        onChromaKeyChange={setChromaKeySettings}
+        onCloseChromaKeyDrawer={() => drawers.setChromaKeyDrawerOpen(false)}
+        stickerDrawerOpen={drawers.stickerDrawerOpen}
+        stickerSettings={stickerSettings}
+        onStickerChange={setStickerSettings}
+        onCloseStickerDrawer={() => drawers.setStickerDrawerOpen(false)}
+      />
+    </div>
+  )
+}
+
+export default EditingPlanner

apps/web/src/pages/editing-planner/components/BgmSelector.tsx

@@ -0,0 +1,5 @@
+/**
+ * BGM 选择器入口（向后兼容）
+ * 实际实现位于 ./bgm-selector/ 目录
+ */
+export { default } from "./bgm-selector"

apps/web/src/pages/editing-planner/components/ClipPropertiesPanel.tsx

@@ -0,0 +1,182 @@
+/**
+ * 右栏设置面板 — V8 原型 1:1 还原
+ * 字幕设置 + BGM设置 + 片段详情
+ */
+import React from "react"
+import type { ClipPropertiesPanelProps } from "@/pages/editing-planner/types/clipProperties"
+import SubtitleSettingsSection from "./clip-properties/SubtitleSettingsSection"
+import TitleSettingsSection from "./clip-properties/TitleSettingsSection"
+import BgmSettingsSection from "./clip-properties/BgmSettingsSection"
+import ClipDetailSection from "./clip-properties/ClipDetailSection"
+import StatsSection from "./clip-properties/StatsSection"
+import { useVoicePreview } from "@/pages/editing-planner/hooks/useVoicePreview"
+
+const ClipPropertiesPanel: React.FC<ClipPropertiesPanelProps> = ({
+  titleConfig,
+  onTitleConfigChange,
+  selectedClip,
+  subtitleSettings,
+  bgmSettings,
+  clipsCount,
+  totalDuration,
+  currentMode,
+  onSubtitleSettingsChange,
+  onBgmSettingsChange: _onBgmSettingsChange,
+  onClipUpdate,
+  onOpenBgmDrawer,
+  onOpenSubtitleDrawer,
+  voiceMaterials = [],
+  voiceMaterialsLoading = false,
+  onRefreshVoiceMaterials,
+  onClipVoiceSelect,
+  onOpenTransitionDrawer,
+  onOpenSpeedDrawer,
+  onOpenTtsDrawer,
+  onOpenWatermarkDrawer,
+  onOpenIntroOutroDrawer,
+  onOpenPipDrawer,
+  onOpenFilterDrawer,
+  onOpenGreenScreenDrawer,
+  onOpenStickerDrawer,
+}) => {
+  const { previewingId, handlePreviewVoice, stopPreview } = useVoicePreview()
+
+  return (
+    <div className="ep-right-panel">
+      {/* ═══ 标题设置 — #1789 ═══ */}
+      {titleConfig && onTitleConfigChange && (
+        <TitleSettingsSection config={titleConfig} onChange={onTitleConfigChange} />
+      )}
+
+      {/* ═══ 字幕设置 ═══ */}
+      <SubtitleSettingsSection
+        settings={subtitleSettings}
+        onChange={onSubtitleSettingsChange}
+        onOpenSubtitleDrawer={onOpenSubtitleDrawer}
+      />
+
+      {/* ═══ BGM 设置 ═══ */}
+      <BgmSettingsSection settings={bgmSettings} onOpenBgmDrawer={onOpenBgmDrawer} />
+
+      {/* ═══ 水印设置 ═══ */}
+      <div className="ep-settings-section">
+        <div className="ep-section-title">
+          <span className="ep-section-icon">🔖</span>
+          水印设置
+        </div>
+        {onOpenWatermarkDrawer && (
+          <button className="ep-advanced-btn" onClick={onOpenWatermarkDrawer}>
+            <span className="ep-advanced-btn-icon">🔖</span>
+            <span className="ep-advanced-btn-label">水印配置</span>
+            <span className="ep-advanced-btn-arrow">›</span>
+          </button>
+        )}
+      </div>
+
+      {/* ═══ 片头片尾设置 ═══ */}
+      <div className="ep-settings-section">
+        <div className="ep-section-title">
+          <span className="ep-section-icon">🎬</span>
+          片头片尾
+        </div>
+        {onOpenIntroOutroDrawer && (
+          <button className="ep-advanced-btn" onClick={onOpenIntroOutroDrawer}>
+            <span className="ep-advanced-btn-icon">🎬</span>
+            <span className="ep-advanced-btn-label">片头片尾配置</span>
+            <span className="ep-advanced-btn-arrow">›</span>
+          </button>
+        )}
+      </div>
+
+      {/* ═══ 混剪 ═══ */}
+      <div className="ep-settings-section">
+        <div className="ep-section-title">
+          <span className="ep-section-icon">🖼️</span>
+          混剪
+        </div>
+        {onOpenPipDrawer && (
+          <button className="ep-advanced-btn" onClick={onOpenPipDrawer}>
+            <span className="ep-advanced-btn-icon">🖼️</span>
+            <span className="ep-advanced-btn-label">配置混剪图层</span>
+            <span className="ep-advanced-btn-arrow">›</span>
+          </button>
+        )}
+      </div>
+
+      {/* ═══ 滤镜调色 ═══ */}
+      <div className="ep-settings-section">
+        <div className="ep-section-title">
+          <span className="ep-section-icon">🎨</span>
+          滤镜调色
+        </div>
+        {onOpenFilterDrawer && (
+          <button className="ep-advanced-btn" onClick={onOpenFilterDrawer}>
+            <span className="ep-advanced-btn-icon">🎨</span>
+            <span className="ep-advanced-btn-label">配置滤镜调色</span>
+            <span className="ep-advanced-btn-arrow">›</span>
+          </button>
+        )}
+      </div>
+
+      {/* ═══ 绿幕抠像 ═══ */}
+      <div className="ep-settings-section">
+        <div className="ep-section-title">
+          <span className="ep-section-icon">🟩</span>
+          绿幕抠像
+        </div>
+        {onOpenGreenScreenDrawer && (
+          <button className="ep-advanced-btn" onClick={onOpenGreenScreenDrawer}>
+            <span className="ep-advanced-btn-icon">🟩</span>
+            <span className="ep-advanced-btn-label">配置绿幕抠像</span>
+            <span className="ep-advanced-btn-arrow">›</span>
+          </button>
+        )}
+      </div>
+
+      {/* ═══ 贴纸 ═══ */}
+      <div className="ep-settings-section">
+        <div className="ep-section-title">
+          <span className="ep-section-icon">🏷️</span>
+          贴纸
+        </div>
+        {onOpenStickerDrawer && (
+          <button className="ep-advanced-btn" onClick={onOpenStickerDrawer}>
+            <span className="ep-advanced-btn-icon">🏷️</span>
+            <span className="ep-advanced-btn-label">配置贴纸花字</span>
+            <span className="ep-advanced-btn-arrow">›</span>
+          </button>
+        )}
+      </div>
+
+      {/* ═══ 片段详情（选中时显示） ═══ */}
+      {selectedClip && (
+        <ClipDetailSection
+          clip={selectedClip}
+          currentMode={currentMode}
+          voiceMaterials={voiceMaterials}
+          voiceMaterialsLoading={voiceMaterialsLoading}
+          onClipUpdate={onClipUpdate}
+          onRefreshVoiceMaterials={onRefreshVoiceMaterials}
+          onClipVoiceSelect={onClipVoiceSelect}
+          onOpenTransitionDrawer={onOpenTransitionDrawer}
+          onOpenSpeedDrawer={onOpenSpeedDrawer}
+          onOpenTtsDrawer={onOpenTtsDrawer}
+          previewingId={previewingId}
+          onPreviewVoice={handlePreviewVoice}
+          onStopPreview={stopPreview}
+        />
+      )}
+
+      {/* ═══ 统计信息（未选中时显示） ═══ */}
+      {!selectedClip && (
+        <StatsSection
+          clipsCount={clipsCount}
+          totalDuration={totalDuration}
+          currentMode={currentMode}
+        />
+      )}
+    </div>
+  )
+}
+
+export default ClipPropertiesPanel

apps/web/src/pages/editing-planner/components/EditingDrawers.tsx

@@ -0,0 +1,106 @@
+/**
+ * 所有弹窗和 Drawer 组件的集合
+ * 纯渲染层，业务逻辑和 state 留在父组件
+ */
+import React from "react"
+import SaveModal from "./SaveModal"
+import { ClipLevelDrawers } from "./editing-drawers/ClipLevelDrawers"
+import { GlobalDrawers } from "./editing-drawers/GlobalDrawers"
+import type { EditingDrawersProps } from "./editing-drawers/types"
+
+const EditingDrawers: React.FC<EditingDrawersProps> = (props) => {
+  const {
+    saveModalOpen,
+    saveLoading,
+    isUpdate,
+    draftName,
+    draftCategory,
+    draftTags,
+    categories,
+    estimatedDuration,
+    onNameChange,
+    onCategoryChange,
+    onTagsChange,
+    onSave,
+    onCancelSave,
+    clips,
+  } = props
+
+  return (
+    <>
+      {/* 保存弹窗 */}
+      <SaveModal
+        open={saveModalOpen}
+        loading={saveLoading}
+        isUpdate={isUpdate}
+        draftName={draftName}
+        draftCategory={draftCategory}
+        draftTags={draftTags}
+        categories={categories}
+        estimatedDuration={estimatedDuration}
+        onNameChange={onNameChange}
+        onCategoryChange={onCategoryChange}
+        onTagsChange={onTagsChange}
+        onSave={onSave}
+        onCancel={onCancelSave}
+      />
+
+      {/* 片段级抽屉（转场/调速/TTS） */}
+      <ClipLevelDrawers
+        clips={clips}
+        transitionDrawerOpen={props.transitionDrawerOpen}
+        transitionTargetClipId={props.transitionTargetClipId}
+        onCloseTransitionDrawer={props.onCloseTransitionDrawer}
+        onTransitionChange={props.onTransitionChange}
+        speedDrawerOpen={props.speedDrawerOpen}
+        speedTargetClipId={props.speedTargetClipId}
+        onCloseSpeedDrawer={props.onCloseSpeedDrawer}
+        onSpeedChange={props.onSpeedChange}
+        onApplySpeedAll={props.onApplySpeedAll}
+        ttsDrawerOpen={props.ttsDrawerOpen}
+        ttsTargetClipId={props.ttsTargetClipId}
+        onCloseTtsDrawer={props.onCloseTtsDrawer}
+        onTtsChange={props.onTtsChange}
+      />
+
+      {/* 全局设置抽屉（BGM/字幕/水印/片头片尾/混剪/滤镜/绿幕/贴纸） */}
+      <GlobalDrawers
+        bgmDrawerOpen={props.bgmDrawerOpen}
+        bgmSettings={props.bgmSettings}
+        onCloseBgmDrawer={props.onCloseBgmDrawer}
+        onChangeBgmSettings={props.onChangeBgmSettings}
+        subtitleDrawerOpen={props.subtitleDrawerOpen}
+        subtitleSettings={props.subtitleSettings}
+        onCloseSubtitleDrawer={props.onCloseSubtitleDrawer}
+        onChangeSubtitleSettings={props.onChangeSubtitleSettings}
+        totalDuration={props.totalDuration}
+        watermarkDrawerOpen={props.watermarkDrawerOpen}
+        watermarkSettings={props.watermarkSettings}
+        onCloseWatermarkDrawer={props.onCloseWatermarkDrawer}
+        onWatermarkChange={props.onWatermarkChange}
+        introOutroDrawerOpen={props.introOutroDrawerOpen}
+        introOutroSettings={props.introOutroSettings}
+        onCloseIntroOutroDrawer={props.onCloseIntroOutroDrawer}
+        onIntroOutroChange={props.onIntroOutroChange}
+        pipDrawerOpen={props.pipDrawerOpen}
+        pipSettings={props.pipSettings}
+        onClosePipDrawer={props.onClosePipDrawer}
+        onPipChange={props.onPipChange}
+        filterDrawerOpen={props.filterDrawerOpen}
+        filterSettings={props.filterSettings}
+        onCloseFilterDrawer={props.onCloseFilterDrawer}
+        onFilterChange={props.onFilterChange}
+        chromaKeyDrawerOpen={props.chromaKeyDrawerOpen}
+        chromaKeySettings={props.chromaKeySettings}
+        onCloseChromaKeyDrawer={props.onCloseChromaKeyDrawer}
+        onChromaKeyChange={props.onChromaKeyChange}
+        stickerDrawerOpen={props.stickerDrawerOpen}
+        stickerSettings={props.stickerSettings}
+        onCloseStickerDrawer={props.onCloseStickerDrawer}
+        onStickerChange={props.onStickerChange}
+      />
+    </>
+  )
+}
+
+export default EditingDrawers

apps/web/src/pages/editing-planner/components/EditorClipList.tsx

@@ -0,0 +1,148 @@
+/**
+ * 编辑器右侧栏 — 片段列表 Tab
+ * 紧凑版片段管理：选中、上下移动、删除、添加
+ */
+import React from "react"
+import { Button, Tooltip, Empty } from "antd"
+import {
+  UpOutlined,
+  DownOutlined,
+  DeleteOutlined,
+  PlusOutlined,
+  ScissorOutlined,
+  SoundOutlined,
+  PictureOutlined,
+  VideoCameraOutlined,
+} from "@ant-design/icons"
+import type { ClipData, ClipType } from "../types"
+
+interface EditorClipListProps {
+  clips: ClipData[]
+  selectedClipId: string | null
+  onSelect: (clipId: string) => void
+  onMoveUp: (clipId: string) => void
+  onMoveDown: (clipId: string) => void
+  onRemove: (clipId: string) => void
+  onAdd: () => void
+}
+
+const clipTypeIcon: Record<ClipType | string, React.ReactNode> = {
+  video: <VideoCameraOutlined />,
+  image: <PictureOutlined />,
+  voice: <SoundOutlined />,
+  pip: <ScissorOutlined />,
+}
+
+const clipTypeLabel: Record<ClipType | string, string> = {
+  video: "视频",
+  image: "图片",
+  voice: "配音",
+  pip: "混剪",
+}
+
+const EditorClipList: React.FC<EditorClipListProps> = ({
+  clips,
+  selectedClipId,
+  onSelect,
+  onMoveUp,
+  onMoveDown,
+  onRemove,
+  onAdd,
+}) => {
+  if (clips.length === 0) {
+    return (
+      <div className="ep-clip-list-empty">
+        <Empty
+          description="暂无片段"
+          image={Empty.PRESENTED_IMAGE_SIMPLE}
+          style={{ margin: "40px 0" }}
+        />
+        <Button type="primary" icon={<PlusOutlined />} block onClick={onAdd}>
+          添加片段
+        </Button>
+      </div>
+    )
+  }
+
+  return (
+    <div className="ep-clip-list">
+      {/* 顶部工具栏 */}
+      <div className="ep-clip-list-toolbar">
+        <span className="ep-clip-list-count">
+          共 <b>{clips.length}</b> 个片段
+        </span>
+        <Tooltip title="添加片段">
+          <Button type="primary" size="small" icon={<PlusOutlined />} onClick={onAdd}>
+            添加
+          </Button>
+        </Tooltip>
+      </div>
+
+      {/* 片段列表 */}
+      <div className="ep-clip-list-scroll">
+        {clips.map((clip, index) => (
+          <div
+            key={clip.id}
+            className={`ep-clip-list-item${selectedClipId === clip.id ? " selected" : ""}`}
+            onClick={() => onSelect(clip.id)}
+          >
+            {/* 序号 + 类型图标 */}
+            <div className="ep-clip-item-head">
+              <span className="ep-clip-item-index">{index + 1}</span>
+              <span className="ep-clip-item-type">
+                {clipTypeIcon[clip.type] || <ScissorOutlined />}
+                <span className="ep-clip-item-type-label">
+                  {clipTypeLabel[clip.type] || "片段"}
+                </span>
+              </span>
+            </div>
+
+            {/* 文案预览 */}
+            {clip.script_text && (
+              <div className="ep-clip-item-text">
+                {clip.script_text.slice(0, 40)}
+                {clip.script_text.length > 40 ? "..." : ""}
+              </div>
+            )}
+
+            {/* 操作按钮 */}
+            <div className="ep-clip-item-actions" onClick={(e) => e.stopPropagation()}>
+              <Tooltip title="上移">
+                <Button
+                  type="text"
+                  size="small"
+                  icon={<UpOutlined />}
+                  disabled={index === 0}
+                  onClick={() => onMoveUp(clip.id)}
+                  className="ep-clip-item-btn"
+                />
+              </Tooltip>
+              <Tooltip title="下移">
+                <Button
+                  type="text"
+                  size="small"
+                  icon={<DownOutlined />}
+                  disabled={index === clips.length - 1}
+                  onClick={() => onMoveDown(clip.id)}
+                  className="ep-clip-item-btn"
+                />
+              </Tooltip>
+              <Tooltip title="删除">
+                <Button
+                  type="text"
+                  size="small"
+                  danger
+                  icon={<DeleteOutlined />}
+                  onClick={() => onRemove(clip.id)}
+                  className="ep-clip-item-btn"
+                />
+              </Tooltip>
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  )
+}
+
+export default EditorClipList

apps/web/src/pages/editing-planner/components/EditorDrawers.tsx

@@ -0,0 +1,246 @@
+import React from "react"
+import BgmSelector from "./BgmSelector"
+import SubtitleStylePanel from "./SubtitleStylePanel"
+import TransitionSelector from "./TransitionSelector"
+import SpeedPanel from "./SpeedPanel"
+import TtsPanel from "./TtsPanel"
+import WatermarkPanel from "./WatermarkPanel"
+import IntroOutroPanel from "./IntroOutroPanel"
+import PipConfigPanel from "./PipConfigPanel"
+import FilterPanel from "./FilterPanel"
+import GreenScreenPanel from "./GreenScreenPanel"
+import StickerPanel from "./StickerPanel"
+import type {
+  ClipData,
+  TransitionConfig,
+  SpeedConfig,
+  TtsConfig,
+  WatermarkConfig,
+  IntroOutroConfig,
+  PipConfig,
+  FilterConfig,
+  ChromaKeyConfig,
+  StickerConfig,
+} from "../types"
+import type { SubtitleStyleConfig } from "../types/subtitle"
+import type { BgmMixConfig } from "@/api/bgm"
+import { DEFAULT_TRANSITION, DEFAULT_SPEED, DEFAULT_TTS_CONFIG } from "../types"
+
+interface EditorDrawersProps {
+  // BGM
+  bgmDrawerOpen: boolean
+  bgmSettings: BgmMixConfig
+  onBgmSettingsChange: (config: BgmMixConfig) => void
+  onCloseBgmDrawer: () => void
+  // 字幕
+  subtitleDrawerOpen: boolean
+  subtitleSettings: SubtitleStyleConfig
+  onSubtitleSettingsChange: (config: SubtitleStyleConfig) => void
+  onCloseSubtitleDrawer: () => void
+  // 转场
+  transitionDrawerOpen: boolean
+  transitionTargetClipId: string | null
+  clips: ClipData[]
+  onTransitionChange: (config: TransitionConfig) => void
+  onCloseTransitionDrawer: () => void
+  // 调速
+  speedDrawerOpen: boolean
+  speedTargetClipId: string | null
+  onSpeedChange: (config: SpeedConfig) => void
+  onApplySpeedAll: (config: SpeedConfig) => void
+  onCloseSpeedDrawer: () => void
+  // TTS
+  ttsDrawerOpen: boolean
+  ttsTargetClipId: string | null
+  onTtsChange: (config: TtsConfig) => void
+  onCloseTtsDrawer: () => void
+  // 水印
+  watermarkDrawerOpen: boolean
+  watermarkSettings: WatermarkConfig
+  onWatermarkChange: (config: WatermarkConfig) => void
+  onCloseWatermarkDrawer: () => void
+  // 片头片尾
+  introOutroDrawerOpen: boolean
+  introOutroSettings: IntroOutroConfig
+  onIntroOutroChange: (config: IntroOutroConfig) => void
+  onCloseIntroOutroDrawer: () => void
+  // 混剪
+  pipDrawerOpen: boolean
+  pipSettings: PipConfig
+  totalDuration: number
+  onPipChange: (config: PipConfig) => void
+  onClosePipDrawer: () => void
+  // 滤镜
+  filterDrawerOpen: boolean
+  filterSettings: FilterConfig
+  onFilterChange: (config: FilterConfig) => void
+  onCloseFilterDrawer: () => void
+  // 绿幕
+  chromaKeyDrawerOpen: boolean
+  chromaKeySettings: ChromaKeyConfig
+  onChromaKeyChange: (config: ChromaKeyConfig) => void
+  onCloseChromaKeyDrawer: () => void
+  // 贴纸
+  stickerDrawerOpen: boolean
+  stickerSettings: StickerConfig
+  onStickerChange: (config: StickerConfig) => void
+  onCloseStickerDrawer: () => void
+}
+
+const EditorDrawers: React.FC<EditorDrawersProps> = ({
+  bgmDrawerOpen,
+  bgmSettings,
+  onBgmSettingsChange,
+  onCloseBgmDrawer,
+  subtitleDrawerOpen,
+  subtitleSettings,
+  onSubtitleSettingsChange,
+  onCloseSubtitleDrawer,
+  transitionDrawerOpen,
+  transitionTargetClipId,
+  clips,
+  onTransitionChange,
+  onCloseTransitionDrawer,
+  speedDrawerOpen,
+  speedTargetClipId,
+  onSpeedChange,
+  onApplySpeedAll,
+  onCloseSpeedDrawer,
+  ttsDrawerOpen,
+  ttsTargetClipId,
+  onTtsChange,
+  onCloseTtsDrawer,
+  watermarkDrawerOpen,
+  watermarkSettings,
+  onWatermarkChange,
+  onCloseWatermarkDrawer,
+  introOutroDrawerOpen,
+  introOutroSettings,
+  onIntroOutroChange,
+  onCloseIntroOutroDrawer,
+  pipDrawerOpen,
+  pipSettings,
+  totalDuration,
+  onPipChange,
+  onClosePipDrawer,
+  filterDrawerOpen,
+  filterSettings,
+  onFilterChange,
+  onCloseFilterDrawer,
+  chromaKeyDrawerOpen,
+  chromaKeySettings,
+  onChromaKeyChange,
+  onCloseChromaKeyDrawer,
+  stickerDrawerOpen,
+  stickerSettings,
+  onStickerChange,
+  onCloseStickerDrawer,
+}) => {
+  const transitionConfig = transitionTargetClipId
+    ? (clips.find((c) => c.id === transitionTargetClipId)?.transition ?? DEFAULT_TRANSITION)
+    : DEFAULT_TRANSITION
+
+  const transitionTitle = transitionTargetClipId ? "片段转场设置" : "全局默认转场"
+
+  return (
+    <>
+      {/* BGM 选择器 Drawer */}
+      <BgmSelector
+        open={bgmDrawerOpen}
+        onClose={onCloseBgmDrawer}
+        config={bgmSettings}
+        onChange={onBgmSettingsChange}
+      />
+
+      {/* 字幕样式配置 Drawer */}
+      <SubtitleStylePanel
+        open={subtitleDrawerOpen}
+        onClose={onCloseSubtitleDrawer}
+        config={subtitleSettings}
+        onChange={onSubtitleSettingsChange}
+      />
+
+      {/* 转场特效选择器 Drawer */}
+      <TransitionSelector
+        open={transitionDrawerOpen}
+        onClose={onCloseTransitionDrawer}
+        config={transitionConfig}
+        onChange={onTransitionChange}
+        title={transitionTitle}
+      />
+
+      {/* 片段调速面板 Drawer */}
+      {speedTargetClipId && (
+        <SpeedPanel
+          open={speedDrawerOpen}
+          onClose={onCloseSpeedDrawer}
+          config={clips.find((c) => c.id === speedTargetClipId)?.speed ?? DEFAULT_SPEED}
+          onChange={onSpeedChange}
+          onApplyAll={onApplySpeedAll}
+        />
+      )}
+
+      {/* TTS 配音面板 Drawer */}
+      {ttsTargetClipId && (
+        <TtsPanel
+          open={ttsDrawerOpen}
+          onClose={onCloseTtsDrawer}
+          config={clips.find((c) => c.id === ttsTargetClipId)?.tts_config ?? DEFAULT_TTS_CONFIG}
+          onChange={onTtsChange}
+        />
+      )}
+
+      {/* 水印配置面板 */}
+      <WatermarkPanel
+        open={watermarkDrawerOpen}
+        onClose={onCloseWatermarkDrawer}
+        config={watermarkSettings}
+        onChange={onWatermarkChange}
+      />
+
+      {/* 片头片尾配置面板 */}
+      <IntroOutroPanel
+        open={introOutroDrawerOpen}
+        onClose={onCloseIntroOutroDrawer}
+        config={introOutroSettings}
+        onChange={onIntroOutroChange}
+      />
+
+      {/* 混剪配置面板 */}
+      <PipConfigPanel
+        open={pipDrawerOpen}
+        onClose={onClosePipDrawer}
+        config={pipSettings}
+        onChange={onPipChange}
+        totalDuration={totalDuration}
+      />
+
+      {/* 滤镜调色面板 */}
+      <FilterPanel
+        open={filterDrawerOpen}
+        onClose={onCloseFilterDrawer}
+        config={filterSettings}
+        onChange={onFilterChange}
+      />
+
+      {/* 绿幕抠像面板 */}
+      <GreenScreenPanel
+        open={chromaKeyDrawerOpen}
+        onClose={onCloseChromaKeyDrawer}
+        config={chromaKeySettings}
+        onChange={onChromaKeyChange}
+      />
+
+      {/* 贴纸面板 */}
+      <StickerPanel
+        open={stickerDrawerOpen}
+        onClose={onCloseStickerDrawer}
+        config={stickerSettings}
+        onChange={onStickerChange}
+        totalDuration={totalDuration}
+      />
+    </>
+  )
+}
+
+export default EditorDrawers

apps/web/src/pages/editing-planner/components/FilterPanel.tsx

@@ -0,0 +1,106 @@
+/**
+ * 滤镜调色配置面板
+ * 预设滤镜 + 手动调节（亮度/对比度/饱和度/色温/色调/锐度）
+ */
+import React, { useCallback } from "react"
+import { Drawer, Switch } from "antd"
+import type { FilterConfig, FilterPreset } from "@/pages/editing-planner/types"
+import { DEFAULT_FILTER_CONFIG } from "@/pages/editing-planner/types"
+import { PRESET_GRADIENTS } from "@/pages/editing-planner/constants/filter"
+import FilterPresetGrid from "./filter/FilterPresetGrid"
+import FilterManualAdjust from "./filter/FilterManualAdjust"
+
+interface FilterPanelProps {
+  open: boolean
+  onClose: () => void
+  config: FilterConfig
+  onChange: (config: FilterConfig) => void
+}
+
+const FilterPanel: React.FC<FilterPanelProps> = ({ open, onClose, config, onChange }) => {
+  const update = useCallback(
+    (partial: Partial<FilterConfig>) => {
+      onChange({ ...config, ...partial })
+    },
+    [config, onChange],
+  )
+
+  const handleReset = useCallback(() => {
+    onChange({ ...DEFAULT_FILTER_CONFIG, enabled: config.enabled })
+  }, [config.enabled, onChange])
+
+  const handlePresetSelect = useCallback(
+    (preset: FilterPreset) => {
+      if (preset === "none") {
+        onChange({ ...DEFAULT_FILTER_CONFIG, enabled: config.enabled })
+      } else {
+        onChange({
+          ...DEFAULT_FILTER_CONFIG,
+          enabled: config.enabled,
+          preset,
+        })
+      }
+    },
+    [config.enabled, onChange],
+  )
+
+  const handleManualChange = useCallback(
+    (key: keyof FilterConfig, value: number) => {
+      onChange({ ...config, [key]: value })
+    },
+    [config, onChange],
+  )
+
+  return (
+    <Drawer
+      title="滤镜调色"
+      placement="right"
+      width={420}
+      styles={{ wrapper: { maxWidth: "100vw" } }}
+      open={open}
+      onClose={onClose}
+      className="filter-panel-drawer"
+    >
+      {/* 顶部开关 */}
+      <div className="filter-header">
+        <span className="filter-header-label">启用滤镜</span>
+        <Switch
+          size="small"
+          checked={config.enabled}
+          onChange={(checked) => update({ enabled: checked })}
+        />
+      </div>
+
+      {/* 预设滤镜选择 */}
+      <FilterPresetGrid selectedPreset={config.preset} onPresetSelect={handlePresetSelect} />
+
+      {/* 手动调节 */}
+      <FilterManualAdjust config={config} onChange={handleManualChange} />
+
+      {/* 预览色块 */}
+      <div className="filter-section">
+        <div className="filter-section-title">效果预览</div>
+        <div
+          className="filter-preview-block"
+          style={{
+            background: PRESET_GRADIENTS[config.preset],
+            filter: [
+              `brightness(${100 + config.brightness}%)`,
+              `contrast(${100 + config.contrast}%)`,
+              `saturate(${100 + config.saturation}%)`,
+            ].join(" "),
+          }}
+        />
+      </div>
+
+      {/* 底部重置 */}
+      <div className="filter-footer">
+        <button className="filter-reset-btn" onClick={handleReset}>
+          重置参数
+        </button>
+      </div>
+    </Drawer>
+  )
+}
+
+export default FilterPanel

apps/web/src/pages/editing-planner/components/GreenScreenPanel.tsx

@@ -0,0 +1,92 @@
+import React, { useCallback } from "react"
+import { Drawer, Switch } from "antd"
+import type { ChromaKeyConfig, ChromaKeyColorPreset } from "../types"
+import { DEFAULT_CHROMA_KEY_CONFIG, CHROMA_KEY_PRESET_COLORS } from "../types"
+import { GreenScreenPresets } from "./green-screen/GreenScreenPresets"
+import { GreenScreenCustomColor } from "./green-screen/GreenScreenCustomColor"
+import { GreenScreenSliders } from "./green-screen/GreenScreenSliders"
+import { GreenScreenPreview } from "./green-screen/GreenScreenPreview"
+
+interface GreenScreenPanelProps {
+  open: boolean
+  onClose: () => void
+  config: ChromaKeyConfig
+  onChange: (config: ChromaKeyConfig) => void
+}
+
+const GreenScreenPanel: React.FC<GreenScreenPanelProps> = ({ open, onClose, config, onChange }) => {
+  const update = useCallback(
+    (partial: Partial<ChromaKeyConfig>) => {
+      onChange({ ...config, ...partial })
+    },
+    [config, onChange],
+  )
+
+  const handleReset = useCallback(() => {
+    onChange({ ...DEFAULT_CHROMA_KEY_CONFIG, enabled: config.enabled })
+  }, [config.enabled, onChange])
+
+  const handlePresetSelect = useCallback(
+    (preset: ChromaKeyColorPreset) => {
+      update({
+        color_preset: preset,
+        color: CHROMA_KEY_PRESET_COLORS[preset],
+      })
+    },
+    [update],
+  )
+
+  const handleColorChange = useCallback(
+    (color: string) => {
+      update({ color })
+    },
+    [update],
+  )
+
+  return (
+    <Drawer
+      title="绿幕抠像"
+      placement="right"
+      width={420}
+      styles={{ wrapper: { maxWidth: "100vw" } }}
+      open={open}
+      onClose={onClose}
+      className="green-screen-panel-drawer"
+    >
+      <div className="green-header">
+        <span className="green-header-label">启用绿幕抠像</span>
+        <Switch
+          size="small"
+          checked={config.enabled}
+          onChange={(checked) => update({ enabled: checked })}
+        />
+      </div>
+
+      <GreenScreenPresets
+        selectedPreset={config.color_preset}
+        onPresetSelect={handlePresetSelect}
+      />
+
+      <GreenScreenCustomColor color={config.color} onColorChange={handleColorChange} />
+
+      <GreenScreenSliders
+        similarity={config.similarity}
+        blend={config.blend}
+        spill={config.spill}
+        onSimilarityChange={(v) => update({ similarity: v })}
+        onBlendChange={(v) => update({ blend: v })}
+        onSpillChange={(v) => update({ spill: v })}
+      />
+
+      <GreenScreenPreview color={config.color} blend={config.blend} />
+
+      <div className="green-footer">
+        <button className="green-reset-btn" onClick={handleReset}>
+          重置参数
+        </button>
+      </div>
+    </Drawer>
+  )
+}
+
+export default GreenScreenPanel

apps/web/src/pages/editing-planner/components/IntroOutroPanel.tsx

@@ -0,0 +1,101 @@
+/**
+ * 片头片尾配置面板 — Drawer 形式
+ * 两个区块：片头（Intro）/ 片尾（Outro）
+ * 每个区块支持：类型选择（无/视频/图片）、素材 URL、时长、过渡动画
+ */
+import React, { useCallback } from "react"
+import { Drawer } from "antd"
+import type {
+  IntroOutroConfig,
+  IntroOutroItem,
+  IntroOutroKind,
+} from "@/pages/editing-planner/types"
+import { DEFAULT_INTRO_OUTRO } from "@/pages/editing-planner/types"
+import IntroOutroBlock from "./intro-outro/IntroOutroBlock"
+
+interface IntroOutroPanelProps {
+  open: boolean
+  onClose: () => void
+  config: IntroOutroConfig
+  onChange: (config: IntroOutroConfig) => void
+}
+
+const IntroOutroPanel: React.FC<IntroOutroPanelProps> = ({ open, onClose, config, onChange }) => {
+  /* ── 更新片头 ── */
+  const handleIntroChange = useCallback(
+    (partial: Partial<IntroOutroItem>) => {
+      onChange({ ...config, intro: { ...config.intro, ...partial } })
+    },
+    [config, onChange],
+  )
+
+  /* ── 更新片尾 ── */
+  const handleOutroChange = useCallback(
+    (partial: Partial<IntroOutroItem>) => {
+      onChange({ ...config, outro: { ...config.outro, ...partial } })
+    },
+    [config, onChange],
+  )
+
+  /* ── 切换片头类型 ── */
+  const handleIntroKindChange = useCallback(
+    (kind: IntroOutroKind) => {
+      handleIntroChange({ kind, url: kind === "none" ? undefined : "" })
+    },
+    [handleIntroChange],
+  )
+
+  /* ── 切换片尾类型 ── */
+  const handleOutroKindChange = useCallback(
+    (kind: IntroOutroKind) => {
+      handleOutroChange({ kind, url: kind === "none" ? undefined : "" })
+    },
+    [handleOutroChange],
+  )
+
+  /* ── 重置 ── */
+  const handleReset = useCallback(() => {
+    onChange({ ...DEFAULT_INTRO_OUTRO })
+  }, [onChange])
+
+  return (
+    <Drawer
+      title="🎬 片头片尾设置"
+      placement="right"
+      width={420}
+      styles={{ wrapper: { maxWidth: "100vw" } }}
+      open={open}
+      onClose={onClose}
+      className="intro-outro-panel-drawer"
+    >
+      {/* ═══ 片头区块 ═══ */}
+      <IntroOutroBlock
+        title="片头"
+        icon="🎞️"
+        item={config.intro}
+        transitionLabel="进入过渡动画"
+        onKindChange={handleIntroKindChange}
+        onChange={handleIntroChange}
+      />
+
+      {/* ═══ 片尾区块 ═══ */}
+      <IntroOutroBlock
+        title="片尾"
+        icon="🏁"
+        item={config.outro}
+        transitionLabel="退出过渡动画"
+        onKindChange={handleOutroKindChange}
+        onChange={handleOutroChange}
+      />
+
+      {/* ── 底部操作 ── */}
+      <div className="iop-footer">
+        <button className="iop-reset-btn" onClick={handleReset}>
+          重置
+        </button>
+      </div>
+    </Drawer>
+  )
+}
+
+export default IntroOutroPanel

apps/web/src/pages/editing-planner/components/MediaPanel.tsx

@@ -0,0 +1,102 @@
+/**
+ * 左侧面板 — 模板列表
+ * 模板编辑器只负责定义模板规则（片段数量、时长范围），不承载素材管理。
+ */
+import React from "react"
+import type { EditingTemplate } from "@/api/editing-planner"
+import { MODE_LABELS } from "@/api/editing-planner"
+
+interface MediaPanelProps {
+  templates: EditingTemplate[]
+  loading: boolean
+  searchQuery: string
+  currentFilter: string
+  filterCategories: string[]
+  loadedTemplateId: string | null
+  onLoadTemplate: (id: string) => void
+  onSearchChange: (q: string) => void
+  onFilterChange: (f: string) => void
+}
+
+const MediaPanel: React.FC<MediaPanelProps> = ({
+  templates,
+  loading,
+  searchQuery,
+  currentFilter,
+  filterCategories,
+  loadedTemplateId,
+  onLoadTemplate,
+  onSearchChange,
+  onFilterChange,
+}) => {
+  return (
+    <div className="ep-left-panel">
+      {/* 搜索 */}
+      <div className="ep-search-wrap ep-media-panel-inner">
+        <span className="ep-search-icon">🔍</span>
+        <input
+          className="ep-search-input"
+          placeholder="搜索模板..."
+          value={searchQuery}
+          onChange={(e) => onSearchChange(e.target.value)}
+        />
+      </div>
+
+      {/* Chip 分类筛选 */}
+      <div className="ep-filter-chips">
+        {filterCategories.map((cat) => (
+          <button
+            key={cat}
+            className={`ep-filter-chip ${currentFilter === cat ? "active" : ""}`}
+            onClick={() => onFilterChange(cat)}
+          >
+            {cat}
+          </button>
+        ))}
+      </div>
+
+      {/* 模板列表 */}
+      <div className="ep-template-list">
+        {loading ? (
+          <div className="ep-loading">
+            <span>⏳</span>
+            <span>加载中...</span>
+          </div>
+        ) : templates.length === 0 ? (
+          <div className="ep-empty">
+            <span>📭</span>
+            <span>暂无模板</span>
+          </div>
+        ) : (
+          templates.map((tpl) => (
+            <div
+              key={tpl.id}
+              className={`ep-template-card ${loadedTemplateId === tpl.id ? "active" : ""}`}
+              onClick={() => onLoadTemplate(tpl.id)}
+            >
+              <div className="ep-template-card-header">
+                <span className="ep-template-card-name">{tpl.name}</span>
+                <span className="ep-template-card-mode">{MODE_LABELS[tpl.mode]}</span>
+              </div>
+              <div className="ep-template-card-meta">
+                <span>⏱️ {tpl.estimated_duration}s</span>
+                <span>📐 {tpl.segments.length}片段</span>
+              </div>
+              {tpl.tags.length > 0 && (
+                <div className="ep-template-card-tags">
+                  {tpl.tags.map((tag) => (
+                    <span key={tag} className="ep-template-tag">
+                      {tag}
+                    </span>
+                  ))}
+                </div>
+              )}
+            </div>
+          ))
+        )}
+      </div>
+    </div>
+  )
+}
+
+export default MediaPanel

apps/web/src/pages/editing-planner/components/ModeBar.tsx

@@ -0,0 +1,28 @@
+import React from "react"
+import type { TemplateMode } from "@/api/editing-planner"
+
+interface ModeBarProps {
+  modeList: { key: TemplateMode; label: string; icon: string }[]
+  currentMode: TemplateMode
+  onModeChange: (mode: TemplateMode) => void
+}
+
+const ModeBar: React.FC<ModeBarProps> = ({ modeList, currentMode, onModeChange }) => {
+  return (
+    <div className="ep-mode-bar">
+      <span className="ep-mode-bar-label">剪辑模式：</span>
+      {modeList.map((m) => (
+        <button
+          key={m.key}
+          className={`ep-mode-btn ${currentMode === m.key ? "active" : ""}`}
+          onClick={() => onModeChange(m.key)}
+        >
+          <span className="ep-mode-icon">{m.icon}</span>
+          <span className="ep-mode-label">{m.label}</span>
+        </button>
+      ))}
+    </div>
+  )
+}
+
+export default ModeBar

apps/web/src/pages/editing-planner/components/PipConfigPanel/components/LayerConfig.tsx

@@ -0,0 +1,268 @@
+import React from "react"
+import type { PipLayer, PipGridPosition, PipAnimType, PipSlideDirection } from "../../../types"
+import { GRID_POSITIONS, ANIM_OPTIONS, SLIDE_DIR_OPTIONS } from "../constants"
+
+export interface LayerConfigProps {
+  layer: PipLayer
+  totalDuration: number
+  onUpdate: (id: string, partial: Partial<PipLayer>) => void
+  onGridClick: (pos: PipGridPosition) => void
+  onWidthChange: (val: number) => void
+  onHeightChange: (val: number) => void
+}
+
+export const LayerConfig: React.FC<LayerConfigProps> = ({
+  layer,
+  totalDuration,
+  onUpdate,
+  onGridClick,
+  onWidthChange,
+  onHeightChange,
+}) => {
+  return (
+    <div className="pip-config-area">
+      {/* ── 素材类型 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">素材类型</label>
+        <div className="pip-type-btns">
+          <button
+            className={`pip-type-btn${layer.material_type === "image" ? " active" : ""}`}
+            onClick={() => onUpdate(layer.id, { material_type: "image" })}
+          >
+            🖼️ 图片
+          </button>
+          <button
+            className={`pip-type-btn${layer.material_type === "video" ? " active" : ""}`}
+            onClick={() => onUpdate(layer.id, { material_type: "video" })}
+          >
+            🎬 视频
+          </button>
+        </div>
+      </div>
+
+      {/* ── 素材 URL ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">
+          {layer.material_type === "image" ? "图片" : "视频"} URL
+        </label>
+        <input
+          className="pip-input"
+          type="text"
+          placeholder={
+            layer.material_type === "image"
+              ? "https://example.com/image.png"
+              : "https://example.com/video.mp4"
+          }
+          value={layer.material_url}
+          onChange={(e) => onUpdate(layer.id, { material_url: e.target.value })}
+        />
+      </div>
+
+      {/* ── 位置：九宫格 + 坐标 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">位置</label>
+        <div style={{ display: "flex", gap: 16, alignItems: "flex-start" }}>
+          <div className="pip-grid">
+            {GRID_POSITIONS.map((pos) => (
+              <button
+                key={pos}
+                className={`pip-grid-btn${layer.grid_position === pos ? " active" : ""}`}
+                onClick={() => onGridClick(pos)}
+              >
+                <span className="pip-grid-dot" />
+              </button>
+            ))}
+          </div>
+          <div className="pip-field-row" style={{ flex: 1 }}>
+            <div>
+              <label className="pip-field-label">X (%)</label>
+              <input
+                className="pip-number"
+                type="number"
+                min={0}
+                max={100}
+                value={layer.x}
+                onChange={(e) => {
+                  const val = Number(e.target.value)
+                  if (!isNaN(val) && val >= 0 && val <= 100) onUpdate(layer.id, { x: val })
+                }}
+              />
+            </div>
+            <div>
+              <label className="pip-field-label">Y (%)</label>
+              <input
+                className="pip-number"
+                type="number"
+                min={0}
+                max={100}
+                value={layer.y}
+                onChange={(e) => {
+                  const val = Number(e.target.value)
+                  if (!isNaN(val) && val >= 0 && val <= 100) onUpdate(layer.id, { y: val })
+                }}
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* ── 尺寸 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">尺寸</label>
+        <div className="pip-slider-row">
+          <span style={{ fontSize: 12, color: "#999", width: 20 }}>宽</span>
+          <input
+            className="pip-slider"
+            type="range"
+            min={10}
+            max={80}
+            value={layer.width}
+            onChange={(e) => {
+              const val = Number(e.target.value)
+              if (!isNaN(val)) onWidthChange(val)
+            }}
+          />
+          <span className="pip-slider-value">{layer.width}%</span>
+        </div>
+        <div className="pip-slider-row" style={{ marginTop: 6 }}>
+          <span style={{ fontSize: 12, color: "#999", width: 20 }}>高</span>
+          <input
+            className="pip-slider"
+            type="range"
+            min={10}
+            max={80}
+            value={layer.height}
+            onChange={(e) => {
+              const val = Number(e.target.value)
+              if (!isNaN(val)) onHeightChange(val)
+            }}
+          />
+          <span className="pip-slider-value">{layer.height}%</span>
+        </div>
+        <div
+          className="pip-lock-row"
+          style={{ marginTop: 6 }}
+          onClick={() => onUpdate(layer.id, { aspect_lock: !layer.aspect_lock })}
+        >
+          <span className="pip-lock-icon">{layer.aspect_lock ? "🔒" : "🔓"}</span>
+          <span>{layer.aspect_lock ? "已锁定比例" : "锁定宽高比"}</span>
+        </div>
+      </div>
+
+      {/* ── 圆角 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">圆角</label>
+        <div className="pip-slider-row">
+          <input
+            className="pip-slider"
+            type="range"
+            min={0}
+            max={50}
+            value={layer.border_radius}
+            onChange={(e) => {
+              const val = Number(e.target.value)
+              if (!isNaN(val)) onUpdate(layer.id, { border_radius: val })
+            }}
+          />
+          <span className="pip-slider-value">{layer.border_radius}%</span>
+        </div>
+      </div>
+
+      {/* ── 透明度 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">透明度</label>
+        <div className="pip-slider-row">
+          <input
+            className="pip-slider"
+            type="range"
+            min={0}
+            max={100}
+            value={layer.opacity}
+            onChange={(e) => {
+              const val = Number(e.target.value)
+              if (!isNaN(val)) onUpdate(layer.id, { opacity: val })
+            }}
+          />
+          <span className="pip-slider-value">{layer.opacity}%</span>
+        </div>
+      </div>
+
+      {/* ── 时间 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">时间</label>
+        <div className="pip-field-row">
+          <div>
+            <label className="pip-field-label">开始 (s)</label>
+            <input
+              className="pip-number"
+              type="number"
+              min={0}
+              max={totalDuration || 999}
+              step={0.1}
+              value={layer.start_time}
+              onChange={(e) => {
+                const val = Number(e.target.value)
+                if (!isNaN(val) && val >= 0 && val <= totalDuration)
+                  onUpdate(layer.id, { start_time: val })
+              }}
+            />
+          </div>
+          <div>
+            <label className="pip-field-label">持续 (s)</label>
+            <input
+              className="pip-number"
+              type="number"
+              min={0.1}
+              max={totalDuration || 999}
+              step={0.1}
+              value={layer.duration}
+              onChange={(e) => {
+                const val = Number(e.target.value)
+                if (!isNaN(val) && val > 0 && val <= totalDuration)
+                  onUpdate(layer.id, { duration: val })
+              }}
+            />
+          </div>
+        </div>
+      </div>
+
+      {/* ── 入场动画 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">入场动画</label>
+        <select
+          className="pip-select"
+          value={layer.animation}
+          onChange={(e) => onUpdate(layer.id, { animation: e.target.value as PipAnimType })}
+        >
+          {ANIM_OPTIONS.map((opt) => (
+            <option key={opt.value} value={opt.value}>
+              {opt.label}
+            </option>
+          ))}
+        </select>
+      </div>
+
+      {/* 滑入方向（仅 slide_in 时显示） */}
+      {layer.animation === "slide_in" && (
+        <div className="pip-field">
+          <label className="pip-field-label">滑入方向</label>
+          <select
+            className="pip-select"
+            value={layer.slide_direction}
+            onChange={(e) =>
+              onUpdate(layer.id, {
+                slide_direction: e.target.value as PipSlideDirection,
+              })
+            }
+          >
+            {SLIDE_DIR_OPTIONS.map((opt) => (
+              <option key={opt.value} value={opt.value}>
+                {opt.label}
+              </option>
+            ))}
+          </select>
+        </div>
+      )}
+    </div>
+  )
+}

apps/web/src/pages/editing-planner/components/PipConfigPanel/components/LayerList.tsx

@@ -0,0 +1,58 @@
+import React from "react"
+import type { PipLayer } from "../../../types"
+import { LAYER_COLORS } from "../constants"
+
+export interface LayerListProps {
+  layers: PipLayer[]
+  selectedId: string
+  onSelect: (id: string) => void
+  onDelete: (id: string) => void
+}
+
+export const LayerList: React.FC<LayerListProps> = ({ layers, selectedId, onSelect, onDelete }) => {
+  if (layers.length === 0) {
+    return (
+      <div className="pip-layer-list">
+        <div className="pip-layer-empty">暂无图层，点击上方添加</div>
+      </div>
+    )
+  }
+
+  return (
+    <div className="pip-layer-list">
+      {layers.map((layer, idx) => (
+        <div
+          key={layer.id}
+          className={`pip-layer-item${selectedId === layer.id ? " active" : ""}`}
+          onClick={() => onSelect(layer.id)}
+        >
+          {layer.thumbnail_url || layer.material_url ? (
+            <img
+              className="pip-layer-thumb"
+              src={layer.thumbnail_url || layer.material_url || undefined}
+              alt={layer.name}
+            />
+          ) : (
+            <div
+              className="pip-layer-thumb"
+              style={{
+                background: LAYER_COLORS[idx % LAYER_COLORS.length],
+              }}
+            />
+          )}
+          <span className="pip-layer-name">{layer.name}</span>
+          <button
+            className="pip-layer-delete"
+            onClick={(e) => {
+              e.stopPropagation()
+              onDelete(layer.id)
+            }}
+            title="删除图层"
+          >
+            ✕
+          </button>
+        </div>
+      ))}
+    </div>
+  )
+}