chore: 合入最新develop触发合入检查

- WechatCallback/WechatBindCallback: 删除localStorage state前置校验(后端state store一次性消费兜底，微信内/跨浏览器误杀正常回调)；catch透传后端真实detail；处理微信重定向error参数
- Login: 微信登录按钮加ref同步防连点(连点两次state互相覆盖)
- 新增api/errors.ts统一错误提取(axios detail/422数组/状态码/网络超时)
- useAssetUpload: 失败卡片记录失败阶段+HTTP状态码+OSS XML错误明细；getOrCreateDefaultProject失败独立提示；toast与拦截器去重
- UploadQueuePanel: 失败卡片多行展示完整原因(阶段+错误+安全重试提示)
- uploadDedup: 全量哈希阈值256MB→64MB，抽样片段8MB→16MB，避免100~256MB视频整文件读入内存卡死
- WechatOnboarding: 昵称输入框不预填，用户必须自己输入
- 测试: 新增22用例，全量644通过

alembic/versions/068_user_profile_completed.py

@@ -1,26 +0,0 @@
-"""add profile_completed to users
-
-Issue #1718：微信新用户首次登录需设置昵称（PATCH /auth/me）。
-- users.profile_completed：资料是否已完善；存量行默认 True（不触发引导），
-  微信新建用户在应用层置 False。
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "068_user_profile_completed"
-down_revision = "067_celery_task_id"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "users",
-        sa.Column("profile_completed", sa.Boolean(), nullable=False, server_default=sa.text("true")),
-    )
-
-
-def downgrade() -> None:
-    op.drop_column("users", "profile_completed")

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

@@ -1,5 +1,4 @@
 """
-from __future__ import annotations
 Canonical authentication API routes.
 
 The route layer is intentionally thin: repository construction lives in
@@ -16,7 +15,7 @@ from app.config import settings
 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
+from pydantic import BaseModel, EmailStr
 
 from packages.adapters.redis import NoopSessionStore
 from packages.adapters.smtp import NoopEmailService
@@ -86,22 +85,6 @@ class CurrentUserResponse(BaseModel):
     phone_verified: bool = False
     binding_complete: bool = False
     wechat_bound: bool = False
-    profile_completed: bool = True
-
-
-class UserProfileResponse(BaseModel):
-    """用户资料负载（PATCH /me、绑定/解绑接口复用；字段与 GET /auth/me 一致，前端 normalizeUser 直接消费）"""
-
-    user_id: str
-    email: str
-    username: str
-    display_name: str
-    email_verified: bool
-    phone: str = ""
-    phone_verified: bool = False
-    binding_complete: bool = False
-    wechat_bound: bool = False
-    profile_completed: bool = True
 
 
 class PasswordResetRequestModel(BaseModel):
@@ -291,51 +274,9 @@ async def get_current_user_info(
         phone_verified=user.phone_verified,
         binding_complete=binding_complete,
         wechat_bound=bool(user.wechat_openid),
-        profile_completed=user.profile_completed,
     )
 
 
-class UpdateProfileRequest(BaseModel):
-    """更新个人资料请求（当前仅支持昵称）"""
-
-    display_name: str
-
-    @field_validator("display_name")
-    @classmethod
-    def _validate_display_name(cls, v: str) -> str:
-        name = (v or "").strip()
-        if not name:
-            raise ValueError("昵称不能为空白")
-        if len(name) > 20:
-            raise ValueError("昵称长度需在 1-20 个字符之间")
-        return name
-
-
-class UpdateProfileResponse(BaseModel):
-    """更新资料响应：前端 normalizeUser(response.user) 直接消费"""
-
-    user: UserProfileResponse
-
-
-@router.patch("/me", response_model=UpdateProfileResponse)
-async def update_current_user_profile(
-    request: UpdateProfileRequest,
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    user_repository: UserRepository = Depends(get_user_repository),
-) -> UpdateProfileResponse:
-    """更新当前登录用户昵称（微信新用户首次设置昵称后置 profile_completed=True）。"""
-    user = current_user.user
-    user.display_name = request.display_name  # 已 strip（validator）
-    if not user.profile_completed:
-        user.profile_completed = True
-    user_repository.save(user)
-
-    logger.info("[资料更新] 用户 %s 更新昵称，profile_completed=%s", user.id, user.profile_completed)
-    # 重新读取，确保返回的是持久化后的最新状态
-    fresh = user_repository.find_by_id(user.id) or user
-    return UpdateProfileResponse(user=_user_profile(fresh))
-
-
 class _NoopSessionStore(NoopSessionStore):
     pass
 
@@ -566,20 +507,34 @@ class WechatBindCompleteRequest(BaseModel):
     state: str = ""
 
 
+class WechatBindUserProfile(BaseModel):
+    """绑定/解绑后返回的用户信息（字段对齐 /auth/me，前端 normalizeUser 直接消费）"""
+
+    user_id: str
+    email: str
+    username: str
+    display_name: str
+    email_verified: bool
+    phone: str = ""
+    phone_verified: bool = False
+    binding_complete: bool = False
+    wechat_bound: bool = False
+
+
 class WechatBindCompleteResponse(BaseModel):
     success: bool
-    user: UserProfileResponse
+    user: WechatBindUserProfile
 
 
 class WechatUnbindResponse(BaseModel):
     success: bool
 
 
-def _user_profile(user) -> UserProfileResponse:
+def _wechat_user_profile(user) -> WechatBindUserProfile:
     binding_complete = bool(
         user.phone_verified and user.email_verified and user.email and "@wechat.local" not in user.email
     )
