fix(points): make @points_gate wrapper globals + sys.modules proxy for Py3.12/PEP563 compat

- rebind wrapper code object to decorated route's __globals__ via types.FunctionType
  so PEP563 ForwardRefs (ExtractFromDouyinRequest etc.) resolve on Py3.12
- use thin sys.modules proxies for internal helpers so tests can monkeypatch
  _points_gate_enabled / _execute_with_gate and see the change at call time
- preserve backward-compat aliases (_filter_kwargs, _execute_with_gate, _run_async)
  for existing unit tests

.ci-trigger

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

.env.example

@@ -203,30 +203,3 @@ DOUBAO_MAX_RETRIES=2
 #   `if settings.points_enabled: ...`
 # 包裹扣点逻辑；所有路由接入完成并验证通过后再在 staging/prod 打开。
 POINTS_ENABLED=false
-
-# ==================== 抖音解析多源轮询 (#1963) ====================
-# 无需配置 Key 也可使用（P0 免费源可用），配置 Key 可增加兜底能力
-
-# TikHub API Key (https://tikhub.io) — $0.001/次起，注册送$0.05
-TIKHUB_API_KEY=
-
-# apizero.cn API Key (https://v1.apizero.cn) — 国内抖音解析服务
-APIZERO_API_KEY=
-
-# ==================== GPU MuseTalk Worker（反向轮询口型同步）====================
-# GPU Worker 长期鉴权 Token，Worker 端 .env 的 GPU_WORKER_TOKEN 必须与此一致
-# 留空时 development 环境允许匿名访问（仅本地调试），staging/production 必须配置
-GPU_WORKER_TOKEN=
-# 单任务超时（秒），processing 超过此时长无任务心跳才回退 pending 或标记 failed
-# #1970：RTX2060 6G 推理 720p 长视频需 5 分钟以上，默认 900
-GPU_TASK_TIMEOUT_SECONDS=900
-# 是否启用 GPU 口型同步（开关）。开启后需同时有 Worker 在心跳窗口内（5分钟）才会走 GPU 路径；
-# 开关关闭 / 无可用 Worker / GPU 任务失败或超时 → 自动回退现有 MediaKit 云端 lipsync
-USE_GPU_LIPSYNC=false
-# 业务侧轮询 GPU 任务结果的间隔（秒）
-GPU_LIPSYNC_POLL_INTERVAL=5
-# 业务侧等待 GPU 任务总超时（秒）；超时回退 MediaKit
-GPU_LIPSYNC_WAIT_TIMEOUT=1200
-# Worker 心跳新鲜度窗口（秒），last_heartbeat_at 在此窗口内视为在线
-GPU_WORKER_STALE_SECONDS=300
-

CHANGELOG.md

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

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")

alembic/versions/078_drop_script_title_fields.py

@@ -1,33 +0,0 @@
-"""#1894: drop obsolete script title fields (title_text/title_category/title_config)
-
-Revision ID: 078_drop_script_title_fields
-Revises: 077_merge_title_libs
-Create Date: 2026-09-16
-
-口播文案（scripts）不再自带配套标题、标题分类和标题样式字段。
-智能剪辑 / AI 数字人等生成场景各自通过入参配置标题，不再从文案读取。
-保留字段：title（名称）、content（正文）、segments（分段）、tags（标签）。
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "078_drop_script_title_fields"
-down_revision = "077_merge_title_libs"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("scripts") as batch:
-        batch.drop_column("title_config")
-        batch.drop_column("title_category")
-        batch.drop_column("title_text")
-
-
-def downgrade() -> 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="{}"))

alembic/versions/079_asset_atom_clips.py

@@ -1,58 +0,0 @@
-"""add asset_atom_clips table
-
-Revision ID: 079_asset_atom_clips
-Revises: 078_drop_script_title_fields
-Create Date: 2026-09-17
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "079_asset_atom_clips"
-down_revision = "078_drop_script_title_fields"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "asset_atom_clips",
-        sa.Column("id", sa.String(36), primary_key=True),
-        sa.Column(
-            "asset_id",
-            sa.String(36),
-            sa.ForeignKey("assets.id", ondelete="CASCADE"),
-            nullable=False,
-        ),
-        sa.Column("start_time", sa.Float(), nullable=False),
-        sa.Column("end_time", sa.Float(), nullable=False),
-        sa.Column("duration", sa.Float(), nullable=False),
-        sa.Column("clip_index", sa.Integer(), nullable=False),
-        sa.Column("tags", sa.JSON(), nullable=False, server_default=sa.text("'[]'")),
-        sa.Column("scene_change_at", sa.Float(), nullable=True),
-        sa.Column(
-            "is_fallback",
-            sa.Boolean(),
-            nullable=False,
-            server_default=sa.text("false"),
-        ),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            nullable=False,
-            server_default=sa.text("NOW()"),
-        ),
-    )
-    # 按素材查片段并按索引排序（复合索引前缀可独立用于 asset_id 过滤）
-    op.create_index(
-        "ix_asset_atom_clips_asset_index",
-        "asset_atom_clips",
-        ["asset_id", "clip_index"],
-        unique=True,
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("ix_asset_atom_clips_asset_index", table_name="asset_atom_clips")
-    op.drop_table("asset_atom_clips")

alembic/versions/080_edit_plan_clips_atom_clip_id.py

@@ -1,37 +0,0 @@
-"""add edit_plan_clips.atom_clip_id for #1970
-
-Revision ID: 080_edit_plan_clips_atom_clip_id
-Revises: 079_asset_atom_clips
-Create Date: 2026-09-17
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "080_edit_plan_clips_atom_clip_id"
-down_revision = "079_asset_atom_clips"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "edit_plan_clips",
-        sa.Column(
-            "atom_clip_id",
-            sa.String(36),
-            nullable=False,
-            server_default=sa.text("''"),
-        ),
-    )
-    op.create_index(
-        "ix_edit_plan_clips_atom_clip_id",
-        "edit_plan_clips",
-        ["atom_clip_id"],
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("ix_edit_plan_clips_atom_clip_id", table_name="edit_plan_clips")
-    op.drop_column("edit_plan_clips", "atom_clip_id")

alembic/versions/081_add_gpu_lipsync_tasks.py

@@ -1,58 +0,0 @@
-"""add gpu_lipsync_tasks and gpu_workers tables for MuseTalk reverse-poll worker
-
-Revision ID: 081_add_gpu_lipsync
-Revises: 080_edit_plan_clips_atom_clip_id
-Create Date: 2026-09-18
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "081_add_gpu_lipsync"
-down_revision = "080_edit_plan_clips_atom_clip_id"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # GPU Worker 注册表
-    op.create_table(
-        "gpu_workers",
-        sa.Column("worker_id", sa.String(100), primary_key=True),
-        sa.Column("hostname", sa.String(200), nullable=False, server_default=""),
-        sa.Column("gpu_name", sa.String(200), nullable=False, server_default=""),
-        sa.Column("free_vram_mb", sa.Integer(), nullable=False, server_default=sa.text("0")),
-        sa.Column("capabilities", sa.String(500), nullable=False, server_default=""),
-        sa.Column("last_heartbeat_at", sa.DateTime(), nullable=True, index=True),
-        sa.Column("created_at", sa.DateTime(), nullable=False, server_default=sa.func.now()),
-    )
-
-    # GPU 口型同步任务表
-    op.create_table(
-        "gpu_lipsync_tasks",
-        sa.Column("id", sa.String(36), primary_key=True),
-        sa.Column("lipsync_job_id", sa.String(36), nullable=False, server_default="", index=True),
-        sa.Column("user_id", sa.String(36), nullable=False, server_default="", index=True),
-        sa.Column("project_id", sa.String(36), nullable=False, server_default="", index=True),
-        sa.Column("video_url", sa.Text(), nullable=False),
-        sa.Column("audio_url", sa.Text(), nullable=False),
-        sa.Column("result_url", sa.Text(), nullable=False, server_default=""),
-        sa.Column("result_duration", sa.Float(), nullable=False, server_default=sa.text("0.0")),
-        sa.Column("status", sa.String(20), nullable=False, server_default="pending", index=True),
-        sa.Column("worker_id", sa.String(100), nullable=False, server_default="", index=True),
-        sa.Column("attempt", sa.Integer(), nullable=False, server_default=sa.text("0")),
-        sa.Column("error_msg", sa.Text(), nullable=False, server_default=""),
-        sa.Column("created_at", sa.DateTime(), nullable=False, server_default=sa.func.now()),
-        sa.Column("started_at", sa.DateTime(), nullable=True),
-        sa.Column("finished_at", sa.DateTime(), nullable=True),
-        sa.Column("updated_at", sa.DateTime(), nullable=False, server_default=sa.func.now()),
-        sa.Column("last_heartbeat_at", sa.DateTime(), nullable=True),
-    )
-    op.create_index("ix_gpu_lipsync_status_created", "gpu_lipsync_tasks", ["status", "created_at"])
-
-
-def downgrade() -> None:
-    op.drop_index("ix_gpu_lipsync_status_created", table_name="gpu_lipsync_tasks")
-    op.drop_table("gpu_lipsync_tasks")
-    op.drop_table("gpu_workers")

alembic/versions/082_atom_clip_ai_tags.py

@@ -1,26 +0,0 @@
-"""add ai_tags to asset_atom_clips for #1970 fragment-level AI tagging
-
-Revision ID: 082_atom_clip_ai_tags
-Revises: 081_add_gpu_lipsync
-Create Date: 2026-09-18
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "082_atom_clip_ai_tags"
-down_revision = "081_add_gpu_lipsync"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "asset_atom_clips",
-        sa.Column("ai_tags", sa.JSON(), nullable=True),
-    )
-
-
-def downgrade() -> None:
-    op.drop_column("asset_atom_clips", "ai_tags")

apps/api/app/api/router.py

@@ -14,7 +14,6 @@ from app.api.routes.generation_cover import router as generation_cover_router
 from app.api.routes.generation_preview import router as generation_preview_router
 from app.api.routes.generation_tasks import router as generation_tasks_router
 from app.api.routes.generation_variant_plans import router as generation_variant_plans_router
-from app.api.routes.gpu_lipsync import router as gpu_lipsync_router
 from app.api.routes.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
@@ -212,8 +211,3 @@ api_router.include_router(
     prefix="/usage",
     tags=["Usage"],
 )
-api_router.include_router(
-    gpu_lipsync_router,
-    prefix="/gpu",
-    tags=["GPU Worker"],
-)

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

@@ -25,27 +25,12 @@ def check_project_access(project_id: str, user_id: str, project_repository) -> N
         raise HTTPException(status_code=403, detail="无权访问该项目")
 
 
-_LEGACY_PLANS = {"standard", "pro", "enterprise", "basic", "premium"}
-
-
 def get_user_plan(user_id: str, user_repository: UserRepository) -> str:
-    """获取用户的会员类型，兼容旧档位值。
-
-    旧档位 standard/pro/enterprise/basic/premium 统一映射到当前体系：
-    - standard/basic → monthly
-    - pro/premium/enterprise → quarterly
-    """
+    """获取用户的订阅计划名称。"""
     user = user_repository.find_by_id(user_id)
     if user is None:
         return "free"
-    plan = getattr(user, "subscription_plan", "free") or "free"
-    if plan in {"standard", "basic"}:
-        return "monthly"
-    if plan in {"pro", "premium", "enterprise"}:
-        return "quarterly"
-    if plan not in {"free", "monthly", "quarterly", "yearly"}:
-        return "free"
-    return plan
+    return getattr(user, "subscription_plan", "free") or "free"
 
 
 def require_project_and_library(

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

@@ -29,8 +29,6 @@ from app.services.ai_avatar_render_service import (
 from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 
-from packages.middleware.points_gate import points_gate
-
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
@@ -44,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 数字人渲染任务.
 

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/generation_cover.py

@@ -27,7 +27,6 @@ from packages.adapters.sqlalchemy_impl.generation_task_repository import (
 )
 from packages.application import ListGeneratedVideosByTaskUseCase
 from packages.domain.config_schemas import normalize_plan_config
-from packages.middleware.points_gate import points_gate
 from packages.shared.storage import get_shared_storage_service
 
 from .templates_editor.dependencies import get_draft_plan_id, get_editor_services
@@ -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"),

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

@@ -16,12 +16,10 @@ from app.core.task_enqueue import (
 from app.dependencies import (
     get_asset_library_repository,
     get_asset_repository,
-    get_cosyvoice_service,
     get_db_session,
     get_generated_video_repository,
     get_generation_task_repository,
     get_project_repository,
-    get_voice_clone_profile_repository,
 )
 from app.schemas.generated_video import (
     GeneratedVideoResponse,
@@ -44,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__)
 
@@ -134,8 +131,6 @@ def _select_assets_from_library(
     mode: str,
     count: int,
     rng=None,
-    script_tags: list | None = None,
-    tag_names_by_id: dict | None = None,
 ) -> list[str]:
     """根据选取模式从素材库中选取 ready 状态的视频素材 ID。
 
@@ -145,8 +140,6 @@ def _select_assets_from_library(
         count: 选取数量，0 表示全部（仅 smart 模式有效）
         rng: 可选随机源（smart 模式排序噪声用），生产环境不传则内部随机；
             测试可注入固定种子或零噪声随机源获得确定性结果。
-        script_tags: #1970 叙事模式文案标签；非空时标签命中素材优先，不足再用其余素材兜底。
-        tag_names_by_id: asset_id → 素材标签名列表（素材只存 tag_ids 时由调用方查名称注入）。
 
     Returns:
         选中的素材 ID 列表
@@ -156,20 +149,6 @@ def _select_assets_from_library(
     if not ready_video_assets:
         return []
 
-    # 叙事模式（#1970 PR3）：文案标签命中池优先；无任何命中时完全降级为现有随机逻辑。
-    if script_tags:
-        from packages.domain.narrative_match import pick_narrative_assets
-
-        limit = count if count > 0 else None
-        picked = pick_narrative_assets(
-            ready_video_assets,
-            script_tags=script_tags,
-            tag_names_by_id=tag_names_by_id,
-            limit=limit,
-            rng=rng,
-        )
-        return [a.id for a in picked]
-
     if mode == "smart":
         # 智能匹配：统一使用 packages/domain/smart_match.py 的多维评分+多样性选取
         # 评分维度：质量分(40%) + 时长适配(30%) + 新鲜度(20%) + 未使用加分(10%)
@@ -182,78 +161,16 @@ def _select_assets_from_library(
     return [a.id for a in ready_video_assets]
 
 
-# #1970 PR3：video_ratio → 默认输出分辨率（显式 output_width/output_height 优先）
-_VIDEO_RATIO_DIMENSIONS = {
-    "9:16": (1080, 1920),
-    "16:9": (1920, 1080),
-    "1:1": (1080, 1080),
-    "3:4": (1080, 1440),
-    "4:3": (1440, 1080),
-}
-
-
-def _resolve_output_dimensions(request: CreateGenerationTaskRequest) -> tuple[int, int]:
-    """解析输出分辨率：显式 output_width/output_height 非旧默认值时优先，否则按 video_ratio。
-
-    前端 #1973 总是同时传 video_ratio 与具体分辨率，两者一致；此函数主要服务
-    只传比例的调用方，并保证旧调用（不传比例）维持 1280x720 行为。
-    """
-    width, height = request.output_width, request.output_height
-    ratio = (request.video_ratio or "").strip()
-    if ratio in _VIDEO_RATIO_DIMENSIONS and (width, height) == (1280, 720):
-        return _VIDEO_RATIO_DIMENSIONS[ratio]
-    return width, height
-
-
-def _load_asset_tag_names(db: Session, assets: list, user_id: str) -> dict[str, list[str]]:
-    """叙事模式：查 TagModel 名称，构造 asset_id → 标签名列表（失败返回空 dict 降级随机）。"""
-    try:
-        from packages.adapters.sqlalchemy_impl.models import AssetTagModel, TagModel
-
-        tag_ids = {tid for a in assets for tid in (getattr(a, "tag_ids", None) or [])}
-        if not tag_ids:
-            return {}
-        name_rows = (
-            db.query(TagModel.id, TagModel.name).filter(TagModel.id.in_(tag_ids), TagModel.user_id == user_id).all()
-        )
-        name_by_id = {row.id: row.name for row in name_rows}
-        links = db.query(AssetTagModel.asset_id, AssetTagModel.tag_id).filter(AssetTagModel.tag_id.in_(tag_ids)).all()
-        index: dict[str, list[str]] = {}
-        for asset_id, tag_id in links:
-            name = name_by_id.get(tag_id)
-            if name:
-                index.setdefault(asset_id, []).append(name)
-        return index
-    except Exception:  # noqa: BLE001 - 标签匹配是加分项，查询失败不阻断生成
-        logger.warning("[叙事模式] 素材标签查询失败，降级随机选片", exc_info=True)
-        return {}
-
-
 def _writeback_edit_plan_config(
     plan_id: str,
     task_id: str,
     title_config: dict | None,
     db: Session,
-    dedup_enabled: bool | None = None,
-    video_index: int | None = None,
-    assembly_mode: str | None = None,
-    script_id: str | None = None,
-    video_ratio: str | None = None,
 ) -> None:
     """[已下沉] 路由层兼容别名 → app.services.generation_common.writeback_edit_plan_config。"""
     from app.services.generation_common import writeback_edit_plan_config
 
-    return writeback_edit_plan_config(
-        plan_id,
-        task_id,
-        title_config,
-        db,
-        dedup_enabled=dedup_enabled,
-        video_index=video_index,
-        assembly_mode=assembly_mode,
-        script_id=script_id,
-        video_ratio=video_ratio,
-    )
+    return writeback_edit_plan_config(plan_id, task_id, title_config, db)
 
 
 def _resolve_project_and_library(
@@ -294,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),
@@ -303,63 +219,16 @@ def create_generation_task(
     asset_library_repository: Any = Depends(get_asset_library_repository),
     asset_repository: Any = Depends(get_asset_repository),
     db: Session = Depends(get_db_session),
-    cosyvoice_service: Any = Depends(get_cosyvoice_service),
-    voice_clone_repository: Any = Depends(get_voice_clone_profile_repository),
 ) -> BatchGenerationTaskResponse:
     logger.info(
-        "[生成任务] 接收请求: user_id=%s, template_id=%s, asset_count=%d, mode=%s, assembly=%s, count=%d",
+        "[生成任务] 接收请求: user_id=%s, template_id=%s, asset_count=%d, mode=%s, count=%d",
         authenticated_user.user.id,
         request.template_id,
         len(request.asset_ids),
         request.asset_select_mode,
-        request.assembly_mode,
         request.count,
     )
 
-    # video_ratio → 默认分辨率（显式分辨率优先）
-    request.output_width, request.output_height = _resolve_output_dimensions(request)
-
-    # ── #1970 PR3 叙事模式：入队前同步合成配音并落为 audio asset ──
-    # 合成结果覆盖 voice_library_id（下游按 audio asset id 消费），失败直接 4xx 不入队。
-    narrative_script_tags: list = []
-    if request.assembly_mode == "narrative":
-        from app.config import settings as _settings
-        from app.services.narrative_service import NarrativeError, prepare_narrative_voice
-
-        from packages.adapters.sqlalchemy_impl.tts_job_repository import SQLAlchemyTTSJobRepository
-
-        try:
-            narrative_ctx = prepare_narrative_voice(
-                db=db,
-                user_id=authenticated_user.user.id,
-                script_id=request.script_id,
-                tts_voice_id=request.tts_voice_id,
-                tts_voice_source=request.tts_voice_source,
-                tts_repository=SQLAlchemyTTSJobRepository(db),
-                cosyvoice_service=cosyvoice_service,
-                voice_clone_repository=voice_clone_repository,
-                asset_repository=asset_repository,
-                asset_library_repository=asset_library_repository,
-                project_repository=project_repository,
-                storage_service=get_storage_service(),
-                points_enabled=bool(getattr(_settings, "points_enabled", False)),
-                is_member=bool(getattr(authenticated_user.user, "is_member", False)),
-                member_type=getattr(authenticated_user.user, "member_type", None),
-            )
-        except NarrativeError as e:
-            logger.warning("[叙事模式] 配音前置处理失败: %s", e.message)
-            raise HTTPException(status_code=e.status_code, detail=e.message) from e
-
-        request.voice_library_id = narrative_ctx.voice_asset_id
-        narrative_script_tags = list(getattr(narrative_ctx.script, "tags", None) or [])
-        logger.info(
-            "[叙事模式] 配音已就绪: script_id=%s, tts_job=%s, voice_asset=%s, duration=%.2f",
-            request.script_id,
-            narrative_ctx.tts_job_id,
-            narrative_ctx.voice_asset_id,
-            narrative_ctx.audio_duration,
-        )
-
     try:
         project_id, asset_library_id = _resolve_project_and_library(
             request, project_repository, asset_library_repository, asset_repository, authenticated_user
@@ -385,29 +254,19 @@ def create_generation_task(
 
         # 素材库自动匹配：当未显式指定 asset_ids 时，按模式自动选取
         if not resolved_asset_ids:
-            _tag_index = (
-                _load_asset_tag_names(db, assets, authenticated_user.user.id) if narrative_script_tags else None
-            )
             resolved_asset_ids = _select_assets_from_library(
                 assets,
                 mode=request.asset_select_mode,
                 count=request.asset_select_count,
-                script_tags=narrative_script_tags or None,
-                tag_names_by_id=_tag_index,
             )
-    elif project_id and not resolved_asset_ids and (request.asset_select_mode in ("smart",) or narrative_script_tags):
-        # 项目级模式：未指定 asset_ids 且选择了 smart 模式（或叙事模式按标签匹配）时自动选取
+    elif project_id and not resolved_asset_ids and request.asset_select_mode in ("smart",):
+        # 项目级模式：未指定 asset_ids 且选择了 smart 模式时，也自动选取
         assets = asset_repository.find_by_project(project_id)
         if assets:
-            _tag_index = (
-                _load_asset_tag_names(db, assets, authenticated_user.user.id) if narrative_script_tags else None
-            )
             resolved_asset_ids = _select_assets_from_library(
                 assets,
                 mode=request.asset_select_mode,
                 count=request.asset_select_count,
-                script_tags=narrative_script_tags or None,
-                tag_names_by_id=_tag_index,
             )
             if not resolved_asset_ids:
                 raise HTTPException(
@@ -471,10 +330,6 @@ def create_generation_task(
                             task_id=preview_task.id,
                             title_config=fallback_title_config,
                             db=db,
-                            dedup_enabled=request.dedup_enabled,
-                            assembly_mode=request.assembly_mode,
-                            script_id=request.script_id or None,
-                            video_ratio=request.video_ratio or None,
                         )
 
                     logger.info(
@@ -619,12 +474,9 @@ def create_generation_task(
             variant_plan_ids.append(_plan0.id)
 
             # #1855 P0：批次区间避让表，从变体0实际clips构建初始值（公共函数）
-            from app.services.generation_common import collect_plan_atom_clip_ids as _collect_atom_ids
             from app.services.generation_common import collect_plan_segments as _collect_segments
 
             _batch_segments = _collect_segments(_plan0.id, _plan_svc._clip_repo)
-            # #1970：批次内原子片段硬避让集合
-            _batch_atom_ids: list[str] = _collect_atom_ids(_plan0.id, _plan_svc._clip_repo)
 
             # 变体 1..N-1 独立选片（传入累积batch_segments做素材区间避让）
             for task_index in range(1, count):
@@ -639,7 +491,6 @@ def create_generation_task(
                             name_suffix=f"批量{task_index + 1}",
                             voice_duration=voice_durations[task_index] if task_index < len(voice_durations) else 0.0,
                             batch_segments=_batch_segments,
-                            batch_used_atom_ids=_batch_atom_ids,
                         )
                         break
                     except ValueError as ve:
@@ -676,8 +527,6 @@ def create_generation_task(
                     _new_segs = _collect_segments(variant.id, _plan_svc._clip_repo)
                     for _aid, _ivs in _new_segs.items():
                         _batch_segments.setdefault(_aid, []).extend(_ivs)
-                    # #1970：同步累积原子片段ID
-                    _batch_atom_ids.extend(_collect_atom_ids(variant.id, _plan_svc._clip_repo))
                 except Exception:
                     logger.exception("[生成任务] 变体%d 区间收集失败（不阻断）", task_index)
 
@@ -821,11 +670,6 @@ def create_generation_task(
                         task_id=task.id,
                         title_config=variant_title_config,
                         db=db,
-                        dedup_enabled=request.dedup_enabled,
-                        video_index=task_index,
-                        assembly_mode=request.assembly_mode,
-                        script_id=request.script_id or None,
-                        video_ratio=request.video_ratio or None,
                     )
 
                 if safe_enqueue_generation_task(
@@ -916,7 +760,6 @@ def confirm_generation(
             generation_task_repository.update(source_task)
 
             # 同步标题到 EditPlan.config
-            # #1970：确认生成复用预览计划，dedup_enabled 沿用计划已有值，不在此覆盖
             if confirmed_title_config and source_task.source_edit_plan_id:
                 _writeback_edit_plan_config(
                     plan_id=source_task.source_edit_plan_id,

apps/api/app/api/routes/gpu_lipsync.py

@@ -1,231 +0,0 @@
-"""GPU MuseTalk Worker 反向轮询路由 — /api/v1/gpu/lipsync/*.
-
-仅面向部署在用户 RTX2060 本地的 GPU Worker 脚本，不面向前端用户。
-鉴权方式：长期 API Token（`Authorization: Bearer <GPU_WORKER_TOKEN>`），不走用户 JWT。
-
-接口：
-  POST  /api/v1/gpu/register              Worker 注册/心跳
-  GET   /api/v1/gpu/lipsync/poll          Worker 轮询拉任务（无任务返回 204）
-  POST  /api/v1/gpu/lipsync/result        Worker multipart 上传结果视频/上报失败
-  GET   /api/v1/gpu/lipsync/status/{id}   业务侧查询任务状态（内部接口，暂开放给登录用户）
-"""
-
-from __future__ import annotations
-
-import logging
-import tempfile
-from datetime import UTC, datetime
-from pathlib import Path
-from typing import Optional
-
-import requests
-from app.core.storage import get_storage_service
-from app.dependencies import get_db_session
-from app.schemas.gpu_lipsync import (
-    GpuLipsyncPollResponse,
-    GpuLipsyncResultResponse,
-    GpuLipsyncStatusResponse,
-    GpuLipsyncTaskPayload,
-    GpuWorkerRegisterRequest,
-    GpuWorkerRegisterResponse,
-)
-from app.services.gpu_lipsync_service import GpuLipsyncService
-from fastapi import (
-    APIRouter,
-    Depends,
-    File,
-    Form,
-    HTTPException,
-    Query,
-    Request,
-    UploadFile,
-    status,
-)
-from fastapi.responses import Response
-from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
-
-from packages.config import get_api_settings
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter()
-
-# 复用 bearer scheme 抽 Token，但不校验用户 JWT
-_gpu_bearer = HTTPBearer(auto_error=False)
-
-
-def _verify_gpu_token(
-    credentials: Optional[HTTPAuthorizationCredentials] = Depends(_gpu_bearer),
-) -> str:
-    """校验 GPU Worker Token，返回 worker 提供的 token 串（仅用于日志，不做身份识别）.
-
-    - development 且未配置 token → 直接放行（方便本地调试）。
-    - production/staging 未配置 token → 拒绝（避免裸奔）。
-    - token 不匹配 → 401。
-    """
-    settings = get_api_settings()
-    expected = (settings.gpu_worker_token or "").strip()
-    is_dev = settings.environment == "development"
-    if not expected:
-        if is_dev:
-            return credentials.credentials if credentials else ""
-        raise HTTPException(
-            status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
-            detail="GPU_WORKER_TOKEN not configured on server",
-        )
-    if credentials is None or credentials.scheme.lower() != "bearer":
-        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Missing bearer token")
-    if credentials.credentials != expected:
-        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid GPU worker token")
-    return credentials.credentials
-
-
-def _get_svc(db=Depends(get_db_session)) -> GpuLipsyncService:
-    return GpuLipsyncService(db)
-
-
-# ── POST /register — Worker 注册/心跳 ──────────────────────────────
-
-
-@router.post("/register", response_model=GpuWorkerRegisterResponse)
-def register_worker(
-    body: GpuWorkerRegisterRequest,
-    svc: GpuLipsyncService = Depends(_get_svc),
-    _token: str = Depends(_verify_gpu_token),
-):
-    svc.register_worker(
-        worker_id=body.worker_id,
-        hostname=body.hostname,
-        gpu_name=body.gpu_name,
-        free_vram_mb=body.free_vram_mb,
-        capabilities=body.capabilities,
-        task_id=body.task_id,
-    )
-    return GpuWorkerRegisterResponse(ok=True, server_time=datetime.now(UTC), message="ok")
-
-
-# ── GET /lipsync/poll — Worker 轮询拉任务 ─────────────────────────
-
-
-@router.get("/lipsync/poll")
-def poll_task(
-    worker_id: str = Query(..., min_length=1, max_length=100, description="Worker 唯一 ID"),
-    svc: GpuLipsyncService = Depends(_get_svc),
-    _token: str = Depends(_verify_gpu_token),
-):
-    task = svc.poll_task(worker_id=worker_id)
-    if task is None:
-        return Response(status_code=status.HTTP_204_NO_CONTENT)
-    payload = GpuLipsyncTaskPayload(
-        task_id=task.id,
-        video_url=getattr(task, "_signed_video_url", task.video_url),
-        audio_url=getattr(task, "_signed_audio_url", task.audio_url),
-        lipsync_job_id=task.lipsync_job_id or "",
-        user_id=task.user_id or "",
-        project_id=task.project_id or "",
-        created_at=task.created_at,
-        upload_url=getattr(task, "_signed_upload_url", ""),
-        upload_method="PUT",
-        expires_at=getattr(task, "_upload_expires_at", datetime.now(UTC)),
-    )
-    return GpuLipsyncPollResponse(task=payload)
-
-
-# ── POST /lipsync/result — Worker 上报结果（multipart） ─────────────
-
-
-@router.post("/lipsync/result", response_model=GpuLipsyncResultResponse)
-async def report_result(
-    request: Request,
-    task_id: str = Form(...),
-    worker_id: str = Form(...),
-    success: bool = Form(True),
-    duration_seconds: float = Form(0.0),
-    error_msg: str = Form(""),
-    result: Optional[UploadFile] = File(None),
-    svc: GpuLipsyncService = Depends(_get_svc),
-    _token: str = Depends(_verify_gpu_token),
-):
-    # 参数校验：
-    # - success=true + result 文件 → API 代为上传到 OSS（方便 Worker 端实现）
-    # - success=true + 无文件 → Worker 已经自己 PUT 到预签名 upload_url，直接确认
-    # - success=false → 不上传文件，错误信息通过 error_msg 传递
-    if success and result is not None:
-        # 把文件落盘到临时目录，然后 PUT 到预签名 URL
-        storage = get_storage_service()
-        result_key = svc._result_key(task_id)
-        upload_url = storage.get_upload_url(result_key, expires_seconds=3600, content_type="video/mp4")
-        try:
-            with tempfile.TemporaryDirectory(prefix="gpu_result_") as tmpdir:
-                tmp_path = Path(tmpdir) / "result.mp4"
-                content = await result.read()
-                if not content:
-                    raise HTTPException(status_code=400, detail="上传的 result 文件为空")
-                tmp_path.write_bytes(content)
-                headers = {"Content-Type": "video/mp4"}
-                with open(tmp_path, "rb") as f:
-                    resp = requests.put(upload_url, data=f, headers=headers, timeout=300)
-                if resp.status_code >= 400:
-                    logger.error(
-                        "上传 GPU 结果到 OSS 失败: status=%d body=%s",
-                        resp.status_code,
-                        resp.text[:500],
-                    )
-                    raise HTTPException(
-                        status_code=502,
-                        detail=f"上传结果视频到 OSS 失败 (HTTP {resp.status_code})",
-                    )
-        except HTTPException:
-            raise
-        except Exception as exc:
-            logger.exception("上传 GPU 结果视频异常: %s", exc)
-            raise HTTPException(status_code=500, detail=f"上传结果视频异常: {exc}") from exc
-    elif not success:
-        # 失败时忽略 result 文件（即便传了也没用）
-        pass
-    # 其他情况：success=true 且无文件 → Worker 已自行 PUT 到预签名 URL，直接标记完成
-
-    try:
-        task = svc.report_result(
-            task_id=task_id,
-            worker_id=worker_id,
-            success=success,
-            duration_seconds=duration_seconds,
-            error_msg=error_msg,
-        )
-    except KeyError as exc:
-        raise HTTPException(status_code=404, detail=str(exc)) from exc
-    return GpuLipsyncResultResponse(
-        ok=True,
-        task_id=task.id,
-        status=task.status,
-        message="ok",
-    )
-
-
-# ── GET /lipsync/status/{task_id} — 业务侧查询状态 ─────────────────
-# 说明：此接口会被 lipsync_service 内部在业务流程里直接读 DB，不通过 HTTP。
-# 但仍暴露一个简单查询接口，方便调试和前端轮询（如后续需要）。暂不做用户权限校验，
-# task_id 本身是 UUID，不可枚举。
-
-
-@router.get("/lipsync/status/{task_id}", response_model=GpuLipsyncStatusResponse)
-def get_task_status(
-    task_id: str,
-    svc: GpuLipsyncService = Depends(_get_svc),
-):
-    task = svc.get_task(task_id)
-    if task is None:
-        raise HTTPException(status_code=404, detail="task not found")
-    return GpuLipsyncStatusResponse(
-        task_id=task.id,
-        status=task.status,
-        result_url=task.result_url,
-        result_duration=task.result_duration,
-        error_msg=task.error_msg,
-        worker_id=task.worker_id,
-        attempt=task.attempt,
-        created_at=task.created_at,
-        started_at=task.started_at,
-        finished_at=task.finished_at,
-    )

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

@@ -12,11 +12,9 @@
 from __future__ import annotations
 
 import logging
-import math
 from datetime import UTC
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.config import settings
 from app.dependencies import (
     get_db_session,
     get_voice_clone_profile_repository,
@@ -32,9 +30,6 @@ from app.services.mediakit_client import MediaKitError
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 
-from packages.domain.points_rules import calculate_points_cost
-from packages.domain.points_service import PointsService
-
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
@@ -58,40 +53,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 +66,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 +79,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 +96,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 +111,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 +121,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 +142,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}",
@@ -295,14 +199,7 @@ def get_lipsync_job(
         from datetime import datetime as _dt
 
         _now = _dt.now(UTC)
-        _upd = job.updated_at
-        # DB 返回的 DateTime 列可能是 naive（取决于方言/驱动）：代码写入统一用
-        # datetime.now(UTC)，经 SQLAlchemy 存入 TIMESTAMP WITHOUT TIMEZONE 后再
-        # 读回就是 UTC wall clock 的 naive datetime，直接补 UTC tz 即可；避免
-        # TypeError: can't subtract offset-naive and offset-aware datetimes。
-        if _upd is not None and _upd.tzinfo is None:
-            _upd = _upd.replace(tzinfo=UTC)
-        _stale = _upd is None or (_now - _upd).total_seconds() > 30
+        _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)

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

@@ -8,7 +8,7 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime, timedelta, timezone
+from datetime import datetime
 from typing import Optional
 
 from app.auth import AuthenticatedUser, get_current_user
@@ -125,7 +125,6 @@ def get_rules(
                 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(
@@ -162,16 +161,7 @@ def check_points(
     current_user: AuthenticatedUser = Depends(get_current_user),
     db: Session = Depends(get_db_session),
 ):
-    """消费前检查余额是否足够。未知 scene_key 返回 400（而非 500）。"""
-    if body.scene_key not in POINTS_SCENES:
-        raise HTTPException(
-            status_code=400,
-            detail={
-                "code": "UNKNOWN_SCENE",
-                "message": f"未知场景: {body.scene_key}",
-                "valid_scenes": sorted(POINTS_SCENES.keys()),
-            },
-        )
+    """消费前检查余额是否足够。"""
     is_mem = _is_member(current_user)
     mt = _member_type(current_user)
 
@@ -277,7 +267,7 @@ def create_recharge_order(
     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(
@@ -288,14 +278,6 @@ def create_recharge_order(
         )
     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)
 
 

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

@@ -1,12 +1,7 @@
-"""Scripts AI 能力路由 — Issue #1893/#1963.
+"""Scripts AI 能力路由 — Issue #1893.
 
 三个 AI 工具接口（均挂载在 /api/v1/scripts 前缀下）：
-- POST /extract-from-douyin  从抖音视频提取文案
-  - 入口自动从分享文本中正则提取 http(s) URL，兼容 "复制链接" 粘贴场景
-  - 多源轮询解析（douyin_resolver）：App Feed API → TikHub → apizero
-  - 拿到 MP4 直链后优先走火山 MediaKit ASR，失败回退下载+本地 ASR
-  - ASR 空结果时使用 Feed desc 兜底，图文视频直接返回 desc
-  - 所有源均失败时返回具体错误信息（不暴露内部细节）
+- POST /extract-from-douyin  从抖音视频提取文案（yt-dlp 下载 + ASR 转写）
 - POST /ai-rewrite           AI 文案改写（复用豆包 LLM）
 - POST /ai-generate-titles   AI 标题生成（复用 generate_smart_titles）
 """
@@ -14,14 +9,10 @@
 from __future__ import annotations
 
 import logging
-import os
 import re
 import tempfile
-import time
-from urllib.parse import urlparse
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session
 from app.schemas.scripts_ai import (
     AiGenerateTitlesRequest,
     AiGenerateTitlesResponse,
@@ -30,525 +21,214 @@ from app.schemas.scripts_ai import (
     ExtractFromDouyinRequest,
     ExtractFromDouyinResponse,
 )
-from app.services.douyin_resolver import available_providers, resolve_douyin_video
-from app.services.mediakit_client import (
-    MediaKitClient,
-    MediaKitError,
-    get_mediakit_client,
-)
 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()
 
-_DOUYIN_DEBUG_ERRORS = os.environ.get("DOUYIN_DEBUG_ERRORS", "").lower() in (
-    "1",
-    "true",
-    "yes",
-) or os.environ.get(
-    "APP_ENV", ""
-).lower() in ("staging", "dev", "development", "test")
-
-_TAIL_PUNCT = ".,;:!?，。；：！？)）]》" + chr(34) + chr(39) + "<>"
-_URL_EXTRACT_RE = re.compile(r"https?://\S+", re.IGNORECASE)
-_DOUYIN_HOST_RE = re.compile(
-    r"(^|\.)(douyin\.com|iesdouyin\.com|amemv\.com)$",
+# 抖音 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,
 )
-_ANY_SCHEME_RE = re.compile(r"^[a-z][a-z0-9+.-]*://\S+", re.IGNORECASE)
 
 
-def _dbg(key, val):
-    logger.debug("douyin_extract %s=%s", key, str(val)[:200])
-
-
-def _extract_url_from_text(raw):
-    if not raw:
-        return None
-    m = _URL_EXTRACT_RE.search(raw)
-    if m:
-        return m.group(0).rstrip(_TAIL_PUNCT)
-    short = re.search(
-        r"(?:^|(?<![a-z0-9/:]))((?:v|www)\.douyin\.com/\S+|douyin\.com/(?:video|note)/\S+)",
-        raw,
-        re.IGNORECASE,
-    )
-    if short:
-        return "https://" + short.group(1).rstrip(_TAIL_PUNCT)
-    return None
-
-
-def _extract_and_validate_douyin_url(raw_input):
-    raw = (raw_input or "").strip()
-    if not raw:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="链接不能为空")
-
-    url = _extract_url_from_text(raw)
-
-    if not url:
-        if _ANY_SCHEME_RE.search(raw):
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="无效的抖音链接，仅支持 http(s) 协议",
-            )
-        short = re.search(
-            r"(?:^|(?<![a-z0-9]))((?:v|www)\.douyin\.com/\S+|douyin\.com/(?:video|note)/\S+)",
-            raw,
-            re.IGNORECASE,
-        )
-        if short:
-            url = "https://" + short.group(1).rstrip(_TAIL_PUNCT)
-        else:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="未在输入中找到有效抖音链接，请粘贴包含 v.douyin.com 或 www.douyin.com 的分享文本",
-            )
-
-    if not re.match(r"^https?://", url, re.IGNORECASE):
-        url = "https://" + url
-
-    try:
-        parsed = urlparse(url)
-        host = parsed.hostname or ""
-        scheme = (parsed.scheme or "").lower()
-    except Exception:
-        host = ""
-        scheme = ""
-    if scheme not in ("http", "https"):
+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="无效的抖音链接，仅支持 http(s) 协议",
+            detail="链接不能为空",
         )
-    if not _DOUYIN_HOST_RE.search(host):
+    if not _DOUYIN_URL_RE.match(url.strip()):
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="无效的抖音链接，仅支持 douyin.com 域名（v.douyin.com 短链或 www.douyin.com 长链）",
+            detail="无效的抖音链接，仅支持 v.douyin.com 短链或 www.douyin.com/video/ 长链",
         )
-    return url
 
 
-# ── MediaKitClient ASR 扩展（monkey patch） ────────────────────────────
+# ── 1. 从抖音视频提取文案 ─────────────────────────────────────────────────────
 
 
-def _mk_post_json(self, path, payload):
-    import httpx
-
-    if not self.is_available:
-        raise MediaKitError("MediaKit API Key 未配置", code="NotConfigured")
-    url = self._base_url + path
-    try:
-        with httpx.Client(timeout=self._timeout) as http:
-            resp = http.post(url, headers=self._headers(), json=payload)
-            resp.raise_for_status()
-            data = resp.json()
-    except httpx.TimeoutException as exc:
-        raise MediaKitError("MediaKit API 超时 (%ss)" % self._timeout, code="Timeout") from exc
-    except httpx.HTTPStatusError as exc:
-        raise MediaKitError(
-            "MediaKit API HTTP %s: %s" % (exc.response.status_code, exc.response.text[:300]),
-            code="HttpError",
-        ) from exc
-    except httpx.RequestError as exc:
-        raise MediaKitError("MediaKit API 网络错误: %s" % exc, code="NetworkError") from exc
-    if data.get("success") is False and data.get("error"):
-        err = data["error"] if isinstance(data["error"], dict) else {"message": str(data["error"])}
-        raise MediaKitError(
-            err.get("message", "请求失败"),
-            code=err.get("code", "RequestFailed"),
-        )
-    return data
-
-
-def _mk_get_json(self, path):
-    import httpx
-
-    if not self.is_available:
-        raise MediaKitError("MediaKit API Key 未配置", code="NotConfigured")
-    url = self._base_url + path
-    try:
-        with httpx.Client(timeout=self._timeout) as http:
-            resp = http.get(url, headers=self._headers())
-            resp.raise_for_status()
-            return resp.json()
-    except httpx.TimeoutException as exc:
-        raise MediaKitError("MediaKit API 超时 (%ss)" % self._timeout, code="Timeout") from exc
-    except httpx.HTTPStatusError as exc:
-        raise MediaKitError(
-            "MediaKit API HTTP %s: %s" % (exc.response.status_code, exc.response.text[:300]),
-            code="HttpError",
-        ) from exc
-    except httpx.RequestError as exc:
-        raise MediaKitError("MediaKit API 网络错误: %s" % exc, code="NetworkError") from exc
-
-
-def _mediakit_asr_submit(self, video_url):
-    """提交语音转字幕任务（POST /tools/asr-subtitles）。返回 task_id。"""
-    data = self._post_json(
-        "/tools/asr-subtitles",
-        {"video_url": video_url, "language": "cmn-Hans-CN"},
-    )
-    task_id = data.get("task_id")
-    if not task_id:
-        raise MediaKitError("MediaKit ASR 提交响应缺少 task_id: %s" % str(data)[:200])
-    return task_id
-
-
-def _mediakit_asr_poll(self, task_id, poll_interval=2.0, max_attempts=90):
-    """轮询 ASR 任务直到 completed/failed。返回 (text, duration)。"""
-    for attempt in range(max_attempts):
-        time.sleep(poll_interval)
-        try:
-            data = self._get_json("/tasks/" + task_id)
-        except MediaKitError as exc:
-            if attempt < max_attempts - 1 and getattr(exc, "code", "") in ("Timeout", "NetworkError"):
-                logger.warning("MediaKit ASR 轮询异常（第%d次），将重试: %s", attempt + 1, exc)
-                continue
-            raise
-        st = data.get("status")
-        if st in ("completed", "success"):
-            result = data.get("result") or {}
-            subs = result.get("subtitles") or []
-            text = "".join(s.get("subtitle_text", "") for s in subs if isinstance(s, dict))
-            duration = float(result.get("duration") or 0.0)
-            return text.strip(), duration
-        if st == "failed":
-            err = data.get("error")
-            if isinstance(err, dict):
-                msg = err.get("message") or "unknown"
-                code = err.get("code") or "TaskFailed"
-            elif isinstance(err, str):
-                msg, code = err, "TaskFailed"
-            else:
-                msg, code = "unknown", "TaskFailed"
-            raise MediaKitError("MediaKit ASR 任务失败: %s" % msg, code=code)
-    raise MediaKitError(
-        "MediaKit ASR 超时（%ss 未完成）" % int(poll_interval * max_attempts),
-        code="Timeout",
-    )
-
-
-# 绑定到类（零侵入）
-if not hasattr(MediaKitClient, "_post_json"):
-    MediaKitClient._post_json = _mk_post_json
-if not hasattr(MediaKitClient, "_get_json"):
-    MediaKitClient._get_json = _mk_get_json
-if not hasattr(MediaKitClient, "asr_submit"):
-    MediaKitClient.asr_submit = _mediakit_asr_submit
-if not hasattr(MediaKitClient, "asr_poll"):
-    MediaKitClient.asr_poll = _mediakit_asr_poll
-
-
-# ── 下载 + 本地 ASR 兜底 ──────────────────────────────────────────────
-
-
-def _direct_url_download_and_local_asr(direct_url, page_url, temp_dir):
-    """通过直链下载 MP4，再做本地 ASR。返回 (text, duration)。"""
-    import os
-
-    import httpx
-
-    video_path = os.path.join(temp_dir, "video.mp4")
-    try:
-        with httpx.Client(timeout=90, follow_redirects=True, verify=False) as http:
-            with http.stream(
-                "GET",
-                direct_url,
-                headers={
-                    "User-Agent": (
-                        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
-                        "AppleWebKit/537.36 (KHTML, like Gecko) "
-                        "Chrome/128.0.0.0 Safari/537.36"
-                    ),
-                    "Referer": "https://www.douyin.com/",
-                    "Accept": "*/*",
-                    "Accept-Language": "zh-CN,zh;q=0.9",
-                },
-            ) as resp:
-                resp.raise_for_status()
-                downloaded = 0
-                with open(video_path, "wb") as f:
-                    for chunk in resp.iter_bytes(chunk_size=65536):
-                        if chunk:
-                            f.write(chunk)
-                            downloaded += len(chunk)
-                if downloaded == 0:
-                    raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail="直链下载为空")
-    except HTTPException:
-        raise
-    except httpx.TimeoutException:
-        logger.warning("直链下载超时: %s", page_url)
-        raise HTTPException(status_code=status.HTTP_504_GATEWAY_TIMEOUT, detail="视频下载超时，请稍后重试") from None
-    except Exception as exc:  # noqa: BLE001
-        logger.exception("直链下载失败: url=%s err=%s", page_url, exc)
-        raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail="视频下载失败: " + str(exc)[:200]) from exc
-
-    try:
-        text = transcribe_to_text(video_path)
-        return text.strip(), 0.0
-    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="语音识别失败: " + str(exc)[:200],
-        ) from exc
-
-
-# ── 1. 从抖音视频提取文案 ─────────────────────────────────────────────
-
-
-@router.get("/douyin/__debug_diag")
-def douyin_diag():
-    """[Staging/Dev only] 抖音解析源诊断。"""
-    import time as _t
-
-    import httpx as _httpx
-    from app.services.douyin_resolver import APIZERO_API_KEY as _api_key_apizero
-    from app.services.douyin_resolver import TIKHUB_API_KEY as _api_key_tikhub
-
-    results = {
-        "providers": available_providers(),
-        "env": {
-            "APP_ENV": os.environ.get("APP_ENV", ""),
-            "MEDIAKIT_CONFIGURED": bool(os.environ.get("MEDIAKIT_API_KEY", "")),
-        },
-    }
-
-    test_url = "https://v.douyin.com/hb-giW8cC1Q/"
-
-    t0 = _t.time()
-    try:
-        r = resolve_douyin_video(test_url)
-        results["resolver"] = {
-            "ok": bool(r),
-            "source": r.source if r else None,
-            "desc_len": len(r.desc) if r else 0,
-            "has_video_url": bool(r.video_url) if r else False,
-            "url_domain": r.video_url.split("/")[2] if r and r.video_url and "/" in r.video_url else None,
-            "time": round(_t.time() - t0, 2),
-        }
-    except Exception as e:
-        results["resolver"] = {"ok": False, "error": str(e)[:200], "time": round(_t.time() - t0, 2)}
-
-    if _api_key_apizero:
-        t0 = _t.time()
-        try:
-            with _httpx.Client(timeout=8, verify=False) as c:
-                r = c.get(
-                    "https://v1.apizero.cn/api/video-parse",
-                    params={"url": test_url, "flat": 2},
-                    headers={"Authorization": f"Bearer {_api_key_apizero}"},
-                )
-                results["apizero"] = {"status": r.status_code, "prefix": r.text[:200], "time": round(_t.time() - t0, 2)}
-        except Exception as e:
-            results["apizero"] = {"error": str(e)[:200], "time": round(_t.time() - t0, 2)}
-
-    if _api_key_tikhub:
-        t0 = _t.time()
-        try:
-            with _httpx.Client(timeout=8, verify=False) as c:
-                r = c.get(
-                    "https://api.tikhub.io/api/v1/douyin/web/get_aweme_id",
-                    params={"url": test_url},
-                    headers={"Authorization": f"Bearer {_api_key_tikhub}"},
-                )
-                results["tikhub"] = {"status": r.status_code, "prefix": r.text[:200], "time": round(_t.time() - t0, 2)}
-        except Exception as e:
-            results["tikhub"] = {"error": str(e)[:200], "time": round(_t.time() - t0, 2)}
-
-    return results
-
-
-@router.post("/extract-from-douyin", response_model=ExtractFromDouyinResponse)
-@points_gate("douyin_extract")
+@router.post(
+    "/extract-from-douyin",
+    response_model=ExtractFromDouyinResponse,
+)
 def extract_from_douyin(
     request: ExtractFromDouyinRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
-    page_url = _extract_and_validate_douyin_url(request.url)
-    _dbg("page_url", page_url)
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+) -> ExtractFromDouyinResponse:
+    """从抖音视频下载无水印视频并通过 ASR 提取文案."""
+    source_url = request.url.strip()
+    _validate_douyin_url(source_url)
 
-    # ── Phase A：多源轮询解析 MP4 直链 ──
-    last_err_stage = "parse"
-    t0 = time.time()
-    result = resolve_douyin_video(page_url)
-    resolve_elapsed = time.time() - t0
-    logger.info("抖音解析耗时: %.2fs providers=%s", resolve_elapsed, available_providers())
+    # 确保 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
 
-    direct_url = result.video_url if result else None
-    feed_desc = (result.desc or "").strip() if result else ""
+    # 使用临时目录下载视频，退出时自动清理
+    try:
+        with tempfile.TemporaryDirectory(prefix="douyin_extract_") as temp_dir:
+            import yt_dlp
 
-    # 图文视频（无 video_url 但有 desc）直接返回文案，跳过 ASR
-    if result and not direct_url and feed_desc:
-        logger.info("图文视频直接返回文案: source=%s desc_len=%d", result.source, len(feed_desc))
-        return ExtractFromDouyinResponse(
-            text=feed_desc,
-            duration_seconds=0.0,
-            source_url=page_url,
-        )
+            ydl_opts = {
+                "format": "best[ext=mp4]/best",
+                "outtmpl": f"{temp_dir}/%(id)s.%(ext)s",
+                "quiet": True,
+                "no_warnings": True,
+                "noplaylist": True,
+            }
 
-    if not direct_url:
-        if _DOUYIN_DEBUG_ERRORS:
-            detail = f"抖音视频链接解析失败，请检查链接是否正确或稍后重试 [debug: providers={available_providers()}]"
-        else:
-            detail = "抖音视频链接解析失败，请检查链接是否正确或稍后重试"
-        logger.warning("抖音解析全部失败: url=%s providers=%s", page_url, available_providers())
-        raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail=detail)
+            try:
+                ydl = yt_dlp.YoutubeDL(ydl_opts)
+                info = ydl.extract_info(url_for_download, download=True)
+            except Exception as exc:
+                logger.error("抖音视频下载失败: url=%s error=%s", source_url, exc)
+                raise HTTPException(
+                    status_code=status.HTTP_502_BAD_GATEWAY,
+                    detail=f"视频下载失败: {exc}",
+                ) from exc
 
-    # ── Phase B：ASR 转文字 ──
-    mk_client = get_mediakit_client()
-    text = ""
-    duration = 0.0
-
-    # B1：MediaKit 云端 ASR（不下载视频，最快）
-    if mk_client.is_available:
-        last_err_stage = "asr"
-        try:
-            task_id = mk_client.asr_submit(direct_url)
-            text, duration = mk_client.asr_poll(task_id)
-            text = text.strip()
-            if text:
-                logger.info(
-                    "抖音 MediaKit ASR 成功: source=%s text_len=%d duration=%.1f total_time=%.1fs",
-                    result.source,
-                    len(text),
-                    duration,
-                    time.time() - t0,
+            if info is None:
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail="无法解析该抖音链接",
                 )
-            else:
-                logger.info("抖音 MediaKit ASR 返回空文本（无旁白/BGM视频）")
-        except MediaKitError as exc:
-            logger.warning("MediaKit ASR 失败，回退本地 ASR: %s", exc)
-            text = ""
 
-    # B2：回退下载 + 本地 ASR
-    if not text:
-        last_err_stage = "download"
-        try:
-            with tempfile.TemporaryDirectory(prefix="douyin_extract_") as temp_dir:
-                text, dl_duration = _direct_url_download_and_local_asr(direct_url, page_url, temp_dir)
-                text = (text or "").strip()
-                if dl_duration and not duration:
-                    duration = dl_duration
-                if text:
-                    logger.info(
-                        "抖音本地 ASR 成功: source=%s text_len=%d total_time=%.1fs",
-                        result.source,
-                        len(text),
-                        time.time() - t0,
-                    )
-                    last_err_stage = "asr"
-        except HTTPException as exc:
-            # 下载超时（504）是明确的网络错误，直接抛出
-            if exc.status_code == status.HTTP_504_GATEWAY_TIMEOUT:
-                raise
-            # 本地 ASR 不可用/失败（502/503）时记录后继续走 desc 兜底，
-            # 不直接抛 502，避免 API 镜像缺 worker 模块时整条链路挂掉
-            logger.warning("本地 ASR 链路失败(status=%d): %s", exc.status_code, exc.detail)
-            text = ""
-            # 如果是下载失败（非ASR错误），保持stage为download
-            if "语音识别" in str(exc.detail) or "ASR" in str(exc.detail):
-                last_err_stage = "asr"
-        except Exception as exc:  # noqa: BLE001
-            logger.warning("本地 ASR 链路异常: %s", exc)
-            text = ""
+            video_path = ydl.prepare_filename(info)
+            duration = float(info.get("duration") or 0)
 
-    # ── Phase C：结果判定 & 兜底 ──
+            # ASR 转写
+            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
 
-    # ASR 空结果（无旁白视频）→ 使用解析源 desc 兜底
-    if not text and feed_desc:
-        text = feed_desc
-        logger.info("抖音 ASR 空结果，使用解析源 desc 兜底: desc_len=%d", len(text))
-
-    if not text:
-        stage_msg = {
-            "parse": "抖音视频链接解析失败，请检查链接是否正确或稍后重试",
-            "download": "抖音视频下载失败，请检查网络或稍后重试",
-            "asr": "抖音语音识别失败，请稍后重试或手动输入文案",
-        }
-        user_msg = stage_msg.get(last_err_stage, "抖音链接解析暂时不可用，请稍后重试或手动输入文案")
-        if _DOUYIN_DEBUG_ERRORS:
-            user_msg = user_msg + f" [debug: stage={last_err_stage} source={result.source}]"
-        logger.warning("抖音文案提取失败: url=%s stage=%s source=%s", page_url, last_err_stage, result.source)
-        raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail=user_msg)
+    except HTTPException:
+        raise
 
     return ExtractFromDouyinResponse(
         text=text,
         duration_seconds=duration,
-        source_url=page_url,
+        source_url=source_url,
     )
 
 
-# ── 2. AI 文案改写 ────────────────────────────────────────────────────
+# ── 2. AI 文案改写 ───────────────────────────────────────────────────────────
 
 
-@router.post("/ai-rewrite", response_model=AiRewriteResponse)
-@points_gate("ai_rewrite")
+@router.post(
+    "/ai-rewrite",
+    response_model=AiRewriteResponse,
+)
 def ai_rewrite(
     request: AiRewriteRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+) -> AiRewriteResponse:
+    """使用豆包大模型改写文案."""
     content = (request.content or "").strip()
     if not content:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="文案内容不能为空")
+        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 = system_prompt + "\n风格要求：" + style
+        system_prompt += f"\n风格要求：{style}"
+
+    user_prompt = f"请改写以下文案：\n\n{content}"
+
     messages = [
         {"role": "system", "content": system_prompt},
-        {"role": "user", "content": "请改写以下文案：\n\n" + content},
+        {"role": "user", "content": user_prompt},
     ]
+
     try:
-        rewritten = client.chat_completion(messages=messages, temperature=0.8, max_tokens=2048)
+        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="AI 改写失败: " + str(exc)) from 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)
+        raise HTTPException(
+            status_code=status.HTTP_502_BAD_GATEWAY,
+            detail="AI 改写未返回有效结果",
+        )
+
+    return AiRewriteResponse(
+        original=content,
+        rewritten=rewritten.strip(),
+        style=style,
+    )
 
 
-# ── 3. AI 标题生成 ────────────────────────────────────────────────────
+# ── 3. AI 标题生成 ───────────────────────────────────────────────────────────
 
 
-@router.post("/ai-generate-titles", response_model=AiGenerateTitlesResponse)
-@points_gate("ai_title")
+@router.post(
+    "/ai-generate-titles",
+    response_model=AiGenerateTitlesResponse,
+)
 def ai_generate_titles(
     request: AiGenerateTitlesRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-):
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+) -> AiGenerateTitlesResponse:
+    """使用现有 generate_smart_titles 生成标题."""
     content = (request.content or "").strip()
     if not content:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="文案内容不能为空")
+        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)
+    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

@@ -5,16 +5,13 @@ from __future__ import annotations
 import logging
 from dataclasses import replace
 from datetime import UTC, datetime
-from typing import Any
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import get_user_repository
 from app.schemas.subscription import (
-    BillingCycle,
     BillingRecord,
     ChangePlanRequest,
     ChangePlanResponse,
-    MembershipType,
     SimpleResponse,
     SubscriptionInfo,
     ToggleAutoRenewRequest,
@@ -28,18 +25,43 @@ logger = logging.getLogger(__name__)
 router = APIRouter()
 
 
-# ============ 会员展示名称（与 packages.domain.points_rules.MEMBERSHIP_PRICES 对应）============
+# ============ 配额定义（硬编码，后续可迁移到配置中心） ============
 
-_PLAN_NAMES: dict[str, str] = {
-    MembershipType.FREE: "免费用户",
-    MembershipType.MONTHLY: "月卡会员",
-    MembershipType.QUARTERLY: "季卡会员",
-    MembershipType.YEARLY: "年卡会员",
+PLAN_QUOTAS = {
+    "free": {"max_projects": 3, "max_storage_gb": 10},
+    "standard": {"max_projects": 10, "max_storage_gb": 50},
+    "pro": {"max_projects": -1, "max_storage_gb": 100},
+    "enterprise": {"max_projects": -1, "max_storage_gb": 1000},
 }
 
 
+# ============ Helper Functions ============
+
+
 def _get_plan_name(plan_id: str) -> str:
-    return _PLAN_NAMES.get(plan_id, "免费用户")
+    """获取套餐显示名称"""
+    plan_names = {
+        "free": "体验版",
+        "standard": "标准版",
+        "pro": "专业版",
+        "enterprise": "企业版",
+    }
+    return plan_names.get(plan_id, "未知套餐")
+
+
+def _get_plan_price(plan_id: str, billing_cycle: str) -> float:
+    """获取套餐价格"""
+    prices = {
+        ("free", "monthly"): 0,
+        ("free", "yearly"): 0,
+        ("standard", "monthly"): 99,
+        ("standard", "yearly"): 999,
+        ("pro", "monthly"): 299,
+        ("pro", "yearly"): 2999,
+        ("enterprise", "monthly"): 999,
+        ("enterprise", "yearly"): 9999,
+    }
+    return prices.get((plan_id, billing_cycle), 0)
 
 
 def _build_subscription_info(user: AuthenticatedUser) -> SubscriptionInfo:
@@ -52,20 +74,15 @@ def _build_subscription_info(user: AuthenticatedUser) -> SubscriptionInfo:
         period_start = now.isoformat()
         period_end = now.isoformat()
 
-    plan_id = user.user.subscription_plan or MembershipType.FREE
-    # 旧档位（standard/pro/enterprise）统一降级为 monthly，避免前端炸掉
-    if plan_id in {"standard", "pro", "enterprise"}:
-        plan_id = MembershipType.MONTHLY
-
     return SubscriptionInfo(
         id=f"sub-{user.user.id[:8]}",
-        plan_id=plan_id,
-        plan_name=_get_plan_name(plan_id),
+        plan_id=user.user.subscription_plan or "free",
+        plan_name=_get_plan_name(user.user.subscription_plan or "free"),
         status=user.user.subscription_status or "active",
-        billing_cycle=plan_id if plan_id != MembershipType.FREE else BillingCycle.MONTHLY,
+        billing_cycle="monthly",
         current_period_start=period_start,
         current_period_end=period_end,
-        amount=0 if plan_id == MembershipType.FREE else 0,  # 金额由前端 /plans 接口展示
+        amount=_get_plan_price(user.user.subscription_plan or "free", "monthly"),
         auto_renew=True,
         created_at=user.user.created_at.isoformat() if user.user.created_at else now.isoformat(),
     )
@@ -82,39 +99,6 @@ 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 == MembershipType.MONTHLY:
-            features.update({"free_clips_daily": 2})
-        elif plan_id == MembershipType.QUARTERLY:
-            features.update({"free_clips_daily": 5})
-        elif plan_id == MembershipType.YEARLY:
-            features.update({"free_clips_daily": "unlimited"})
-        plans.append({
-            "plan_id": plan_id,
-            "name": info["name"],
-            "price_cents": info["price_cents"],
-            "monthly_price_cents": monthly_cents,
-            "duration_days": days,
-            "points_discount": MEMBER_DISCOUNT.get(plan_id, 1.0),
-            "features": features,
-        })
-    return {"plans": plans}
-
-
 @router.get("/billing-records", response_model=list[BillingRecord])
 async def get_billing_records(
     current_user: AuthenticatedUser = Depends(get_current_user),
@@ -133,7 +117,7 @@ async def get_billing_records(
         return [
             BillingRecord(
                 id=r.id,
-                plan_name=_get_plan_name(r.plan_name),
+                plan_name=r.plan_name,
                 amount=r.amount,
                 billing_cycle=r.billing_cycle,
                 status=r.status,
@@ -147,10 +131,6 @@ async def get_billing_records(
         session.close()
 
 
-_VALID_PLANS = {MembershipType.MONTHLY, MembershipType.QUARTERLY, MembershipType.YEARLY}
-_VALID_CYCLES = {BillingCycle.MONTHLY, BillingCycle.QUARTERLY, BillingCycle.YEARLY}
-
-
 @router.post("/change-plan", response_model=ChangePlanResponse)
 async def change_plan(
     request: ChangePlanRequest,
@@ -159,45 +139,47 @@ async def change_plan(
 ) -> ChangePlanResponse:
     """变更订阅套餐（升级/降级）"""
     # TODO: 接入支付验证（支付宝/微信支付）
-    target_plan = request.target_plan_id
-    if target_plan not in _VALID_PLANS:
+    valid_plans = {"free", "standard", "pro", "enterprise"}
+    if request.target_plan_id not in valid_plans:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"无效的会员类型。支持: {', '.join(sorted(_VALID_PLANS))}",
+            detail=f"无效的套餐ID。支持的套餐: {', '.join(valid_plans)}",
         )
 
-    if request.billing_cycle not in _VALID_CYCLES:
+    valid_cycles = {"monthly", "yearly"}
+    if request.billing_cycle not in valid_cycles:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"无效的计费周期。支持: {', '.join(sorted(_VALID_CYCLES))}",
+            detail="无效的计费周期。支持: monthly, yearly",
         )
 
     user = current_user.user
-    current_plan = user.subscription_plan or MembershipType.FREE
-    # 旧档位归一化，避免永远显示"您已经是xxx"
-    if current_plan in {"standard", "pro", "enterprise"}:
-        current_plan = MembershipType.MONTHLY
+    current_plan = user.subscription_plan or "free"
+    target_plan = request.target_plan_id
 
     if current_plan == target_plan:
         return ChangePlanResponse(
             success=False,
-            message=f"您已经是{_get_plan_name(target_plan)}",
+            message=f"您已经是 {_get_plan_name(target_plan)}",
         )
 
+    # 通过 dataclasses.replace 创建新实例（不直接修改 dataclass）
+    quotas = PLAN_QUOTAS.get(target_plan, PLAN_QUOTAS["free"])
     updated_user = replace(
         user,
         subscription_plan=target_plan,
         subscription_status="active",
-        max_projects=-1,  # 付费会员不限项目数
-        max_storage_gb=100,
+        max_projects=quotas["max_projects"],
+        max_storage_gb=quotas["max_storage_gb"],
     )
     user_repository.save(updated_user)
 
+    # 用更新后的用户构造响应
     refreshed_auth_user = AuthenticatedUser(user=updated_user)
 
     return ChangePlanResponse(
         success=True,
-        message=f"套餐已成功变更为{_get_plan_name(target_plan)}",
+        message=f"套餐已成功变更为 {_get_plan_name(target_plan)}",
         new_subscription=_build_subscription_info(refreshed_auth_user),
     )
 
@@ -209,11 +191,10 @@ async def cancel_subscription(
 ) -> SimpleResponse:
     """取消订阅"""
     user = current_user.user
-    plan_id = user.subscription_plan or MembershipType.FREE
-    if plan_id == MembershipType.FREE:
+    if user.subscription_plan == "free":
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="免费用户无需取消订阅",
+            detail="体验版无需取消",
         )
 
     updated_user = replace(user, subscription_status="cancelled")
@@ -221,7 +202,7 @@ async def cancel_subscription(
 
     return SimpleResponse(
         success=True,
-        message="订阅已取消，当前周期结束后将降级为免费用户",
+        message="订阅已取消，当前周期结束后停止服务",
     )
 
 
@@ -247,14 +228,11 @@ async def payment_callback(
     if SessionLocal is None:
         raise HTTPException(status_code=500, detail="Database not available")
 
-    # 仅接受当前会员体系的 plan 值
-    if plan not in _VALID_PLANS:
-        raise HTTPException(status_code=400, detail=f"未知的会员类型: {plan}")
-
     session = SessionLocal()
     try:
         repo = SQLAlchemyBillingRepository(session)
 
+        # 创建账单记录
         record_id = uuid.uuid4().hex
         repo.create(
             {
@@ -267,20 +245,19 @@ async def payment_callback(
             }
         )
 
+        # 在事务中标记支付成功并更新订阅
         repo.mark_paid(record_id, payment_method, payment_id)
 
-        days_map = {BillingCycle.MONTHLY: 30, BillingCycle.QUARTERLY: 90, BillingCycle.YEARLY: 365}
-        days = days_map.get(billing_cycle, 30)
+        # 计算到期时间
+        days = 365 if billing_cycle == "yearly" else 30
         expires_at = datetime.now(UTC) + timedelta(days=days)
         repo.update_subscription_on_payment(user_id, plan, expires_at)
 
         return {"success": True, "message": "支付成功", "record_id": record_id}
-    except HTTPException:
-        session.rollback()
-        raise
     except Exception as e:
         session.rollback()
-        logger.error("支付回调处理失败: user_id=%s, plan=%s, error=%s", user_id, plan, e)
+        logger.error(f"支付回调处理失败: user_id={user_id}, plan={plan}, error={e}")
+        # 不返回原始异常信息，避免泄漏内部实现细节
         raise HTTPException(status_code=500, detail="支付处理失败，请稍后重试") from e
     finally:
         session.close()
@@ -292,5 +269,10 @@ async def toggle_auto_renew(
     current_user: AuthenticatedUser = Depends(get_current_user),
 ) -> SimpleResponse:
     """切换自动续费"""
+    # TODO: 实际需要在数据库中存储 auto_renew 字段
     status_text = "已开启自动续费" if request.enabled else "已关闭自动续费"
-    return SimpleResponse(success=True, message=status_text)
+
+    return SimpleResponse(
+        success=True,
+        message=status_text,
+    )

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

@@ -1,35 +1,191 @@
-"""Title library routes — DEPRECATED (#1894).
-
-独立标题库已废弃。前端应直接调用 GET /api/v1/scripts 获取文案列表，
-取每条文案的 `title` 字段作为标题候选。
-
-所有 /api/v1/titles 端点统一返回 HTTP 410 Gone。
-"""
+"""Title library CRUD routes."""
 
 from __future__ import annotations
 
-from fastapi import APIRouter, Response, status
+from typing import Optional
+
+from app.api.routes._helpers import get_user_plan
+from app.auth import AuthenticatedUser, get_current_user
+from app.dependencies import get_db_session, get_user_repository
+from app.schemas.title_library import (
+    CreateTitleLibraryRequest,
+    ListTitleLibraryResponse,
+    TitleLibraryItemResponse,
+    UpdateTitleLibraryRequest,
+)
+from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
+from sqlalchemy.orm import Session
+
+from packages.adapters.sqlalchemy_impl.title_library_repository import SQLAlchemyTitleLibraryRepository
+from packages.application.title_library.commands import (
+    CreateTitleLibraryCommand,
+    PickTitleCommand,
+    UpdateTitleLibraryCommand,
+)
+from packages.application.title_library.use_cases import (
+    CreateTitleLibraryUseCase,
+    DeleteTitleLibraryUseCase,
+    GetTitleLibraryUseCase,
+    ListTitleLibraryUseCase,
+    NotFoundError,
+    PickTitleUseCase,
+    QuotaExceededError,
+    UpdateTitleLibraryUseCase,
+)
+from packages.ports.user_repository import UserRepository
 
 router = APIRouter()
 
-_GONE_MESSAGE = (
-    "标题库 API 已废弃（#1894）：独立标题库已合并进文案库，"
-    "请使用 GET /api/v1/scripts 获取文案列表并取 title 字段作为标题。"
-)
+
+def _get_title_repository(session: Session = Depends(get_db_session)) -> SQLAlchemyTitleLibraryRepository:
+    return SQLAlchemyTitleLibraryRepository(session)
 
 
-def _gone(response: Response) -> dict:
-    response.status_code = status.HTTP_410_GONE
-    response.headers["Deprecation"] = "true"
-    response.headers["Sunset"] = "Tue, 16 Sep 2026 00:00:00 GMT"
-    return {"error": {"code": "GONE", "message": _GONE_MESSAGE}}
+def _to_response(item) -> TitleLibraryItemResponse:
+    return TitleLibraryItemResponse(
+        id=item.id,
+        user_id=item.user_id,
+        name=item.name,
+        text=item.text,
+        category=item.category,
+        description=item.description,
+        tags=item.tags,
+        usage_count=item.usage_count,
+        is_active=item.is_active,
+        created_at=item.created_at,
+        updated_at=item.updated_at,
+    )
 
 
-@router.api_route("", methods=["GET", "POST", "PUT", "DELETE", "PATCH"])
-def titles_root_gone(response: Response) -> dict:
-    return _gone(response)
+@router.get("", response_model=ListTitleLibraryResponse)
+def list_titles(
+    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:
+    user_id = authenticated_user.user.id
+    use_case = ListTitleLibraryUseCase(title_repository)
+    items = use_case.execute(user_id, category=category, skip=skip, limit=limit)
+    total = title_repository.count_by_user(user_id)
+    return ListTitleLibraryResponse(
+        items=[_to_response(i) for i in items],
+        total=total,
+    )
 
 
-@router.api_route("/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH"])
-def titles_subpath_gone(response: Response, path: str) -> dict:
-    return _gone(response)
+@router.post("/pick", response_model=TitleLibraryItemResponse)
+def pick_title(
+    category: Optional[str] = Query(None, description="按分类筛选，不填则从全部标题中选"),
+    exclude_ids: Optional[str] = Query(
+        None,
+        description="排除的标题ID（逗号分隔），用于批量生成时避免重复",
+    ),
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
+) -> TitleLibraryItemResponse:
+    """智能选择一个标题。
+
+    策略：优先使用次数少的，从最少的前5个中随机选一个，兼顾公平和多样性。
+    """
+    user_id = authenticated_user.user.id
+    exclude_list: list[str] = []
+    if exclude_ids:
+        exclude_list = [t.strip() for t in exclude_ids.split(",") if t.strip()]
+
+    use_case = PickTitleUseCase(title_repository)
+    item = use_case.execute(
+        PickTitleCommand(
+            user_id=user_id,
+            category=category,
+            exclude_ids=exclude_list,
+        )
+    )
+    if item is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="标题库为空，请先添加标题",
+        )
+    return _to_response(item)
+
+
+@router.get("/{title_id}", response_model=TitleLibraryItemResponse)
+def get_title(
+    title_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
+) -> TitleLibraryItemResponse:
+    user_id = authenticated_user.user.id
+    use_case = GetTitleLibraryUseCase(title_repository)
+    item = use_case.execute(title_id, user_id)
+    if item is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Title not found")
+    return _to_response(item)
+
+
+@router.post("", response_model=TitleLibraryItemResponse, status_code=status.HTTP_201_CREATED)
+def create_title(
+    request: CreateTitleLibraryRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
+    user_repository: UserRepository = Depends(get_user_repository),
+) -> TitleLibraryItemResponse:
+    user_id = authenticated_user.user.id
+    plan_name = get_user_plan(user_id, user_repository)
+    command = CreateTitleLibraryCommand(
+        user_id=user_id,
+        name=request.name,
+        text=request.text,
+        category=request.category,
+        description=request.description,
+        tags=request.tags,
+    )
+    use_case = CreateTitleLibraryUseCase(title_repository)
+    try:
+        item = use_case.execute(command, plan_name=plan_name)
+    except QuotaExceededError as exc:
+        raise HTTPException(
+            status_code=status.HTTP_429_TOO_MANY_REQUESTS,
+            detail=f"标题库配额已满（{exc.used}/{exc.limit}），请升级套餐",
+        ) from exc
+    return _to_response(item)
+
+
+@router.put("/{title_id}", response_model=TitleLibraryItemResponse)
+def update_title(
+    title_id: str,
+    request: UpdateTitleLibraryRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
+) -> TitleLibraryItemResponse:
+    user_id = authenticated_user.user.id
+    command = UpdateTitleLibraryCommand(
+        title_id=title_id,
+        user_id=user_id,
+        name=request.name,
+        text=request.text,
+        category=request.category,
+        description=request.description,
+        tags=request.tags,
+    )
+    use_case = UpdateTitleLibraryUseCase(title_repository)
+    try:
+        item = use_case.execute(command)
+    except NotFoundError as _e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Title not found") from _e
+    return _to_response(item)
+
+
+@router.delete("/{title_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
+def delete_title(
+    title_id: str,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
+) -> Response:
+    user_id = authenticated_user.user.id
+    use_case = DeleteTitleLibraryUseCase(title_repository)
+    deleted = use_case.execute(title_id, user_id)
+    if not deleted:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Title not found")
+    return

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
@@ -228,7 +198,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 +205,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 +223,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,
@@ -598,7 +553,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 +561,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)
@@ -657,16 +586,16 @@ def preview_tts(
             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
@@ -348,7 +339,6 @@ def get_voice_clone_preview(
         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:
@@ -360,31 +350,6 @@ def get_voice_clone_preview(
     """
     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,
@@ -428,14 +393,9 @@ def get_voice_clone_preview(
             speed=speed,
             emotion=emotion,
         )
-    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
+    except CosyVoiceError as e:
+        raise HTTPException(status_code=502, detail=f"TTS 合成失败: {e}") from e
+    except ValueError as e:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e)) from e
 
     # 缓存（仅默认参数组合）

apps/api/app/schemas/generation_task.py

@@ -98,24 +98,6 @@ class CreateGenerationTaskRequest(BaseModel):
         description="各变体独立标题文字数组：长度1=共用，长度=count=独立。为空时使用 title_config.text",
     )
 
-    # ── 智能降重开关（#1970）──
-    # True（默认）：edge_crop + 片段级微变换（hflip/变速/亮度/对比度/饱和度/BGM偏移）全部生效；
-    # False：跳过 edge_crop、不注入微变换，渲染确定性（固定种子）。
-    dedup_enabled: bool = Field(default=True, description="智能降重开关，默认开启；关闭后跳过边缘裁切与微变换")
-
-    # ── 剪辑组装模式（#1970 PR3）──
-    # random（默认，完全兼容现有随机混剪）/ narrative（叙事剪辑：文案→TTS 配音→标签匹配画面）
-    assembly_mode: str = Field(default="random", description="组装模式：random=随机混剪（默认），narrative=叙事剪辑")
-    # 叙事模式必填：文案库 scripts.id（后端据此读取 content 合成 TTS）
-    script_id: str = Field(default="", description="叙事模式必填：文案库 ID")
-    # 叙事模式必填：TTS 音色 ID（preset 为 CosyVoice 音色 id；clone 为克隆档案 id）
-    tts_voice_id: str = Field(default="", description="叙事模式必填：TTS 音色 ID（系统音色或克隆档案 ID）")
-    tts_voice_source: str = Field(default="preset", description="TTS 音色来源：preset=系统预设（默认），clone=克隆音色")
-    # 视频比例：当前前端 9:16/16:9；与 output_width/output_height 并存，传了具体分辨率时以分辨率为准
-    video_ratio: str = Field(
-        default="", description="视频比例，如 9:16（默认竖屏）/16:9；与显式分辨率冲突时以分辨率为准"
-    )
-
     @model_validator(mode="after")
     def _check_variant_arrays(self) -> "CreateGenerationTaskRequest":
         """变体数组字段长度校验 + #1749 配音严格守卫。
@@ -145,26 +127,6 @@ class CreateGenerationTaskRequest(BaseModel):
             raise ValueError(f"variant_plan_ids 长度({len(self.variant_plan_ids)})必须与 count({self.count})一致")
         return self
 
-    @model_validator(mode="after")
-    def _check_assembly_mode(self) -> "CreateGenerationTaskRequest":
-        """#1970 组装模式与叙事模式入参校验。"""
-        if self.assembly_mode not in ("random", "narrative"):
-            raise ValueError("assembly_mode 仅支持 'random'（默认）或 'narrative'")
-        if self.tts_voice_source not in ("preset", "clone"):
-            raise ValueError("tts_voice_source 仅支持 'preset' 或 'clone'")
-        if self.video_ratio:
-            parts = self.video_ratio.split(":")
-            if len(parts) != 2 or not all(p.isdigit() and int(p) > 0 for p in parts):
-                raise ValueError("video_ratio 格式必须为 '宽:高'，如 9:16 或 16:9")
-            if self.video_ratio not in ("9:16", "16:9", "1:1", "3:4", "4:3"):
-                raise ValueError("video_ratio 仅支持 9:16 / 16:9 / 1:1 / 3:4 / 4:3")
-        if self.assembly_mode == "narrative":
-            if not self.script_id.strip():
-                raise ValueError("叙事模式（narrative）必须提供 script_id（文案库 ID）")
-            if not self.tts_voice_id.strip():
-                raise ValueError("叙事模式（narrative）必须提供 tts_voice_id（TTS 音色 ID）")
-        return self
-
     @model_validator(mode="after")
     def _check_at_least_one_mode(self) -> "CreateGenerationTaskRequest":
         has_project = bool(self.project_id.strip())

apps/api/app/schemas/gpu_lipsync.py

@@ -1,111 +0,0 @@
-"""GPU MuseTalk 反向轮询 API Schema 定义.
-
-面向部署在用户 RTX2060 本地的 GPU Worker 脚本，不面向前端用户。
-Worker 用长期 GPU_WORKER_TOKEN 鉴权（不是用户 JWT）。
-"""
-
-from __future__ import annotations
-
-from datetime import datetime
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
-# ── Worker 注册/心跳 ──────────────────────────────────────────────
-
-
-class GpuWorkerRegisterRequest(BaseModel):
-    """Worker 启动/心跳时上报自身信息."""
-
-    worker_id: str = Field(..., min_length=1, max_length=100, description="Worker 唯一 ID（机器名+UUID 等）")
-    hostname: str = Field("", max_length=200, description="主机名，用于运维排查")
-    gpu_name: str = Field("", max_length=200, description="GPU 型号，如 'NVIDIA GeForce RTX 2060'")
-    free_vram_mb: int = Field(0, ge=0, description="当前空闲显存（MB）")
-    capabilities: str = Field("musetalk", max_length=500, description="能力列表，逗号分隔，如 'musetalk'")
-    task_id: Optional[str] = Field(
-        None,
-        max_length=64,
-        description=(
-            "当前正在处理的任务 ID。Worker 推理期间定期心跳时携带，"
-            "服务端同步刷新该任务 last_heartbeat_at，防止长推理被误判超时；空闲时不传"
-        ),
-    )
-
-
-class GpuWorkerRegisterResponse(BaseModel):
-    ok: bool = True
-    server_time: datetime
-    message: str = "ok"
-
-
-# ── 轮询任务 ────────────────────────────────────────────────────
-
-
-class GpuLipsyncTaskPayload(BaseModel):
-    """下发给 Worker 的任务载荷（含预签名下载 URL）."""
-
-    task_id: str
-    video_url: str = Field(..., description="人物视频预签名下载 URL（GET）")
-    audio_url: str = Field(..., description="驱动音频预签名下载 URL（GET）")
-    lipsync_job_id: str = ""
-    user_id: str = ""
-    project_id: str = ""
-    created_at: datetime
-    upload_url: str = Field(..., description="结果视频预签名上传 URL（PUT, video/mp4）")
-    upload_method: str = Field("PUT", description="上传方式，目前只支持 PUT")
-    expires_at: datetime
-
-
-class GpuLipsyncPollResponse(BaseModel):
-    """Worker poll 的返回：200 带任务，204 无任务."""
-
-    task: Optional[GpuLipsyncTaskPayload] = None
-
-
-# ── Worker 上报结果 ──────────────────────────────────────────────
-
-
-class GpuLipsyncResultRequest(BaseModel):
-    """Worker 通过 multipart 上传结果时携带的字段（非文件字段）."""
-
-    task_id: str = Field(..., min_length=1, max_length=64)
-    worker_id: str = Field(..., min_length=1, max_length=100)
-    success: bool = Field(True, description="true=成功（此时必须上传 result 视频文件）；false=失败")
-    duration_seconds: float = Field(0.0, ge=0, description="合成后视频时长（秒），成功时应填入")
-    error_msg: str = Field("", max_length=2000, description="失败原因，success=false 时必填")
-
-
-class GpuLipsyncResultResponse(BaseModel):
-    ok: bool = True
-    task_id: str
-    status: str  # done / failed
-    message: str = "ok"
-
-
-# ── 业务侧查询任务状态 ────────────────────────────────────────────
-
-
-class GpuLipsyncStatusResponse(BaseModel):
-    task_id: str
-    status: str
-    result_url: str = ""
-    result_duration: float = 0.0
-    error_msg: str = ""
-    worker_id: str = ""
-    attempt: int = 0
-    created_at: datetime
-    started_at: Optional[datetime] = None
-    finished_at: Optional[datetime] = None
-
-
-# ── 创建任务（内部服务调用） ──────────────────────────────────────
-
-
-class GpuLipsyncCreateRequest(BaseModel):
-    """服务层内部创建 GPU 任务用（不通过 HTTP 暴露给 Worker/前端）."""
-
-    video_url: str  # 已可访问的 OSS key 或公网 URL（API 侧会转预签名）
-    audio_url: str
-    lipsync_job_id: str = ""
-    user_id: str = ""
-    project_id: str = ""

apps/api/app/schemas/points.py

@@ -57,7 +57,6 @@ class PointRuleItem(BaseModel):
     base_points: int
     unit: str
     extra_per_30s: Optional[int] = None
-    description: str = Field(default="", description="规则中文说明，例如 AI 配音每分钟消耗 X 积分")
 
 
 class PointsRulesResponse(BaseModel):
@@ -140,12 +139,7 @@ class PointsOrderResponse(BaseModel):
     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
 
 
@@ -177,27 +171,6 @@ class MembershipStatusResponse(BaseModel):
     )
 
 
-# ============ 订阅档位 ============
-
-
-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]
-
-
 # ============ 通用响应 ============
 
 

apps/api/app/schemas/subscription.py

@@ -7,21 +7,15 @@ from typing import Optional
 from pydantic import BaseModel, Field
 
 # ============ Enums / Types ============
-# 会员体系（#1951/#1955 实装）：
-#   free     — 免费用户
-#   monthly  — 月卡
-#   quarterly — 季卡
-#   yearly   — 年卡
-# 已废弃档位：standard / pro / enterprise（保留常量名便于识别旧字段，但不在 API 中暴露）
 
 
-class MembershipType(str):
-    """会员类型（与 packages.domain.points_rules.MEMBERSHIP_PRICES 一致）"""
+class PlanType(str):
+    """套餐类型"""
 
     FREE = "free"
-    MONTHLY = "monthly"
-    QUARTERLY = "quarterly"
-    YEARLY = "yearly"
+    STANDARD = "standard"
+    PRO = "pro"
+    ENTERPRISE = "enterprise"
 
 
 class SubscriptionStatus(str):
@@ -46,7 +40,6 @@ class BillingCycle(str):
     """计费周期"""
 
     MONTHLY = "monthly"
-    QUARTERLY = "quarterly"
     YEARLY = "yearly"
 
 
@@ -102,8 +95,8 @@ class SimpleResponse(BaseModel):
 class ChangePlanRequest(BaseModel):
     """升级/降级请求"""
 
-    target_plan_id: str = Field(..., description="目标会员类型: monthly/quarterly/yearly")
-    billing_cycle: str = Field(..., description="计费周期: monthly/quarterly/yearly")
+    target_plan_id: str = Field(..., description="目标套餐ID")
+    billing_cycle: str = Field(..., description="计费周期: monthly/yearly")
 
 
 class ToggleAutoRenewRequest(BaseModel):

apps/api/app/services/douyin_resolver.py

@@ -1,243 +0,0 @@
-"""抖音视频解析多源轮询服务。
-
-优先级（P0 最高）：
-  P0: App Feed API 直连（零成本，不用 API Key，当前最稳定）
-  P1: TikHub API（付费 $0.001/次起，稳定）
-  P2: apizero.cn 极数本源（按量付费，国内延迟低）
-
-任一源成功即返回 MP4 直链 + 标题/文案；所有源均失败时返回 None。
-每个解析源独立超时（5-10s），总耗时不超过所有源超时之和（实际快速失败时远小于此）。
-未配置 API Key 的源自动跳过；无任何 Key 时 P0 仍可使用。
-"""
-
-from __future__ import annotations
-
-import logging
-import os
-import re
-import time
-from dataclasses import dataclass
-from typing import Optional
-
-import httpx
-
-logger = logging.getLogger(__name__)
-
-# ── API Keys from env ──────────────────────────────────────────────────
-TIKHUB_API_KEY = os.environ.get("TIKHUB_API_KEY", "").strip()
-APIZERO_API_KEY = os.environ.get("APIZERO_API_KEY", "").strip()
-
-# ── Timeouts (seconds) ────────────────────────────────────────────────
-_TIMEOUT_APP_FEED = 12
-_TIMEOUT_TIKHUB = 6
-_TIMEOUT_APIZERO = 6
-
-
-@dataclass
-class ResolveResult:
-    video_url: str  # MP4 直链；图文视频时为空字符串
-    desc: str  # 视频标题/描述文案
-    source: str  # 解析源名称，用于日志/metrics
-
-
-# ── URL preprocessing ─────────────────────────────────────────────────
-_AWEME_ID_RE = re.compile(
-    r"(?:douyin\.com/(?:video|note)/|iesdouyin\.com/share/video/|aweme_id=)(\d{15,25})",
-    re.IGNORECASE,
-)
-
-
-def _extract_url_from_text(text: str) -> str:
-    """从任意分享文本中提取首个 http(s) URL。"""
-    if not text:
-        return ""
-    m = re.search(r"https?://\S+", text)
-    return m.group(0).rstrip("。，！？!?,，；;\"'）)】") if m else ""  # noqa: B005
-
-
-def _canonicalize_url(url: str, timeout: int = 8) -> str:
-    """跟随 v.douyin.com 短链 302 重定向，返回完整 URL。失败时返回原 URL。"""
-    if "v.douyin.com" not in url and "iesdouyin.com" not in url:
-        return url
-    try:
-        with httpx.Client(
-            timeout=timeout, follow_redirects=True, verify=False, headers={"User-Agent": "Mozilla/5.0"}
-        ) as c:
-            resp = c.get(url)
-            return str(resp.url)
-    except Exception as exc:
-        logger.debug("短链解析失败: %s (%s)", url, exc)
-        return url
-
-
-# ── Provider P0: App Feed API (零成本直连) ────────────────────────────
-def _resolve_app_feed(url: str, timeout: int = _TIMEOUT_APP_FEED) -> Optional[ResolveResult]:
-    """抖音 Android App Feed API 直连 — 零依赖、无需 Key、目前最稳定。"""
-    from packages.douyin_parser import fetch_douyin_video_url
-
-    video_url, desc = fetch_douyin_video_url(url, timeout=timeout, max_retries=2)
-    if video_url:
-        return ResolveResult(video_url=video_url, desc=desc or "", source="app_feed")
-    if desc:
-        # 图文视频：video_url 为 None 但 desc 可用
-        return ResolveResult(video_url="", desc=desc, source="app_feed_image")
-    return None
-
-
-# ── Provider P1: TikHub ───────────────────────────────────────────────
-def _resolve_tikhub(url: str, api_key: str, timeout: int = _TIMEOUT_TIKHUB) -> Optional[ResolveResult]:
-    """TikHub API: https://api.tikhub.io/
-    两步：get_aweme_id → fetch_one_video
-    """
-    if not api_key:
-        return None
-    headers = {"Authorization": f"Bearer {api_key}"}
-    aweme_id = _AWEME_ID_RE.search(url or "")
-    aweme_id = aweme_id.group(1) if aweme_id else None
-
-    if not aweme_id:
-        try:
-            with httpx.Client(timeout=timeout, verify=False) as c:
-                r = c.get(
-                    "https://api.tikhub.io/api/v1/douyin/web/get_aweme_id",
-                    headers=headers,
-                    params={"url": url},
-                )
-                data = r.json()
-                aweme_id = (data.get("data") or {}).get("aweme_id")
-        except Exception as exc:
-            logger.warning("TikHub get_aweme_id 失败: %s", exc)
-            return None
-    if not aweme_id:
-        return None
-
-    try:
-        with httpx.Client(timeout=timeout, verify=False) as c:
-            r = c.get(
-                "https://api.tikhub.io/api/v1/douyin/app/v3/fetch_one_video",
-                headers=headers,
-                params={"aweme_id": aweme_id},
-            )
-            data = r.json()
-            video = (data.get("data") or {}).get("video") or {}
-            urls = []
-            for k in ("download_addr", "play_addr_h264", "play_addr"):
-                urls = (video.get(k) or {}).get("url_list") or []
-                if urls:
-                    break
-            if not urls:
-                # bit_rate 兜底
-                for br in video.get("bit_rate") or []:
-                    urls = (br.get("play_addr") or {}).get("url_list") or []
-                    if urls:
-                        break
-            if not urls:
-                return None
-            # 优先 CDN 直链
-            video_url = urls[0]
-            for u in urls:
-                if any(h in u for h in ("douyinvod.com", "bytecdn.com", "365yg.com")):
-                    video_url = u
-                    break
-            desc = (data.get("data") or {}).get("desc", "")
-            # 检测图文
-            images = (data.get("data") or {}).get("images") or []
-            if images and not any(h in video_url for h in ("douyinvod.com", "bytecdn.com", "amemv.com")):
-                # 图文且无视频直链
-                if desc:
-                    return ResolveResult(video_url="", desc=desc, source="tikhub_image")
-                return None
-            return ResolveResult(video_url=video_url, desc=desc or "", source="tikhub")
-    except Exception as exc:
-        logger.warning("TikHub fetch_one_video 失败: %s", exc)
-        return None
-
-
-# ── Provider P2: apizero.cn ──────────────────────────────────────────
-def _resolve_apizero(url: str, api_key: str, timeout: int = _TIMEOUT_APIZERO) -> Optional[ResolveResult]:
-    """apizero.cn 极数本源: https://v1.apizero.cn/api/video-parse?url=...&flat=2"""
-    if not api_key:
-        return None
-    headers = {"Authorization": f"Bearer {api_key}"}
-    try:
-        with httpx.Client(timeout=timeout, verify=False) as c:
-            r = c.get(
-                "https://v1.apizero.cn/api/video-parse",
-                headers=headers,
-                params={"url": url, "flat": 2},
-            )
-            data = r.json()
-            d = data.get("data") or {}
-            video_list = d.get("video_list") or []
-            if not video_list:
-                return None
-            video_url = video_list[0].get("url", "")
-            desc = d.get("title", "") or d.get("desc", "") or d.get("author", "")
-            if not video_url:
-                return None
-            return ResolveResult(video_url=video_url, desc=desc, source="apizero")
-    except Exception as exc:
-        logger.warning("apizero 解析失败: %s", exc)
-        return None
-
-
-# ── Main API ──────────────────────────────────────────────────────────
-def resolve_douyin_video(page_url: str) -> Optional[ResolveResult]:
-    """按 P0→P1→P2 顺序轮询解析抖音视频。
-
-    Args:
-        page_url: 抖音 URL 或含 URL 的分享文本。
-
-    Returns:
-        ResolveResult 或 None（所有源均失败）。
-        图文视频时 video_url 为空字符串、desc 为文案。
-    """
-    url = _extract_url_from_text(page_url) or page_url
-    url = _canonicalize_url(url)
-
-    providers = [
-        ("app_feed", lambda: _resolve_app_feed(url)),
-        ("tikhub", lambda: _resolve_tikhub(url, TIKHUB_API_KEY)),
-        ("apizero", lambda: _resolve_apizero(url, APIZERO_API_KEY)),
-    ]
-
-    enabled_count = 0
-    for name, fn in providers:
-        if name == "tikhub" and not TIKHUB_API_KEY:
-            continue
-        if name == "apizero" and not APIZERO_API_KEY:
-            continue
-        enabled_count += 1
-        t0 = time.time()
-        try:
-            result = fn()
-            elapsed = time.time() - t0
-            if result:
-                domain = result.video_url.split("/")[2] if result.video_url and "/" in result.video_url else "(image)"
-                logger.info(
-                    "抖音解析成功: source=%s url_domain=%s desc_len=%d time=%.2fs",
-                    result.source,
-                    domain,
-                    len(result.desc),
-                    elapsed,
-                )
-                return result
-            logger.debug("解析源 %s 返回空 (%.2fs)", name, elapsed)
-        except Exception as exc:
-            logger.warning("解析源 %s 异常 (%.2fs): %s", name, time.time() - t0, exc)
-
-    if enabled_count == 0:
-        logger.error("无任何抖音解析源可用：请检查 App Feed API 网络连通性")
-    else:
-        logger.warning("所有 %d 个抖音解析源均失败: url=%s", enabled_count, url)
-    return None
-
-
-def available_providers() -> list[str]:
-    """返回当前可用的解析源列表（用于诊断）。"""
-    provs = ["app_feed"]
-    if TIKHUB_API_KEY:
-        provs.append("tikhub")
-    if APIZERO_API_KEY:
-        provs.append("apizero")
-    return provs

apps/api/app/services/edit_plan_service.py

@@ -423,7 +423,6 @@ class EditPlanService:
                     clip_type=clip.clip_type,
                     order=clip.order,
                     asset_id=clip.asset_id,
-                    atom_clip_id=clip_item.get("atom_clip_id", ""),
                     text_content=clip.text_content,
                     start_time=clip.start_time,
                     duration=clip.duration,
@@ -475,7 +474,6 @@ class EditPlanService:
         voice_duration: float = 0.0,
         rng=None,
         batch_segments: dict[str, list[tuple[float, float]]] | None = None,
-        batch_used_atom_ids: set[str] | list[str] | None = None,
     ) -> EditPlan:
         """为批量变体生成独立 plan：完整重跑单视频选片流程（#1743）。
 
@@ -610,69 +608,18 @@ class EditPlanService:
                     st = float(c.start_time or 0.0)
                     batch_segments_resolved.setdefault(c.asset_id, []).append((st, st + float(c.duration)))
 
-        clips_data = None
-        # #1970 原子片段级变体重选：候选素材已切片时优先按原子片段选片
-        try:
-            from packages.adapters.sqlalchemy_impl.asset_atom_clip_repository import (
-                SQLAlchemyAssetAtomClipRepository,
-            )
-            from packages.domain.atom_clip_resolver import flatten_candidates, load_atom_clips_for_assets
-            from packages.domain.atom_clip_selector import reselect_clips_from_atoms
+        clips_data = reselect_clips_for_variant(
+            source_clips_data,
+            pool_ids,
+            asset_durations=durations,
+            asset_scene_points=scene_points,
+            historical_used_segments=historical,
+            batch_segments=batch_segments_resolved,
+            target_durations=target_durations,
+            rng=rng,
+        )
 
-            atom_repo = SQLAlchemyAssetAtomClipRepository(db)
-
-            # 兜底切片只需要时长；本方法已查出 durations，封装一个只读假素材仓储
-            class _DurationOnlyAssetRepo:
-                def __init__(self, durations_map: dict[str, float]) -> None:
-                    self._durations = durations_map
-
-                def get(self, asset_id: str):
-                    if asset_id not in self._durations:
-                        return None
-
-                    class _A:
-                        pass
-
-                    a = _A()
-                    a.duration = self._durations[asset_id]
-                    return a
-
-            clips_by_asset = load_atom_clips_for_assets(
-                pool_ids,
-                atom_clip_repo=atom_repo,
-                asset_repo=_DurationOnlyAssetRepo(durations),
-            )
-            atom_candidates = flatten_candidates(clips_by_asset)
-            if atom_candidates:
-                # 历史成片已用原子片段（降权）；批次内前序变体已用（硬避让）
-                historical_atom_ids = set(
-                    self._clip_repo.list_recent_atom_clip_ids_by_user(
-                        created_by_user_id or source.created_by_user_id or "",
-                        limit=200,
-                    )
-                )
-                clips_data = reselect_clips_from_atoms(
-                    source_clips_data,
-                    atom_candidates,
-                    historical_atom_ids=historical_atom_ids,
-                    batch_used_atom_ids=(set(batch_used_atom_ids) if batch_used_atom_ids else None),
-                    rng=rng,
-                )
-        except Exception:
-            logger.warning("原子片段变体重选失败，回退整条素材选片", exc_info=True)
-            clips_data = None
-
-        if clips_data is None:
-            clips_data = reselect_clips_for_variant(
-                source_clips_data,
-                pool_ids,
-                asset_durations=durations,
-                asset_scene_points=scene_points,
-                historical_used_segments=historical,
-                batch_segments=batch_segments_resolved,
-                target_durations=target_durations,
-                rng=rng,
-            )  # 片段区间写回素材 metadata（与落库同事务；replace_all_clips_transactional 内 commit）
+        # 片段区间写回素材 metadata（与落库同事务；replace_all_clips_transactional 内 commit）
         for item in clips_data:
             aid = item.get("asset_id", "")
             if aid:

apps/api/app/services/generation_common.py

@@ -61,17 +61,10 @@ def writeback_edit_plan_config(
     task_id: str,
     title_config: dict | None,
     db: Session,
-    dedup_enabled: bool | None = None,
-    video_index: int | None = None,
-    assembly_mode: str | None = None,
-    script_id: str | None = None,
-    video_ratio: str | None = None,
 ) -> None:
     """任务入队成功后，回写 EditPlan.config：generation_task_id + title_config。
 
     用 merge 方式更新，不整体覆盖 config，避免丢失其他字段。
-    #1970：dedup_enabled 非 None 时一并写入，worker 据此决定 edge_crop/微变换；
-    PR3 叙事模式再写 assembly_mode/script_id/video_ratio（可追溯，不影响渲染）。
     失败只记日志，不影响任务创建。
     """
     if not plan_id:
@@ -87,16 +80,6 @@ def writeback_edit_plan_config(
         current_config = plan_model.config if isinstance(plan_model.config, dict) else {}
         merged = dict(current_config)
         merged["generation_task_id"] = task_id
-        if dedup_enabled is not None:
-            merged["dedup_enabled"] = bool(dedup_enabled)
-        if video_index is not None:
-            merged["video_index"] = int(video_index)
-        if assembly_mode:
-            merged["assembly_mode"] = assembly_mode
-        if script_id:
-            merged["script_id"] = script_id
-        if video_ratio:
-            merged["video_ratio"] = video_ratio
 
         if title_config:
             # #1901 统一字段名为 "title"（worker sync_configs_to_plan 写的是 "title"）
@@ -174,33 +157,6 @@ def collect_plan_segments(
     return segs
 
 
-def collect_plan_atom_clip_ids(
-    plan_id: str,
-    clip_repo: Any,
-    *,
-    page_size: int = 500,
-) -> list[str]:
-    """分页读取 plan 所有 clips，收集已选用的原子片段 ID（#1970）。
-
-    用于批量变体间原子片段级硬避让：同一原子片段在同批次内只用一次。
-    旧路径 clips 的 atom_clip_id 为空串，自动忽略。
-    """
-    ids: list[str] = []
-    sk, pg = 0, page_size
-    while True:
-        batch = clip_repo.list_by_plan(plan_id, skip=sk, limit=pg)
-        if not batch:
-            break
-        for c in batch:
-            acid = getattr(c, "atom_clip_id", "") or ""
-            if acid:
-                ids.append(acid)
-        if len(batch) < pg:
-            break
-        sk += pg
-    return ids
-
-
 def resolve_latest_plan_by_template(
     db: Session,
     *,

apps/api/app/services/gpu_lipsync_service.py

@@ -1,382 +0,0 @@
-"""GPU MuseTalk 口型同步服务 — 反向轮询模式.
-
-职责：
-1. 创建任务（由 lipsync 业务流程调用），为输入/输出生成预签名 URL，任务入队；
-2. Worker 心跳注册（register）：登记/刷新 worker 状态；
-3. Worker 轮询拉任务（poll）：原子地 CLAIM 一条 pending 任务，返回预签名 URL；
-4. Worker 上报结果（report_result）：标记 done/failed，失败可重试；
-5. 业务侧查询状态（get_status）。
-"""
-
-from __future__ import annotations
-
-import logging
-import uuid
-from datetime import UTC, datetime, timedelta
-from typing import Optional
-
-from app.core.storage import get_storage_service
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.models import GpuLipsyncTaskModel, GpuWorkerModel
-from packages.config import get_api_settings
-
-logger = logging.getLogger(__name__)
-
-# 任务在 processing 超过此时长仍未完成 → 超时回退 pending 或置 failed
-MAX_ATTEMPTS = 3
-
-
-class GpuLipsyncService:
-    """GPU 口型同步服务（无状态方法，每次调用从 DI 拿 db/storage）."""
-
-    RESULT_PREFIX = "gpu-lipsync/results/"
-    INPUT_SIGN_EXPIRES_PAD = 600  # 输入预签名 URL 在任务超时基础上再加 10min 余量
-
-    # ── 公共入口 ────────────────────────────────────────────────────
-
-    def __init__(self, db: Session):
-        self.db = db
-        self.settings = get_api_settings()
-        self.storage = get_storage_service()
-
-    # ── Worker 注册/心跳 ────────────────────────────────────────────
-
-    def register_worker(
-        self,
-        worker_id: str,
-        hostname: str = "",
-        gpu_name: str = "",
-        free_vram_mb: int = 0,
-        capabilities: str = "musetalk",
-        task_id: Optional[str] = None,
-    ) -> GpuWorkerModel:
-        """Worker 注册/心跳。
-
-        task_id 非空时（Worker 推理期间的任务级心跳），同步把对应 processing
-        任务的 last_heartbeat_at 续到当前时间，使长推理不会被
-        ``_recover_timed_out_tasks`` 误回退。任务已结束 / 不属于该 worker
-        （如已被超时回收重新派发）时忽略，不报错。
-        """
-        now = datetime.now(UTC)
-        worker = self.db.query(GpuWorkerModel).filter(GpuWorkerModel.worker_id == worker_id).one_or_none()
-        if worker is None:
-            worker = GpuWorkerModel(
-                worker_id=worker_id,
-                hostname=hostname,
-                gpu_name=gpu_name,
-                free_vram_mb=free_vram_mb,
-                capabilities=capabilities,
-                last_heartbeat_at=now,
-                created_at=now,
-            )
-            self.db.add(worker)
-        else:
-            worker.hostname = hostname or worker.hostname
-            worker.gpu_name = gpu_name or worker.gpu_name
-            worker.free_vram_mb = free_vram_mb
-            worker.capabilities = capabilities or worker.capabilities
-            worker.last_heartbeat_at = now
-        if task_id:
-            self._touch_task_heartbeat(task_id, worker_id, now)
-        self.db.commit()
-        return worker
-
-    # ── 轮询拉任务（Worker 调用） ──────────────────────────────────
-
-    def poll_task(self, worker_id: str) -> Optional[GpuLipsyncTaskModel]:
-        """原子地认领一条最早的 pending 任务，返回给 worker；无任务返回 None.
-
-        同时会：
-        - 把 processing 状态且真正超时（任务心跳停滞超过
-          gpu_task_timeout_seconds；Worker 推理期会通过 register(task_id=...)
-          续心跳，长推理不会误判）的任务回退为 pending（attempt++，超过
-          MAX_ATTEMPTS 置 failed），让其它 worker 认领。
-        - 刷新 worker 心跳。
-        """
-        now = datetime.now(UTC)
-        self._recover_timed_out_tasks(now)
-        # 更新 worker 心跳
-        self._touch_worker(worker_id, now)
-
-        # 选一条最早 pending 任务（FOR UPDATE SKIP LOCKED 语义：简单起见先查再锁状态）
-        task = (
-            self.db.query(GpuLipsyncTaskModel)
-            .filter(GpuLipsyncTaskModel.status == "pending")
-            .order_by(GpuLipsyncTaskModel.created_at.asc())
-            .first()
-        )
-        if task is None:
-            self.db.commit()
-            return None
-
-        # 原子 claim：用 UPDATE WHERE status=pending 避免并发
-        upd_rows = (
-            self.db.query(GpuLipsyncTaskModel)
-            .filter(
-                GpuLipsyncTaskModel.id == task.id,
-                GpuLipsyncTaskModel.status == "pending",
-            )
-            .update(
-                {
-                    GpuLipsyncTaskModel.status: "processing",
-                    GpuLipsyncTaskModel.worker_id: worker_id,
-                    GpuLipsyncTaskModel.started_at: now,
-                    GpuLipsyncTaskModel.last_heartbeat_at: now,
-                    GpuLipsyncTaskModel.attempt: GpuLipsyncTaskModel.attempt + 1,
-                    GpuLipsyncTaskModel.updated_at: now,
-                },
-                synchronize_session=False,
-            )
-        )
-        self.db.commit()
-        if upd_rows == 0:
-            # 被其它 worker 抢先了
-            return None
-        self.db.refresh(task)
-        # 生成预签名输入/输出 URL（在 claim 时动态生成，避免长时间过期）
-        expires = self.settings.gpu_task_timeout_seconds + self.INPUT_SIGN_EXPIRES_PAD
-        task._signed_video_url = self.storage.get_download_url(task.video_url, expires_seconds=expires)
-        task._signed_audio_url = self.storage.get_download_url(task.audio_url, expires_seconds=expires)
-        task._signed_upload_url = self.storage.get_upload_url(
-            self._result_key(task.id),
-            expires_seconds=expires,
-            content_type="video/mp4",
-        )
-        task._upload_expires_at = now + timedelta(seconds=expires)
-        return task
-
-    # ── 上报结果 ──────────────────────────────────────────────────
-
-    def report_result(
-        self,
-        task_id: str,
-        worker_id: str,
-        success: bool,
-        duration_seconds: float = 0.0,
-        error_msg: str = "",
-    ) -> GpuLipsyncTaskModel:
-        task = self.db.get(GpuLipsyncTaskModel, task_id)
-        if task is None:
-            raise KeyError(f"task {task_id} not found")
-        now = datetime.now(UTC)
-        if success:
-            task.status = "done"
-            task.result_url = self._result_key(task_id)
-            task.result_duration = duration_seconds or 0.0
-            task.error_msg = ""
-            task.finished_at = now
-        else:
-            # 失败：若仍可重试（已尝试次数 < MAX_ATTEMPTS）→ 回退 pending；否则 → failed
-            if task.attempt < MAX_ATTEMPTS:
-                task.status = "pending"
-                task.worker_id = ""
-                task.started_at = None
-                task.error_msg = error_msg[:2000]
-                logger.warning(
-                    "GPU 任务 %s 在 worker %s 上失败，回退 pending 等待重试（attempt=%d）: %s",
-                    task_id,
-                    worker_id,
-                    task.attempt,
-                    error_msg[:200],
-                )
-            else:
-                task.status = "failed"
-                task.error_msg = error_msg[:2000]
-                task.finished_at = now
-                logger.error(
-                    "GPU 任务 %s 失败达到最大重试次数 %d，置为 failed: %s",
-                    task_id,
-                    MAX_ATTEMPTS,
-                    error_msg[:200],
-                )
-        task.updated_at = now
-        task.last_heartbeat_at = now
-        self._touch_worker(worker_id, now)
-        self.db.commit()
-        self.db.refresh(task)
-        return task
-
-    # ── 业务侧查询 ────────────────────────────────────────────────
-
-    def get_task(self, task_id: str) -> Optional[GpuLipsyncTaskModel]:
-        return self.db.get(GpuLipsyncTaskModel, task_id)
-
-    def get_by_lipsync_job(self, lipsync_job_id: str) -> Optional[GpuLipsyncTaskModel]:
-        return (
-            self.db.query(GpuLipsyncTaskModel)
-            .filter(GpuLipsyncTaskModel.lipsync_job_id == lipsync_job_id)
-            .order_by(GpuLipsyncTaskModel.created_at.desc())
-            .first()
-        )
-
-    # ── 创建任务（业务侧调用） ────────────────────────────────────
-
-    def create_task(
-        self,
-        video_url: str,
-        audio_url: str,
-        lipsync_job_id: str = "",
-        user_id: str = "",
-        project_id: str = "",
-    ) -> GpuLipsyncTaskModel:
-        task_id = str(uuid.uuid4())
-        now = datetime.now(UTC)
-        task = GpuLipsyncTaskModel(
-            id=task_id,
-            lipsync_job_id=lipsync_job_id,
-            user_id=user_id,
-            project_id=project_id,
-            video_url=video_url,
-            audio_url=audio_url,
-            status="pending",
-            attempt=0,
-            created_at=now,
-            updated_at=now,
-        )
-        self.db.add(task)
-        self.db.commit()
-        self.db.refresh(task)
-        logger.info(
-            "创建 GPU 口型任务 %s (lipsync_job=%s, user=%s)",
-            task_id,
-            lipsync_job_id,
-            user_id,
-        )
-        return task
-
-    # ── 内部辅助 ──────────────────────────────────────────────────
-
-    def _result_key(self, task_id: str) -> str:
-        return f"{self.RESULT_PREFIX}{task_id}.mp4"
-
-    def _touch_task_heartbeat(self, task_id: str, worker_id: str, now: datetime) -> None:
-        """Worker 推理期间的任务级心跳：只刷新属于该 worker 且仍在 processing 的任务。
-
-        任务不存在 / 已被超时回收重新派发 / 已完成 → 静默忽略（此时旧 worker 的
-        结果上报会被结果接口按最终态处理）。
-        """
-        task = self.db.get(GpuLipsyncTaskModel, task_id)
-        if task is None:
-            return
-        if task.status != "processing" or task.worker_id != worker_id:
-            logger.info(
-                "忽略过期任务心跳 task=%s worker=%s（status=%s owner=%s）",
-                task_id,
-                worker_id,
-                task.status,
-                task.worker_id,
-            )
-            return
-        task.last_heartbeat_at = now
-        task.updated_at = now
-        self.db.flush()
-
-    def _touch_worker(self, worker_id: str, now: datetime) -> None:
-        if not worker_id:
-            return
-        worker = self.db.query(GpuWorkerModel).filter(GpuWorkerModel.worker_id == worker_id).one_or_none()
-        if worker is not None:
-            worker.last_heartbeat_at = now
-            self.db.flush()
-        else:
-            # 自注册（poll 时允许自动建一个空 worker 记录，运维可见）
-            worker = GpuWorkerModel(
-                worker_id=worker_id,
-                hostname="",
-                gpu_name="",
-                free_vram_mb=0,
-                capabilities="musetalk",
-                last_heartbeat_at=now,
-                created_at=now,
-            )
-            self.db.add(worker)
-            self.db.flush()
-
-    def _recover_timed_out_tasks(self, now: datetime) -> None:
-        """扫描 processing 状态且真正超时的任务，回退 pending 或失败。
-
-        判定只看任务自身 last_heartbeat_at：claim 时写入，Worker 推理期间通过
-        /gpu/register(task_id=...) 每 30s 续期。因此仅在 Worker 崩溃/断网
-        （任务心跳停滞超过 gpu_task_timeout_seconds）时才回收，
-        不会因 Worker 主循环忙于推理而误回退。
-        """
-        timeout = self.settings.gpu_task_timeout_seconds
-        cutoff = now - timedelta(seconds=timeout)
-        stuck_tasks = (
-            self.db.query(GpuLipsyncTaskModel)
-            .filter(
-                GpuLipsyncTaskModel.status == "processing",
-                GpuLipsyncTaskModel.last_heartbeat_at < cutoff,
-            )
-            .all()
-        )
-        for t in stuck_tasks:
-            if t.attempt >= MAX_ATTEMPTS:
-                t.status = "failed"
-                t.error_msg = f"worker 心跳超时（{timeout}s），重试次数已耗尽"
-                t.finished_at = now
-            else:
-                t.status = "pending"
-                t.worker_id = ""
-                t.started_at = None
-                t.error_msg = f"worker 心跳超时（{timeout}s），等待重试"
-                logger.warning("GPU 任务 %s 心跳超时，回退 pending（attempt=%d）", t.id, t.attempt)
-            t.updated_at = now
-        if stuck_tasks:
-            self.db.flush()
-
-    # ── 业务侧辅助 ──────────────────────────────────────────────────
-
-    def has_available_worker(self) -> bool:
-        """判断是否有 Worker 在心跳新鲜窗口内可用."""
-        stale_cutoff = datetime.now(UTC) - timedelta(seconds=self.settings.gpu_worker_stale_seconds)
-        return (
-            self.db.query(GpuWorkerModel).filter(GpuWorkerModel.last_heartbeat_at >= stale_cutoff).first() is not None
-        )
-
-    def wait_for_result(
-        self,
-        task_id: str,
-        timeout_seconds: Optional[int] = None,
-        poll_interval: Optional[float] = None,
-    ) -> Optional[GpuLipsyncTaskModel]:
-        """同步轮询等待 GPU 任务完成。
-
-        Args:
-            task_id: 任务 ID（由 create_task 返回）
-            timeout_seconds: 总超时，默认取 settings.gpu_lipsync_wait_timeout
-            poll_interval: 轮询间隔秒，默认取 settings.gpu_lipsync_poll_interval
-
-        Returns:
-            终态 task（status=done/failed）；超时返回 None（此时调用方应回退 MediaKit）。
-            等待期间会自动调用 _recover_timed_out_tasks 做超时回收。
-        """
-        import time
-
-        timeout = timeout_seconds if timeout_seconds is not None else self.settings.gpu_lipsync_wait_timeout
-        interval = poll_interval if poll_interval is not None else self.settings.gpu_lipsync_poll_interval
-        deadline = time.monotonic() + timeout
-
-        while True:
-            now = datetime.now(UTC)
-            # 顺手回收超时任务
-            try:
-                self._recover_timed_out_tasks(now)
-                self.db.commit()
-            except Exception as exc:  # noqa: BLE001 - 回收失败不阻塞主流程
-                logger.warning("wait_for_result 回收超时任务异常: %s", exc)
-                self.db.rollback()
-
-            task = self.db.get(GpuLipsyncTaskModel, task_id)
-            if task is None:
-                return None
-            if task.status == "done":
-                return task
-            if task.status == "failed":
-                return task
-            # pending/processing 继续等
-            if time.monotonic() >= deadline:
-                logger.warning("GPU 任务 %s 等待超时（%ds），回退 MediaKit", task_id, timeout)
-                return None
-            time.sleep(interval)

apps/api/app/services/lipsync_service.py

@@ -36,7 +36,6 @@ from sqlalchemy.orm import Session
 
 from packages.adapters.sqlalchemy_impl.models import LipsyncJobModel
 from packages.application.cosyvoice_service import CosyVoiceError
-from packages.config import get_api_settings
 from packages.domain.sentence_timings import (
     compute_sentence_timings,
     probe_audio_duration,
@@ -64,7 +63,6 @@ class LipsyncService:
         self.client = client or get_mediakit_client()
         self._cosyvoice = cosyvoice_service
         self._voice_clone_repo = voice_clone_repo
-        self.settings = get_api_settings()
 
     def _get_cosyvoice(self):
         """延迟获取 CosyVoiceService（与 tts 路由一致，含 OSS 预签名配置）."""
@@ -217,52 +215,7 @@ class LipsyncService:
         if timings:
             job.sentence_timings = timings
 
-        # 4. 检查是否走 GPU 路径：开关打开 + 有可用 Worker
-        use_gpu = False
-        if self.settings.use_gpu_lipsync:
-            try:
-                from app.services.gpu_lipsync_service import GpuLipsyncService
-
-                gpu_svc = GpuLipsyncService(self.db)
-                if gpu_svc.has_available_worker():
-                    use_gpu = True
-                    logger.info("[lipsync] 检测到可用 GPU Worker，优先走 MuseTalk 本地推理: job_id=%s", job.id)
-                else:
-                    logger.info("[lipsync] GPU 开关已开但无可用 Worker（心跳过期），回退 MediaKit: job_id=%s", job.id)
-            except Exception as exc:
-                logger.warning("[lipsync] GPU 服务初始化失败，回退 MediaKit: job_id=%s err=%s", job.id, exc)
-
-        if use_gpu:
-            try:
-                gpu_task = self._submit_to_gpu(job=job, gpu_svc=gpu_svc)
-                if gpu_task is not None:
-                    # GPU 任务完成：直接把结果写入 job，标为 completed
-                    job.mediakit_task_id = ""  # GPU 路径不走 MediaKit
-                    job.status = STATUS_COMPLETED
-                    job.output_video_url = gpu_task.result_url
-                    job.output_duration = gpu_task.result_duration or 0.0
-                    job.completed_at = datetime.now(UTC)
-                    job.updated_at = datetime.now(UTC)
-                    self.db.commit()
-                    logger.info(
-                        "[lipsync] GPU MuseTalk 推理完成: job_id=%s gpu_task=%s duration=%.2f",
-                        job.id,
-                        gpu_task.id,
-                        job.output_duration,
-                    )
-                    # 转存到持久 OSS 路径（GPU 结果已在 gpu-lipsync/results/ 下，直接签短链）
-                    return
-                # wait_for_result 返回 None 表示超时/最终失败 → 继续走 MediaKit 兜底
-                logger.warning("[lipsync] GPU 任务等待超时或失败，回退 MediaKit: job_id=%s", job.id)
-                self.db.rollback()  # 回滚可能的中间状态
-            except Exception as exc:
-                logger.exception("[lipsync] GPU 路径异常，回退 MediaKit: job_id=%s err=%s", job.id, exc)
-                try:
-                    self.db.rollback()
-                except Exception:
-                    pass
-
-        # 5. 签名 URL 并提交 MediaKit（兜底路径）
+        # 4. 签名 URL 并提交 MediaKit
         video_url = self._sign_media_url(job.video_url)
         signed_audio_url = self._sign_media_url(job.audio_url)
         job.audio_url = signed_audio_url
@@ -291,51 +244,6 @@ class LipsyncService:
             self.db.commit()
             raise
 
-    # ── GPU MuseTalk 路径 ────────────────────────────────────────────────
-
-    def _submit_to_gpu(self, *, job, gpu_svc) -> Optional[object]:
-        """创建 GPU 任务并同步等待结果。
-
-        成功返回终态 task 对象（status=done）；超时或 GPU 最终失败返回 None，
-        调用方回退 MediaKit。
-
-        注意：job.video_url / job.audio_url 可能是：
-        - 自家 OSS 存储 key（storage.is_own_url 判断，gpu_svc.create_task 内部
-          get_download_url 会自动签预签名 URL 给 Worker）
-        - 外部公网 URL（CosyVoice 临时链接等）：poll 返回时原样透传给 Worker，
-          Worker 可直接 GET 下载。
-        """
-        # 创建 GPU 任务
-        gpu_task = gpu_svc.create_task(
-            video_url=job.video_url,
-            audio_url=job.audio_url,
-            lipsync_job_id=job.id,
-            user_id=job.user_id,
-            project_id=job.project_id,
-        )
-        logger.info(
-            "[lipsync] 已创建 GPU 任务: job_id=%s gpu_task=%s",
-            job.id,
-            gpu_task.id,
-        )
-        # 同步等待 Worker 处理完成（轮询 DB）
-        final_task = gpu_svc.wait_for_result(gpu_task.id)
-        if final_task is None:
-            logger.warning("[lipsync] GPU 任务等待超时，回退 MediaKit: gpu_task=%s", gpu_task.id)
-            return None
-        if final_task.status != "done":
-            logger.warning(
-                "[lipsync] GPU 任务失败: gpu_task=%s status=%s err=%s",
-                gpu_task.id,
-                final_task.status,
-                final_task.error_msg,
-            )
-            return None
-        # result_url 是 OSS 存储 key；签一个长有效期 URL 写回 job.output_video_url
-        result_signed = self._sign_media_url(final_task.result_url)
-        final_task.result_url = result_signed or final_task.result_url
-        return final_task
-
     # ── 创建任务 ──────────────────────────────────────────────────────────
 
     def create_job(

apps/api/app/services/narrative_service.py

@@ -1,344 +0,0 @@
-"""叙事剪辑前置服务 — #1970 PR3.
-
-叙事模式（assembly_mode='narrative'）在生成任务入队前同步完成：
-
-1. 按 script_id 读取文案（归属校验）；
-2. 按 tts_voice_source 解析音色（preset=CosyVoice 音色 id；clone=克隆档案 id，
-   解析档案归属并取其 CosyVoice voice_id）；
-3. 同步 TTS 合成（复用 tts_job 现有 workflow：提交即同步返回，未完成则轮询兜底），
-   失败直接抛 NarrativeError（HTTP 层转 4xx，任务不入队）；
-4. 把合成音频转存为配音库 audio asset（与 /tts/jobs/{id}/save-to-library 同一套
-   存储路径与元信息约定），返回 asset_id —— 下游仍以 voice_library_id（实为
-   audio asset id）消费，渲染链路零改动。
-
-积分扣点与 /tts 合成端点保持一致（ai_voice 场景），失败退费。
-"""
-
-from __future__ import annotations
-
-import json
-import logging
-import math
-import subprocess
-import tempfile
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Any
-
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.models import ScriptModel
-from packages.application.cosyvoice_service import CosyVoiceService
-from packages.application.tts_job.use_cases import CreateTTSJobUseCase
-from packages.application.tts_job.workflow import TTSWorkflowService
-from packages.domain import Asset, AssetLibrary, AssetLibraryKind, AssetStatus, ClassificationStatus
-from packages.domain.points_rules import calculate_points_cost
-from packages.domain.points_service import PointsService
-from packages.shared.storage import SharedStorageService
-
-logger = logging.getLogger(__name__)
-
-_POINTS_SCENE = "ai_voice"
-_SYNTH_TIMEOUT = 180.0  # 叙事配音在 HTTP 请求内同步等待，长文案分段合成时留出余量
-_CONTENT_TYPE_MAP = {"mp3": "audio/mpeg", "wav": "audio/wav", "pcm": "audio/pcm", "opus": "audio/opus"}
-
-
-class NarrativeError(Exception):
-    """叙事模式前置处理失败（文案/音色/TTS/落库）。"""
-
-    def __init__(self, message: str, *, status_code: int = 400) -> None:
-        super().__init__(message)
-        self.message = message
-        self.status_code = status_code
-
-
-@dataclass(slots=True)
-class NarrativeContext:
-    """叙事模式前置处理结果。"""
-
-    script: ScriptModel
-    voice_asset_id: str
-    tts_job_id: str
-    audio_duration: float
-
-
-def _find_or_create_voice_library(
-    *,
-    user_id: str,
-    project_repository: Any,
-    asset_library_repository: Any,
-) -> AssetLibrary:
-    """找到（或自动创建）用户 voice 素材库；与 tts.py 保存配音库逻辑一致。"""
-    projects = project_repository.find_accessible_projects(user_id)
-    if not projects:
-        raise NarrativeError("没有可用的项目，无法保存叙事配音", status_code=400)
-
-    for project in projects:
-        for lib in asset_library_repository.find_by_project(project.id):
-            kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
-            if kind == AssetLibraryKind.VOICE.value:
-                return lib
-
-    project = projects[0]
-    library = AssetLibrary.create(project_id=project.id, name="配音素材库", kind=AssetLibraryKind.VOICE)
-    from sqlalchemy.exc import IntegrityError
-
-    try:
-        return asset_library_repository.create(library)
-    except IntegrityError:
-        session = getattr(asset_library_repository, "session", None)
-        if session is not None:
-            try:
-                session.rollback()
-            except Exception:  # noqa: BLE001 - 回滚失败不影响重查
-                logger.warning("IntegrityError 后回滚 session 失败", exc_info=True)
-        for lib in asset_library_repository.find_by_project(project.id):
-            kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
-            if kind == AssetLibraryKind.VOICE.value:
-                return lib
-        raise NarrativeError("配音素材库创建失败，请重试", status_code=500) from None
-
-
-def _resolve_voice(
-    *,
-    user_id: str,
-    tts_voice_id: str,
-    tts_voice_source: str,
-    voice_clone_repository: Any,
-) -> tuple[str, str]:
-    """解析音色 → (CosyVoice voice_id, voice_clone_profile_id)。"""
-    if tts_voice_source == "clone":
-        profile = voice_clone_repository.get(tts_voice_id)
-        if profile is None:
-            raise NarrativeError("克隆音色不存在", status_code=404)
-        if profile.user_id != user_id:
-            raise NarrativeError("无权使用该克隆音色", status_code=403)
-        if not profile.voice_id:
-            raise NarrativeError("音色克隆尚未完成，请稍后再试", status_code=400)
-        return profile.voice_id, profile.id
-    # preset：tts_voice_id 即 CosyVoice 音色 id；与 /tts 端点一致，
-    # 若前端误传克隆档案 UUID，同样兼容解析。
-    profile = voice_clone_repository.get(tts_voice_id)
-    if profile is not None:
-        if profile.user_id != user_id:
-            raise NarrativeError("无权使用该音色", status_code=403)
-        if not profile.voice_id:
-            raise NarrativeError("音色克隆尚未完成，请稍后再试", status_code=400)
-        return profile.voice_id, profile.id
-    return tts_voice_id, ""
-
-
-def _save_tts_job_as_voice_asset(
-    *,
-    job: Any,
-    user_id: str,
-    name: str,
-    project_repository: Any,
-    asset_library_repository: Any,
-    asset_repository: Any,
-    storage_service: SharedStorageService,
-) -> Asset:
-    """把已完成 TTS job 的音频转存为配音库 audio asset（同 save-to-library 约定）。"""
-    if not job.output_audio_url and not job.output_audio_key:
-        raise NarrativeError("TTS 合成缺少输出音频", status_code=502)
-
-    library = _find_or_create_voice_library(
-        user_id=user_id,
-        project_repository=project_repository,
-        asset_library_repository=asset_library_repository,
-    )
-
-    audio_format = (job.format or "mp3").strip() or "mp3"
-    content_type = _CONTENT_TYPE_MAP.get(audio_format, "audio/mpeg")
-    storage_key = f"uploads/voice/tts/{job.id}.{audio_format}"
-
-    tmp_path: Path | None = None
-    audio_duration: float | None = None
-    file_size = 0
-    try:
-        with tempfile.NamedTemporaryFile(suffix=f".{audio_format}", delete=False) as tmp:
-            tmp_path = Path(tmp.name)
-        download_source = job.output_audio_key or job.output_audio_url
-        downloaded = storage_service.download_asset(download_source, tmp_path)
-        if not downloaded or not tmp_path.exists() or tmp_path.stat().st_size == 0:
-            raise NarrativeError("叙事配音音频转存失败", status_code=502)
-        file_size = tmp_path.stat().st_size
-        storage_service.upload_file(tmp_path, storage_key, content_type=content_type)
-
-        try:
-            proc = subprocess.run(
-                [
-                    "ffprobe",
-                    "-v",
-                    "quiet",
-                    "-print_format",
-                    "json",
-                    "-show_format",
-                    str(tmp_path),
-                ],
-                capture_output=True,
-                text=True,
-                timeout=10,
-            )
-            if proc.returncode == 0:
-                dur = float(json.loads(proc.stdout).get("format", {}).get("duration", 0))
-                if dur > 0:
-                    audio_duration = dur
-        except Exception:  # noqa: BLE001 - ffprobe 仅用于时长兜底
-            logger.warning("叙事配音 ffprobe 时长提取失败: job_id=%s", job.id, exc_info=True)
-    except NarrativeError:
-        raise
-    except Exception as e:  # noqa: BLE001
-        logger.error("叙事配音转存失败: job_id=%s, error=%s", job.id, e, exc_info=True)
-        raise NarrativeError("叙事配音音频转存失败", status_code=502) from e
-    finally:
-        if tmp_path and tmp_path.exists():
-            try:
-                tmp_path.unlink()
-            except OSError:
-                pass
-
-    metadata_: dict[str, object] = {
-        "source": "tts_job",
-        "tts_job_id": job.id,
-        "narrative": True,
-        "format": job.format,
-        "sample_rate": job.sample_rate,
-        "voice_id": job.voice_id,
-        "voice_name": job.voice_model or "",
-    }
-    if job.metadata:
-        for key in ("speed", "language"):
-            if key in job.metadata:
-                metadata_[key] = job.metadata[key]
-
-    asset = Asset.create(
-        project_id=library.project_id,
-        library_id=library.id,
-        name=name or f"叙事配音-{job.id[:8]}",
-        storage_key=storage_key,
-        mime_type=content_type,
-        metadata=metadata_,
-        file_size=file_size,
-        duration=job.duration or audio_duration or None,
-        status=AssetStatus.READY,
-        classification_status=ClassificationStatus.PENDING,
-        uploaded_by_user_id=user_id,
-    )
-    try:
-        return asset_repository.create(asset)
-    except Exception as e:  # noqa: BLE001
-        logger.error("叙事配音 asset 落库失败，清理 OSS: %s, error=%s", storage_key, e, exc_info=True)
-        try:
-            storage_service.delete_file(storage_key)
-        except Exception:  # noqa: BLE001
-            logger.warning("清理孤儿 OSS 文件失败: %s", storage_key, exc_info=True)
-        raise NarrativeError("叙事配音保存失败，请重试", status_code=502) from e
-
-
-def prepare_narrative_voice(
-    *,
-    db: Session,
-    user_id: str,
-    script_id: str,
-    tts_voice_id: str,
-    tts_voice_source: str,
-    tts_repository: Any,
-    cosyvoice_service: CosyVoiceService,
-    voice_clone_repository: Any,
-    asset_repository: Any,
-    asset_library_repository: Any,
-    project_repository: Any,
-    storage_service: SharedStorageService,
-    points_enabled: bool = False,
-    is_member: bool = False,
-    member_type: str | None = None,
-) -> NarrativeContext:
-    """叙事模式入队前同步合成配音并落为 audio asset。
-
-    Raises:
-        NarrativeError: 文案缺失/归属不符、音色不可用、TTS 失败、转存失败。
-    """
-    script = db.query(ScriptModel).filter(ScriptModel.id == script_id, ScriptModel.user_id == user_id).first()
-    if script is None:
-        raise NarrativeError("文案不存在或无权使用", status_code=404)
-    content = (script.content or "").strip()
-    if not content:
-        raise NarrativeError("文案内容为空，无法合成配音", status_code=400)
-
-    actual_voice_id, clone_profile_id = _resolve_voice(
-        user_id=user_id,
-        tts_voice_id=tts_voice_id,
-        tts_voice_source=tts_voice_source,
-        voice_clone_repository=voice_clone_repository,
-    )
-
-    # 积分扣点（与 /tts 合成端点同口径），失败时在合成失败分支退费
-    points_svc = PointsService() if points_enabled else None
-    points_deducted = 0
-    if points_svc is not None:
-        est_minutes = max(1.0, math.ceil(len(content) / 240))
-        points_deducted = calculate_points_cost(
-            _POINTS_SCENE,
-            is_member=is_member,
-            duration_minutes=est_minutes,
-            member_type=member_type,
-        )
-        deduct_res = points_svc.deduct_points(user_id, points_deducted, _POINTS_SCENE, db)
-        if not deduct_res["success"]:
-            raise NarrativeError(
-                f"积分不足，需要 {points_deducted} 积分，当前余额 {deduct_res['balance']}",
-                status_code=402,
-            )
-
-    use_case = CreateTTSJobUseCase(tts_repository)
-    job = use_case.execute(
-        user_id=user_id,
-        input_text=content,
-        voice_id=actual_voice_id,
-        voice_clone_profile_id=clone_profile_id,
-        metadata={"speed": 1.0, "emotion": "", "language": "zh-CN", "narrative": True, "script_id": script_id},
-    )
-
-    workflow = TTSWorkflowService(repository=tts_repository, cosyvoice_service=cosyvoice_service)
-    try:
-        job = workflow.start_synthesis(job.id)
-        if not job.is_completed:
-            job = workflow.poll_and_process_synthesis(job.id, timeout=_SYNTH_TIMEOUT)
-    except Exception as e:  # noqa: BLE001 - 同步合成异常统一转 NarrativeError
-        logger.error("叙事配音 TTS 合成失败: job_id=%s, error=%s", job.id, e, exc_info=True)
-        try:
-            workflow.process_synthesis_failure(job.id, str(e))
-        except Exception:  # noqa: BLE001
-            logger.warning("标记叙事 TTS job 失败出错: job_id=%s", job.id, exc_info=True)
-        if points_deducted and points_svc is not None:
-            try:
-                points_svc.refund_points(user_id, points_deducted, _POINTS_SCENE, db, ref_id=job.id)
-            except Exception:  # noqa: BLE001
-                logger.warning("叙事 TTS 失败退积分异常: job_id=%s", job.id, exc_info=True)
-        raise NarrativeError(f"配音合成失败：{e}", status_code=502) from e
-
-    if not job.is_completed:
-        if points_deducted and points_svc is not None:
-            try:
-                points_svc.refund_points(user_id, points_deducted, _POINTS_SCENE, db, ref_id=job.id)
-            except Exception:  # noqa: BLE001
-                logger.warning("叙事 TTS 未完成退积分异常: job_id=%s", job.id, exc_info=True)
-        raise NarrativeError("配音合成未完成，请稍后重试", status_code=504)
-
-    asset = _save_tts_job_as_voice_asset(
-        job=job,
-        user_id=user_id,
-        name=(script.title or "叙事配音")[:60],
-        project_repository=project_repository,
-        asset_library_repository=asset_library_repository,
-        asset_repository=asset_repository,
-        storage_service=storage_service,
-    )
-
-    return NarrativeContext(
-        script=script,
-        voice_asset_id=asset.id,
-        tts_job_id=job.id,
-        audio_duration=float(job.duration or asset.duration or 0.0),
-    )

apps/api/app/services/plan_generator_service.py

@@ -22,11 +22,6 @@ from packages.adapters.sqlalchemy_impl import (
     SQLAlchemyEditPlanClipRepository,
     SQLAlchemyEditPlanRepository,
 )
-from packages.domain.atom_clip_resolver import load_atom_clips_for_assets
-from packages.domain.atom_clip_selector import (
-    estimate_required_clip_count,
-    select_atom_clips,
-)
 from packages.domain.config_schemas import normalize_plan_config
 from packages.domain.edit_plan import EditPlan
 from packages.domain.edit_plan_clip import EditPlanClip
@@ -57,12 +52,10 @@ class PlanGeneratorService:
     基于模板 + 素材，自动生成 EditPlan 及 EditPlanClip 列表。
     """
 
-    def __init__(self, db: Session, asset_repo=None, atom_clip_repo=None) -> None:
+    def __init__(self, db: Session, asset_repo=None) -> None:
         self._plan_repo = SQLAlchemyEditPlanRepository(db)
         self._clip_repo = SQLAlchemyEditPlanClipRepository(db)
         self._asset_repo = asset_repo
-        # #1970 原子化切片：可选注入；未注入时走旧的整条素材选片路径（向后兼容）
-        self._atom_clip_repo = atom_clip_repo
 
     # ── 公开接口 ─────────────────────────────────────────────────────────────
 
@@ -128,34 +121,18 @@ class PlanGeneratorService:
 
         # 4. 按 editing_mode 分配素材
         if asset_ids:
-            # #1970 原子化切片：素材 clip 从 atom_clips 表选取（未就绪自动内存兜底）。
-            # 预览随机模式保持旧路径（整条素材 + 随机起点），与现有预览契约一致。
-            atom_applied = False
-            if not random_preview and self._atom_clip_repo is not None:
-                try:
-                    atom_applied = self._distribute_atom_clips(
-                        clips,
-                        asset_ids,
-                        editing_mode,
-                        user_id=created_by_user_id,
-                    )
-                except Exception:
-                    logger.warning("原子片段选片失败，回退整条素材选片", exc_info=True)
-                    atom_applied = False
-
-            if not atom_applied:
-                # 获取素材时长信息，用于随机起始时间
-                asset_durations = None
-                if self._asset_repo:
-                    asset_durations = self._fetch_asset_durations(asset_ids)
-                self._distribute_assets(
-                    clips,
-                    asset_ids,
-                    editing_mode,
-                    random_selection=random_preview,
-                    asset_durations=asset_durations,
-                    user_id=created_by_user_id,
-                )
+            # 获取素材时长信息，用于随机起始时间
+            asset_durations = None
+            if self._asset_repo:
+                asset_durations = self._fetch_asset_durations(asset_ids)
+            self._distribute_assets(
+                clips,
+                asset_ids,
+                editing_mode,
+                random_selection=random_preview,
+                asset_durations=asset_durations,
+                user_id=created_by_user_id,
+            )
 
         # 5. 持久化所有 clips 并计算总时长
         created_clips: list[EditPlanClip] = []
@@ -282,103 +259,6 @@ class PlanGeneratorService:
             external_used_segments=external_used_segments,
         )
 
-    def _distribute_atom_clips(
-        self,
-        clips: list[EditPlanClip],
-        asset_ids: list[str],
-        editing_mode: str,
-        *,
-        user_id: str = "",
-    ) -> bool:
-        """#1970 原子化切片选片（就地修改 clips，未持久化）.
-
-        从 ``asset_atom_clips`` 表按原子片段选取；老素材/切片未就绪的素材
-        内存兜底切片。同一原子片段在一次方案中只用一次；跨视频避让走
-        edit_plan_clips.atom_clip_id 最近使用记录。
-
-        Returns:
-            True 表示原子片段选片成功；False 表示无可用片段，调用方应回退
-            到旧的整条素材 distribute_assets。
-        """
-        # 1. 加载候选原子片段（DB + 兜底）
-        clips_by_asset = load_atom_clips_for_assets(
-            asset_ids,
-            atom_clip_repo=self._atom_clip_repo,
-            asset_repo=self._asset_repo,
-        )
-        if not clips_by_asset:
-            return False
-
-        # 2. 最近使用片段（跨视频原子片段级避让）
-        recently_used: set[str] = set()
-        if user_id and hasattr(self._clip_repo, "list_recent_atom_clip_ids_by_user"):
-            try:
-                recently_used = set(self._clip_repo.list_recent_atom_clip_ids_by_user(user_id, limit=200))
-            except Exception:
-                logger.warning("跨视频原子片段避让查询失败", exc_info=True)
-
-        # 3. 片段需求估算：无配音时按 clips 数量；voice_over 的配音总时长存于
-        #    clip.config["voice_duration"]，按 平均片段时长≈需要片段数 估算
-        voice_total = 0.0
-        for c in clips:
-            cfg_vd = c.config.get("voice_duration") if c.config else None
-            if cfg_vd:
-                voice_total += float(cfg_vd)
-        avg_clip_target = sum(float(c.duration or 0.0) for c in clips) / max(len(clips), 1)
-        required_count = estimate_required_clip_count(
-            voice_total or sum(float(c.duration or 0.0) for c in clips),
-            avg_clip_target or 3.5,
-        )
-        required_count = max(required_count, len(clips))
-
-        rng = random.Random()
-
-        # 4. 正式生成：先按素材 smart_score 对素材池排序，再展开为片段池
-        #    （同素材的片段保持连续，高分素材的片段排在前面优先入选）
-        if self._asset_repo:
-            asset_order = self._sort_assets_by_smart_score(list(clips_by_asset.keys()))
-            ordered: dict[str, list] = {}
-            for aid in asset_order:
-                if aid in clips_by_asset:
-                    ordered[aid] = clips_by_asset[aid]
-            clips_by_asset = ordered
-
-        candidates: list = []
-        for asset_clips in clips_by_asset.values():
-            candidates.extend(asset_clips)
-
-        # 5. 逐虚拟片段选片：评分排序，同片段不重复使用
-        used_atom_ids: set[str] = set()
-        asset_usage: dict[str, int] = {}
-        assigned = 0
-        for clip in clips:
-            # 对每个虚拟片段重新评分（usage_count 随选择动态变化）
-            scored = select_atom_clips(
-                candidates,
-                target_duration=float(clip.duration or 0.0),
-                used_atom_clip_ids=used_atom_ids,
-                asset_usage_counts=asset_usage,
-                recently_used_atom_ids=recently_used,
-                required_count=required_count,
-                limit=1,
-                rng=rng,
-            )
-            if not scored:
-                # 候选耗尽（同片段不可重复），交由调用方回退或留白
-                continue
-            picked = scored[0]
-            clip.asset_id = picked.asset_id
-            clip.atom_clip_id = picked.atom_clip_id
-            clip.start_time = round(picked.start_time, 3)
-            clip.duration = round(picked.duration, 3)
-            used_atom_ids.add(picked.atom_clip_id)
-            asset_usage[picked.asset_id] = asset_usage.get(picked.asset_id, 0) + 1
-            assigned += 1
-
-        if assigned == 0:
-            return False
-        return True
-
     def _fetch_asset_scene_points(self, asset_ids: list[str]) -> dict[str, list[float]]:
         """从素材 metadata 读取场景切换点缓存（无缓存的素材不包含在结果中）。"""
         points_map: dict[str, list[float]] = {}

apps/api/app/services/script_asr_service.py

@@ -38,12 +38,7 @@ def transcribe_to_text(media_path: str | Path) -> str:
         ASRTranscriptionError: ASR 调用失败
     """
     # 延迟导入，避免循环依赖和启动时副作用
-    try:
-        from apps.worker.services.asr_service_factory import get_asr_service
-    except ImportError as exc:
-        # API 镜像未打包 worker 代码（本地 ASR 依赖 worker 的 asr_service_factory）
-        logger.warning("本地 ASR 不可用（apps.worker 未安装）: %s", exc)
-        raise ASRNotConfiguredError("本地 ASR 服务不可用（worker 模块未安装）") from exc
+    from apps.worker.services.asr_service_factory import get_asr_service
 
     asr = get_asr_service()
     if asr is None:

apps/web/e2e/core-douyin-extract.spec.ts

@@ -1,117 +0,0 @@
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test"
-
-const PASSWORD = "SmokePass123!"
-const apiBase = process.env.E2E_API_BASE || "/api/v1"
-const apiOrigin = apiBase.endsWith("/api/v1") ? apiBase.slice(0, -"/api/v1".length) : ""
-
-async function routeBrowserApiToTestApi(page: Page) {
-  if (!apiOrigin) return
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url())
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    })
-    await route.fulfill({ response })
-  })
-}
-
-async function loginWithRetry(request: APIRequestContext, email: string, password: string) {
-  for (let i = 0; i <= 2; i++) {
-    const r = await request.post(`${apiBase}/auth/login`, { data: { email, password } })
-    if (r.status() !== 429) {
-      expect(r.ok(), `login: ${await r.text()}`).toBeTruthy()
-      return (await r.json()).access_token as string
-    }
-    console.log(`[douyin] 429 retry ${i + 1}/2`)
-    await new Promise((res) => setTimeout(res, 65000))
-  }
-  throw new Error("Login retries exhausted")
-}
-
-/**
- * #1972 抖音文案提取冒烟
- *
- * 路径：文案库页面 → 点「🎬 从抖音提取」→ 粘贴分享文案 → 点「开始提取」
- * → mock /api/v1/scripts/extract-from-douyin 返回稳定文案 → 断言「新建文案」弹窗中预填了非空文案
- */
-test.describe("Douyin Script Extraction (#1972)", () => {
-  test("extract flow: open modal, paste link, text prefilled in create modal", async ({
-    page,
-    request,
-  }) => {
-    test.setTimeout(180_000)
-    await page.setViewportSize({ width: 1440, height: 900 })
-
-    const suffix = Math.random().toString(36).slice(2, 8)
-    const email = `e2e-douyin-${suffix}@example.com`
-    await request.post(`${apiBase}/auth/register`, {
-      data: { email, password: PASSWORD, username: `e2e_dy_${suffix}` },
-    })
-    const token = await loginWithRetry(request, email, PASSWORD)
-    const authHeader = { Authorization: `Bearer ${token}` }
-
-    const proj = await request.post(`${apiBase}/projects`, {
-      headers: authHeader,
-      data: { name: `Smoke Douyin ${suffix}` },
-    })
-    const projectId = (await proj.json()).id ?? (await proj.json()).project_id
-    await request.post(`${apiBase}/asset-libraries`, {
-      headers: authHeader,
-      data: { project_id: projectId, name: "Smoke", kind: "video" },
-    })
-
-    await page.addInitScript((t: string) => {
-      window.localStorage.setItem("access_token", t)
-      window.localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({ state: { token: t, user: null } }),
-      )
-    }, token)
-    await routeBrowserApiToTestApi(page)
-
-    // Mock 抖音提取接口返回稳定文案
-    const extractedText = "大家好，今天给大家推荐一款超好用的产品，性价比非常高，快来看看吧！"
-    await page.route("**/api/v1/scripts/extract-from-douyin", (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({ text: extractedText, duration_seconds: 15 }),
-      }),
-    )
-    // 文案列表空态
-    await page.route(
-      (url) => url.pathname.endsWith("/scripts") && !url.pathname.includes("extract-from-douyin"),
-      (route) =>
-        route.fulfill({
-          status: 200,
-          contentType: "application/json",
-          body: JSON.stringify({ items: [], total: 0, page: 1, page_size: 20 }),
-        }),
-    )
-
-    await page.goto("/app/scripts")
-    // 文案库页面加载
-    await expect(page.getByText(/文案库|文案/).first()).toBeVisible({ timeout: 30000 })
-
-    // 点「🎬 从抖音提取」按钮
-    await page.getByRole("button", { name: /从抖音提取/ }).click()
-    await expect(page.getByText("从抖音视频提取文案")).toBeVisible({ timeout: 5000 })
-
-    // 在 TextArea 粘贴"抖音分享文案"
-    const textarea = page.locator(".ant-modal textarea").first()
-    await expect(textarea).toBeVisible()
-    await textarea.fill("8.88 复制打开抖音，看看【推荐视频】https://v.douyin.com/abcDEF/")
-
-    // 点「开始提取」
-    await page.getByRole("button", { name: "开始提取" }).click()
-    await expect(page.getByText(/提取中/)).toBeVisible({ timeout: 3000 })
-
-    // 等待抖音弹窗关闭，「新建文案」弹窗打开并预填提取文案
-    await expect(page.getByText("从抖音视频提取文案")).not.toBeVisible({ timeout: 15000 })
-    await expect(page.getByText("新建文案")).toBeVisible({ timeout: 5000 })
-    const createTextarea = page.locator(".ant-modal textarea").first()
-    await expect(createTextarea).toBeVisible()
-    await expect(createTextarea).toHaveValue(new RegExp(extractedText.slice(0, 10)))
-    console.log("[douyin] Extraction flow completed ✓, text length:", extractedText.length)
-  })
-})

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

@@ -1,4 +1,4 @@
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test"
+import { expect, test, type APIRequestContext } from "@playwright/test"
 import * as fs from "node:fs"
 import * as path from "node:path"
 import { fileURLToPath } from "node:url"
@@ -8,8 +8,7 @@ const PASSWORD = "SmokePass123!"
 const apiBase = process.env.E2E_API_BASE || "/api/v1"
 const apiOrigin = apiBase.endsWith("/api/v1") ? apiBase.slice(0, -"/api/v1".length) : ""
 
-/** 将浏览器侧 /api/v1 请求路由到 Playwright request 源（支持跨域） */
-async function routeBrowserApiToTestApi(page: Page) {
+const routeBrowserApiToTestApi = async (page: import("@playwright/test").Page) => {
   if (!apiOrigin) return
   await page.route("**/api/v1/**", async (route) => {
     const sourceUrl = new URL(route.request().url())
@@ -25,358 +24,292 @@ async function loginWithRetry(
   email: string,
   password: string,
   maxRetries = 2,
-): Promise<string> {
+) {
   for (let i = 0; i <= maxRetries; i++) {
-    const resp = await request.post(`${apiBase}/auth/login`, { data: { email, password } })
-    if (resp.status() !== 429) {
-      expect(resp.ok(), `Login should succeed: ${await resp.text()}`).toBeTruthy()
-      const data = await resp.json()
-      return data.access_token
-    }
-    console.log(`[login] 429 rate limited, retry ${i + 1}/${maxRetries} after 65s`)
+    const response = await request.post(`${apiBase}/auth/login`, {
+      data: { email, password },
+    })
+    if (response.status() !== 429) return response
+    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`)
     await new Promise((r) => setTimeout(r, 65000))
   }
-  throw new Error("Login failed after retries")
+  return request.post(`${apiBase}/auth/login`, {
+    data: { email, password },
+  })
 }
 
-/**
- * 注册新用户 + 建项目/视频库/上传 sample.mp4，等素材 ready。返回 { token, projectId, libraryId, assetId }。
- */
-async function setupFreshUser(
-  request: APIRequestContext,
-  label: string,
-): Promise<{ token: string; libraryId: string; assetId: string; suffix: string }> {
-  const suffix = Math.random().toString(36).slice(2, 8)
-  const email = `e2e-${label}-${suffix}@example.com`
-  await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username: `e2e_${label}_${suffix}` },
-  })
-  const token = await loginWithRetry(request, email, PASSWORD)
-  const auth = { Authorization: `Bearer ${token}` }
-
-  const proj = await request.post(`${apiBase}/projects`, {
-    headers: auth,
-    data: { name: `Smoke ${label} ${suffix}` },
-  })
-  expect(proj.ok(), `create project: ${await proj.text()}`).toBeTruthy()
-  const projectId = (await proj.json()).id ?? (await proj.json()).project_id
-
-  const lib = await request.post(`${apiBase}/asset-libraries`, {
-    headers: auth,
-    data: { project_id: projectId, name: "Smoke", kind: "video" },
-  })
-  expect(lib.ok(), `create library: ${await lib.text()}`).toBeTruthy()
-  const libraryId = (await lib.json()).id
-
-  const samplePath = path.join(__dirname, "fixtures", "sample.mp4")
-  const sampleBuf = fs.readFileSync(samplePath)
-  const up = await request.post(`${apiBase}/upload`, {
-    headers: auth,
-    multipart: {
-      project_id: projectId,
-      library_id: libraryId,
-      file: {
-        name: "sample.mp4",
-        mimeType: "video/mp4",
-        buffer: sampleBuf,
-      },
-    },
-  })
-  expect(up.ok(), `upload sample: ${await up.text()}`).toBeTruthy()
-  const assetId = (await up.json()).asset_id
-  await expect
-    .poll(
-      async () => {
-        const r = await request.get(`${apiBase}/assets/${assetId}`, { headers: auth })
-        return r.ok() ? (await r.json()).status : "pending"
-      },
-      { timeout: 90_000, intervals: [3000, 3000, 5000] },
-    )
-    .toBe("ready")
-  return { token, libraryId, assetId, suffix }
+type ProjectResponse = { id: string }
+type LibraryResponse = { id: string }
+type AssetListResponse = {
+  items: Array<{
+    id: string
+    name: string
+    status: string
+  }>
 }
 
-/**
- * #1970 智能剪辑核心冒烟（新 5 步向导）
- *
- * 新流程：选择模式 → 选择素材 → 选择标题 → 确认生成 → 选择封面
- *
- * 两条路径：
- *   1) 随机混剪（默认）→ Step1 下一步 → 配音选择弹窗 → Step2 选素材 → 数量弹窗
- *      → Step3 标题 → Step4 确认生成 → 断言任务创建
- *   2) 叙事剪辑 → Step1 切模式 → 下一步 → 文案选择弹窗 → TTS 弹窗选音色（mock 合成）
- *      → Step2 AI 提示卡可见 + 选素材 → 数量弹窗 → Step3 标题 → Step4 确认生成
- *      → 断言任务创建
- */
-test.describe("Core Smart-Edit Flow (#1970)", () => {
-  test("random mode: 5-step wizard creates generation task", async ({ page, request }) => {
-    test.setTimeout(600_000)
-    await page.setViewportSize({ width: 1440, height: 1000 })
-    const { token, suffix } = await setupFreshUser(request, "random")
-    const authHeader = { Authorization: `Bearer ${token}` }
+test.describe("Core generation flow", () => {
+  test.describe.configure({ timeout: 360_000 })
 
-    // 确保默认模板存在（智能剪辑页依赖模板）
-    const tmpls = await request.get(`${apiBase}/templates`, { headers: authHeader })
-    const tmplsJson = await tmpls.json()
-    const templates = Array.isArray(tmplsJson)
-      ? tmplsJson
-      : Array.isArray(tmplsJson.items)
-        ? tmplsJson.items
-        : []
-    expect(templates.length).toBeGreaterThan(0)
+  test("walks through 6-step wizard and starts generation", async ({ page, request }) => {
+    test.setTimeout(360_000)
 
-    // 注入登录态 + 路由 API
-    await page.addInitScript((t: string) => {
-      window.localStorage.setItem("access_token", t)
-      window.localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({ state: { token: t, user: null } }),
-      )
-    }, token)
     await routeBrowserApiToTestApi(page)
+    const suffix = Date.now().toString(36)
+    const email = `e2e-gen-${suffix}@example.com`
+    const username = `e2e_gen_${suffix}`
+    const libraryName = `E2E Gen Lib ${suffix}`
 
-    // ── 提前 mock 配音列表（VoiceSelectModal 查询 /assets?kind=voice） ──
-    await page.route(
-      (url) => url.pathname.endsWith("/assets") && url.searchParams.get("kind") === "voice",
-      (route) =>
-        route.fulfill({
-          status: 200,
-          contentType: "application/json",
-          body: JSON.stringify({
-            items: [
-              {
-                id: `asset-voice-${suffix}`,
-                name: "测试配音.mp3",
-                file_url: "data:audio/mpeg;base64,",
-                duration: 10,
-                file_size: 1024,
-                kind: "voice",
-                status: "ready",
-              },
-            ],
-            total: 1,
+    // Register
+    const register = await request.post(`${apiBase}/auth/register`, {
+      data: { email, username, password: PASSWORD, display_name: username },
+    })
+    expect(register.status()).toBe(201)
+    const registerData = (await register.json()) as { user_id: string }
+
+    // Login
+    const login = await loginWithRetry(request, email, PASSWORD)
+    expect(login.status()).toBe(200)
+    const loginData = (await login.json()) as { access_token: string }
+    const headers = { Authorization: `Bearer ${loginData.access_token}` }
+
+    // Create project
+    const project = await request.post(`${apiBase}/projects`, {
+      headers,
+      data: { name: `E2E Gen Proj ${suffix}` },
+    })
+    expect(project.status()).toBe(200)
+    const projectData = (await project.json()) as ProjectResponse
+
+    // Create asset library
+    const library = await request.post(`${apiBase}/asset-libraries`, {
+      headers,
+      data: { project_id: projectData.id, name: libraryName, kind: "video" },
+    })
+    expect(library.status()).toBe(200)
+    const libraryData = (await library.json()) as LibraryResponse
+
+    // Upload source video
+    const sourceFileName = "e2e-gen-source.mp4"
+    const sampleVideoPath = path.join(__dirname, "fixtures", "sample.mp4")
+    const sampleVideoBuffer = fs.readFileSync(sampleVideoPath)
+    const upload = await request.post(`${apiBase}/upload`, {
+      headers,
+      multipart: {
+        project_id: projectData.id,
+        library_id: libraryData.id,
+        file: {
+          name: sourceFileName,
+          mimeType: "video/mp4",
+          buffer: sampleVideoBuffer,
+        },
+      },
+    })
+    expect(upload.status()).toBe(200)
+
+    // Wait for asset to be ready
+    await expect
+      .poll(
+        async () => {
+          const assets = await request.get(`${apiBase}/assets`, {
+            headers,
+            params: { library_id: libraryData.id },
+          })
+          if (!assets.ok()) return `http_${assets.status()}`
+          const data = (await assets.json()) as AssetListResponse
+          const asset = data.items.find((a) => a.name === sourceFileName)
+          if (!asset) return "missing"
+          return asset.status
+        },
+        { timeout: 30_000, intervals: [1_000, 2_000, 3_000] },
+      )
+      .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()
+
+    // Set auth in localStorage
+    await page.addInitScript(
+      ({ token, user }) => {
+        localStorage.setItem("access_token", token)
+        localStorage.setItem(
+          "auth-storage",
+          JSON.stringify({
+            state: { user, isAuthenticated: true },
+            version: 0,
           }),
-        }),
+        )
+      },
+      {
+        token: loginData.access_token,
+        user: {
+          id: registerData.user_id,
+          user_id: registerData.user_id,
+          email,
+          username,
+          display_name: username,
+          is_email_verified: true,
+          email_verified: true,
+        },
+      },
     )
 
+    // Navigate to generate page
     await page.goto("/app/generate")
     await expect(page.getByRole("heading", { name: "智能剪辑" })).toBeVisible({
-      timeout: 30000,
+      timeout: 20_000,
     })
 
-    // ── Step 1：默认随机混剪选中，点下一步 ──────────────────────────
-    await expect(page.getByText("选择模式", { exact: true })).toBeVisible()
-    await expect(page.getByText("随机混剪")).toBeVisible()
-    await page.getByRole("button", { name: /下一步/ }).click()
+    // Step 1: template - default selected, click next
+    await expect(page.locator(".xx-choice-item.selected")).toBeVisible()
+    await page.getByRole("button", { name: "下一步" }).click()
 
-    // ── 配音选择弹窗：选第一个配音 → 确认 ─────────────────────────
-    await expect(page.getByText("🎙️ 选择配音")).toBeVisible({ timeout: 5000 })
-    await page.getByText("测试配音.mp3").first().click()
-    await page.getByRole("button", { name: "确认选择" }).click()
-    await expect(page.getByText("🎙️ 选择配音")).not.toBeVisible()
-
-    // ── Step 2：选择素材 ──────────────────────────────────────────
-    await expect(page.getByText("选择素材", { exact: true })).toBeVisible({ timeout: 10000 })
-    await page.getByTestId("material-card").first().click()
-    await page.getByRole("button", { name: /下一步/ }).click()
-
-    // ── 数量弹窗：默认 1 个 → 确认 ───────────────────────────────
-    await expect(page.getByText("要生成几个视频？")).toBeVisible({ timeout: 5000 })
+    // 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 3：填写标题 ──────────────────────────────────────────
-    await expect(page.getByText("选择标题", { exact: true })).toBeVisible({ timeout: 10000 })
-    const titleInput = page.getByPlaceholder("输入或从标题库选择")
+    // 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 })
+    // 新 UI: 素材以 9:16 竖屏卡片展示，点击卡片选中
+    // 注意：卡片中心是播放按钮（stopPropagation 会阻止选中），所以点击左上角避开
+    const materialCard = page.getByTestId("material-card").filter({ hasText: sourceFileName })
+    await expect(materialCard).toBeVisible({ timeout: 10_000 })
+    await materialCard.click({ position: { x: 15, y: 15 } })
+    // 验证选中：卡片应出现勾选标记（用 testid 定位，避免 ✓ 字符文本匹配不稳定）
+    await expect(materialCard.getByTestId("material-card-check")).toBeVisible({ timeout: 5_000 })
+    await page.getByRole("button", { name: "下一步" }).click()
+
+    // Step 3: voice (可选步骤，新注册用户无配音素材，直接跳过)
+    await expect(page.getByRole("heading", { name: /选择配音/ })).toBeVisible({ timeout: 15000 })
+    await page.getByRole("button", { name: "下一步" }).click()
+
+    // Step 4: title（新顺序：标题在预览之前）
+    await expect(page.getByRole("heading", { name: /选择标题/ })).toBeVisible({ timeout: 15000 })
+    // 等待组件完全渲染
+    await page.waitForTimeout(2000)
+
+    // Antd AutoComplete 的 placeholder 渲染在 span 上，input 无 placeholder 属性
+    // 使用 Antd AutoComplete 特有的 class 定位输入框
+    const titleInput = page.locator(".ant-select-auto-complete input")
     await expect(titleInput).toBeVisible({ timeout: 5000 })
-    await titleInput.fill(`测试随机剪辑 ${suffix}`)
-    await page.getByRole("button", { name: /下一步/ }).click()
 
-    // ── Step 4：确认生成 ──────────────────────────────────────────
-    await expect(page.getByText("📋 生成配置")).toBeVisible({ timeout: 10000 })
-    await expect(page.getByText("随机混剪")).toBeVisible()
-    const confirmBtn = page.getByRole("button", { name: /确认生成视频/ })
-    await expect(confirmBtn).toBeEnabled({ timeout: 5000 })
+    const titleText = `E2E Test ${suffix}`
+    await titleInput.fill(titleText)
 
-    const createTask = page.waitForResponse(
-      (r) => r.url().includes("/generation/tasks") && r.request().method() === "POST",
-      { timeout: 30000 },
+    // Step 4（标题+实时预览）：确认生成按钮已移到标题页，点击直接创建最终渲染任务
+    // 等待前端实时预览就绪：未就绪时右侧 FrontendPreviewPlayer 显示「准备预览素材...」占位，
+    // 就绪（previewReady：素材已解析 + 模板已选中）后占位消失；否则按钮会被校验拦截弹 warning
+    await page
+      .getByText("准备预览素材")
+      .waitFor({ state: "detached", timeout: 30_000 })
+      .catch(() => {})
+
+    // 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: 30_000 },
     )
-    await confirmBtn.click()
-    const taskResp = await createTask
-    expect(taskResp.ok(), `Create task: ${await taskResp.text()}`).toBeTruthy()
-    const taskId = (await taskResp.json()).id ?? (await taskResp.json()).task_id
-    console.log("[random] Generation task created:", taskId)
-    await expect(page.getByText(/正在生成|提交/)).toBeVisible({ timeout: 15000 })
-    console.log("[random] Wizard flow completed ✓")
+
+    // 点击「确认生成视频」
+    await page.locator(".xx-btn-primary").filter({ hasText: "确认生成视频" }).first().click()
+
+    // Verify generation was triggered
+    const genResp = await generatePromise
+    if (!genResp.ok()) {
+      const body = await genResp.text()
+      console.error(
+        `[E2E DEBUG] 触发生成接口失败: status=${genResp.status()} url=${genResp.url()} body=${body.slice(0, 500)}`,
+      )
+    }
+    // Generate API may return 400 in test env if template has no ready segments
+    // That is OK for a wizard flow smoke test
+    if (genResp.ok()) {
+      const genData = (await genResp.json()) as {
+        items: Array<{ id: string; status: string }>
+        total: number
+      }
+      expect(genData.items.length).toBeGreaterThan(0)
+      expect(genData.items[0].id).toBeTruthy()
+
+      // 单视频（N=1）：点击「确认生成视频」后跳 Step 5「确认生成」，展示实时渲染进度
+      await expect(page.getByRole("heading", { name: "🎬 确认生成" })).toBeVisible({
+        timeout: 30_000,
+      })
+
+      // 等待渲染完成：进度卡变为「视频生成完成」（最长等待 3 分钟）
+      await expect(page.getByText("视频生成完成")).toBeVisible({ timeout: 180_000 })
+
+      // 全部完成后「下一步：选择封面」解锁，点击进入 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`)
+      // 创建失败时停留在标题页并展示错误提示
+      await page
+        .getByText(/生成失败|重新生成/)
+        .isVisible({ timeout: 15_000 })
+        .catch(() => false)
+    }
+
+    // Verify product library page loads (smoke: just verify page renders)
+    await page.goto("/app/products")
+    await expect(page).toHaveURL(/\/app\/products/)
+    // Verify page container exists = page rendered correctly
+    // (works in all states: loading/error/success - more reliable than checking search input)
+    await expect(page.locator(".xx-products-page")).toBeVisible({
+      timeout: 15_000,
+    })
+
+    // 清理所有路由，避免页面关闭时飞地API请求导致测试报错
+    await page.unrouteAll({ behavior: "ignoreErrors" })
   })
 
-  test("narrative mode: select script + mock TTS, create generation task", async ({
-    page,
-    request,
-  }) => {
-    test.setTimeout(600_000)
-    await page.setViewportSize({ width: 1440, height: 1000 })
-    const { token, suffix } = await setupFreshUser(request, "narrative")
+  test("generation task API creates and lists tasks", async ({ request }) => {
+    const suffix = Date.now().toString(36)
+    const email = `e2e-gen-api-${suffix}@example.com`
+    const username = `e2e_gen_api_${suffix}`
 
-    await page.addInitScript((t: string) => {
-      window.localStorage.setItem("access_token", t)
-      window.localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({ state: { token: t, user: null } }),
-      )
-    }, token)
-    await routeBrowserApiToTestApi(page)
-
-    // ── Mock 文案列表、音色、TTS 合成（避免真实合成） ──────────────
-    const mockScriptId = `script-mock-${suffix}`
-    const mockVoiceId = `preset-voice-${suffix}`
-    const mockJobId = `tts-job-${suffix}`
-
-    // 文案列表（ScriptSelectModal 查询 /scripts）
-    await page.route("**/api/v1/scripts**", (route) => {
-      const url = new URL(route.request().url())
-      if (url.pathname.includes("/extract-from-douyin")) {
-        route.continue()
-        return
-      }
-      route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({
-          items: [
-            {
-              id: mockScriptId,
-              title: "测试带货文案",
-              content: "这是一段测试用的带货文案内容，用于 E2E 冒烟测试。",
-              tags: ["带货"],
-              title_category: "daihuo",
-              created_at: new Date().toISOString(),
-              updated_at: new Date().toISOString(),
-            },
-          ],
-          total: 1,
-          page: 1,
-          page_size: 200,
-        }),
-      })
+    const register = await request.post(`${apiBase}/auth/register`, {
+      data: { email, username, password: PASSWORD, display_name: username },
     })
+    expect(register.status()).toBe(201)
 
-    // 预设音色（TtsVoiceModal 查询 GET /voices/presets）
-    await page.route("**/api/v1/voices/presets**", (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({
-          items: [
-            {
-              voice_id: mockVoiceId,
-              name: "晓晓（女声）",
-              description: "温柔女声",
-              gender: "female",
-              language: "zh-CN",
-              preview_url: null,
-              tags: ["温柔"],
-            },
-          ],
-          total: 1,
-        }),
-      }),
-    )
+    const login = await loginWithRetry(request, email, PASSWORD)
+    expect(login.status()).toBe(200)
+    const loginData = (await login.json()) as { access_token: string }
+    const headers = { Authorization: `Bearer ${loginData.access_token}` }
 
-    // 克隆音色：空列表
-    await page.route(
-      (url) => url.pathname.endsWith("/voice-clones"),
-      (route) =>
-        route.fulfill({
-          status: 200,
-          contentType: "application/json",
-          body: JSON.stringify({ items: [] }),
-        }),
-    )
-
-    // TTS 合成：直接返回 completed 任务
-    await page.route("**/api/v1/tts/synthesize", (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({ job_id: mockJobId, status: "queued" }),
-      }),
-    )
-    await page.route(`**/api/v1/tts/jobs/${mockJobId}/status`, (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({
-          job_id: mockJobId,
-          status: "completed",
-          progress: 100,
-          audio_url: "data:audio/mpeg;base64,",
-          duration: 5,
-        }),
-      }),
-    )
-    await page.route(`**/api/v1/tts/jobs/${mockJobId}/save-to-library`, (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({ id: `tts-asset-${suffix}`, name: "AI合成配音" }),
-      }),
-    )
-
-    await page.goto("/app/generate")
-    await expect(page.getByRole("heading", { name: "智能剪辑" })).toBeVisible({
-      timeout: 30000,
+    const project = await request.post(`${apiBase}/projects`, {
+      headers,
+      data: { name: `E2E API Proj ${suffix}` },
     })
+    expect(project.status()).toBe(200)
 
-    // ── Step 1：切到叙事剪辑 → 下一步 ────────────────────────────
-    await expect(page.getByText("选择模式", { exact: true })).toBeVisible()
-    await page.getByText("叙事剪辑").click()
-    await page.getByRole("button", { name: /下一步/ }).click()
-
-    // ── 文案选择弹窗：选第一条 → 确认 ─────────────────────────────
-    await expect(page.getByText("📝 选择文案")).toBeVisible({ timeout: 5000 })
-    await page.getByText("测试带货文案").first().click()
-    await page.getByRole("button", { name: "确认选择" }).click()
-    await expect(page.getByText("📝 选择文案")).not.toBeVisible()
-
-    // ── TTS 音色弹窗：选系统音色 → 合成 ─────────────────────────
-    await expect(page.getByText("🎙️ 合成配音")).toBeVisible({ timeout: 5000 })
-    await page.getByText("晓晓（女声）").first().click()
-    await page.getByRole("button", { name: "🎧 合成配音" }).click()
-    await expect(page.getByText("🎙️ 合成配音")).not.toBeVisible({ timeout: 30000 })
-
-    // ── Step 2：AI 匹配提示卡可见 + 选素材 ────────────────────────
-    await expect(page.getByText("选择素材", { exact: true })).toBeVisible({ timeout: 10000 })
-    await expect(page.getByText(/AI智能匹配/)).toBeVisible()
-    await page.getByTestId("material-card").first().click()
-    await page.getByRole("button", { name: /下一步/ }).click()
-
-    // ── 数量弹窗 ─────────────────────────────────────────────────
-    await expect(page.getByText("要生成几个视频？")).toBeVisible({ timeout: 5000 })
-    await page.getByRole("button", { name: "生成 1 个视频" }).click()
-
-    // ── Step 3：填写标题（handleScriptModalConfirm 已预填 script.title，但我们再覆盖一次） ─
-    await expect(page.getByText("选择标题", { exact: true })).toBeVisible({ timeout: 10000 })
-    const titleInput2 = page.getByPlaceholder("输入或从标题库选择")
-    await expect(titleInput2).toBeVisible({ timeout: 5000 })
-    await titleInput2.fill(`测试叙事剪辑 ${suffix}`)
-    await page.getByRole("button", { name: /下一步/ }).click()
-
-    // ── Step 4：确认生成 ──────────────────────────────────────────
-    await expect(page.getByText("📋 生成配置")).toBeVisible({ timeout: 10000 })
-    await expect(page.getByText("叙事剪辑")).toBeVisible()
-    const confirmBtn2 = page.getByRole("button", { name: /确认生成视频/ })
-    await expect(confirmBtn2).toBeEnabled({ timeout: 5000 })
-
-    const createTask2 = page.waitForResponse(
-      (r) => r.url().includes("/generation/tasks") && r.request().method() === "POST",
-      { timeout: 30000 },
-    )
-    await confirmBtn2.click()
-    const taskResp2 = await createTask2
-    expect(taskResp2.ok(), `Create task: ${await taskResp2.text()}`).toBeTruthy()
-    console.log("[narrative] Generation task created:", (await taskResp2.json()).id)
-    await expect(page.getByText(/正在生成|提交/)).toBeVisible({ timeout: 15000 })
-    console.log("[narrative] Wizard flow completed ✓")
+    // List generation tasks via task center API
+    const tasks = await request.get(`${apiBase}/tasks`, { headers })
+    expect(tasks.status()).toBe(200)
+    const tasksData = await tasks.json()
+    expect(Array.isArray(tasksData.items)).toBe(true)
   })
 })

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

@@ -1,105 +0,0 @@
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test"
-
-const PASSWORD = "SmokePass123!"
-const apiBase = process.env.E2E_API_BASE || "/api/v1"
-const apiOrigin = apiBase.endsWith("/api/v1") ? apiBase.slice(0, -"/api/v1".length) : ""
-
-async function routeBrowserApiToTestApi(page: Page) {
-  if (!apiOrigin) return
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url())
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    })
-    await route.fulfill({ response })
-  })
-}
-
-async function loginWithRetry(request: APIRequestContext, email: string, password: string) {
-  for (let i = 0; i <= 2; i++) {
-    const r = await request.post(`${apiBase}/auth/login`, { data: { email, password } })
-    if (r.status() !== 429) {
-      expect(r.ok(), `login: ${await r.text()}`).toBeTruthy()
-      return (await r.json()).access_token as string
-    }
-    console.log(`[nav] 429 retry ${i + 1}/2`)
-    await new Promise((res) => setTimeout(res, 65000))
-  }
-  throw new Error("Login retries exhausted")
-}
-
-/**
- * 核心页面导航冒烟：侧边栏主要入口能访问、文案库/配音库页面能正常加载（不出白屏/无致命 js error）
- */
-test.describe("Core Navigation", () => {
-  let authToken: string
-
-  test.beforeAll(async ({ request }) => {
-    const suffix = Math.random().toString(36).slice(2, 8)
-    const email = `e2e-nav-${suffix}@example.com`
-    await request.post(`${apiBase}/auth/register`, {
-      data: { email, password: PASSWORD, username: `e2e_nav_${suffix}` },
-    })
-    authToken = await loginWithRetry(request, email, PASSWORD)
-    const authHeader = { Authorization: `Bearer ${authToken}` }
-    const proj = await request.post(`${apiBase}/projects`, {
-      headers: authHeader,
-      data: { name: `Smoke Nav ${suffix}` },
-    })
-    if (proj.ok()) {
-      const projectId = (await proj.json()).id ?? (await proj.json()).project_id
-      await request.post(`${apiBase}/asset-libraries`, {
-        headers: authHeader,
-        data: { project_id: projectId, name: "Nav Lib", kind: "video" },
-      })
-    }
-  })
-
-  test.beforeEach(async ({ page }) => {
-    await page.setViewportSize({ width: 1440, height: 900 })
-    await page.addInitScript((t: string) => {
-      window.localStorage.setItem("access_token", t)
-      window.localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({ state: { token: t, user: null } }),
-      )
-    }, authToken)
-    await routeBrowserApiToTestApi(page)
-  })
-
-  const navCases = [
-    { path: "/app/dashboard", marker: /概览|工作台|最近/i, name: "概览" },
-    { path: "/app/generate", marker: /智能剪辑|剪辑/, name: "智能剪辑" },
-    { path: "/app/assets", marker: /视频库|素材/, name: "视频库" },
-    { path: "/app/scripts", marker: /文案/, name: "文案库" },
-    { path: "/app/voices", marker: /配音|我的音色|配音库/, name: "配音库" },
-    { path: "/app/products", marker: /成品|作品/, name: "成品库" },
-    { path: "/app/history", marker: /历史|任务/, name: "任务历史" },
-    { path: "/app/tasks", marker: /任务中心|任务列表/, name: "任务中心" },
-    { path: "/app/points", marker: /积分|我的积分/, name: "积分中心" },
-  ]
-
-  for (const c of navCases) {
-    test(`visit ${c.name} (${c.path}) loads without fatal pageerror`, async ({ page }) => {
-      const errors: Error[] = []
-      page.on("pageerror", (e) => errors.push(e))
-      await page.goto(c.path)
-      await expect(page.locator("body")).not.toBeEmpty({ timeout: 20000 })
-      // 过滤掉常见第三方/非致命错误
-      const fatal = errors.filter(
-        (e) =>
-          !/ResizeObserver|Loading chunk|network error|Failed to fetch|chunkLoadError/i.test(
-            e.message,
-          ),
-      )
-      expect(fatal, `${c.name} pageerrors: ${fatal.map((e) => e.message).join("; ")}`).toHaveLength(
-        0,
-      )
-      await expect(
-        page.getByText(c.marker).first(),
-        `${c.name} should show relevant text`,
-      ).toBeVisible({ timeout: 15000 })
-      console.log(`[nav] ${c.name} loaded ✓`)
-    })
-  }
-})

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

@@ -1,345 +1,477 @@
 /**
- * 积分系统 API 封装
- * 对齐后端 staging 实测最终契约（2026-09-16）
- *
- * 当前 POINTS_API_MOCK=true：使用 MOCK_* 常量 + setTimeout 模拟延迟，
- * 等后端 P0（支付通道接入、change-plan 校验）稳定后切 false 联调。
- *
- * 会员/订阅 API 在 @/api/subscription 中定义，避免重复封装。
+ * 积分 & 会员 API 封装（v2 两档会员制）
+ * 后端接口未就绪阶段使用 mock 数据；接口就绪后把 MOCK 开关关掉即可。
  */
 import apiClient from "../client"
 import type {
   PointsBalance,
-  PointsRulesResponse,
-  PointsPackagesResponse,
   PointsTransaction,
+  PointsTransactionsParams,
   PointsTransactionsResponse,
+  PointsPackagesResponse,
+  PointsRechargeRequest,
+  PointsOrder,
+  PointsRulesResponse,
   PointsCheckRequest,
   PointsCheckResponse,
-  CreateRechargeOrderRequest,
-  CreateRechargeOrderResponse,
-  DailyUsage,
-  MembershipResponse,
+  SubscriptionCurrent,
+  SubscribeRequest,
+  SubscriptionPlan,
 } from "./types"
 
-/** 模拟网络延迟（ms） */
-const MOCK_DELAY = 500
+/**
+ * 是否启用 mock 数据（后端 PR 合入前为 true；对接真实接口后改为 false）
+ */
+export const POINTS_API_MOCK = true
 
-/* ================================================================
- * Mock 数据
- * ================================================================ */
-
-/** mock 余额（无 free_clips_* 字段，已拆分到 dailyUsage） */
+// ==================== Mock 数据 ====================
 const MOCK_BALANCE: PointsBalance = {
-  balance: 258,
-  total_earned: 500,
-  total_spent: 242,
+  balance: 580,
+  total_earned: 1200,
+  total_spent: 620,
   is_member: false,
   member_type: null,
   member_expires_at: null,
+  free_clips_used: 1,
+  free_clips_limit: 2,
+  free_clips_remaining: 1,
+}
+
+const MOCK_PACKAGES: PointsPackagesResponse = {
+  packages: [
+    {
+      id: "starter_pack",
+      name: "体验包",
+      points: 100,
+      price: 990,
+      discounted_price_for_free: 990,
+      discounted_price_for_monthly: 891,
+      discounted_price_for_quarterly: 861,
+      discounted_price_for_yearly: 792,
+    },
+    {
+      id: "basic_pack",
+      name: "基础包",
+      points: 500,
+      price: 3900,
+      discounted_price_for_free: 3900,
+      discounted_price_for_monthly: 3510,
+      discounted_price_for_quarterly: 3393,
+      discounted_price_for_yearly: 3120,
+    },
+    {
+      id: "pro_pack",
+      name: "专业包",
+      points: 2000,
+      price: 12900,
+      discounted_price_for_free: 12900,
+      discounted_price_for_monthly: 11610,
+      discounted_price_for_quarterly: 11223,
+      discounted_price_for_yearly: 10320,
+    },
+  ],
+  user_member_type: "free",
+  unit_price_yuan: 0.1,
 }
 
 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_name: "AI 配音",
+      points_per_use: 1,
+      unit: "分钟",
+      description: "每生成 1 分钟配音",
     },
     {
       scene_key: "ai_video",
-      name: "AI 视频生成",
-      base_points: 8,
+      scene_name: "智能混剪",
+      points_per_use: 3,
       unit: "条",
-      description: "单条视频 8 积分起，按视频时长加收",
-      extra_per_30s: 3,
+      extra_per_30s: 1,
+      description: "每条 ≤30s 3 积分，每加 30s +1",
     },
     {
       scene_key: "ai_digital_human",
-      name: "AI 数字人",
-      base_points: 15,
-      unit: "次",
-      description: "数字人生成 15 积分起",
-      extra_per_30s: 5,
+      scene_name: "AI 数字人",
+      points_per_use: 15,
+      unit: "分钟",
+      description: "每生成 1 分钟口播",
     },
     {
       scene_key: "voice_clone_train",
-      name: "声音克隆训练",
-      base_points: 20,
+      scene_name: "声音克隆训练",
+      points_per_use: 0,
       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 积分",
+      description: "训练免费",
     },
+    { scene_key: "voice_clone_synth", scene_name: "声音克隆合成", points_per_use: 1, unit: "分钟" },
+    { scene_key: "douyin_extract", scene_name: "抖音链接提取", points_per_use: 1, unit: "次" },
+    { scene_key: "ai_rewrite", scene_name: "AI 改写文案", points_per_use: 1, unit: "次" },
+    { scene_key: "ai_title", scene_name: "AI 标题生成", points_per_use: 1, unit: "次" },
+    { scene_key: "ai_cover", scene_name: "AI 封面生成", points_per_use: 1, unit: "张" },
   ],
   free_user_multiplier: 1.15,
+  note: "免费用户消耗 = 会员消耗 × 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 },
+function genMockTransactions(): PointsTransactionsResponse {
+  const now = new Date()
+  const list = [
     {
-      code: "points_3000",
-      name: "3000 积分",
-      points: 3000,
-      price_cents: 19900,
-      unit_price: 0.0663,
+      src: "ai_voice",
+      name: "AI 配音",
+      type: "spend" as const,
+      amt: 1,
+      desc: "生成配音 1 分钟",
+      days: 0,
+      hours: 0,
+      mins: 30,
     },
-  ],
-  user_discount: null,
+    {
+      src: "ai_video",
+      name: "智能混剪",
+      type: "spend" as const,
+      amt: 5,
+      desc: "生成 1 分钟视频（基础3+30s*2）",
+      days: 0,
+      hours: 1,
+      mins: 15,
+    },
+    {
+      src: "task_reward",
+      name: "任务奖励",
+      type: "earn" as const,
+      amt: 20,
+      desc: "首次生成视频奖励",
+      days: 1,
+      hours: 0,
+      mins: 0,
+    },
+    {
+      src: "recharge",
+      name: "充值",
+      type: "earn" as const,
+      amt: 500,
+      desc: "基础包充值",
+      days: 15,
+      hours: 0,
+      mins: 0,
+    },
+    {
+      src: "ai_rewrite",
+      name: "AI 改写文案",
+      type: "spend" as const,
+      amt: 2,
+      desc: "免费用户价（1×1.15 向上取整）",
+      days: 16,
+      hours: 2,
+      mins: 10,
+    },
+    {
+      src: "ai_title",
+      name: "AI 标题生成",
+      type: "spend" as const,
+      amt: 2,
+      desc: "免费用户价",
+      days: 16,
+      hours: 3,
+      mins: 0,
+    },
+    {
+      src: "douyin_extract",
+      name: "抖音链接提取",
+      type: "spend" as const,
+      amt: 2,
+      desc: "提取 3 分钟文案",
+      days: 18,
+      hours: 0,
+      mins: 0,
+    },
+    {
+      src: "ai_digital_human",
+      name: "AI 数字人",
+      type: "spend" as const,
+      amt: 18,
+      desc: "数字人口播 1 分钟（免费用户价）",
+      days: 20,
+      hours: 0,
+      mins: 0,
+    },
+    {
+      src: "task_reward",
+      name: "任务奖励",
+      type: "earn" as const,
+      amt: 50,
+      desc: "注册赠送",
+      days: 30,
+      hours: 0,
+      mins: 0,
+    },
+  ]
+  let bal = MOCK_BALANCE.balance
+  const items = list
+    .map((t, i) => {
+      const signed = t.type === "earn" ? t.amt : -t.amt
+      const balance_after = bal // 按时间倒序：earliest 先算
+      // adjust running bal
+      bal = t.type === "earn" ? bal - t.amt : bal + t.amt
+      const d = new Date(now)
+      d.setDate(d.getDate() - t.days)
+      d.setHours(d.getHours() - t.hours)
+      d.setMinutes(d.getMinutes() - t.mins)
+      return {
+        id: `tx_${i + 1}`,
+        type: t.type,
+        source: t.src as PointsBalance extends never ? never : string,
+        source_name: t.name,
+        amount: t.amt,
+        signed_amount: signed,
+        balance_after,
+        description: t.desc,
+        ref_id: null,
+        created_at: d.toISOString(),
+      }
+    })
+    .reverse()
+  // Rebuild balance_after going forward
+  let running = 50 + 0 // after registration gift
+  for (let i = items.length - 1; i >= 0; i--) {
+    const it = items[i] as PointsTransaction & { balance_after?: number }
+    if (it.source === "task_reward" && it.description.includes("注册")) running = 50
+  }
+  running = 50
+  const fwd = [...items].reverse() as Array<PointsTransaction & { balance_after?: number }>
+  for (const it of fwd) {
+    running += it.signed_amount
+    it.balance_after = running
+  }
+  return { items: fwd, total: fwd.length, page: 1, page_size: 20 } as PointsTransactionsResponse
 }
 
-const MOCK_TRANSACTIONS: PointsTransaction[] = [
+// ==================== 真实 API ====================
+
+/** 查询积分余额 + 会员状态 */
+export async function getPointsBalance(): Promise<PointsBalance> {
+  if (POINTS_API_MOCK) {
+    return new Promise((r) => setTimeout(() => r({ ...MOCK_BALANCE }), 180))
+  }
+  const res = await apiClient.get("/points/balance")
+  return res.data
+}
+
+/** 查询积分流水（分页） */
+export async function getPointsTransactions(
+  params: PointsTransactionsParams = {},
+): Promise<PointsTransactionsResponse> {
+  if (POINTS_API_MOCK) {
+    return new Promise((r) => setTimeout(() => r(genMockTransactions()), 200))
+  }
+  const res = await apiClient.get("/points/transactions", { params })
+  return res.data
+}
+
+/** 查询积分包列表 */
+export async function getPointsPackages(): Promise<PointsPackagesResponse> {
+  if (POINTS_API_MOCK) {
+    return new Promise((r) => setTimeout(() => r({ ...MOCK_PACKAGES }), 150))
+  }
+  const res = await apiClient.get("/points/packages")
+  return res.data
+}
+
+/** 创建积分充值订单（mock 阶段返回 "pending" 订单，前端弹"支付开发中"） */
+export async function createPointsOrder(req: PointsRechargeRequest): Promise<PointsOrder> {
+  if (POINTS_API_MOCK) {
+    const pkg = MOCK_PACKAGES.packages.find((p) => p.id === req.package_id)
+    const mt = MOCK_PACKAGES.user_member_type
+    type DiscountKey =
+      | "discounted_price_for_free"
+      | "discounted_price_for_monthly"
+      | "discounted_price_for_quarterly"
+      | "discounted_price_for_yearly"
+    const discountKey = `discounted_price_for_${mt}` as DiscountKey
+    const price = pkg?.[discountKey] ?? pkg?.price ?? 0
+    return new Promise((r) =>
+      setTimeout(
+        () =>
+          r({
+            id: `mock_order_${Date.now()}`,
+            package_id: req.package_id,
+            package_name: pkg?.name ?? "",
+            points_amount: pkg?.points ?? 0,
+            price_cents: price,
+            original_price_cents: pkg?.price ?? 0,
+            discount: price / (pkg?.price || 1),
+            currency: "CNY",
+            status: "pending",
+            payment_method: null,
+            payment_id: null,
+            paid_at: null,
+            expire_at: null,
+            created_at: new Date().toISOString(),
+          }),
+        300,
+      ),
+    )
+  }
+  const res = await apiClient.post("/points/recharge", req)
+  return res.data
+}
+
+/** 查询积分消耗规则 */
+export async function getPointsRules(): Promise<PointsRulesResponse> {
+  if (POINTS_API_MOCK) {
+    return new Promise((r) => setTimeout(() => r({ ...MOCK_RULES }), 120))
+  }
+  const res = await apiClient.get("/points/rules")
+  return res.data
+}
+
+/** 消费前余额预检查 */
+export async function checkPoints(req: PointsCheckRequest): Promise<PointsCheckResponse> {
+  if (POINTS_API_MOCK) {
+    const rule = MOCK_RULES.rules.find((r) => r.scene_key === req.scene_key)
+    if (!rule) {
+      return {
+        allowed: false,
+        required_points: 0,
+        current_balance: MOCK_BALANCE.balance,
+        remaining_after: MOCK_BALANCE.balance,
+        is_free_quota: false,
+        code: "SCENE_NOT_FOUND",
+        message: "未知场景",
+        recharge_url: "/app/points",
+      }
+    }
+    const units = req.units ?? 1
+    let base = rule.points_per_use * units
+    if (rule.extra_per_30s && units > 1) {
+      // ai_video extra_per_30s: base already covers first 30s, subtract
+      base = rule.points_per_use + rule.extra_per_30s * (units - 1)
+    }
+    const isFree =
+      MOCK_BALANCE.is_member === false &&
+      req.scene_key === "ai_video" &&
+      (MOCK_BALANCE.free_clips_remaining ?? 0) > 0
+    const needed = isFree
+      ? 0
+      : MOCK_BALANCE.is_member
+        ? base
+        : Math.ceil(base * MOCK_RULES.free_user_multiplier)
+    const allowed = isFree || MOCK_BALANCE.balance >= needed
+    return {
+      allowed,
+      required_points: needed,
+      current_balance: MOCK_BALANCE.balance,
+      remaining_after: MOCK_BALANCE.balance - needed,
+      is_free_quota: isFree,
+      code: allowed ? undefined : "INSUFFICIENT_POINTS",
+      message: allowed
+        ? undefined
+        : `积分不足，需要 ${needed} 积分，当前余额 ${MOCK_BALANCE.balance}`,
+      recharge_url: "/app/points",
+    }
+  }
+  const res = await apiClient.post("/points/check", req)
+  return res.data
+}
+
+// ==================== 订阅相关 ====================
+
+/** 订阅套餐（定价常量，前端硬编码；折扣由后端会员类型决定） */
+export const SUBSCRIPTION_PLANS: SubscriptionPlan[] = [
   {
-    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: "monthly",
+    name: "月卡",
+    price_cents: 1990,
+    price_yuan: 19.9,
+    per_month_yuan: 19.9,
+    billing_label: "/月",
   },
   {
-    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: "quarterly",
+    name: "季卡",
+    price_cents: 3990,
+    price_yuan: 39.9,
+    per_month_yuan: 13.3,
+    savings_percent: 33,
+    recommended: true,
+    billing_label: "/季",
   },
   {
-    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",
+    id: "yearly",
+    name: "年卡",
+    price_cents: 15900,
+    price_yuan: 159,
+    per_month_yuan: 13.25,
+    savings_percent: 33,
+    billing_label: "/年",
   },
 ]
 
-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 }
+/** 查询当前订阅 */
+export async function getCurrentSubscription(): Promise<SubscriptionCurrent> {
+  if (POINTS_API_MOCK) {
+    return new Promise((r) =>
+      setTimeout(
+        () =>
+          r({
+            is_member: MOCK_BALANCE.is_member,
+            member_type: MOCK_BALANCE.member_type,
+            member_type_name: MOCK_BALANCE.is_member ? "付费会员" : "免费会员",
+            status: MOCK_BALANCE.is_member ? "active" : "none",
+            current_period_start: null,
+            current_period_end: MOCK_BALANCE.member_expires_at,
+            auto_renew: false,
+            points_discount: MOCK_BALANCE.is_member ? 0.9 : 1.0,
+          }),
+        150,
+      ),
+    )
   }
-  const { data } = await apiClient.get(`/points/balance`)
-  return data
+  const res = await apiClient.get("/subscription/current")
+  return res.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 }
+/** 开通/续费会员 */
+export async function subscribe(req: SubscribeRequest): Promise<PointsOrder> {
+  if (POINTS_API_MOCK) {
+    const plan = SUBSCRIPTION_PLANS.find((p) => p.id === req.member_type)!
+    return new Promise((r) =>
+      setTimeout(
+        () =>
+          r({
+            id: `mock_sub_${Date.now()}`,
+            package_id: plan.id,
+            package_name: plan.name,
+            points_amount: 0,
+            price_cents: plan.price_cents,
+            original_price_cents: plan.price_cents,
+            discount: 1,
+            currency: "CNY",
+            status: "pending",
+            payment_method: null,
+            payment_id: null,
+            paid_at: null,
+            expire_at: null,
+            created_at: new Date().toISOString(),
+          }),
+        300,
+      ),
+    )
   }
-  const { data } = await apiClient.get(`/points/rules`)
-  return data
+  const res = await apiClient.post("/subscription/subscribe", req)
+  return res.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 }
+/** 取消自动续费 */
+export async function cancelAutoRenew(): Promise<{ success: boolean; message: string }> {
+  if (POINTS_API_MOCK) {
+    return new Promise((r) =>
+      setTimeout(() => r({ success: true, message: "已取消自动续费" }), 200),
+    )
   }
-  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
+  const res = await apiClient.post("/subscription/cancel")
+  return res.data
 }

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

@@ -1,134 +1,76 @@
 /**
- * 积分系统类型定义
- * 对齐后端 staging 实测最终契约（2026-09-16）
- *
- * Base path: /api/v1/
- * 会员/订阅相关类型请从 @/api/subscription/types 引入，本文件仅保留积分核心类型。
+ * 积分 & 会员系统 API 类型定义（v2 两档会员制）
+ * 接口契约对齐后端设计文档 membership-points-design-v2.md
  */
 
-/* ================================================================
- * 场景键
- * ================================================================ */
-/**
- * 积分消耗场景键（9 个）
- * - ai_script 已拆分为 douyin_extract / ai_rewrite / ai_title，前端禁止再传 ai_script
- */
+/** 会员类型 */
+export type MemberType = "free" | "monthly" | "quarterly" | "yearly"
+
+/** 积分流水类型 */
+export type PointsTxType = "earn" | "spend" | "refund"
+
+/** 积分来源/消耗场景 */
 export type PointsSource =
+  | "recharge" // 充值
+  | "task_reward" // 任务奖励
   | "ai_voice" // AI 配音
-  | "ai_video" // AI 视频生成
   | "ai_digital_human" // AI 数字人
+  | "ai_video" // 智能混剪
   | "voice_clone_train" // 声音克隆训练
   | "voice_clone_synth" // 声音克隆合成
-  | "douyin_extract" // 抖音提取文案
-  | "ai_rewrite" // AI 文案改写
+  | "douyin_extract" // 抖音链接提取
+  | "ai_rewrite" // AI 改写文案
   | "ai_title" // AI 标题生成
   | "ai_cover" // AI 封面生成
+  | "subscription_bonus" // 会员赠送
+  | "admin_adjust" // 管理员调整
+  | "refund" // 失败退还
 
-/** 非消耗场景 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
-  /** 是否为付费会员 */
+  /** 是否付费会员（free 用户为 false） */
   is_member: boolean
-  /** 会员类型（monthly/quarterly/yearly，非会员 null）。推荐使用 /subscription/current 的 plan_id+billing_cycle 做判断 */
-  member_type: "monthly" | "quarterly" | "yearly" | null
-  /** 会员到期时间 */
-  member_expires_at: ISODate | null
+  /** 会员类型：monthly / quarterly / yearly；free 用户为 null */
+  member_type: Extract<MemberType, "monthly" | "quarterly" | "yearly"> | null
+  /** 会员到期时间 ISO 字符串 */
+  member_expires_at: string | null
+  /** 今日免费混剪已用次数 */
+  free_clips_used?: number
+  /** 今日免费混剪额度上限 */
+  free_clips_limit?: number
+  /** 今日免费混剪剩余 */
+  free_clips_remaining?: number
 }
 
-/* ================================================================
- * 积分规则（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=消耗 */
+  id: string
+  /** earn / spend / refund */
   type: PointsTxType
-  /**
-   * 消耗/获得来源：
-   * - 消耗场景直接用 PointsSource 值
-   * - 充值/退款/赠送使用 recharge / refund:<source> / sign_up / bind_phone / gift / admin
-   */
-  source: string
-  /** 变动数量（绝对值，正负由 type 决定） */
+  /** 来源场景 */
+  source: PointsSource
+  /** 场景中文名称 */
+  source_name: string
+  /** 变动数量（正数） */
   amount: number
+  /** 带符号的变动数（收入+，支出-） */
+  signed_amount: number
   /** 变动后余额 */
   balance_after: number
-  /** 中文描述 */
+  /** 备注描述 */
   description: string
-  /** 关联订单/任务 ID，空字符串 "" 表示无关联（不是 null） */
-  ref_id: string
-  created_at: ISODate
+  /** 关联业务 ID */
+  ref_id: string | null
+  created_at: string
 }
 
+/** 积分流水分页响应 */
 export interface PointsTransactionsResponse {
   items: PointsTransaction[]
   total: number
@@ -136,92 +78,140 @@ export interface PointsTransactionsResponse {
   page_size: number
 }
 
-/* ================================================================
- * 创建充值订单（POST /points/recharge）
- * ================================================================ */
-export interface CreateRechargeOrderRequest {
-  /** 充值包 code（字段名保留 package_id 与后端一致） */
+/** 积分流水查询参数 */
+export interface PointsTransactionsParams {
+  page?: number
+  page_size?: number
+  type?: PointsTxType
+  source?: PointsSource
+  start_date?: string
+  end_date?: string
+}
+
+/** 积分包 */
+export interface PointsPackage {
+  id: "starter_pack" | "basic_pack" | "pro_pack" | string
+  /** 中文名称 */
+  name: string
+  /** 积分数量 */
+  points: number
+  /** 原价（分） */
+  price: number
+  /** 各会员类型折扣价（分） */
+  discounted_price_for_free: number
+  discounted_price_for_monthly: number
+  discounted_price_for_quarterly: number
+  discounted_price_for_yearly: number
+}
+
+/** 积分包列表响应 */
+export interface PointsPackagesResponse {
+  packages: PointsPackage[]
+  /** 当前用户会员类型，用于前端计算折后价 */
+  user_member_type: MemberType
+  /** 积分单价（元/积分，按会员价计） */
+  unit_price_yuan: number
+}
+
+/** 创建充值订单请求 */
+export interface PointsRechargeRequest {
   package_id: string
+  payment_method?: "wechat_pay" | "alipay"
 }
 
-export interface CreateRechargeOrderResponse {
+/** 订单状态 */
+export type OrderStatus = "pending" | "paid" | "failed" | "refunded" | "expired"
+
+/** 充值订单响应 */
+export interface PointsOrder {
   id: string
-  order_type: string
-  product_code: string
-  /** 订单金额（分） */
-  amount_cents: number
-  /** 充值积分数量 */
+  package_id: string
+  package_name: string
   points_amount: number
-  status: string
-  /**
-   * 支付参数（支付通道未接入时返回空对象 {}，前端可透传）
-   */
-  pay_params: Record<string, unknown>
-  /** 订单过期时间 */
-  expire_at: ISODate
-  created_at: ISODate
+  price_cents: number
+  original_price_cents: number
+  discount: number
+  currency: "CNY"
+  status: OrderStatus
+  payment_method: string | null
+  payment_id: string | null
+  paid_at: string | null
+  expire_at: string | null
+  created_at: string
+  /** 微信/支付宝支付参数（mock 阶段前端自行处理） */
+  pay_params?: Record<string, string>
 }
 
-/* ================================================================
- * 积分预检查（POST /points/check）
- * ================================================================ */
+/** 订阅套餐（月/季/年） */
+export interface SubscriptionPlan {
+  id: "monthly" | "quarterly" | "yearly"
+  name: string
+  price_cents: number
+  price_yuan: number
+  per_month_yuan: number
+  savings_percent?: number
+  recommended?: boolean
+  billing_label: string
+}
+
+/** 当前订阅详情 */
+export interface SubscriptionCurrent {
+  is_member: boolean
+  member_type: Extract<MemberType, "monthly" | "quarterly" | "yearly"> | null
+  member_type_name: string
+  status: "active" | "expired" | "cancelled" | "none"
+  current_period_start: string | null
+  current_period_end: string | null
+  auto_renew: boolean
+  /** 订阅会员对应的积分折扣 */
+  points_discount: number
+}
+
+/** 开通/续费订阅请求 */
+export interface SubscribeRequest {
+  member_type: "monthly" | "quarterly" | "yearly"
+  payment_method?: "wechat_pay" | "alipay"
+}
+
+/** 积分消耗规则 */
+export interface PointsRule {
+  scene_key: PointsSource
+  scene_name: string
+  /** 每次消耗基础积分（会员价） */
+  points_per_use: number
+  /** 计量单位：条/分钟/次/张 */
+  unit: string
+  /** 额外每 30s 加积分（ai_video 用） */
+  extra_per_30s?: number
+  /** 说明文案 */
+  description?: string
+}
+
+export interface PointsRulesResponse {
+  rules: PointsRule[]
+  /** 免费用户消耗倍率 */
+  free_user_multiplier: number
+  note: string
+}
+
+/** 消费前余额检查请求 */
 export interface PointsCheckRequest {
   scene_key: PointsSource
-  /** 数量（units 改名） */
-  quantity: number
-  /** 预计时长（分钟），可选 */
-  duration_minutes?: number
+  /** 单位数量（时长/条数），默认 1 */
+  units?: 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[]
-  }
+  /** 拒绝原因代码 */
+  code?: "INSUFFICIENT_POINTS" | "FREE_QUOTA_EXCEEDED" | "SCENE_NOT_FOUND"
+  message?: string
+  /** 充值页跳转 URL */
+  recharge_url?: string
 }

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

@@ -11,12 +11,8 @@ import type {
   ScriptCategory,
 } from "./types"
 
-/**
- * 是否启用 mock。
- * #1894：文案库接口已上线，默认 false 走真实 API；
- * 通过 SCRIPTS_API_MOCK=true 环境变量可本地开启 mock 调试（行为同 POINTS_API_MOCK）。
- */
-export const SCRIPTS_API_MOCK = (process.env.SCRIPTS_API_MOCK as string | undefined) === "true"
+/** 是否启用 mock（后端合入后改为 false） */
+export const SCRIPTS_API_MOCK = true
 
 // ==================== Mock 数据 ====================
 

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/tasks/types.ts

@@ -71,16 +71,6 @@ export interface CreateGenerationTaskRequest {
   duration?: number
   /** 视频宽高比，如 "9:16" */
   video_ratio?: string
-  /** #1970：剪辑模式 random/narrative */
-  assembly_mode?: "random" | "narrative"
-  /** #1970：叙事模式下的文案 ID */
-  script_id?: string
-  /** #1970：TTS 音色 ID */
-  tts_voice_id?: string
-  /** #1970：TTS 音色来源 preset/clone */
-  tts_voice_source?: "preset" | "clone"
-  /** #1970：智能降重开关（默认 true） */
-  dedup_enabled?: boolean
   /** 标题烧录配置 */
   title_config?: {
     text?: string

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

@@ -0,0 +1,19 @@
+/**
+ * 标题相关 API — 目录化入口
+ * 保持与原 titles.ts 相同导出，向后兼容
+ */
+
+// 类型
+export type {
+  TitleItem,
+  BackendTitleResponse,
+  BackendCreateTitleRequest,
+  BackendUpdateTitleRequest,
+  CreateTitleRequest,
+} from "./types"
+
+// 工具函数
+export { toTitleItem } from "./utils"
+
+// API 函数
+export { getTitles, createTitle, updateTitle, deleteTitle, batchImportTitles } from "./titles"

apps/web/src/api/titles/titles.ts

@@ -0,0 +1,65 @@
+/**
+ * 标题相关 API 函数
+ * Phase 1 新增：全局标题库
+ * 注意：后端 schema 使用 name + text 字段，前端 UI 用 content 展示
+ */
+import apiClient from "../client"
+import type {
+  BackendCreateTitleRequest,
+  BackendTitleResponse,
+  BackendUpdateTitleRequest,
+  CreateTitleRequest,
+  TitleItem,
+} from "./types"
+import { toTitleItem } from "./utils"
+
+/** 获取当前用户的所有标题 */
+export const getTitles = async (): Promise<TitleItem[]> => {
+  const response = await apiClient.get<{ items: BackendTitleResponse[] } | BackendTitleResponse[]>(
+    "/titles",
+  )
+  // 兼容两种后端返回格式：{ items: [...] } 或直接 [...]
+  const items = Array.isArray(response.data) ? response.data : response.data.items || []
+  return items.map(toTitleItem)
+}
+
+/** 创建标题 */
+export const createTitle = async (data: CreateTitleRequest): Promise<TitleItem> => {
+  // 后端要求 name（≤255）和 text（≤500），name 从 content 截取
+  const payload: BackendCreateTitleRequest = {
+    name: data.content.slice(0, 255),
+    text: data.content.slice(0, 500),
+    category: data.category || "default",
+  }
+  const response = await apiClient.post<BackendTitleResponse>("/titles", payload)
+  return toTitleItem(response.data)
+}
+
+/** 更新标题 */
+export const updateTitle = async (
+  titleId: string,
+  data: Partial<CreateTitleRequest>,
+): Promise<TitleItem> => {
+  const payload: BackendUpdateTitleRequest = {}
+  if (data.content !== undefined) {
+    payload.name = data.content.slice(0, 255)
+    payload.text = data.content.slice(0, 500)
+  }
+  if (data.category !== undefined) {
+    payload.category = data.category
+  }
+  // 后端用 PUT，非 PATCH
+  const response = await apiClient.put<BackendTitleResponse>(`/titles/${titleId}`, payload)
+  return toTitleItem(response.data)
+}
+
+/** 删除标题 */
+export const deleteTitle = async (titleId: string): Promise<void> => {
+  await apiClient.delete(`/titles/${titleId}`)
+}
+
+/** 批量导入标题 */
+export const batchImportTitles = async (titles: string[]): Promise<{ imported_count: number }> => {
+  const response = await apiClient.post("/titles/batch-import", { titles })
+  return response.data
+}

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

@@ -0,0 +1,54 @@
+/**
+ * 标题相关类型定义
+ */
+
+/** 标题条目（前端展示用） */
+export interface TitleItem {
+  id: string
+  content: string
+  category?: string
+  source?: string
+  word_count?: number
+  is_favorite?: boolean
+  created_at?: string
+  updated_at?: string
+}
+
+/** 后端标题响应格式 */
+export interface BackendTitleResponse {
+  id: string
+  user_id: string
+  name: string
+  text: string
+  category: string
+  description: string
+  tags: string[]
+  usage_count: number
+  is_active: boolean
+  created_at: string
+  updated_at: string
+}
+
+/** 后端创建标题请求格式 */
+export interface BackendCreateTitleRequest {
+  name: string
+  text: string
+  category: string
+  description?: string
+  tags?: string[]
+}
+
+/** 后端更新标题请求格式 */
+export interface BackendUpdateTitleRequest {
+  name?: string
+  text?: string
+  category?: string
+  description?: string
+  tags?: string[]
+}
+
+/** 创建标题请求（前端接口，保持向后兼容） */
+export interface CreateTitleRequest {
+  content: string
+  category?: string
+}

apps/web/src/api/titles/utils.ts

@@ -0,0 +1,14 @@
+/**
+ * 标题数据转换工具函数
+ */
+import type { BackendTitleResponse, TitleItem } from "./types"
+
+/** 将后端响应映射为前端 TitleItem */
+export const toTitleItem = (item: BackendTitleResponse): TitleItem => ({
+  id: item.id,
+  content: item.text,
+  category: item.category,
+  word_count: item.text?.length || 0,
+  created_at: item.created_at,
+  updated_at: item.updated_at,
+})

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

@@ -1,11 +1,7 @@
 /**
- * Header 右上角积分徽章
+ * Header 右上角的积分徽章（💎 580）
  * - 余额 <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"
@@ -21,32 +17,27 @@ 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()
+  const { balance, init, loading } = usePointsStore()
 
   useEffect(() => {
     if (!balance) init()
   }, [balance, init])
 
-  // 余额：优先用 membership.points_balance（冗余字段），降级 balance.balance
-  const bal = membership?.points_balance ?? balance?.balance ?? 0
+  const bal = 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 isMember = !!balance?.is_member
+  const memberLabel = isMember
+    ? balance?.member_type === "yearly"
+      ? "年卡会员"
+      : balance?.member_type === "quarterly"
+        ? "季卡会员"
+        : balance?.member_type === "monthly"
+          ? "月卡会员"
+          : "付费会员"
+    : "免费会员"
 
   const popContent = (
     <div className="xx-points-popover">
@@ -67,16 +58,9 @@ const PointsBadge: React.FC = () => {
         </Paragraph>
       )}
 
-      {!isMember && dailyUsage && freeRemain > 0 && (
-        <Text type="secondary" className="xx-points-expire">
-          今日剩余免费次数：{freeRemain}/{dailyUsage.free_clips_limit}
-        </Text>
-      )}
-
-      {balance?.member_expires_at && isMember && (
+      {balance?.member_expires_at && (
         <Text type="secondary" className="xx-points-expire">
           会员到期：{new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}
-          {maxRes ? ` · ${maxRes}` : ""}
         </Text>
       )}
 
@@ -96,16 +80,16 @@ const PointsBadge: React.FC = () => {
           type="primary"
           icon={<ThunderboltOutlined />}
           block
-          onClick={() => navigate("/points/recharge")}
+          onClick={() => navigate("/app/points")}
         >
           充值积分
         </Button>
-        <Button block onClick={() => navigate("/points/transactions")}>
+        <Button block onClick={() => navigate("/app/points/transactions")}>
           积分明细
           <RightOutlined />
         </Button>
         {!isMember && (
-          <Button block type="link" onClick={() => navigate("/subscription")}>
+          <Button block type="link" onClick={() => navigate("/app/subscription")}>
             <CrownOutlined /> 升级会员享折扣
           </Button>
         )}

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

@@ -1,40 +1,31 @@
 /**
  * 功能操作按钮旁的"消耗积分"提示
  * 例：[生成配音] 💎 -1 积分
- *  - 根据 scene_key 自动读取规则（来自 store.rules）
- *  - 免费用户自动计算 ×free_user_multiplier 向上取整
- *  - 会员 floor(base × points_discount)
+ *  - 根据 scene_key 自动读取规则
+ *  - 免费用户自动计算 ×1.15 向上取整
  *  - 余额不足时显示红色告警 + 充值提示
  *
- * 字段对齐新契约：
- *  - rule.points_per_use → base_points
- *  - balance.free_clips_remaining → dailyUsage.free_clips_remaining
- *  - props.units → 保留兼容，新代码优先用 quantity
+ * 使用：<PointsCost scene="ai_voice" units={1} />
  */
-import React, { useMemo } from "react"
+import React, { useEffect, useMemo, useState } 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 { getPointsRules } from "@/api/points"
 import "./PointsCost.css"
 
 interface Props {
   /** 消耗场景 key */
   scene: PointsSource
-  /** 数量（新字段），默认 1 */
-  quantity?: number
-  /** 预计时长（分钟），可选 */
-  durationMinutes?: number
+  /** 单位数（分钟数/条数/张数），默认 1 */
+  units?: number
   /** 是否显示为紧凑模式（仅图标+数字，不显示单位文字） */
   compact?: boolean
   /** 余额不足时，是否显示充值提示 */
   showRechargeHint?: boolean
   /** 自定义 class */
   className?: string
-  /**
-   * @deprecated 旧字段保留兼容，内部映射为 quantity
-   */
-  units?: number
 }
 
 /** 单位中文 */
@@ -47,26 +38,31 @@ const UNIT_LABEL: Record<string, string> = {
 
 const PointsCost: React.FC<Props> = ({
   scene,
-  quantity,
-  units,
-  durationMinutes,
+  units = 1,
   compact = false,
   showRechargeHint = true,
   className = "",
 }) => {
-  const { balance, dailyUsage, rules, membership } = usePointsStore()
-  const qty = quantity ?? units ?? 1
+  const { balance, init } = usePointsStore()
+  const [rules, setRules] = useState<Awaited<ReturnType<typeof getPointsRules>> | null>(null)
 
-  const { cost, isFreeQuota, rule, isFreeUser, insufficient, freeRemain } = useMemo(() => {
-    const isMem = membership?.is_member ?? balance?.is_member ?? false
+  useEffect(() => {
+    if (!balance) init()
+    if (!rules) {
+      getPointsRules()
+        .then(setRules)
+        .catch(() => {})
+    }
+  }, [balance, init, rules])
+
+  const { cost, isFreeQuota, rule, isFreeUser, insufficient } = useMemo(() => {
     if (!rules || !balance) {
       return {
         cost: 0,
         isFreeQuota: false,
         rule: null,
-        isFreeUser: !isMem,
+        isFreeUser: !balance?.is_member,
         insufficient: false,
-        freeRemain: 0,
       }
     }
     const rule = rules.rules.find((r) => r.scene_key === scene)
@@ -75,54 +71,49 @@ const PointsCost: React.FC<Props> = ({
         cost: 0,
         isFreeQuota: false,
         rule: null,
-        isFreeUser: !isMem,
+        isFreeUser: !balance.is_member,
         insufficient: false,
-        freeRemain: 0,
       }
     // 免费训练不扣费
-    if (rule.base_points === 0) {
+    if (rule.points_per_use === 0) {
       return {
         cost: 0,
         isFreeQuota: false,
         rule,
-        isFreeUser: !isMem,
+        isFreeUser: !balance.is_member,
         insufficient: false,
-        freeRemain: 0,
       }
     }
 
-    // 计算 base
+    // 智能混剪：首条30s=3分，每+30s +1
     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)
+      // units 当作"30s 段数"更简单；按分钟算：minutes 个 30s 段 - 1
+      const segments = Math.max(1, Math.ceil(units * 2)) // 1min = 2 segments
+      baseCost = rule.points_per_use + rule.extra_per_30s * (segments - 1)
     } else {
-      baseCost = rule.base_points * Math.max(1, qty)
+      baseCost = rule.points_per_use * Math.max(1, units)
     }
 
-    // 非会员 + 今日免费额度 → 免费
-    const freeRemain = dailyUsage?.free_clips_remaining ?? 0
-    const isFree = scene === "ai_video" && !isMem && freeRemain > 0
+    // 混剪 + 免费用户 + 今日有免费额度 → 免费
+    const isFree =
+      scene === "ai_video" && !balance.is_member && (balance.free_clips_remaining ?? 0) > 0
 
-    const multiplier = rules.free_user_multiplier ?? 1.15
-    const cost = isFree ? 0 : isMem ? Math.floor(baseCost) : Math.ceil(baseCost * multiplier)
+    const isFreeUser = !balance.is_member
+    const cost = isFree
+      ? 0
+      : isFreeUser
+        ? Math.ceil(baseCost * rules.free_user_multiplier)
+        : baseCost
     const insufficient = !isFree && balance.balance < cost
-    return {
-      cost,
-      isFreeQuota: isFree,
-      rule,
-      isFreeUser: !isMem,
-      insufficient,
-      freeRemain,
-    }
-  }, [rules, balance, dailyUsage, membership, scene, qty, durationMinutes])
+    return { cost, isFreeQuota: isFree, rule, isFreeUser, insufficient }
+  }, [rules, balance, scene, units])
 
   if (!rule || !balance) {
     return <span className={`xx-points-cost ${className}`} />
   }
 
-  if (rule.base_points === 0) {
+  if (rule.points_per_use === 0) {
     return (
       <span className={`xx-points-cost free ${className}`}>
         <span className="xx-points-tag-free">免费</span>
@@ -132,10 +123,12 @@ const PointsCost: React.FC<Props> = ({
 
   if (isFreeQuota) {
     return (
-      <Tooltip title={`今日免费额度剩余 ${freeRemain} 条，不扣积分`}>
+      <Tooltip title={`今日免费额度剩余 ${balance.free_clips_remaining} 条，不扣积分`}>
         <span className={`xx-points-cost free-quota ${className}`}>
           <span className="xx-points-tag-free">免费</span>
-          {!compact && <span className="xx-points-desc">（今日剩余 {freeRemain} 条）</span>}
+          {!compact && (
+            <span className="xx-points-desc">（今日剩余 {balance.free_clips_remaining} 条）</span>
+          )}
         </span>
       </Tooltip>
     )
@@ -143,7 +136,7 @@ const PointsCost: React.FC<Props> = ({
 
   const unitLabel = compact
     ? ""
-    : `/${qty > 1 ? `${qty}${UNIT_LABEL[rule.unit] ?? rule.unit}` : rule.unit}`
+    : ` /${units > 1 ? `${units}${UNIT_LABEL[rule.unit] ?? rule.unit}` : rule.unit}`
 
   return (
     <span

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,6 +6,7 @@ import React from "react"
 import {
   DashboardOutlined,
   FileOutlined,
+  FileTextOutlined,
   AudioOutlined,
   EditOutlined,
   VideoCameraOutlined,
@@ -50,6 +51,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: "文案库",
@@ -153,6 +160,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: "文案库",

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

@@ -619,7 +619,6 @@ const AiAvatarPage: React.FC = () => {
                   scriptText={state.scriptText}
                   onScriptTextChange={state.setScriptText}
                   onOpenScriptModal={() => state.setShowScriptModal(true)}
-                  onScriptCreated={(s) => state.selectScript(s as import("./types").Script)}
                 />
                 <div className="aa-step-btn-row">
                   <button
@@ -1147,9 +1146,8 @@ const ScriptSelectModalLazy: React.FC<{
   useEffect(() => {
     if (!open) return
     setLoading(true)
-    // #1894: getScripts 返回 { items, total } 分页结构，取 items 即可
-    getScripts({ page_size: 200 })
-      .then((res) => setScripts(Array.isArray(res) ? res : (res.items ?? [])))
+    getScripts()
+      .then((items) => setScripts(Array.isArray(items) ? items : []))
       .catch(() => setScripts([]))
       .finally(() => setLoading(false))
   }, [open])

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

@@ -2,15 +2,31 @@
  * AI数字人 — API 封装（#1822 契约对齐）
  */
 import apiClient from "@/api/client"
-// #1894: Script 类型统一从 @/api/scripts 取（ai-avatar 本地 Script 仅保留渲染/对口型等自有类型）
-import type { LipsyncJob, RenderJob, BRollSegment, SentenceTiming } from "../types"
+import type { Script, LipsyncJob, RenderJob, BRollSegment, SentenceTiming } from "../types"
 
-/* ── 文案库 ──
- * #1894: 统一走 @/api/scripts 的 getScripts，不再各自封装；
- * 这样 mock 开关、分页/搜索参数、字段对齐都和文案库页面保持一致。
- */
-// #1894: 统一复用文案库 API，不再在 ai-avatar 里重复实现
-export { getScripts, getScript as getScriptById, createScript, deleteScript } from "@/api/scripts"
+/* ── 文案库 ── */
+export const getScripts = async (): Promise<Script[]> => {
+  const response = await apiClient.get<{ items?: Script[] } | Script[]>("/scripts")
+  // 后端列表返回 { items, total } 分页对象，做兼容解包 + 数组防御（#1809 白屏修复）
+  const data = response.data as unknown
+  if (Array.isArray(data)) return data
+  const items = (data as { items?: Script[] })?.items
+  return Array.isArray(items) ? items : []
+}
+
+export const getScriptById = async (id: string): Promise<Script> => {
+  const response = await apiClient.get<Script>(`/scripts/${id}`)
+  return response.data
+}
+
+export const createScript = async (data: { title: string; content: string }): Promise<Script> => {
+  const response = await apiClient.post<Script>("/scripts", data)
+  return response.data
+}
+
+export const deleteScript = async (id: string): Promise<void> => {
+  await apiClient.delete(`/scripts/${id}`)
+}
 
 /* ── 素材单查（拿到 file_url 作为对口型的 video_url） ── */
 export const getAssetById = async (id: string): Promise<{ file_url?: string; id: string }> => {

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

@@ -1,17 +1,13 @@
 /**
  * AI数字人 — 文案面板（步骤1用）
- * #1894: 文案库选择走 @/api/scripts；手动输入支持一键「保存到文案库」
+ * 文案库选择 / 手动输入 + 字数统计
  */
 import { useState } from "react"
-import { message } from "antd"
-import { createScript } from "../api/aiAvatar"
 
 interface PanelScriptProps {
   scriptText: string
   onScriptTextChange: (text: string) => void
   onOpenScriptModal: () => void
-  /** 手动保存到文案库后回调（把新脚本传入，父组件可更新 selectedScript） */
-  onScriptCreated?: (script: { id: string; title: string; content: string }) => void
 }
 
 type ScriptTab = "library" | "manual"
@@ -20,30 +16,8 @@ export function PanelScript({
   scriptText,
   onScriptTextChange,
   onOpenScriptModal,
-  onScriptCreated,
 }: PanelScriptProps) {
   const [scriptTab, setScriptTab] = useState<ScriptTab>("library")
-  const [saving, setSaving] = useState(false)
-
-  const handleSaveToLibrary = async () => {
-    const text = scriptText.trim()
-    if (!text) {
-      message.warning("请先输入文案内容")
-      return
-    }
-    // 用正文前 20 字作为默认标题
-    const autoTitle = text.slice(0, 20).replace(/\n+/g, " ").trim() || "手动输入文案"
-    setSaving(true)
-    try {
-      const created = await createScript({ title: autoTitle, content: text, tags: [] })
-      message.success({ content: "已保存到文案库", duration: 1 })
-      onScriptCreated?.(created)
-    } catch {
-      message.error("保存到文案库失败，请稍后重试")
-    } finally {
-      setSaving(false)
-    }
-  }
 
   return (
     <div className="aa-script-lipsync">
@@ -85,20 +59,7 @@ export function PanelScript({
         }
         onChange={(e) => onScriptTextChange(e.target.value)}
       />
-      <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
-        <div className="aa-char-count">{scriptText.length} 字</div>
-        {scriptTab === "manual" && scriptText.trim().length > 0 && (
-          <button
-            type="button"
-            className="aa-btn aa-btn--text"
-            disabled={saving}
-            onClick={handleSaveToLibrary}
-            style={{ fontSize: 12, padding: "2px 8px" }}
-          >
-            {saving ? "保存中..." : "💾 保存到文案库"}
-          </button>
-        )}
-      </div>
+      <div className="aa-char-count">{scriptText.length} 字</div>
     </div>
   )
 }

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

@@ -15,8 +15,7 @@ import type { TitleOption } from "@/pages/generate/components/title/TitleLibrary
 import type { TitleSettings } from "@/pages/generate/types"
 import { POSITION_OPTIONS, FONT_OPTIONS, TITLE_PRESETS } from "@/pages/generate/constants"
 import type { AiAvatarTitleConfig } from "../types"
-// #1894: 标题数据源切换到文案库，取 script.title 作为候选
-import { getScripts } from "@/api/scripts"
+import { getTitles } from "@/api/titles"
 
 const { TextArea } = Input
 
@@ -29,23 +28,11 @@ const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpda
   /** TitleStylePanel 内部高亮的预设 key（面板本地状态） */
   const [activePreset, setActivePreset] = useState<string | null>(null)
 
-  /** 标题库选项（#1894：从文案库 scripts[].title 取候选） */
+  /** 标题库选项（复用智能剪辑的标题库） */
   const [titleOptions, setTitleOptions] = useState<TitleOption[]>([])
   useEffect(() => {
-    getScripts({ page_size: 200 })
-      .then((res) => {
-        const items = Array.isArray(res) ? res : (res.items ?? [])
-        // 去重 + 过滤空标题
-        const seen = new Set<string>()
-        const opts: TitleOption[] = []
-        for (const s of items) {
-          const t = (s.title || "").trim()
-          if (!t || seen.has(t)) continue
-          seen.add(t)
-          opts.push({ label: t, value: t })
-        }
-        setTitleOptions(opts)
-      })
+    getTitles()
+      .then((items) => setTitleOptions(items.map((t) => ({ label: t.content, value: t.content }))))
       .catch(() => setTitleOptions([]))
   }, [])
 
@@ -97,12 +84,10 @@ const PanelTitleConfig: React.FC<PanelTitleConfigProps> = ({ titleConfig, onUpda
           style={{ fontSize: 15 }}
         />
         <div style={{ marginTop: 8, display: "flex", alignItems: "center", gap: 8 }}>
-          <span style={{ fontSize: 12, color: "#8c8ca1", whiteSpace: "nowrap" }}>
-            📚 文案库标题
-          </span>
+          <span style={{ fontSize: 12, color: "#8c8ca1", whiteSpace: "nowrap" }}>📚 标题库</span>
           <TitleLibraryAutoComplete
             key={titleConfig.title}
-            placeholder="从文案库选择标题"
+            placeholder="选择标题填入上方"
             value=""
             onChange={(val) => {
               if (val) onUpdate({ title: val })

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

@@ -0,0 +1,97 @@
+/**
+ * AI数字人 — 标题库选择弹窗
+ * 复用智能剪辑的标题库 API，选择标题后填入输入框
+ */
+import React, { useEffect, useState } from "react"
+import { getTitles } from "@/api/titles"
+import type { TitleItem } from "@/api/titles/types"
+
+interface TitleLibraryModalProps {
+  open: boolean
+  onClose: () => void
+  onSelect: (title: string) => void
+}
+
+const TitleLibraryModal: React.FC<TitleLibraryModalProps> = ({ open, onClose, onSelect }) => {
+  const [titles, setTitles] = useState<TitleItem[]>([])
+  const [loading, setLoading] = useState(false)
+  const [search, setSearch] = useState("")
+
+  useEffect(() => {
+    if (!open) return
+    setLoading(true)
+    getTitles()
+      .then((items) => setTitles(items))
+      .catch(() => setTitles([]))
+      .finally(() => setLoading(false))
+  }, [open])
+
+  const filtered = titles.filter(
+    (t) => !search || t.content.toLowerCase().includes(search.toLowerCase()),
+  )
+
+  if (!open) return null
+
+  return (
+    <div className="aa-modal-overlay" onClick={onClose}>
+      <div className="aa-modal" onClick={(e) => e.stopPropagation()} style={{ maxWidth: 600 }}>
+        <div className="aa-modal__header">
+          <span className="aa-modal__title">从标题库选择</span>
+          <button className="aa-modal__close" onClick={onClose}></button>
+        </div>
+        <div className="aa-modal__body">
+          <div style={{ marginBottom: 12 }}>
+            <input
+              className="aa-input"
+              placeholder="搜索标题..."
+              value={search}
+              onChange={(e) => setSearch(e.target.value)}
+            />
+          </div>
+          {loading ? (
+            <div style={{ textAlign: "center", padding: 40, color: "#8c8ca1" }}>加载中...</div>
+          ) : filtered.length === 0 ? (
+            <div style={{ textAlign: "center", padding: 40, color: "#8c8ca1" }}>
+              暂无标题，请先在标题库创建
+            </div>
+          ) : (
+            <div style={{ maxHeight: 400, overflowY: "auto" }}>
+              {filtered.map((t) => (
+                <div
+                  key={t.id}
+                  style={{
+                    padding: "12px 16px",
+                    marginBottom: 8,
+                    background: "#f8f8fc",
+                    borderRadius: 8,
+                    cursor: "pointer",
+                    transition: "background 0.2s",
+                  }}
+                  onMouseEnter={(e) => (e.currentTarget.style.background = "#eef0ff")}
+                  onMouseLeave={(e) => (e.currentTarget.style.background = "#f8f8fc")}
+                  onClick={() => {
+                    onSelect(t.content)
+                    onClose()
+                  }}
+                >
+                  <div style={{ fontSize: 14, color: "#1a1a2e", marginBottom: 4 }}>{t.content}</div>
+                  <div style={{ fontSize: 12, color: "#8c8ca1" }}>
+                    {t.word_count ?? t.content.length}字 ·{" "}
+                    {t.created_at ? new Date(t.created_at).toLocaleDateString() : ""}
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+        <div className="aa-modal__footer">
+          <button className="aa-btn" onClick={onClose}>
+            取消
+          </button>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default TitleLibraryModal

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

@@ -56,11 +56,15 @@ export interface TtsPreviewResult {
   error: string | null
 }
 
-/* ── 文案 ──
- * #1894: 直接复用文案库的 ScriptItem 类型，保证字段（title/content/tags/...）一致；
- * 个别 ai-avatar 专属属性如有需要再在此处扩展。
- */
-export type Script = import("@/api/scripts").ScriptItem
+/* ── 文案 ── */
+export interface Script {
+  id: string
+  title: string
+  content: string
+  char_count: number
+  created_at: string
+  updated_at?: string
+}
 
 /* ── 对口型任务 ── */
 export interface LipsyncJob {

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

@@ -11,9 +11,6 @@ import type { VoiceClone } from "@/api/voice-clone"
 import { useQuery } from "@tanstack/react-query"
 import { useCloneProgress } from "@/hooks/useCloneProgress"
 import CloneModal from "@/components/voice/CloneModal"
-import VoiceSelectModal from "./components/VoiceSelectModal"
-import ScriptSelectModal from "./components/ScriptSelectModal"
-import TtsVoiceModal from "./components/TtsVoiceModal"
 import GenerateHeader from "./components/GenerateHeader"
 import FrontendPreviewPlayer from "./components/FrontendPreviewPlayer"
 import CanvasPreviewGrid from "./components/CanvasPreviewGrid"
@@ -42,7 +39,7 @@ const GeneratePage: React.FC = () => {
   /* ── 表单状态 ── */
   const formState = useGenerateFormState()
   /* ── 积分状态 ── */
-  const { balance, dailyUsage, rules, init: initPoints } = usePointsStore()
+  const { balance, init: initPoints } = usePointsStore()
   useEffect(() => {
     initPoints()
   }, [initPoints])
@@ -65,26 +62,11 @@ const GeneratePage: React.FC = () => {
     selectedVoice,
     setSelectedVoice,
     voiceMode,
-    setVoiceMode,
     selectedClonedVoice,
-    setSelectedClonedVoice,
-    editMode,
-    setEditMode,
-    selectedScript,
-    setSelectedScript,
-    ttsVoiceId,
-    setTtsVoiceId,
-    ttsVoiceSource,
-    setTtsVoiceSource,
-    ttsVoiceAssetId,
-    setTtsVoiceAssetId,
-    dedupEnabled,
-    setDedupEnabled,
 
     cloneModalOpen,
     setCloneModalOpen,
     videoRatio,
-    setVideoRatio,
     duration,
     style,
     autoSubtitles,
@@ -142,11 +124,6 @@ const GeneratePage: React.FC = () => {
   /* ── 数量选择弹窗 ── */
   const [countModalOpen, setCountModalOpen] = useState(false)
 
-  /* ── #1970 流程重构：分支弹窗 ── */
-  const [voiceModalOpen, setVoiceModalOpen] = useState(false)
-  const [scriptModalOpen, setScriptModalOpen] = useState(false)
-  const [ttsModalOpen, setTtsModalOpen] = useState(false)
-
   /* ── 标题样式回调 ── */
   const styleUpdaters = useTitleStyleUpdaters({
     titleSettings,
@@ -324,12 +301,6 @@ const GeneratePage: React.FC = () => {
     selectedClonedVoice,
     coverSettings,
     videoRatio,
-    editMode,
-    selectedScript,
-    ttsVoiceId,
-    ttsVoiceSource,
-    ttsVoiceAssetId,
-    dedupEnabled,
     style,
     duration,
     autoSubtitles,
@@ -369,7 +340,7 @@ const GeneratePage: React.FC = () => {
         return Array.from({ length: count }, (_, i) => list[i] ?? "")
       })
       setSelectedVariantIds(Array.from({ length: count }, (_, i) => i))
-      setCurrentStep(3)
+      setCurrentStep(2)
     },
     [
       setPreviewCount,
@@ -383,70 +354,11 @@ const GeneratePage: React.FC = () => {
     ],
   )
 
-  /* ── #1970：Step1 弹窗回调 ── */
-  const handleVoiceModalConfirm = useCallback(
-    (voiceAssetId: string) => {
-      setSelectedVoice(voiceAssetId)
-      setVoiceMode("custom")
-      setVoiceModalOpen(false)
-      setCurrentStep(2)
-    },
-    [setSelectedVoice, setVoiceMode, setCurrentStep],
-  )
-
-  const handleScriptModalConfirm = useCallback(
-    (script: import("@/api/scripts").ScriptItem) => {
-      setSelectedScript(script)
-      // 自动带入标题（若标题为空则预填）
-      if (!titleSettings.title?.trim() && script.title) {
-        setTitleSettings((prev) => ({ ...prev, title: script.title, aiAutoSelect: false }))
-      }
-      setScriptModalOpen(false)
-      // 自动打开 TTS 弹窗
-      setTtsModalOpen(true)
-    },
-    [setSelectedScript, setTitleSettings, titleSettings.title],
-  )
-
-  const handleTtsSynthesized = useCallback(
-    (payload: { voiceAssetId: string; ttsVoiceId: string; ttsVoiceSource: "preset" | "clone" }) => {
-      setTtsVoiceId(payload.ttsVoiceId)
-      setTtsVoiceSource(payload.ttsVoiceSource)
-      setTtsVoiceAssetId(payload.voiceAssetId)
-      if (payload.ttsVoiceSource === "clone") {
-        setSelectedClonedVoice(payload.ttsVoiceId)
-        setVoiceMode("clone")
-      } else {
-        setSelectedVoice(payload.ttsVoiceId)
-        setVoiceMode("preset")
-      }
-      setTtsModalOpen(false)
-      message.success("配音合成成功")
-      setCurrentStep(2)
-    },
-    [
-      setTtsVoiceId,
-      setTtsVoiceSource,
-      setTtsVoiceAssetId,
-      setSelectedVoice,
-      setSelectedClonedVoice,
-      setVoiceMode,
-      setCurrentStep,
-    ],
-  )
-
   /* ── 步骤3「确认生成视频」：校验通过 → 创建正式生成任务 → 跳步骤4看实时进展 ── */
   const handleConfirmGenerate = useCallback(async () => {
     // 积分预检查
     const units = isBatch ? Math.max(selectedVariantIds.length, 1) : 1
-    const check = hasEnoughPoints(
-      balance ?? null,
-      units,
-      dailyUsage ?? null,
-      [],
-      "free",
-      rules?.free_user_multiplier ?? 1.15,
-    )
+    const check = hasEnoughPoints(balance ?? null, units)
     if (!check.sufficient) {
       message.error(check.reason ?? "积分不足，请充值")
       return
@@ -485,28 +397,18 @@ const GeneratePage: React.FC = () => {
     handleGenerate,
     setCurrentStep,
     balance,
-    dailyUsage,
-    rules,
   ])
 
   /* ── 步骤导航 ── */
   const { goNext, goPrev } = useStepNavigation({
     currentStep,
     setCurrentStep,
-    editMode,
     materialMode,
     selectedMaterials,
     smartSelectedIds,
     titleSettings,
     generated,
     onOpenCountModal: () => setCountModalOpen(true),
-    onOpenStep1Modal: () => {
-      if (editMode === "random") {
-        setVoiceModalOpen(true)
-      } else {
-        setScriptModalOpen(true)
-      }
-    },
   })
 
   /* ── 最终成片 ── */
@@ -521,16 +423,8 @@ const GeneratePage: React.FC = () => {
   /* ── 积分消耗估算（步骤3确认生成展示用） ── */
   const unitsForCost = isBatch ? Math.max(selectedVariantIds.length, 1) : 1
   const pointsEstimate = useMemo(
-    () =>
-      hasEnoughPoints(
-        balance ?? null,
-        unitsForCost,
-        dailyUsage ?? null,
-        [],
-        "free",
-        rules?.free_user_multiplier ?? 1.15,
-      ),
-    [unitsForCost, balance, dailyUsage, rules],
+    () => hasEnoughPoints(balance ?? null, unitsForCost),
+    [unitsForCost, balance],
   )
   const insufficientPoints = !pointsEstimate.sufficient
 
@@ -551,7 +445,7 @@ const GeneratePage: React.FC = () => {
             {!isBatch ? (
               <FrontendPreviewPlayer
                 assets={previewAssets}
-                videoRatio={videoRatio as "9:16" | "16:9"}
+                videoRatio={videoRatio}
                 ready={previewAssets.length > 0}
                 serverClips={serverClips}
                 voiceAudioUrl={previewVoiceAudioUrl || undefined}
@@ -586,7 +480,7 @@ const GeneratePage: React.FC = () => {
                 <CanvasPreviewGrid
                   count={previewCount}
                   assets={previewAssets}
-                  videoRatio={videoRatio as "9:16" | "16:9"}
+                  videoRatio={videoRatio}
                   titles={previewTitles}
                   titleSettings={titleSettings}
                   voiceAudioUrls={variantVoiceAudioUrls}
@@ -634,16 +528,6 @@ const GeneratePage: React.FC = () => {
             coverSettings={coverSettings}
             onCoverSettingsChange={setCoverSettings}
             selectedVoice={selectedVoice}
-            editMode={editMode}
-            onEditModeChange={setEditMode}
-            dedupEnabled={dedupEnabled}
-            onDedupEnabledChange={setDedupEnabled}
-            onPreviewCountChange={setPreviewCount}
-            videoRatio={videoRatio as "9:16" | "16:9"}
-            onVideoRatioChange={(r) => setVideoRatio(r)}
-            selectedScript={selectedScript}
-            ttsVoiceId={ttsVoiceId}
-            ttsVoiceSource={ttsVoiceSource}
             onSelectedVoiceChange={setSelectedVoice}
             onServerClipsChange={setServerClips}
             generating={generating}
@@ -770,27 +654,6 @@ const GeneratePage: React.FC = () => {
         onClose={() => setCloneModalOpen(false)}
         onSuccess={handleCloneSuccess}
       />
-
-      {/* #1970 流程弹窗 */}
-      <VoiceSelectModal
-        open={voiceModalOpen}
-        selectedVoice={selectedVoice}
-        onCancel={() => setVoiceModalOpen(false)}
-        onConfirm={handleVoiceModalConfirm}
-      />
-      <ScriptSelectModal
-        open={scriptModalOpen}
-        selectedScriptId={selectedScript?.id ?? null}
-        onCancel={() => setScriptModalOpen(false)}
-        onConfirm={handleScriptModalConfirm}
-      />
-      <TtsVoiceModal
-        open={ttsModalOpen}
-        scriptText={selectedScript?.content ?? ""}
-        scriptTitle={selectedScript?.title ?? ""}
-        onCancel={() => setTtsModalOpen(false)}
-        onSynthesized={handleTtsSynthesized}
-      />
     </div>
   )
 }

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

@@ -1,14 +1,8 @@
 /**
- * 第5步「确认生成」— 批量渲染进度网格（Issue #1677 / #1800 布局修复）
+ * 第5步「确认生成」— 批量渲染进度网格（Issue #1677）
  *
  * N 个正式生成任务各自独立卡片：进度条 / 成功成片播放 / 失败原因 + 单独重试。
  * 数据来自 useGenerateVideo 的 batchTasks（useGenerationPolling 实时回传）。
- *
- * #1800 修复点：
- * - 不再用 inline style 硬编码 grid 列宽 / 卡片 maxWidth，改由 CSS 统一控制
- *   （便于响应式 + 避免 inline 覆盖类规则）。
- * - 标题图标 + 文本拆分为独立 span，文本 span 加 flex:1/min-width:0/ellipsis，
- *   防止长标题在窄列里溢出导致与相邻卡片进度条视觉重叠。
  */
 import React from "react"
 import { LoadingOutlined, CheckCircleFilled, CloseCircleOutlined } from "@ant-design/icons"
@@ -40,34 +34,36 @@ const BatchGenerationGrid: React.FC<BatchGenerationGridProps> = ({
           完成 {tasks.filter((t) => t.status === "completed").length} / {tasks.length}
         </span>
       </div>
-      {/* #1800: grid 列宽 / gap / justify 全部交由 .xx-batch-gen-grid CSS 控制 */}
-      <div className="xx-batch-gen-grid">
+      <div
+        className="xx-batch-gen-grid"
+        style={{
+          display: "grid",
+          gridTemplateColumns: "repeat(auto-fill, minmax(280px, 320px))",
+          justifyContent: "center",
+          justifyItems: "center",
+          gap: 14,
+          width: "100%",
+        }}
+      >
         {sorted.map((task) => {
           const title = titles[task.variantIndex] || `视频 ${task.variantIndex + 1}`
           const video = (task.videos?.[0] || null) as GeneratedVideo | null
           return (
-            <div key={task.taskId} className={`xx-batch-gen-card status-${task.status}`}>
+            <div
+              key={task.taskId}
+              className={`xx-batch-gen-card status-${task.status}`}
+              style={{ maxWidth: 320 }}
+            >
               <div className="xx-batch-gen-card-head">
                 <span className="xx-batch-gen-card-title" title={title}>
                   {task.status === "completed" ? (
-                    <CheckCircleFilled
-                      className="xx-batch-gen-card-icon"
-                      style={{ color: "#52c41a" }}
-                    />
+                    <CheckCircleFilled style={{ color: "#52c41a", marginRight: 6 }} />
                   ) : task.status === "failed" ? (
-                    <CloseCircleOutlined
-                      className="xx-batch-gen-card-icon"
-                      style={{ color: "#ef4444" }}
-                    />
+                    <CloseCircleOutlined style={{ color: "#ef4444", marginRight: 6 }} />
                   ) : (
-                    <LoadingOutlined
-                      className="xx-batch-gen-card-icon"
-                      style={{ color: "#1677ff" }}
-                    />
+                    <LoadingOutlined style={{ color: "#1677ff", marginRight: 6 }} />
                   )}
-                  <span className="xx-batch-gen-card-title-text">
-                    视频 {task.variantIndex + 1}：{title}
-                  </span>
+                  视频 {task.variantIndex + 1}：{title}
                 </span>
               </div>
 

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

@@ -1,11 +1,11 @@
 /**
- * GeneratePage 步骤底部操作按钮（5 步向导：素材→配音→标题→确认生成→封面）
- * v3: 修复 #1954 off-by-one —— 步骤4 单视频/批量生成完成后正确显示「下一步：选择封面」
+ * GeneratePage 步骤底部操作按钮（Issue #1677 修正：固定 6 步）
+ * v2: 步骤4 按钮前显示本次积分消耗；积分不足时禁用按钮并提示充值
  *
  * 步骤 1~3：上一步 / 下一步
- * 步骤 4（确认生成/进度）：未开始 →「✨ 确认生成视频」；生成中 →「⏳ 视频渲染中…」；
- *                       失败 →「🔄 重新生成」；全部完成 →「下一步：选择封面 →」
- * 步骤 5（选择封面）：仅上一步，无主按钮
+ * 步骤 4（选择标题）：「✨ 确认生成视频 / 确认生成 N 个视频」→ 创建正式生成任务，成功后跳步骤5
+ * 步骤 5（确认生成）：渲染进度页，全部完成后「下一步：选择封面」；仅上一步
+ * 步骤 6（选择封面）：仅上一步
  */
 import React from "react"
 import { Tooltip } from "antd"
@@ -22,13 +22,14 @@ export interface GenerateStepActionsProps {
   generateError: string | null
   /** 批量模式下勾选的视频数量（N=1 时为1） */
   selectedCount?: number
+  // v2: 积分相关
   /** 本次预估消耗积分 */
   estimatedCost?: number
   /** 是否积分不足 */
   pointsInsufficient?: boolean
   /** 积分不足原因 */
   insufficientReason?: string
-  /** 本次使用的免费混剪次数 */
+  /** 剩余免费混剪次数 */
   freeClipsUsedThisTime?: number
   /** 前往充值 */
   onRecharge?: () => void
@@ -59,17 +60,8 @@ const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
       )
     }
 
-    /* 步骤 4：确认生成 / 进度 / 完成进封面 */
+    /* 步骤 4：选择标题 — 确认生成 */
     if (currentStep === 4) {
-      // #1954 修复：单视频/批量 全部生成完成后显示「下一步：选择封面」
-      if (generated && !generating && !generateError) {
-        return (
-          <button className="xx-btn xx-btn-primary" onClick={onNext}>
-            下一步：选择封面 →
-          </button>
-        )
-      }
-
       const costTag =
         typeof estimatedCost === "number" && estimatedCost > 0 ? (
           <span className="xx-step-cost-tag">
@@ -126,7 +118,23 @@ const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
       )
     }
 
-    /* 步骤 5（封面，最后一步）：无主按钮 */
+    /* 步骤 5：确认生成进度页 — 全部完成后下一步进封面 */
+    if (currentStep === 5) {
+      if (generated) {
+        return (
+          <button className="xx-btn xx-btn-primary" onClick={onNext}>
+            下一步：选择封面 →
+          </button>
+        )
+      }
+      return (
+        <button className="xx-btn xx-btn-primary" disabled>
+          ⏳ 视频渲染中…
+        </button>
+      )
+    }
+
+    /* 步骤 6（封面，最后一步）：无主按钮 */
     return null
   }
 

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

@@ -1,16 +1,14 @@
 /**
- * GeneratePage 步骤内容渲染（#1970 流程重构）
- * 步骤顺序：选择模式(1) → 选择素材(2) → 选择标题(3) → 确认生成(4) → 选择封面(5)
- * 原步骤"选择配音"已从主流程移除，改为 Step1 下一步分支弹窗（VoiceSelectModal / ScriptSelectModal → TtsVoiceModal）。
+ * GeneratePage 步骤内容渲染（#1899 简化为 5 步，#1913 传递 selectedTemplate）
+ * 步骤顺序：素材(1) → 配音(2) → 标题(3) → 确认生成(4) → 封面(5)
+ * 步骤3预览（Canvas 网格）与步骤4进度（批量渲染网格）由 GeneratePage 直接渲染在左侧大区域。
  */
 import React from "react"
 import type { EditPlanClip } from "@/api/template-editor"
 import type { CoverConfig } from "../types/cover"
 import type { TitleSettings } from "../types"
-import type { ScriptItem } from "@/api/scripts"
-import Step1EditMode from "./Step1EditMode"
-import type { EditMode } from "./Step1EditMode"
 import Step2MaterialSelect from "../components/Step2MaterialSelect"
+import Step3VoiceWithMode from "./Step3VoiceWithMode"
 import Step4TitleSettings from "../components/Step4TitleSettings"
 import Step6CoverSettings from "../components/Step6CoverSettings"
 import BatchGenerationGrid from "./BatchGenerationGrid"
@@ -19,28 +17,19 @@ import type { GeneratedVideo } from "@/api/template-editor"
 
 export interface GenerateStepContentProps {
   currentStep: number
-  /* Step1：剪辑模式 + 生成设置 */
-  editMode: EditMode
-  onEditModeChange: (m: EditMode) => void
-  dedupEnabled: boolean
-  onDedupEnabledChange: (v: boolean) => void
-  /* ── 片段数量（#1899） ── */
+  /* 片段数量（#1899） */
   clipCount: number
   onClipCountChange: (n: number) => void
-  /* ── 生成数量/比例（Step1 设置） ── */
-  previewCount: number
-  onPreviewCountChange: (n: number) => void
-  videoRatio: "9:16" | "16:9"
-  onVideoRatioChange: (r: "9:16" | "16:9") => void
-  /* ── 素材 ── */
+  /* 素材 */
   materialMode: "manual" | "auto"
   onMaterialModeChange: (mode: "manual" | "auto") => void
   selectedMaterials: string[]
   onSelectedMaterialsChange: (ids: string[]) => void
   smartSelectedIds: string[]
   onSmartSelectedIdsChange: (ids: string[]) => void
+  /* 当前选中的模板/草稿 ID；空串时由后端自动兜底（#1913） */
   selectedTemplate?: string
-  /* ── 标题 ── */
+  /* 标题 */
   titleSettings: TitleSettings
   onTitleSettingsChange: (settings: TitleSettings) => void
   onUpdatePosition: (position: string) => void
@@ -53,14 +42,14 @@ export interface GenerateStepContentProps {
   onApplyPreset: (presetKey: string) => void
   activePreset: string | null
   titlePresets: { key: string; label: string; previewStyle: React.CSSProperties }[]
-  /* ── 封面 ── */
+  /* 封面 */
   coverSettings: CoverConfig
   onCoverSettingsChange: (settings: CoverConfig) => void
-  /* ── 配音 ── */
+  /* 配音 */
   selectedVoice: string
   onSelectedVoiceChange: (id: string) => void
   onServerClipsChange: (clips: EditPlanClip[]) => void
-  /* ── 生成 ── */
+  /* 生成 */
   generating: boolean
   generated: boolean
   generateError: string | null
@@ -69,10 +58,14 @@ export interface GenerateStepContentProps {
   onRetry: () => void
   onRetryBatchTask: (taskId: string) => void
   onDismissError: () => void
+  /** 批量：每个正式生成任务的独立状态（步骤4进度网格） */
   batchTasks: BatchTaskState[]
+  /** BGM 开关 */
   bgm: boolean
+  /** BGM 配置 */
   bgmConfig?: { enabled: boolean; music_id?: string }
-  /* ── 批量生成 ── */
+  /* ── 批量生成（#1677）── */
+  previewCount: number
   previewTitles: string[]
   onPreviewTitlesChange: (titles: string[]) => void
   voiceModePerVideo: boolean
@@ -81,27 +74,15 @@ export interface GenerateStepContentProps {
   onVoiceLibraryIdsChange: (ids: string[]) => void
   previewCovers: string[]
   onPreviewCoversChange: (urls: string[]) => void
+  /** 批量模式勾选的变体索引 */
   selectedVariantIds?: number[]
-  /* ── 摘要信息（#1970 Step4 展示用） ── */
-  selectedScript: ScriptItem | null
-  ttsVoiceId: string
-  ttsVoiceSource: "preset" | "clone"
 }
 
 export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) => {
-  // Only destructure props actually referenced in JSX below
   const {
     currentStep,
-    editMode,
-    onEditModeChange,
-    dedupEnabled,
-    onDedupEnabledChange,
     clipCount,
     onClipCountChange,
-    previewCount,
-    onPreviewCountChange,
-    videoRatio,
-    onVideoRatioChange,
     materialMode,
     onMaterialModeChange,
     selectedMaterials,
@@ -123,24 +104,31 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
     titlePresets,
     coverSettings,
     onCoverSettingsChange,
+    selectedVoice,
+    onSelectedVoiceChange,
     onServerClipsChange,
     generating,
+    generated,
     generateError,
     progress,
     onRetry,
     generatedVideos,
     batchTasks,
     onRetryBatchTask,
+    previewCount,
     previewTitles,
     onPreviewTitlesChange,
+    voiceModePerVideo,
+    onVoiceModePerVideoChange,
+    voiceLibraryIds,
+    onVoiceLibraryIdsChange,
     previewCovers,
     onPreviewCoversChange,
     selectedVariantIds,
-    selectedScript,
-    ttsVoiceId,
-    ttsVoiceSource,
   } = props
 
+  // #1913：包装 onServerClipsChange，适配 hook 的 (clips, templateId?) 签名
+  // 如果 hook 传回了后端兜底创建的 templateId，同时通知外层更新 selectedTemplate
   const handleClipsChange = React.useCallback(
     (clips: EditPlanClip[], _templateId?: string) => {
       onServerClipsChange(clips)
@@ -150,22 +138,8 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
 
   switch (currentStep) {
     case 1:
-      return (
-        <Step1EditMode
-          editMode={editMode}
-          onEditModeChange={onEditModeChange}
-          previewCount={previewCount}
-          onPreviewCountChange={onPreviewCountChange}
-          videoRatio={videoRatio}
-          onVideoRatioChange={onVideoRatioChange}
-          dedupEnabled={dedupEnabled}
-          onDedupEnabledChange={onDedupEnabledChange}
-        />
-      )
-    case 2:
       return (
         <Step2MaterialSelect
-          editMode={editMode}
           materialMode={materialMode}
           onMaterialModeChange={onMaterialModeChange}
           selectedMaterials={selectedMaterials}
@@ -178,6 +152,18 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
           onServerClipsChange={handleClipsChange}
         />
       )
+    case 2:
+      return (
+        <Step3VoiceWithMode
+          previewCount={previewCount}
+          selectedVoice={selectedVoice}
+          onSelectedVoiceChange={onSelectedVoiceChange}
+          voiceModePerVideo={voiceModePerVideo}
+          onVoiceModePerVideoChange={onVoiceModePerVideoChange}
+          voiceLibraryIds={voiceLibraryIds}
+          onVoiceLibraryIdsChange={onVoiceLibraryIdsChange}
+        />
+      )
     case 3:
       return (
         <Step4TitleSettings
@@ -199,49 +185,20 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
         />
       )
     case 4:
+      /* 确认生成页：批量=逐任务进度网格；单视频=仅渲染进度/失败状态 */
+      if (previewCount > 1) {
+        return (
+          <BatchGenerationGrid
+            tasks={batchTasks}
+            titles={previewTitles}
+            onRetryTask={onRetryBatchTask}
+          />
+        )
+      }
+      if (generated && !generating && !generateError) return null
       return (
         <div className="xx-form-section">
-          {/* 配置摘要（#1970） */}
-          <div
-            style={{
-              padding: 14,
-              background: "#f9fafb",
-              borderRadius: 8,
-              marginBottom: 16,
-              fontSize: 13,
-              lineHeight: 1.8,
-              color: "#374151",
-            }}
-          >
-            <div style={{ fontWeight: 600, fontSize: 14, marginBottom: 6, color: "#111" }}>
-              📋 生成配置
-            </div>
-            <div>🎬 剪辑模式：{editMode === "random" ? "🎲 随机混剪" : "📖 叙事剪辑"}</div>
-            {editMode === "random" ? (
-              <div>🎙️ 配音来源：配音库音频</div>
-            ) : (
-              <>
-                <div>📝 文案：{selectedScript?.title ?? "未选择"}</div>
-                <div>
-                  🎙️ 合成配音音色：
-                  {ttsVoiceId
-                    ? `${ttsVoiceSource === "clone" ? "克隆音色" : "系统音色"}（${ttsVoiceId.slice(0, 8)}...）`
-                    : "未选择"}
-                </div>
-              </>
-            )}
-            <div>📱 视频比例：{videoRatio}</div>
-            <div>🎯 智能降重：{dedupEnabled ? "已开启" : "已关闭"}</div>
-            {previewCount > 1 && <div>📦 生成数量：{previewCount} 个</div>}
-          </div>
-
-          {previewCount > 1 ? (
-            <BatchGenerationGrid
-              tasks={batchTasks}
-              titles={previewTitles}
-              onRetryTask={onRetryBatchTask}
-            />
-          ) : generating ? (
+          {generating && (
             <div className="xx-gen-progress-card">
               <div className="xx-gen-progress-header">
                 <div className="xx-gen-progress-info">
@@ -260,7 +217,8 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
                 />
               </div>
             </div>
-          ) : generateError ? (
+          )}
+          {generateError && !generating && (
             <div className="xx-gen-error-card">
               <div className="xx-gen-error-info">
                 <div className="xx-gen-error-title">生成失败</div>
@@ -270,7 +228,7 @@ export const GenerateStepContent: React.FC<GenerateStepContentProps> = (props) =
                 🔄 重试
               </button>
             </div>
-          ) : null}
+          )}
         </div>
       )
     case 5:

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

@@ -1,243 +0,0 @@
-/**
- * 叙事剪辑 — 文案选择弹窗（#1970）
- * - 搜索框：防抖 300ms，命中文字黄色高亮
- * - 标签筛选行：全部/带货/工厂/测评/教程/口播/种草
- * - 数量统计 + 卡片列表（可滚动，max-height 420px）
- * - 调用 GET /api/v1/scripts?keyword=&tag=&page_size=200
- */
-import React, { useState, useEffect, useMemo, useRef, useCallback } from "react"
-import { Modal, Input, Tag, Spin } from "antd"
-import { SearchOutlined, CheckCircleFilled } from "@ant-design/icons"
-import { useQuery } from "@tanstack/react-query"
-import { getScripts } from "@/api/scripts"
-import type { ScriptItem } from "@/api/scripts"
-
-interface ScriptSelectModalProps {
-  open: boolean
-  selectedScriptId: string | null
-  onCancel: () => void
-  onConfirm: (script: ScriptItem) => void
-}
-
-const SCRIPT_TABS = [
-  { key: "all", label: "全部" },
-  { key: "带货", label: "带货" },
-  { key: "工厂", label: "工厂" },
-  { key: "测评", label: "测评" },
-  { key: "教程", label: "教程" },
-  { key: "口播", label: "口播" },
-  { key: "种草", label: "种草" },
-]
-
-/** 在文本中用 <mark> 高亮关键词（黄色背景） */
-function highlight(text: string, keyword: string): React.ReactNode {
-  if (!keyword) return text
-  const idx = text.toLowerCase().indexOf(keyword.toLowerCase())
-  if (idx < 0) return text
-  return (
-    <>
-      {text.slice(0, idx)}
-      <mark style={{ background: "#fef08a", color: "#713f12", padding: "0 2px", borderRadius: 2 }}>
-        {text.slice(idx, idx + keyword.length)}
-      </mark>
-      {text.slice(idx + keyword.length)}
-    </>
-  )
-}
-
-const ScriptSelectModal: React.FC<ScriptSelectModalProps> = ({
-  open,
-  selectedScriptId,
-  onCancel,
-  onConfirm,
-}) => {
-  const [innerSelected, setInnerSelected] = useState<string | null>(selectedScriptId)
-  const [activeTag, setActiveTag] = useState<string>("all")
-  const [searchInput, setSearchInput] = useState("")
-  const [debouncedKw, setDebouncedKw] = useState("")
-  const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-
-  useEffect(() => {
-    if (open) {
-      setInnerSelected(selectedScriptId)
-      setActiveTag("all")
-      setSearchInput("")
-      setDebouncedKw("")
-    }
-  }, [open, selectedScriptId])
-
-  // 300ms 防抖
-  useEffect(() => {
-    if (debounceRef.current) clearTimeout(debounceRef.current)
-    debounceRef.current = setTimeout(() => setDebouncedKw(searchInput.trim()), 300)
-    return () => {
-      if (debounceRef.current) clearTimeout(debounceRef.current)
-    }
-  }, [searchInput])
-
-  const { data, isLoading } = useQuery({
-    queryKey: ["scripts", "select-modal", debouncedKw, activeTag],
-    queryFn: () =>
-      getScripts({
-        page: 1,
-        page_size: 200,
-        keyword: debouncedKw || undefined,
-        tag: activeTag === "all" ? undefined : activeTag,
-      }),
-    enabled: open,
-  })
-
-  const scripts: ScriptItem[] = useMemo(() => data?.items ?? [], [data])
-  const selected = useMemo(
-    () => scripts.find((s) => s.id === innerSelected) ?? null,
-    [scripts, innerSelected],
-  )
-
-  const handleConfirm = useCallback(() => {
-    if (selected) onConfirm(selected)
-  }, [selected, onConfirm])
-
-  return (
-    <Modal
-      title="📝 选择文案"
-      open={open}
-      onCancel={onCancel}
-      onOk={handleConfirm}
-      okText="确认选择"
-      cancelText="取消"
-      okButtonProps={{ disabled: !selected, style: { background: "#7c3aed" } }}
-      width={680}
-      destroyOnClose
-    >
-      {/* 搜索 */}
-      <Input
-        allowClear
-        prefix={<SearchOutlined style={{ color: "#9ca3af" }} />}
-        placeholder="搜索标题、内容或标签"
-        value={searchInput}
-        onChange={(e) => setSearchInput(e.target.value)}
-        style={{ marginBottom: 12 }}
-      />
-
-      {/* 标签筛选 */}
-      <div style={{ display: "flex", flexWrap: "wrap", gap: 8, marginBottom: 12 }}>
-        {SCRIPT_TABS.map((t) => {
-          const active = activeTag === t.key
-          return (
-            <Tag
-              key={t.key}
-              onClick={() => setActiveTag(t.key)}
-              style={{
-                cursor: "pointer",
-                padding: "4px 14px",
-                borderRadius: 16,
-                border: active ? "1px solid #7c3aed" : "1px solid #e5e7eb",
-                background: active ? "#ede9fe" : "#fff",
-                color: active ? "#7c3aed" : "#4b5563",
-                margin: 0,
-                fontSize: 13,
-              }}
-            >
-              {t.label}
-            </Tag>
-          )
-        })}
-      </div>
-
-      {/* 数量统计 */}
-      <div style={{ fontSize: 12, color: "#6b7280", marginBottom: 8 }}>
-        共 {data?.total ?? scripts.length} 条文案
-      </div>
-
-      {/* 卡片列表 */}
-      <div style={{ maxHeight: 420, overflowY: "auto", paddingRight: 4 }}>
-        {isLoading ? (
-          <div style={{ textAlign: "center", padding: "40px 0" }}>
-            <Spin />
-          </div>
-        ) : scripts.length === 0 ? (
-          <div style={{ textAlign: "center", padding: "40px 0", color: "#9ca3af" }}>
-            暂无匹配文案
-          </div>
-        ) : (
-          <div style={{ display: "flex", flexDirection: "column", gap: 10 }}>
-            {scripts.map((s) => {
-              const isSel = innerSelected === s.id
-              const preview = (s.content || "").replace(/\s+/g, " ").slice(0, 80)
-              return (
-                <div
-                  key={s.id}
-                  onClick={() => setInnerSelected(s.id)}
-                  style={{
-                    padding: 14,
-                    borderRadius: 8,
-                    border: isSel ? "2px solid #7c3aed" : "1px solid #e5e7eb",
-                    background: isSel ? "#faf5ff" : "#fff",
-                    cursor: "pointer",
-                    transition: "all 0.2s",
-                    position: "relative",
-                  }}
-                >
-                  {isSel && (
-                    <CheckCircleFilled
-                      style={{
-                        position: "absolute",
-                        top: 12,
-                        right: 12,
-                        color: "#7c3aed",
-                        fontSize: 18,
-                      }}
-                    />
-                  )}
-                  <div
-                    style={{
-                      fontSize: 14,
-                      fontWeight: 600,
-                      color: isSel ? "#6d28d9" : "#111",
-                      marginBottom: 4,
-                      paddingRight: 24,
-                    }}
-                  >
-                    {highlight(s.title || "未命名", debouncedKw)}
-                  </div>
-                  <div
-                    style={{
-                      fontSize: 12,
-                      color: "#6b7280",
-                      lineHeight: 1.6,
-                      marginBottom: 8,
-                    }}
-                  >
-                    {highlight(preview + ((s.content || "").length > 80 ? "..." : ""), debouncedKw)}
-                  </div>
-                  {s.tags && s.tags.length > 0 && (
-                    <div style={{ display: "flex", gap: 4, flexWrap: "wrap" }}>
-                      {s.tags.slice(0, 5).map((tg) => (
-                        <Tag
-                          key={tg}
-                          style={{
-                            margin: 0,
-                            fontSize: 11,
-                            padding: "1px 8px",
-                            borderRadius: 10,
-                            background: "#f3f4f6",
-                            border: "none",
-                            color: "#6b7280",
-                          }}
-                        >
-                          {tg}
-                        </Tag>
-                      ))}
-                    </div>
-                  )}
-                </div>
-              )
-            })}
-          </div>
-        )}
-      </div>
-    </Modal>
-  )
-}
-
-export default ScriptSelectModal

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

@@ -1,264 +0,0 @@
-/**
- * Step 1 选择剪辑模式 + 生成设置（#1970 新流程第一步）
- * - 剪辑模式：🎲随机混剪 / 📖叙事剪辑，二选一，选中紫底紫框
- * - 生成设置：生成数量（-/+ 1-10 默认1）、视频比例（9:16/16:9 默认9:16）、智能降重开关（默认开）
- */
-import React from "react"
-import { MinusOutlined, PlusOutlined } from "@ant-design/icons"
-
-export type EditMode = "random" | "narrative"
-
-interface Step1EditModeProps {
-  editMode: EditMode
-  onEditModeChange: (mode: EditMode) => void
-  /** 生成数量（1-10，默认1） */
-  previewCount: number
-  onPreviewCountChange: (n: number) => void
-  /** 视频比例 */
-  videoRatio: "9:16" | "16:9"
-  onVideoRatioChange: (ratio: "9:16" | "16:9") => void
-  /** 智能降重开关（默认 true） */
-  dedupEnabled: boolean
-  onDedupEnabledChange: (v: boolean) => void
-}
-
-const PURPLE = "#7c3aed"
-const PURPLE_BG = "linear-gradient(135deg, #ede9fe, #ddd6fe)"
-const PURPLE_BORDER = "2px solid #7c3aed"
-
-const MODE_CARDS: Array<{
-  key: EditMode
-  emoji: string
-  title: string
-  desc: string
-  features: string[]
-}> = [
-  {
-    key: "random",
-    emoji: "🎲",
-    title: "随机混剪",
-    desc: "根据配音时长随机抽取素材片段，灵活组合",
-    features: ["随机抽帧组合", "每次画面不同", "适合批量生成"],
-  },
-  {
-    key: "narrative",
-    emoji: "📖",
-    title: "叙事剪辑",
-    desc: "按文案内容匹配相关画面，有逻辑组织镜头",
-    features: ["画面匹配文案", "叙事感更强", "需要素材标签"],
-  },
-]
-
-const Step1EditMode: React.FC<Step1EditModeProps> = ({
-  editMode,
-  onEditModeChange,
-  previewCount,
-  onPreviewCountChange,
-  videoRatio,
-  onVideoRatioChange,
-  dedupEnabled,
-  onDedupEnabledChange,
-}) => {
-  return (
-    <div className="xx-form-section">
-      <h3>🎬 选择剪辑模式</h3>
-      <p style={{ color: "#666", fontSize: 14, marginBottom: 16 }}>
-        选择适合您的剪辑方式，后续流程会根据模式自动调整
-      </p>
-
-      <div
-        style={{
-          display: "grid",
-          gridTemplateColumns: "repeat(auto-fit, minmax(240px, 1fr))",
-          gap: 16,
-          marginBottom: 24,
-        }}
-      >
-        {MODE_CARDS.map((card) => {
-          const selected = editMode === card.key
-          return (
-            <div
-              key={card.key}
-              onClick={() => onEditModeChange(card.key)}
-              style={{
-                padding: 20,
-                borderRadius: 12,
-                border: selected ? PURPLE_BORDER : "1px solid #e5e7eb",
-                background: selected ? PURPLE_BG : "#fff",
-                cursor: "pointer",
-                transition: "all 0.2s",
-              }}
-            >
-              <div style={{ fontSize: 36, marginBottom: 8 }}>{card.emoji}</div>
-              <div
-                style={{
-                  fontSize: 18,
-                  fontWeight: 600,
-                  color: selected ? PURPLE : "#111",
-                  marginBottom: 6,
-                }}
-              >
-                {card.title}
-              </div>
-              <div style={{ fontSize: 13, color: "#666", marginBottom: 12 }}>{card.desc}</div>
-              <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
-                {card.features.map((f) => (
-                  <div key={f} style={{ fontSize: 12, color: selected ? "#6d28d9" : "#6b7280" }}>
-                    ✅ {f}
-                  </div>
-                ))}
-              </div>
-            </div>
-          )
-        })}
-      </div>
-
-      <h3 style={{ marginTop: 8 }}>⚙️ 生成设置</h3>
-
-      <div className="xx-form-field" style={{ marginTop: 12 }}>
-        <label>生成数量</label>
-        <div style={{ display: "flex", alignItems: "center", gap: 12 }}>
-          <div
-            style={{
-              display: "inline-flex",
-              alignItems: "center",
-              border: "1px solid #e5e7eb",
-              borderRadius: 8,
-              overflow: "hidden",
-              background: "#fff",
-            }}
-          >
-            <button
-              type="button"
-              onClick={() => onPreviewCountChange(Math.max(1, previewCount - 1))}
-              disabled={previewCount <= 1}
-              style={{
-                width: 36,
-                height: 36,
-                border: "none",
-                background: "transparent",
-                cursor: previewCount <= 1 ? "not-allowed" : "pointer",
-                color: previewCount <= 1 ? "#d1d5db" : "#374151",
-                fontSize: 16,
-              }}
-            >
-              <MinusOutlined />
-            </button>
-            <span
-              style={{
-                minWidth: 40,
-                textAlign: "center",
-                fontSize: 16,
-                fontWeight: 600,
-                color: "#111",
-              }}
-            >
-              {previewCount}
-            </span>
-            <button
-              type="button"
-              onClick={() => onPreviewCountChange(Math.min(10, previewCount + 1))}
-              disabled={previewCount >= 10}
-              style={{
-                width: 36,
-                height: 36,
-                border: "none",
-                background: "transparent",
-                cursor: previewCount >= 10 ? "not-allowed" : "pointer",
-                color: previewCount >= 10 ? "#d1d5db" : "#374151",
-                fontSize: 16,
-              }}
-            >
-              <PlusOutlined />
-            </button>
-          </div>
-          <span style={{ fontSize: 12, color: "#6b7280" }}>最多一次生成 10 个</span>
-        </div>
-      </div>
-
-      <div className="xx-form-field" style={{ marginTop: 16 }}>
-        <label>视频比例</label>
-        <div style={{ display: "flex", gap: 12, marginTop: 4 }}>
-          {[
-            { key: "9:16" as const, emoji: "📱", label: "竖屏 9:16" },
-            { key: "16:9" as const, emoji: "🖥️", label: "横屏 16:9" },
-          ].map((opt) => {
-            const selected = videoRatio === opt.key
-            return (
-              <button
-                key={opt.key}
-                type="button"
-                onClick={() => onVideoRatioChange(opt.key)}
-                style={{
-                  padding: "10px 20px",
-                  borderRadius: 8,
-                  border: selected ? PURPLE_BORDER : "1px solid #e5e7eb",
-                  background: selected ? PURPLE_BG : "#fff",
-                  color: selected ? PURPLE : "#374151",
-                  cursor: "pointer",
-                  fontSize: 14,
-                  fontWeight: selected ? 600 : 400,
-                  transition: "all 0.2s",
-                }}
-              >
-                {opt.emoji} {opt.label}
-              </button>
-            )
-          })}
-        </div>
-      </div>
-
-      <div
-        className="xx-form-field"
-        style={{
-          marginTop: 16,
-          padding: "12px 16px",
-          background: "#f9fafb",
-          borderRadius: 8,
-        }}
-      >
-        <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
-          <span style={{ fontSize: 14, fontWeight: 500, color: "#111" }}>
-            🎯 智能降重 {dedupEnabled ? "已开启" : "已关闭"}
-          </span>
-          <button
-            type="button"
-            onClick={() => onDedupEnabledChange(!dedupEnabled)}
-            style={{
-              width: 44,
-              height: 24,
-              borderRadius: 12,
-              border: "none",
-              background: dedupEnabled ? PURPLE : "#d1d5db",
-              position: "relative",
-              cursor: "pointer",
-              transition: "background 0.2s",
-              padding: 0,
-              flexShrink: 0,
-            }}
-            aria-label="toggle dedup"
-          >
-            <span
-              style={{
-                position: "absolute",
-                top: 2,
-                left: dedupEnabled ? 22 : 2,
-                width: 20,
-                height: 20,
-                borderRadius: "50%",
-                background: "#fff",
-                transition: "left 0.2s",
-                boxShadow: "0 1px 3px rgba(0,0,0,0.2)",
-              }}
-            />
-          </button>
-        </div>
-        <div style={{ fontSize: 12, color: "#6b7280", marginTop: 4 }}>
-          自动对画面做微调，避免查重不过
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default Step1EditMode

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

@@ -11,8 +11,6 @@ import SmartMatchInput from "./material/SmartMatchInput"
 import SmartMatchResults from "./material/SmartMatchResults"
 
 interface Step2MaterialSelectProps {
-  /** 剪辑模式：random 随机混剪 / narrative 叙事剪辑（#1970） */
-  editMode?: "random" | "narrative"
   materialMode: "manual" | "auto"
   onMaterialModeChange: (mode: "manual" | "auto") => void
   selectedMaterials: string[]
@@ -45,27 +43,6 @@ const Step2MaterialSelect: React.FC<Step2MaterialSelectProps> = (props) => {
     <div className="xx-form-section">
       <h3>📦 选择素材</h3>
 
-      {/* 叙事剪辑：AI 智能匹配提示卡（#1970） */}
-      {props.editMode === "narrative" && (
-        <div
-          style={{
-            marginTop: 12,
-            padding: "12px 16px",
-            background: "linear-gradient(135deg,#ede9fe,#f5f3ff)",
-            border: "1px solid #c4b5fd",
-            borderRadius: 8,
-            fontSize: 13,
-            color: "#5b21b6",
-            display: "flex",
-            alignItems: "center",
-            gap: 8,
-          }}
-        >
-          <span style={{ fontSize: 18 }}>🤖</span>
-          <span>AI智能匹配：系统将根据您的文案内容，从素材库自动匹配合适的视频片段</span>
-        </div>
-      )}
-
       {/* 片段数量（#1899） */}
       <div className="xx-form-field" style={{ marginTop: 12 }}>
         <label>片段数量</label>

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

@@ -1,491 +0,0 @@
-/**
- * 叙事剪辑 — TTS 音色选择 + 合成配音弹窗（#1970）
- * - Tabs：✨系统音色 / 🎙️我的克隆音色
- * - 2列音色卡片（头像emoji+名称+描述+标签+▶试听+选中✓）
- * - 底部：取消 / 🎧 合成配音（主按钮，必须选音色才能点）
- * - 合成中：紫色 spinner + "正在合成配音..." + "请稍候，通常需要10-30秒"
- * - 合成成功：保存到配音库并回调（voiceAssetId + ttsVoiceId + ttsVoiceSource）
- *
- * 复用现有 /api/tts 的 synthesizeSpeech + 轮询 getTTSJobStatus 逻辑；
- * 不直接复用 TtsModal（它是页面配音弹窗，含文本输入/语速/情感等字段，叙事模式文本来自文案）。
- */
-import React, { useState, useEffect, useMemo, useRef, useCallback } from "react"
-import { Modal, Tabs, Spin, message } from "antd"
-import { CheckCircleFilled, SoundOutlined } from "@ant-design/icons"
-import { useQuery } from "@tanstack/react-query"
-import { fetchPresetVoices } from "@/api/voices"
-import { getVoiceClones } from "@/api/voice-clone"
-import { synthesizeSpeech, getTTSJobStatus, saveTtsToLibrary } from "@/api/tts"
-import type { PresetVoiceItem } from "@/api/voices"
-import type { VoiceClone } from "@/api/voice-clone"
-import { VOICE_GENDER_ICON } from "../constants"
-
-interface TtsVoiceModalProps {
-  open: boolean
-  /** 需要合成的文本（来自选中的文案 content） */
-  scriptText: string
-  scriptTitle: string
-  onCancel: () => void
-  /** 合成成功回调：asset_id 为保存到配音库后的素材ID */
-  onSynthesized: (payload: {
-    voiceAssetId: string
-    ttsVoiceId: string
-    ttsVoiceSource: "preset" | "clone"
-  }) => void
-}
-
-type TtsSynthStatus = "idle" | "synthesizing" | "saving" | "done" | "error"
-
-const TtsVoiceModal: React.FC<TtsVoiceModalProps> = ({
-  open,
-  scriptText,
-  scriptTitle,
-  onCancel,
-  onSynthesized,
-}) => {
-  const [activeTab, setActiveTab] = useState<"preset" | "clone">("preset")
-  const [selectedVoiceId, setSelectedVoiceId] = useState<string>("")
-  const [status, setStatus] = useState<TtsSynthStatus>("idle")
-  const [error, setError] = useState<string | null>(null)
-  const [previewingId, setPreviewingId] = useState<string | null>(null)
-  const audioRef = useRef<HTMLAudioElement | null>(null)
-  const timerRef = useRef<ReturnType<typeof setInterval> | null>(null)
-
-  /* 系统音色 */
-  const { data: presetData } = useQuery({
-    queryKey: ["preset-voices", "modal"],
-    queryFn: fetchPresetVoices,
-    enabled: open,
-  })
-  const presetVoices: PresetVoiceItem[] = useMemo(() => presetData?.items ?? [], [presetData])
-
-  /* 克隆音色（仅 ready 状态可用） */
-  const { data: cloneListRaw = [] } = useQuery({
-    queryKey: ["voice-clones", "ready"],
-    queryFn: () => getVoiceClones({ status: "ready" }),
-    enabled: open,
-  })
-  const cloneVoices: VoiceClone[] = useMemo(
-    () => cloneListRaw.filter((v: VoiceClone) => v.status === "ready"),
-    [cloneListRaw],
-  )
-
-  /* 打开时重置状态 */
-  useEffect(() => {
-    if (open) {
-      setSelectedVoiceId("")
-      setStatus("idle")
-      setError(null)
-      setActiveTab("preset")
-    } else {
-      if (timerRef.current) {
-        clearInterval(timerRef.current)
-        timerRef.current = null
-      }
-      if (audioRef.current) {
-        audioRef.current.pause()
-        audioRef.current = null
-      }
-      setPreviewingId(null)
-    }
-    return () => {
-      if (timerRef.current) clearInterval(timerRef.current)
-    }
-  }, [open])
-
-  const handlePreview = useCallback(
-    (voiceId: string, previewUrl: string | null | undefined) => {
-      if (!previewUrl) {
-        message.info("该音色暂无试听音频")
-        return
-      }
-      if (previewingId === voiceId && audioRef.current) {
-        audioRef.current.pause()
-        setPreviewingId(null)
-        return
-      }
-      if (audioRef.current) audioRef.current.pause()
-      const a = new Audio(previewUrl)
-      audioRef.current = a
-      setPreviewingId(voiceId)
-      a.onended = () => {
-        setPreviewingId(null)
-        audioRef.current = null
-      }
-      a.play().catch(() => {
-        setPreviewingId(null)
-        audioRef.current = null
-      })
-    },
-    [previewingId],
-  )
-
-  const textToSynth = useMemo(() => {
-    // 文案内容取首段（过长会被 TTS 截断，保持和用户感知一致）
-    const t = (scriptText || "").trim()
-    return t.length > 500 ? t.slice(0, 500) : t
-  }, [scriptText])
-
-  const handleSynthesize = useCallback(async () => {
-    if (!selectedVoiceId) {
-      message.warning("请先选择一个音色")
-      return
-    }
-    if (!textToSynth) {
-      message.warning("文案内容为空，无法合成")
-      return
-    }
-    setStatus("synthesizing")
-    setError(null)
-    try {
-      const isClone = activeTab === "clone"
-      const payload: Record<string, unknown> = {
-        text: textToSynth,
-        speed: 1.0,
-        language: "zh-CN",
-      }
-      if (isClone) {
-        payload.voice_clone_profile_id = selectedVoiceId
-      } else {
-        payload.voice_id = selectedVoiceId
-      }
-      const resp = await synthesizeSpeech(
-        payload as unknown as Parameters<typeof synthesizeSpeech>[0],
-      )
-      const jobId = resp.job_id
-
-      await new Promise<void>((resolve, reject) => {
-        timerRef.current = setInterval(async () => {
-          try {
-            const job = await getTTSJobStatus(jobId)
-            if (job.status === "completed") {
-              if (timerRef.current) clearInterval(timerRef.current)
-              timerRef.current = null
-              resolve()
-            } else if (job.status === "failed") {
-              if (timerRef.current) clearInterval(timerRef.current)
-              timerRef.current = null
-              reject(new Error(job.error_message || "合成失败"))
-            }
-          } catch (e) {
-            if (timerRef.current) clearInterval(timerRef.current)
-            timerRef.current = null
-            reject(e)
-          }
-        }, 2000)
-      })
-
-      // 保存到配音库
-      setStatus("saving")
-      await saveTtsToLibrary(jobId, { name: scriptTitle?.slice(0, 30) || "AI合成配音" })
-      setStatus("done")
-
-      // 合成成功后回调；voiceAssetId 由后端在保存时产出，这里用 ttsVoiceId 占位，
-      // 父流程会在下一次 asset 列表刷新后重新选取；前端直接以 ttsVoiceId 为 key 传给后端
-      // （叙事模式后端通过 script_id + tts_voice_id 自行再合成，不依赖 asset_id）。
-      onSynthesized({
-        voiceAssetId: jobId,
-        ttsVoiceId: selectedVoiceId,
-        ttsVoiceSource: isClone ? "clone" : "preset",
-      })
-    } catch (err: unknown) {
-      setStatus("error")
-      const msg = err instanceof Error ? err.message : "合成失败，请稍后重试"
-      setError(msg)
-    }
-  }, [selectedVoiceId, textToSynth, activeTab, scriptTitle, onSynthesized])
-
-  const renderVoiceCard = (v: {
-    id: string
-    name: string
-    description?: string
-    gender?: string
-    tags?: string[]
-    preview_url?: string | null
-  }) => {
-    const isSel = selectedVoiceId === v.id
-    const isPlaying = previewingId === v.id
-    const emoji = v.gender ? (VOICE_GENDER_ICON[v.gender] ?? "🎤") : "🎤"
-    return (
-      <div
-        key={v.id}
-        onClick={() => setSelectedVoiceId(v.id)}
-        style={{
-          padding: 12,
-          borderRadius: 8,
-          border: isSel ? "2px solid #7c3aed" : "1px solid #e5e7eb",
-          background: isSel ? "#faf5ff" : "#fff",
-          cursor: "pointer",
-          transition: "all 0.2s",
-          position: "relative",
-        }}
-      >
-        {isSel && (
-          <CheckCircleFilled
-            style={{
-              position: "absolute",
-              top: 10,
-              right: 10,
-              color: "#7c3aed",
-            }}
-          />
-        )}
-        <div style={{ display: "flex", alignItems: "center", gap: 10, marginBottom: 8 }}>
-          <div
-            style={{
-              width: 36,
-              height: 36,
-              borderRadius: "50%",
-              background: isSel ? "linear-gradient(135deg,#7c3aed,#a78bfa)" : "#f3f4f6",
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-              fontSize: 18,
-            }}
-          >
-            {emoji}
-          </div>
-          <div style={{ flex: 1, minWidth: 0 }}>
-            <div
-              style={{
-                fontSize: 14,
-                fontWeight: 600,
-                color: isSel ? "#6d28d9" : "#111",
-                overflow: "hidden",
-                textOverflow: "ellipsis",
-                whiteSpace: "nowrap",
-              }}
-            >
-              {v.name}
-            </div>
-            {v.description && (
-              <div
-                style={{
-                  fontSize: 11,
-                  color: "#6b7280",
-                  overflow: "hidden",
-                  textOverflow: "ellipsis",
-                  whiteSpace: "nowrap",
-                }}
-              >
-                {v.description}
-              </div>
-            )}
-          </div>
-          {v.preview_url && (
-            <button
-              type="button"
-              onClick={(e) => {
-                e.stopPropagation()
-                handlePreview(v.id, v.preview_url)
-              }}
-              style={{
-                width: 28,
-                height: 28,
-                borderRadius: "50%",
-                border: "none",
-                background: isPlaying ? "#ef4444" : "#7c3aed",
-                color: "#fff",
-                cursor: "pointer",
-                fontSize: 11,
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "center",
-              }}
-            >
-              <SoundOutlined />
-            </button>
-          )}
-        </div>
-        {v.tags && v.tags.length > 0 && (
-          <div style={{ display: "flex", gap: 4, flexWrap: "wrap" }}>
-            {v.tags.slice(0, 3).map((tg) => (
-              <span
-                key={tg}
-                style={{
-                  fontSize: 10,
-                  padding: "1px 6px",
-                  borderRadius: 8,
-                  background: "#f3f4f6",
-                  color: "#6b7280",
-                }}
-              >
-                {tg}
-              </span>
-            ))}
-          </div>
-        )}
-      </div>
-    )
-  }
-
-  /* 合成中 loading 覆盖层 */
-  const renderSynthOverlay = () => {
-    if (status !== "synthesizing" && status !== "saving") return null
-    return (
-      <div
-        style={{
-          position: "absolute",
-          inset: 0,
-          background: "rgba(255,255,255,0.92)",
-          zIndex: 10,
-          display: "flex",
-          flexDirection: "column",
-          alignItems: "center",
-          justifyContent: "center",
-          gap: 12,
-          borderRadius: 8,
-        }}
-      >
-        <Spin size="large" style={{ color: "#7c3aed" }} />
-        <div style={{ fontSize: 16, fontWeight: 600, color: "#6d28d9" }}>
-          {status === "synthesizing" ? "正在合成配音..." : "正在保存到配音库..."}
-        </div>
-        <div style={{ fontSize: 12, color: "#6b7280" }}>请稍候，通常需要 10-30 秒</div>
-      </div>
-    )
-  }
-
-  return (
-    <Modal
-      title="🎙️ 合成配音"
-      open={open}
-      onCancel={status === "synthesizing" || status === "saving" ? undefined : onCancel}
-      cancelText="取消"
-      okText="🎧 合成配音"
-      okButtonProps={{
-        disabled: !selectedVoiceId || status === "synthesizing" || status === "saving",
-        style: { background: "#7c3aed" },
-      }}
-      onOk={handleSynthesize}
-      width={680}
-      destroyOnClose
-      confirmLoading={status === "synthesizing" || status === "saving"}
-    >
-      <div style={{ position: "relative" }}>
-        {error && (
-          <div
-            style={{
-              padding: "10px 12px",
-              background: "#fef2f2",
-              border: "1px solid #fecaca",
-              color: "#b91c1c",
-              borderRadius: 6,
-              fontSize: 13,
-              marginBottom: 12,
-            }}
-          >
-            {error}
-          </div>
-        )}
-
-        <div
-          style={{
-            fontSize: 12,
-            color: "#6b7280",
-            marginBottom: 12,
-            padding: "8px 12px",
-            background: "#f9fafb",
-            borderRadius: 6,
-          }}
-        >
-          将根据文案《{scriptTitle?.slice(0, 30) || "所选文案"}》合成配音，文本长度：
-          {textToSynth.length} 字
-        </div>
-
-        <Tabs
-          activeKey={activeTab}
-          onChange={(k) => {
-            setActiveTab(k as "preset" | "clone")
-            setSelectedVoiceId("")
-          }}
-          items={[
-            {
-              key: "preset",
-              label: "✨ 系统音色",
-              children: (
-                <div
-                  style={{
-                    display: "grid",
-                    gridTemplateColumns: "1fr 1fr",
-                    gap: 10,
-                    maxHeight: 420,
-                    overflowY: "auto",
-                    paddingRight: 4,
-                  }}
-                >
-                  {presetVoices.length === 0 ? (
-                    <div
-                      style={{
-                        gridColumn: "1/-1",
-                        textAlign: "center",
-                        padding: 30,
-                        color: "#9ca3af",
-                      }}
-                    >
-                      正在加载系统音色...
-                    </div>
-                  ) : (
-                    presetVoices.map((v) =>
-                      renderVoiceCard({
-                        id: v.voice_id,
-                        name: v.name,
-                        description: v.description,
-                        gender: v.gender,
-                        tags: v.tags,
-                        preview_url: v.preview_url,
-                      }),
-                    )
-                  )}
-                </div>
-              ),
-            },
-            {
-              key: "clone",
-              label: "🎙️ 我的克隆音色",
-              children: (
-                <div
-                  style={{
-                    display: "grid",
-                    gridTemplateColumns: "1fr 1fr",
-                    gap: 10,
-                    maxHeight: 420,
-                    overflowY: "auto",
-                    paddingRight: 4,
-                  }}
-                >
-                  {cloneVoices.length === 0 ? (
-                    <div
-                      style={{
-                        gridColumn: "1/-1",
-                        textAlign: "center",
-                        padding: 30,
-                        color: "#9ca3af",
-                      }}
-                    >
-                      暂无就绪的克隆音色，请先在配音库完成音色克隆
-                    </div>
-                  ) : (
-                    cloneVoices.map((v) =>
-                      renderVoiceCard({
-                        id: v.id,
-                        name: v.name,
-                        description: v.description,
-                        gender: "neutral",
-                        tags: ["克隆"],
-                        preview_url: v.sample_url || null,
-                      }),
-                    )
-                  )}
-                </div>
-              ),
-            },
-          ]}
-        />
-        {renderSynthOverlay()}
-      </div>
-    </Modal>
-  )
-}
-
-export default TtsVoiceModal

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

@@ -1,241 +0,0 @@
-/**
- * 随机混剪 — 配音选择弹窗（#1970）
- * 内容复用 Step5VoiceSelect 的配音库音频卡片（图标+文件名+时长/大小+▶试听），
- * 无 TTS / 克隆音色入口；确认后进入 Step2。
- */
-import React from "react"
-import { Modal } from "antd"
-import { AudioOutlined } from "@ant-design/icons"
-import { useNavigate } from "react-router-dom"
-import { useQuery } from "@tanstack/react-query"
-import { useState, useRef, useCallback } from "react"
-import { getAssetsByKind } from "@/api/assets"
-import type { AssetItem } from "@/api/assets"
-
-interface VoiceSelectModalProps {
-  open: boolean
-  selectedVoice: string
-  onCancel: () => void
-  onConfirm: (voiceAssetId: string) => void
-}
-
-const getDuration = (item: AssetItem): number =>
-  item.duration ?? (item.metadata?.duration as number) ?? 0
-const getFileSize = (item: AssetItem): number =>
-  item.file_size ?? (item.metadata?.file_size as number) ?? 0
-const isAiVoice = (item: AssetItem): boolean => {
-  const d = getDuration(item)
-  const s = getFileSize(item)
-  return (!d || d <= 0) && (!s || s <= 0)
-}
-const fmtDur = (s?: number): string => {
-  if (!s || s <= 0) return "时长未知"
-  return `${s.toFixed(1)}秒`
-}
-const fmtSize = (b?: number): string => {
-  if (!b || b <= 0) return "未知"
-  if (b < 1024) return `${b} B`
-  if (b < 1024 * 1024) return `${(b / 1024).toFixed(1)} KB`
-  if (b < 1024 * 1024 * 1024) return `${(b / (1024 * 1024)).toFixed(1)} MB`
-  return `${(b / (1024 * 1024 * 1024)).toFixed(1)} GB`
-}
-
-const VoiceSelectModal: React.FC<VoiceSelectModalProps> = ({
-  open,
-  selectedVoice,
-  onCancel,
-  onConfirm,
-}) => {
-  const navigate = useNavigate()
-  const [innerSelected, setInnerSelected] = React.useState(selectedVoice)
-  const [playingId, setPlayingId] = useState<string | null>(null)
-  const audioRef = useRef<HTMLAudioElement | null>(null)
-
-  React.useEffect(() => {
-    if (open) setInnerSelected(selectedVoice)
-  }, [open, selectedVoice])
-
-  const { data: materials = [], isLoading } = useQuery({
-    queryKey: ["assets", "voice", "modal"],
-    queryFn: () => getAssetsByKind("voice", { limit: 50 }),
-    enabled: open,
-  })
-
-  const togglePlay = useCallback(
-    (item: AssetItem) => {
-      if (playingId === item.id && audioRef.current) {
-        audioRef.current.pause()
-        setPlayingId(null)
-        return
-      }
-      if (audioRef.current) audioRef.current.pause()
-      if (!item.file_url) return
-      const audio = new Audio(item.file_url)
-      audioRef.current = audio
-      setPlayingId(item.id)
-      audio.onended = () => {
-        setPlayingId(null)
-        audioRef.current = null
-      }
-      audio.play().catch(() => {
-        setPlayingId(null)
-        audioRef.current = null
-      })
-    },
-    [playingId],
-  )
-
-  const handleGoUpload = () => navigate("/app/voices?tab=material&upload=1")
-
-  const handleConfirm = () => {
-    if (!innerSelected) return
-    onConfirm(innerSelected)
-  }
-
-  return (
-    <Modal
-      title="🎙️ 选择配音"
-      open={open}
-      onCancel={onCancel}
-      onOk={handleConfirm}
-      okText="确认选择"
-      cancelText="取消"
-      okButtonProps={{ disabled: !innerSelected, style: { background: "#7c3aed" } }}
-      width={720}
-      destroyOnClose
-    >
-      <p style={{ color: "#666", fontSize: 13, marginBottom: 12 }}>
-        从配音库中选择已上传的音频素材，点击 ▶ 可试听
-      </p>
-      {isLoading ? (
-        <div style={{ textAlign: "center", padding: "40px 0", color: "#999" }}>加载中...</div>
-      ) : materials.length === 0 ? (
-        <div style={{ textAlign: "center", padding: "40px 0", color: "#999" }}>
-          <AudioOutlined style={{ fontSize: 48, color: "#d9d9d9", marginBottom: 12 }} />
-          <p style={{ marginBottom: 12 }}>暂无配音素材</p>
-          <button
-            type="button"
-            onClick={handleGoUpload}
-            style={{
-              padding: "8px 20px",
-              background: "#7c3aed",
-              color: "#fff",
-              border: "none",
-              borderRadius: 6,
-              cursor: "pointer",
-            }}
-          >
-            去配音库上传
-          </button>
-        </div>
-      ) : (
-        <div
-          style={{
-            display: "grid",
-            gridTemplateColumns: "repeat(auto-fill, minmax(200px, 1fr))",
-            gap: 12,
-            maxHeight: 460,
-            overflowY: "auto",
-            paddingRight: 4,
-          }}
-        >
-          {materials.map((item) => {
-            const isSel = innerSelected === item.id
-            const isPlaying = playingId === item.id
-            return (
-              <div
-                key={item.id}
-                onClick={() => setInnerSelected(item.id)}
-                style={{
-                  padding: 14,
-                  borderRadius: 8,
-                  border: isSel ? "2px solid #7c3aed" : "1px solid #e8e8e8",
-                  background: isSel ? "#ede9fe" : "#fff",
-                  cursor: "pointer",
-                  transition: "all 0.2s",
-                }}
-              >
-                <div
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    justifyContent: "space-between",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: 36,
-                      height: 36,
-                      borderRadius: 8,
-                      background: isSel
-                        ? "linear-gradient(135deg,#7c3aed,#a78bfa)"
-                        : "linear-gradient(135deg,#f0f0f0,#e8e8e8)",
-                      display: "flex",
-                      alignItems: "center",
-                      justifyContent: "center",
-                    }}
-                  >
-                    <AudioOutlined style={{ color: isSel ? "#fff" : "#666" }} />
-                  </div>
-                  {item.file_url && (
-                    <button
-                      type="button"
-                      onClick={(e) => {
-                        e.stopPropagation()
-                        togglePlay(item)
-                      }}
-                      style={{
-                        width: 30,
-                        height: 30,
-                        borderRadius: "50%",
-                        border: "none",
-                        background: isPlaying ? "#ef4444" : "#7c3aed",
-                        color: "#fff",
-                        cursor: "pointer",
-                        fontSize: 12,
-                      }}
-                    >
-                      ▶
-                    </button>
-                  )}
-                </div>
-                <div
-                  style={{
-                    fontSize: 13,
-                    fontWeight: 500,
-                    marginTop: 8,
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                    color: isSel ? "#6d28d9" : "#333",
-                  }}
-                  title={item.name}
-                >
-                  {item.name}
-                </div>
-                <div
-                  style={{
-                    display: "flex",
-                    justifyContent: "space-between",
-                    fontSize: 11,
-                    color: "#999",
-                    marginTop: 4,
-                  }}
-                >
-                  {isAiVoice(item) ? (
-                    <span style={{ color: "#7c3aed", fontWeight: 500 }}>AI 音色</span>
-                  ) : (
-                    <span>{fmtDur(getDuration(item))}</span>
-                  )}
-                  <span>{isAiVoice(item) ? "按文本合成" : fmtSize(getFileSize(item))}</span>
-                </div>
-              </div>
-            )
-          })}
-        </div>
-      )}
-    </Modal>
-  )
-}
-
-export default VoiceSelectModal

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

@@ -27,10 +27,10 @@ export const VOICE_GENDER_ICON: Record<string, string> = {
   neutral: "✨",
 }
 
-/* ── 步骤定义（5步，#1970 流程重构：选择模式 → 素材 → 标题 → 确认 → 封面） ── */
+/* ── 步骤定义（5步，#1899 简化：删除选模板步骤） ── */
 export const STEPS = [
-  { key: 1, label: "选择模式" },
-  { key: 2, label: "选择素材" },
+  { key: 1, label: "选择素材" },
+  { key: 2, label: "选择配音" },
   { key: 3, label: "选择标题" },
   { key: 4, label: "确认生成" },
   { key: 5, label: "选择封面" },

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

@@ -3376,18 +3376,14 @@
 }
 
 /* ============================================================
-   第5步确认生成：批量渲染进度网格（Issue #1677 / #1800 布局修复）
-   - 列宽从 minmax(160,180) 放宽到 minmax(300,360)，避免进度条/标题挤压
-   - 卡片 width:100% 撑满列宽，避免 inline maxWidth 硬编码
-   - 标题图标/文本拆分 flex 布局，文本 ellipsis 长标题不溢出
+   第5步确认生成：批量渲染进度网格（Issue #1677）
    ============================================================ */
 .xx-batch-gen-grid {
+  justify-items: center;
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(300px, 360px));
+  grid-template-columns: repeat(auto-fill, minmax(160px, 180px));
   justify-content: center;
-  justify-items: stretch;
   gap: 14px;
-  width: 100%;
 }
 
 .xx-batch-gen-card {
@@ -3398,9 +3394,7 @@
   display: flex;
   flex-direction: column;
   gap: 10px;
-  width: 100%;
   min-width: 0;
-  box-sizing: border-box;
 }
 
 .xx-batch-gen-card.status-completed {
@@ -3416,30 +3410,14 @@
 .xx-batch-gen-card-head {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   gap: 8px;
-  min-width: 0;
 }
 
 .xx-batch-gen-card-title {
-  display: flex;
-  align-items: center;
-  gap: 6px;
   font-size: 14px;
   font-weight: 600;
   color: var(--text-primary, #1a1a1a);
-  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-}
-
-.xx-batch-gen-card-icon {
-  flex-shrink: 0;
-  font-size: 14px;
-}
-
-.xx-batch-gen-card-title-text {
-  flex: 1;
-  min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -3449,7 +3427,6 @@
   display: flex;
   flex-direction: column;
   gap: 8px;
-  min-width: 0;
 }
 
 .xx-batch-gen-card-pct {
@@ -3478,10 +3455,10 @@
   word-break: break-word;
 }
 
-/* ── 响应式：窄屏批量网格回退单列 ── */
+/* ── 响应式：窄屏批量网格回退单列（.xx-canvas-grid 的窄屏限宽见网格定义处 #1741） ── */
 @media (max-width: 960px) {
   .xx-batch-gen-grid {
     justify-items: center;
-    grid-template-columns: minmax(0, 360px);
+    grid-template-columns: minmax(0, 320px);
   }
 }

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

@@ -1,9 +1,7 @@
 import type { UseGenerateVideoProps } from "./types"
 
 /**
- * 生成前置校验（#1970 适配新流程）
- * - 随机混剪：需选配音（selectedVoice，配音库音频）
- * - 叙事剪辑：需选文案 + TTS 音色
+ * 生成前置校验
  * 返回错误信息，通过则返回 null
  */
 export const validateGenerateInputs = (props: UseGenerateVideoProps): string | null => {
@@ -14,30 +12,19 @@ export const validateGenerateInputs = (props: UseGenerateVideoProps): string | n
     smartSelectedIds,
     voiceMode,
     selectedClonedVoice,
-    editMode = "random",
-    selectedScript,
-    ttsVoiceId,
-    selectedVoice,
   } = props
 
+  // AI 自动选择模式下，标题可以为空（后端会自行生成）
   if (!titleSettings.aiAutoSelect && !titleSettings.title?.trim()) {
     return "请先选择或输入标题"
   }
+  // 无论手动还是自动模式，都必须有素材
   const materialIds = materialMode === "auto" ? smartSelectedIds || [] : selectedMaterials || []
   if (materialIds.length === 0) {
     return materialMode === "auto" ? "AI 未匹配到素材，请手动选择素材后重试" : "请至少选择一个素材"
   }
-  if (editMode === "narrative") {
-    if (!selectedScript?.id) return "请先选择文案"
-    if (!ttsVoiceId) return "请先合成配音"
-  } else {
-    // 随机混剪：配音库音频
-    if (!selectedVoice && voiceMode !== "clone") {
-      return "请先选择配音"
-    }
-    if (voiceMode === "clone" && !selectedClonedVoice) {
-      return "请先选择一个克隆音色"
-    }
+  if (voiceMode === "clone" && !selectedClonedVoice) {
+    return "请先选择一个克隆音色"
   }
   return null
 }

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

@@ -13,19 +13,7 @@ export interface UseGenerateVideoProps {
   selectedVoice: string
   selectedClonedVoice: string
   coverSettings: CoverConfig
-  videoRatio: "9:16" | "16:9" | string
-  /** #1970 剪辑模式 */
-  editMode?: "random" | "narrative"
-  /** 叙事模式下选中的文案 */
-  selectedScript?: { id: string; title?: string; content?: string } | null
-  /** TTS 音色 ID（叙事模式） */
-  ttsVoiceId?: string
-  /** TTS 音色来源 */
-  ttsVoiceSource?: "preset" | "clone"
-  /** 合成后保存到配音库的 asset id / job id（叙事模式） */
-  ttsVoiceAssetId?: string
-  /** 智能降重开关（默认 true） */
-  dedupEnabled?: boolean
+  videoRatio: string
   style: string
   duration: number
   autoSubtitles: boolean

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

@@ -1,74 +1,58 @@
 /**
  * 生成前积分消耗估算与余额校验
- * 用于步骤「确认生成」按钮前展示本次消耗，积分不足时禁用并提示充值
- *
- * 契约对齐（2026-09-16 最终版）：
- * - balance 不再包含 free_clips_* 字段，免费额度通过 dailyUsage 传入
- * - 乘数逻辑：非会员 ceil(base × free_user_multiplier)，会员 floor(base × points_discount)
- * - points_discount 从 subscription.plans.points_discount 获取（mock 阶段用 1 占位）
+ * 用于步骤4「确认生成」按钮前展示本次消耗，积分不足时禁用并提示充值
  */
-import type { PointsBalance, DailyUsage } from "@/api/points/types"
-import type { SubscriptionPlan } from "@/api/subscription/types"
+import type { PointsBalance } from "@/api/points/types"
 
-/** 生成单条视频基准积分（ai_video base_points=8，但向导默认使用短片段，先保守按 3 估算） */
+/** 生成单条视频消耗积分（基准） */
 export const BASE_VIDEO_POINTS = 3
 
-/** 默认免费用户倍率（后端 free_user_multiplier，mock 默认 1.15） */
-const DEFAULT_FREE_MULTIPLIER = 1.15
+/**
+ * 估算生成任务的积分消耗
+ * @param videoCount 视频条数（批量模式）
+ * @param memberMultiplier 会员倍率（免费用户 1.15）
+ */
+export function estimateGenerateCost(videoCount: number, memberMultiplier = 1): number {
+  const raw = BASE_VIDEO_POINTS * videoCount * memberMultiplier
+  // 向上取整，避免小数
+  return Math.ceil(raw)
+}
 
-export interface HasEnoughPointsResult {
+/**
+ * 判断积分是否充足（含每日免费额度）
+ * @returns sufficient=true 表示可以继续生成；false 需要提示充值
+ */
+export function hasEnoughPoints(
+  balance: PointsBalance | null,
+  videoCount: number,
+): {
   sufficient: boolean
   cost: number
   reason?: string
   freeClipsUsed?: number
   freeClipsRemaining?: number
-}
-
-/**
- * 判断积分是否充足（含每日免费额度）
- * @param balance 积分余额
- * @param videoCount 视频条数（批量模式下为 variant 数）
- * @param dailyUsage 每日免费额度（可选；不传视为 0）
- * @param plans 当前可用订阅计划列表（用于计算会员积分折扣；mock 传 []）
- * @param currentPlanId 当前用户 plan_id（free/monthly/quarterly/yearly）
- * @param freeMultiplier 免费用户倍率，默认 1.15
- */
-export function hasEnoughPoints(
-  balance: PointsBalance | null,
-  videoCount: number,
-  dailyUsage?: DailyUsage | null,
-  plans: SubscriptionPlan[] = [],
-  currentPlanId: string = "free",
-  freeMultiplier: number = DEFAULT_FREE_MULTIPLIER,
-): HasEnoughPointsResult {
+} {
   if (!balance) {
-    return { sufficient: true, cost: estimateGenerateCost(videoCount, 1) }
+    // 未登录或未加载：不拦截，后端会校验
+    return { sufficient: true, cost: estimateGenerateCost(videoCount) }
   }
 
-  const isMember = balance.is_member && currentPlanId !== "free"
-  const plan = plans.find((p) => p.plan_id === currentPlanId)
-  const multiplier = isMember ? (plan?.points_discount ?? 1) : freeMultiplier
-  const raw = BASE_VIDEO_POINTS * videoCount * multiplier
-  const cost = isMember ? Math.floor(raw) : Math.ceil(raw)
+  const isMember = balance.is_member
+  const multiplier = isMember ? 1 : 1.15
+  const cost = estimateGenerateCost(videoCount, multiplier)
 
-  const freeRemain = dailyUsage?.free_clips_remaining ?? 0
-
-  // 非会员优先用每日免费额度
-  if (!isMember && freeRemain > 0) {
-    const freeUsed = Math.min(freeRemain, videoCount)
-    const afterFree = videoCount - freeUsed
-    const paidCost =
-      afterFree === 0
-        ? 0
-        : isMember
-          ? Math.floor(BASE_VIDEO_POINTS * afterFree * multiplier)
-          : Math.ceil(BASE_VIDEO_POINTS * afterFree * multiplier)
+  // 免费用户优先使用每日免费额度
+  if (!isMember && balance.free_clips_remaining && balance.free_clips_remaining > 0) {
+    const freeUsed = Math.min(balance.free_clips_remaining, videoCount)
+    const remainingAfterFree = videoCount - freeUsed
+    const paidCost = estimateGenerateCost(remainingAfterFree, multiplier)
     if (paidCost === 0) {
+      // 完全用免费额度
       return {
         sufficient: true,
         cost: 0,
         freeClipsUsed: freeUsed,
-        freeClipsRemaining: freeRemain - freeUsed,
+        freeClipsRemaining: balance.free_clips_remaining - freeUsed,
       }
     }
     if (balance.balance >= paidCost) {
@@ -76,28 +60,24 @@ export function hasEnoughPoints(
         sufficient: true,
         cost: paidCost,
         freeClipsUsed: freeUsed,
-        freeClipsRemaining: freeRemain - freeUsed,
+        freeClipsRemaining: balance.free_clips_remaining - freeUsed,
       }
     }
     return {
       sufficient: false,
       cost: paidCost,
-      reason: `积分不足：本次需 ${paidCost} 积分（已用 ${freeUsed} 次免费额度），当前余额 ${balance.balance}，还差 ${paidCost - balance.balance} 积分`,
+      reason: `积分不足：本次需 ${paidCost} 积分（使用 ${freeUsed} 次免费额度后），当前余额 ${balance.balance}，还差 ${paidCost - balance.balance} 积分`,
       freeClipsUsed: freeUsed,
     }
   }
 
-  if (balance.balance >= cost) return { sufficient: true, cost }
+  // 付费会员或免费额度用完
+  if (balance.balance >= cost) {
+    return { sufficient: true, cost }
+  }
   return {
     sufficient: false,
     cost,
     reason: `积分不足：本次需 ${cost} 积分，当前余额 ${balance.balance}，还差 ${cost - balance.balance} 积分`,
   }
 }
-
-/**
- * 估算生成任务的积分消耗（导出给 UI 直接使用）
- */
-export function estimateGenerateCost(videoCount: number, multiplier = 1): number {
-  return Math.ceil(BASE_VIDEO_POINTS * videoCount * multiplier)
-}

apps/web/src/pages/generate/hooks/useGenerateFormState/index.ts

@@ -12,7 +12,6 @@ import { getEditingTemplates } from "@/api/editing-planner"
 import type { EditPlanClip } from "@/api/template-editor"
 import type { CoverConfig } from "../../types/cover"
 import type { PresetVoiceItem } from "@/api/voices"
-import type { ScriptItem } from "@/api/scripts"
 import { DEFAULT_COVER_SETTINGS, DEFAULT_CLIP_COUNT } from "../../constants"
 import type { TitleSettings } from "../../types"
 import { usePlanConfigLoader } from "./usePlanConfigLoader"
@@ -83,28 +82,8 @@ export interface GenerateFormState {
   cloneModalOpen: boolean
   setCloneModalOpen: (open: boolean) => void
 
-  /* ── 剪辑模式（#1970 流程重构）── */
-  editMode: "random" | "narrative"
-  setEditMode: (mode: "random" | "narrative") => void
-  /** 叙事模式下选中的文案 */
-  selectedScript: ScriptItem | null
-  setSelectedScript: (s: ScriptItem | null) => void
-  /** TTS 音色 ID */
-  ttsVoiceId: string
-  setTtsVoiceId: (id: string) => void
-  /** TTS 音色来源：preset 系统 / clone 克隆 */
-  ttsVoiceSource: "preset" | "clone"
-  setTtsVoiceSource: (src: "preset" | "clone") => void
-  /** 合成后配音库 asset id（叙事模式保存到库后获得；随机模式 = selectedVoice） */
-  ttsVoiceAssetId: string
-  setTtsVoiceAssetId: (id: string) => void
-  /** 智能降重开关（默认 true） */
-  dedupEnabled: boolean
-  setDedupEnabled: (v: boolean) => void
-
   /* 高级设置 */
-  videoRatio: "9:16" | "16:9" | string
-  setVideoRatio: (r: "9:16" | "16:9") => void
+  videoRatio: string
   duration: number
   style: string
   autoSubtitles: boolean
@@ -222,21 +201,13 @@ export const useGenerateFormState = (): GenerateFormState => {
   /* ── 克隆声音弹窗 ── */
   const [cloneModalOpen, setCloneModalOpen] = useState(false)
 
-  /* ── 高级设置 ── */
-  const [videoRatio, setVideoRatio] = useState<"9:16" | "16:9">("9:16")
+  /* ── 高级设置（隐藏但保留） ── */
+  const [videoRatio] = useState("9:16")
   const [duration] = useState(30)
   const [style] = useState("business")
   const [autoSubtitles] = useState(true)
   const [bgm] = useState(true)
 
-  /* ── 剪辑模式状态（#1970） ── */
-  const [editMode, setEditMode] = useState<"random" | "narrative">("random")
-  const [selectedScript, setSelectedScript] = useState<ScriptItem | null>(null)
-  const [ttsVoiceId, setTtsVoiceId] = useState<string>("")
-  const [ttsVoiceSource, setTtsVoiceSource] = useState<"preset" | "clone">("preset")
-  const [ttsVoiceAssetId, setTtsVoiceAssetId] = useState<string>("")
-  const [dedupEnabled, setDedupEnabled] = useState<boolean>(true)
-
   /* ── 预览任务 ID ── */
   const previewStorageKey = editPlanId
     ? `preview_task_id_${editPlanId}`
@@ -303,22 +274,9 @@ export const useGenerateFormState = (): GenerateFormState => {
     selectedClonedVoice,
     setSelectedClonedVoice,
     presetVoices,
-    editMode,
-    setEditMode,
-    selectedScript,
-    setSelectedScript,
-    ttsVoiceId,
-    setTtsVoiceId,
-    ttsVoiceSource,
-    setTtsVoiceSource,
-    ttsVoiceAssetId,
-    setTtsVoiceAssetId,
-    dedupEnabled,
-    setDedupEnabled,
     cloneModalOpen,
     setCloneModalOpen,
     videoRatio,
-    setVideoRatio,
     duration,
     style,
     autoSubtitles,

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

@@ -123,8 +123,6 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
       const { width: outputWidth, height: outputHeight } = calculateResolution(
         props.videoRatio || "9:16",
       )
-      const editMode = props.editMode ?? "random"
-      const dedupEnabled = props.dedupEnabled !== false
 
       const assetIds =
         props.materialMode === "auto" ? props.smartSelectedIds : props.selectedMaterials
@@ -153,13 +151,10 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
 
       const coverUrl = props.coverSettings?.thumbnail_url || props.coverSettings?.upload_url || ""
 
-      // #1970：叙事模式下 ttsVoiceId 作为配音 id；随机模式用 selectedVoice
       const voiceLibraryId =
-        editMode === "narrative"
-          ? props.ttsVoiceId || ""
-          : props.voiceMode === "clone"
-            ? props.selectedClonedVoice || props.selectedVoice || ""
-            : props.selectedVoice || ""
+        props.voiceMode === "clone"
+          ? props.selectedClonedVoice || props.selectedVoice || ""
+          : props.selectedVoice || ""
 
       /* ── 批量变体数组（长度1=共用，长度=count=独立，空=回退单值） ── */
       const indexes =
@@ -202,15 +197,6 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
           custom_title: props.titleSettings?.title || "",
           duration: props.duration || undefined,
           video_ratio: props.videoRatio,
-          assembly_mode: editMode,
-          ...(editMode === "narrative" && props.selectedScript?.id
-            ? {
-                script_id: props.selectedScript.id,
-                tts_voice_id: props.ttsVoiceId || undefined,
-                tts_voice_source: props.ttsVoiceSource || undefined,
-              }
-            : {}),
-          dedup_enabled: dedupEnabled,
           voice_library_id: voiceLibraryId,
           ...(props.selectedVoice && !voiceLibraryId ? { voice_ids: [props.selectedVoice] } : {}),
           bgm_config: {

apps/web/src/pages/generate/hooks/useStep4Title/index.ts

@@ -1,7 +1,6 @@
 import { useEffect, useRef } from "react"
 import { useQuery } from "@tanstack/react-query"
-// #1894: 标题候选从文案库 scripts[].title 获取，不再调用废弃的 /api/titles
-import { getScripts } from "@/api/scripts"
+import { getTitles } from "@/api/titles"
 import type { TitleSettings } from "../../types"
 import { useAiTitleGenerator } from "./useAiTitleGenerator"
 import { useTitleStyleUpdaters } from "./useTitleStyleUpdaters"
@@ -23,14 +22,10 @@ export function useStep4Title({
   onTitleSettingsChange,
   selectedTemplate,
 }: UseStep4TitleProps) {
-  // 标题候选（#1894：统一从文案库取 scripts[].title，去重）
+  // 标题库数据
   const { data: userTitles = [] } = useQuery({
-    queryKey: ["scripts", "titles-source"],
-    queryFn: async () => {
-      const res = await getScripts({ page_size: 200 })
-      const items = Array.isArray(res) ? res : (res.items ?? [])
-      return items.map((s) => ({ content: (s.title || "").trim() })).filter((s) => !!s.content)
-    },
+    queryKey: ["titles"],
+    queryFn: () => getTitles(),
     staleTime: 30_000,
   })
 

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

@@ -1,22 +1,17 @@
 /**
- * GeneratePage 步骤导航（#1970 流程重构）
- * 步骤：选择模式(1) → 选择素材(2) → 选择标题(3) → 确认生成(4) → 选择封面(5)
+ * GeneratePage 步骤导航（#1899 简化为 5 步，单视频与批量一致）
+ * 步骤：素材(1) → 配音(2) → 标题(3) → 确认生成(4) → 封面(5)
  *
- * - 步骤1（选择模式）：下一步分支由外层弹窗处理（VoiceSelectModal / ScriptSelectModal），
- *   本 hook 的 goNext 仅在未选模式时拦截；外层 Modal onConfirm 里主动 setCurrentStep(2)。
- * - 步骤2（选择素材）：弹数量选择弹窗（PreviewCountModal），确认后跳步骤3。
- * - 步骤3 底部按钮是「确认生成视频」（由 GenerateStepActions 调 onConfirmGenerate），
- *   创建成功后跳步骤4；本 hook 的 goNext 只负责 2→3 和 4→5 的「下一步」。
- * - 步骤4（确认生成进度页）：全部渲染完成后「下一步」解锁进封面。
+ * - 步骤3底部按钮是「确认生成视频」（由 GenerateStepActions 调 onConfirmGenerate），
+ *   创建成功后跳转步骤4；本 hook 的 goNext 只负责 1→2→3 和 4→5 的「下一步」。
+ * - 步骤4（确认生成进度页）：渲染全部完成（generated）后「下一步」解锁进封面。
  */
 import { message } from "antd"
 import type { TitleSettings } from "../types"
-import type { EditMode } from "../components/Step1EditMode"
 
 export interface UseStepNavigationOptions {
   currentStep: number
   setCurrentStep: (step: number | ((prev: number) => number)) => void
-  editMode: EditMode
   materialMode: "manual" | "auto"
   selectedMaterials: string[]
   smartSelectedIds: string[]
@@ -25,8 +20,6 @@ export interface UseStepNavigationOptions {
   generated: boolean
   /** 点素材下一步时弹出数量选择弹窗 */
   onOpenCountModal: () => void
-  /** 步骤1下一步：根据 editMode 打开对应弹窗（随机→配音 / 叙事→文案） */
-  onOpenStep1Modal: () => void
 }
 
 export interface UseStepNavigationReturn {
@@ -43,27 +36,20 @@ export const useStepNavigation = (options: UseStepNavigationOptions): UseStepNav
     smartSelectedIds,
     generated,
     onOpenCountModal,
-    onOpenStep1Modal,
   } = options
 
   const goNext = () => {
     if (currentStep === 1) {
-      // 步骤1：先校验素材/配音等由弹窗负责，goNext 只负责触发弹窗
-      onOpenStep1Modal()
+      // 选完素材弹数量选择弹窗
+      onOpenCountModal()
       return
     }
-    if (currentStep === 2) {
-      // 素材校验
-      if (materialMode === "manual" && selectedMaterials.length === 0) {
-        message.warning("请至少选择一个素材")
-        return
-      }
-      if (materialMode === "auto" && smartSelectedIds.length === 0) {
-        message.warning("请先进行智能匹配并选择素材")
-        return
-      }
-      // 弹数量选择弹窗
-      onOpenCountModal()
+    if (currentStep === 1 && materialMode === "manual" && selectedMaterials.length === 0) {
+      message.warning("请至少选择一个素材")
+      return
+    }
+    if (currentStep === 1 && materialMode === "auto" && smartSelectedIds.length === 0) {
+      message.warning("请先进行智能匹配并选择素材")
       return
     }
     // 步骤4（确认生成）：全部渲染完成后才能下一步进封面

apps/web/src/pages/points/Center.tsx

@@ -1,11 +1,6 @@
 /**
- * 积分中心主页（/points 或 /app/points）
- * 展示余额、会员信息、免费额度、快捷入口、最近流水
- *
- * 字段对齐新契约（2026-09-16）：
- *  - balance 不含 free_clips_*，从 dailyUsage 取
- *  - subscription.member_type → plan_id（free/monthly/quarterly/yearly）
- *  - subscription.member_type_name → 前端 PLAN_LABEL 映射
+ * 积分中心主页（/app/points）
+ * 展示余额、会员信息、本月统计、快捷入口
  */
 import React, { useEffect } from "react"
 import {
@@ -35,7 +30,6 @@ import {
 import { useNavigate } from "react-router-dom"
 import PageHead from "@/components/layout/PageHead"
 import { usePointsStore } from "@/store/pointsStore"
-import { PLAN_LABEL } from "@/api/subscription/types"
 import "./Points.css"
 
 const { Text } = Typography
@@ -52,57 +46,32 @@ const SOURCE_NAME: Record<string, string> = {
   ai_rewrite: "AI 改写",
   ai_title: "AI 标题",
   ai_cover: "AI 封面",
-  sign_up: "注册赠送",
-  bind_phone: "绑定手机",
-  gift: "活动赠送",
-  admin: "管理员调整",
-}
-
-const sourceLabel = (src: string): string => {
-  if (src.startsWith("refund:")) return `${SOURCE_NAME[src.slice(7)] || src.slice(7)}退款`
-  return SOURCE_NAME[src] || src
-}
-
-/** 会员标签：优先取 membership.member_type，降级 subscription.plan_id */
-const memberKey = (
-  membership: { member_type: string | null } | null,
-  subscription: { plan_id: string } | null,
-): string | null =>
-  membership?.member_type ??
-  (subscription?.plan_id && subscription.plan_id !== "free" ? subscription.plan_id : null)
-
-const memberLabel = (
-  membership: { member_type: string | null } | null,
-  subscription: { plan_id: string; plan_name?: string } | null,
-): string => {
-  const key = memberKey(membership, subscription)
-  if (!key) return "免费会员"
-  return PLAN_LABEL[key as keyof typeof PLAN_LABEL] || subscription?.plan_name || "付费会员"
+  subscription_bonus: "会员赠送",
+  admin_adjust: "管理员调整",
+  refund: "失败退还",
 }
 
 const PointsCenter: React.FC = () => {
   const navigate = useNavigate()
-  const { balance, dailyUsage, membership, subscription, rules, init, loading } = usePointsStore()
+  const { balance, subscription, init, loading } = usePointsStore()
 
   useEffect(() => {
     init()
   }, [init])
 
-  const bal = membership?.points_balance ?? balance?.balance ?? 0
+  const bal = balance?.balance ?? 0
   const earned = balance?.total_earned ?? 0
   const spent = balance?.total_spent ?? 0
-  const isMember = membership?.is_member ?? balance?.is_member ?? false
+  const isMember = !!balance?.is_member
+  const freeUsed = balance?.free_clips_used ?? 0
+  const freeLimit = balance?.free_clips_limit ?? 2
+  const freeRemain = balance?.free_clips_remaining ?? (isMember ? 0 : 2)
 
-  // 免费额度从 dailyUsage 取
-  const freeUsed = dailyUsage?.free_clips_used ?? 0
-  const freeLimit = dailyUsage?.free_clips_limit ?? (isMember ? 0 : 3)
-  const freeRemain = dailyUsage?.free_clips_remaining ?? 0
-
-  // 最近流水 mock（后续可改为调用 getPointsTransactions(1,5)）
+  // 近 5 条流水 mock（实际从 transactions 页加载）
   const recentTx = [
-    { type: "deduct" as const, source: "ai_voice", amount: 1, time: "今天 10:30" },
-    { type: "deduct" as const, source: "ai_video", amount: 3, time: "今天 09:15" },
-    { type: "add" as const, source: "recharge", amount: 100, time: "昨天" },
+    { type: "spend", source: "ai_voice", amount: 1, time: "今天 10:30" },
+    { type: "spend", source: "ai_video", amount: 3, time: "今天 09:15" },
+    { type: "earn", source: "task_reward", amount: 20, time: "昨天" },
   ]
 
   return (
@@ -110,15 +79,16 @@ const PointsCenter: React.FC = () => {
       <PageHead
         title="积分中心"
         description="管理积分余额、查看流水、充值使用"
+
         actions={
           <Space>
-            <Button icon={<FileTextOutlined />} onClick={() => navigate("/points/rules")}>
+            <Button icon={<FileTextOutlined />} onClick={() => navigate("/app/points/rules")}>
               积分规则
             </Button>
             <Button
               type="primary"
               icon={<WalletOutlined />}
-              onClick={() => navigate("/points/recharge")}
+              onClick={() => navigate("/app/subscription")}
             >
               充值积分
             </Button>
@@ -141,7 +111,12 @@ const PointsCenter: React.FC = () => {
               <Space size={8} wrap>
                 {isMember ? (
                   <Tag color="gold" icon={<CrownFilled />} style={{ padding: "4px 10px" }}>
-                    {memberLabel(membership, subscription)}
+                    {subscription?.member_type === "yearly"
+                      ? "年卡"
+                      : subscription?.member_type === "quarterly"
+                        ? "季卡"
+                        : "月卡"}
+                    会员
                   </Tag>
                 ) : (
                   <Tag
@@ -155,24 +130,19 @@ const PointsCenter: React.FC = () => {
                     免费会员
                   </Tag>
                 )}
-                {balance?.member_expires_at && isMember && (
+                {balance?.member_expires_at && (
                   <Text style={{ color: "rgba(255,255,255,0.85)", fontSize: 12 }}>
                     到期 {new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}
                   </Text>
                 )}
-                {membership?.max_resolution && isMember && (
-                  <Text style={{ color: "rgba(255,255,255,0.85)", fontSize: 12 }}>
-                    · {membership.max_resolution}
-                  </Text>
-                )}
                 {!isMember && (
                   <Button
                     size="small"
                     type="primary"
-                    onClick={() => navigate("/subscription")}
+                    onClick={() => navigate("/app/subscription")}
                     style={{ background: "#fff", color: "#7c3aed", borderColor: "#fff" }}
                   >
-                    <CrownFilled /> 升级会员享折扣
+                    <CrownFilled /> 升级会员享 8 折
                   </Button>
                 )}
               </Space>
@@ -186,24 +156,12 @@ const PointsCenter: React.FC = () => {
                   <InfoCircleOutlined /> 今日免费混剪
                 </div>
                 <Progress
-                  percent={freeLimit > 0 ? Math.round((freeUsed / freeLimit) * 100) : 0}
+                  percent={Math.round((freeUsed / freeLimit) * 100)}
                   strokeColor={{ "0%": "#f59e0b", "100%": "#ef4444" }}
                   format={() => `${freeUsed}/${freeLimit} 条`}
                 />
                 <Text style={{ color: "rgba(255,255,255,0.8)", fontSize: 12 }}>
                   剩余 {freeRemain} 条免费混剪，超出部分消耗积分
-                  {rules?.free_user_multiplier ? `（×${rules.free_user_multiplier} 倍率）` : ""}
-                  {dailyUsage?.reset_at && (
-                    <span>
-                      {" "}
-                      ·{" "}
-                      {new Date(dailyUsage.reset_at).toLocaleTimeString("zh-CN", {
-                        hour: "2-digit",
-                        minute: "2-digit",
-                      })}
-                      重置
-                    </span>
-                  )}
                 </Text>
               </div>
             )}
@@ -247,7 +205,7 @@ const PointsCenter: React.FC = () => {
           <Card>
             <Statistic
               title={isMember ? "会员等级" : "今日免费剩余"}
-              value={isMember ? memberLabel(membership, subscription) : `${freeRemain} 条`}
+              value={isMember ? (subscription?.member_type_name ?? "付费会员") : `${freeRemain} 条`}
               prefix={<CrownFilled style={{ color: "#f59e0b" }} />}
               valueStyle={{ color: "#f59e0b" }}
             />
@@ -265,7 +223,7 @@ const PointsCenter: React.FC = () => {
                 最近流水
               </Space>
             }
-            extra={<a onClick={() => navigate("/points/transactions")}>查看全部 →</a>}
+            extra={<a onClick={() => navigate("/app/points/transactions")}>查看全部 →</a>}
           >
             {recentTx.length === 0 ? (
               <Empty description="暂无积分流水" />
@@ -279,22 +237,22 @@ const PointsCenter: React.FC = () => {
                         <Avatar
                           size="small"
                           style={{
-                            background: item.type === "add" ? "#d1fae5" : "#fee2e2",
-                            color: item.type === "add" ? "#059669" : "#dc2626",
+                            background: item.type === "earn" ? "#d1fae5" : "#fee2e2",
+                            color: item.type === "earn" ? "#059669" : "#dc2626",
                           }}
-                          icon={item.type === "add" ? <ArrowUpOutlined /> : <ArrowDownOutlined />}
+                          icon={item.type === "earn" ? <ArrowUpOutlined /> : <ArrowDownOutlined />}
                         />
                       }
-                      title={sourceLabel(item.source)}
+                      title={SOURCE_NAME[item.source] ?? item.source}
                       description={item.time}
                     />
                     <div
                       style={{
-                        color: item.type === "add" ? "#10b981" : "#ef4444",
+                        color: item.type === "earn" ? "#10b981" : "#ef4444",
                         fontWeight: 700,
                       }}
                     >
-                      {item.type === "add" ? "+" : "-"}
+                      {item.type === "earn" ? "+" : "-"}
                       {item.amount}
                     </div>
                   </List.Item>
@@ -311,7 +269,7 @@ const PointsCenter: React.FC = () => {
                 size="large"
                 type="primary"
                 icon={<WalletOutlined />}
-                onClick={() => navigate("/points/recharge")}
+                onClick={() => navigate("/app/subscription")}
               >
                 充值积分
               </Button>
@@ -319,7 +277,7 @@ const PointsCenter: React.FC = () => {
                 block
                 size="large"
                 icon={<HistoryOutlined />}
-                onClick={() => navigate("/points/transactions")}
+                onClick={() => navigate("/app/points/transactions")}
               >
                 积分明细
               </Button>
@@ -327,7 +285,7 @@ const PointsCenter: React.FC = () => {
                 block
                 size="large"
                 icon={<CrownFilled />}
-                onClick={() => navigate("/subscription")}
+                onClick={() => navigate("/app/subscription")}
               >
                 {isMember ? "续费/升级会员" : "升级付费会员"}
               </Button>
@@ -335,7 +293,7 @@ const PointsCenter: React.FC = () => {
                 block
                 size="large"
                 icon={<FileTextOutlined />}
-                onClick={() => navigate("/points/rules")}
+                onClick={() => navigate("/app/points/rules")}
               >
                 积分消耗规则
               </Button>

apps/web/src/pages/points/Packages.tsx

@@ -1,72 +1,56 @@
 /**
- * 积分充值页（/points/recharge）
+ * 积分充值页（/app/points/recharge）
  * 单独展示积分包，供入口直接跳转使用
- *
- * 字段对齐新契约（2026-09-16）：
- *  - package 用 code 做唯一键（替代 id）
- *  - 价格单位为 cents，折后价 = price_cents × (user_discount ?? 1)
- *  - 下单接口返回 pay_params（当前为 {}，支付通道未接入）
- *  - 余额优先取 membership.points_balance，降级 balance.balance
+ * 主 Plans 页面也有充值区，这里提供独立 URL 方便从"积分不足"弹窗跳转
  */
 import React, { useEffect, useState } from "react"
-import {
-  Card,
-  Col,
-  Row,
-  Button,
-  Tag,
-  Typography,
-  Space,
-  Modal,
-  message,
-  Tooltip,
-  Alert,
-} from "antd"
+import { Card, Col, Row, Button, Tag, Typography, Space, Modal, message, Tooltip } from "antd"
 import { ThunderboltOutlined, SafetyCertificateOutlined, CrownFilled } from "@ant-design/icons"
 import { useNavigate } from "react-router-dom"
 import PageHead from "@/components/layout/PageHead"
 import { usePointsStore } from "@/store/pointsStore"
 import { createPointsOrder, getPointsPackages } from "@/api/points"
-import type { PointsPackage, PointsPackagesResponse } from "@/api/points/types"
-import { getDiscountPriceCents } from "@/api/points/types"
+import type { PointsPackage } from "@/api/points/types"
 import "./Points.css"
 
 const { Title, Text, Paragraph } = Typography
 
 const PointsRecharge: React.FC = () => {
   const navigate = useNavigate()
-  const { balance, membership, init } = usePointsStore()
-  const [packagesResp, setPackagesResp] = useState<PointsPackagesResponse | null>(null)
+  const { balance, init } = usePointsStore()
+  const [packages, setPackages] = useState<PointsPackage[]>([])
   const [buying, setBuying] = useState<string | null>(null)
 
   useEffect(() => {
     init()
     getPointsPackages()
-      .then((r) => setPackagesResp(r))
+      .then((r) => setPackages(r.packages))
       .catch(() => {})
   }, [init])
 
-  const packages = packagesResp?.packages ?? []
-  const userDiscount = packagesResp?.user_discount ?? null
-  const isMember = membership?.is_member ?? balance?.is_member ?? false
-  const currentBalance = membership?.points_balance ?? balance?.balance ?? 0
+  const getPackPrice = (pkg: PointsPackage): number => {
+    const mt = balance?.member_type ?? "free"
+    type DiscountKey =
+      | "discounted_price_for_free"
+      | "discounted_price_for_monthly"
+      | "discounted_price_for_quarterly"
+      | "discounted_price_for_yearly"
+    const key = `discounted_price_for_${mt}` as DiscountKey
+    return pkg[key] ?? pkg.price
+  }
 
   const handleBuy = async (pkg: PointsPackage) => {
     try {
-      setBuying(pkg.code)
-      const order = await createPointsOrder({ package_id: pkg.code })
+      setBuying(pkg.id)
+      const order = await createPointsOrder({ package_id: pkg.id })
       Modal.info({
         title: "支付功能开发中",
         icon: <SafetyCertificateOutlined />,
         content: (
           <div>
             <Paragraph>
-              订单已创建（{order.id.slice(0, 16)}…），购买 {pkg.points} 积分，金额{" "}
-              <b>¥{(order.amount_cents / 100).toFixed(2).replace(/\.00$/, "")}</b>。
-              {order.points_amount !== undefined && ` 到账 ${order.points_amount} 积分。`}
-              {order.expire_at && (
-                <span> 有效期至 {new Date(order.expire_at).toLocaleDateString("zh-CN")}。</span>
-              )}
+              订单已创建（{order.id.slice(0, 16)}…），金额{" "}
+              <b>¥{(order.price_cents / 100).toFixed(2).replace(/\.00$/, "")}</b>。
               微信/支付宝支付正在接入中。
             </Paragraph>
             <Paragraph type="secondary" style={{ marginBottom: 0 }}>
@@ -77,9 +61,8 @@ const PointsRecharge: React.FC = () => {
         okText: "知道了",
       })
     } catch (e) {
-      const err = e as { response?: { data?: { error?: { message?: string } } }; message?: string }
-      const msg = err?.response?.data?.error?.message || err?.message || "下单失败"
-      message.error(msg)
+      const err = e as { message?: string }
+      message.error(err?.message ?? "下单失败")
     } finally {
       setBuying(null)
     }
@@ -90,61 +73,51 @@ const PointsRecharge: React.FC = () => {
       <PageHead
         title="积分充值"
         description="积分永久有效，可用于全部 AI 功能；付费会员享折扣"
+
         actions={
           <Space>
-            {!isMember && (
-              <Button icon={<CrownFilled />} onClick={() => navigate("/subscription")}>
-                升级会员享折扣
+            {!balance?.is_member && (
+              <Button icon={<CrownFilled />} onClick={() => navigate("/app/subscription")}>
+                升级会员 8 折起
               </Button>
             )}
-            <Button onClick={() => navigate("/points/transactions")}>积分明细</Button>
+            <Button onClick={() => navigate("/app/points/transactions")}>积分明细</Button>
           </Space>
         }
       />
 
-      <Card
-        bordered={false}
-        style={{ marginBottom: 16, background: "linear-gradient(135deg,#ede9fe,#fce7f3)" }}
-      >
-        <Space size="large">
-          <div>
-            <Text type="secondary">当前可用积分</Text>
-            <div style={{ fontSize: 28, fontWeight: 800, color: "#7c3aed" }}>
-              <ThunderboltOutlined /> {currentBalance.toLocaleString()}
+      {balance && (
+        <Card
+          bordered={false}
+          style={{ marginBottom: 16, background: "linear-gradient(135deg,#ede9fe,#fce7f3)" }}
+        >
+          <Space size="large">
+            <div>
+              <Text type="secondary">当前可用积分</Text>
+              <div style={{ fontSize: 28, fontWeight: 800, color: "#7c3aed" }}>
+                <ThunderboltOutlined /> {balance.balance.toLocaleString()}
+              </div>
             </div>
-          </div>
-        </Space>
-      </Card>
-
-      {userDiscount !== null && userDiscount < 1 && (
-        <Alert
-          type="success"
-          showIcon
-          style={{ marginBottom: 16 }}
-          message={`您当前享 ${Math.round(userDiscount * 100) / 10} 折优惠`}
-          description="会员/优惠已自动应用到下方价格"
-        />
+          </Space>
+        </Card>
       )}
 
       <Title level={4}>选择积分包</Title>
       <Row gutter={[20, 20]}>
         {packages.map((pkg) => {
-          const priceCents = getDiscountPriceCents(pkg, userDiscount)
-          const originalCents = pkg.price_cents
-          const discount =
-            priceCents < originalCents ? Math.round((1 - priceCents / originalCents) * 100) : 0
-          const unit = priceCents / 100 / pkg.points
-          const isHot = pkg.unit_price < 0.1 // 单价低于 0.1 元/分视为热门
+          const price = getPackPrice(pkg)
+          const discount = price < pkg.price ? Math.round((1 - price / pkg.price) * 100) : 0
+          const unit = price / pkg.points
           return (
-            <Col xs={24} sm={12} md={8} key={pkg.code}>
+            <Col xs={24} sm={12} md={8} key={pkg.id}>
               <Card
-                className={`xx-pkg-card ${isHot ? "recommended" : ""} ${discount > 0 ? "has-discount" : ""}`}
+                className={`xx-pkg-card ${pkg.id === "basic_pack" ? "recommended" : ""} ${discount > 0 ? "has-discount" : ""}`}
                 hoverable
               >
-                {isHot && <div className="xx-pkg-badge">热门</div>}
+                {pkg.id === "basic_pack" && <div className="xx-pkg-badge">热门</div>}
                 {discount > 0 && (
                   <Tag color="gold" className="xx-pkg-discount">
-                    {Math.round((priceCents / originalCents) * 10) / 1}折
+                    会员{10 - discount / 10}折
                   </Tag>
                 )}
                 <div className="xx-pkg-name">{pkg.name}</div>
@@ -154,17 +127,17 @@ const PointsRecharge: React.FC = () => {
                 <div className="xx-pkg-price">
                   <span className="currency">¥</span>
                   <span className="amount">
-                    {(priceCents / 100).toFixed(priceCents % 100 === 0 ? 0 : 1).replace(/\.0$/, "")}
+                    {(price / 100).toFixed(price % 100 === 0 ? 0 : 1).replace(/\.0$/, "")}
                   </span>
                   {discount > 0 && (
-                    <span className="xx-pkg-origin">¥{(originalCents / 100).toFixed(0)}</span>
+                    <span className="xx-pkg-origin">¥{(pkg.price / 100).toFixed(0)}</span>
                   )}
                 </div>
                 <div className="xx-pkg-unit">≈¥{unit.toFixed(3)}/积分 · 永久有效</div>
                 <Button
                   block
-                  type={isHot ? "primary" : "default"}
-                  loading={buying === pkg.code}
+                  type={pkg.id === "basic_pack" ? "primary" : "default"}
+                  loading={buying === pkg.id}
                   onClick={() => handleBuy(pkg)}
                   size="large"
                   style={{ marginTop: 16 }}
@@ -180,13 +153,12 @@ const PointsRecharge: React.FC = () => {
       <Card style={{ marginTop: 24 }}>
         <Title level={5}>积分消耗说明</Title>
         <ul style={{ paddingLeft: 20, color: "var(--text-secondary)", lineHeight: 2 }}>
-          <li>智能混剪：基础积分/条（≤30s），每加 30s 额外消耗</li>
-          <li>AI 配音 / 声音克隆合成：按分钟消耗积分</li>
-          <li>AI 数字人：按分钟消耗积分</li>
-          <li>抖音链接提取 / AI 改写 / AI 标题 / AI 封面：按次消耗</li>
+          <li>智能混剪：3 积分/条（≤30s），每加 30s +1 积分</li>
+          <li>AI 配音 / 声音克隆合成：1 积分/分钟</li>
+          <li>AI 数字人：15 积分/分钟</li>
+          <li>抖音链接提取 / AI 改写 / AI 标题 / AI 封面：1~2 积分/次</li>
           <li>声音克隆训练：免费</li>
-          <li>免费用户每日若干条免费混剪，其余 AI 功能按会员价 ×1.15 消耗</li>
-          <li>会员享积分折扣（具体档位见会员中心）</li>
+          <li>免费用户每日 2 条混剪免费，其余 AI 功能消耗为会员价 ×1.15</li>
         </ul>
         <Tooltip title="具体规则以系统实际计算为准">
           <Text type="secondary" style={{ fontSize: 12 }}>

apps/web/src/pages/points/Transactions.tsx

@@ -1,13 +1,6 @@
 /**
- * 积分明细页（/points/transactions）
+ * 积分明细页（/app/points/transactions）
  * 分页展示积分流水，支持按类型/来源筛选
- *
- * 字段对齐新契约（2026-09-16）：
- *  - 分页接口返回 {items, total, page, page_size}
- *  - type 仅 add/deduct；refund 通过 source=refund:xxx 前缀体现
- *  - source_name 字段已移除，中文名在前端 SOURCE_LABEL 映射
- *  - signed_amount 字段已移除，根据 type 显示 +/-
- *  - ref_id 在新契约中为 string（不再是 number）
  */
 import React, { useEffect, useState, useCallback } from "react"
 import {
@@ -36,12 +29,14 @@ const { Text } = Typography
 const { RangePicker } = DatePicker
 
 const TYPE_LABEL: Record<PointsTxType, { text: string; color: string }> = {
-  add: { text: "获得", color: "green" },
-  deduct: { text: "消耗", color: "red" },
+  earn: { text: "获得", color: "green" },
+  spend: { text: "消耗", color: "red" },
+  refund: { text: "退还", color: "blue" },
 }
 
 const SOURCE_LABEL: Record<string, string> = {
   recharge: "充值",
+  task_reward: "任务奖励",
   ai_voice: "AI 配音",
   ai_digital_human: "AI 数字人",
   ai_video: "智能混剪",
@@ -51,18 +46,9 @@ const SOURCE_LABEL: Record<string, string> = {
   ai_rewrite: "AI 文案改写",
   ai_title: "AI 标题生成",
   ai_cover: "AI 封面生成",
-  sign_up: "注册赠送",
-  bind_phone: "绑定手机",
-  gift: "活动赠送",
-  admin: "管理员调整",
-}
-
-const sourceLabel = (s: string): { label: string; isRefund: boolean } => {
-  if (s.startsWith("refund:")) {
-    const inner = s.slice(7)
-    return { label: `${SOURCE_LABEL[inner] || inner}（退款）`, isRefund: true }
-  }
-  return { label: SOURCE_LABEL[s] || s, isRefund: false }
+  subscription_bonus: "会员赠送",
+  admin_adjust: "管理员调整",
+  refund: "失败退还",
 }
 
 const PointsTransactions: React.FC = () => {
@@ -80,29 +66,22 @@ const PointsTransactions: React.FC = () => {
   const load = useCallback(async () => {
     setLoading(true)
     try {
-      // 新契约后端暂不支持 type/source/date/keyword 过滤参数，先前端过滤
-      const res = await getPointsTransactions(page, pageSize)
-      let items = res.items
-      if (type !== "all") {
-        items = items.filter((it) => it.type === type)
-      }
-      if (source !== "all") {
-        items = items.filter((it) => it.source === source || it.source === `refund:${source}`)
-      }
+      const params: Record<string, string | number> = { page, page_size: pageSize }
+      if (type !== "all") params.type = type
+      if (source !== "all") params.source = source
       if (dateRange && dateRange[0] && dateRange[1]) {
-        const start = dateRange[0].startOf("day")
-        const end = dateRange[1].endOf("day")
-        items = items.filter((it) => {
-          const t = dayjs(it.created_at)
-          return t.isAfter(start) && t.isBefore(end)
-        })
+        params.start_date = dateRange[0].format("YYYY-MM-DD")
+        params.end_date = dateRange[1].format("YYYY-MM-DD")
       }
+      const res = await getPointsTransactions(params)
+      let items = res.items
       if (keyword) {
         const k = keyword.toLowerCase()
-        items = items.filter((it) => {
-          const sl = sourceLabel(it.source).label
-          return (it.description || "").toLowerCase().includes(k) || sl.toLowerCase().includes(k)
-        })
+        items = items.filter(
+          (it) =>
+            it.description.toLowerCase().includes(k) ||
+            (SOURCE_LABEL[it.source] ?? it.source).includes(keyword),
+        )
       }
       setData(items)
       setTotal(res.total)
@@ -126,41 +105,41 @@ const PointsTransactions: React.FC = () => {
       title: "类型",
       dataIndex: "type",
       width: 90,
-      render: (t: PointsTxType, r: PointsTransaction) => {
-        if (r.source.startsWith("refund:")) {
-          return <Tag color="blue">退还</Tag>
-        }
+      render: (t: PointsTxType) => {
         const cfg = TYPE_LABEL[t]
-        return <Tag color={cfg?.color || "default"}>{cfg?.text || t}</Tag>
+        return <Tag color={cfg.color}>{cfg.text}</Tag>
       },
     },
     {
       title: "来源/场景",
       dataIndex: "source",
-      width: 180,
-      render: (s: string) => <Text>{sourceLabel(s).label}</Text>,
+      width: 150,
+      render: (s: string, r: PointsTransaction) => (
+        <Space>
+          <Text>{r.source_name || SOURCE_LABEL[s] || s}</Text>
+        </Space>
+      ),
     },
     {
       title: "说明",
       dataIndex: "description",
       ellipsis: true,
-      render: (v: string) => v || "-",
     },
     {
       title: "变动",
-      dataIndex: "amount",
+      dataIndex: "signed_amount",
       width: 110,
       align: "right",
-      render: (v: number, r: PointsTransaction) => {
-        const isRefund = r.source.startsWith("refund:")
-        const positive = r.type === "add" || isRefund
-        return (
-          <span className={positive ? "xx-tx-earn" : "xx-tx-spend"}>
-            {positive ? "+" : "-"}
-            {v}
-          </span>
-        )
-      },
+      render: (v: number, r: PointsTransaction) => (
+        <span
+          className={
+            r.type === "earn" ? "xx-tx-earn" : r.type === "refund" ? "xx-tx-refund" : "xx-tx-spend"
+          }
+        >
+          {v > 0 ? "+" : ""}
+          {v}
+        </span>
+      ),
     },
     {
       title: "余额",
@@ -180,12 +159,13 @@ const PointsTransactions: React.FC = () => {
       <PageHead
         title="积分明细"
         description="查看积分收入、消耗与退还记录"
+
         actions={
           <Space>
             <Button icon={<ReloadOutlined />} onClick={load}>
               刷新
             </Button>
-            <Button type="primary" onClick={() => navigate("/points/recharge")}>
+            <Button type="primary" onClick={() => navigate("/app/subscription")}>
               充值积分
             </Button>
           </Space>
@@ -204,8 +184,9 @@ const PointsTransactions: React.FC = () => {
               style={{ width: 120 }}
               options={[
                 { value: "all", label: "全部类型" },
-                { value: "add", label: "获得" },
-                { value: "deduct", label: "消耗" },
+                { value: "earn", label: "获得" },
+                { value: "spend", label: "消耗" },
+                { value: "refund", label: "退还" },
               ]}
             />
             <Select

apps/web/src/pages/scripts/ScriptLibrary.tsx

@@ -1,17 +1,19 @@
 /**
- * 文案库页面 — Issue #1811（#1894 方向修正后）
+ * 文案库页面 — Issue #1811（v2 完整版） + #1893 AI 能力
  * 功能：
  * - 列表页：卡片列表，搜索（标题/正文）、分类标签筛选、分页
- *   每条卡片展示：title（标题）、content 前 100 字摘要、分类 Tag、tags、使用次数、时间
+ *   每条卡片展示：title、content 前 100 字摘要、title_text、分类 Tag、tags、使用次数、时间
  *   操作：编辑 / 删除 / 复制 / 使用（跳创作页预填）
- * - 新建/编辑弹窗：标题（原"名称"）、正文（含 AI 改写）、分类、标签
- * - #1893/#1894 AI 能力：
- *   - 顶部「🎬 从抖音提取」按钮 → 粘贴分享文案/链接（后端自动提取URL） → ASR 提取文案 → 自动填充到新建弹窗
- *   - 正文下方「✨ AI 改写」按钮 → 点击直接执行（美化 loading spinner + "正在改写..."），
- *     成功自动替换正文并 toast「改写成功」1s 自动关闭；失败 toast 错误
- *   - 标题旁「✨ AI 生成标题」按钮 → 候选列表一键填入
+ * - 新建/编辑弹窗：title、content 多行、segments（按空行自动拆分+手动编辑）、title_text、title_category、
+ *   title_config（字体/颜色/位置/字号）、tags
+ * - #1893 AI 能力：
+ *   - 顶部「🎬 从抖音提取」按钮 → 输入抖音链接 → ASR 提取文案 → 自动填充到新建弹窗
+ *   - 新建/编辑弹窗中 content 下方「✨ AI 改写」按钮（带风格选择） → 对比弹窗让用户确认
+ *   - title 旁「✨ AI 生成标题」按钮 → 候选列表一键填入
  * - 删除确认（Popconfirm）
  * - 对接 api/scripts CRUD（mock 阶段 SCRIPTS_API_MOCK=true，AI 接口始终走真实 API）
+ *
+ * 风格对齐标题库（.xx-scripts-* 命名，沿用 CSS 变量）
  */
 import React, { useCallback, useEffect, useState } from "react"
 import {
@@ -20,6 +22,8 @@ import {
   Empty,
   Form,
   Input,
+  InputNumber,
+  List,
   Modal,
   Pagination,
   Popconfirm,
@@ -27,7 +31,6 @@ import {
   Space,
   Spin,
   Tag,
-  Tooltip,
   Typography,
   message,
 } from "antd"
@@ -55,7 +58,13 @@ import {
   aiGenerateTitles,
   REWRITE_STYLE_OPTIONS,
 } from "@/api/scripts"
-import type { ScriptItem, ScriptCategory, ScriptUpsertRequest, RewriteStyle } from "@/api/scripts"
+import type {
+  ScriptItem,
+  ScriptCategory,
+  ScriptUpsertRequest,
+  RewriteStyle,
+  AiRewriteResponse,
+} from "@/api/scripts"
 import { SCRIPT_CATEGORY_LABEL } from "@/api/scripts"
 import "./scripts.css"
 
@@ -71,6 +80,19 @@ const CATEGORY_OPTIONS: { value: ScriptCategory | "all"; label: string }[] = [
   })),
 ]
 
+const FONT_OPTIONS = [
+  { value: "default", label: "默认" },
+  { value: "bold", label: "粗体" },
+  { value: "handwritten", label: "手写" },
+  { value: "serif", label: "衬线" },
+]
+
+const POSITION_OPTIONS = [
+  { value: "top", label: "顶部" },
+  { value: "center", label: "居中" },
+  { value: "bottom", label: "底部" },
+] as const
+
 /** 提取后端返回的错误 detail（全局拦截器可能已弹 toast，但这里再兜一层） */
 function extractErrMsg(err: unknown, fallback: string): string {
   const e = err as {
@@ -109,9 +131,11 @@ const ScriptLibrary: React.FC = () => {
   const [douyinUrl, setDouyinUrl] = useState("")
   const [douyinLoading, setDouyinLoading] = useState(false)
 
-  // AI 改写（#1894: 点击直接执行，美化 loading + 1s 自动关闭 toast，不弹确认弹窗）
+  // AI 改写
+  const [rewriteModalOpen, setRewriteModalOpen] = useState(false)
   const [rewriteStyle, setRewriteStyle] = useState<RewriteStyle>("口语化")
   const [rewriteLoading, setRewriteLoading] = useState(false)
+  const [rewriteResult, setRewriteResult] = useState<AiRewriteResponse | null>(null)
 
   // AI 生成标题
   const [titleGenLoading, setTitleGenLoading] = useState(false)
@@ -151,8 +175,19 @@ const ScriptLibrary: React.FC = () => {
       content: "",
       segments: [],
       tags: [],
+      title_text: "",
       title_category: "other",
+      title_config: {
+        font: "default",
+        color: "#ffffff",
+        stroke: "#000000",
+        position: "center",
+        size: 48,
+        bold: true,
+        italic: false,
+      },
     })
+    setRewriteResult(null)
     setTitleCandidates([])
   }
 
@@ -169,8 +204,17 @@ const ScriptLibrary: React.FC = () => {
       content: item.content,
       segments: item.segments ?? item.content.split(/\n\n+/).filter(Boolean),
       tags: item.tags ?? [],
+      title_text: item.title_text ?? "",
       title_category: item.title_category ?? "other",
+      title_config: item.title_config ?? {
+        font: "default",
+        color: "#ffffff",
+        stroke: "#000000",
+        position: "center",
+        size: 48,
+      },
     })
+    setRewriteResult(null)
     setTitleCandidates([])
     setModalOpen(true)
   }
@@ -178,6 +222,7 @@ const ScriptLibrary: React.FC = () => {
   const closeModal = () => {
     setModalOpen(false)
     setEditing(null)
+    setRewriteResult(null)
     setTitleCandidates([])
   }
 
@@ -191,8 +236,9 @@ const ScriptLibrary: React.FC = () => {
         content: values.content,
         segments: values.segments?.filter(Boolean) ?? values.content.split(/\n\n+/).filter(Boolean),
         tags: values.tags ?? [],
+        title_text: values.title_text?.trim() || undefined,
         title_category: values.title_category,
-        // #1894: 配套标题 / 标题样式配置字段已从 UI 移除，后端即将删除，不再传
+        title_config: values.title_config,
       }
       if (editing) {
         await updateScript(editing.id, payload)
@@ -272,16 +318,20 @@ const ScriptLibrary: React.FC = () => {
     setDouyinModalOpen(true)
   }
 
-  /** #1894：执行抖音提取。前端不再做 URL 前缀校验，直接把用户粘贴的原文（含分享文案+链接）交给后端 _extract_url_from_text 自动提取。后端 400 错误（未找到链接/非抖音域名等）直接透传给用户。 */
+  /** 执行抖音提取，成功后打开新建弹窗并预填 content */
   const handleDouyinExtract = async () => {
-    const raw = douyinUrl.trim()
-    if (!raw) {
-      message.warning("请粘贴抖音视频链接或分享文案")
+    const url = douyinUrl.trim()
+    if (!url) {
+      message.warning("请粘贴抖音视频链接")
+      return
+    }
+    if (!/^https?:\/\//i.test(url)) {
+      message.warning("请输入以 http(s):// 开头的完整链接")
       return
     }
     setDouyinLoading(true)
     try {
-      const res = await extractScriptFromDouyin({ url: raw })
+      const res = await extractScriptFromDouyin({ url })
       message.success(`提取成功${res.duration_seconds ? `（时长 ${res.duration_seconds}s）` : ""}`)
       setDouyinModalOpen(false)
       setDouyinUrl("")
@@ -292,29 +342,38 @@ const ScriptLibrary: React.FC = () => {
         title: "",
         content: res.text,
         tags: [],
+        title_text: "",
         title_category: "other",
+        title_config: {
+          font: "default",
+          color: "#ffffff",
+          stroke: "#000000",
+          position: "center",
+          size: 48,
+          bold: true,
+          italic: false,
+        },
       })
       setModalOpen(true)
     } catch (err) {
-      // 后端 400（未找到有效链接/仅支持抖音域名等）直接透传错误信息
       message.error(extractErrMsg(err, "抖音文案提取失败"))
     } finally {
       setDouyinLoading(false)
     }
   }
 
-  /** #1894: 执行 AI 改写，完成后自动替换正文并 toast 1 秒关闭 */
-  const handleAiRewrite = async (style: RewriteStyle) => {
+  /** 执行 AI 改写，结果写入 rewriteResult 让用户对比确认 */
+  const handleAiRewrite = async () => {
     const content = form.getFieldValue("content") as string | undefined
     if (!content || !content.trim()) {
       message.warning("请先填写文案正文再改写")
       return
     }
     setRewriteLoading(true)
+    setRewriteResult(null)
     try {
-      const res = await aiRewriteScript({ content, style })
-      form.setFieldsValue({ content: res.rewritten })
-      message.success({ content: "改写成功", duration: 1 })
+      const res = await aiRewriteScript({ content, style: rewriteStyle })
+      setRewriteResult(res)
     } catch (err) {
       message.error(extractErrMsg(err, "AI 改写失败"))
     } finally {
@@ -322,6 +381,15 @@ const ScriptLibrary: React.FC = () => {
     }
   }
 
+  /** 应用改写结果：替换 content 字段，关闭改写弹窗 */
+  const applyRewrite = () => {
+    if (!rewriteResult) return
+    form.setFieldsValue({ content: rewriteResult.rewritten })
+    setRewriteResult(null)
+    setRewriteModalOpen(false)
+    message.success("已应用改写结果")
+  }
+
   /** 执行 AI 生成标题，生成候选 */
   const handleGenerateTitles = async () => {
     const content = form.getFieldValue("content") as string | undefined
@@ -458,6 +526,13 @@ const ScriptLibrary: React.FC = () => {
 
                   <div className="xx-script-preview">{preview(s.content)}</div>
 
+                  {s.title_text && (
+                    <div className="xx-script-title-text">
+                      <span className="xx-script-label">配套标题：</span>
+                      {s.title_text}
+                    </div>
+                  )}
+
                   {s.tags && s.tags.length > 0 && (
                     <div className="xx-script-tags">
                       <TagsOutlined
@@ -514,37 +589,38 @@ const ScriptLibrary: React.FC = () => {
           layout="vertical"
           initialValues={{
             title_category: "other",
+            title_config: {
+              font: "default",
+              color: "#ffffff",
+              stroke: "#000000",
+              position: "center",
+              size: 48,
+              bold: true,
+            },
           }}
         >
           <Form.Item
             name="title"
             label={
               <span>
-                标题
-                {/* #1893 UX: disabled 时原生 title 在 antd Button 上不触发，
-                    用 Tooltip + span 包裹保证提示可见 */}
-                <Tooltip
+                名称
+                <Button
+                  type="link"
+                  size="small"
+                  icon={<BulbOutlined />}
+                  loading={titleGenLoading}
+                  disabled={contentEmpty}
+                  onClick={handleGenerateTitles}
                   title={contentEmpty ? "请先填写文案内容" : "基于正文 AI 生成 3 个候选标题"}
+                  style={{ padding: "0 4px", marginLeft: 4, height: 22 }}
                 >
-                  <span style={{ display: "inline-flex", marginLeft: 4 }}>
-                    <Button
-                      type="link"
-                      size="small"
-                      icon={<BulbOutlined />}
-                      loading={titleGenLoading}
-                      disabled={contentEmpty}
-                      onClick={handleGenerateTitles}
-                      style={{ padding: "0 4px", height: 22 }}
-                    >
-                      ✨ AI 生成标题
-                    </Button>
-                  </span>
-                </Tooltip>
+                  ✨ AI 生成标题
+                </Button>
               </span>
             }
-            rules={[{ required: true, message: "请填写视频标题" }, { max: 200 }]}
+            rules={[{ required: true, message: "请填写文案名称" }, { max: 200 }]}
           >
-            <Input placeholder="输入视频标题" maxLength={200} />
+            <Input placeholder="给这段文案起个名字" maxLength={200} />
           </Form.Item>
 
           {/* AI 生成标题候选列表 */}
@@ -577,30 +653,28 @@ const ScriptLibrary: React.FC = () => {
             <TextArea placeholder="在这里输入文案正文…" rows={6} maxLength={10000} />
           </Form.Item>
 
-          {/* AI 改写工具条（#1894 UX：点击直接执行，自定义渐变圆环 loading） */}
+          {/* AI 改写工具条 */}
           <div className="xx-ai-rewrite-bar">
-            <Space size={8} wrap align="center">
+            <Space size={8} wrap>
               <Select
                 value={rewriteStyle}
                 onChange={setRewriteStyle}
                 options={REWRITE_STYLE_OPTIONS}
                 style={{ width: 110 }}
                 size="small"
-                disabled={rewriteLoading}
               />
               <Button
                 size="small"
                 icon={<RobotOutlined />}
-                disabled={contentEmpty || rewriteLoading}
-                onClick={() => handleAiRewrite(rewriteStyle)}
+                loading={rewriteLoading}
+                onClick={() => setRewriteModalOpen(true)}
               >
                 ✨ AI 改写
               </Button>
-              {rewriteLoading && (
-                <span className="xx-ai-rewrite-loading">
-                  <span className="xx-ai-rewrite-spinner" />
-                  <span className="xx-ai-rewrite-loading-text">正在改写...</span>
-                </span>
+              {rewriteResult && (
+                <Button size="small" type="link" onClick={() => setRewriteModalOpen(true)}>
+                  查看上一次改写结果
+                </Button>
               )}
             </Space>
           </div>
@@ -609,6 +683,57 @@ const ScriptLibrary: React.FC = () => {
             <Input />
           </Form.Item>
 
+          <Form.Item name="title_text" label="配套标题（选填）" rules={[{ max: 200 }]}>
+            <Input placeholder="使用此文案时自动带入的标题文本" maxLength={200} />
+          </Form.Item>
+
+          <Space size={16} style={{ display: "flex" }}>
+            <Form.Item name="title_category" label="分类" style={{ flex: 1, marginBottom: 0 }}>
+              <Select options={CATEGORY_OPTIONS.filter((o) => o.value !== "all")} />
+            </Form.Item>
+            <Form.Item
+              name={["title_config", "position"]}
+              label="标题位置"
+              style={{ flex: 1, marginBottom: 0 }}
+            >
+              <Select options={POSITION_OPTIONS as unknown as { value: string; label: string }[]} />
+            </Form.Item>
+          </Space>
+
+          <Space size={16} style={{ display: "flex", marginTop: 12 }}>
+            <Form.Item
+              name={["title_config", "font"]}
+              label="字体"
+              style={{ flex: 1, marginBottom: 0 }}
+            >
+              <Select options={FONT_OPTIONS} />
+            </Form.Item>
+            <Form.Item
+              name={["title_config", "size"]}
+              label="字号"
+              style={{ flex: 1, marginBottom: 0 }}
+            >
+              <InputNumber min={20} max={120} style={{ width: "100%" }} addonAfter="px" />
+            </Form.Item>
+          </Space>
+
+          <Space size={16} style={{ display: "flex", marginTop: 12 }}>
+            <Form.Item
+              name={["title_config", "color"]}
+              label="文字颜色"
+              style={{ flex: 1, marginBottom: 0 }}
+            >
+              <Input type="color" style={{ width: "100%", height: 32, padding: 4 }} />
+            </Form.Item>
+            <Form.Item
+              name={["title_config", "stroke"]}
+              label="描边色"
+              style={{ flex: 1, marginBottom: 0 }}
+            >
+              <Input type="color" style={{ width: "100%", height: 32, padding: 4 }} />
+            </Form.Item>
+          </Space>
+
           <Form.Item name="tags" label="标签" style={{ marginTop: 12 }}>
             <Select
               mode="tags"
@@ -634,12 +759,11 @@ const ScriptLibrary: React.FC = () => {
         destroyOnClose
       >
         <Paragraph type="secondary" style={{ marginBottom: 12, fontSize: 13 }}>
-          粘贴抖音分享文案或链接即可，系统会自动从文本中识别链接（支持 v.douyin.com 短链、
-          www.douyin.com/video/ 长链，以及 App「复制链接」带的分享文案）。AI
-          将自动下载音频并识别文案， 首次识别可能需要 5-15 秒。
+          粘贴抖音分享链接（支持 v.douyin.com 短链和 www.douyin.com/video/ 长链）， AI
+          将自动下载音频并识别文案。首次识别可能需要 5-15 秒。
         </Paragraph>
         <Input.TextArea
-          placeholder="直接粘贴 App「复制链接」的全部内容即可，例如：8.88 复制打开抖音... https://v.douyin.com/xxxxx/"
+          placeholder="例如：https://v.douyin.com/xxxxx/ 或 https://www.douyin.com/video/xxxxx"
           value={douyinUrl}
           onChange={(e) => setDouyinUrl(e.target.value)}
           rows={2}
@@ -649,7 +773,78 @@ const ScriptLibrary: React.FC = () => {
         {douyinLoading && (
           <div className="xx-ai-loading-hint">
             <Spin size="small" style={{ marginRight: 8 }} />
-            提取中，正在下载视频并识别文案，可能需要数秒，请稍候…
+            正在下载视频并识别文案，可能需要数秒，请稍候…
+          </div>
+        )}
+      </Modal>
+
+      {/* AI 改写对比弹窗 */}
+      <Modal
+        title={`✨ AI 改写（${rewriteStyle}风格）`}
+        open={rewriteModalOpen}
+        onCancel={() => setRewriteModalOpen(false)}
+        footer={
+          rewriteResult ? (
+            <Space>
+              <Button onClick={() => setRewriteModalOpen(false)}>保留原文</Button>
+              <Button type="primary" onClick={applyRewrite}>
+                应用改写
+              </Button>
+            </Space>
+          ) : (
+            <Button onClick={() => setRewriteModalOpen(false)}>关闭</Button>
+          )
+        }
+        width={640}
+        destroyOnClose={false}
+      >
+        {!rewriteResult && !rewriteLoading && (
+          <Paragraph type="secondary" style={{ marginBottom: 16 }}>
+            将以「{rewriteStyle}」风格改写正文，生成后可对比确认是否应用。
+          </Paragraph>
+        )}
+        {rewriteLoading && (
+          <div className="xx-ai-loading-hint" style={{ padding: "32px 0" }}>
+            <Spin tip="AI 改写中…" />
+          </div>
+        )}
+        {rewriteResult && (
+          <List
+            dataSource={[
+              { label: "原文", text: rewriteResult.original, type: "original" },
+              {
+                label: `改写（${rewriteResult.style}）`,
+                text: rewriteResult.rewritten,
+                type: "rewrite",
+              },
+            ]}
+            renderItem={(item) => (
+              <List.Item className="xx-ai-rewrite-item">
+                <div className="xx-ai-rewrite-block">
+                  <div className="xx-ai-rewrite-label">
+                    <Tag color={item.type === "original" ? "default" : "purple"}>{item.label}</Tag>
+                  </div>
+                  <Paragraph
+                    className="xx-ai-rewrite-text"
+                    style={{ whiteSpace: "pre-wrap", marginBottom: 0 }}
+                  >
+                    {item.text}
+                  </Paragraph>
+                </div>
+              </List.Item>
+            )}
+          />
+        )}
+        {!rewriteResult && !rewriteLoading && (
+          <div style={{ textAlign: "center" }}>
+            <Button
+              type="primary"
+              icon={<RobotOutlined />}
+              loading={rewriteLoading}
+              onClick={handleAiRewrite}
+            >
+              开始改写
+            </Button>
           </div>
         )}
       </Modal>

apps/web/src/pages/scripts/scripts.css

@@ -258,51 +258,3 @@
   background: linear-gradient(180deg, #faf5ff 0%, #ffffff 100%);
   border: 1px solid #eee6ff;
 }
-
-/* #1894: AI 改写内联 loading —— 渐变圆环旋转动画，替代 antd 默认 Spin */
-.xx-ai-rewrite-loading {
-  display: inline-flex;
-  align-items: center;
-  gap: 8px;
-  margin-left: 4px;
-}
-.xx-ai-rewrite-spinner {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-  border: 2px solid transparent;
-  border-top-color: #9254de;
-  border-right-color: #722ed1;
-  background:
-    linear-gradient(#fff, #fff) padding-box,
-    conic-gradient(from 0deg, #9254de, #4096ff, #9254de) border-box;
-  -webkit-mask:
-    linear-gradient(#000 0 0) content-box,
-    linear-gradient(#000 0 0);
-  -webkit-mask-composite: xor;
-  mask-composite: exclude;
-  animation: xx-ai-rewrite-spin 0.9s linear infinite;
-}
-@keyframes xx-ai-rewrite-spin {
-  to {
-    transform: rotate(360deg);
-  }
-}
-.xx-ai-rewrite-loading-text {
-  font-size: 13px;
-  color: var(--text-secondary, #666);
-  background: linear-gradient(90deg, #722ed1, #4096ff, #722ed1);
-  background-size: 200% 100%;
-  -webkit-background-clip: text;
-  background-clip: text;
-  color: transparent;
-  animation: xx-ai-rewrite-text-shimmer 2s linear infinite;
-}
-@keyframes xx-ai-rewrite-text-shimmer {
-  0% {
-    background-position: 0% 0;
-  }
-  100% {
-    background-position: 200% 0;
-  }
-}

apps/web/src/pages/subscription/Billing.tsx

@@ -1,28 +1,15 @@
 /**
  * 账单管理页面
- * 展示当前订阅信息 + 自动续费开关 + 账单历史
- *
- * 字段对齐新契约（2026-09-16）：
- *  - toggleAutoRenew 参数改为 {enabled} 对象
- *  - billing_cycle 仅 monthly/yearly（季卡走 monthly 周期 + 3 个月时长）
- *  - 新增账单历史表格：order_type / amount_cents / status / created_at
+ * 展示当前订阅信息 + 自动续费开关
+ * P1-3: antd Switch→自定义ToggleSwitch, antd Spin→自定义Spinner
  */
 import React, { useState, useEffect } from "react"
-import { message, Table, Tag, Card, Space, Button, Modal, Typography } from "antd"
-import type { ColumnsType } from "antd/es/table"
-import {
-  getCurrentSubscription,
-  toggleAutoRenew,
-  cancelSubscription,
-  getBillingRecords,
-} from "@/api/subscription"
-import type { SubscriptionInfo, BillingRecord } from "@/api/subscription/types"
-import { PLAN_LABEL, BILLING_CYCLE_LABEL } from "@/api/subscription/types"
+import { message } from "antd"
+import { getCurrentSubscription, toggleAutoRenew } from "@/api/subscription"
+import type { SubscriptionInfo } from "@/api/subscription"
 import PageHead from "@/components/layout/PageHead"
 import "./Billing.css"
 
-const { Text } = Typography
-
 const formatDate = (iso: string): string => {
   const d = new Date(iso)
   return d.toLocaleDateString("zh-CN", {
@@ -64,40 +51,21 @@ const Spinner: React.FC<{ size?: "small" | "large" }> = ({ size = "large" }) =>
   </div>
 )
 
-const ORDER_TYPE_LABEL: Record<string, string> = {
-  subscribe: "新购",
-  renew: "续费",
-  upgrade: "升级",
-  downgrade: "降级",
-  refund: "退款",
-}
-
-const BILLING_STATUS_TAG: Record<string, { color: string; text: string }> = {
-  paid: { color: "green", text: "已支付" },
-  pending: { color: "orange", text: "待支付" },
-  failed: { color: "red", text: "支付失败" },
-  refunded: { color: "blue", text: "已退款" },
-  cancelled: { color: "default", text: "已取消" },
-}
-
 const Billing: React.FC = () => {
   const [subscription, setSubscription] = useState<SubscriptionInfo | null>(null)
-  const [billingRecords, setBillingRecords] = useState<BillingRecord[]>([])
   const [loading, setLoading] = useState(true)
-  const [recordsLoading, setRecordsLoading] = useState(false)
   const [autoRenewChecked, setAutoRenewChecked] = useState(false)
   const [autoRenewLoading, setAutoRenewLoading] = useState(false)
 
   useEffect(() => {
     loadData()
-    loadRecords()
   }, [])
 
   const loadData = async () => {
     try {
       const data = await getCurrentSubscription()
       setSubscription(data)
-      setAutoRenewChecked(!!data.auto_renew)
+      setAutoRenewChecked(data.auto_renew)
     } catch (err: unknown) {
       if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("加载订阅数据失败")
     } finally {
@@ -105,106 +73,22 @@ const Billing: React.FC = () => {
     }
   }
 
-  const loadRecords = async () => {
-    try {
-      setRecordsLoading(true)
-      const list = await getBillingRecords()
-      setBillingRecords(Array.isArray(list) ? list : [])
-    } catch {
-      // 账单加载失败不阻塞主流程
-      setBillingRecords([])
-    } finally {
-      setRecordsLoading(false)
-    }
-  }
-
   const handleToggleAutoRenew = async (checked: boolean) => {
     setAutoRenewLoading(true)
     try {
-      const res = await toggleAutoRenew({ enabled: checked })
-      message.success(res?.message ?? (checked ? "已开启自动续费" : "已关闭自动续费"))
+      const res = await toggleAutoRenew(checked)
+      message.success(res.message)
       setAutoRenewChecked(checked)
       if (subscription) {
         setSubscription({ ...subscription, auto_renew: checked })
       }
     } catch (err: unknown) {
-      const e = err as { response?: { data?: { error?: { message?: string } } }; message?: string }
-      message.error(e?.response?.data?.error?.message || e?.message || "操作失败")
+      if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("操作失败")
     } finally {
       setAutoRenewLoading(false)
     }
   }
 
-  const handleCancelSubscription = () => {
-    Modal.confirm({
-      title: "确认取消订阅？",
-      content: "取消后，当前周期结束时将不再自动续费。您仍可使用当前会员权益至到期日。",
-      okText: "确认取消",
-      okType: "danger",
-      cancelText: "我再想想",
-      onOk: async () => {
-        try {
-          await cancelSubscription()
-          message.success("已取消订阅，到期后不再续费")
-          await loadData()
-        } catch (err: unknown) {
-          const e = err as {
-            response?: { data?: { error?: { message?: string } } }
-            message?: string
-          }
-          message.error(e?.response?.data?.error?.message || e?.message || "取消失败")
-        }
-      },
-    })
-  }
-
-  const columns: ColumnsType<BillingRecord> = [
-    {
-      title: "时间",
-      dataIndex: "created_at",
-      width: 170,
-      render: (v: string) => formatDate(v),
-    },
-    {
-      title: "类型",
-      dataIndex: "order_type",
-      width: 100,
-      render: (v: string) => ORDER_TYPE_LABEL[v] || v || "-",
-    },
-    {
-      title: "套餐",
-      dataIndex: "plan_id",
-      width: 120,
-      render: (v: string) => (v ? PLAN_LABEL[v as keyof typeof PLAN_LABEL] || v : "-"),
-    },
-    {
-      title: "金额",
-      dataIndex: "amount_cents",
-      width: 110,
-      align: "right",
-      render: (v: number) => (
-        <Text strong style={{ fontVariantNumeric: "tabular-nums" }}>
-          ¥{((v ?? 0) / 100).toFixed(2)}
-        </Text>
-      ),
-    },
-    {
-      title: "状态",
-      dataIndex: "status",
-      width: 100,
-      render: (v: string) => {
-        const cfg = BILLING_STATUS_TAG[v]
-        return <Tag color={cfg?.color || "default"}>{cfg?.text || v || "-"}</Tag>
-      },
-    },
-    {
-      title: "支付时间",
-      dataIndex: "paid_at",
-      width: 170,
-      render: (v?: string) => (v ? formatDate(v) : <Text type="secondary">—</Text>),
-    },
-  ]
-
   if (loading) {
     return (
       <div className="xx-billing-page">
@@ -225,42 +109,19 @@ const Billing: React.FC = () => {
             <div className="xx-overview-details">
               <div className="xx-overview-item">
                 <span className="xx-label">套餐</span>
-                <span className="xx-value">
-                  {subscription.plan_name ||
-                    PLAN_LABEL[subscription.plan_id as keyof typeof PLAN_LABEL] ||
-                    "-"}
-                </span>
+                <span className="xx-value">{subscription.plan_name}</span>
               </div>
               <div className="xx-overview-item">
                 <span className="xx-label">计费周期</span>
                 <span className="xx-value">
-                  {BILLING_CYCLE_LABEL[
-                    subscription.billing_cycle as keyof typeof BILLING_CYCLE_LABEL
-                  ] ||
-                    subscription.billing_cycle ||
-                    "-"}
+                  {subscription.billing_cycle === "monthly" ? "月付" : "年付"}
                 </span>
               </div>
               <div className="xx-overview-item">
-                <span className="xx-label">本期金额</span>
-                <span className="xx-value">¥{((subscription.amount ?? 0) / 100).toFixed(2)}</span>
-              </div>
-              <div className="xx-overview-item">
-                <span className="xx-label">周期开始</span>
-                <span className="xx-value">{formatDate(subscription.current_period_start)}</span>
-              </div>
-              <div className="xx-overview-item">
-                <span className="xx-label">下次扣费/到期</span>
+                <span className="xx-label">下次扣费</span>
                 <span className="xx-value">{formatDate(subscription.current_period_end)}</span>
               </div>
             </div>
-            {subscription.plan_id !== "free" && (
-              <Space style={{ marginTop: 16 }}>
-                <Button danger onClick={handleCancelSubscription}>
-                  取消订阅
-                </Button>
-              </Space>
-            )}
           </div>
 
           {/* 自动续费 */}
@@ -284,26 +145,6 @@ const Billing: React.FC = () => {
           </div>
         </>
       )}
-
-      {/* 账单历史 */}
-      <Card
-        title="账单历史"
-        style={{ marginTop: 16 }}
-        extra={
-          <Button size="small" onClick={loadRecords} loading={recordsLoading}>
-            刷新
-          </Button>
-        }
-      >
-        <Table<BillingRecord>
-          rowKey="id"
-          columns={columns}
-          dataSource={billingRecords}
-          loading={recordsLoading}
-          pagination={{ pageSize: 10, showSizeChanger: false }}
-          locale={{ emptyText: "暂无账单记录" }}
-        />
-      </Card>
     </div>
   )
 }

apps/web/src/pages/subscription/Plans.tsx

@@ -1,10 +1,8 @@
 /**
  * 会员订阅 & 积分充值页
- * v3: 对齐后端最终契约（2026-09-16）
- *  - 订阅计划走 GET /subscription/plans（4 档：free/monthly/quarterly/yearly）
- *  - 积分包走 GET /points/packages，折后价 = price_cents × (user_discount ?? 1)
- *  - 当前身份/余额优先从 membership + dailyUsage 取，降级 balance
- *  - 暂保留 SUBSCRIPTION_PLANS_FALLBACK 常量，API 失败时降级
+ * v2 两档会员制：免费 vs 付费
+ * 付费三档：月¥19.9 / 季¥39.9（推荐）/ 年¥159
+ * 积分包：100/¥9.9、500/¥39、2000/¥129
  */
 import React, { useEffect, useMemo, useState } from "react"
 import {
@@ -32,19 +30,16 @@ import {
 import { useNavigate } from "react-router-dom"
 import PageHead from "@/components/layout/PageHead"
 import { usePointsStore } from "@/store/pointsStore"
-import { createPointsOrder, getPointsPackages } from "@/api/points"
-import { getSubscriptionPlans, changePlan } from "@/api/subscription"
-import type { PointsPackage, PointsPackagesResponse } from "@/api/points/types"
-import { getDiscountPriceCents } from "@/api/points/types"
-import type { SubscriptionPlan } from "@/api/subscription/types"
-import { PLAN_LABEL, BILLING_CYCLE_LABEL } from "@/api/subscription/types"
+import { SUBSCRIPTION_PLANS, createPointsOrder } from "@/api/points"
+import type { PointsPackage } from "@/api/points/types"
+import { getPointsPackages } from "@/api/points"
 import "./Plans.css"
 
 const { Title, Text, Paragraph } = Typography
 
-/** 免费会员权益（根据后端 features 动态展示，这里保留兜底） */
+/** 免费会员权益 */
 const FREE_FEATURES = [
-  { include: true, text: "每日免费混剪额度" },
+  { include: true, text: "每日 2 条免费混剪" },
   { include: true, text: "720p 导出分辨率" },
   { include: true, text: "AI 配音（×1.15 积分）" },
   { include: true, text: "AI 数字人（×1.15 积分）" },
@@ -54,181 +49,91 @@ const FREE_FEATURES = [
   { include: false, text: "去重检测报告" },
 ]
 
-/** 付费会员权益（兜底） */
+/** 付费会员权益 */
 const PAID_FEATURES = [
-  { include: true, text: "智能混剪按会员折扣积分" },
+  { include: true, text: "无限次智能混剪" },
   { include: true, text: "最高 1080p 导出" },
-  { include: true, text: "全部 AI 功能（会员折扣积分）" },
+  { include: true, text: "全部 AI 功能（标准积分价）" },
   { include: true, text: "声音克隆训练免费" },
-  { include: true, text: "积分购买最低折扣" },
+  { include: true, text: "积分购买最低 8 折" },
   { include: true, text: "批量导出" },
   { include: true, text: "多平台一键发布" },
   { include: true, text: "去重检测报告" },
 ]
 
-/** 旧 SUBSCRIPTION_PLANS 兜底（API 不可用时） */
-const SUBSCRIPTION_PLANS_FALLBACK = [
-  {
-    id: "monthly" as const,
-    name: "月卡",
-    price_cents: 1990,
-    per_month_yuan: "19.9",
-    savings_percent: 0,
-    recommended: false,
-    billing_label: "/月",
-    billing_cycle: "monthly" as const,
-  },
-  {
-    id: "quarterly" as const,
-    name: "季卡",
-    price_cents: 3990,
-    per_month_yuan: "13.3",
-    savings_percent: 33,
-    recommended: true,
-    billing_label: "/季",
-    billing_cycle: "monthly" as const,
-  },
-  {
-    id: "yearly" as const,
-    name: "年卡",
-    price_cents: 15900,
-    per_month_yuan: "13.25",
-    savings_percent: 34,
-    recommended: false,
-    billing_label: "/年",
-    billing_cycle: "yearly" as const,
-  },
-]
-
 const formatYuan = (cents: number) =>
   `¥${(cents / 100).toFixed(cents % 100 === 0 ? 0 : 1).replace(/\.0$/, "")}`
 
 const Plans: React.FC = () => {
   const navigate = useNavigate()
-  const { balance, dailyUsage, membership, subscription, init } = usePointsStore()
-  const [plans, setPlans] = useState<SubscriptionPlan[]>([])
-  const [packagesResp, setPackagesResp] = useState<PointsPackagesResponse | null>(null)
-  const [subscribing, setSubscribing] = useState(false)
-  const [buying, setBuying] = useState<string | null>(null)
+  const { balance, init } = usePointsStore()
   const [selectedBilling, setSelectedBilling] = useState<"monthly" | "quarterly" | "yearly">(
     "quarterly",
   )
+  const [packages, setPackages] = useState<PointsPackage[]>([])
+  const [subscribing] = useState(false)
+  const [buying, setBuying] = useState<string | null>(null)
 
   useEffect(() => {
     init()
-    // 拉取订阅计划
-    getSubscriptionPlans()
-      .then((r) => {
-        const paid = r.plans.filter((p) => p.plan_id !== "free")
-        setPlans(paid)
-        // 默认选季卡，没有就选第一个
-        const hasQuarterly = paid.some((p) => p.plan_id === "quarterly")
-        if (!hasQuarterly && paid.length > 0) setSelectedBilling(paid[0].plan_id as "monthly")
-      })
-      .catch(() => {
-        // 降级
-      })
     getPointsPackages()
-      .then((r) => setPackagesResp(r))
+      .then((r) => setPackages(r.packages))
       .catch(() => {})
   }, [init])
 
-  const packages = packagesResp?.packages ?? []
-  const userDiscount = packagesResp?.user_discount ?? null
+  const isMember = !!balance?.is_member
+  const memberType = balance?.member_type ?? null
 
-  const isMember = membership?.is_member ?? balance?.is_member ?? false
-  // 当前会员档位：优先 membership.member_type，降级 subscription.plan_id
-  const memberPlanId =
-    membership?.member_type ??
-    (subscription?.plan_id && subscription.plan_id !== "free" ? subscription.plan_id : null)
-
-  const bal = membership?.points_balance ?? balance?.balance ?? 0
-  const freeUsed = dailyUsage?.free_clips_used ?? 0
-  const freeLimit = dailyUsage?.free_clips_limit ?? (isMember ? 0 : 3)
-  const freeRemain = dailyUsage?.free_clips_remaining ?? (isMember ? 0 : freeLimit - freeUsed)
-
-  /** 统一的可选付费档位（API 返回 + 兜底） */
-  const billingOptions = useMemo(() => {
-    if (plans.length > 0) {
-      return plans.map((p) => {
-        const id = p.plan_id as "monthly" | "quarterly" | "yearly"
-        const perMonth =
-          p.duration_days > 0
-            ? (p.price_cents / 100 / (p.duration_days / 30)).toFixed(1)
-            : (p.monthly_price_cents / 100).toFixed(1)
-        const monthlyCents = p.monthly_price_cents || p.price_cents
-        const savings =
-          p.price_cents > 0 && monthlyCents > 0
-            ? Math.max(
-                0,
-                Math.round((1 - p.price_cents / (monthlyCents * (p.duration_days / 30))) * 100),
-              )
-            : 0
-        return {
-          id,
-          name: p.name,
-          price_cents: p.price_cents,
-          per_month_yuan: perMonth,
-          savings_percent: savings,
-          recommended: id === "quarterly",
-          billing_label: id === "yearly" ? "/年" : id === "quarterly" ? "/季" : "/月",
-          billing_cycle: (id === "yearly" ? "yearly" : "monthly") as "monthly" | "yearly",
-        }
-      })
-    }
-    return SUBSCRIPTION_PLANS_FALLBACK
-  }, [plans])
+  /** 根据会员等级计算积分包折后价（分） */
+  const getPackPrice = (pkg: PointsPackage): number => {
+    const mt = memberType ?? "free"
+    type DiscountKey =
+      | "discounted_price_for_free"
+      | "discounted_price_for_monthly"
+      | "discounted_price_for_quarterly"
+      | "discounted_price_for_yearly"
+    const key = `discounted_price_for_${mt}` as DiscountKey
+    return pkg[key] ?? pkg.price
+  }
 
   const selectedPlan = useMemo(
-    () => billingOptions.find((p) => p.id === selectedBilling) ?? billingOptions[0],
-    [billingOptions, selectedBilling],
+    () => SUBSCRIPTION_PLANS.find((p) => p.id === selectedBilling)!,
+    [selectedBilling],
   )
 
   const handleSubscribe = async () => {
-    if (!selectedPlan) return
-    try {
-      setSubscribing(true)
-      await changePlan({
-        target_plan_id: selectedPlan.id,
-        billing_cycle: selectedPlan.billing_cycle,
-      })
-      Modal.success({
-        title: "订阅已提交",
-        icon: <SafetyCertificateOutlined />,
-        content: `已为您切换到 ${selectedPlan.name}，${BILLING_CYCLE_LABEL[selectedPlan.billing_cycle]} ${formatYuan(selectedPlan.price_cents)}。支付通道接入中，正式上线后会自动扣费。`,
-        okText: "知道了",
-      })
-    } catch (e) {
-      const err = e as { response?: { data?: { error?: { message?: string } } }; message?: string }
-      // 支付未接入阶段，保持演示体验
-      Modal.confirm({
-        title: "支付功能开发中",
-        icon: <SafetyCertificateOutlined />,
-        content:
-          err?.response?.data?.error?.message ||
-          "微信/支付宝支付正在接入中，完成后会第一时间通知。是否返回首页继续使用免费功能？",
-        okText: "返回首页",
-        cancelText: "留在此页",
-        onOk: () => navigate("/app/dashboard"),
-      })
-    } finally {
-      setSubscribing(false)
-    }
+    Modal.confirm({
+      title: "支付功能开发中",
+      icon: <SafetyCertificateOutlined />,
+      content: "微信/支付宝支付正在接入中，完成后会第一时间通知。是否返回首页继续使用免费功能？",
+      okText: "返回首页",
+      cancelText: "留在此页",
+      onOk: () => navigate("/app/dashboard"),
+    })
+    // 实际对接时：
+    // try {
+    //   setSubscribing(true)
+    //   const order = await subscribe({ member_type: selectedBilling, payment_method: "wechat_pay" })
+    //   // 拉起支付...
+    // } catch (e: any) {
+    //   message.error(e?.message ?? "订阅失败")
+    // } finally {
+    //   setSubscribing(false)
+    // }
   }
 
   const handleBuyPoints = async (pkg: PointsPackage) => {
     try {
-      setBuying(pkg.code)
-      const order = await createPointsOrder({ package_id: pkg.code })
+      setBuying(pkg.id)
+      const order = await createPointsOrder({ package_id: pkg.id })
       Modal.info({
         title: "支付功能开发中",
         icon: <ThunderboltOutlined />,
         content: (
           <div>
             <Paragraph>
-              订单 <Text code>{order.id.slice(0, 16)}…</Text> 已创建，购买 {pkg.points} 积分，金额{" "}
-              <b>{formatYuan(order.amount_cents)}</b>，
-              {order.points_amount !== undefined && `到账 ${order.points_amount} 积分。`}
+              订单 <Text code>{order.id.slice(0, 16)}…</Text> 已创建，金额{" "}
+              <b>{formatYuan(order.price_cents)}</b>，
               微信/支付宝支付正在接入中，正式上线后可直接付款。
             </Paragraph>
             <Paragraph type="secondary" style={{ marginBottom: 0 }}>
@@ -239,8 +144,8 @@ const Plans: React.FC = () => {
         okText: "知道了",
       })
     } catch (e) {
-      const err = e as { response?: { data?: { error?: { message?: string } } }; message?: string }
-      message.error(err?.response?.data?.error?.message || err?.message || "创建订单失败")
+      const err = e as { message?: string }
+      message.error(err?.message ?? "创建订单失败")
     } finally {
       setBuying(null)
     }
@@ -251,6 +156,7 @@ const Plans: React.FC = () => {
       <PageHead
         title="会员与积分"
         description="开通会员解锁全部功能，按需充值积分灵活使用 AI 能力"
+
         actions={
           <Space>
             <Button
@@ -264,75 +170,77 @@ const Plans: React.FC = () => {
       />
 
       {/* 当前状态卡片 */}
-      <Card className="xx-current-status" bordered={false}>
-        <Row align="middle" gutter={24}>
-          <Col flex="auto">
-            <Space size="large" wrap>
-              <div>
-                <Text type="secondary">当前身份</Text>
+      {balance && (
+        <Card className="xx-current-status" bordered={false}>
+          <Row align="middle" gutter={24}>
+            <Col flex="auto">
+              <Space size="large" wrap>
                 <div>
-                  {isMember ? (
-                    <Tag
-                      color="gold"
-                      icon={<CrownFilled />}
-                      style={{ marginTop: 4, fontSize: 14, padding: "4px 10px" }}
-                    >
-                      {memberPlanId
-                        ? PLAN_LABEL[memberPlanId as keyof typeof PLAN_LABEL] || "付费会员"
-                        : "付费会员"}
-                    </Tag>
-                  ) : (
-                    <Tag style={{ marginTop: 4, fontSize: 14, padding: "4px 10px" }}>免费会员</Tag>
-                  )}
-                  {balance?.member_expires_at && isMember && (
-                    <Text type="secondary" style={{ marginLeft: 8 }}>
-                      到期 {new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}
-                    </Text>
-                  )}
-                  {membership?.max_resolution && (
-                    <Text type="secondary" style={{ marginLeft: 8 }}>
-                      · 最高 {membership.max_resolution}
-                    </Text>
-                  )}
-                </div>
-              </div>
-              <div>
-                <Text type="secondary">可用积分</Text>
-                <div className="xx-current-balance">
-                  <ThunderboltOutlined style={{ color: "#8b5cf6" }} />
-                  <span className="xx-current-balance-val">{bal}</span>
-                </div>
-              </div>
-              {!isMember && freeLimit > 0 && (
-                <div>
-                  <Text type="secondary">今日免费混剪</Text>
+                  <Text type="secondary">当前身份</Text>
                   <div>
-                    <Text strong>{freeUsed}</Text>
-                    <Text type="secondary"> / {freeLimit} 条</Text>
-                    {!isMember && (
-                      <Tag color="blue" style={{ marginLeft: 8 }}>
-                        剩余 {freeRemain} 条
+                    {isMember ? (
+                      <Tag
+                        color="gold"
+                        icon={<CrownFilled />}
+                        style={{ marginTop: 4, fontSize: 14, padding: "4px 10px" }}
+                      >
+                        {memberType === "yearly"
+                          ? "年卡"
+                          : memberType === "quarterly"
+                            ? "季卡"
+                            : "月卡"}
+                        会员
                       </Tag>
+                    ) : (
+                      <Tag style={{ marginTop: 4, fontSize: 14, padding: "4px 10px" }}>
+                        免费会员
+                      </Tag>
+                    )}
+                    {balance.member_expires_at && (
+                      <Text type="secondary" style={{ marginLeft: 8 }}>
+                        到期 {new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}
+                      </Text>
                     )}
                   </div>
                 </div>
-              )}
-            </Space>
-          </Col>
-          <Col>
-            <Button
-              type="primary"
-              icon={<ThunderboltOutlined />}
-              onClick={() => {
-                const el = document.getElementById("points-packages")
-                el?.scrollIntoView({ behavior: "smooth" })
-              }}
-            >
-              充值积分
-            </Button>
-          </Col>
-        </Row>
-      </Card>
+                <div>
+                  <Text type="secondary">可用积分</Text>
+                  <div className="xx-current-balance">
+                    <ThunderboltOutlined style={{ color: "#8b5cf6" }} />
+                    <span className="xx-current-balance-val">{balance.balance}</span>
+                  </div>
+                </div>
+                {balance.free_clips_limit ? (
+                  <div>
+                    <Text type="secondary">今日免费混剪</Text>
+                    <div>
+                      <Text strong>{balance.free_clips_used ?? 0}</Text>
+                      <Text type="secondary"> / {balance.free_clips_limit} 条</Text>
+                      {!isMember && (
+                        <Tag color="blue" style={{ marginLeft: 8 }}>
+                          剩余 {balance.free_clips_remaining ?? 0} 条
+                        </Tag>
+                      )}
+                    </div>
+                  </div>
+                ) : null}
+              </Space>
+            </Col>
+            <Col>
+              <Button
+                type="primary"
+                icon={<ThunderboltOutlined />}
+                onClick={() => {
+                  const el = document.getElementById("points-packages")
+                  el?.scrollIntoView({ behavior: "smooth" })
+                }}
+              >
+                充值积分
+              </Button>
+            </Col>
+          </Row>
+        </Card>
+      )}
 
       {/* 两档会员对比 */}
       <Title level={4} style={{ marginTop: 24 }}>
@@ -342,7 +250,7 @@ const Plans: React.FC = () => {
 
       {/* 计费周期切换 */}
       <div className="xx-billing-switch">
-        {billingOptions.map((p) => (
+        {SUBSCRIPTION_PLANS.map((p) => (
           <button
             key={p.id}
             type="button"
@@ -355,11 +263,7 @@ const Plans: React.FC = () => {
             <div className="xx-billing-name">{p.name}</div>
             <div className="xx-billing-price">
               <span className="xx-billing-yuan">¥</span>
-              <span className="xx-billing-amount">
-                {(p.price_cents / 100)
-                  .toFixed(p.price_cents % 100 === 0 ? 0 : 1)
-                  .replace(/\.0$/, "")}
-              </span>
+              <span className="xx-billing-amount">{p.price_yuan}</span>
             </div>
             <div className="xx-billing-sub">
               ≈¥{p.per_month_yuan}/月
@@ -399,8 +303,8 @@ const Plans: React.FC = () => {
                 </li>
               ))}
             </ul>
-            <Button block size="large" disabled={!isMember ? false : true}>
-              {!isMember ? "当前方案" : "免费方案"}
+            <Button block size="large" disabled>
+              当前方案
             </Button>
           </Card>
         </Col>
@@ -413,21 +317,15 @@ const Plans: React.FC = () => {
             </div>
             <div className="xx-plan-head">
               <Title level={4} style={{ margin: 0, color: "#7c3aed" }}>
-                <CrownFilled style={{ color: "#f59e0b" }} /> {selectedPlan?.name || "付费会员"}
+                <CrownFilled style={{ color: "#f59e0b" }} /> 付费会员
               </Title>
               <div className="xx-plan-price">
                 <span className="currency">¥</span>
-                <span className="amount">
-                  {selectedPlan
-                    ? (selectedPlan.price_cents / 100)
-                        .toFixed(selectedPlan.price_cents % 100 === 0 ? 0 : 1)
-                        .replace(/\.0$/, "")
-                    : "—"}
-                </span>
-                <span className="period">{selectedPlan?.billing_label || ""}</span>
+                <span className="amount">{selectedPlan.price_yuan}</span>
+                <span className="period">{selectedPlan.billing_label}</span>
               </div>
               <Text type="secondary">
-                折合 ¥{selectedPlan?.per_month_yuan}/月 · 解锁全部 AI 能力
+                折合 ¥{selectedPlan.per_month_yuan}/月 · 解锁全部 AI 能力
               </Text>
             </div>
             <Divider style={{ margin: "16px 0" }} />
@@ -444,11 +342,11 @@ const Plans: React.FC = () => {
               size="large"
               type="primary"
               loading={subscribing}
-              disabled={isMember && memberPlanId === selectedBilling}
+              disabled={isMember && memberType === selectedBilling}
               onClick={handleSubscribe}
               icon={<ThunderboltOutlined />}
             >
-              {isMember && memberPlanId === selectedBilling
+              {isMember && memberType === selectedBilling
                 ? "当前方案"
                 : isMember
                   ? "续费/升级"
@@ -475,22 +373,19 @@ const Plans: React.FC = () => {
 
         <Row gutter={[16, 16]}>
           {packages.map((pkg) => {
-            const priceCents = getDiscountPriceCents(pkg, userDiscount)
-            const originalCents = pkg.price_cents
-            const discount =
-              priceCents < originalCents ? Math.round((1 - priceCents / originalCents) * 100) : 0
-            const unit = priceCents / 100 / pkg.points
-            const isHot = pkg.unit_price < 0.1
+            const price = getPackPrice(pkg)
+            const discount = price < pkg.price ? Math.round((1 - price / pkg.price) * 100) : 0
+            const unit = price / pkg.points
             return (
-              <Col xs={24} sm={8} key={pkg.code}>
+              <Col xs={24} sm={8} key={pkg.id}>
                 <Card
-                  className={`xx-pkg-card ${discount > 0 ? "has-discount" : ""} ${isHot ? "recommended" : ""}`}
+                  className={`xx-pkg-card ${discount > 0 ? "has-discount" : ""} ${pkg.id === "basic_pack" ? "recommended" : ""}`}
                   hoverable
                 >
-                  {isHot && <div className="xx-pkg-badge">热门</div>}
+                  {pkg.id === "basic_pack" && <div className="xx-pkg-badge">热门</div>}
                   {discount > 0 && (
                     <Tag color="gold" className="xx-pkg-discount">
-                      {Math.round((priceCents / originalCents) * 10) / 1}折
+                      会员{10 - discount / 10}折
                     </Tag>
                   )}
                   <div className="xx-pkg-name">{pkg.name}</div>
@@ -500,19 +395,17 @@ const Plans: React.FC = () => {
                   <div className="xx-pkg-price">
                     <span className="currency">¥</span>
                     <span className="amount">
-                      {(priceCents / 100)
-                        .toFixed(priceCents % 100 === 0 ? 0 : 1)
-                        .replace(/\.0$/, "")}
+                      {(price / 100).toFixed(price % 100 === 0 ? 0 : 1).replace(/\.0$/, "")}
                     </span>
                     {discount > 0 && (
-                      <span className="xx-pkg-origin">¥{(originalCents / 100).toFixed(0)}</span>
+                      <span className="xx-pkg-origin">¥{(pkg.price / 100).toFixed(0)}</span>
                     )}
                   </div>
                   <div className="xx-pkg-unit">≈¥{unit.toFixed(3)}/积分</div>
                   <Button
                     block
-                    type={isHot ? "primary" : "default"}
-                    loading={buying === pkg.code}
+                    type={pkg.id === "basic_pack" ? "primary" : "default"}
+                    loading={buying === pkg.id}
                     onClick={() => handleBuyPoints(pkg)}
                     style={{ marginTop: 12 }}
                   >

apps/web/src/pages/subscription/UpgradeSubscription.tsx

@@ -1,21 +1,18 @@
 /**
- * 升级/降级/续费页面（#1894 清理后：价格统一走 /subscription/plans API）
+ * 升级/降级/续费页面
+ * P1-3: antd Button/Modal/Radio/Spin → 自定义 UI 组件
  */
-import React, { useEffect, useMemo, useState } from "react"
+import React from "react"
 import { Modal } from "@/components/ui"
 import { useNavigate } from "react-router-dom"
-import type { PlanId, SubscriptionPlan, BillingCycle } from "@/api/subscription/types"
+import type { PlanType } from "@/api/subscription"
 import PageHead from "@/components/layout/PageHead"
 import { Button } from "@/components/ui"
-import { getPlanName } from "./constants"
-import { getSubscriptionPlans } from "@/api/subscription"
+import { PLANS_META, getPlanName, getPlanPrice } from "./constants"
 import { BillingCycleSwitch, Spinner } from "./components/SubscriptionUI"
 import { useSubscription } from "./hooks/useSubscription"
 import "./UpgradeSubscription.css"
 
-/** 可选择的付费档位（不含 free） */
-const PAID_PLANS: PlanId[] = ["monthly", "quarterly", "yearly"]
-
 const UpgradeSubscription: React.FC = () => {
   const navigate = useNavigate()
   const {
@@ -31,53 +28,18 @@ const UpgradeSubscription: React.FC = () => {
     handleCancel,
   } = useSubscription()
 
-  // #1894: 从 /subscription/plans 拉真实价格，不使用任何硬编码价格
-  const [apiPlans, setApiPlans] = useState<SubscriptionPlan[]>([])
-  useEffect(() => {
-    getSubscriptionPlans()
-      .then((r) => setApiPlans(r.plans))
-      .catch(() => setApiPlans([]))
-  }, [])
-
-  const planMap = useMemo(() => {
-    const m = new Map<string, SubscriptionPlan>()
-    apiPlans.forEach((p) => m.set(p.plan_id, p))
-    return m
-  }, [apiPlans])
-
-  const getPlanDisplay = (planId: PlanId) => {
-    const apiPlan = planMap.get(planId)
-    const name = apiPlan?.name ?? getPlanName(planId)
-    // 年卡按年价，月/季卡按总价
-    const isYearly = planId === "yearly"
-    const priceCents = apiPlan?.price_cents ?? 0
-    const monthlyCents =
-      apiPlan?.monthly_price_cents ??
-      (apiPlan && apiPlan.duration_days > 0
-        ? Math.round(apiPlan.price_cents / (apiPlan.duration_days / 30))
-        : 0)
-    return {
-      name,
-      priceYuan: priceCents / 100,
-      monthlyYuan: monthlyCents / 100,
-      billingLabel: isYearly ? "/年" : planId === "quarterly" ? "/季" : "/月",
-    }
-  }
-
   const handleUpgradeClick = () => {
     if (!subscription) return
     if (selectedPlan === subscription.plan_id && billingCycle === subscription.billing_cycle) {
       return
     }
 
-    const display = getPlanDisplay(selectedPlan)
-    const cycleLabel = billingCycle === "monthly" ? "月付" : "年付"
-    const priceLabel =
-      display.priceYuan > 0 ? `费用 ¥${display.priceYuan}${display.billingLabel}` : "免费"
+    const plan = PLANS_META[selectedPlan]
+    const price = getPlanPrice(selectedPlan, billingCycle)
 
     Modal.confirm({
       title: "确认变更套餐",
-      content: `即将变更为「${display.name}」（${cycleLabel}），${priceLabel}。变更立即生效。`,
+      content: `即将变更为「${plan.name}」（${billingCycle === "monthly" ? "月付" : "年付"}），${price > 0 ? `费用 ¥${price}${billingCycle === "monthly" ? "/月" : "/年"}` : "免费"}。变更立即生效。`,
       okText: "确认变更",
       cancelText: "取消",
       onOk: executeChangePlan,
@@ -87,12 +49,12 @@ const UpgradeSubscription: React.FC = () => {
   const handleCancelClick = () => {
     Modal.confirm({
       title: "确认取消订阅",
-      content: "取消后，当前周期结束前仍可正常使用，到期后降级为免费版。",
+      content: "取消后，当前周期结束前仍可正常使用，到期后降级为体验版。",
       okText: "确认取消",
       cancelText: "再想想",
       onOk: async () => {
         const ok = await handleCancel()
-        if (ok) navigate("/subscription")
+        if (ok) navigate("/app/subscription")
       },
     })
   }
@@ -112,31 +74,23 @@ const UpgradeSubscription: React.FC = () => {
       <PageHead title="变更订阅方案" description={`当前套餐：${getPlanName(currentPlan)}`} />
 
       <div className="xx-upgrade-plans">
-        {PAID_PLANS.map((planId) => {
-          const display = getPlanDisplay(planId)
+        {(["standard", "pro", "enterprise"] as PlanType[]).map((planId) => {
+          const plan = PLANS_META[planId]
           const isCurrent = planId === currentPlan
-          // 年卡显示年价，其他显示月价折算
-          const monthlyPrice = display.monthlyYuan
-          const yearlyPrice = display.priceYuan
-          // 选中季卡时默认切到月付周期；年卡切到年付
-          const resolvedCycle: BillingCycle = planId === "yearly" ? "yearly" : "monthly"
           return (
             <div
               key={planId}
               className={`xx-upgrade-card ${isCurrent ? "current" : ""} ${selectedPlan === planId ? "selected" : ""}`}
-              onClick={() => {
-                setSelectedPlan(planId)
-                setBillingCycle(resolvedCycle)
-              }}
+              onClick={() => setSelectedPlan(planId)}
             >
               {isCurrent && <div className="xx-current-badge">当前</div>}
-              <h3>{display.name}</h3>
+              <h3>{plan.name}</h3>
               <div className="xx-price">
                 <BillingCycleSwitch
                   value={billingCycle}
                   onChange={setBillingCycle}
-                  monthlyPrice={monthlyPrice}
-                  yearlyPrice={yearlyPrice}
+                  monthlyPrice={plan.price}
+                  yearlyPrice={plan.yearlyPrice}
                 />
               </div>
             </div>

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

@@ -1,13 +1,16 @@
-/**
- * 订阅套餐元数据（#1894 清理后）
- *
- * - 套餐名兜底：API 失败时用 getPlanName 展示档位名
- * - 价格已统一走 GET /subscription/plans 动态获取，此处不再硬编码价格
- *   （旧 getPlanPrice / PLANS_META.priceYuan / yearlyPriceYuan 已移除）
- */
-import type { PlanId } from "@/api/subscription/types"
-import { PLAN_LABEL } from "@/api/subscription/types"
+import type { PlanType, BillingCycle } from "@/api/subscription"
 
-/** 套餐展示名兜底（优先使用 API 返回的 plan.name / PLAN_LABEL） */
-export const getPlanName = (planId: PlanId | string): string =>
-  PLAN_LABEL[planId as PlanId] ?? "免费版"
+export const PLANS_META: Record<string, { name: string; price: number; yearlyPrice: number }> = {
+  free: { name: "体验版", price: 0, yearlyPrice: 0 },
+  standard: { name: "标准版", price: 99, yearlyPrice: 990 },
+  pro: { name: "专业版", price: 299, yearlyPrice: 2990 },
+  enterprise: { name: "企业版", price: 0, yearlyPrice: 0 },
+}
+
+export const getPlanName = (planId: PlanType | string) => PLANS_META[planId]?.name ?? "体验版"
+
+export const getPlanPrice = (planId: PlanType | string, cycle: BillingCycle) => {
+  const plan = PLANS_META[planId]
+  if (!plan) return 0
+  return cycle === "yearly" ? plan.yearlyPrice : plan.price
+}

apps/web/src/pages/subscription/hooks/useSubscription.ts

@@ -1,8 +1,3 @@
-/**
- * 订阅管理 Hook
- * 封装订阅信息查询、套餐变更、自动续费切换、取消订阅等逻辑
- * 对齐最终契约（plan_id=free/monthly/quarterly/yearly + billing_cycle=monthly/yearly）
- */
 import { useState, useEffect, useCallback } from "react"
 import { message } from "antd"
 import {
@@ -10,14 +5,20 @@ import {
   changePlan,
   toggleAutoRenew,
   cancelSubscription,
+  type SubscriptionInfo,
+  type PlanType,
+  type BillingCycle,
 } from "@/api/subscription"
-import type { SubscriptionInfo, PlanId, BillingCycle } from "@/api/subscription/types"
 
+/**
+ * 订阅管理 Hook
+ * 封装订阅信息查询、套餐变更、自动续费切换、取消订阅等逻辑
+ */
 export function useSubscription() {
   const [subscription, setSubscription] = useState<SubscriptionInfo | null>(null)
   const [loading, setLoading] = useState(true)
   const [submitting, setSubmitting] = useState(false)
-  const [selectedPlan, setSelectedPlan] = useState<PlanId>("monthly")
+  const [selectedPlan, setSelectedPlan] = useState<PlanType>("standard")
   const [billingCycle, setBillingCycle] = useState<BillingCycle>("monthly")
 
   const loadSubscription = useCallback(async () => {
@@ -25,7 +26,6 @@ export function useSubscription() {
       const data = await getCurrentSubscription()
       setSubscription(data)
       setSelectedPlan(data.plan_id)
-      setBillingCycle(data.billing_cycle)
     } catch (err: unknown) {
       if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("获取订阅信息失败")
     } finally {
@@ -37,41 +37,45 @@ export function useSubscription() {
     loadSubscription()
   }, [loadSubscription])
 
-  const executeChangePlan = useCallback(async () => {
-    if (!subscription) return false
+  const handleUpgrade = useCallback(async () => {
+    if (!subscription) return
     if (selectedPlan === subscription.plan_id && billingCycle === subscription.billing_cycle) {
       message.info("当前已是该套餐")
-      return false
+      return
     }
+    // 由调用方决定是否弹确认框
+  }, [subscription, selectedPlan, billingCycle])
+
+  const executeChangePlan = useCallback(async () => {
     try {
       setSubmitting(true)
-      const res = await changePlan({ target_plan_id: selectedPlan, billing_cycle: billingCycle })
+      const res = await changePlan({
+        target_plan_id: selectedPlan,
+        billing_cycle: billingCycle,
+      })
       if (res.success) {
         message.success(res.message)
         setSubscription(res.new_subscription ?? null)
-        return true
       } else {
         message.error(res.message)
-        return false
       }
     } catch (err: unknown) {
       if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("套餐变更失败，请重试")
-      return false
     } finally {
       setSubmitting(false)
     }
-  }, [subscription, selectedPlan, billingCycle])
+  }, [selectedPlan, billingCycle])
 
   const handleToggleAutoRenew = useCallback(
     async (enabled: boolean) => {
       try {
-        const res = await toggleAutoRenew({ enabled })
+        const res = await toggleAutoRenew(enabled)
         message.success(res.message)
-        if (subscription) setSubscription({ ...subscription, auto_renew: enabled })
-        return true
+        if (subscription) {
+          setSubscription({ ...subscription, auto_renew: enabled })
+        }
       } catch (err: unknown) {
         if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("操作失败")
-        return false
       }
     },
     [subscription],
@@ -89,6 +93,7 @@ export function useSubscription() {
   }, [])
 
   return {
+    // 状态
     subscription,
     loading,
     submitting,
@@ -96,7 +101,9 @@ export function useSubscription() {
     billingCycle,
     setSelectedPlan,
     setBillingCycle,
+    // 操作
     loadSubscription,
+    handleUpgrade,
     executeChangePlan,
     handleToggleAutoRenew,
     handleCancel,

apps/web/src/pages/titles/TitleLibrary.tsx

@@ -0,0 +1,137 @@
+/**
+ * 标题库页面 — V21 设计系统
+ * 两栏布局：左侧分类列表（220px）+ 右侧标题卡片网格（3列）
+ * 支持：标题卡片展示、AI 生成标题、复制/编辑/删除、收藏、分类筛选、搜索
+ * 对接后端真实 API（GET/POST/PUT/DELETE /titles）
+ */
+import React from "react"
+import { useTitleLibrary } from "./hooks/useTitleLibrary"
+import { useTitleEdit } from "./hooks/useTitleEdit"
+import { useTitleAI } from "./hooks/useTitleAI"
+import { CategorySidebar } from "./components/title-library/CategorySidebar"
+import { FilterBar } from "./components/title-library/FilterBar"
+import { TitleGrid } from "./components/title-library/TitleGrid"
+import { CreateTitleModal } from "./components/title-library/CreateTitleModal"
+import { AIGenerateModal } from "./components/title-library/AIGenerateModal"
+import "./titles.css"
+
+const TitleLibrary: React.FC = () => {
+  const {
+    categories,
+    activeCatId,
+    filteredTitles,
+    searchText,
+    filterType,
+    filterIndustry,
+    filterFrequency,
+    createMutation,
+    updateMutation,
+    setActiveCatId,
+    setSearchText,
+    setFilterType,
+    setFilterIndustry,
+    setFilterFrequency,
+    handleToggleFavorite,
+    handleCopy,
+    handleDelete,
+  } = useTitleLibrary()
+
+  const {
+    editingId,
+    editText,
+    setEditText,
+    createTitleModalOpen,
+    setCreateTitleModalOpen,
+    newTitleContent,
+    setNewTitleContent,
+    newTitleType,
+    setNewTitleType,
+    handleStartEdit,
+    handleSaveEdit,
+    handleCancelEdit,
+    handleCreateTitle,
+    handleCloseCreateModal,
+  } = useTitleEdit({ updateMutation, createMutation })
+
+  const {
+    aiModalOpen,
+    setAiModalOpen,
+    aiKeyword,
+    setAiKeyword,
+    aiLoading,
+    aiResults,
+    handleAIGenerate,
+    handleAdoptAITitle,
+    handleCopyAI,
+    handleCloseAIModal,
+  } = useTitleAI({ createMutation })
+
+  return (
+    <div className="xx-titles-page">
+      <div className="xx-titles-layout">
+        {/* 左侧：分类列表 */}
+        <CategorySidebar
+          categories={categories}
+          activeCatId={activeCatId}
+          onSelect={setActiveCatId}
+        />
+
+        {/* 右侧：内容区 */}
+        <div className="xx-titles-content">
+          <FilterBar
+            searchText={searchText}
+            onSearchChange={setSearchText}
+            filterType={filterType}
+            onFilterTypeChange={setFilterType}
+            filterIndustry={filterIndustry}
+            onFilterIndustryChange={setFilterIndustry}
+            filterFrequency={filterFrequency}
+            onFilterFrequencyChange={setFilterFrequency}
+            onCreateClick={() => setCreateTitleModalOpen(true)}
+            onAIClick={() => setAiModalOpen(true)}
+          />
+
+          <TitleGrid
+            titles={filteredTitles}
+            editingId={editingId}
+            editText={editText}
+            searchText={searchText}
+            onEditChange={setEditText}
+            onStartEdit={handleStartEdit}
+            onSaveEdit={handleSaveEdit}
+            onCancelEdit={handleCancelEdit}
+            onCopy={handleCopy}
+            onDelete={handleDelete}
+            onToggleFavorite={handleToggleFavorite}
+          />
+        </div>
+      </div>
+
+      {/* 新建标题弹窗 */}
+      <CreateTitleModal
+        open={createTitleModalOpen}
+        newTitleContent={newTitleContent}
+        newTitleType={newTitleType}
+        onContentChange={setNewTitleContent}
+        onTypeChange={setNewTitleType}
+        onCancel={handleCloseCreateModal}
+        onSubmit={handleCreateTitle}
+      />
+
+      {/* AI 生成标题弹窗 */}
+      <AIGenerateModal
+        open={aiModalOpen}
+        aiKeyword={aiKeyword}
+        aiLoading={aiLoading}
+        aiResults={aiResults}
+        onKeywordChange={setAiKeyword}
+        onGenerate={handleAIGenerate}
+        onCancel={handleCloseAIModal}
+        onCopy={handleCopyAI}
+        onAdopt={handleAdoptAITitle}
+      />
+    </div>
+  )
+}
+
+export default TitleLibrary

apps/web/src/pages/titles/components/title-library/AIGenerateModal.tsx

@@ -0,0 +1,121 @@
+import React from "react"
+import Modal from "@/components/ui/Modal"
+import { CopyOutlined, CheckOutlined } from "@ant-design/icons"
+import { Button, Input } from "@/components/ui"
+import { AI_KEYWORD_MAX_LENGTH } from "../../constants/titleLibrary"
+
+interface AIGenerateModalProps {
+  open: boolean
+  aiKeyword: string
+  aiLoading: boolean
+  aiResults: string[]
+  onKeywordChange: (keyword: string) => void
+  onGenerate: () => void
+  onCancel: () => void
+  onCopy: (text: string) => void
+  onAdopt: (text: string) => void
+}
+
+export const AIGenerateModal: React.FC<AIGenerateModalProps> = ({
+  open,
+  aiKeyword,
+  aiLoading,
+  aiResults,
+  onKeywordChange,
+  onGenerate,
+  onCancel,
+  onCopy,
+  onAdopt,
+}) => {
+  return (
+    <Modal
+      title="AI 生成标题"
+      open={open}
+      onCancel={onCancel}
+      onOk={onGenerate}
+      okText={aiLoading ? "生成中..." : "生成"}
+      cancelText="关闭"
+      okButtonProps={{ disabled: aiLoading }}
+      destroyOnClose
+      width={640}
+    >
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "column",
+          gap: 16,
+          padding: "8px 0",
+        }}
+      >
+        <div>
+          <div
+            style={{
+              marginBottom: 6,
+              fontSize: "var(--font-size-sm)",
+              color: "var(--text-secondary)",
+            }}
+          >
+            输入关键词或主题
+          </div>
+          <Input
+            placeholder="例如：美食探店、科技评测、旅行攻略..."
+            value={aiKeyword}
+            onChange={(e) => onKeywordChange(e.target.value)}
+            maxLength={AI_KEYWORD_MAX_LENGTH}
+            onPressEnter={onGenerate}
+          />
+        </div>
+
+        {/* AI 加载动画 */}
+        {aiLoading && (
+          <div className="xx-ai-loading">
+            <div className="xx-ai-loading-dots">
+              <div className="xx-ai-loading-dot" />
+              <div className="xx-ai-loading-dot" />
+              <div className="xx-ai-loading-dot" />
+            </div>
+            <span>AI 正在生成标题候选...</span>
+          </div>
+        )}
+
+        {/* AI 生成结果列表 */}
+        {aiResults.length > 0 && (
+          <div className="xx-ai-results">
+            <div
+              style={{
+                fontSize: "var(--font-size-sm)",
+                color: "var(--text-secondary)",
+                marginBottom: 4,
+              }}
+            >
+              已生成 {aiResults.length} 个候选标题，点击采纳或复制：
+            </div>
+            {aiResults.map((text, idx) => (
+              <div key={idx} className="xx-ai-result-item">
+                <span className="xx-ai-result-text">{text}</span>
+                <div className="xx-ai-result-actions">
+                  <Button
+                    buttonType="ghost"
+                    buttonSize="sm"
+                    icon={<CopyOutlined />}
+                    onClick={() => onCopy(text)}
+                  >
+                    复制
+                  </Button>
+                  <Button
+                    buttonType="primary"
+                    buttonSize="sm"
+                    icon={<CheckOutlined />}
+                    onClick={() => onAdopt(text)}
+                  >
+                    采纳
+                  </Button>
+                </div>
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+    </Modal>
+  )
+}

apps/web/src/pages/titles/components/title-library/CategorySidebar.tsx

@@ -0,0 +1,44 @@
+import React from "react"
+import { FileTextOutlined } from "@ant-design/icons"
+import type { CategoryItem } from "../../types/titleLibrary"
+
+interface CategorySidebarProps {
+  categories: CategoryItem[]
+  activeCatId: string
+  onSelect: (catId: string) => void
+}
+
+export const CategorySidebar: React.FC<CategorySidebarProps> = ({
+  categories,
+  activeCatId,
+  onSelect,
+}) => {
+  return (
+    <div className="xx-title-category-list">
+      {categories.map((cat) => (
+        <div
+          key={cat.id}
+          className={`xx-title-category-item${cat.id === activeCatId ? " active" : ""}`}
+          onClick={() => onSelect(cat.id)}
+        >
+          <div
+            style={{
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "space-between",
+              flex: 1,
+              minWidth: 0,
+            }}
+          >
+            <div style={{ minWidth: 0 }}>
+              <h4 style={{ margin: 0 }}>
+                <FileTextOutlined /> {cat.name}
+              </h4>
+              <span>{cat.count} 条</span>
+            </div>
+          </div>
+        </div>
+      ))}
+    </div>
+  )
+}

apps/web/src/pages/titles/components/title-library/CreateTitleModal.tsx

@@ -0,0 +1,89 @@
+import React from "react"
+import Modal from "@/components/ui/Modal"
+import { Input, Select } from "@/components/ui"
+import type { TitleType } from "../../types/titleLibrary"
+import { TITLE_MAX_LENGTH } from "../../constants/titleLibrary"
+
+const TITLE_TYPE_CREATE_OPTIONS: Array<{ value: TitleType; label: string }> = [
+  { value: "hot", label: "爆款" },
+  { value: "normal", label: "常规" },
+  { value: "creative", label: "创意" },
+]
+
+interface CreateTitleModalProps {
+  open: boolean
+  newTitleContent: string
+  newTitleType: TitleType
+  onContentChange: (content: string) => void
+  onTypeChange: (type: TitleType) => void
+  onCancel: () => void
+  onSubmit: () => void
+}
+
+export const CreateTitleModal: React.FC<CreateTitleModalProps> = ({
+  open,
+  newTitleContent,
+  newTitleType,
+  onContentChange,
+  onTypeChange,
+  onCancel,
+  onSubmit,
+}) => {
+  return (
+    <Modal
+      title="新建标题"
+      open={open}
+      onCancel={onCancel}
+      onOk={onSubmit}
+      okText="创建"
+      cancelText="取消"
+      destroyOnClose
+    >
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "column",
+          gap: 16,
+          padding: "8px 0",
+        }}
+      >
+        <div>
+          <div
+            style={{
+              marginBottom: 6,
+              fontSize: "var(--font-size-sm)",
+              color: "var(--text-secondary)",
+            }}
+          >
+            标题内容
+          </div>
+          <Input.TextArea
+            placeholder="请输入标题内容"
+            value={newTitleContent}
+            onChange={(e) => onContentChange(e.target.value)}
+            rows={3}
+            maxLength={TITLE_MAX_LENGTH}
+            showCount
+          />
+        </div>
+        <div>
+          <div
+            style={{
+              marginBottom: 6,
+              fontSize: "var(--font-size-sm)",
+              color: "var(--text-secondary)",
+            }}
+          >
+            标题类型
+          </div>
+          <Select
+            value={newTitleType}
+            onChange={(v) => onTypeChange(v as TitleType)}
+            style={{ width: "100%" }}
+            options={TITLE_TYPE_CREATE_OPTIONS}
+          />
+        </div>
+      </div>
+    </Modal>
+  )
+}

apps/web/src/pages/titles/components/title-library/FilterBar.tsx

@@ -0,0 +1,76 @@
+import React from "react"
+import { SearchOutlined, PlusOutlined, RobotOutlined } from "@ant-design/icons"
+import { Button, Input, Select } from "@/components/ui"
+import type { Frequency } from "../../types/titleLibrary"
+import {
+  TITLE_TYPE_OPTIONS,
+  INDUSTRY_OPTIONS,
+  FREQUENCY_OPTIONS,
+} from "../../constants/titleLibrary"
+
+interface FilterBarProps {
+  searchText: string
+  onSearchChange: (text: string) => void
+  filterType: string
+  onFilterTypeChange: (value: string) => void
+  filterIndustry: string
+  onFilterIndustryChange: (value: string) => void
+  filterFrequency: Frequency
+  onFilterFrequencyChange: (value: Frequency) => void
+  onCreateClick: () => void
+  onAIClick: () => void
+}
+
+export const FilterBar: React.FC<FilterBarProps> = ({
+  searchText,
+  onSearchChange,
+  filterType,
+  onFilterTypeChange,
+  filterIndustry,
+  onFilterIndustryChange,
+  filterFrequency,
+  onFilterFrequencyChange,
+  onCreateClick,
+  onAIClick,
+}) => {
+  return (
+    <div className="xx-titles-filters">
+      <div className="xx-titles-filters-left">
+        <Input
+          placeholder="搜索标题关键词..."
+          prefix={<SearchOutlined />}
+          value={searchText}
+          onChange={(e) => onSearchChange(e.target.value)}
+          allowClear
+          style={{ width: 220 }}
+        />
+        <Select
+          value={filterType}
+          onChange={onFilterTypeChange}
+          style={{ width: 110 }}
+          options={TITLE_TYPE_OPTIONS}
+        />
+        <Select
+          value={filterIndustry}
+          onChange={onFilterIndustryChange}
+          style={{ width: 110 }}
+          options={INDUSTRY_OPTIONS}
+        />
+        <Select
+          value={filterFrequency}
+          onChange={(v) => onFilterFrequencyChange(v as Frequency)}
+          style={{ width: 120 }}
+          options={FREQUENCY_OPTIONS}
+        />
+      </div>
+      <div className="xx-titles-filters-right">
+        <Button buttonType="ghost" buttonSize="sm" icon={<PlusOutlined />} onClick={onCreateClick}>
+          新建标题
+        </Button>
+        <Button buttonType="primary" buttonSize="sm" icon={<RobotOutlined />} onClick={onAIClick}>
+          AI 生成标题
+        </Button>
+      </div>
+    </div>
+  )
+}

apps/web/src/pages/titles/components/title-library/TitleCard.tsx

@@ -0,0 +1,121 @@
+import React from "react"
+import { Popconfirm } from "antd"
+import {
+  StarOutlined,
+  StarFilled,
+  EditOutlined,
+  CopyOutlined,
+  DeleteOutlined,
+  CheckOutlined,
+} from "@ant-design/icons"
+import type { TitleData } from "../../types/titleLibrary"
+import { typeLabel } from "../../utils/titleLibrary"
+
+interface TitleCardProps {
+  title: TitleData
+  isEditing: boolean
+  editText: string
+  onEditChange: (text: string) => void
+  onStartEdit: () => void
+  onSaveEdit: () => void
+  onCancelEdit: () => void
+  onCopy: () => void
+  onDelete: () => void
+  onToggleFavorite: () => void
+}
+
+export const TitleCard: React.FC<TitleCardProps> = ({
+  title,
+  isEditing,
+  editText,
+  onEditChange,
+  onStartEdit,
+  onSaveEdit,
+  onCancelEdit,
+  onCopy,
+  onDelete,
+  onToggleFavorite,
+}) => {
+  return (
+    <div className="xx-title-card">
+      {/* 收藏按钮 */}
+      <button
+        className="xx-title-fav-btn"
+        onClick={onToggleFavorite}
+        title={title.isFavorited ? "取消收藏" : "收藏"}
+        style={{
+          position: "absolute",
+          top: 12,
+          right: 12,
+          color: title.isFavorited ? "#f59e0b" : "var(--text-tertiary)",
+        }}
+      >
+        {title.isFavorited ? <StarFilled /> : <StarOutlined />}
+      </button>
+
+      {/* 标题文本 / 编辑区 */}
+      {isEditing ? (
+        <textarea
+          className="xx-title-card-edit"
+          value={editText}
+          onChange={(e) => onEditChange(e.target.value)}
+          autoFocus
+          onKeyDown={(e) => {
+            if (e.key === "Enter" && !e.shiftKey) {
+              e.preventDefault()
+              onSaveEdit()
+            }
+            if (e.key === "Escape") {
+              onCancelEdit()
+            }
+          }}
+        />
+      ) : (
+        <div className="xx-title-card-text" style={{ paddingRight: 24 }}>
+          {title.content}
+        </div>
+      )}
+
+      {/* 底部元信息 */}
+      <div className="xx-title-card-meta">
+        <div className="xx-title-card-meta-left">
+          <span className={`xx-title-type-tag ${title.type}`}>{typeLabel(title.type)}</span>
+          <span className="xx-title-card-stat">使用 {title.usageCount} 次</span>
+          <span className="xx-title-card-stat">{title.createdAt}</span>
+        </div>
+
+        <div className="xx-title-card-actions">
+          {isEditing ? (
+            <>
+              <button className="xx-title-card-action-btn" onClick={onSaveEdit} title="保存">
+                <CheckOutlined />
+              </button>
+              <button className="xx-title-card-action-btn" onClick={onCancelEdit} title="取消">
+                ✕
+              </button>
+            </>
+          ) : (
+            <>
+              <button className="xx-title-card-action-btn" onClick={onCopy} title="复制">
+                <CopyOutlined />
+              </button>
+              <button className="xx-title-card-action-btn" onClick={onStartEdit} title="编辑">
+                <EditOutlined />
+              </button>
+              <Popconfirm
+                title="确定删除此标题？"
+                onConfirm={onDelete}
+                okText="删除"
+                cancelText="取消"
+              >
+                <button className="xx-title-card-action-btn danger" title="删除">
+                  <DeleteOutlined />
+                </button>
+              </Popconfirm>
+            </>
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}

apps/web/src/pages/titles/components/title-library/TitleGrid.tsx

@@ -0,0 +1,63 @@
+import React from "react"
+import { FileTextOutlined } from "@ant-design/icons"
+import { TitleCard } from "./TitleCard"
+import type { TitleData } from "../../types/titleLibrary"
+
+interface TitleGridProps {
+  titles: TitleData[]
+  editingId: string | null
+  editText: string
+  searchText: string
+  onEditChange: (text: string) => void
+  onStartEdit: (title: TitleData) => void
+  onSaveEdit: () => void
+  onCancelEdit: () => void
+  onCopy: (title: TitleData) => void
+  onDelete: (id: string) => void
+  onToggleFavorite: (id: string) => void
+}
+
+export const TitleGrid: React.FC<TitleGridProps> = ({
+  titles,
+  editingId,
+  editText,
+  searchText,
+  onEditChange,
+  onStartEdit,
+  onSaveEdit,
+  onCancelEdit,
+  onCopy,
+  onDelete,
+  onToggleFavorite,
+}) => {
+  if (titles.length > 0) {
+    return (
+      <div className="xx-title-grid">
+        {titles.map((title) => (
+          <TitleCard
+            key={title.id}
+            title={title}
+            isEditing={editingId === title.id}
+            editText={editingId === title.id ? editText : ""}
+            onEditChange={onEditChange}
+            onStartEdit={() => onStartEdit(title)}
+            onSaveEdit={onSaveEdit}
+            onCancelEdit={onCancelEdit}
+            onCopy={() => onCopy(title)}
+            onDelete={() => onDelete(title.id)}
+            onToggleFavorite={() => onToggleFavorite(title.id)}
+          />
+        ))}
+      </div>
+    )
+  }
+
+  return (
+    <div className="xx-titles-empty">
+      <div className="xx-titles-empty-icon">
+        <FileTextOutlined />
+      </div>
+      <p>{searchText ? "未找到匹配的标题" : "暂无标题，点击「新建标题」或「AI 生成标题」开始"}</p>
+    </div>
+  )
+}

apps/web/src/pages/titles/constants/titleLibrary.ts

@@ -0,0 +1,34 @@
+import type { TitleType, Industry, Frequency } from "../types/titleLibrary"
+
+export const TITLE_TYPE_OPTIONS: Array<{ value: TitleType | "all"; label: string }> = [
+  { value: "all", label: "全部类型" },
+  { value: "hot", label: "爆款" },
+  { value: "normal", label: "常规" },
+  { value: "creative", label: "创意" },
+]
+
+export const INDUSTRY_OPTIONS: Array<{ value: Industry | "all"; label: string }> = [
+  { value: "all", label: "全部行业" },
+  { value: "food", label: "美食" },
+  { value: "tech", label: "科技" },
+  { value: "beauty", label: "美妆" },
+  { value: "education", label: "教育" },
+  { value: "travel", label: "旅行" },
+]
+
+export const FREQUENCY_OPTIONS: Array<{ value: Frequency; label: string }> = [
+  { value: "all", label: "全部频率" },
+  { value: "high", label: "高频使用" },
+  { value: "medium", label: "中频使用" },
+  { value: "low", label: "低频使用" },
+]
+
+export const FREQUENCY_THRESHOLDS = {
+  high: 100,
+  medium: 30,
+} as const
+
+export const AI_GENERATE_DELAY = 2000
+export const TITLE_MAX_LENGTH = 200
+export const AI_KEYWORD_MAX_LENGTH = 100
+export const ALL_CATEGORY_ID = "cat-all"

apps/web/src/pages/titles/hooks/useTitleAI.ts

@@ -0,0 +1,84 @@
+import { useState, useCallback } from "react"
+import { message } from "antd"
+import type { UseMutationResult } from "@tanstack/react-query"
+import type { TitleItem } from "@/api/titles"
+import { copyToClipboard } from "../utils/titleLibrary"
+import { AI_GENERATE_DELAY } from "../constants/titleLibrary"
+
+interface UseTitleAIProps {
+  createMutation: UseMutationResult<TitleItem, Error, string, unknown>
+}
+
+const generateMockTitles = (keyword: string): string[] => [
+  `${keyword}：这个方法让我事半功倍！`,
+  `关于${keyword}，99%的人都不知道的事`,
+  `${keyword}全攻略，看完这篇就够了`,
+  `我花了 3 个月研究${keyword}，总结出这些经验`,
+  `${keyword}避坑指南，帮你省下 1000 块`,
+]
+
+export const useTitleAI = ({ createMutation }: UseTitleAIProps) => {
+  const [aiModalOpen, setAiModalOpen] = useState(false)
+  const [aiKeyword, setAiKeyword] = useState("")
+  const [aiLoading, setAiLoading] = useState(false)
+  const [aiResults, setAiResults] = useState<string[]>([])
+
+  /* AI 生成标题 */
+  const handleAIGenerate = useCallback(() => {
+    if (!aiKeyword.trim()) {
+      message.warning("请输入关键词或主题")
+      return
+    }
+    setAiLoading(true)
+    setAiResults([])
+
+    setTimeout(() => {
+      const results = generateMockTitles(aiKeyword.trim())
+      setAiResults(results)
+      setAiLoading(false)
+    }, AI_GENERATE_DELAY)
+  }, [aiKeyword])
+
+  /* 采纳 AI 生成的标题 */
+  const handleAdoptAITitle = useCallback(
+    (text: string) => {
+      createMutation.mutate(text, {
+        onSuccess: () => {
+          message.success("标题已采纳并添加到标题库")
+        },
+      })
+    },
+    [createMutation],
+  )
+
+  /* 复制 AI 生成的标题 */
+  const handleCopyAI = useCallback(async (text: string) => {
+    const ok = await copyToClipboard(text)
+    if (ok) {
+      message.success("已复制到剪贴板")
+    } else {
+      message.error("复制失败")
+    }
+  }, [])
+
+  /* 关闭 AI 弹窗 */
+  const handleCloseAIModal = useCallback(() => {
+    setAiModalOpen(false)
+    setAiLoading(false)
+    setAiResults([])
+    setAiKeyword("")
+  }, [])
+
+  return {
+    aiModalOpen,
+    setAiModalOpen,
+    aiKeyword,
+    setAiKeyword,
+    aiLoading,
+    aiResults,
+    handleAIGenerate,
+    handleAdoptAITitle,
+    handleCopyAI,
+    handleCloseAIModal,
+  }
+}

apps/web/src/pages/titles/hooks/useTitleEdit.ts

@@ -0,0 +1,87 @@
+import { useState, useCallback } from "react"
+import { message } from "antd"
+import type { TitleData, TitleType } from "../types/titleLibrary"
+import type { UseMutationResult } from "@tanstack/react-query"
+import type { TitleItem } from "@/api/titles"
+
+interface UseTitleEditProps {
+  updateMutation: UseMutationResult<TitleItem, Error, { id: string; content: string }, unknown>
+  createMutation: UseMutationResult<TitleItem, Error, string, unknown>
+}
+
+export const useTitleEdit = ({ updateMutation, createMutation }: UseTitleEditProps) => {
+  /* 编辑状态 */
+  const [editingId, setEditingId] = useState<string | null>(null)
+  const [editText, setEditText] = useState("")
+
+  /* 新建标题弹窗 */
+  const [createTitleModalOpen, setCreateTitleModalOpen] = useState(false)
+  const [newTitleContent, setNewTitleContent] = useState("")
+  const [newTitleType, setNewTitleType] = useState<TitleType>("normal")
+
+  /* 开始编辑 */
+  const handleStartEdit = useCallback((title: TitleData) => {
+    setEditingId(title.id)
+    setEditText(title.content)
+  }, [])
+
+  /* 保存编辑 */
+  const handleSaveEdit = useCallback(() => {
+    if (!editText.trim()) {
+      message.warning("标题内容不能为空")
+      return
+    }
+    if (editingId) {
+      updateMutation.mutate({ id: editingId, content: editText.trim() })
+    }
+    setEditingId(null)
+    setEditText("")
+    message.success("标题已更新")
+  }, [editingId, editText, updateMutation])
+
+  /* 取消编辑 */
+  const handleCancelEdit = useCallback(() => {
+    setEditingId(null)
+    setEditText("")
+  }, [])
+
+  /* 新建标题提交 */
+  const handleCreateTitle = useCallback(() => {
+    if (!newTitleContent.trim()) {
+      message.warning("请输入标题内容")
+      return
+    }
+    createMutation.mutate(newTitleContent.trim(), {
+      onSuccess: () => {
+        setCreateTitleModalOpen(false)
+        setNewTitleContent("")
+        setNewTitleType("normal")
+        message.success("标题创建成功")
+      },
+    })
+  }, [newTitleContent, createMutation])
+
+  /* 关闭新建弹窗 */
+  const handleCloseCreateModal = useCallback(() => {
+    setCreateTitleModalOpen(false)
+    setNewTitleContent("")
+    setNewTitleType("normal")
+  }, [])
+
+  return {
+    editingId,
+    editText,
+    setEditText,
+    createTitleModalOpen,
+    setCreateTitleModalOpen,
+    newTitleContent,
+    setNewTitleContent,
+    newTitleType,
+    setNewTitleType,
+    handleStartEdit,
+    handleSaveEdit,
+    handleCancelEdit,
+    handleCreateTitle,
+    handleCloseCreateModal,
+  }
+}

apps/web/src/pages/titles/hooks/useTitleLibrary/index.ts

@@ -0,0 +1,55 @@
+import { useTitleFilters } from "./useTitleFilters"
+import { useTitleMutations } from "./useTitleMutations"
+import { useTitleData } from "./useTitleData"
+import { useTitleActions } from "./useTitleActions"
+
+export const useTitleLibrary = () => {
+  /* 数据获取与派生 */
+  const { titles, categories, activeCatId, activeCategory, setActiveCatId } = useTitleData()
+
+  /* 筛选 */
+  const {
+    searchText,
+    filterType,
+    filterIndustry,
+    filterFrequency,
+    setSearchText,
+    setFilterType,
+    setFilterIndustry,
+    setFilterFrequency,
+    filteredTitles,
+  } = useTitleFilters(titles, categories, activeCatId, activeCategory)
+
+  /* CRUD mutations */
+  const { createMutation, updateMutation, deleteMutation } = useTitleMutations()
+
+  /* 操作 handlers */
+  const { handleToggleFavorite, handleCopy, handleDelete } = useTitleActions(deleteMutation)
+
+  return {
+    /* 状态 */
+    titles,
+    categories,
+    activeCatId,
+    activeCategory,
+    filteredTitles,
+    searchText,
+    filterType,
+    filterIndustry,
+    filterFrequency,
+    /* mutations */
+    createMutation,
+    updateMutation,
+    deleteMutation,
+    /* setters */
+    setActiveCatId,
+    setSearchText,
+    setFilterType,
+    setFilterIndustry,
+    setFilterFrequency,
+    /* handlers */
+    handleToggleFavorite,
+    handleCopy,
+    handleDelete,
+  }
+}