-    return UserProfileResponse(
+    return WechatBindUserProfile(
         user_id=user.id,
         email=user.email,
         username=user.username,
@@ -589,7 +544,6 @@ def _user_profile(user) -> UserProfileResponse:
         phone_verified=user.phone_verified,
         binding_complete=binding_complete,
         wechat_bound=bool(user.wechat_openid),
-        profile_completed=user.profile_completed,
     )
 
 
@@ -635,7 +589,7 @@ async def wechat_bind(
         raise HTTPException(status_code=http_status, detail=error)
 
     logger.info("[微信绑定] 用户 %s 绑定成功 openid=%s", current_user.user.id, wechat_user.openid[:8])
-    return WechatBindCompleteResponse(success=True, user=_user_profile(result.user))
+    return WechatBindCompleteResponse(success=True, user=_wechat_user_profile(result.user))
 
 
 @router.delete("/wechat/bind", response_model=WechatUnbindResponse)

apps/api/app/api/routes/upload.py

@@ -108,8 +108,9 @@ def _infer_mime_type_from_storage_key(storage_key: str) -> str:
     return "video/mp4"  # default
 
 
-# 兜底去重：无 file_hash / client_upload_id 且大小已知时，同库同名同大小近期活动记录视为重复
+# 兜底去重：无 file_hash / client_upload_id 时，同库同名近期活动记录视为重复
 FALLBACK_DEDUP_WINDOW_MINUTES = 30
+ACTIVE_ASSET_STATUSES = (AssetStatus.UPLOADING, AssetStatus.PROCESSING)
 
 
 def _find_duplicate_asset(
@@ -125,12 +126,8 @@ def _find_duplicate_asset(
 
     1. client_upload_id（客户端幂等 token，同一次上传的重试保持一致）
     2. file_hash（内容哈希，不同上传只要内容相同即去重）
-    3. 兜底（严格模式，宁可漏判不可误杀）：file_hash 与 client_upload_id
-       均缺失、且 file_size > 0 时，同库 + 同文件名 + **同大小** 且 30 分钟内
-       仍处 uploading/processing 的记录才判重。
-       - file_hash 非空时跳过兜底（hash 已代表内容；同名但内容全新的视频
-         如 iPhone 的 IMG_xxxx.MOV 绝不能被同名占位误杀）
-       - file_size=0（未知）时不允许仅凭同名 + processing 判重，直接放行
+    3. 兜底：同库 + 同文件名（+同大小）且 30 分钟内仍处 uploading/processing
+       的记录——旧客户端不传 hash/token 时，防止 complete 超时重试反复建占位。
 
     全部为鸭子类型调用：旧仓储无对应方法时静默跳过，不破坏既有实现。
     """
@@ -159,35 +156,24 @@ def _find_duplicate_asset(
                 existing.id,
             )
             return existing
-    # 同名兜底去重（最后防线，严格模式）：
-    # - 仅当 file_hash / client_upload_id 均缺失时启用（hash 能代表内容时不靠同名猜）
-    # - file_size 必须 > 0 且与记录大小严格一致；大小未知（0）直接放行
-    # - 只命中近期 UPLOADING/PROCESSING 活动记录（READY 历史素材不拦）
-    if filename and not file_hash and not client_upload_id and file_size and file_size > 0:
+    if filename:
         find_recent = getattr(asset_repository, "find_recent_active_by_library_and_name", None)
         if callable(find_recent):
             existing = find_recent(
                 library_id=library_id,
                 name=filename,
                 within_minutes=FALLBACK_DEDUP_WINDOW_MINUTES,
-                file_size=file_size,
+                file_size=file_size or 0,
             )
-            if existing is not None:
+            if existing is not None and getattr(existing, "status", None) in ACTIVE_ASSET_STATUSES:
                 logger.info(
-                    "素材幂等兜底命中(近期同名同大小活动记录): library=%s name=%s asset=%s status=%s size=%s",
+                    "素材幂等兜底命中(近期活动同名记录): library=%s name=%s asset=%s status=%s",
                     library_id,
                     filename,
                     getattr(existing, "id", "?"),
-                    getattr(existing, "status", None),
-                    file_size,
+                    getattr(existing, "status", "?"),
                 )
                 return existing
-    elif filename and not file_hash and not client_upload_id and not file_size:
-        logger.debug(
-            "同名兜底去重跳过(file_size 未知，宁可放行不可误杀): library=%s name=%s",
-            library_id,
-            filename,
-        )
     return None
 
 
@@ -201,44 +187,8 @@ def _create_pending_asset(
     user_id,
     file_hash="",
     client_upload_id="",
-    file_size: int = 0,
 ):
-    """立即创建或复用一条 PROCESSING 状态的 Asset 记录。
-
-    find-or-create：prepare 阶段已按 file_hash/client_upload_id 预建的占位记录
-    会被 find_by_library_and_file_hash/find_by_library_and_client_upload_id 命中，
-    直接复用并补齐字段（避免 pre-create + complete 重复建两条）。
-    """
-    # 1. 按 client_upload_id / file_hash 查找现有记录
-    existing = None
-    if client_upload_id:
-        find_by_cuid = getattr(asset_repository, "find_by_library_and_client_upload_id", None)
-        if callable(find_by_cuid):
-            existing = find_by_cuid(library_id=library_id, client_upload_id=client_upload_id)
-    if existing is None and file_hash:
-        existing = asset_repository.find_by_library_and_file_hash(library_id=library_id, file_hash=file_hash)
-    if existing is not None:
-        # 补齐字段（幂等：避免重复建记录，前端已拿到 asset_id）
-        changed = False
-        if file_hash and not existing.file_hash:
-            existing.file_hash = file_hash
-            changed = True
-        if client_upload_id and not existing.client_upload_id:
-            existing.client_upload_id = client_upload_id
-            changed = True
-        if file_size and not existing.file_size:
-            existing.file_size = file_size
-            changed = True
-        if existing.status not in (AssetStatus.PROCESSING, AssetStatus.UPLOADING):
-            existing.status = AssetStatus.PROCESSING
-            changed = True
-        if changed:
-            try:
-                asset_repository.update(existing)
-            except Exception:  # noqa: BLE001 — 字段补齐失败不阻塞主流程
-                pass
-        return existing
-
+    """立即创建一条 PROCESSING 状态的 Asset 记录，使前端能马上看到新素材。"""
     asset = Asset.create(
         project_id=project_id,
         library_id=library_id,
@@ -249,7 +199,6 @@ def _create_pending_asset(
         uploaded_by_user_id=user_id,
         file_hash=file_hash,
         client_upload_id=client_upload_id,
-        file_size=file_size,
     )
     return asset_repository.create(asset)
 
@@ -294,15 +243,9 @@ async def prepare_direct_upload(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     project_repository: Any = Depends(get_project_repository),
     asset_library_repository: Any = Depends(get_asset_library_repository),
-    asset_repository: Any = Depends(get_asset_repository),
     storage_service: OSSStorageService = Depends(get_storage_service),
 ) -> DirectUploadPrepareResponse:
-    """创建浏览器直传 OSS 的短期表单签名，并在签名前按 file_hash/client_upload_id 去重。
-
-    命中去重：直接返回 duplicated=True + skip_transfer=True（前端跳过 OSS 直传），
-    未命中：正常签名 OSS 并立即预建一条 PROCESSING 状态的 asset 记录占住
-    file_hash 闸门，响应带 asset_id 供前端/后续 complete 关联。
-    """
+    """创建浏览器直传 OSS 的短期表单签名。"""
     settings = get_settings()
     max_size_bytes = settings.OSS_DIRECT_UPLOAD_MAX_MB * 1024 * 1024
     if request.file_size > max_size_bytes:
@@ -321,39 +264,8 @@ async def prepare_direct_upload(
         asset_library_repository,
     )
 
-    safe_filename = request.filename.replace("/", "_").replace("\\", "_")
-
-    # ── prepare 阶段去重：OSS 签名之前先查已存在素材 ──
-    if request.file_hash or request.client_upload_id:
-        existing = _find_duplicate_asset(
-            asset_repository,
-            library_id=request.library_id,
-            file_hash=request.file_hash,
-            client_upload_id=request.client_upload_id,
-            filename=request.filename,
-            file_size=request.file_size,
-        )
-        if existing is not None:
-            logger.info(
-                "prepare 命中去重: library=%s hash=%s cuid=%s existing_asset=%s",
-                request.library_id,
-                request.file_hash,
-                request.client_upload_id,
-                existing.id,
-            )
-            return DirectUploadPrepareResponse(
-                upload_url="",
-                method="",
-                storage_key=existing.storage_key,
-                expires_at="",
-                fields={},
-                max_size_bytes=0,
-                duplicated=True,
-                skip_transfer=True,
-                asset_id=existing.id,
-            )
-
     file_id = uuid4().hex[:8]
+    safe_filename = request.filename.replace("/", "_").replace("\\", "_")
     storage_key = f"uploads/{file_id}/{safe_filename}"
     try:
         payload = storage_service.create_direct_upload_post(
@@ -372,27 +284,6 @@ async def prepare_direct_upload(
             detail=f"Failed to prepare upload: {type(error).__name__}",
         ) from error
 
-    # ── 预建 asset 占位：占住 file_hash/client_upload_id 闸门，避免并发重复上传 ──
-    pending_asset_id = ""
-    if request.file_hash or request.client_upload_id:
-        try:
-            pending = _create_pending_asset(
-                asset_repository=asset_repository,
-                project_id=request.project_id,
-                library_id=request.library_id,
-                storage_key=storage_key,
-                filename=safe_filename,
-                mime_type=validated_content_type,
-                user_id=authenticated_user.user.id,
-                file_hash=request.file_hash,
-                client_upload_id=request.client_upload_id,
-                file_size=request.file_size,
-            )
-            pending_asset_id = pending.id
-        except Exception as error:
-            # 预建失败不阻塞签名：complete 仍可按 OSS 文件 + hash 兜底去重
-            logger.warning("预建 asset 占位失败，降级走 old flow: %s", error)
-
     return DirectUploadPrepareResponse(
         upload_url=str(payload["url"]),
         method=str(payload["method"]),
@@ -400,9 +291,6 @@ async def prepare_direct_upload(
         expires_at=str(payload["expires_at"]),
         fields={str(key): str(value) for key, value in dict(payload["fields"]).items()},
         max_size_bytes=max_size_bytes,
-        duplicated=False,
-        skip_transfer=False,
-        asset_id=pending_asset_id,
     )
 
 
@@ -472,7 +360,6 @@ async def complete_direct_upload(
         user_id=authenticated_user.user.id,
         file_hash=request.file_hash,
         client_upload_id=request.client_upload_id,
-        file_size=request.file_size,
     )
 
     job = _submit_ingest_job(

apps/api/app/schemas/upload.py

@@ -16,7 +16,6 @@ class DirectUploadPrepareRequest(BaseModel):
     content_type: str = Field(default="application/octet-stream", min_length=1, max_length=100)
     file_size: int = Field(..., gt=0)
     file_hash: str = Field(default="", max_length=64, description="文件 MD5 哈希，用于去重检测")
-    client_upload_id: str = Field(default="", max_length=64, description="客户端幂等 token（同一次上传的重试保持一致）")
 
 
 class DirectUploadPrepareResponse(BaseModel):
@@ -26,9 +25,6 @@ class DirectUploadPrepareResponse(BaseModel):
     expires_at: str
     fields: dict[str, str]
     max_size_bytes: int
-    duplicated: bool = False
-    skip_transfer: bool = False
-    asset_id: str = ""
 
 
 class DirectUploadCompleteRequest(BaseModel):

apps/web/public/vite.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <rect width="64" height="64" rx="14" fill="#3b82f6"/>
-  <text x="32" y="44" font-size="34" text-anchor="middle">🦐</text>
-</svg>

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

@@ -139,17 +139,6 @@ export interface DirectUploadPrepareResult {
    * 旧后端不返回该字段，前端降级为无预建卡片的原有行为。
    */
   asset_id?: string
-  /**
-   * 后端 file_hash 命中素材库已有相同文件时为 true，前端应跳过 transfer + complete 阶段
-   * 直接按「去重命中」处理（不调 transfer、不调 complete、立即刷新素材列表）。
-   * 旧后端不返回该字段，前端降级为走老流程。
-   */
-  duplicated?: boolean
-  /**
-   * 与 duplicated 语义一致：true 表示跳过传输，前端据此短路。
-   * 两个字段是同一语义的别名（后端可能只返回其一），前端任意为 true 即视为命中去重。
-   */
-  skip_transfer?: boolean
 }
 
 /** 直传完成确认返回 */

apps/web/src/api/assets/upload.ts

@@ -32,8 +32,6 @@ export const completeDirectUpload = async (data: {
   file_hash?: string
   /** 前端上传幂等 token（与 prepare 一致），同一次上传重发 complete 不重复建记录 */
   client_upload_id?: string
-  /** 文件字节数；后端同名兜底去重需用它做大小校验，缺失（=0）时同名记录一律不判重 */
-  file_size?: number
 }): Promise<DirectUploadCompleteResult> => {
   // complete 内含 OSS 存在性检查 + 建库 + 派单，放宽到 60s；
   // 超时不代表失败（记录可能已建成），调用方禁止超时后盲目重传整个文件
@@ -158,8 +156,6 @@ export const prepareDirectUploadHandle = async (data: {
         storage_key: prepared.storage_key,
         file_hash: data.fileHash,
         client_upload_id: data.clientUploadId,
-        // 透传文件字节数：后端同名兜底去重依赖大小校验，缺省会导致同名新视频被误判重复
-        file_size: data.file.size,
       }),
   }
 }
@@ -183,16 +179,6 @@ export const uploadAssetDirect = async (data: {
     fileHash,
     clientUploadId,
   })
-  // prepare 阶段后端 file_hash 命中素材库已有相同文件：跳过 transfer + complete
-  if (handle.prepared.skip_transfer || handle.prepared.duplicated) {
-    return {
-      storage_key: handle.prepared.storage_key,
-      ingest_job_id: "",
-      url: "",
-      duplicated: true,
-      asset_id: handle.prepared.asset_id,
-    }
-  }
   await handle.transfer(data.onProgress)
   return handle.complete()
 }

apps/web/src/api/auth/wxLogin.ts

@@ -1,112 +0,0 @@
-/**
- * 微信扫码登录 WxLogin JS-SDK 动态加载与授权参数解析
- *
- * 微信官网嵌入式二维码方案：页面引入 https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js
- * 后挂载全局 window.WxLogin，new WxLogin({...}) 会在指定容器内渲染二维码 iframe。
- * 本模块负责：动态加载该脚本（带超时/失败检测）、从后端返回的 auth_url 中解析
- * WxLogin 所需的 appid / redirect_uri / state。
- */
-
-const WX_LOGIN_SRC = "https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"
-/** 脚本加载超时（毫秒）：超时视为加载失败，调用方回退整页跳转 */
-const WX_LOGIN_LOAD_TIMEOUT = 8000
-
-/** WxLogin 构造参数（微信官方字段，保持原名） */
-export interface WxLoginOptions {
-  /** 是否内嵌二维码（回调在 iframe 内完成） */
-  self_redirect: boolean
-  /** 二维码容器元素 id */
-  id: string
-  /** 微信开放平台 AppID */
-  appid: string
-  /** 应用授权作用域，网站应用固定 snsapi_login */
-  scope: "snsapi_login"
-  /** 回调地址（需与微信开放平台配置一致，WxLogin 内部会 encodeURIComponent） */
-  redirect_uri: string
-  /** 防 CSRF 随机串，由后端 state store 生成并在回调时一次性消费 */
-  state: string
-  /** 二维码样式：black / white */
-  style?: "black" | "white"
-  /** 自定义样式链接（可选） */
-  href?: string
-}
-
-/** 微信脚本挂载到 window 上的全局构造函数类型 */
-export interface WxLoginConstructor {
-  new (options: WxLoginOptions): unknown
-}
-
-declare global {
-  interface Window {
-    WxLogin?: WxLoginConstructor
-  }
-}
-
-let loadPromise: Promise<WxLoginConstructor> | null = null
-
-/**
- * 动态加载微信 WxLogin JS（单例：并发调用复用同一个 promise）。
- * 加载失败或超时会 reject，调用方应回退到整页跳转授权方式。
- */
-export function loadWxLoginScript(): Promise<WxLoginConstructor> {
-  if (window.WxLogin) return Promise.resolve(window.WxLogin)
-  if (loadPromise) return loadPromise
-
-  loadPromise = new Promise<WxLoginConstructor>((resolve, reject) => {
-    const script = document.createElement("script")
-    script.src = WX_LOGIN_SRC
-    script.async = true
-    script.onload = () => {
-      if (window.WxLogin) {
-        resolve(window.WxLogin)
-      } else {
-        loadPromise = null
-        reject(new Error("微信登录脚本加载完成但 WxLogin 未挂载"))
-      }
-    }
-    script.onerror = () => {
-      loadPromise = null
-      script.remove()
-      reject(new Error("微信登录脚本加载失败"))
-    }
-    document.head.appendChild(script)
-
-    // 超时兜底：部分网络环境下脚本既不 onload 也不 onerror
-    window.setTimeout(() => {
-      if (window.WxLogin) {
-        resolve(window.WxLogin)
-        return
-      }
-      loadPromise = null
-      script.remove()
-      reject(new Error("微信登录脚本加载超时"))
-    }, WX_LOGIN_LOAD_TIMEOUT)
-  })
-
-  return loadPromise
-}
-
-/** 从微信授权链接 query 中解析出的 WxLogin 所需参数 */
-export interface ParsedWxAuthParams {
-  appid: string
-  /** 已 URL 解码的回调地址（传给 WxLogin 时由其内部再次编码） */
-  redirect_uri: string
-  state: string
-}
-
-/**
- * 从后端返回的微信授权链接（https://open.weixin.qq.com/connect/qrconnect?appid=...&redirect_uri=...&state=...）
- * 中解析 appid / redirect_uri / state。解析失败时返回 null，由调用方回退整页跳转。
- */
-export function parseWxAuthUrl(authUrl: string, stateFallback?: string): ParsedWxAuthParams | null {
-  try {
-    const url = new URL(authUrl)
-    const appid = url.searchParams.get("appid")
-    const redirectUri = url.searchParams.get("redirect_uri")
-    const state = url.searchParams.get("state") || stateFallback || ""
-    if (!appid || !redirectUri || !state) return null
-    return { appid, redirect_uri: redirectUri, state }
-  } catch {
-    return null
-  }
-}

apps/web/src/components/auth/WechatQrModal/WechatQrModal.css

@@ -1,74 +0,0 @@
-.xx-wechat-qr-modal {
-  position: relative;
-  padding: 8px 0 4px;
-  min-height: 320px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-/* 常驻二维码容器（WxLogin 渲染目标） */
-.xx-wechat-qr-container {
-  display: flex;
-  justify-content: center;
-  min-height: 260px;
-}
-
-/* loading / error 遮罩层，覆盖在二维码容器之上 */
-.xx-wechat-qr-overlay {
-  position: absolute;
-  inset: 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  background: #fff;
-  text-align: center;
-  color: #666;
-}
-
-.xx-wechat-qr-overlay p {
-  margin-top: 16px;
-  margin-bottom: 0;
-}
-
-.xx-wechat-qr-container iframe {
-  border: none;
-}
-
-.xx-wechat-qr-tip {
-  margin: 12px 0 0;
-  color: #666;
-  font-size: 14px;
-}
-
-.xx-wechat-qr-error {
-  text-align: center;
-  width: 100%;
-}
-
-.xx-wechat-qr-error-msg {
-  color: #ef4444;
-  font-size: 14px;
-  line-height: 1.6;
-  margin: 0 0 16px;
-  word-break: break-word;
-}
-
-.xx-wechat-qr-error-actions {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 12px;
-}
-
-.xx-wechat-qr-fallback {
-  background: none;
-  border: none;
-  color: var(--primary-color, #3b82f6);
-  cursor: pointer;
-  font-size: 13px;
-  padding: 0;
-  text-decoration: underline;
-}

apps/web/src/components/auth/WechatQrModal/index.tsx

@@ -1,265 +0,0 @@
-/**
- * 微信扫码二维码弹窗（登录 / 绑定复用）
- *
- * 微信官方嵌入式二维码方案：弹窗内用 new WxLogin({ self_redirect: true }) 渲染二维码，
- * 扫码后微信重定向到本站回调页（在二维码 iframe 内加载），回调页通过 postMessage
- * 把成功/失败结果通知本弹窗（消息协议见 ./messages）。
- *
- * 兜底：获取授权链接成功但 WxLogin JS 加载失败/超时时，自动回退整页跳转授权
- * （与旧流程一致）；获取授权链接本身失败时在弹窗内展示错误并提供重试。
- */
-import React, { useEffect, useRef, useState } from "react"
-import { Spin } from "antd"
-import Modal from "@/components/ui/Modal"
-import Button from "@/components/ui/Button"
-import {
-  getWechatAuthUrl,
-  getWechatBindUrl,
-  getCurrentUser,
-  normalizeUser,
-  type User,
-} from "@/api/auth"
-import { useAuthStore } from "@/store/authStore"
-import { scheduleProactiveRefresh } from "@/api/auth/tokenRefresh"
-import { getErrorMessage } from "@/api/errors"
-import { loadWxLoginScript, parseWxAuthUrl } from "@/api/auth/wxLogin"
-import { isWechatQrMessage, type WechatQrScene } from "./messages"
-import "./WechatQrModal.css"
-
-export interface WechatQrModalProps {
-  open: boolean
-  scene: WechatQrScene
-  onClose: () => void
-  /** 登录场景成功回调（needOnboarding=true 时调用方应跳昵称引导页） */
-  onLoginSuccess?: (needOnboarding: boolean) => void
-  /** 绑定场景成功回调（调用方刷新用户信息/提示） */
-  onBindSuccess?: () => void
-}
-
-type QrStatus = "loading" | "qrcode" | "error"
-
-const CONTAINER_ID: Record<WechatQrScene, string> = {
-  login: "wechat-qr-login-container",
-  bind: "wechat-qr-bind-container",
-}
-
-const STATE_STORAGE_KEY: Record<WechatQrScene, string> = {
-  login: "wechat_state",
-  bind: "wechat_bind_state",
-}
-
-/**
- * 等待二维码容器挂载到 DOM。antd Modal 内容通过 portal 渲染且带进场动画，
- * 父组件 effect 首次执行时容器可能尚未出现在 document 中。
- */
-function waitForContainer(id: string, timeoutMs = 3000): Promise<HTMLElement | null> {
-  return new Promise((resolve) => {
-    const start = Date.now()
-    const check = () => {
-      const el = document.getElementById(id)
-      if (el) {
-        resolve(el)
-        return
-      }
-      if (Date.now() - start > timeoutMs) {
-        resolve(null)
-        return
-      }
-      setTimeout(check, 50)
-    }
-    check()
-  })
-}
-
-const WechatQrModal: React.FC<WechatQrModalProps> = ({
-  open,
-  scene,
-  onClose,
-  onLoginSuccess,
-  onBindSuccess,
-}) => {
-  const setAuth = useAuthStore((state) => state.setAuth)
-  const setUser = useAuthStore((state) => state.setUser)
-  const [status, setStatus] = useState<QrStatus>("loading")
-  const [errorMsg, setErrorMsg] = useState("")
-  /** 刷新二维码计数：变化时重新请求授权链接并重渲染 */
-  const [renderSeq, setRenderSeq] = useState(0)
-  /** 最新授权链接，用于"整页打开"兜底 */
-  const authUrlRef = useRef<string | null>(null)
-
-  const isLogin = scene === "login"
-
-  // 初始化：获取授权链接 → 加载 WxLogin JS → 内嵌渲染二维码
-  useEffect(() => {
-    if (!open) return
-    let cancelled = false
-    authUrlRef.current = null
-    setStatus("loading")
-    setErrorMsg("")
-
-    const init = async () => {
-      try {
-        const fetchUrl = isLogin ? getWechatAuthUrl : getWechatBindUrl
-        const result = await fetchUrl()
-        if (cancelled) return
-        // 写 state（整页跳转兜底路径的回调页也会清理它）
-        localStorage.setItem(STATE_STORAGE_KEY[scene], result.state)
-        authUrlRef.current = result.auth_url
-
-        const params = parseWxAuthUrl(result.auth_url, result.state)
-        if (!params) {
-          // 授权链接格式异常：直接整页跳转，由微信侧/回调页兜底
-          window.location.href = result.auth_url
-          return
-        }
-
-        const WxLogin = await loadWxLoginScript()
-        if (cancelled) return
-        // 等 Modal portal 中的容器挂载完成
-        const container = await waitForContainer(CONTAINER_ID[scene])
-        if (cancelled) return
-        if (!container) {
-          window.location.href = result.auth_url
-          return
-        }
-        container.innerHTML = ""
-        new WxLogin({
-          self_redirect: true,
-          id: CONTAINER_ID[scene],
-          appid: params.appid,
-          scope: "snsapi_login",
-          redirect_uri: params.redirect_uri,
-          state: params.state,
-          style: "black",
-        })
-        if (!cancelled) setStatus("qrcode")
-      } catch (err) {
-        if (cancelled) return
-        if (authUrlRef.current) {
-          // 授权链接已拿到但二维码脚本加载失败/超时：回退整页跳转
-          window.location.href = authUrlRef.current
-          return
-        }
-        // 授权链接接口本身失败：弹窗内展示真实原因，允许重试
-        setErrorMsg(getErrorMessage(err, "微信服务暂不可用，请稍后重试"))
-        setStatus("error")
-      }
-    }
-
-    init()
-    return () => {
-      cancelled = true
-    }
-  }, [open, scene, isLogin, renderSeq])
-
-  // 监听 iframe 内回调页 postMessage 回来的扫码结果
-  useEffect(() => {
-    if (!open) return
-
-    const handleMessage = async (event: MessageEvent) => {
-      // 只接受同源消息
-      if (event.origin !== window.location.origin) return
-      if (!isWechatQrMessage(event.data, scene)) return
-      const msg = event.data
-
-      if (msg.success) {
-        if (isLogin) {
-          // iframe 内回调页已把 token 写入 localStorage（同源共享），
-          // 父窗口同步内存登录态后交给调用方跳转
-          try {
-            const userData = await getCurrentUser()
-            const user = normalizeUser(userData) as User
-            setAuth(
-              user,
-              localStorage.getItem("access_token") || "",
-              localStorage.getItem("refresh_token"),
-            )
-            scheduleProactiveRefresh()
-          } catch {
-            // token 已持久化，即使这里失败路由守卫/刷新也能恢复登录态
-          }
-          onLoginSuccess?.(msg.payload?.needOnboarding ?? false)
-        } else {
-          try {
-            const userData = await getCurrentUser()
-            setUser(normalizeUser(userData) as User)
-          } catch {
-            // 绑定结果以后端为准，调用方 invalidateQueries 会兜底刷新
-          }
-          onBindSuccess?.()
-        }
-        return
-      }
-
-      // 失败：弹窗内展示回调页透传的真实原因，提供刷新/整页跳转
-      setErrorMsg(msg.detail || "微信授权失败，请重试")
-      setStatus("error")
-    }
-
-    window.addEventListener("message", handleMessage)
-    return () => window.removeEventListener("message", handleMessage)
-  }, [open, scene, isLogin, onLoginSuccess, onBindSuccess, setAuth, setUser])
-
-  const handleRefresh = () => setRenderSeq((seq) => seq + 1)
-
-  const handleFullPageRedirect = () => {
-    if (authUrlRef.current) {
-      window.location.href = authUrlRef.current
-    }
-  }
-
-  return (
-    <Modal
-      title={isLogin ? "微信扫码登录" : "绑定微信"}
-      open={open}
-      onCancel={onClose}
-      footer={null}
-      width={380}
-      maskClosable={false}
-      destroyOnHidden
-    >
-      <div className="xx-wechat-qr-modal">
-        {/* 二维码容器常驻：WxLogin 在 loading 阶段就会把 iframe 渲染进来，
-            不能按 status 条件渲染，否则 effect 里永远找不到容器 */}
-        <div
-          id={CONTAINER_ID[scene]}
-          className="xx-wechat-qr-container"
-          style={{ visibility: status === "qrcode" ? "visible" : "hidden" }}
-        />
-
-        {status === "loading" && (
-          <div className="xx-wechat-qr-overlay">
-            <Spin size="large" />
-            <p>正在生成微信二维码...</p>
-          </div>
-        )}
-
-        {status === "qrcode" && (
-          <p className="xx-wechat-qr-tip">请使用微信扫描二维码{isLogin ? "登录" : "绑定账号"}</p>
-        )}
-
-        {status === "error" && (
-          <div className="xx-wechat-qr-overlay xx-wechat-qr-error">
-            <p className="xx-wechat-qr-error-msg">{errorMsg}</p>
-            <div className="xx-wechat-qr-error-actions">
-              <Button buttonType="primary" buttonSize="md" onClick={handleRefresh}>
-                刷新二维码
-              </Button>
-              {authUrlRef.current && (
-                <button
-                  type="button"
-                  className="xx-wechat-qr-fallback"
-                  onClick={handleFullPageRedirect}
-                >
-                  使用整页方式打开
-                </button>
-              )}
-            </div>
-          </div>
-        )}
-      </div>
-    </Modal>
-  )
-}
-
-export default WechatQrModal

apps/web/src/components/auth/WechatQrModal/messages.ts

@@ -1,71 +0,0 @@
-/**
- * 微信扫码弹窗与 iframe 内回调页之间的 postMessage 消息协议
- *
- * 流程：弹窗内 WxLogin(self_redirect:true) 渲染的二维码 iframe 扫码后，
- * 微信重定向到本站回调页（同源，在 iframe 内加载）；回调页完成换 token/绑定后，
- * 通过 window.parent.postMessage 把结果通知弹窗，弹窗负责关闭/展示错误/同步登录态。
- */
-
-/** 扫码场景：登录 / 绑定 */
-export type WechatQrScene = "login" | "bind"
-
-export interface WechatQrSuccessPayload {
-  /** 登录场景：是否需要昵称引导（新用户或资料未完善） */
-  needOnboarding?: boolean
-}
-
-export interface WechatQrMessageData {
-  /** 固定协议标识，父窗口只认该 source */
-  source: "xiaoxia-wechat-qr"
-  /** 场景，需与弹窗发起时一致（login/bind），父窗口据此过滤 */
-  scene: WechatQrScene
-  /** 成功 / 失败 */
-  success: boolean
-  /** 失败时的真实原因（已在回调页拼好，含后端 detail） */
-  detail?: string
-  payload?: WechatQrSuccessPayload
-}
-
-export const WECHAT_QR_MESSAGE_SOURCE = "xiaoxia-wechat-qr"
-
-/** 判断收到的 message 是否为本协议消息（且场景匹配） */
-export function isWechatQrMessage(
-  data: unknown,
-  scene: WechatQrScene,
-): data is WechatQrMessageData {
-  if (!data || typeof data !== "object") return false
-  const msg = data as Partial<WechatQrMessageData>
-  return msg.source === WECHAT_QR_MESSAGE_SOURCE && msg.scene === scene
-}
-
-/** 当前页面是否运行在 iframe（弹窗内嵌二维码）中 */
-export function isInIframe(): boolean {
-  try {
-    return window.parent !== window
-  } catch {
-    // 跨域访问 window.parent 可能抛异常，按非 iframe 处理
-    return false
-  }
-}
-
-/**
- * iframe 内回调页向父窗口上报扫码结果。同源回调页加载，targetOrigin 限定本站 origin。
- */
-export function postWechatQrResult(
-  scene: WechatQrScene,
-  success: boolean,
-  options?: { detail?: string; needOnboarding?: boolean },
-): void {
-  if (!isInIframe()) return
-  const data: WechatQrMessageData = {
-    source: WECHAT_QR_MESSAGE_SOURCE,
-    scene,
-    success,
-    detail: options?.detail,
-    payload:
-      success && options?.needOnboarding !== undefined
-        ? { needOnboarding: options.needOnboarding }
-        : undefined,
-  }
-  window.parent.postMessage(data, window.location.origin)
-}

apps/web/src/components/common/ChunkErrorBoundary.tsx

@@ -1,85 +0,0 @@
-/**
- * 全局错误边界：专门兜底"发版后旧标签页懒加载 chunk 失效"导致的白屏，
- * 同时兜住页面级渲染崩溃，避免任何未捕获错误导致整页白屏无反馈。
- *
- * 捕获到 ChunkLoadError / Failed to fetch dynamically imported module：
- *  1. 首次：自动整页刷新一次（sessionStorage 标记，刷新后 index.html 重新拉取，
- *     拿到新 chunk 引用，白屏自愈）
- *  2. 刷新后仍失败（标记未过期）：不再自动刷新，显示"系统已更新，请点击刷新"
- *     兜底界面，由用户手动点击
- *
- * 其他非 chunk 错误：显示通用错误页 + "返回首页"按钮（跳首页而非刷新当前 URL，
- * 避免刷新后再次命中同一路由崩溃形成死循环）。
- */
-import React from "react"
-import { Button, Result } from "antd"
-import {
-  getChunkReloadedAt,
-  goHomeRecover,
-  isChunkLoadError,
-  reloadForChunkError,
-} from "@/utils/chunkLoadError"
-
-interface Props {
-  children: React.ReactNode
-}
-
-interface State {
-  error: Error | null
-  isChunkError: boolean
-  /** 捕获错误时是否已经自动刷新过（决定显示自动刷新中还是手动兜底） */
-  alreadyReloaded: boolean
-}
-
-class ChunkErrorBoundary extends React.Component<Props, State> {
-  state: State = { error: null, isChunkError: false, alreadyReloaded: false }
-
-  static getDerivedStateFromError(error: Error): State {
-    const chunk = isChunkLoadError(error)
-    return {
-      error,
-      isChunkError: chunk,
-      alreadyReloaded: chunk ? getChunkReloadedAt() !== null : false,
-    }
-  }
-
-  componentDidCatch(error: Error): void {
-    // 仅 chunk 错误且本次会话没自动刷新过 → 打标记并整页刷新（自愈）
-    if (isChunkLoadError(error) && getChunkReloadedAt() === null) {
-      reloadForChunkError()
-    }
-  }
-
-  render(): React.ReactNode {
-    const { error, isChunkError, alreadyReloaded } = this.state
-    if (!error) return this.props.children
-
-    if (isChunkError && !alreadyReloaded) {
-      // 已打标记、componentDidCatch 里已触发 reload；极短瞬间展示加载中
-      return (
-        <Result status="info" title="系统正在更新" subTitle="检测到新版本，正在自动刷新页面…" />
-      )
-    }
-
-    // 手动兜底统一跳首页（整页导航）：chunk 失效时脱离旧 chunk 引用；
-    // 业务崩溃时绕开当前报错路由，避免刷新-再崩死循环
-    return (
-      <Result
-        status="warning"
-        title={isChunkError ? "系统已更新" : "页面出现异常"}
-        subTitle={
-          isChunkError
-            ? "检测到新版本，请点击下方按钮回到首页加载最新内容。"
-            : "页面加载遇到问题，点击返回首页通常可以恢复，未保存的内容可能丢失。"
-        }
-        extra={
-          <Button type="primary" onClick={goHomeRecover}>
-            {isChunkError ? "刷新并返回首页" : "返回首页"}
-          </Button>
-        }
-      />
-    )
-  }
-}
-
-export default ChunkErrorBoundary

apps/web/src/main.tsx

@@ -9,7 +9,6 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
 import { ConfigProvider, App as AntApp } from "antd"
 import zhCN from "antd/locale/zh_CN"
 import router from "./router"
-import ChunkErrorBoundary from "./components/common/ChunkErrorBoundary"
 import { scheduleProactiveRefresh } from "./api/auth/tokenRefresh"
 
 // 应用启动时，如果用户已登录，立即调度主动 token 刷新
@@ -100,9 +99,7 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
     <QueryClientProvider client={queryClient}>
       <ConfigProvider locale={zhCN} theme={theme}>
         <AntApp>
-          <ChunkErrorBoundary>
-            <RouterProvider router={router} />
-          </ChunkErrorBoundary>
+          <RouterProvider router={router} />
         </AntApp>
       </ConfigProvider>
     </QueryClientProvider>

apps/web/src/pages/assets/hooks/useAssetUpload.ts

@@ -141,20 +141,6 @@ export function useAssetUpload({ effectiveLibId }: { effectiveLibId: string }) {
           }))
         handlesRef.current.set(item.tempId, h)
 
-        // prepare 阶段后端 file_hash 命中素材库已有相同文件（skip_transfer / duplicated）：
-        // 立即标记 done、调一次 refreshList 让已存在素材立即显示，跳过 transfer + complete
-        if (h.prepared.skip_transfer || h.prepared.duplicated) {
-          updateItem(item.tempId, {
-            status: "done",
-            duplicated: true,
-            assetId: h.prepared.asset_id,
-          })
-          handlesRef.current.delete(item.tempId)
-          refreshList()
-          message.info(`"${item.fileName}" 与素材库已有内容相同，已跳过`)
-          return
-        }
-
         if (h.prepared.asset_id) {
           updateItem(item.tempId, {
             status: "uploading",

apps/web/src/pages/auth/Login.tsx

@@ -1,12 +1,13 @@
 /**
  * 登录页面 - V21 完全对标
  */
-import React, { useState } from "react"
+import React, { useRef, useState } from "react"
 import { Form, Input, Checkbox, message } from "antd"
 import { Link, useNavigate } from "react-router-dom"
 import { useLogin } from "@/hooks/useAuth"
+import { getWechatAuthUrl } from "@/api/auth"
+import { getErrorMessage, isErrorMsgShown } from "@/api/errors"
 import Button from "@/components/ui/Button"
-import WechatQrModal from "@/components/auth/WechatQrModal"
 import "./Login.css"
 
 interface LoginFormValues {
@@ -19,7 +20,10 @@ const Login: React.FC = () => {
   const navigate = useNavigate()
   const loginMutation = useLogin()
   const [form] = Form.useForm()
-  const [wechatQrOpen, setWechatQrOpen] = useState(false)
+  const [wechatLoading, setWechatLoading] = useState(false)
+  // 同步防连点守卫：state 更新有渲染间隙，连点两次会各自请求授权 URL，
+  // 后一次的 state 覆盖前一次写入 localStorage 的 state，导致回调校验失败
+  const wechatStartingRef = useRef(false)
 
   const onFinish = async (values: LoginFormValues) => {
     try {
@@ -35,28 +39,33 @@ const Login: React.FC = () => {
     }
   }
 
-  const handleWechatLogin = () => {
-    // 记录登录前的来源页，登录成功后（弹窗回调）跳回
-    const from = window.location.pathname + window.location.search
-    if (from !== "/login" && from !== "/register") {
-      localStorage.setItem("login_redirect", from)
-    } else {
-      localStorage.removeItem("login_redirect")
+  const handleWechatLogin = async () => {
+    if (wechatStartingRef.current) return
+    wechatStartingRef.current = true
+    setWechatLoading(true)
+    try {
+      const result = await getWechatAuthUrl()
+      // 保存 state 到 localStorage 用于回调时验证
+      localStorage.setItem("wechat_state", result.state)
+      // 记录登录前的来源页，登录成功后跳回
+      const from = window.location.pathname + window.location.search
+      if (from !== "/login" && from !== "/register") {
+        localStorage.setItem("login_redirect", from)
+      } else {
+        localStorage.removeItem("login_redirect")
+      }
+      // 跳转到微信授权页
+      window.location.href = result.auth_url
+    } catch (error) {
+      // 跳走前才可能回到这里；拦截器已弹过后端 detail 时不重复弹，
+      // 否则透传真实原因（如微信服务未配置、网络异常）
+      if (!isErrorMsgShown(error)) {
+        message.error(`微信登录启动失败：${getErrorMessage(error, "请稍后重试")}`)
+      }
+      wechatStartingRef.current = false
+      setWechatLoading(false)
     }
-    setWechatQrOpen(true)
-    // 弹窗打开期间按钮 disabled；WxLogin 脚本加载失败/超时时弹窗内会自动回退整页跳转
-  }
-
-  // 弹窗扫码登录成功：登录态已由弹窗同步，按用户类型跳转
-  const handleWechatQrSuccess = (needOnboarding: boolean) => {
-    setWechatQrOpen(false)
-    if (needOnboarding) {
-      navigate("/welcome/wechat", { replace: true })
-      return
-    }
-    const redirect = localStorage.getItem("login_redirect") || "/"
-    localStorage.removeItem("login_redirect")
-    navigate(redirect, { replace: true })
+    // 成功时 window.location 跳走，不复位 loading（页面即将卸载）
   }
 
   return (
@@ -127,10 +136,10 @@ const Login: React.FC = () => {
             type="button"
             className="xx-btn-wechat"
             onClick={handleWechatLogin}
-            disabled={wechatQrOpen}
+            disabled={wechatLoading}
           >
             <span className="xx-wechat-icon">💬</span>
-            微信登录
+            {wechatLoading ? "加载中..." : "微信登录"}
           </button>
         </div>
 
@@ -138,13 +147,6 @@ const Login: React.FC = () => {
           还没有账号？ <Link to="/register">立即注册</Link>
         </div>
       </div>
-
-      <WechatQrModal
-        open={wechatQrOpen}
-        scene="login"
-        onClose={() => setWechatQrOpen(false)}
-        onLoginSuccess={handleWechatQrSuccess}
-      />
     </div>
   )
 }

apps/web/src/pages/auth/WechatBindCallback.tsx

@@ -1,11 +1,6 @@
 /**
  * 微信绑定回调页（已登录用户在设置页发起"绑定微信"扫码后回到这里）
  * 用 code 调绑定接口把微信关联到当前账号，成功后回设置页
- *
- * 两种运行环境：
- * - 整页跳转授权（旧流程/兜底）：本页整页加载，成功/失败后 navigate 回设置页
- * - 弹窗内嵌二维码（WxLogin self_redirect）：本页在同源 iframe 内加载，
- *   结果通过 postMessage 通知父窗口弹窗，不做页面导航
  */
 import React, { useEffect, useState } from "react"
 import { useSearchParams, useNavigate } from "react-router-dom"
@@ -13,30 +8,19 @@ import { Spin } from "antd"
 import { bindWechat, normalizeUser } from "@/api/auth"
 import { getErrorMessage } from "@/api/errors"
 import { useAuthStore } from "@/store/authStore"
-import { isInIframe, postWechatQrResult } from "@/components/auth/WechatQrModal/messages"
 
 const WechatBindCallback: React.FC = () => {
   const [searchParams] = useSearchParams()
   const navigate = useNavigate()
   const setUser = useAuthStore((state) => state.setUser)
   const [error, setError] = useState<string | null>(null)
-  const inIframe = isInIframe()
 
   useEffect(() => {
     const code = searchParams.get("code")
     const state = searchParams.get("state")
 
-    const fail = (message: string) => {
-      if (inIframe) {
-        // 弹窗模式：把真实原因上报父窗口在 Modal 内展示
-        postWechatQrResult("bind", false, { detail: message })
-        return
-      }
-      setError(message)
-    }
-
     if (!code || !state) {
-      fail("无效的回调参数，请回到设置页重新扫码绑定")
+      setError("无效的回调参数，请回到设置页重新扫码绑定")
       return
     }
 
@@ -48,23 +32,16 @@ const WechatBindCallback: React.FC = () => {
       try {
         const result = await bindWechat(code, state)
         setUser(normalizeUser(result.user))
-
-        if (inIframe) {
-          // 弹窗模式：通知父窗口关闭弹窗并刷新绑定状态
-          postWechatQrResult("bind", true)
-          return
-        }
-
         // 用 replace 回设置页，query 携带成功标记由设置页提示
         navigate("/app/profile?wechat_bind=success", { replace: true })
       } catch (err) {
-        // 绑定失败直接在本页展示/上报真实原因（如微信已被其他账号绑定），不静默跳走
-        fail(`微信绑定失败：${getErrorMessage(err, "请回到设置页重试")}`)
+        // 绑定失败直接在本页展示真实原因（如微信已被其他账号绑定），不静默跳走
+        setError(`微信绑定失败：${getErrorMessage(err, "请回到设置页重试")}`)
       }
     }
 
     handleBind()
-  }, [searchParams, navigate, setUser, inIframe])
+  }, [searchParams, navigate, setUser])
 
   if (error) {
     return (

apps/web/src/pages/auth/WechatCallback.tsx

@@ -2,11 +2,6 @@
  * 微信登录回调页
  * 扫码授权后由微信重定向回来：用 code 换登录态，
  * 新用户/资料未完善 → 跳昵称引导页；老用户 → 回来源页/首页
- *
- * 两种运行环境：
- * - 整页跳转授权（旧流程/兜底）：本页整页加载，按上述逻辑导航
- * - 弹窗内嵌二维码（WxLogin self_redirect）：本页在同源 iframe 内加载，
- *   成功/失败均通过 postMessage 通知父窗口弹窗，不做页面导航
  */
 import React, { useEffect, useState } from "react"
 import { useSearchParams, useNavigate } from "react-router-dom"
@@ -15,7 +10,6 @@ import { wechatCallback, getCurrentUser, normalizeUser, type User } from "@/api/
 import { getErrorMessage } from "@/api/errors"
 import { useAuthStore } from "@/store/authStore"
 import { scheduleProactiveRefresh } from "@/api/auth/tokenRefresh"
-import { isInIframe, postWechatQrResult } from "@/components/auth/WechatQrModal/messages"
 
 const WechatCallback: React.FC = () => {
   const [searchParams] = useSearchParams()
@@ -23,33 +17,24 @@ const WechatCallback: React.FC = () => {
   const setAuth = useAuthStore((state) => state.setAuth)
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState<string | null>(null)
-  const inIframe = isInIframe()
 
   useEffect(() => {
     const code = searchParams.get("code")
     const state = searchParams.get("state")
 
-    const fail = (message: string) => {
-      if (inIframe) {
-        // 弹窗模式：把真实原因上报父窗口在 Modal 内展示，本页保持"处理中"即可
-        postWechatQrResult("login", false, { detail: message })
-        return
-      }
-      setError(message)
-      setLoading(false)
-    }
-
-    // 微信重定向出错时（如用户拒绝授权 error=access_denied）直接展示/上报原因
+    // 微信重定向出错时（如用户拒绝授权 error=access_denied）直接展示原因
     const wxErrorCode = searchParams.get("error")
     const wxErrDesc = searchParams.get("error_description")
     if (wxErrorCode || wxErrDesc) {
       const reason = [wxErrorCode, wxErrDesc].filter(Boolean).join("：")
-      fail(`微信授权失败：${reason}`)
+      setError(`微信授权失败：${reason}`)
+      setLoading(false)
       return
     }
 
     if (!code || !state) {
-      fail("无效的回调参数，请重新扫码登录")
+      setError("无效的回调参数，请重新扫码登录")
+      setLoading(false)
       return
     }
 
@@ -76,13 +61,6 @@ const WechatCallback: React.FC = () => {
 
         // 新用户 或 资料未完善（如上次中断没填昵称）→ 强制昵称引导
         const needOnboarding = result.is_new_user || user.profile_completed === false
-
-        if (inIframe) {
-          // 弹窗模式：token 已写入同源 localStorage，通知父窗口同步登录态并跳转
-          postWechatQrResult("login", true, { needOnboarding })
-          return
-        }
-
         if (needOnboarding) {
           navigate("/welcome/wechat", { replace: true })
           return
@@ -94,12 +72,13 @@ const WechatCallback: React.FC = () => {
         navigate(redirect, { replace: true })
       } catch (err) {
         // 透传后端真实错误（如 state 过期、code 已消费、接口异常），禁止吞成通用提示
-        fail(`微信登录失败：${getErrorMessage(err, "请重试或更换登录方式")}`)
+        setError(`微信登录失败：${getErrorMessage(err, "请重试或更换登录方式")}`)
+        setLoading(false)
       }
     }
 
     handleCallback()
-  }, [searchParams, navigate, setAuth, inIframe])
+  }, [searchParams, navigate, setAuth])
 
   if (loading) {
     return (

apps/web/src/pages/auth/WechatOnboarding.tsx

@@ -2,12 +2,11 @@
  * 微信新用户昵称引导页
  * 新微信用户首次登录后强制填写昵称，完成后才进入主界面
  */
-import React, { useRef } from "react"
+import React from "react"
 import { Form, Input, message } from "antd"
 import { Navigate, useNavigate } from "react-router-dom"
 import { useMutation } from "@tanstack/react-query"
 import { updateProfile } from "@/api/auth"
-import { getErrorMessage, isErrorMsgShown } from "@/api/errors"
 import { useAuthStore } from "@/store/authStore"
 import Button from "@/components/ui/Button"
 import "./Login.css"
@@ -23,10 +22,6 @@ const WechatOnboarding: React.FC = () => {
   const user = useAuthStore((state) => state.user)
   const hasAccessToken = Boolean(localStorage.getItem("access_token"))
   const [form] = Form.useForm<OnboardingFormValues>()
-  // 同步防连点守卫：antd loading 要等 React 重渲染后才禁用按钮，
-  // 连点两次时第一次的 mutation 刚触发、重渲染未发生，第二次 click 仍会进来
-  // （截图里 PATCH /me 405 出现两次就是连点导致的重复提交）
-  const submittingRef = useRef(false)
 
   const saveMutation = useMutation({
     mutationFn: (displayName: string) => updateProfile({ display_name: displayName }),
@@ -42,8 +37,6 @@ const WechatOnboarding: React.FC = () => {
   }
 
   const onFinish = async (values: OnboardingFormValues) => {
-    if (submittingRef.current) return
-    submittingRef.current = true
     try {
       const updated = await saveMutation.mutateAsync(values.display_name.trim())
       // 后端返回的 profile_completed 以最新资料为准，前端同步标记完善
@@ -52,14 +45,9 @@ const WechatOnboarding: React.FC = () => {
       const redirect = localStorage.getItem("login_redirect") || "/app/dashboard"
       localStorage.removeItem("login_redirect")
       navigate(redirect, { replace: true })
-    } catch (err) {
-      // 透传后端真实原因（如接口异常/校验失败）；拦截器已弹过的不重复弹
-      if (!isErrorMsgShown(err)) {
-        message.error(`昵称保存失败：${getErrorMessage(err, "请稍后重试")}`)
-      }
-      submittingRef.current = false
+    } catch {
+      message.error("保存失败，请重试")
     }
-    // 成功时页面跳走，不复位
   }
 
   return (
@@ -101,7 +89,6 @@ const WechatOnboarding: React.FC = () => {
               buttonSize="lg"
               htmlType="submit"
               loading={saveMutation.isPending}
-              disabled={saveMutation.isPending}
               style={{ width: "100%" }}
             >
               {saveMutation.isPending ? "保存中..." : "进入小虾智剪"}

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

@@ -9,13 +9,12 @@
  * - 标题样式（字体/颜色/位置/大小/粗斜描边/预设）：全局统一
  */
 import React, { useMemo, useState } from "react"
-import { Input, message } from "antd"
+import { AutoComplete, Input, message } from "antd"
 import { LoadingOutlined } from "@ant-design/icons"
 import type { TitleSettings } from "../types"
 import { POSITION_OPTIONS, FONT_OPTIONS } from "../constants"
 import { useStep4Title } from "../hooks/useStep4Title"
 import AiTitleGenerator from "./title/AiTitleGenerator"
-import TitleLibraryAutoComplete from "./title/TitleLibraryAutoComplete"
 import TitleStylePanel from "./title/TitleStylePanel"
 import { AI_TITLE_TEMPLATES } from "../constants"
 
@@ -202,14 +201,21 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
               </div>
               <div className="xx-form-field">
                 <label>标题</label>
-                <TitleLibraryAutoComplete
-                  placeholder="输入或从标题库选择"
-                  value={previewTitles?.[0] ?? t.titleSettings.title}
+                <AutoComplete
+                  placeholder="输入标题文字…"
+                  allowClear
+                  maxLength={50}
+                  style={{ width: "100%" }}
+                  value={(previewTitles?.[0] ?? t.titleSettings.title) || undefined}
                   onChange={(val) => {
                     t.updateTitle(val || "")
                     onPreviewTitlesChange?.([val || ""])
                   }}
                   options={titleOptions}
+                  filterOption={(inputValue, option) => {
+                    const title = (option?.label || option?.value || "") as string
+                    return title.toLowerCase().includes((inputValue || "").toLowerCase())
+                  }}
                 />
               </div>
             </>
@@ -263,11 +269,17 @@ const Step4TitleSettings: React.FC<Step4TitleSettingsProps> = (props) => {
           {Array.from({ length: previewCount }, (_, i) => (
             <div className="xx-form-field" key={i}>
               <label>视频 {i + 1} 标题</label>
-              <TitleLibraryAutoComplete
-                placeholder={`输入或选择视频 ${i + 1} 的标题`}
-                value={previewTitles?.[i] || ""}
-                onChange={(val) => updateVariantTitle(i, val)}
+              <AutoComplete
+                placeholder={`视频 ${i + 1} 的标题…`}
+                maxLength={50}
+                style={{ width: "100%" }}
+                value={previewTitles?.[i] || undefined}
+                onChange={(val) => updateVariantTitle(i, val || "")}
                 options={titleOptions}
+                filterOption={(inputValue, option) => {
+                  const title = (option?.label || option?.value || "") as string
+                  return title.toLowerCase().includes((inputValue || "").toLowerCase())
+                }}
               />
             </div>
           ))}

apps/web/src/pages/generate/components/title/TitleLibraryAutoComplete.tsx

@@ -1,75 +0,0 @@
-/**
- * 标题库 AutoComplete（Issue #1737）
- *
- * 原生 antd AutoComplete（combobox 模式）的两个行为不符合产品预期：
- * 1. combobox 默认 showAction=[]，输入框聚焦时下拉不展开——用户必须先打字才能看到标题库，
- *    且组件无下拉箭头，视觉上是"纯输入框"，不知道标题库里已有标题可选。
- * 2. 空态聚焦不展示任何标题库内容。
- *
- * 本组件封装修复：
- * - 受控 open：聚焦（且标题库非空）即展开，展示全部标题；失焦/选中/Esc 关闭
- *   （rc-select 失焦会主动 onToggleOpen(false)，onOpenChange 同步状态即可，不会死循环）
- * - suffixIcon 加下拉三角，视觉提示"可选择"；有值时 allowClear 的清除按钮照常出现
- * - 输入文字时由 filterOption 过滤（空串展示全部）
- * - 保留 combobox 自由输入能力：用户可输入标题库之外的自定义标题
- */
-import React, { useState } from "react"
-import { AutoComplete } from "antd"
-import { DownOutlined } from "@ant-design/icons"
-import type { AutoCompleteProps } from "antd"
-
-export interface TitleOption {
-  label: string
-  value: string
-}
-
-interface TitleLibraryAutoCompleteProps {
-  value: string
-  onChange: (val: string) => void
-  options: TitleOption[]
-  placeholder?: string
-  allowClear?: boolean
-  maxLength?: number
-  style?: React.CSSProperties
-}
-
-const TitleLibraryAutoComplete: React.FC<TitleLibraryAutoCompleteProps> = ({
-  value,
-  onChange,
-  options,
-  placeholder = "输入或从标题库选择",
-  allowClear = true,
-  maxLength = 50,
-  style,
-}) => {
-  const [open, setOpen] = useState(false)
-  const hasTitles = options.length > 0
-
-  const filterOption: AutoCompleteProps["filterOption"] = (inputValue, option) => {
-    const title = (option?.label || option?.value || "") as string
-    return title.toLowerCase().includes((inputValue || "").toLowerCase())
-  }
-
-  return (
-    <AutoComplete
-      value={value || undefined}
-      onChange={(val) => onChange(val || "")}
-      options={options}
-      filterOption={filterOption}
-      open={open}
-      onOpenChange={setOpen}
-      onFocus={() => {
-        // 标题库为空时不展开（避免弹出"暂无数据"空壳）
-        if (hasTitles) setOpen(true)
-      }}
-      onSelect={() => setOpen(false)}
-      suffixIcon={<DownOutlined style={{ color: "var(--text-secondary, #bbb)", fontSize: 12 }} />}
-      placeholder={placeholder}
-      allowClear={allowClear}
-      maxLength={maxLength}
-      style={{ width: "100%", ...style }}
-    />
-  )
-}
-
-export default TitleLibraryAutoComplete

apps/web/src/pages/profile/Settings.tsx

@@ -8,10 +8,9 @@ import { useSearchParams } from "react-router-dom"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
 import { message } from "antd"
 import { Button, Input, Modal } from "@/components/ui"
-import { getCurrentUser, updateProfile, unbindWechat } from "@/api/auth"
+import { getCurrentUser, updateProfile, getWechatBindUrl, unbindWechat } from "@/api/auth"
 import { useAuthStore } from "@/store/authStore"
 import PageHead from "@/components/layout/PageHead"
-import WechatQrModal from "@/components/auth/WechatQrModal"
 import "./ProfileSettings.css"
 
 const Settings: React.FC = () => {
@@ -20,7 +19,6 @@ const Settings: React.FC = () => {
   const queryClient = useQueryClient()
   const [searchParams, setSearchParams] = useSearchParams()
   const [displayName, setDisplayName] = useState(user?.display_name || "")
-  const [wechatBindOpen, setWechatBindOpen] = useState(false)
   const bindTipShownRef = useRef(false)
 
   // 拉取最新用户信息（微信绑定状态以后端为准）
@@ -64,11 +62,14 @@ const Settings: React.FC = () => {
     },
   })
 
-  // 弹窗扫码绑定成功：关闭弹窗，刷新用户信息并提示
-  const handleBindSuccess = () => {
-    setWechatBindOpen(false)
-    queryClient.invalidateQueries({ queryKey: ["currentUser"] })
-    message.success("微信绑定成功")
+  const handleBindWechat = async () => {
+    try {
+      const result = await getWechatBindUrl()
+      localStorage.setItem("wechat_bind_state", result.state)
+      window.location.href = result.auth_url
+    } catch {
+      message.error("微信绑定暂不可用，请稍后重试")
+    }
   }
 
   const unbindMutation = useMutation({
@@ -176,20 +177,13 @@ const Settings: React.FC = () => {
                 解绑
               </Button>
             ) : (
-              <Button buttonType="primary" buttonSize="md" onClick={() => setWechatBindOpen(true)}>
+              <Button buttonType="primary" buttonSize="md" onClick={handleBindWechat}>
                 绑定微信
               </Button>
             )}
           </div>
         </div>
       </div>
-
-      <WechatQrModal
-        open={wechatBindOpen}
-        scene="bind"
-        onClose={() => setWechatBindOpen(false)}
-        onBindSuccess={handleBindSuccess}
-      />
     </div>
   )
 }

apps/web/src/router/appRoutes.tsx

@@ -1,7 +1,6 @@
 import { Navigate, type RouteObject } from "react-router-dom"
 import MainLayout from "@/components/layout/MainLayout"
 import { ProtectedRoute } from "./ProtectedRoute"
-import { lazyRoute } from "./lazyRoute"
 
 /**
  * 受保护的 /app 子路由
@@ -14,118 +13,202 @@ const appChildren: RouteObject[] = [
   },
   {
     path: "dashboard",
-    lazy: lazyRoute(() => import("@/pages/dashboard/Dashboard")),
+    lazy: () =>
+      import("@/pages/dashboard/Dashboard").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "assets",
-    lazy: lazyRoute(() => import("@/pages/assets/AssetLibrary")),
+    lazy: () =>
+      import("@/pages/assets/AssetLibrary").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "titles",
-    lazy: lazyRoute(() => import("@/pages/titles/TitleLibrary")),
+    lazy: () =>
+      import("@/pages/titles/TitleLibrary").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "voices",
-    lazy: lazyRoute(() => import("@/pages/voices/VoiceLibrary")),
+    lazy: () =>
+      import("@/pages/voices/VoiceLibrary").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "templates",
-    lazy: lazyRoute(() => import("@/pages/templates/TemplateLibrary")),
+    lazy: () =>
+      import("@/pages/templates/TemplateLibrary").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "generate",
-    lazy: lazyRoute(() => import("@/pages/generate/GeneratePage")),
+    lazy: () =>
+      import("@/pages/generate/GeneratePage").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "history",
-    lazy: lazyRoute(() => import("@/pages/history/TaskHistory")),
+    lazy: () =>
+      import("@/pages/history/TaskHistory").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "products",
-    lazy: lazyRoute(() => import("@/pages/products/ProductLibrary")),
+    lazy: () =>
+      import("@/pages/products/ProductLibrary").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "products/:id",
-    lazy: lazyRoute(() => import("@/pages/products/ProductDetail")),
+    lazy: () =>
+      import("@/pages/products/ProductDetail").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "tasks",
-    lazy: lazyRoute(() => import("@/pages/tasks/TaskCenter")),
+    lazy: () =>
+      import("@/pages/tasks/TaskCenter").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "editing-planner",
-    lazy: lazyRoute(() => import("@/pages/editing-planner/EditingPlanner")),
+    lazy: () =>
+      import("@/pages/editing-planner/EditingPlanner").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "my-templates",
-    lazy: lazyRoute(() => import("@/pages/my-templates/MyTemplates")),
+    lazy: () =>
+      import("@/pages/my-templates/MyTemplates").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "voice-clone",
-    lazy: lazyRoute(() => import("@/pages/voice-clone/VoiceClone")),
+    lazy: () =>
+      import("@/pages/voice-clone/VoiceClone").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "voice-materials",
-    lazy: lazyRoute(() => import("@/pages/voice-materials/VoiceMaterialLibrary")),
+    lazy: () =>
+      import("@/pages/voice-materials/VoiceMaterialLibrary").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "my-voices",
-    lazy: lazyRoute(() => import("@/pages/my-voices/MyVoices")),
+    lazy: () =>
+      import("@/pages/my-voices/MyVoices").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "accounts",
-    lazy: lazyRoute(() => import("@/pages/accounts/Accounts")),
+    lazy: () =>
+      import("@/pages/accounts/Accounts").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "duplication",
-    lazy: lazyRoute(() => import("@/pages/duplication/DuplicationUpload")),
+    lazy: () =>
+      import("@/pages/duplication/DuplicationUpload").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "duplication/results",
-    lazy: lazyRoute(() => import("@/pages/duplication/DuplicationResults")),
+    lazy: () =>
+      import("@/pages/duplication/DuplicationResults").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "duplication/:id",
-    lazy: lazyRoute(() => import("@/pages/duplication/DuplicationDetail")),
+    lazy: () =>
+      import("@/pages/duplication/DuplicationDetail").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "subscription",
-    lazy: lazyRoute(() => import("@/pages/subscription/Plans")),
+    lazy: () =>
+      import("@/pages/subscription/Plans").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "subscription/upgrade",
-    lazy: lazyRoute(() => import("@/pages/subscription/UpgradeSubscription")),
+    lazy: () =>
+      import("@/pages/subscription/UpgradeSubscription").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "subscription/billing",
-    lazy: lazyRoute(() => import("@/pages/subscription/Billing")),
+    lazy: () =>
+      import("@/pages/subscription/Billing").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "profile",
-    lazy: lazyRoute(() => import("@/pages/profile/Settings")),
+    lazy: () =>
+      import("@/pages/profile/Settings").then((m) => ({
+        Component: m.default,
+      })),
   },
   {
     path: "admin",
     children: [
       {
         index: true,
-        lazy: lazyRoute(() => import("@/pages/admin/AdminComingSoon")),
+        lazy: () =>
+          import("@/pages/admin/AdminComingSoon").then((m) => ({
+            Component: m.default,
+          })),
       },
       {
         path: "users",
-        lazy: lazyRoute(() => import("@/pages/admin/AdminComingSoon")),
+        lazy: () =>
+          import("@/pages/admin/AdminComingSoon").then((m) => ({
+            Component: m.default,
+          })),
       },
       {
         path: "analytics",
-        lazy: lazyRoute(() => import("@/pages/admin/AdminComingSoon")),
+        lazy: () =>
+          import("@/pages/admin/AdminComingSoon").then((m) => ({
+            Component: m.default,
+          })),
       },
       {
         path: "monitor",
-        lazy: lazyRoute(() => import("@/pages/admin/AdminComingSoon")),
+        lazy: () =>
+          import("@/pages/admin/AdminComingSoon").then((m) => ({
+            Component: m.default,
+          })),
       },
       {
         path: "logs",
-        lazy: lazyRoute(() => import("@/pages/admin/AdminComingSoon")),
+        lazy: () =>
+          import("@/pages/admin/AdminComingSoon").then((m) => ({
+            Component: m.default,
+          })),
       },
     ],
   },

apps/web/src/router/lazyRoute.ts

@@ -1,40 +0,0 @@
-import type { LazyRouteFunction, RouteObject } from "react-router-dom"
-import { isChunkLoadError } from "@/utils/chunkLoadError"
-
-/**
- * 给 React Router data router 的路由懒加载包一层自动重试：
- *
- * - 网络抖动 / 瞬态失败：自动重试最多 2 次（间隔 300ms / 800ms），用户无感恢复
- * - 发版后旧 chunk 404（chunk 文件名已不存在）：重试也拿不到旧文件名，
- *   重试耗尽后抛出，由全局 ChunkErrorBoundary 捕获并引导整页刷新
- *   （刷新后 index.html 是 no-cache 的，会拿到新 chunk 引用）
- */
-const RETRY_DELAYS_MS = [300, 800]
-const RETRY_COUNT = RETRY_DELAYS_MS.length
-
-const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms))
-
-export const lazyRoute = (
-  factory: () => Promise<{ default: React.ComponentType }>,
-): LazyRouteFunction<RouteObject> => {
-  return async () => {
-    let lastError: unknown
-    for (let attempt = 0; attempt <= RETRY_COUNT; attempt++) {
-      try {
-        const mod = await factory()
-        if (!mod.default) {
-          throw new Error("lazyRoute: 目标模块缺少 default 导出")
-        }
-        return { Component: mod.default }
-      } catch (err) {
-        lastError = err
-        // 非 chunk 加载错误（代码 bug 等）立即抛出，不浪费重试
-        if (!isChunkLoadError(err)) throw err
-        if (attempt < RETRY_COUNT) {
-          await sleep(RETRY_DELAYS_MS[attempt])
-        }
-      }
-    }
-    throw lastError
-  }
-}

apps/web/src/test/api/assets.test.ts

@@ -242,20 +242,6 @@ describe("assets API", () => {
       await expect(completeDirectUpload({ name: "test-item" })).resolves.not.toThrow()
     })
 
-    it("请求体携带 file_size（后端同名兜底去重的大小校验依赖它）", async () => {
-      await completeDirectUpload({
-        project_id: "p-1",
-        library_id: "l-1",
-        storage_key: "uploads/k.mp4",
-        file_size: 12345,
-      } as never)
-      const completeCalls = mockPost.mock.calls.filter(
-        ([u]: [string]) => u === "/upload/direct/complete",
-      )
-      expect(completeCalls).toHaveLength(1)
-      expect(completeCalls[0][1]).toMatchObject({ file_size: 12345 })
-    })
-
     it("should reject on API error", async () => {
       mockGet.mockRejectedValue(new Error("Network error"))
       mockPost.mockRejectedValue(new Error("Network error"))
@@ -273,114 +259,6 @@ describe("assets API", () => {
     })
   })
 
-  describe("uploadAssetDirect skip_transfer 短路", () => {
-    it("prepare 返回 skip_transfer=true → 直接返回 duplicated，不调 transfer/complete", async () => {
-      mockPost.mockImplementation((url: string) => {
-        if (url === "/upload/direct/prepare") {
-          return Promise.resolve({
-            data: {
-              upload_url: "https://oss/x",
-              method: "POST",
-              storage_key: "uploads/skip/y.mp4",
-              expires_at: "2099",
-              fields: {},
-              max_size_bytes: 1e9,
-              asset_id: "existing-asset",
-              skip_transfer: true,
-              duplicated: true,
-            },
-          })
-        }
-        if (url === "/upload/direct/complete") {
-          throw new Error("complete 不应被调用")
-        }
-        throw new Error("unexpected url " + url)
-      })
-      const putSpy = vi.spyOn(globalThis, "XMLHttpRequest")
-      const file = new File(["x"], "x.mp4", { type: "video/mp4" })
-      const result = await uploadAssetDirect({ file, library_id: "lib-1" })
-      expect(result.duplicated).toBe(true)
-      expect(result.asset_id).toBe("existing-asset")
-      // complete 未被调用（mockPost 只记录 prepare，complete 若调用会抛 "不应被调用"）
-      const completeCalls = mockPost.mock.calls.filter(
-        ([u]: [string]) => u === "/upload/direct/complete",
-      )
-      expect(completeCalls).toHaveLength(0)
-      putSpy.mockRestore()
-    })
-
-    it("prepare 返回 skip_transfer=false → 走老流程（complete 被调用）", async () => {
-      mockPost.mockImplementation((url: string) => {
-        if (url === "/upload/direct/prepare") {
-          return Promise.resolve({
-            data: {
-              upload_url: "https://oss/x",
-              method: "POST",
-              storage_key: "uploads/normal/y.mp4",
-              expires_at: "2099",
-              fields: {},
-              max_size_bytes: 1e9,
-              asset_id: "new-asset",
-            },
-          })
-        }
-        if (url === "/upload/direct/complete") {
-          return Promise.resolve({
-            data: {
-              storage_key: "uploads/normal/y.mp4",
-              ingest_job_id: "job-1",
-              url: "https://oss/y.mp4",
-              duplicated: false,
-              asset_id: "new-asset",
-            },
-          })
-        }
-        throw new Error("unexpected url " + url)
-      })
-      // mock XMLHttpRequest：send 之后下一 tick 触发 onload 让 transfer 立即成功
-      const origOpen = XMLHttpRequest.prototype.open
-      const origSend = XMLHttpRequest.prototype.send
-      const origSetReadyState = Object.getOwnPropertyDescriptor(
-        XMLHttpRequest.prototype,
-        "readyState",
-      ) as PropertyDescriptor | undefined
-      const origStatus = Object.getOwnPropertyDescriptor(XMLHttpRequest.prototype, "status")
-      Object.defineProperty(XMLHttpRequest.prototype, "readyState", {
-        configurable: true,
-        writable: true,
-        value: 4,
-      })
-      Object.defineProperty(XMLHttpRequest.prototype, "status", {
-        configurable: true,
-        writable: true,
-        value: 200,
-      })
-      XMLHttpRequest.prototype.open = vi.fn() as unknown as typeof origOpen
-      XMLHttpRequest.prototype.send = vi.fn(function (this: XMLHttpRequest) {
-        // 下一 tick 触发 onload（模拟 XHR 异步完成）
-        setTimeout(() => this.onload?.(new ProgressEvent("load")), 0)
-      }) as unknown as typeof origSend
-      const file = new File(["x"], "x.mp4", { type: "video/mp4" })
-      const result = await uploadAssetDirect({ file, library_id: "lib-1" })
-      expect(result.duplicated).toBeFalsy()
-      expect(result.asset_id).toBe("new-asset")
-      const completeCalls = mockPost.mock.calls.filter(
-        ([u]: [string]) => u === "/upload/direct/complete",
-      )
-      expect(completeCalls).toHaveLength(1)
-      // complete 请求必须带上 file_size，否则后端同名兜底会误杀同名新视频
-      expect(completeCalls[0][1]).toMatchObject({ file_size: file.size })
-      XMLHttpRequest.prototype.open = origOpen
-      XMLHttpRequest.prototype.send = origSend
-      if (origSetReadyState) {
-        Object.defineProperty(XMLHttpRequest.prototype, "readyState", origSetReadyState)
-      }
-      if (origStatus) {
-        Object.defineProperty(XMLHttpRequest.prototype, "status", origStatus)
-      }
-    })
-  })
-
   describe("getIngestJob", () => {
     it("should resolve successfully", async () => {
       await expect(getIngestJob("test-jobId")).resolves.not.toThrow()

apps/web/src/test/api/wxLogin.test.ts

@@ -1,64 +0,0 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from "vitest"
-
-describe("wxLogin 工具", () => {
-  describe("parseWxAuthUrl", () => {
-    it("从微信授权链接解析出 appid/redirect_uri/state（redirect_uri 解码）", async () => {
-      const { parseWxAuthUrl } = await import("@/api/auth/wxLogin")
-      const authUrl =
-        "https://open.weixin.qq.com/connect/qrconnect?appid=wxb7ae80b48e53980d" +
-        "&redirect_uri=https%3A%2F%2Fstaging.xiaoxiajianji.com%2Fauth%2Fwechat%2Fcallback" +
-        "&response_type=code&scope=snsapi_login&state=abc123#wechat_redirect"
-      const params = parseWxAuthUrl(authUrl)
-      expect(params).not.toBeNull()
-      expect(params?.appid).toBe("wxb7ae80b48e53980d")
-      expect(params?.redirect_uri).toBe("https://staging.xiaoxiajianji.com/auth/wechat/callback")
-      expect(params?.state).toBe("abc123")
-    })
-
-    it("链接里缺 state 时回退使用 stateFallback", async () => {
-      const { parseWxAuthUrl } = await import("@/api/auth/wxLogin")
-      const authUrl =
-        "https://open.weixin.qq.com/connect/qrconnect?appid=wx123" +
-        "&redirect_uri=https%3A%2F%2Fexample.com%2Fcb"
-      const params = parseWxAuthUrl(authUrl, "fallback-state")
-      expect(params?.state).toBe("fallback-state")
-    })
-
-    it("缺 appid 或 redirect_uri 时返回 null（调用方应回退整页跳转）", async () => {
-      const { parseWxAuthUrl } = await import("@/api/auth/wxLogin")
-      expect(parseWxAuthUrl("https://open.weixin.qq.com/connect/qrconnect?appid=wx123")).toBeNull()
-      expect(parseWxAuthUrl("not a url")).toBeNull()
-    })
-  })
-
-  describe("loadWxLoginScript", () => {
-    beforeEach(() => {
-      vi.resetModules()
-      document.head.querySelectorAll("script[src*='wxLogin']").forEach((el) => el.remove())
-      delete (window as unknown as { WxLogin?: unknown }).WxLogin
-    })
-    afterEach(() => {
-      vi.restoreAllMocks()
-    })
-
-    it("window.WxLogin 已存在时直接复用，不重复插入 script", async () => {
-      const fakeCtor = vi.fn()
-      ;(window as unknown as { WxLogin: unknown }).WxLogin = fakeCtor
-      const { loadWxLoginScript } = await import("@/api/auth/wxLogin")
-      const ctor = await loadWxLoginScript()
-      expect(ctor).toBe(fakeCtor)
-      expect(document.head.querySelector("script[src*='wxLogin']")).toBeNull()
-    })
-
-    it("脚本 onerror 时 reject（调用方据此回退整页跳转）", async () => {
-      const { loadWxLoginScript } = await import("@/api/auth/wxLogin")
-      const promise = loadWxLoginScript()
-      const script = document.head.querySelector(
-        "script[src*='wxLogin']",
-      ) as HTMLScriptElement | null
-      expect(script).not.toBeNull()
-      script?.dispatchEvent(new Event("error"))
-      await expect(promise).rejects.toThrow(/加载失败/)
-    })
-  })
-})

apps/web/src/test/components/ChunkErrorBoundary.test.tsx

@@ -1,79 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from "vitest"
-import { render, screen, fireEvent } from "@testing-library/react"
-import { Button } from "antd"
-import { useState } from "react"
-import ChunkErrorBoundary from "@/components/common/ChunkErrorBoundary"
-import * as chunkUtils from "@/utils/chunkLoadError"
-
-// reload 函数 mock 掉（jsdom 不支持真实 window.location.reload）
-vi.mock("@/utils/chunkLoadError", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/utils/chunkLoadError")>()
-  return {
-    ...actual,
-    reloadForChunkError: vi.fn(),
-    goHomeRecover: vi.fn(),
-  }
-})
-const { reloadForChunkError, goHomeRecover } = vi.mocked(chunkUtils)
-
-/** 渲染时直接抛错的子组件 */
-const Boom: React.FC<{ error: Error }> = ({ error }) => {
-  throw error
-}
-
-/** 点击按钮后才抛 chunk 错误的子组件 */
-const ChunkBoomButton: React.FC = () => {
-  const [boom, setBoom] = useState(false)
-  if (boom) {
-    throw new TypeError("Failed to fetch dynamically imported module: /assets/x.js")
-  }
-  return <Button onClick={() => setBoom(true)}>boom</Button>
-}
-
-const renderBoundary = (ui: React.ReactNode) =>
-  render(<ChunkErrorBoundary>{ui}</ChunkErrorBoundary>)
-
-beforeEach(() => {
-  sessionStorage.clear()
-  vi.clearAllMocks()
-  // error boundary 捕获后 React 会打 error log，静默掉
-  vi.spyOn(console, "error").mockImplementation(() => {})
-})
-
-afterEach(() => {
-  vi.restoreAllMocks()
-  sessionStorage.clear()
-})
-
-describe("ChunkErrorBoundary", () => {
-  it("正常渲染 children", () => {
-    renderBoundary(<div>hello-child</div>)
-    expect(screen.getByText("hello-child")).toBeInTheDocument()
-  })
-
-  it("首次捕获 chunk 错误 → 自动刷新（reloadForChunkError）并显示自动刷新提示", () => {
-    renderBoundary(<ChunkBoomButton />)
-    fireEvent.click(screen.getByText("boom"))
-    expect(reloadForChunkError).toHaveBeenCalledTimes(1)
-    expect(screen.getByText(/正在自动刷新/)).toBeInTheDocument()
-  })
-
-  it("已刷新过仍失败 → 不再自动刷新，显示手动兜底按钮", () => {
-    // 模拟"本会话已经自动刷新过一次"
-    sessionStorage.setItem("chunk_error_reloaded_at", String(Date.now()))
-    renderBoundary(
-      <Boom error={new TypeError("Failed to fetch dynamically imported module: /assets/y.js")} />,
-    )
-    expect(reloadForChunkError).not.toHaveBeenCalled()
-    expect(screen.getByText("系统已更新")).toBeInTheDocument()
-    // 点击兜底按钮 → goHomeRecover（跳首页，不刷新当前 URL）
-    fireEvent.click(screen.getByText("刷新并返回首页"))
-    expect(goHomeRecover).toHaveBeenCalledTimes(1)
-  })
-
-  it("非 chunk 错误 → 显示通用错误页，不触发 chunk 自动刷新", () => {
-    renderBoundary(<Boom error={new Error("普通业务报错")} />)
-    expect(reloadForChunkError).not.toHaveBeenCalled()
-    expect(screen.getByText("页面出现异常")).toBeInTheDocument()
-  })
-})

apps/web/src/test/components/WechatQrModal.test.tsx

@@ -1,165 +0,0 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from "vitest"
-import { render, screen, waitFor, cleanup, fireEvent } from "@testing-library/react"
-import WechatQrModal from "@/components/auth/WechatQrModal"
-
-const { mockWxLoginCtor, mockGetAuthUrl, mockGetBindUrl, mockGetCurrentUser } = vi.hoisted(() => ({
-  mockWxLoginCtor: vi.fn(),
-  mockGetAuthUrl: vi.fn(),
-  mockGetBindUrl: vi.fn(),
-  mockGetCurrentUser: vi.fn(),
-}))
-
-vi.mock("@/api/auth", () => ({
-  getWechatAuthUrl: (...args: unknown[]) => mockGetAuthUrl(...args),
-  getWechatBindUrl: (...args: unknown[]) => mockGetBindUrl(...args),
-  getCurrentUser: (...args: unknown[]) => mockGetCurrentUser(...args),
-  normalizeUser: (u: unknown) => u,
-}))
-
-vi.mock("@/api/auth/wxLogin", () => ({
-  loadWxLoginScript: vi.fn(async () => mockWxLoginCtor),
-  parseWxAuthUrl: vi.fn(() => ({
-    appid: "wxb7ae80b48e53980d",
-    redirect_uri: "https://staging.xiaoxiajianji.com/auth/wechat/callback",
-    state: "state-from-url",
-  })),
-}))
-
-vi.mock("@/api/auth/tokenRefresh", () => ({
-  scheduleProactiveRefresh: vi.fn(),
-  cancelProactiveRefresh: vi.fn(),
-}))
-
-const { mockSetAuth, mockSetUser } = vi.hoisted(() => ({
-  mockSetAuth: vi.fn(),
-  mockSetUser: vi.fn(),
-}))
-vi.mock("@/store/authStore", () => ({
-  useAuthStore: (selector: (s: unknown) => unknown) =>
-    selector({ setAuth: mockSetAuth, setUser: mockSetUser }),
-}))
-
-const AUTH_URL =
-  "https://open.weixin.qq.com/connect/qrconnect?appid=wxb7ae80b48e53980d" +
-  "&redirect_uri=https%3A%2F%2Fstaging.xiaoxiajianji.com%2Fauth%2Fwechat%2Fcallback&state=st123"
-
-const postMessage = (data: Record<string, unknown>) =>
-  window.dispatchEvent(new MessageEvent("message", { data, origin: window.location.origin }))
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mockGetAuthUrl.mockResolvedValue({ auth_url: AUTH_URL, state: "st123" })
-  mockGetBindUrl.mockResolvedValue({ auth_url: AUTH_URL, state: "st123" })
-  mockGetCurrentUser.mockResolvedValue({ id: 1, display_name: "测试用户" })
-  localStorage.clear()
-})
-
-afterEach(() => cleanup())
-
-describe("WechatQrModal", () => {
-  it("open=false 时不渲染弹窗内容", () => {
-    render(<WechatQrModal open={false} scene="login" onClose={vi.fn()} />)
-    expect(screen.queryByText("微信扫码登录")).toBeNull()
-  })
-
-  it("登录场景：open 后请求授权链接、写入 state、用 WxLogin 渲染二维码", async () => {
-    render(<WechatQrModal open scene="login" onClose={vi.fn()} />)
-    await waitFor(() => expect(mockGetAuthUrl).toHaveBeenCalledTimes(1))
-    expect(localStorage.getItem("wechat_state")).toBe("st123")
-    await waitFor(() => expect(mockWxLoginCtor).toHaveBeenCalledTimes(1))
-    expect(mockWxLoginCtor).toHaveBeenCalledWith(
-      expect.objectContaining({
-        self_redirect: true,
-        appid: "wxb7ae80b48e53980d",
-        scope: "snsapi_login",
-        state: "state-from-url",
-        redirect_uri: "https://staging.xiaoxiajianji.com/auth/wechat/callback",
-      }),
-    )
-    expect(screen.getByText(/请使用微信扫描二维码登录/)).toBeTruthy()
-  })
-
-  it("绑定场景：请求 bind/url 且写入 wechat_bind_state", async () => {
-    render(<WechatQrModal open scene="bind" onClose={vi.fn()} />)
-    await waitFor(() => expect(mockGetBindUrl).toHaveBeenCalledTimes(1))
-    expect(mockGetAuthUrl).not.toHaveBeenCalled()
-    expect(localStorage.getItem("wechat_bind_state")).toBe("st123")
-    await waitFor(() => expect(mockWxLoginCtor).toHaveBeenCalledTimes(1))
-  })
-
-  it("获取授权链接失败时弹窗内展示错误并提供刷新", async () => {
-    mockGetAuthUrl.mockRejectedValueOnce({
-      response: { status: 500, data: { detail: "微信服务内部错误" } },
-    })
-    render(<WechatQrModal open scene="login" onClose={vi.fn()} />)
-    expect(await screen.findByText(/微信服务内部错误/)).toBeTruthy()
-    expect(screen.getByText("刷新二维码")).toBeTruthy()
-    // 点刷新后重新请求
-    fireEvent.click(screen.getByText("刷新二维码"))
-    await waitFor(() => expect(mockGetAuthUrl).toHaveBeenCalledTimes(2))
-  })
-
-  it("登录成功消息：同步登录态并回调 onLoginSuccess(needOnboarding)", async () => {
-    const onSuccess = vi.fn()
-    localStorage.setItem("access_token", "tok-123")
-    render(<WechatQrModal open scene="login" onClose={vi.fn()} onLoginSuccess={onSuccess} />)
-    await waitFor(() => expect(mockWxLoginCtor).toHaveBeenCalledTimes(1))
-
-    postMessage({
-      source: "xiaoxia-wechat-qr",
-      scene: "login",
-      success: true,
-      payload: { needOnboarding: true },
-    })
-
-    await waitFor(() => expect(onSuccess).toHaveBeenCalledWith(true))
-    expect(mockGetCurrentUser).toHaveBeenCalled()
-    expect(mockSetAuth).toHaveBeenCalledWith(expect.objectContaining({ id: 1 }), "tok-123", null)
-  })
-
-  it("登录失败消息：弹窗内展示回调页透传的真实原因", async () => {
-    render(<WechatQrModal open scene="login" onClose={vi.fn()} />)
-    await waitFor(() => expect(mockWxLoginCtor).toHaveBeenCalledTimes(1))
-
-    postMessage({
-      source: "xiaoxia-wechat-qr",
-      scene: "login",
-      success: false,
-      detail: "微信登录失败：state 已过期或已被使用",
-    })
-
-    expect(await screen.findByText(/state 已过期或已被使用/)).toBeTruthy()
-  })
-
-  it("绑定成功消息：刷新用户并回调 onBindSuccess", async () => {
-    const onBindSuccess = vi.fn()
-    render(<WechatQrModal open scene="bind" onClose={vi.fn()} onBindSuccess={onBindSuccess} />)
-    await waitFor(() => expect(mockWxLoginCtor).toHaveBeenCalledTimes(1))
-
-    postMessage({ source: "xiaoxia-wechat-qr", scene: "bind", success: true })
-
-    await waitFor(() => expect(onBindSuccess).toHaveBeenCalledTimes(1))
-    expect(mockSetUser).toHaveBeenCalled()
-  })
-
-  it("忽略跨源消息和其他场景的消息", async () => {
-    const onSuccess = vi.fn()
-    render(<WechatQrModal open scene="login" onClose={vi.fn()} onLoginSuccess={onSuccess} />)
-    await waitFor(() => expect(mockWxLoginCtor).toHaveBeenCalledTimes(1))
-
-    // 跨源
-    window.dispatchEvent(
-      new MessageEvent("message", {
-        data: { source: "xiaoxia-wechat-qr", scene: "login", success: true },
-        origin: "https://evil.example.com",
-      }),
-    )
-    // 场景不符（bind 消息发给 login 弹窗）
-    postMessage({ source: "xiaoxia-wechat-qr", scene: "bind", success: true })
-    // 无协议标识
-    postMessage({ foo: "bar" })
-
-    await new Promise((r) => setTimeout(r, 50))
-    expect(onSuccess).not.toHaveBeenCalled()
-  })
-})

apps/web/src/test/pages/assets/useAssetUpload.test.tsx

@@ -26,8 +26,6 @@ interface FakeHandle {
     fields: Record<string, string>
     max_size_bytes: number
     asset_id: string
-    duplicated?: boolean
-    skip_transfer?: boolean
   }
   transfer: ReturnType<typeof vi.fn>
   complete: ReturnType<typeof vi.fn>
@@ -48,8 +46,6 @@ const makeFakeHandle = (opts: {
   duplicated?: boolean
   failTransfer?: boolean
   completeAuto?: boolean
-  /** prepare 阶段就命中去重：prepare 响应 skip_transfer/duplicated=true */
-  prepareDedup?: boolean
 }) => {
   const h: FakeHandle = {
     prepared: {
@@ -60,8 +56,6 @@ const makeFakeHandle = (opts: {
       fields: {},
       max_size_bytes: 2_000_000_000,
       asset_id: opts.id,
-      duplicated: opts.prepareDedup ? true : undefined,
-      skip_transfer: opts.prepareDedup ? true : undefined,
     },
     transfer: vi.fn(),
     complete: vi.fn(),
@@ -386,27 +380,4 @@ describe("useAssetUpload", () => {
     expect(it.failedStage).toBe("prepare")
     expect(it.error).toContain("签名服务内部错误")
   })
-  it("prepare 返回 skip_transfer=true 时立即跳过 transfer+complete，标记 done+duplicated", async () => {
-    const h = makeFakeHandle({ id: "a-skip", prepareDedup: true })
-    ;(prepareDirectUploadHandle as unknown as ReturnType<typeof vi.fn>).mockImplementation(
-      async () => h,
-    )
-
-    const { result } = renderHook(() => useAssetUpload({ effectiveLibId: "lib-1" }), {
-      wrapper: createWrapper(),
-    })
-
-    await act(async () => {
-      result.current.enqueueUploads([mp4("skip-transfer.mp4")])
-    })
-
-    await waitFor(() => {
-      expect(h.transfer).not.toHaveBeenCalled()
-      expect(h.complete).not.toHaveBeenCalled()
-      const it = result.current.uploadItems[0]
-      expect(it?.status).toBe("done")
-      expect(it?.duplicated).toBe(true)
-      expect(it?.assetId).toBe("a-skip")
-    })
-  })
 })

apps/web/src/test/pages/auth/WechatBindCallback.test.tsx

@@ -41,16 +41,6 @@ vi.mock("@/store/authStore", () => ({
   useAuthStore: (selector: (state: unknown) => unknown) => selector({ setUser: mockSetUser }),
 }))
 
-// iframe 场景：默认非 iframe；用例可 mockReturnValue(true)
-const { mockIsInIframe, mockPostResult } = vi.hoisted(() => ({
-  mockIsInIframe: vi.fn(() => false),
-  mockPostResult: vi.fn(),
-}))
-vi.mock("@/components/auth/WechatQrModal/messages", () => ({
-  isInIframe: () => mockIsInIframe(),
-  postWechatQrResult: (...args: unknown[]) => mockPostResult(...args),
-}))
-
 const renderPage = () =>
   render(
     <MemoryRouter>
@@ -65,7 +55,6 @@ describe("WechatBindCallback Page", () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    mockIsInIframe.mockReturnValue(false)
     bindError = null
     Array.from(mockParams.keys()).forEach((k) => mockParams.delete(k))
     mockParams.set("code", "bind_code")
@@ -113,32 +102,4 @@ describe("WechatBindCallback Page", () => {
       expect(screen.getByText(/无效的回调参数/)).toBeTruthy()
     })
   })
-
-  describe("iframe（弹窗内嵌二维码）场景", () => {
-    it("绑定成功时 postMessage 通知父窗口，不做 navigate", async () => {
-      mockIsInIframe.mockReturnValue(true)
-      renderPage()
-      await waitFor(() => {
-        expect(mockPostResult).toHaveBeenCalledWith("bind", true)
-      })
-      expect(mockSetUser).toHaveBeenCalled()
-      expect(mockNavigate).not.toHaveBeenCalled()
-    })
-
-    it("绑定失败时把真实原因 postMessage 给父窗口", async () => {
-      mockIsInIframe.mockReturnValue(true)
-      bindError = {
-        isAxiosError: true,
-        response: { status: 409, data: { detail: "该微信已绑定其他账号" } },
-      }
-      renderPage()
-      await waitFor(() => {
-        expect(mockPostResult).toHaveBeenCalledWith("bind", false, {
-          detail: expect.stringContaining("该微信已绑定其他账号"),
-        })
-      })
-      expect(screen.queryByText(/返回设置/)).toBeNull()
-      expect(mockNavigate).not.toHaveBeenCalled()
-    })
-  })
 })

apps/web/src/test/pages/auth/WechatCallback.test.tsx

@@ -53,16 +53,6 @@ vi.mock("@/store/authStore", () => ({
   useAuthStore: (selector: (state: unknown) => unknown) => selector({ setAuth: mockSetAuth }),
 }))
 
-// iframe 场景：默认非 iframe；用例可 mockReturnValue(true)
-const { mockIsInIframe, mockPostResult } = vi.hoisted(() => ({
-  mockIsInIframe: vi.fn(() => false),
-  mockPostResult: vi.fn(),
-}))
-vi.mock("@/components/auth/WechatQrModal/messages", () => ({
-  isInIframe: () => mockIsInIframe(),
-  postWechatQrResult: (...args: unknown[]) => mockPostResult(...args),
-}))
-
 const renderPage = () =>
   render(
     <MemoryRouter>
@@ -77,7 +67,6 @@ describe("WechatCallback Page", () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    mockIsInIframe.mockReturnValue(false)
     callbackError = null
     // 默认正常回调参数；用例可改写 mockParams 模拟 error 重定向
     Array.from(mockParams.keys()).forEach((k) => mockParams.delete(k))
@@ -170,54 +159,4 @@ describe("WechatCallback Page", () => {
     renderPage()
     expect(screen.getByText("微信登录中...")).toBeTruthy()
   })
-
-  describe("iframe（弹窗内嵌二维码）场景", () => {
-    it("登录成功时 postMessage 通知父窗口（needOnboarding=false），不做 navigate", async () => {
-      mockIsInIframe.mockReturnValue(true)
-      renderPage()
-      await waitFor(() => {
-        expect(mockPostResult).toHaveBeenCalledWith("login", true, { needOnboarding: false })
-      })
-      expect(mockSetAuth).toHaveBeenCalled()
-      expect(mockNavigate).not.toHaveBeenCalled()
-    })
-
-    it("新用户成功时上报 needOnboarding=true", async () => {
-      mockIsInIframe.mockReturnValue(true)
-      mockCallbackResult = { access_token: "at", refresh_token: "rt", is_new_user: true }
-      renderPage()
-      await waitFor(() => {
-        expect(mockPostResult).toHaveBeenCalledWith("login", true, { needOnboarding: true })
-      })
-      expect(mockNavigate).not.toHaveBeenCalled()
-    })
-
-    it("后端报错时把真实原因 postMessage 给父窗口，页面不渲染错误/按钮", async () => {
-      mockIsInIframe.mockReturnValue(true)
-      callbackError = {
-        isAxiosError: true,
-        response: { status: 400, data: { detail: "state 已过期或已被使用" } },
-      }
-      renderPage()
-      await waitFor(() => {
-        expect(mockPostResult).toHaveBeenCalledWith("login", false, {
-          detail: expect.stringContaining("state 已过期或已被使用"),
-        })
-      })
-      expect(screen.queryByText(/返回登录/)).toBeNull()
-      expect(mockNavigate).not.toHaveBeenCalled()
-    })
-
-    it("微信重定向 error（拒绝授权）在 iframe 内也上报父窗口", async () => {
-      mockIsInIframe.mockReturnValue(true)
-      for (const k of Array.from(mockParams.keys())) mockParams.delete(k)
-      mockParams.set("error", "access_denied")
-      renderPage()
-      await waitFor(() => {
-        expect(mockPostResult).toHaveBeenCalledWith("login", false, {
-          detail: expect.stringContaining("access_denied"),
-        })
-      })
-    })
-  })
 })

apps/web/src/test/pages/auth/WechatOnboarding.test.tsx

@@ -122,54 +122,6 @@ describe("WechatOnboarding 昵称引导页", () => {
     )
   })
 
-  it("连点提交按钮只触发一次请求（防重复提交）", async () => {
-    // mutation 挂起不立即完成，模拟慢网络下连续双击
-    let resolveSubmit: (v: unknown) => void = () => {}
-    updateProfileMock = vi.fn(
-      () =>
-        new Promise((resolve) => {
-          resolveSubmit = resolve
-        }),
-    )
-    renderPage()
-    fireEvent.change(screen.getByPlaceholderText("请输入您的昵称"), {
-      target: { value: "小虾用户" },
-    })
-    const btn = screen.getByText("进入小虾智剪")
-    fireEvent.click(btn)
-    // 第一次点击后立即再点（此时重渲染/loading 可能还没生效）
-    fireEvent.click(btn)
-    fireEvent.click(btn)
-    await waitFor(() => {
-      expect(updateProfileMock).toHaveBeenCalledTimes(1)
-    })
-    // 释放挂起的 Promise，避免泄漏
-    resolveSubmit({ id: "u1", display_name: "小虾用户", profile_completed: true })
-  })
-
-  it("提交失败后守卫复位，允许再次提交", async () => {
-    updateProfileMock = vi
-      .fn()
-      .mockRejectedValueOnce({
-        isAxiosError: true,
-        response: { status: 500, data: { detail: "服务内部错误" } },
-      })
-      .mockResolvedValueOnce({ id: "u1", display_name: "小虾用户", profile_completed: true })
-    renderPage()
-    fireEvent.change(screen.getByPlaceholderText("请输入您的昵称"), {
-      target: { value: "小虾用户" },
-    })
-    fireEvent.click(screen.getByText("进入小虾智剪"))
-    await waitFor(() => {
-      expect(updateProfileMock).toHaveBeenCalledTimes(1)
-    })
-    // 失败后再点一次，应能重新提交
-    fireEvent.click(screen.getByText("进入小虾智剪"))
-    await waitFor(() => {
-      expect(updateProfileMock).toHaveBeenCalledTimes(2)
-    })
-  })
-
   it("提交失败显示错误且不跳转", async () => {
     updateProfileMock = vi.fn(async () => {
       throw new Error("500")

apps/web/src/test/pages/generate/title-library-autocomplete.test.tsx

@@ -1,126 +0,0 @@
-/**
- * TitleLibraryAutoComplete 单测（Issue #1737）
- *
- * 覆盖：
- * - 聚焦空输入框 → 下拉立即展开，展示标题库全部标题（原生 AutoComplete 聚焦不展开，此为本工单核心修复）
- * - 输入关键词 → 下拉只显示匹配项
- * - 点击下拉项 → onChange 回填所选标题
- * - 自由输入自定义标题 → onChange 正常透传，不被下拉干扰
- * - 标题库为空 → 聚焦不展开（不出"暂无数据"空壳）
- * - 选中后下拉关闭
- */
-import { describe, it, expect, vi } from "vitest"
-import { render, screen, waitFor, fireEvent } from "@testing-library/react"
-import userEvent from "@testing-library/user-event"
-import TitleLibraryAutoComplete from "@/pages/generate/components/title/TitleLibraryAutoComplete"
-
-const OPTIONS = [
-  { label: "永康这家面馆绝了", value: "永康这家面馆绝了" },
-  { label: "永康美食探店vlog", value: "永康美食探店vlog" },
-  { label: "萌宠日常第一天", value: "萌宠日常第一天" },
-]
-
-function renderBox(initialValue = "", opts = OPTIONS) {
-  const onChange = vi.fn()
-  const result = render(
-    <TitleLibraryAutoComplete
-      value={initialValue}
-      onChange={onChange}
-      options={opts}
-      placeholder="输入或从标题库选择"
-    />,
-  )
-  return { onChange, ...result }
-}
-
-/** 聚焦输入框（combobox role） */
-function focusInput() {
-  const input = screen.getByRole("combobox") as HTMLInputElement
-  fireEvent.focus(input)
-  return input
-}
-
-/** 取下拉中实际可见的选项（rc-virtual-list 渲染为 .ant-select-item-option；role=option 的 listbox 是 a11y 哨兵） */
-function getVisibleOptions(): HTMLElement[] {
-  const dropdown = document.querySelector(".ant-select-dropdown:not(.ant-select-dropdown-hidden)")
-  if (!dropdown) return []
-  return Array.from(dropdown.querySelectorAll(".ant-select-item-option")) as HTMLElement[]
-}
-
-describe("TitleLibraryAutoComplete (#1737)", () => {
-  it("聚焦空输入框时下拉展开并展示标题库全部标题", async () => {
-    renderBox()
-    expect(screen.queryByRole("listbox")).not.toBeInTheDocument()
-
-    focusInput()
-
-    await screen.findByRole("listbox")
-    await waitFor(() => expect(getVisibleOptions()).toHaveLength(3))
-    const options = getVisibleOptions()
-    expect(options[0]).toHaveTextContent("永康这家面馆绝了")
-    expect(options[2]).toHaveTextContent("萌宠日常第一天")
-  })
-
-  it("输入关键词时下拉只显示匹配项", async () => {
-    const user = userEvent.setup()
-    renderBox()
-    const input = screen.getByRole("combobox")
-    await user.click(input)
-    await screen.findByRole("listbox")
-
-    await user.type(input, "永康")
-    await waitFor(() => expect(getVisibleOptions()).toHaveLength(2))
-    const options = getVisibleOptions()
-    expect(options.every((o) => o.textContent?.includes("永康"))).toBe(true)
-  })
-
-  it("点击下拉项后 onChange 回填标题且下拉关闭", async () => {
-    const user = userEvent.setup()
-    const { onChange } = renderBox()
-    const input = screen.getByRole("combobox") as HTMLInputElement
-    await user.click(input)
-    await screen.findByRole("listbox")
-
-    await user.click(screen.getByText("萌宠日常第一天"))
-
-    await waitFor(() => {
-      expect(onChange).toHaveBeenCalledWith("萌宠日常第一天")
-    })
-    await waitFor(() => {
-      expect(screen.queryByRole("listbox")).not.toBeInTheDocument()
-    })
-  })
-
-  it("自由输入自定义标题时 onChange 正常透传（不被下拉干扰）", async () => {
-    const user = userEvent.setup()
-    const { onChange } = renderBox()
-    const input = screen.getByRole("combobox")
-    await user.click(input)
-
-    await user.type(input, "我自己编的标题XYZ")
-    await waitFor(() => {
-      expect(onChange).toHaveBeenCalledWith("我自己编的标题XYZ")
-    })
-    // 输入无匹配关键词，下拉无 option 时不阻塞输入
-    expect(input).toHaveValue("我自己编的标题XYZ")
-  })
-
-  it("标题库为空时聚焦不展开下拉", async () => {
-    renderBox("", [])
-    focusInput()
-    // 等一帧确认没有 listbox
-    await new Promise((r) => setTimeout(r, 50))
-    expect(screen.queryByRole("listbox")).not.toBeInTheDocument()
-  })
-
-  it("渲染下拉箭头图标作为可选择提示", () => {
-    const { container } = renderBox()
-    // antd 后缀图标在 .ant-select-arrow 内
-    expect(container.querySelector(".ant-select-arrow")).toBeInTheDocument()
-  })
-
-  it("有初始值时输入框正常展示", () => {
-    renderBox("已有标题")
-    expect(screen.getByRole("combobox")).toHaveValue("已有标题")
-  })
-})

apps/web/src/test/router/lazyRoute.test.ts

@@ -1,44 +0,0 @@
-import { describe, it, expect, vi, afterEach } from "vitest"
-import { lazyRoute } from "@/router/lazyRoute"
-
-const chunkErr = () => new TypeError("Failed to fetch dynamically imported module: /assets/x.js")
-
-/** fake 模块 */
-const Comp = function Comp() {}
-const factoryOk = vi.fn(async () => ({ default: Comp }))
-
-afterEach(() => {
-  vi.clearAllMocks()
-})
-
-describe("lazyRoute", () => {
-  it("首次成功直接返回 Component", async () => {
-    const result = await lazyRoute(factoryOk)()
-    expect(result).toEqual({ Component: Comp })
-    expect(factoryOk).toHaveBeenCalledTimes(1)
-  })
-
-  it("chunk 失败重试：前两次失败、第三次成功 → 不抛出", async () => {
-    const f = vi
-      .fn()
-      .mockRejectedValueOnce(chunkErr())
-      .mockRejectedValueOnce(chunkErr())
-      .mockResolvedValueOnce({ default: Comp })
-
-    const result = await lazyRoute(f as never)()
-    expect(result).toEqual({ Component: Comp })
-    expect(f).toHaveBeenCalledTimes(3)
-  })
-
-  it("chunk 失败重试 2 次仍失败 → 抛出", async () => {
-    const f = vi.fn().mockRejectedValue(chunkErr())
-    await expect(lazyRoute(f as never)()).rejects.toThrow(/dynamically imported/)
-    expect(f).toHaveBeenCalledTimes(3)
-  })
-
-  it("非 chunk 错误立即抛出，不重试", async () => {
-    const f = vi.fn().mockRejectedValue(new Error("业务模块内部报错"))
-    await expect(lazyRoute(f as never)()).rejects.toThrow("业务模块内部报错")
-    expect(f).toHaveBeenCalledTimes(1)
-  })
-})

apps/web/src/test/utils/chunkLoadError.test.ts

@@ -1,80 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from "vitest"
-import {
-  getChunkReloadedAt,
-  goHomeRecover,
-  isChunkLoadError,
-  reloadForChunkError,
-} from "@/utils/chunkLoadError"
-
-describe("isChunkLoadError", () => {
-  it("识别 Vite 动态 import 失败", () => {
-    const err = new TypeError(
-      "Failed to fetch dynamically imported module: https://x/assets/AssetLibrary-abc.js",
-    )
-    expect(isChunkLoadError(err)).toBe(true)
-  })
-
-  it("识别 Webpack 风格 ChunkLoadError", () => {
-    const err = new Error("Loading chunk 12 failed.")
-    err.name = "ChunkLoadError"
-    expect(isChunkLoadError(err)).toBe(true)
-  })
-
-  it("识别字符串形式错误", () => {
-    expect(isChunkLoadError("Error loading dynamically imported module")).toBe(true)
-  })
-
-  it("普通错误不命中", () => {
-    expect(isChunkLoadError(new Error("Cannot read properties of undefined"))).toBe(false)
-    expect(isChunkLoadError(null)).toBe(false)
-    expect(isChunkLoadError(undefined)).toBe(false)
-    expect(isChunkLoadError({ status: 500 })).toBe(false)
-  })
-})
-
-describe("reload 标记", () => {
-  beforeEach(() => {
-    sessionStorage.clear()
-    // jsdom 未实现真实导航，reload 仅打 "not implemented" 警告，静默掉
-    vi.spyOn(console, "error").mockImplementation(() => {})
-  })
-  afterEach(() => {
-    vi.restoreAllMocks()
-    sessionStorage.clear()
-  })
-
-  it("无标记返回 null", () => {
-    expect(getChunkReloadedAt()).toBeNull()
-  })
-
-  it("reloadForChunkError 写入刷新标记", () => {
-    expect(() => reloadForChunkError()).not.toThrow()
-    expect(getChunkReloadedAt()).not.toBeNull()
-  })
-
-  it("标记过期（>10min）返回 null", () => {
-    sessionStorage.setItem("chunk_error_reloaded_at", String(Date.now() - 11 * 60 * 1000))
-    expect(getChunkReloadedAt()).toBeNull()
-  })
-
-  it("goHomeRecover 清掉标记", () => {
-    reloadForChunkError()
-    expect(getChunkReloadedAt()).not.toBeNull()
-    expect(() => goHomeRecover()).not.toThrow()
-    expect(sessionStorage.getItem("chunk_error_reloaded_at")).toBeNull()
-  })
-
-  it("sessionStorage 抛异常（无痕模式）时降级不崩溃", () => {
-    const spy = vi.spyOn(Storage.prototype, "getItem").mockImplementation(() => {
-      throw new Error("Storage disabled")
-    })
-    const setSpy = vi.spyOn(Storage.prototype, "setItem").mockImplementation(() => {
-      throw new Error("Storage disabled")
-    })
-    expect(getChunkReloadedAt()).toBeNull()
-    expect(() => reloadForChunkError()).not.toThrow()
-    expect(() => goHomeRecover()).not.toThrow()
-    spy.mockRestore()
-    setSpy.mockRestore()
-  })
-})

apps/web/src/utils/chunkLoadError.ts

@@ -1,84 +0,0 @@
-/**
- * 发版后旧标签页懒加载 chunk 失效（白屏）的识别与恢复工具。
- *
- * 背景：页面 React Router 的 lazy 动态 import，发版后旧 chunk 文件名被删除，
- * 停留在旧标签页的用户点菜单时 import 404，抛出
- * "Failed to fetch dynamically imported module"（Vite）/ ChunkLoadError，
- * 不捕获就是整页白屏。
- */
-
-/** sessionStorage 标记：最近已经为 chunk 失效自动刷新过一次（带时间戳，10min 有效） */
-const RELOAD_FLAG_KEY = "chunk_error_reloaded_at"
-/** 标记有效期：超过后允许再次自动刷新，避免用户手动正常刷新后标记永久残留 */
-const RELOAD_FLAG_TTL_MS = 10 * 60 * 1000
-
-/**
- * Storage 在 Safari 无痕模式 / 禁用 Cookie 的浏览器 / 严格 iframe 策略下
- * 访问可能抛异常；此处统一容错，拿不到存储就降级为"无标记"，绝不能让
- * 错误边界本身因读存储而崩溃。
- */
-const safeStorage = {
-  getItem: (key: string): string | null => {
-    try {
-      return sessionStorage.getItem(key)
-    } catch {
-      return null
-    }
-  },
-  setItem: (key: string, value: string): void => {
-    try {
-      sessionStorage.setItem(key, value)
-    } catch {
-      /* 存储不可用时静默降级：仅丢失"已刷新"标记，不影响恢复动作 */
-    }
-  },
-  removeItem: (key: string): void => {
-    try {
-      sessionStorage.removeItem(key)
-    } catch {
-      /* ignore */
-    }
-  },
-}
-
-/** 判断错误是否为懒加载 chunk 加载失败（发版 404 / 网络中断 / 动态 import 失败） */
-export const isChunkLoadError = (error: unknown): boolean => {
-  if (!error) return false
-  // Vite: Failed to fetch dynamically imported module: /assets/xxx-yyy.js
-  // Webpack: ChunkLoadError: Loading chunk xxx failed.
-  const needle =
-    error instanceof Error
-      ? `${error.name} ${error.message}`
-      : typeof error === "string"
-        ? error
-        : ""
-  return /failed to fetch dynamically imported module|chunkloaderror|loading chunk \d+ failed|error loading dynamically imported module|importing a module script failed/i.test(
-    needle,
-  )
-}
-
-/** 读取上次自动刷新时间戳；过期或不存在返回 null */
-export const getChunkReloadedAt = (): number | null => {
-  const raw = safeStorage.getItem(RELOAD_FLAG_KEY)
-  if (!raw) return null
-  const ts = Number(raw)
-  if (!Number.isFinite(ts)) return null
-  if (Date.now() - ts > RELOAD_FLAG_TTL_MS) return null
-  return ts
-}
-
-/** 标记"已为 chunk 失效自动刷新过"，然后刷新页面 */
-export const reloadForChunkError = (): void => {
-  safeStorage.setItem(RELOAD_FLAG_KEY, String(Date.now()))
-  window.location.reload()
-}
-
-/**
- * 硬恢复：清掉标记后回到首页（整页导航，不是当前 URL 刷新）。
- * - chunk 失效兜底：回到首页会拉取最新 index.html，彻底脱离旧 chunk 引用
- * - 非 chunk 的页面级崩溃：跳首页能绕开当前报错路由，避免"刷新-再崩"死循环
- */
-export const goHomeRecover = (): void => {
-  safeStorage.removeItem(RELOAD_FLAG_KEY)
-  window.location.href = "/"
-}

apps/worker/worker_app/celery_app.py

@@ -17,12 +17,6 @@ apply_queue_settings(celery_app)
 # 长渲染任务预取 1，避免任务被预取占住导致调度不均
 celery_app.conf.worker_prefetch_multiplier = GENERATION_WORKER_PREFETCH_MULTIPLIER
 celery_app.conf.task_acks_late = True  # worker 崩溃时未完成任务重回队列，由执行前守卫丢弃作废消息
-# worker 进程被 OOM/容器硬杀时拒绝 ack，消息留在队列由其他 worker 接手
-celery_app.conf.task_reject_on_worker_lost = True
-# Redis broker 消息可见性超时（#1714）：acks_late 下，消息被预取后 visibility_timeout
-# 内未 ack 才会重投。长任务（ingest HEVC 转码 20-30 分钟、生成硬超时 11 分钟）
-# 必须远大于最长执行时间，否则正常任务会在执行中被误重投；4 小时覆盖最长转码 + 余量。
-celery_app.conf.broker_transport_options = {"visibility_timeout": 4 * 60 * 60}
 
 celery_app.conf.imports = (
     "worker_app.tasks.health",
@@ -54,11 +48,4 @@ celery_app.conf.beat_schedule = {
         "schedule": 300.0,  # 每 5 分钟（秒）
         "options": {"expires": 240},
     },
-    # 上传/转码链路孤儿巡检：worker 重启丢 prefetch 消息后，卡 pending/processing
-    # 的 ingest_job + asset 占位超时标终态（#1714）。转码任务较长，10 分钟一轮
-    "cleanup-stale-ingest-jobs": {
-        "task": "worker.cleanup_stale_ingest_jobs",
-        "schedule": 600.0,  # 每 10 分钟（秒）
-        "options": {"expires": 540},
-    },
 }

apps/worker/worker_app/tasks/_startup.py

@@ -257,32 +257,3 @@ def _on_worker_ready(sender, **kwargs):  # pragma: no cover
     result = cleanup_all_stale_tasks()
     total = result["generation_tasks"] + result["jobs"]
     logger.info("Worker 启动清理完成，共清理 %d 个孤儿任务", total)
-
-
-@worker_ready.connect
-def _recover_stuck_ingest_jobs_on_ready(sender, **kwargs):  # pragma: no cover
-    """Worker 启动完成后恢复卡死在 processing 的 ingest_job（#1714）。
-
-    容器重启/进程 OOM 导致 transcode 队列 unacked 消息未重投时，processing
-    ingest_job 会永久卡死。启动时扫描 processing 超 10 分钟的 job，CAS 重置
-    pending 并重新派单；Redis 锁保证同容器 generation/transcode 双 worker
-    只有一个执行恢复。旧消息若后来重投，ingest_asset 执行前守卫会丢弃。
-    """
-    try:
-        from packages.application.ingest_orphan_cleanup import (
-            make_redis_recovery_lock,
-            recover_stuck_ingest_jobs_on_startup,
-        )
-
-        session = SessionLocal()
-        try:
-            recovered = recover_stuck_ingest_jobs_on_startup(
-                session,
-                lock_acquire=make_redis_recovery_lock(),
-                stuck_minutes=10,
-            )
-        finally:
-            session.close()
-        logger.info("Worker 启动 ingest 恢复完成，共重新派单 %d 个卡死任务", recovered)
-    except Exception as e:  # noqa: BLE001 — 启动恢复失败不能阻断 worker 起服
-        logger.error("启动 ingest 恢复扫描失败（beat 巡检仍会兜底标 failed）: %s", e, exc_info=True)

apps/worker/worker_app/tasks/cleanup.py

@@ -16,12 +16,6 @@ from worker_app.tasks._startup import (
     cleanup_stale_pending_tasks,
 )
 
-from packages.application.ingest_orphan_cleanup import (
-    ASSET_ORPHAN_TIMEOUT_MINUTES,
-    INGEST_PENDING_TIMEOUT_MINUTES,
-    INGEST_PROCESSING_TIMEOUT_MINUTES,
-)
-
 logger = logging.getLogger(__name__)
 
 
@@ -75,53 +69,3 @@ def scheduled_cleanup_stale_running(timeout_minutes: int = ORPHAN_TASK_TIMEOUT_M
             timeout_minutes,
         )
     return {"generation_tasks": gen_count, "jobs": job_count}
-
-
-@shared_task(name="worker.cleanup_stale_ingest_jobs")
-def scheduled_cleanup_stale_ingest_jobs(
-    processing_timeout_minutes: int = INGEST_PROCESSING_TIMEOUT_MINUTES,
-    pending_timeout_minutes: int = INGEST_PENDING_TIMEOUT_MINUTES,
-    orphan_asset_timeout_minutes: int = ASSET_ORPHAN_TIMEOUT_MINUTES,
-) -> dict:
-    """Celery Beat 调度：清理上传/转码链路（IngestJob + Asset）孤儿记录。
-
-    每 10 分钟执行一次。worker 容器重启/进程 OOM 时，已 prefetch 的 transcode
-    celery 消息会丢失（队列里也不存在），ingest_job 永久卡 pending/processing、
-    asset 永久卡 processing/uploading，没有兜底永远不会恢复（#1714）。
-
-    - ingest_job processing > processing_timeout_minutes / pending > pending_timeout_minutes
-      → 标 failed；关联 asset 占位（processing/uploading）联动标 error
-    - 无 ingest_job 关联、created_at > orphan_asset_timeout_minutes 的占位 asset
-      → 标 error
-    - 作废 celery 消息 revoke + 物理清除（防重投，执行前守卫是第二道防线）
-    """
-    from worker_app.db import SessionLocal
-
-    from packages.application.ingest_orphan_cleanup import (
-        cleanup_orphan_processing_assets,
-        cleanup_stale_ingest_jobs,
-        revoke_stale_ingest_messages,
-    )
-
-    session = SessionLocal()
-    try:
-        job_items, asset_ids = cleanup_stale_ingest_jobs(
-            session,
-            processing_timeout_minutes=processing_timeout_minutes,
-            pending_timeout_minutes=pending_timeout_minutes,
-        )
-        orphan_asset_ids = cleanup_orphan_processing_assets(session, timeout_minutes=orphan_asset_timeout_minutes)
-    finally:
-        session.close()
-
-    purged = revoke_stale_ingest_messages(job_items) if job_items else 0
-    total_jobs = len(job_items)
-    total_assets = len(set(asset_ids) | set(orphan_asset_ids))
-    if total_jobs or total_assets:
-        logger.warning(
-            "[Beat] 清理 ingest 链路孤儿: stale_jobs=%d, assets→error=%d, 队列清除消息=%d",
-            total_jobs,
-            total_assets,
-            purged,
-        )
-    return {"stale_jobs": total_jobs, "assets_to_error": total_assets, "purged_messages": purged}

deploy/configs/nginx-production.conf

@@ -14,10 +14,6 @@ server {
     # SPA routing - index.html 禁止缓存，确保每次获取最新版本
     location / {
         try_files $uri /index.html;
-        # HTML 文档（含 try_files 回退的 SPA 路由，如 /login /app/dashboard）一律 no-cache，
-        # 每次校验 ETag/Last-Modified，保证发版后旧标签页重新加载拿到新 chunk 引用；
-        # 带 hash 的静态资源由下方 ~* \.(js|css...) location 优先匹配，不受影响、保持 immutable
-        add_header Cache-Control "no-cache" always;
     }
 
     # API proxy — Production 环境代理到 production API 容器

deploy/configs/nginx-staging.conf

@@ -21,10 +21,6 @@ server {
     # SPA fallback
     location / {
         try_files $uri /index.html;
-        # HTML 文档（含 try_files 回退的 SPA 路由，如 /login /app/dashboard）一律 no-cache，
-        # 每次校验 ETag/Last-Modified，保证发版后旧标签页重新加载拿到新 chunk 引用；
-        # 带 hash 的静态资源由下方 ~* \.(js|css...) location 优先匹配，不受影响、保持 immutable
-        add_header Cache-Control "no-cache" always;
     }
 
     # API proxy — Staging 环境代理到 staging API 容器

infra/docker/entrypoint-worker.sh

@@ -36,7 +36,6 @@ celery \
   worker \
   --loglevel=info \
   "-B" \
-  -s /tmp/celerybeat-schedule \
   -Q generation \
   "--concurrency=${GEN_CONCURRENCY}" \
   "--max-tasks-per-child=${MAX_TASKS}" \

infra/docker/nginx-production.conf

@@ -16,10 +16,6 @@ server {
     # 注意：不能加 $uri/，否则 /assets 等与构建产物目录同名的路由会被当成目录访问，返回 403
     location / {
         try_files $uri /index.html;
-        # HTML 文档（含 try_files 回退的 SPA 路由，如 /login /app/dashboard）一律 no-cache，
-        # 每次校验 ETag/Last-Modified，保证发版后旧标签页重新加载拿到新 chunk 引用；
-        # 带 hash 的静态资源由下方 ~* \.(js|css...) location 优先匹配，不受影响、保持 immutable
-        add_header Cache-Control "no-cache" always;
     }
 
     # API proxy

infra/docker/nginx-staging.conf

@@ -23,10 +23,6 @@ server {
 
     location / {
         try_files $uri /index.html;
-        # HTML 文档（含 try_files 回退的 SPA 路由，如 /login /app/dashboard）一律 no-cache，
-        # 每次校验 ETag/Last-Modified，保证发版后旧标签页重新加载拿到新 chunk 引用；
-        # 带 hash 的静态资源由下方 ~* \.(js|css...) location 优先匹配，不受影响、保持 immutable
-        add_header Cache-Control "no-cache" always;
     }
 
     # API proxy

infra/docker/nginx.conf

@@ -33,10 +33,6 @@ server {
 
     location / {
         try_files $uri /index.html;
-        # HTML 文档（含 try_files 回退的 SPA 路由，如 /login /app/dashboard）一律 no-cache，
-        # 每次校验 ETag/Last-Modified，保证发版后旧标签页重新加载拿到新 chunk 引用；
-        # 带 hash 的静态资源由下方 ~* \.(js|css...) location 优先匹配，不受影响、保持 immutable
-        add_header Cache-Control "no-cache" always;
     }
 
     # API proxy

packages/adapters/sqlalchemy_impl/asset_repository.py

@@ -488,25 +488,20 @@ class SQLAlchemyAssetRepository:
 
         用于旧客户端未传 file_hash/client_upload_id 时，防止 complete 超时重试
         反复创建 PROCESSING 占位记录。只命中"活动中"的近期记录，READY 历史素材不拦。
-
-        严格模式（#1714 误杀修复）：file_size 必须 > 0 且与记录大小严格一致；
-        file_size=0（大小未知）时直接返回 None——宁可漏判（极端情况下多建一条
-        占位）也不可仅凭同名 + processing 误杀内容全新的视频。
         """
         from datetime import datetime, timedelta, timezone
 
         if not name:
             return None
-        if not file_size or file_size <= 0:
-            return None
         cutoff = datetime.now(timezone.utc) - timedelta(minutes=within_minutes)
         query = self.session.query(AssetModel).filter(
             AssetModel.asset_library_id == library_id,
             AssetModel.name == name,
             AssetModel.status.in_([AssetStatus.UPLOADING.value, AssetStatus.PROCESSING.value]),
             AssetModel.created_at >= cutoff,
-            AssetModel.file_size == file_size,
         )
+        if file_size and file_size > 0:
+            query = query.filter(AssetModel.file_size == file_size)
         model = query.order_by(AssetModel.created_at.desc()).first()
         if model is None:
             return None

packages/adapters/sqlalchemy_impl/models.py

@@ -38,7 +38,6 @@ class UserModel(Base):
     phone = Column(String(32), nullable=True, unique=True, index=True)
     phone_verified = Column(Boolean, nullable=False, default=False)
     binding_completed_at = Column(DateTime, nullable=True)
-    profile_completed = Column(Boolean, nullable=False, default=True, server_default="true")
     created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
 
 

packages/adapters/sqlalchemy_impl/user_repository.py

@@ -38,7 +38,6 @@ class SQLAlchemyUserRepository(UserRepository):
         model.phone = user.phone
         model.phone_verified = user.phone_verified
         model.binding_completed_at = user.binding_completed_at
-        model.profile_completed = user.profile_completed
         model.created_at = user.created_at
 
         self.session.commit()
@@ -114,6 +113,5 @@ class SQLAlchemyUserRepository(UserRepository):
             phone=model.phone,
             phone_verified=model.phone_verified or False,
             binding_completed_at=model.binding_completed_at,
-            profile_completed=model.profile_completed if model.profile_completed is not None else True,
             created_at=model.created_at,
         )

packages/application/auth/wechat_sync_use_case.py

@@ -2,10 +2,8 @@
 微信同步登录/注册 Use Case
 
 供 BFF 层调用的系统级接口：
-- 优先按 unionid 识别用户（跨应用/跨端识别同一微信用户）
-- 再按 openid 识别（同一应用内）
-- openid 命中老账号但 unionid 缺失时补写 unionid（开放平台绑定前的存量账号自动关联）
-- 都未命中则创建新用户
+- 根据 openid 查找用户，找到则登录返回 token
+- 没找到则创建新用户并返回 token
 - 支持 unionid 跨应用关联
 """
 
@@ -84,10 +82,10 @@ class WechatSyncResponse:
 
 
 class WechatSyncUseCase:
-    """微信登录/注册同步用例
+    """微信同步登录/注册用例
 
     系统级接口，由 BFF 通过 API Key 调用。
-    职责：根据 unionid/openid 查找或创建用户，返回 SaaS token。
+    职责：根据 openid 查找或创建用户，返回 SaaS token。
     """
 
     def __init__(self, user_repository, session_store=None, jwt_secret_key: str | None = None):
@@ -107,54 +105,24 @@ class WechatSyncUseCase:
                 return None, "openid is required"
 
             is_new_user = False
-            user = None
-            openid_user = None
-            unionid_user = None
 
-            # 1. 先按 unionid 查找（跨应用识别同一微信用户，优先级最高）
-            if request.unionid:
-                unionid_user = self.user_repository.find_by_wechat_unionid(request.unionid)
+            # 1. 按 openid 查找用户
+            user = self.user_repository.find_by_wechat_openid(request.openid)
 
-            # 2. 再按 openid 查找（同一应用内）
-            openid_user = self.user_repository.find_by_wechat_openid(request.openid)
+            # 2. 如果 openid 没找到，尝试 unionid
+            if not user and request.unionid:
+                user = self.user_repository.find_by_wechat_unionid(request.unionid)
+                if user:
+                    # 找到用户但 openid 为空，绑定一下当前 openid
+                    user.wechat_openid = request.openid
+                    self.user_repository.save(user)
 
-            if unionid_user and openid_user:
-                # 3a. 两边都命中
-                if unionid_user.id == openid_user.id:
-                    # 同一个用户，直接登录
-                    user = unionid_user
-                else:
-                    # unionid 与 openid 分属两个不同账号：数据异常，拒绝写入，
-                    # 交由人工/数据修复合并，避免账号被错误串联
-                    return None, ("wechat account conflict: unionid and openid bound to " "different users")
-            elif unionid_user:
-                # 3b. unionid 命中（跨端老用户），当前 openid 未绑定过：
-                # 确认 openid 没有落在其他账号上后，把新 openid 绑到该用户
-                if openid_user is not None and openid_user.id != unionid_user.id:
-                    return None, ("wechat account conflict: openid bound to another user")
-                if unionid_user.wechat_openid != request.openid:
-                    unionid_user.wechat_openid = request.openid
-                    self.user_repository.save(unionid_user)
-                user = unionid_user
-            elif openid_user:
-                # 3c. 仅 openid 命中（开放平台绑定前创建的存量账号）：
-                # 本次请求带了 unionid 且该账号还没有 unionid 时补写
-                if request.unionid and not openid_user.wechat_unionid:
-                    # 去重：确认该 unionid 没有关联到其他用户
-                    conflict = self.user_repository.find_by_wechat_unionid(request.unionid)
-                    if conflict is not None and conflict.id != openid_user.id:
-                        return None, ("wechat account conflict: unionid already bound to " "another user")
-                    openid_user.wechat_unionid = request.unionid
-                    self.user_repository.save(openid_user)
-                user = openid_user
-            else:
-                # 4. 都没找到，创建新用户
-                # 额外兜底：若 unionid 已被其他账号占用（理论上上面已查过），
-                # 不创建带冲突 unionid 的新账号
+            # 3. 都没找到则创建新用户
+            if not user:
                 user = self._create_wechat_user(request)
                 is_new_user = True
 
-            # 5. 创建 session 并生成 token
+            # 4. 创建 session 并生成 token
             session_id = secrets.token_urlsafe(16)
             refresh_token = secrets.token_urlsafe(32)
 
@@ -232,8 +200,6 @@ class WechatSyncUseCase:
             email_verified=True,  # 微信登录视为已验证
             wechat_openid=request.openid,
             wechat_unionid=request.unionid or None,
-            # 微信新建用户首次登录需引导设置昵称
-            profile_completed=False,
         )
 
         self.user_repository.save(user)

packages/application/ingest_orphan_cleanup.py

@@ -1,310 +0,0 @@
-"""上传/转码链路（IngestJob + Asset）孤儿清理核心逻辑。
-
-#1714：generation 链路有 cleanup_stale_running/pending 兜底，但上传链路
-（ingest_jobs + assets）没有。worker 容器重启/进程 OOM 时，已 prefetch 的
-celery 消息会丢失（transcode 队列 worker_prefetch_multiplier=1，消息预取后
-宕机即丢失，Redis 队列里也不再存在），导致：
-
-- ingest_jobs.status 永久卡 pending/processing
-- assets.status 永久卡 processing/uploading（complete 阶段预建的占位）
-
-本模块提供纯核心（session 注入，便于单测）：超时阈值内无更新的记录
-批量标终态（job→failed、asset→error），并返回 (job_id, celery_task_id)
-列表供调用方 revoke + purge 残留队列消息。
-"""
-
-from __future__ import annotations
-
-import logging
-from datetime import datetime, timedelta, timezone
-from typing import Any, Callable
-
-logger = logging.getLogger(__name__)
-
-# ingest_job PROCESSING 超时阈值：ingest 任务包含下载 + ffprobe + HEVC 转码
-# （1GB 视频约 10-20 分钟）+ 回传 OSS，正常任务可能跑 20-30 分钟；
-# 60 分钟阈值覆盖大文件转码 + 抖动，绝不误杀正常任务。
-INGEST_PROCESSING_TIMEOUT_MINUTES = 60
-
-# ingest_job PENDING 超时阈值：transcode 队列 concurrency=1，队列积压时
-# 正常排队可能较久；90 分钟覆盖 worker 短暂停消费 + 排队。
-INGEST_PENDING_TIMEOUT_MINUTES = 90
-
-# Asset 占位超时阈值：无关联 ingest_job 的孤儿占位（complete 预建后派单失败等），
-# 阈值放宽到 120 分钟，避免与 ingest_job 生命周期错杀。
-ASSET_ORPHAN_TIMEOUT_MINUTES = 120
-
-_TERMINAL_JOB_STATUSES = ("failed", "completed")
-_TERMINAL_ASSET_STATUSES = ("ready", "error", "deleted")
-
-
-def _now() -> datetime:
-    return datetime.now(timezone.utc)
-
-
-def cleanup_stale_ingest_jobs(
-    session: Any,
-    *,
-    processing_timeout_minutes: int = INGEST_PROCESSING_TIMEOUT_MINUTES,
-    pending_timeout_minutes: int = INGEST_PENDING_TIMEOUT_MINUTES,
-    commit: bool = True,
-) -> tuple[list[tuple[str, str]], list[str]]:
-    """清理超时卡 pending/processing 的 ingest_jobs，并联动关联 asset。
-
-    Args:
-        session: SQLAlchemy session（或提供 query/commit 的鸭子类型）
-        processing_timeout_minutes: processing 状态超时阈值
-        pending_timeout_minutes: pending 状态超时阈值
-        commit: 是否提交事务
-
-    Returns:
-        (job_items, asset_ids)
-        - job_items: [(job_id, celery_task_id), ...] 供 revoke/purge
-        - asset_ids: 被联动标记为 error 的 asset id 列表
-    """
-    from packages.adapters.sqlalchemy_impl.models import AssetModel, IngestJobModel
-
-    now = _now()
-    processing_cutoff = now - timedelta(minutes=processing_timeout_minutes)
-    pending_cutoff = now - timedelta(minutes=pending_timeout_minutes)
-
-    stale_jobs = (
-        session.query(IngestJobModel)
-        .filter(
-            IngestJobModel.status.in_(["pending", "processing"]),
-            (
-                (IngestJobModel.status == "processing") & (IngestJobModel.updated_at < processing_cutoff)
-                | (IngestJobModel.status == "pending") & (IngestJobModel.created_at < pending_cutoff)
-            ),
-        )
-        .all()
-    )
-
-    job_items: list[tuple[str, str]] = []
-    asset_ids: list[str] = []
-    stale_asset_models: list[Any] = []
-    for job_model in stale_jobs:
-        ref_time = job_model.updated_at or job_model.created_at
-        if ref_time.tzinfo is None:  # SQLite 读回 naive datetime 的防御
-            ref_time = ref_time.replace(tzinfo=timezone.utc)
-        stale_minutes = int((now - ref_time).total_seconds() // 60)
-        job_model.status = "failed"
-        job_model.error_message = (
-            f"转码任务执行中断（超过超时阈值未更新，疑似 worker 重启/进程退出，已卡死 {stale_minutes} 分钟）"
-        )
-        job_model.updated_at = now
-        job_items.append((job_model.id, getattr(job_model, "celery_task_id", "") or ""))
-        if job_model.asset_id:
-            asset_ids.append(job_model.asset_id)
-
-    if asset_ids:
-        stale_asset_models = (
-            session.query(AssetModel)
-            .filter(
-                AssetModel.id.in_(asset_ids),
-                AssetModel.status.in_(["processing", "uploading"]),
-            )
-            .all()
-        )
-        for asset_model in stale_asset_models:
-            asset_model.status = "error"
-            asset_model.updated_at = now
-
-    if commit and (job_items or stale_asset_models):
-        session.commit()
-
-    if job_items:
-        logger.warning(
-            "[ingest-cleanup] 清理 %d 个超时 ingest_job（processing>%dm / pending>%dm），联动 %d 个 asset 标 error",
-            len(job_items),
-            processing_timeout_minutes,
-            pending_timeout_minutes,
-            len(stale_asset_models),
-        )
-    return job_items, [a.id for a in stale_asset_models]
-
-
-def cleanup_orphan_processing_assets(
-    session: Any,
-    *,
-    timeout_minutes: int = ASSET_ORPHAN_TIMEOUT_MINUTES,
-    commit: bool = True,
-) -> list[str]:
-    """清理无 ingest_job 关联、超时卡 processing/uploading 的孤儿 asset 占位。
-
-    complete 阶段预建 asset 后若派单失败（或 direct 上传 complete 后
-    未触发 ingest），占位会永久卡住。这类 asset 没有对应 ingest_job，
-    只能按 created_at 超时兜底标 error。
-    """
-    from packages.adapters.sqlalchemy_impl.models import AssetModel, IngestJobModel
-
-    cutoff = _now() - timedelta(minutes=timeout_minutes)
-    orphan_assets = (
-        session.query(AssetModel)
-        .outerjoin(IngestJobModel, IngestJobModel.asset_id == AssetModel.id)
-        .filter(
-            AssetModel.status.in_(["processing", "uploading"]),
-            AssetModel.created_at < cutoff,
-            IngestJobModel.id.is_(None),
-        )
-        .all()
-    )
-    for asset_model in orphan_assets:
-        asset_model.status = "error"
-        asset_model.updated_at = _now()
-    if commit and orphan_assets:
-        session.commit()
-        logger.warning("[ingest-cleanup] 清理 %d 个无 job 关联的超时孤儿 asset 占位", len(orphan_assets))
-    return [a.id for a in orphan_assets]
-
-
-def revoke_stale_ingest_messages(
-    job_items: list[tuple[str, str]],
-    *,
-    celery_app_factory: Callable[[], Any] | None = None,
-    broker_url_factory: Callable[[], str] | None = None,
-) -> int:
-    """revoke + 物理清理 ingest 作废消息（transcode/celery 队列）。
-
-    消息可能已在 worker 宕机时丢失（队列里查不到），那也无害；
-    若消息还在（极端重复投递），物理清除防止重投执行。
-    失败不阻断清理（ingest_asset 的执行前状态守卫是第二道防线）。
-    """
-    biz_ids = [jid for jid, _ in job_items if jid]
-    celery_ids = [cid for _, cid in job_items if cid]
-    if not biz_ids and not celery_ids:
-        return 0
-    try:
-        from packages.shared.celery_orphan_guard import revoke_and_purge
-
-        app = celery_app_factory() if celery_app_factory else None
-        broker_url = broker_url_factory() if broker_url_factory else ""
-        if app is None or not broker_url:
-            from worker_app.celery_app import celery_app as _app
-            from worker_app.core.config import get_settings
-
-            app = _app
-            broker_url = get_settings().broker_url
-        return revoke_and_purge(
-            app,
-            broker_url,
-            business_task_ids=biz_ids,
-            celery_task_ids=celery_ids,
-            queue_names=("transcode", "celery"),
-        )
-    except Exception as e:  # noqa: BLE001
-        logger.error("撤销作废 ingest 队列消息失败（执行前守卫仍会兜底）: %s", e, exc_info=True)
-        return 0
-
-
-# ── worker 启动恢复（#1714）──────────────────────────────────────────────
-#
-# task_acks_late=True 下，worker 崩溃/容器重启时未 ack 的消息理论上会在
-# visibility_timeout 到期后重新投递；但 prefork 进程异常、部署窗口跨
-# visibility 配置边界等场景仍可能留下卡在 processing 的 ingest_job
-# （staging 实证：03:16 派单、03:45 置 processing 后 worker 重启，
-# unacked 消息未重投，任务永久卡死）。启动时做一次显式恢复扫描兜底。
-#
-# 恢复策略：processing 超过 stuck_minutes（默认 10 分钟，部署中跨进程
-# 交接的正常窗口 < 10 分钟，不会误抢别的 worker 正在执行的任务）的 job，
-# CAS 重置为 pending 并重新 send_task；旧消息若后来重投，ingest_asset
-# 的执行前守卫会把状态不匹配的旧 celery 消息丢弃。
-
-
-def recover_stuck_ingest_jobs_on_startup(
-    session: Any,
-    *,
-    send_task: Callable[..., Any] | None = None,
-    update_celery_task_id: Callable[[str, str], None] | None = None,
-    lock_acquire: Callable[[], bool] | None = None,
-    stuck_minutes: int = 10,
-    commit: bool = True,
-) -> int:
-    """worker 启动时把卡在 processing 超时的 ingest_job 重新派单。
-
-    Args:
-        session: SQLAlchemy session
-        send_task: celery send_task 可调用（注入便于测试）；不传则用 worker celery_app
-        update_celery_task_id: 回写新 celery task id 的回调（job_id, new_task_id）
-        lock_acquire: 分布式锁获取回调（多 worker 进程同时启动时只允许一个恢复）；
-            返回 False 表示未抢到锁，本次跳过
-        stuck_minutes: processing 超过该分钟数视为卡死
-
-    Returns:
-        重新派单的 job 数
-    """
-    if lock_acquire is not None and not lock_acquire():
-        logger.info("[ingest-recover] 未抢到恢复锁，跳过（另一进程正在恢复）")
-        return 0
-
-    from packages.adapters.sqlalchemy_impl.models import IngestJobModel
-
-    cutoff = _now() - timedelta(minutes=stuck_minutes)
-    stuck_jobs = (
-        session.query(IngestJobModel)
-        .filter(IngestJobModel.status == "processing", IngestJobModel.updated_at < cutoff)
-        .order_by(IngestJobModel.updated_at.asc())
-        .all()
-    )
-
-    if not stuck_jobs:
-        logger.info("[ingest-recover] 无卡死 processing ingest_job 需要恢复")
-        return 0
-
-    if send_task is None:
-        from worker_app.celery_app import celery_app as _app
-
-        send_task = _app.send_task
-
-    recovered = 0
-    for job_model in stuck_jobs:
-        # CAS：只有仍是 processing 才重置（并发/旧消息已回写终态时不碰）
-        updated = (
-            session.query(IngestJobModel)
-            .filter(IngestJobModel.id == job_model.id, IngestJobModel.status == "processing")
-            .update({"status": "pending", "error_message": "", "updated_at": _now()})
-        )
-        if not updated:
-            continue
-        try:
-            result = send_task("worker.ingest_asset", args=[job_model.id])
-            new_task_id = getattr(result, "id", "") or ""
-        except Exception as e:  # noqa: BLE001
-            logger.error("[ingest-recover] 重新派单失败 job_id=%s: %s", job_model.id, e)
-            continue
-        if new_task_id:
-            job_model.celery_task_id = new_task_id
-            if update_celery_task_id is not None:
-                update_celery_task_id(job_model.id, new_task_id)
-        logger.warning(
-            "[ingest-recover] 卡死 ingest_job %s 已重置 pending 并重新派单 (new celery task=%s)",
-            job_model.id,
-            new_task_id,
-        )
-        recovered += 1
-
-    if commit and recovered:
-        session.commit()
-    logger.warning("[ingest-recover] 启动恢复完成，共重新派单 %d 个卡死 ingest_job", recovered)
-    return recovered
-
-
-def make_redis_recovery_lock(lock_key: str = "ingest:recover:startup", ttl_seconds: int = 300):
-    """构造基于 Redis SET NX 的恢复锁工厂（多 worker 进程互斥）。
-
-    返回一个无参 callable，调用时尝试抢锁：抢到返回 True，未抢到返回 False。
-    Redis 不可用时不阻断启动恢复（返回 True，恢复逻辑自身有 CAS 幂等保护）。
-    """
-
-    def _acquire() -> bool:
-        try:
-            import redis as redis_lib
-            from worker_app.core.config import get_settings
-
-            client = redis_lib.Redis.from_url(get_settings().broker_url)
-            return bool(client.set(lock_key, "1", nx=True, ex=ttl_seconds))
-        except Exception as e:  # noqa: BLE001
-            logger.warning("[ingest-recover] Redis 锁不可用，降级为无锁执行（CAS 兜底）: %s", e)
-            return True
-
-    return _acquire

packages/domain/entities.py

@@ -57,8 +57,6 @@ class User:
     phone: str | None = None
     phone_verified: bool = False
     binding_completed_at: datetime | None = None
-    # 资料是否已完善（微信新用户首次设置昵称后置 True；邮箱注册默认 True）
-    profile_completed: bool = True
 
     created_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 

tests/unit/test_asset_repo_fallback_dedup_1714.py

@@ -1,93 +0,0 @@
-"""#1714 find_recent_active_by_library_and_name 严格模式测试。
-
-file_size=0（未知）时必须返回 None（宁可漏判不可误杀）；
-大小严格匹配；只命中近期 UPLOADING/PROCESSING 记录。
-"""
-
-import sys
-from datetime import datetime, timedelta, timezone
-from pathlib import Path
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
-
-from sqlalchemy import create_engine  # noqa: E402
-from sqlalchemy.orm import sessionmaker  # noqa: E402
-
-from packages.adapters.sqlalchemy_impl.asset_repository import SQLAlchemyAssetRepository  # noqa: E402
-from packages.adapters.sqlalchemy_impl.models import Base  # noqa: E402
-from packages.domain import Asset, AssetStatus  # noqa: E402
-
-
-def _repository():
-    engine = create_engine("sqlite:///:memory:")
-    Base.metadata.create_all(engine)
-    session = sessionmaker(bind=engine)()
-    return SQLAlchemyAssetRepository(session)
-
-
-def _mk_asset(name="IMG_2285.MOV", file_size=5_000_000, status=AssetStatus.PROCESSING, minutes_ago=5):
-    asset = Asset.create(
-        project_id="proj-1",
-        library_id="lib-1",
-        name=name,
-        storage_key=f"uploads/x/{name}",
-        mime_type="video/quicktime",
-        file_size=file_size,
-    )
-    asset.status = status
-    asset.created_at = datetime.now(timezone.utc) - timedelta(minutes=minutes_ago)
-    return asset
-
-
-def test_returns_none_when_file_size_zero():
-    """file_size=0（大小未知）直接返回 None——不许仅凭同名 + processing 判重。"""
-    repo = _repository()
-    repo.create(_mk_asset(file_size=0))
-
-    result = repo.find_recent_active_by_library_and_name(library_id="lib-1", name="IMG_2285.MOV", file_size=0)
-    assert result is None
-
-
-def test_matches_when_name_size_strict_equal():
-    """同名 + 同大小 + processing 近期记录 → 命中。"""
-    repo = _repository()
-    repo.create(_mk_asset(file_size=5_000_000))
-
-    result = repo.find_recent_active_by_library_and_name(library_id="lib-1", name="IMG_2285.MOV", file_size=5_000_000)
-    assert result is not None
-    assert result.name == "IMG_2285.MOV"
-
-
-def test_no_match_when_same_name_but_different_size():
-    """同名但大小不同 → 不命中（内容全新的视频不能误杀）。"""
-    repo = _repository()
-    repo.create(_mk_asset(file_size=5_000_000))
-
-    result = repo.find_recent_active_by_library_and_name(library_id="lib-1", name="IMG_2285.MOV", file_size=9_999_999)
-    assert result is None
-
-
-def test_no_match_ready_history_even_with_same_size():
-    """READY 历史同名素材不命中（允许再次上传同名文件）。"""
-    repo = _repository()
-    repo.create(_mk_asset(file_size=5_000_000, status=AssetStatus.READY))
-
-    result = repo.find_recent_active_by_library_and_name(library_id="lib-1", name="IMG_2285.MOV", file_size=5_000_000)
-    assert result is None
-
-
-def test_no_match_when_window_expired():
-    """超过 30 分钟窗口的活动记录不命中。"""
-    repo = _repository()
-    repo.create(_mk_asset(file_size=5_000_000, minutes_ago=45))
-
-    result = repo.find_recent_active_by_library_and_name(
-        library_id="lib-1", name="IMG_2285.MOV", within_minutes=30, file_size=5_000_000
-    )
-    assert result is None
-
-
-def test_returns_none_when_name_empty():
-    repo = _repository()
-    result = repo.find_recent_active_by_library_and_name(library_id="lib-1", name="", file_size=100)
-    assert result is None

tests/unit/test_cleanup_ingest_beat_1714.py

@@ -1,75 +0,0 @@
-"""#1714 beat 任务 scheduled_cleanup_stale_ingest_jobs 薄封装测试。
-
-mock SessionLocal 和清理核心，验证 beat 任务正确串联
-cleanup_stale_ingest_jobs → cleanup_orphan_processing_assets → revoke 消息。
-"""
-
-from __future__ import annotations
-
-import os
-import sys
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret")
-os.environ.setdefault("DATABASE_URL", "sqlite:///test_beat.db")
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "worker"))
-sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
-sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
-
-import worker_app.tasks.cleanup as cleanup  # noqa: E402
-
-
-def test_beat_cleanup_calls_core_and_revokes():
-    """beat 任务串联三个核心步骤，返回汇总计数。"""
-    fake_session = MagicMock()
-
-    with (
-        patch("worker_app.db.SessionLocal", return_value=fake_session) as m_db,
-        patch(
-            "packages.application.ingest_orphan_cleanup.cleanup_stale_ingest_jobs",
-            return_value=([("job-1", "cel-1"), ("job-2", "")], ["a-1"]),
-        ) as m_jobs,
-        patch(
-            "packages.application.ingest_orphan_cleanup.cleanup_orphan_processing_assets",
-            return_value=["a-2"],
-        ) as m_assets,
-        patch(
-            "packages.shared.celery_orphan_guard.revoke_and_purge",
-            return_value=1,
-        ) as m_revoke,
-    ):
-        result = cleanup.scheduled_cleanup_stale_ingest_jobs()
-
-    m_db.assert_called_once()
-    m_jobs.assert_called_once()
-    assert m_jobs.call_args.kwargs["processing_timeout_minutes"] == 60
-    m_assets.assert_called_once()
-    m_revoke.assert_called_once()
-    # 队列名只传 transcode/celery（不传 generation）
-    assert m_revoke.call_args.kwargs["queue_names"] == ("transcode", "celery")
-    fake_session.close.assert_called_once()
-    assert result == {"stale_jobs": 2, "assets_to_error": 2, "purged_messages": 1}
-
-
-def test_beat_cleanup_no_op_when_nothing_stale():
-    """无孤儿时不调 revoke，返回全 0。"""
-    fake_session = MagicMock()
-
-    with (
-        patch("worker_app.db.SessionLocal", return_value=fake_session),
-        patch(
-            "packages.application.ingest_orphan_cleanup.cleanup_stale_ingest_jobs",
-            return_value=([], []),
-        ),
-        patch(
-            "packages.application.ingest_orphan_cleanup.cleanup_orphan_processing_assets",
-            return_value=[],
-        ),
-        patch("packages.shared.celery_orphan_guard.revoke_and_purge") as m_revoke,
-    ):
-        result = cleanup.scheduled_cleanup_stale_ingest_jobs()
-
-    m_revoke.assert_not_called()
-    assert result == {"stale_jobs": 0, "assets_to_error": 0, "purged_messages": 0}

tests/unit/test_ingest_orphan_cleanup_1714.py

@@ -1,262 +0,0 @@
-"""#1714 上传/转码链路（IngestJob + Asset）孤儿清理测试。
-
-场景：worker 容器重启/进程 OOM 时，已 prefetch 的 transcode celery 消息丢失，
-ingest_job 永久卡 pending/processing、asset 永久卡 processing/uploading。
-"""
-
-from __future__ import annotations
-
-import os
-import sys
-from datetime import datetime, timedelta, timezone
-from pathlib import Path
-
-import pytest
-
-os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret")
-os.environ.setdefault("DATABASE_URL", "sqlite:///test_ingest_orphan.db")
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "worker"))
-sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
-sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
-
-from sqlalchemy import create_engine  # noqa: E402
-from sqlalchemy.orm import sessionmaker  # noqa: E402
-
-from packages.adapters.sqlalchemy_impl.models import AssetModel, Base, IngestJobModel  # noqa: E402
-from packages.application.ingest_orphan_cleanup import (  # noqa: E402
-    cleanup_orphan_processing_assets,
-    cleanup_stale_ingest_jobs,
-)
-
-
-@pytest.fixture()
-def session():
-    engine = create_engine("sqlite:///:memory:")
-    Base.metadata.create_all(bind=engine)
-    Session = sessionmaker(bind=engine)
-    db = Session()
-    yield db
-    db.close()
-
-
-def _mk_job(session, *, status="processing", celery_task_id="cel-1", asset_id="a-1", minutes_ago=90):
-    now = datetime.now(timezone.utc)
-    job = IngestJobModel(
-        id=f"job-{minutes_ago}-{status}-{celery_task_id}",
-        project_id="p-1",
-        library_id="lib-1",
-        storage_key="uploads/x/IMG_2285.MOV",
-        status=status,
-        asset_id=asset_id,
-        celery_task_id=celery_task_id,
-        created_at=now - timedelta(minutes=minutes_ago),
-        updated_at=now - timedelta(minutes=minutes_ago),
-    )
-    session.add(job)
-    session.commit()
-    return job
-
-
-def _mk_asset(session, *, id="a-1", status="processing", minutes_ago=90, file_size=0):
-    now = datetime.now(timezone.utc)
-    asset = AssetModel(
-        id=id,
-        project_id="p-1",
-        asset_library_id="lib-1",
-        name="IMG_2285.MOV",
-        file_type="video",
-        file_size=file_size,
-        file_url="https://example.com/x.mov",
-        storage_key="uploads/x/IMG_2285.MOV",
-        status=status,
-        uploaded_by_user_id="u-1",
-        created_at=now - timedelta(minutes=minutes_ago),
-        updated_at=now - timedelta(minutes=minutes_ago),
-    )
-    session.add(asset)
-    session.commit()
-    return asset
-
-
-class TestCleanupStaleIngestJobs:
-    def test_stale_processing_job_marked_failed_and_asset_to_error(self, session):
-        """processing 超 60 分钟 → job failed，关联 processing asset → error。"""
-        _mk_asset(session, id="a-1", status="processing")
-        _mk_job(session, status="processing", celery_task_id="cel-dead", asset_id="a-1", minutes_ago=90)
-
-        items, asset_ids = cleanup_stale_ingest_jobs(session, processing_timeout_minutes=60, pending_timeout_minutes=90)
-
-        assert len(items) == 1
-        assert items[0] == ("job-90-processing-cel-dead", "cel-dead")
-        assert asset_ids == ["a-1"]
-        db_job = session.query(IngestJobModel).one()
-        assert db_job.status == "failed"
-        assert "中断" in db_job.error_message
-        db_asset = session.query(AssetModel).one()
-        assert db_asset.status == "error"
-
-    def test_stale_pending_job_marked_failed(self, session):
-        """pending 超 90 分钟（从未被消费）→ job failed。"""
-        _mk_asset(session, id="a-2", status="uploading")
-        _mk_job(session, status="pending", celery_task_id="", asset_id="a-2", minutes_ago=120)
-
-        items, asset_ids = cleanup_stale_ingest_jobs(session, processing_timeout_minutes=60, pending_timeout_minutes=90)
-
-        assert len(items) == 1
-        assert items[0][1] == ""  # 无 celery task id
-        assert session.query(IngestJobModel).one().status == "failed"
-        assert session.query(AssetModel).one().status == "error"
-
-    def test_recent_processing_job_not_touched(self, session):
-        """processing 仅 10 分钟（正常转码中）→ 不误杀。"""
-        _mk_asset(session, id="a-3", status="processing", minutes_ago=10)
-        _mk_job(session, status="processing", celery_task_id="cel-live", asset_id="a-3", minutes_ago=10)
-
-        items, asset_ids = cleanup_stale_ingest_jobs(session, processing_timeout_minutes=60, pending_timeout_minutes=90)
-
-        assert items == []
-        assert asset_ids == []
-        assert session.query(IngestJobModel).one().status == "processing"
-        assert session.query(AssetModel).one().status == "processing"
-
-    def test_recent_pending_job_not_touched(self, session):
-        """pending 仅 30 分钟（队列积压排队中）→ 不误杀。"""
-        _mk_job(session, status="pending", asset_id="", minutes_ago=30)
-
-        items, _ = cleanup_stale_ingest_jobs(session, processing_timeout_minutes=60, pending_timeout_minutes=90)
-
-        assert items == []
-        assert session.query(IngestJobModel).one().status == "pending"
-
-    def test_terminal_job_not_touched(self, session):
-        """已 completed/failed 的 job 不动。"""
-        _mk_job(session, status="completed", celery_task_id="", asset_id="", minutes_ago=999)
-        _mk_job(session, status="failed", celery_task_id="", asset_id="", minutes_ago=999)
-
-        items, _ = cleanup_stale_ingest_jobs(session)
-
-        assert items == []
-        statuses = sorted(j.status for j in session.query(IngestJobModel).all())
-        assert statuses == ["completed", "failed"]
-
-    def test_ready_asset_not_demoted(self, session):
-        """关联 asset 已是 ready（转码其实成功了，仅 job 回写失败）→ 不降级为 error。"""
-        _mk_asset(session, id="a-4", status="ready")
-        _mk_job(session, status="processing", celery_task_id="cel-x", asset_id="a-4", minutes_ago=90)
-
-        _, asset_ids = cleanup_stale_ingest_jobs(session)
-
-        assert asset_ids == []  # ready 不动
-        assert session.query(AssetModel).one().status == "ready"
-
-
-class TestCleanupOrphanProcessingAssets:
-    def test_orphan_asset_without_job_marked_error(self, session):
-        """无 ingest_job 关联、created 超 120 分钟的 processing 占位 → error。"""
-        _mk_asset(session, id="orphan-1", status="processing", minutes_ago=150)
-
-        ids = cleanup_orphan_processing_assets(session, timeout_minutes=120)
-
-        assert ids == ["orphan-1"]
-        assert session.query(AssetModel).one().status == "error"
-
-    def test_asset_with_active_job_not_touched(self, session):
-        """有 processing job 关联的 asset 不由本函数处理（归 cleanup_stale_ingest_jobs）。"""
-        _mk_asset(session, id="a-5", status="processing", minutes_ago=150)
-        _mk_job(session, status="processing", asset_id="a-5", minutes_ago=150)
-
-        ids = cleanup_orphan_processing_assets(session, timeout_minutes=120)
-
-        assert ids == []
-        assert session.query(AssetModel).one().status == "processing"
-
-    def test_recent_orphan_asset_not_touched(self, session):
-        """无 job 但才创建 30 分钟 → 可能 complete 刚建、job 派单中，不动。"""
-        _mk_asset(session, id="orphan-2", status="processing", minutes_ago=30)
-
-        ids = cleanup_orphan_processing_assets(session, timeout_minutes=120)
-
-        assert ids == []
-        assert session.query(AssetModel).one().status == "processing"
-
-
-class TestRecoverStuckIngestJobsOnStartup:
-    def test_stuck_processing_job_requeued(self, session):
-        """processing 超 10 分钟 → 重置 pending 并重新 send_task，回写新 celery id。"""
-        from types import SimpleNamespace
-
-        from packages.application.ingest_orphan_cleanup import recover_stuck_ingest_jobs_on_startup
-
-        job = _mk_job(session, status="processing", celery_task_id="old-cel-1", asset_id="a-1", minutes_ago=30)
-
-        sent = []
-
-        def fake_send_task(name, args=None, **kw):
-            sent.append((name, args))
-            return SimpleNamespace(id="new-cel-9")
-
-        updated_ids = []
-        recovered = recover_stuck_ingest_jobs_on_startup(
-            session,
-            send_task=fake_send_task,
-            update_celery_task_id=lambda jid, cid: updated_ids.append((jid, cid)),
-            stuck_minutes=10,
-        )
-
-        assert recovered == 1
-        assert sent == [("worker.ingest_asset", [job.id])]
-        refreshed = session.query(IngestJobModel).filter_by(id=job.id).one()
-        assert refreshed.status == "pending"
-        assert refreshed.celery_task_id == "new-cel-9"
-        assert updated_ids == [(job.id, "new-cel-9")]
-
-    def test_recent_processing_job_not_touched(self, session):
-        """processing 仅 5 分钟（正常转码中/部署交接窗口）→ 不抢。"""
-        from packages.application.ingest_orphan_cleanup import recover_stuck_ingest_jobs_on_startup
-
-        _mk_job(session, status="processing", celery_task_id="live", asset_id="", minutes_ago=5)
-
-        sent = []
-        recovered = recover_stuck_ingest_jobs_on_startup(
-            session,
-            send_task=lambda *a, **k: sent.append(a),
-            stuck_minutes=10,
-        )
-
-        assert recovered == 0
-        assert sent == []
-        assert session.query(IngestJobModel).one().status == "processing"
-
-    def test_lock_not_acquired_skips(self, session):
-        """未抢到分布式锁（另一 worker 正在恢复）→ 跳过。"""
-        from packages.application.ingest_orphan_cleanup import recover_stuck_ingest_jobs_on_startup
-
-        _mk_job(session, status="processing", celery_task_id="x", asset_id="", minutes_ago=30)
-
-        recovered = recover_stuck_ingest_jobs_on_startup(
-            session,
-            send_task=lambda *a, **k: None,
-            lock_acquire=lambda: False,
-            stuck_minutes=10,
-        )
-
-        assert recovered == 0
-        assert session.query(IngestJobModel).one().status == "processing"
-
-    def test_pending_and_terminal_not_requeued(self, session):
-        """pending/已终态 job 不在恢复范围。"""
-        from packages.application.ingest_orphan_cleanup import recover_stuck_ingest_jobs_on_startup
-
-        _mk_job(session, status="pending", celery_task_id="", asset_id="", minutes_ago=60)
-        _mk_job(session, status="failed", celery_task_id="", asset_id="", minutes_ago=60)
-
-        recovered = recover_stuck_ingest_jobs_on_startup(
-            session,
-            send_task=lambda *a, **k: None,
-            stuck_minutes=10,
-        )
-
-        assert recovered == 0
-        statuses = sorted(j.status for j in session.query(IngestJobModel).all())
-        assert statuses == ["failed", "pending"]

tests/unit/test_patch_me_profile_1718.py

@@ -1,222 +0,0 @@
-"""#1718：PATCH /auth/me 资料更新接口测试。
-
-覆盖：
-- 正常更新昵称并落库
-- strip 生效（前后空白去除）
-- 纯空白/超长 -> 422（pydantic 校验）
-- 首次设置昵称 profile_completed False->True
-- 已完成用户重复提交幂等（仍 True）
-- 未登录由 get_current_user 依赖保证 401（框架行为，这里验证路由声明了该依赖）
-- 响应结构 {user: {...}} 含 wechat_bound/profile_completed 全字段
-- 微信新建用户 profile_completed 默认 False（wechat_sync _create_wechat_user）
-"""
-
-from __future__ import annotations
-
-import asyncio
-import os
-import sys
-from pathlib import Path
-from types import SimpleNamespace
-from unittest.mock import MagicMock
-
-import pytest
-from pydantic import ValidationError
-
-os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
-os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
-
-from app.api.routes import auth as auth_route  # noqa: E402
-
-from packages.adapters.in_memory.user_repository import InMemoryUserRepository  # noqa: E402
-from packages.domain.entities import User  # noqa: E402
-
-
-def _auth_user(user):
-    return SimpleNamespace(user=user, session_id="s-1", token_type="user_auth")
-
-
-def _make_user(**kw):
-    defaults = dict(
-        id="u-1",
-        email="user@example.com",
-        username="user",
-        display_name="微信用户",
-        password_hash="x",
-        email_verified=True,
-        profile_completed=False,
-    )
-    defaults.update(kw)
-    return User(**defaults)
-
-
-# ---------- 请求体校验 ----------
-
-
-def test_display_name_strips_whitespace():
-    req = auth_route.UpdateProfileRequest(display_name="  ying123  ")
-    assert req.display_name == "ying123"
-
-
-def test_display_name_blank_rejected():
-    with pytest.raises(ValidationError) as exc:
-        auth_route.UpdateProfileRequest(display_name="    ")
-    assert "空白" in str(exc.value)
-
-
-def test_display_name_empty_rejected():
-    with pytest.raises(ValidationError):
-        auth_route.UpdateProfileRequest(display_name="")
-
-
-def test_display_name_too_long_rejected():
-    with pytest.raises(ValidationError) as exc:
-        auth_route.UpdateProfileRequest(display_name="甲" * 21)
-    assert "1-20" in str(exc.value)
-
-
-def test_display_name_max_length_accepted():
-    req = auth_route.UpdateProfileRequest(display_name="甲" * 20)
-    assert req.display_name == "甲" * 20
-
-
-# ---------- 路由逻辑 ----------
-
-
-def test_patch_me_updates_display_name_and_persists():
-    user = _make_user()
-    repo = InMemoryUserRepository()
-    repo.save(user)
-
-    resp = asyncio.run(
-        auth_route.update_current_user_profile(
-            auth_route.UpdateProfileRequest(display_name="  ying123 "),
-            current_user=_auth_user(user),
-            user_repository=repo,
-        )
-    )
-    assert resp.user.display_name == "ying123"
-    assert resp.user.profile_completed is True
-    assert resp.user.wechat_bound is False
-    # 落库验证
-    fresh = repo.find_by_id("u-1")
-    assert fresh.display_name == "ying123"
-    assert fresh.profile_completed is True
-
-
-def test_patch_me_first_time_sets_profile_completed_true():
-    user = _make_user(profile_completed=False)
-    repo = InMemoryUserRepository()
-    repo.save(user)
-    assert repo.find_by_id("u-1").profile_completed is False
-
-    asyncio.run(
-        auth_route.update_current_user_profile(
-            auth_route.UpdateProfileRequest(display_name="小虾"),
-            current_user=_auth_user(user),
-            user_repository=repo,
-        )
-    )
-    assert repo.find_by_id("u-1").profile_completed is True
-
-
-def test_patch_me_idempotent_for_completed_user():
-    user = _make_user(display_name="老名字", profile_completed=True)
-    repo = InMemoryUserRepository()
-    repo.save(user)
-
-    resp = asyncio.run(
-        auth_route.update_current_user_profile(
-            auth_route.UpdateProfileRequest(display_name="新名字"),
-            current_user=_auth_user(user),
-            user_repository=repo,
-        )
-    )
-    assert resp.user.profile_completed is True
-    assert resp.user.display_name == "新名字"
-    # 再提交一次同样内容，不报错、状态稳定
-    resp2 = asyncio.run(
-        auth_route.update_current_user_profile(
-            auth_route.UpdateProfileRequest(display_name="新名字"),
-            current_user=_auth_user(repo.find_by_id("u-1")),
-            user_repository=repo,
-        )
-    )
-    assert resp2.user.profile_completed is True
-
-
-def test_patch_me_response_contains_all_me_fields():
-    user = _make_user(wechat_openid="wx-1", phone="13800000000", phone_verified=True)
-    repo = InMemoryUserRepository()
-    repo.save(user)
-
-    resp = asyncio.run(
-        auth_route.update_current_user_profile(
-            auth_route.UpdateProfileRequest(display_name="昵称"),
-            current_user=_auth_user(user),
-            user_repository=repo,
-        )
-    )
-    payload = resp.user.model_dump()
-    for field in (
-        "user_id",
-        "email",
-        "username",
-        "display_name",
-        "email_verified",
-        "phone",
-        "phone_verified",
-        "binding_complete",
-        "wechat_bound",
-        "profile_completed",
-    ):
-        assert field in payload, f"missing field {field}"
-    assert payload["wechat_bound"] is True
-    assert payload["phone"] == "13800000000"
-
-
-def test_get_me_includes_profile_completed_flag():
-    # 未完成
-    u = _make_user(profile_completed=False)
-    resp = asyncio.run(auth_route.get_current_user_info(authenticated_user=_auth_user(u)))
-    assert resp.profile_completed is False
-    assert resp.wechat_bound is False
-
-    # 已完成 + 已绑微信
-    u2 = _make_user(profile_completed=True, wechat_openid="wx-9")
-    resp2 = asyncio.run(auth_route.get_current_user_info(authenticated_user=_auth_user(u2)))
-    assert resp2.profile_completed is True
-    assert resp2.wechat_bound is True
-
-
-def test_patch_me_requires_auth_dependency():
-    # 路由签名必须依赖 get_current_user，未携带 token 时框架返回 401
-    params = (
-        auth_route.update_current_user_profile.__wrapped__
-        if hasattr(auth_route.update_current_user_profile, "__wrapped__")
-        else auth_route.update_current_user_profile
-    )
-    import inspect
-
-    sig = inspect.signature(params)
-    dep = sig.parameters.get("current_user")
-    assert dep is not None
-    assert dep.default is not None and getattr(dep.default, "dependency", None) is auth_route.get_current_user
-
-
-def test_wechat_new_user_created_with_profile_completed_false():
-    # 微信同步建号：新用户 profile_completed=False（需引导设置昵称）
-    from packages.application.auth.wechat_sync_use_case import (
-        WechatSyncRequest,
-        WechatSyncUseCase,
-    )
-
-    repo = InMemoryUserRepository()
-    # session_store 用 mock，不依赖 redis
-    use_case = WechatSyncUseCase(user_repository=repo, session_store=MagicMock(), jwt_secret_key="test-secret")
-    resp, err = use_case.execute(WechatSyncRequest(openid="wx-new-openid", nickname="微信测试", source="web"))
-    assert err is None
-    user = repo.find_by_id(resp.user_id)
-    assert user.profile_completed is False

tests/unit/test_prepare_dedup_1714.py

@@ -1,471 +0,0 @@
-"""#1714 prepare_direct_upload 去重 + 预建 asset 测试。
-
-覆盖 4 类用例：
-- 第一次上传：prepare 返回 duplicated=false + asset_id 非空
-- 第二次同 hash：prepare 返回 duplicated=true, skip_transfer=true
-- 同 client_upload_id 重试：prepare 也直接跳过
-- file_hash 空：走老逻辑，duplicated=false，无 asset_id
-
-以及：
-- pre-create 的 PROCESSING 占位不被"文件名兜底去重"误命中
-- _create_pending_asset find-or-create 复用现有记录
-"""
-
-from __future__ import annotations
-
-import os
-import sys
-from pathlib import Path
-from types import SimpleNamespace
-from unittest.mock import MagicMock
-
-import pytest
-
-os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret")
-os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
-sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
-
-from apps.api.app.api.routes import upload as upload_route  # noqa: E402
-from packages.domain.entities import Asset, AssetLibrary, AssetLibraryKind, AssetStatus, Project  # noqa: E402
-
-# ---------------------------------------------------------------------------
-# Fake repository
-# ---------------------------------------------------------------------------
-
-
-class _FakeAssetRepo:
-    """内存 asset 仓储：实现 prepare/complete 去重需要的所有方法。"""
-
-    def __init__(self):
-        self.assets = {}  # id -> Asset
-        self.saved = 0
-        self.updated = 0
-
-    def create(self, asset):
-        self.assets[asset.id] = asset
-        self.saved += 1
-        return asset
-
-    def update(self, asset):
-        self.assets[asset.id] = asset
-        self.updated += 1
-        return asset
-
-    def find_by_id(self, asset_id):
-        return self.assets.get(asset_id)
-
-    def find_by_library_and_file_hash(self, library_id, file_hash):
-        if not file_hash:
-            return None
-        for a in self.assets.values():
-            if a.library_id == library_id and a.file_hash == file_hash:
-                return a
-        return None
-
-    def find_by_library_and_client_upload_id(self, library_id, client_upload_id):
-        if not client_upload_id:
-            return None
-        for a in self.assets.values():
-            if a.library_id == library_id and a.client_upload_id == client_upload_id:
-                return a
-        return None
-
-    def find_recent_active_by_library_and_name(self, library_id, name, within_minutes=30, file_size=0):
-        return None
-
-
-def _make_asset(**kw):
-    defaults = dict(
-        project_id="p-1",
-        library_id="lib-1",
-        name="existing.mp4",
-        storage_key="uploads/old/existing.mp4",
-        mime_type="video/mp4",
-        status=AssetStatus.READY,
-        file_hash="existinghash",
-    )
-    defaults.update(kw)
-    return Asset(id=defaults.pop("id", "existing-asset"), **defaults)
-
-
-def _make_pending(**kw):
-    defaults = dict(
-        project_id="p-1",
-        library_id="lib-1",
-        name="test.mp4",
-        storage_key="uploads/abc/test.mp4",
-        mime_type="video/mp4",
-        status=AssetStatus.PROCESSING,
-        file_hash="abc123",
-    )
-    defaults.update(kw)
-    return Asset(id=defaults.pop("id", "pending-asset"), **defaults)
-
-
-def _user():
-    return SimpleNamespace(user=SimpleNamespace(id="user-1"), session_id="s", token_type="t")
-
-
-class _StubProjectRepo:
-    def __init__(self, project):
-        self._p = project
-
-    def get(self, pid):
-        return self._p if self._p.id == pid else None
-
-    def find_by_id(self, pid):
-        return self._p if self._p.id == pid else None
-
-
-class _StubLibraryRepo:
-    def __init__(self, lib):
-        self._lib = lib
-
-    def find_by_project(self, pid, kind=None):
-        if self._lib.project_id == pid:
-            return [self._lib]
-        return []
-
-
-_FIXTURE_PROJECT = Project(id="p-1", owner_user_id="user-1", name="proj", description="")
-_FIXTURE_LIBRARY = AssetLibrary(
-    id="lib-1", project_id="p-1", name="videos", kind=AssetLibraryKind.VIDEO, asset_count=0, total_size=0
-)
-
-
-def _storage():
-    s = MagicMock()
-    s.create_direct_upload_post.return_value = {
-        "url": "https://bucket.oss.example.com",
-        "method": "POST",
-        "storage_key": "uploads/abc/test.mp4",
-        "expires_at": "2026-01-01T00:00:00Z",
-        "fields": {"key": "uploads/abc/test.mp4"},
-    }
-    return s
-
-
-# ---------------------------------------------------------------------------
-# 场景 1：第一次上传（无 file_hash）
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_prepare_first_upload_no_hash_returns_no_dedup():
-    repo = _FakeAssetRepo()
-    req = SimpleNamespace(
-        project_id="p-1",
-        library_id="lib-1",
-        filename="test.mp4",
-        content_type="video/mp4",
-        file_size=1024,
-        file_hash="",
-        client_upload_id="",
-    )
-    resp = await upload_route.prepare_direct_upload(
-        request=req,
-        authenticated_user=_user(),
-        project_repository=_StubProjectRepo(_FIXTURE_PROJECT),
-        asset_library_repository=_StubLibraryRepo(_FIXTURE_LIBRARY),
-        asset_repository=repo,
-        storage_service=_storage(),
-    )
-    assert resp.duplicated is False
-    assert resp.skip_transfer is False
-    assert resp.asset_id == ""  # file_hash 空，不预建
-    assert repo.saved == 0
-
-
-# ---------------------------------------------------------------------------
-# 场景 2：第一次上传带 file_hash → duplicated=false + asset_id 非空
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_prepare_first_upload_with_hash_creates_pending():
-    repo = _FakeAssetRepo()
-    req = SimpleNamespace(
-        project_id="p-1",
-        library_id="lib-1",
-        filename="test.mp4",
-        content_type="video/mp4",
-        file_size=1024,
-        file_hash="abc123",
-        client_upload_id="",
-    )
-    resp = await upload_route.prepare_direct_upload(
-        request=req,
-        authenticated_user=_user(),
-        project_repository=_StubProjectRepo(_FIXTURE_PROJECT),
-        asset_library_repository=_StubLibraryRepo(_FIXTURE_LIBRARY),
-        asset_repository=repo,
-        storage_service=_storage(),
-    )
-    assert resp.duplicated is False
-    assert resp.skip_transfer is False
-    assert resp.asset_id != ""
-    # 预建记录确实落库
-    assert repo.saved == 1
-    pending = repo.find_by_id(resp.asset_id)
-    assert pending is not None
-    assert pending.file_hash == "abc123"
-    assert pending.status == AssetStatus.PROCESSING
-
-
-# ---------------------------------------------------------------------------
-# 场景 3：第二次同 hash → duplicated=true, skip_transfer=true
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_prepare_second_upload_same_hash_returns_duplicated():
-    repo = _FakeAssetRepo()
-    repo.create(_make_pending(file_hash="abc123", id="existing-asset"))
-    req = SimpleNamespace(
-        project_id="p-1",
-        library_id="lib-1",
-        filename="test.mp4",
-        content_type="video/mp4",
-        file_size=1024,
-        file_hash="abc123",
-        client_upload_id="",
-    )
-    resp = await upload_route.prepare_direct_upload(
-        request=req,
-        authenticated_user=_user(),
-        project_repository=_StubProjectRepo(_FIXTURE_PROJECT),
-        asset_library_repository=_StubLibraryRepo(_FIXTURE_LIBRARY),
-        asset_repository=repo,
-        storage_service=_storage(),
-    )
-    assert resp.duplicated is True
-    assert resp.skip_transfer is True
-    assert resp.asset_id == "existing-asset"
-    assert resp.upload_url == ""  # 未签名 OSS
-    # 未新增记录
-    assert repo.saved == 1  # 只有初始那条
-
-
-# ---------------------------------------------------------------------------
-# 场景 4：同 client_upload_id 重试 → 直接跳过
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_prepare_retry_same_client_upload_id_skips():
-    repo = _FakeAssetRepo()
-    repo.create(
-        _make_pending(
-            file_hash="abc123",
-            client_upload_id="cuid-xyz",
-            id="existing-asset",
-        )
-    )
-    # 即使 file_hash 不同（理论上不会），client_upload_id 命中也直接跳过
-    req = SimpleNamespace(
-        project_id="p-1",
-        library_id="lib-1",
-        filename="test.mp4",
-        content_type="video/mp4",
-        file_size=1024,
-        file_hash="different-hash",
-        client_upload_id="cuid-xyz",
-    )
-    resp = await upload_route.prepare_direct_upload(
-        request=req,
-        authenticated_user=_user(),
-        project_repository=_StubProjectRepo(_FIXTURE_PROJECT),
-        asset_library_repository=_StubLibraryRepo(_FIXTURE_LIBRARY),
-        asset_repository=repo,
-        storage_service=_storage(),
-    )
-    assert resp.duplicated is True
-    assert resp.skip_transfer is True
-    assert resp.asset_id == "existing-asset"
-
-
-# ---------------------------------------------------------------------------
-# 兜底：文件名兜底去重不误命中 PROCESSING 占位
-# ---------------------------------------------------------------------------
-
-
-def test_filename_fallback_does_not_match_processing_pending():
-    """_find_duplicate_asset 按文件名兜底时，不能命中 pre-create 的 PROCESSING 记录。"""
-    repo = _FakeAssetRepo()
-    repo.create(_make_pending(id="p1"))
-    result = upload_route._find_duplicate_asset(
-        repo,
-        library_id="lib-1",
-        file_hash="",  # 无 hash
-        client_upload_id="",  # 无 cuid
-        filename="test.mp4",  # 同名
-        file_size=1024,
-    )
-    assert result is None  # PROCESSING 占位不被兜底命中
-
-
-def test_filename_fallback_matches_stable_ready_record():
-    """READY 状态的已存在记录能被文件名兜底命中。"""
-    repo = _FakeAssetRepo()
-    repo.create(_make_asset(status=AssetStatus.READY, id="ready-asset"))
-    # 伪造 find_recent_active_by_library_and_name 返回 READY 记录
-    repo.find_recent_active_by_library_and_name = lambda **kw: repo.assets["ready-asset"]
-    result = upload_route._find_duplicate_asset(
-        repo,
-        library_id="lib-1",
-        file_hash="",
-        client_upload_id="",
-        filename="existing.mp4",
-        file_size=1024,
-    )
-    assert result is not None
-    assert result.id == "ready-asset"
-
-
-# ---------------------------------------------------------------------------
-# _create_pending_asset find-or-create
-# ---------------------------------------------------------------------------
-
-
-def test_create_pending_asset_reuses_existing_by_hash():
-    """_create_pending_asset：file_hash 命中现有 PROCESSING 记录则复用，不新建。"""
-    repo = _FakeAssetRepo()
-    repo.create(_make_pending(file_hash="abc123", client_upload_id="", id="p1"))
-    # 复用
-    result = upload_route._create_pending_asset(
-        asset_repository=repo,
-        project_id="p-1",
-        library_id="lib-1",
-        storage_key="uploads/new/test.mp4",
-        filename="test.mp4",
-        mime_type="video/mp4",
-        user_id="user-1",
-        file_hash="abc123",
-        client_upload_id="cuid-new",
-    )
-    assert result.id == "p1"
-    assert repo.saved == 1  # 没新增
-    assert repo.updated >= 1  # 字段补齐触发 update
-    assert result.client_upload_id == "cuid-new"
-
-
-def test_create_pending_asset_creates_when_no_match():
-    """无匹配时正常新建。"""
-    repo = _FakeAssetRepo()
-    result = upload_route._create_pending_asset(
-        asset_repository=repo,
-        project_id="p-1",
-        library_id="lib-1",
-        storage_key="uploads/new/test.mp4",
-        filename="test.mp4",
-        mime_type="video/mp4",
-        user_id="user-1",
-        file_hash="newhash",
-        client_upload_id="newcuid",
-    )
-    assert result.id != ""
-    assert result.file_hash == "newhash"
-    assert result.client_upload_id == "newcuid"
-    assert repo.saved == 1
-
-
-# ---------------------------------------------------------------------------
-# 兜底去重：PROCESSING 占位 hash 不同时跳过
-# ---------------------------------------------------------------------------
-
-
-def test_filename_fallback_skips_processing_with_different_hash():
-    """PROCESSING/UPLOADING 占位记录仅当 hash 一致（或占位无 hash）才命中；hash 不同跳过。"""
-    repo = _FakeAssetRepo()
-    repo.create(_make_pending(id="p1", file_hash="oldhash"))
-    repo.find_recent_active_by_library_and_name = lambda **kw: repo.assets["p1"]
-    result = upload_route._find_duplicate_asset(
-        repo,
-        library_id="lib-1",
-        file_hash="differenthash",  # 新上传内容不同
-        client_upload_id="",
-        filename="test.mp4",
-        file_size=1024,
-    )
-    assert result is None
-
-
-def test_filename_fallback_matches_processing_with_same_hash():
-    """PROCESSING 占位 hash 与请求一致时命中（重试场景）。"""
-    repo = _FakeAssetRepo()
-    repo.create(_make_pending(id="p1", file_hash="samehash"))
-    repo.find_recent_active_by_library_and_name = lambda **kw: repo.assets["p1"]
-    result = upload_route._find_duplicate_asset(
-        repo,
-        library_id="lib-1",
-        file_hash="samehash",
-        client_upload_id="",
-        filename="test.mp4",
-        file_size=1024,
-    )
-    assert result is not None
-    assert result.id == "p1"
-
-
-# ---------------------------------------------------------------------------
-# prepare 预建失败降级：不阻塞签名
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_prepare_pending_asset_create_failure_degrades_gracefully():
-    """预建 asset 抛异常时，prepare 仍正常返回签名（duplicated=False, asset_id 空）。"""
-
-    class _BrokenRepo(_FakeAssetRepo):
-        def create(self, asset):
-            raise RuntimeError("db down")
-
-    repo = _BrokenRepo()
-    req = SimpleNamespace(
-        project_id="p-1",
-        library_id="lib-1",
-        filename="test.mp4",
-        content_type="video/mp4",
-        file_size=1024,
-        file_hash="abc123",
-        client_upload_id="cuid-1",
-    )
-    resp = await upload_route.prepare_direct_upload(
-        request=req,
-        authenticated_user=_user(),
-        project_repository=_StubProjectRepo(_FIXTURE_PROJECT),
-        asset_library_repository=_StubLibraryRepo(_FIXTURE_LIBRARY),
-        asset_repository=repo,
-        storage_service=_storage(),
-    )
-    assert resp.duplicated is False
-    assert resp.skip_transfer is False
-    assert resp.asset_id == ""  # 预建失败，降级无 asset_id
-    assert resp.upload_url != ""  # 签名仍正常返回
-
-
-def test_create_pending_asset_update_failure_swallowed():
-    """复用占位记录时字段补齐 update 抛异常被吞掉，不阻塞返回。"""
-
-    class _UpdateBrokenRepo(_FakeAssetRepo):
-        def update(self, asset):
-            raise RuntimeError("db down")
-
-    repo = _UpdateBrokenRepo()
-    repo.create(_make_pending(file_hash="abc123", client_upload_id="", id="p1"))
-    result = upload_route._create_pending_asset(
-        asset_repository=repo,
-        project_id="p-1",
-        library_id="lib-1",
-        storage_key="uploads/new/test.mp4",
-        filename="test.mp4",
-        mime_type="video/mp4",
-        user_id="user-1",
-        file_hash="abc123",
-        client_upload_id="cuid-new",
-        file_size=1024,
-    )
-    assert result.id == "p1"  # 仍复用，不抛异常
-    assert repo.saved == 1

tests/unit/test_upload_complete_idempotency_1714.py

@@ -73,9 +73,6 @@ class StubAssetRepository:
     def find_recent_active_by_library_and_name(
         self, library_id: str, name: str, within_minutes: int = 30, file_size: int = 0
     ) -> Asset | None:
-        # 严格模式（#1714）：大小未知（0）直接不命中，宁可漏判不可误杀
-        if not file_size or file_size <= 0:
-            return None
         cutoff = datetime.now(timezone.utc) - timedelta(minutes=within_minutes)
         candidates = [
             a
@@ -84,7 +81,7 @@ class StubAssetRepository:
             and a.name == name
             and a.status in (AssetStatus.UPLOADING, AssetStatus.PROCESSING)
             and a.created_at >= cutoff
-            and a.file_size == file_size
+            and (not file_size or a.file_size == file_size)
         ]
         return max(candidates, key=lambda a: a.created_at) if candidates else None
 
@@ -237,21 +234,14 @@ class TestDirectCompleteIdempotency:
         不应再建第二条。
         """
         client, asset_repo, ingest_repo, _ = _client()
-        # 第一次 complete（旧客户端无 token/hash，但 file_size 可知）
-        r1 = client.post(
-            "/api/v1/direct/complete",
-            json={**COMPLETE_BODY, "file_size": 5_000_000},
-        )
+        # 第一次 complete（旧客户端无 token/hash）
+        r1 = client.post("/api/v1/direct/complete", json=COMPLETE_BODY)
         assert r1.json()["duplicated"] is False
         # 重试：重新 prepare 产生新 storage_key（仅 uuid 目录不同，文件名一致——
-        # 前端重试传的是同一个 File），且近期；同大小才允许兜底命中
+        # 前端重试传的是同一个 File），且近期
         r2 = client.post(
             "/api/v1/direct/complete",
-            json={
-                **COMPLETE_BODY,
-                "storage_key": "uploads/retry/IMG_2282.MOV",
-                "file_size": 5_000_000,
-            },
+            json={**COMPLETE_BODY, "storage_key": "uploads/retry/IMG_2282.MOV", "file_size": 0},
         )
         assert r2.status_code == 200
         assert r2.json()["duplicated"] is True
@@ -259,80 +249,6 @@ class TestDirectCompleteIdempotency:
         assert len(asset_repo.created) == 1
         assert ingest_repo.created_count == 1
 
-    def test_fallback_dedup_skipped_when_file_size_unknown(self):
-        """file_size=0（未知）时不允许仅凭同名 + processing 判重，直接放行（#1714）。
-
-        根因场景：complete 没传 file_size，30 分钟内同名占位（如 iPhone 的
-        IMG_2285.MOV）会把内容/大小全新的视频误判为重复跳过。
-        """
-        client, asset_repo, _ingest_repo, _ = _client()
-        r1 = client.post(
-            "/api/v1/direct/complete",
-            json={**COMPLETE_BODY, "file_size": 0},
-        )
-        assert r1.json()["duplicated"] is False
-        # 第二个全新视频：同名（IMG_2285.MOV）、无 hash/token、file_size 仍未知
-        r2 = client.post(
-            "/api/v1/direct/complete",
-            json={**COMPLETE_BODY, "storage_key": "uploads/retry2/IMG_2282.MOV", "file_size": 0},
-        )
-        assert r2.status_code == 200
-        assert r2.json()["duplicated"] is False  # 不能误杀
-        assert len(asset_repo.created) == 2  # 两条记录，放行新上传
-
-    def test_fallback_dedup_skipped_when_same_name_but_different_size(self):
-        """同名但 file_size 不同 → 不判重，正常建记录（#1714）。"""
-        client, asset_repo, _ingest_repo, _ = _client()
-        r1 = client.post(
-            "/api/v1/direct/complete",
-            json={**COMPLETE_BODY, "file_size": 5_000_000},
-        )
-        assert r1.json()["duplicated"] is False
-        r2 = client.post(
-            "/api/v1/direct/complete",
-            json={
-                **COMPLETE_BODY,
-                "storage_key": "uploads/retry3/IMG_2282.MOV",
-                "file_size": 9_999_999,  # 同名但大小完全不同的新视频
-            },
-        )
-        assert r2.status_code == 200
-        assert r2.json()["duplicated"] is False
-        assert len(asset_repo.created) == 2
-
-    def test_fallback_dedup_skipped_when_hash_present_even_if_name_size_match(self):
-        """file_hash 非空且 hash 未命中时，不允许退回同名兜底（#1714）。
-
-        hash 已能代表内容：同名同大小但 hash 不同是真实的新内容，必须放行。
-        """
-        client, asset_repo, _ingest_repo, _ = _client()
-        # 第一次：某 hash 的视频
-        r1 = client.post(
-            "/api/v1/direct/complete",
-            json={
-                **COMPLETE_BODY,
-                "file_hash": "a" * 64,
-                "client_upload_id": "tok-1",
-                "file_size": 5_000_000,
-            },
-        )
-        assert r1.json()["duplicated"] is False
-        # 第二次：同名同大小但 hash 不同（新视频内容不同）；
-        # 注意 client_upload_id 也必须不同，否则会先被 token 命中
-        r2 = client.post(
-            "/api/v1/direct/complete",
-            json={
-                **COMPLETE_BODY,
-                "storage_key": "uploads/retry4/IMG_2282.MOV",
-                "file_hash": "b" * 64,
-                "client_upload_id": "tok-2",
-                "file_size": 5_000_000,
-            },
-        )
-        assert r2.status_code == 200
-        assert r2.json()["duplicated"] is False
-        assert len(asset_repo.created) == 2
-
     def test_fallback_dedup_ignores_ready_history(self):
         """READY 历史同名素材不触发兜底（允许用户再次上传同名文件）。"""
         ready = Asset(

tests/unit/test_wechat_bind_routes_1719.py

@@ -38,7 +38,6 @@ def _auth_user(user_id="u-1", openid=None):
         display_name="用户",
         phone="",
         phone_verified=False,
-        profile_completed=True,
     )
     return SimpleNamespace(user=user, session_id="s-1", token_type="user_auth")
 
@@ -113,7 +112,6 @@ def test_bind_success_returns_user_with_wechat_bound():
         display_name="用户",
         phone="",
         phone_verified=False,
-        profile_completed=True,
     )
 
     import packages.application.auth.wechat_oauth_service as oauth_mod

tests/unit/test_wechat_sync_use_case.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, patch
 
 import pytest
 
@@ -13,17 +13,10 @@ from packages.application.auth.wechat_sync_use_case import (
 )
 from packages.domain.entities import User
 
-JWT_KEY = "test-secret-key-for-jwt-12345"
-
 
 @pytest.fixture
 def mock_user_repo():
-    repo = MagicMock()
-    # 默认全部查不到，具体用例再覆盖
-    repo.find_by_wechat_openid.return_value = None
-    repo.find_by_wechat_unionid.return_value = None
-    repo.find_by_username.return_value = None
-    return repo
+    return MagicMock()
 
 
 @pytest.fixture
@@ -48,29 +41,40 @@ def sample_user():
     return user
 
 
-def make_use_case(repo, store):
-    return WechatSyncUseCase(repo, session_store=store, jwt_secret_key=JWT_KEY)
-
-
 class TestWechatSyncRequest:
+    """WechatSyncRequest 测试"""
+
     def test_openid_stripped(self):
-        assert WechatSyncRequest(openid="  openid_123  ").openid == "openid_123"
+        """openid 被 strip"""
+        req = WechatSyncRequest(openid="  openid_123  ")
+        assert req.openid == "openid_123"
 
     def test_unionid_stripped(self):
-        assert WechatSyncRequest(openid="o1", unionid="  unionid_456  ").unionid == "unionid_456"
+        """unionid 被 strip"""
+        req = WechatSyncRequest(openid="o1", unionid="  unionid_456  ")
+        assert req.unionid == "unionid_456"
 
     def test_default_nickname(self):
-        assert WechatSyncRequest(openid="o1").nickname == "微信用户"
+        """默认昵称"""
+        req = WechatSyncRequest(openid="o1")
+        assert req.nickname == "微信用户"
 
     def test_default_source(self):
-        assert WechatSyncRequest(openid="o1").source == "miniapp"
+        """默认来源"""
+        req = WechatSyncRequest(openid="o1")
+        assert req.source == "miniapp"
 
     def test_empty_unionid(self):
-        assert WechatSyncRequest(openid="o1").unionid == ""
+        """不传 unionid 默认为空字符串"""
+        req = WechatSyncRequest(openid="o1")
+        assert req.unionid == ""
 
 
 class TestWechatSyncResponse:
+    """WechatSyncResponse 测试"""
+
     def test_to_dict_contains_fields(self):
+        """to_dict 包含所有必要字段"""
         resp = WechatSyncResponse(
             access_token="access_123",
             refresh_token="refresh_456",
@@ -81,241 +85,276 @@ class TestWechatSyncResponse:
             expires_in=1800,
         )
         data = resp.to_dict()
+
         assert data["access_token"] == "access_123"
-        assert data["token"] == "access_123"
+        assert data["token"] == "access_123"  # 兼容字段
         assert data["refresh_token"] == "refresh_456"
         assert data["user_id"] == "user_001"
         assert data["is_new_user"] is False
         assert data["expires_in"] == 1800
+        assert "user" in data
+        assert "user_info" in data
         assert data["user"]["id"] == "user_001"
+        assert data["user"]["nickname"] == "测试用户"
         assert data["user"]["display_name"] == "测试用户"
 
 
-class TestWechatSyncLoginExisting:
+class TestWechatSyncUseCaseLoginExisting:
+    """已有用户登录测试"""
+
     def test_login_by_openid(self, mock_user_repo, mock_session_store, sample_user):
-        """openid 命中、unionid 一致，正常登录"""
+        """通过 openid 登录已有用户"""
         mock_user_repo.find_by_wechat_openid.return_value = sample_user
-        mock_user_repo.find_by_wechat_unionid.return_value = sample_user
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
-            WechatSyncRequest(openid="openid_123", unionid="unionid_456")
-        )
-        assert err is None
-        assert resp.user_id == "user_001"
-        assert resp.is_new_user is False
-
-    def test_backfill_unionid_for_legacy_openid_user(self, mock_user_repo, mock_session_store):
-        """核心修复：openid 命中的老账号没有 unionid，请求带 unionid 时补写"""
-        legacy = User(
-            id="legacy_001",
-            email="legacy@wechat.local",
-            username="wx_legacy",
-            display_name="微信用户",
-            password_hash="h",
-            email_verified=True,
-            wechat_openid="oGjxK3_old",
-            wechat_unionid=None,
-        )
-        mock_user_repo.find_by_wechat_openid.return_value = legacy
-        # unionid 查找：补写前确认无其他账号占用
         mock_user_repo.find_by_wechat_unionid.return_value = None
+        mock_user_repo.save.return_value = sample_user
 
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
-            WechatSyncRequest(openid="oGjxK3_old", unionid="o5nVk_union")
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
         )
-        assert err is None
-        assert resp.user_id == "legacy_001"
-        assert resp.is_new_user is False
-        assert legacy.wechat_unionid == "o5nVk_union"
-        # 至少保存过一次（补写 + 最后登录更新）
-        mock_user_repo.save.assert_called()
+        request = WechatSyncRequest(openid="openid_123", nickname="测试")
+        response, error = use_case.execute(request)
 
-    def test_login_by_unionid_binds_new_openid(self, mock_user_repo, mock_session_store, sample_user):
-        """unionid 命中（跨端老用户），openid 未绑定过 → 绑定新 openid"""
-        sample_user.wechat_openid = None
+        assert error is None
+        assert response is not None
+        assert response.user_id == "user_001"
+        assert response.is_new_user is False
+        mock_user_repo.find_by_wechat_openid.assert_called_once_with("openid_123")
+        mock_session_store.save_session.assert_called_once()
+
+    def test_login_by_unionid(self, mock_user_repo, mock_session_store, sample_user):
+        """openid 没找到，通过 unionid 找到并绑定 openid"""
+        sample_user.wechat_openid = None  # 没有当前 openid
         mock_user_repo.find_by_wechat_openid.return_value = None
         mock_user_repo.find_by_wechat_unionid.return_value = sample_user
+        mock_user_repo.save.return_value = sample_user
 
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
-            WechatSyncRequest(openid="new_openid", unionid="unionid_456", nickname="测试")
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
         )
-        assert err is None
-        assert resp.is_new_user is False
+        request = WechatSyncRequest(
+            openid="new_openid",
+            unionid="unionid_456",
+            nickname="测试",
+        )
+        response, error = use_case.execute(request)
+
+        assert error is None
+        assert response is not None
+        assert response.is_new_user is False
+        # 应该保存了新的 openid
         assert sample_user.wechat_openid == "new_openid"
-
-    def test_unionid_user_already_has_same_openid_no_extra_write(self, mock_user_repo, mock_session_store, sample_user):
-        """unionid 命中且 openid 已经是当前 openid，不额外改写"""
-        mock_user_repo.find_by_wechat_openid.return_value = sample_user
-        mock_user_repo.find_by_wechat_unionid.return_value = sample_user
-        saved = []
-        mock_user_repo.save.side_effect = lambda u: saved.append(u)
-        make_use_case(mock_user_repo, mock_session_store).execute(
-            WechatSyncRequest(openid="openid_123", unionid="unionid_456")
-        )
-        # 只有最后登录信息那一次 save，没有绑定/补写导致的额外 save
-        assert len(saved) == 1
+        mock_user_repo.save.assert_called()
 
     def test_updates_last_login(self, mock_user_repo, mock_session_store, sample_user):
+        """登录时更新最后登录信息"""
         mock_user_repo.find_by_wechat_openid.return_value = sample_user
-        mock_user_repo.find_by_wechat_unionid.return_value = sample_user
-        make_use_case(mock_user_repo, mock_session_store).execute(WechatSyncRequest(openid="openid_123"))
+        mock_user_repo.save.return_value = sample_user
+
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
+        )
+        request = WechatSyncRequest(openid="openid_123")
+        use_case.execute(request)
+
         assert sample_user.last_login_at is not None
         assert sample_user.last_login_ip == "bff_gateway"
 
     def test_returns_tokens(self, mock_user_repo, mock_session_store, sample_user):
+        """返回 access_token 和 refresh_token"""
         mock_user_repo.find_by_wechat_openid.return_value = sample_user
-        mock_user_repo.find_by_wechat_unionid.return_value = sample_user
-        resp, _ = make_use_case(mock_user_repo, mock_session_store).execute(WechatSyncRequest(openid="openid_123"))
-        assert resp.access_token and resp.refresh_token and resp.expires_in > 0
+        mock_user_repo.save.return_value = sample_user
+
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
+        )
+        request = WechatSyncRequest(openid="openid_123")
+        response, _ = use_case.execute(request)
+
+        assert response.access_token is not None
+        assert len(response.access_token) > 0
+        assert response.refresh_token is not None
+        assert len(response.refresh_token) > 0
+        assert response.expires_in > 0
 
 
-class TestWechatSyncConflicts:
-    def test_unionid_and_openid_bound_to_different_users(self, mock_user_repo, mock_session_store):
-        """unionid 与 openid 分属两个账号 → 冲突报错，不写库"""
-        ua = User(
-            id="ua",
-            email="a@wechat.local",
-            username="wxa",
-            display_name="A",
-            password_hash="h",
-            wechat_openid="o1",
-            wechat_unionid=None,
-        )
-        ub = User(
-            id="ub",
-            email="b@wechat.local",
-            username="wxb",
-            display_name="B",
-            password_hash="h",
-            wechat_openid="oX",
-            wechat_unionid="un1",
-        )
-        mock_user_repo.find_by_wechat_openid.return_value = ua
-        mock_user_repo.find_by_wechat_unionid.return_value = ub
+class TestWechatSyncUseCaseNewUser:
+    """新用户注册测试"""
 
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
-            WechatSyncRequest(openid="o1", unionid="un1")
-        )
-        assert resp is None
-        assert "conflict" in err
-        # 补写不得发生
-        assert ua.wechat_unionid is None
-
-    def test_backfill_unionid_already_used_by_other(self, mock_user_repo, mock_session_store):
-        """给 openid 老账号补 unionid 时发现 unionid 已被他人占用 → 冲突"""
-        ua = User(
-            id="ua",
-            email="a@wechat.local",
-            username="wxa",
-            display_name="A",
-            password_hash="h",
-            wechat_openid="o1",
-            wechat_unionid=None,
-        )
-        ub = User(
-            id="ub",
-            email="b@wechat.local",
-            username="wxb",
-            display_name="B",
-            password_hash="h",
-            wechat_openid="o2",
-            wechat_unionid="un1",
-        )
-        # openid 命中 ua；unionid 首次查找（优先级查询）命中 ub
-        mock_user_repo.find_by_wechat_openid.return_value = ua
-        mock_user_repo.find_by_wechat_unionid.return_value = ub
-
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
-            WechatSyncRequest(openid="o1", unionid="un1")
-        )
-        assert resp is None
-        assert "conflict" in err
-        assert ua.wechat_unionid is None
-
-    def test_unionid_user_openid_belongs_to_other(self, mock_user_repo, mock_session_store):
-        """unionid 命中 ua，但请求的 openid 属于另一个账号 ub → 冲突，不抢占 openid"""
-        ua = User(
-            id="ua",
-            email="a@wechat.local",
-            username="wxa",
-            display_name="A",
-            password_hash="h",
-            wechat_openid="oA",
-            wechat_unionid="un1",
-        )
-        ub = User(
-            id="ub",
-            email="b@wechat.local",
-            username="wxb",
-            display_name="B",
-            password_hash="h",
-            wechat_openid="oB",
-            wechat_unionid=None,
-        )
-        mock_user_repo.find_by_wechat_openid.return_value = ub
-        mock_user_repo.find_by_wechat_unionid.return_value = ua
-
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
-            WechatSyncRequest(openid="oB", unionid="un1")
-        )
-        assert resp is None
-        assert "conflict" in err
-        assert ua.wechat_openid == "oA"  # 未被改写
-
-
-class TestWechatSyncNewUser:
     def test_create_new_user(self, mock_user_repo, mock_session_store):
-        saved = {}
-        mock_user_repo.save.side_effect = lambda u: saved.update({u.id: u})
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(
-            WechatSyncRequest(openid="new_openid_789", unionid="new_union_789", nickname="新用户")
+        """openid 和 unionid 都没找到，创建新用户"""
+        mock_user_repo.find_by_wechat_openid.return_value = None
+        mock_user_repo.find_by_wechat_unionid.return_value = None
+        mock_user_repo.find_by_username.return_value = None  # username 不重复
+
+        saved_user = None
+
+        def capture_save(user):
+            nonlocal saved_user
+            saved_user = user
+
+        mock_user_repo.save.side_effect = capture_save
+
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
         )
-        assert err is None
-        assert resp.is_new_user is True
-        u = saved[resp.user_id]
-        assert u.wechat_openid == "new_openid_789"
-        assert u.wechat_unionid == "new_union_789"
-        assert u.email.endswith("@wechat.local")
-        assert u.username.startswith("wx_")
-        assert u.email_verified is True
-        assert u.password_hash
+        request = WechatSyncRequest(
+            openid="new_openid_789",
+            unionid="new_union_789",
+            nickname="新用户",
+            avatar_url="https://example.com/avatar.jpg",
+        )
+        response, error = use_case.execute(request)
+
+        assert error is None
+        assert response is not None
+        assert response.is_new_user is True
+        assert saved_user is not None
+        assert saved_user.wechat_openid == "new_openid_789"
+        assert saved_user.wechat_unionid == "new_union_789"
+        assert saved_user.email.endswith("@wechat.local")
+        assert saved_user.username.startswith("wx_")
+        assert saved_user.email_verified is True
+
+    def test_new_user_email_based_on_openid(self, mock_user_repo, mock_session_store):
+        """新用户邮箱基于 openid 生成"""
+        mock_user_repo.find_by_wechat_openid.return_value = None
+        mock_user_repo.find_by_wechat_unionid.return_value = None
+        mock_user_repo.find_by_username.return_value = None
+
+        saved_user = None
+
+        def capture_save(user):
+            nonlocal saved_user
+            saved_user = user
+
+        mock_user_repo.save.side_effect = capture_save
+
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
+        )
+        request = WechatSyncRequest(openid="abcdef1234567890")
+        use_case.execute(request)
+
+        assert "abcdef1234567890" in saved_user.email or "abcdef1234567890"[:20] in saved_user.email
+        assert saved_user.email.endswith("@wechat.local")
 
     def test_username_conflict_adds_suffix(self, mock_user_repo, mock_session_store):
+        """用户名冲突时加后缀"""
         call_count = [0]
 
-        def find_by_username(username):
+        def mock_find_by_username(username):
+            # 前两次返回存在（模拟冲突），第三次返回 None（可用）
             call_count[0] += 1
-            return MagicMock() if call_count[0] <= 2 else None
+            if call_count[0] <= 2:
+                return MagicMock()
+            return None
 
-        mock_user_repo.find_by_username.side_effect = find_by_username
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(WechatSyncRequest(openid="test_openid"))
-        assert err is None
-        assert resp.is_new_user is True
-        assert call_count[0] >= 2
+        mock_user_repo.find_by_wechat_openid.return_value = None
+        mock_user_repo.find_by_wechat_unionid.return_value = None
+        mock_user_repo.find_by_username.side_effect = mock_find_by_username
+
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
+        )
+        request = WechatSyncRequest(openid="test_openid")
+        response, error = use_case.execute(request)
+
+        assert error is None
+        assert response is not None
+        assert response.is_new_user is True
+        # find_by_username 被调用了多次（找不冲突的用户名）
+        assert mock_user_repo.find_by_username.call_count >= 2
+
+    def test_new_user_has_password_hash(self, mock_user_repo, mock_session_store):
+        """新用户有随机密码哈希（不能是空的）"""
+        mock_user_repo.find_by_wechat_openid.return_value = None
+        mock_user_repo.find_by_wechat_unionid.return_value = None
+        mock_user_repo.find_by_username.return_value = None
+
+        saved_user = None
+
+        def capture_save(user):
+            nonlocal saved_user
+            saved_user = user
+
+        mock_user_repo.save.side_effect = capture_save
+
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
+        )
+        request = WechatSyncRequest(openid="new_openid")
+        use_case.execute(request)
+
+        assert saved_user.password_hash is not None
+        assert len(saved_user.password_hash) > 0
 
 
-class TestWechatSyncErrors:
+class TestWechatSyncUseCaseErrors:
+    """错误场景测试"""
+
     def test_empty_openid(self, mock_user_repo, mock_session_store):
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(WechatSyncRequest(openid=""))
-        assert resp is None
-        assert "openid is required" in err
+        """空 openid 返回错误"""
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
+        )
+        request = WechatSyncRequest(openid="")
+        response, error = use_case.execute(request)
+
+        assert response is None
+        assert "openid is required" in error
 
     def test_exception_returns_error(self, mock_user_repo, mock_session_store):
+        """异常时返回友好错误"""
         mock_user_repo.find_by_wechat_openid.side_effect = Exception("DB error")
-        mock_user_repo.find_by_wechat_unionid.side_effect = Exception("DB error")
-        resp, err = make_use_case(mock_user_repo, mock_session_store).execute(WechatSyncRequest(openid="openid_123"))
-        assert resp is None
-        assert "Internal error" in err
+
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
+        )
+        request = WechatSyncRequest(openid="openid_123")
+        response, error = use_case.execute(request)
+
+        assert response is None
+        assert "Internal error" in error
 
 
 class TestWechatSyncSession:
+    """Session 相关测试"""
+
     def test_session_saved(self, mock_user_repo, mock_session_store, sample_user):
+        """登录时保存 session"""
         mock_user_repo.find_by_wechat_openid.return_value = sample_user
-        mock_user_repo.find_by_wechat_unionid.return_value = sample_user
-        make_use_case(mock_user_repo, mock_session_store).execute(
-            WechatSyncRequest(openid="openid_123", source="miniapp")
+        mock_user_repo.save.return_value = sample_user
+
+        use_case = WechatSyncUseCase(
+            mock_user_repo,
+            session_store=mock_session_store,
+            jwt_secret_key="test-secret-key-for-jwt-12345",
         )
+        request = WechatSyncRequest(openid="openid_123", source="miniapp")
+        use_case.execute(request)
+
         mock_session_store.save_session.assert_called_once()
-        kw = mock_session_store.save_session.call_args[1]
-        assert kw["user_id"] == "user_001"
-        assert "wechat_miniapp" in kw["device_info"]
-        assert kw["expires_in_seconds"] == 30 * 24 * 3600
+        call_kwargs = mock_session_store.save_session.call_args[1]
+        assert call_kwargs["user_id"] == "user_001"
+        assert "wechat_miniapp" in call_kwargs["device_info"]
+        assert call_kwargs["expires_in_seconds"] == 30 * 24 * 3600