cleanup: Backend Phase 1 — 5项代码清理任务

1. 修复密码重置接口路径不一致 Bug (auth.py) - forgot_password 硬编码 localhost → 使用 APP_BASE_URL 配置 2. 删除 8 处死代码（未使用 import/变量） - 清理多个文件中的未使用导入和变量 3. 删除 8 个空文件/空模块 - 删除无内容的 __init__.py 文件 4. 合并 3 对 100% 完全重复的函数 - 提取 check_project_access/get_user_plan/require_project_and_library - 新建 apps/api/app/api/routes/_helpers.py 作为共享模块 - 6 个路由文件改为从 _helpers 导入 5. 对齐 6 个废弃/异常环境变量 - 修复 DATABASE_POOL_RECYLE 拼写错误 → DATABASE_POOL_RECYCLE - 添加 JWT_ALGORITHM/JWT_ACCESS_TOKEN_EXPIRE_MINUTES/JWT_REFRESH_TOKEN_EXPIRE_DAYS 到 Settings - 修复 jwt_service.py hasattr 字段名匹配 - .env.example: CORS_ORIGINS → CORS_ORIGINS_RAW（逗号分隔格式） - .env.example: 启用 APP_ENV - 修复 OSS_ENDPOINT 默认值拼写错误 (aliiyuncs.com → aliyuncs.com) - 添加 COSYVOICE_* 变量来源注释修改文件: 52 个（新增 1，删除 8，修改 43）
fix: P0-2 sign_url 返回 HTTPS URL（endpoint 加 https:// 前缀）
2026-07-13 13:23:30 +08:00 · 2026-07-10 17:27:57 +08:00 · 2026-07-10 17:23:58 +08:00
74 changed files with 1082 additions and 2225 deletions
@@ -3,6 +3,7 @@
 # ==================== 应用配置 ====================
 APP_NAME=小虾 SaaS
 APP_BASE_URL=http://localhost:3000
+APP_ENV=development

 # ==================== 数据库配置 ====================
 DATABASE_URL=postgresql://xiaoxia_user:your_password@localhost:5432/xiaoxia_saas
@@ -35,7 +36,8 @@ ENVIRONMENT=development
 DEBUG=true

 # ==================== CORS 配置 ====================
-CORS_ORIGINS=["http://localhost:3000","http://localhost:5173"]
+# 逗号分隔的域名列表（Settings 读取 CORS_ORIGINS_RAW）
+CORS_ORIGINS_RAW=http://localhost:3000,http://localhost:5173

 # ==================== 阿里云 OSS 配置 ====================
 OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
@@ -44,6 +46,7 @@ OSS_ACCESS_KEY_SECRET=your-access-key-secret
 OSS_BUCKET_NAME=xiaoxia-autocut

 # ==================== CosyVoice 语音合成配置 ====================
+# 注意：COSYVOICE_* 变量由 packages/shared/config.py 的 SharedSettings 读取
 COSYVOICE_API_KEY=your-cosyvoice-api-key
 COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1/services/aigc/text2audio
 COSYVOICE_MODEL=cosyvoice-v1
@@ -1,26 +0,0 @@
-"""Add logs field to generation_tasks
-
-Revision ID: 037_generation_logs
-Revises: 036_expand_uuid_36
-Create Date: 2026-07-10
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "037_generation_logs"
-down_revision = "036_expand_uuid_36"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "generation_tasks",
-        sa.Column("logs", sa.Text(), nullable=False, server_default="[]"),
-    )
-
-
-def downgrade() -> None:
-    op.drop_column("generation_tasks", "logs")
@@ -1 +0,0 @@
-"""API application package."""
@@ -1 +0,0 @@
-"""API package."""
@@ -0,0 +1,41 @@
+"""路由层共享辅助函数 — 消除跨文件重复定义。"""
+
+from typing import Any
+
+from fastapi import HTTPException, status
+
+from packages.application import GetProjectUseCase
+from packages.ports.user_repository import UserRepository
+
+
+def check_project_access(project_id: str, user_id: str, project_repository) -> None:
+    """检查用户是否有项目访问权限。"""
+    project = project_repository.find_by_id(project_id)
+    if project is None:
+        raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
+    if not project.can_access(user_id):
+        raise HTTPException(status_code=403, detail="Access denied to project")
+
+
+def get_user_plan(user_id: str, user_repository: UserRepository) -> str:
+    """获取用户的订阅计划名称。"""
+    user = user_repository.find_by_id(user_id)
+    if user is None:
+        return "free"
+    return getattr(user, "subscription_plan", "free") or "free"
+
+
+def require_project_and_library(
+    project_id: str,
+    library_id: str,
+    project_repository: Any,
+    asset_library_repository: Any,
+) -> None:
+    """Verify project and asset library exist."""
+    project = GetProjectUseCase(project_repository).execute(project_id)
+    if project is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
+
+    libraries = asset_library_repository.find_by_project(project_id)
+    if not any(item.id == library_id for item in libraries):
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found")
@@ -27,6 +27,8 @@ from packages.application import (
 )
 from packages.domain import AssetStatus, ClassificationStatus

+from app.api.routes._helpers import check_project_access
+
 logger = logging.getLogger(__name__)

 router = APIRouter()
@@ -72,14 +74,6 @@ def _to_asset_response(item, storage_service=None) -> AssetResponse:
    )


-def _check_project_access(project_id: str, user_id: str, project_repository) -> None:
-    """检查用户是否有项目访问权限"""
-    project = project_repository.find_by_id(project_id)
-    if project is None:
-        raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
-    if not project.can_access(user_id):
-        raise HTTPException(status_code=403, detail="Access denied to project")
-

@router.get("", response_model=ListAssetsResponse)
 def list_assets(
@@ -136,7 +130,7 @@ def list_assets(
            library = asset_library_repository.get(library_id)
            if library is None:
                raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
-            _check_project_access(library.project_id, user_id, project_repository)
+            check_project_access(library.project_id, user_id, project_repository)
            if ft:
                items = asset_repository.find_by_library_and_file_type(library_id, ft, skip=skip, limit=limit)
                total = asset_repository.count_by_project(library.project_id) if not kind else len(items)
@@ -152,7 +146,7 @@ def list_assets(

        # 模式2：指定 project_id
        if project_id:
-            _check_project_access(project_id, user_id, project_repository)
+            check_project_access(project_id, user_id, project_repository)
            if ft:
                # 无直接方法，加载后按 file_type 过滤（仍比全量加载好）
                all_items = asset_repository.find_by_project(project_id)
@@ -210,13 +204,13 @@ def list_assets(
        library = asset_library_repository.get(library_id)
        if library is None:
            raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
-        _check_project_access(library.project_id, user_id, project_repository)
+        check_project_access(library.project_id, user_id, project_repository)
        if kind:
            all_items = asset_repository.find_by_library_and_file_type(library_id, kind_to_file_type[kind])
        else:
            all_items = asset_repository.find_by_library(library_id)
    elif project_id:
-        _check_project_access(project_id, user_id, project_repository)
+        check_project_access(project_id, user_id, project_repository)
        all_items = asset_repository.find_by_project(project_id)
    else:
        try:
@@ -262,7 +256,7 @@ def update_asset_review_status(
    item = asset_repository.get(asset_id)
    if item is None:
        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
-    _check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
    _apply_asset_review_status(item, request.review_status)
    updated = asset_repository.update(item)
    return _to_asset_response(updated)
@@ -286,7 +280,7 @@ def batch_delete_assets(
            failed_ids.append(asset_id)
            continue
        try:
-            _check_project_access(item.project_id, user_id, project_repository)
+            check_project_access(item.project_id, user_id, project_repository)
            deleted_ids.append(asset_id)
        except HTTPException:
            failed_ids.append(asset_id)
@@ -307,7 +301,7 @@ def get_asset(
    item = asset_repository.find_by_id(asset_id)
    if item is None:
        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
-    _check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
    return _to_asset_response(item)


@@ -322,7 +316,7 @@ def update_asset(
    item = asset_repository.find_by_id(asset_id)
    if item is None:
        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
-    _check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)

    # 合并可修改字段
    if request.name is not None:
@@ -346,7 +340,7 @@ def delete_asset(
    item = asset_repository.find_by_id(asset_id)
    if item is None:
        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
-    _check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
    asset_repository.delete(asset_id)


@@ -363,7 +357,7 @@ def tag_asset(
    item = asset_repository.find_by_id(asset_id)
    if item is None:
        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
-    _check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
    for tag_id in request.tag_ids:
        tag = tag_repository.get(tag_id)
        if tag is None:
@@ -387,7 +381,7 @@ def untag_asset(
    item = asset_repository.find_by_id(asset_id)
    if item is None:
        raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
-    _check_project_access(item.project_id, authenticated_user.user.id, project_repository)
+    check_project_access(item.project_id, authenticated_user.user.id, project_repository)
    item.remove_tag(tag_id)
    asset_repository.update(item)

@@ -243,7 +243,6 @@ async def logout(
    current_user: AuthenticatedUser = Depends(get_current_user),
 ):
    """登出 - 将当前 token 加入黑名单"""
-    from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer

    if credentials:
        try:
@@ -14,7 +14,6 @@ from typing import Any
 from uuid import uuid4

 from app.auth import AuthenticatedUser, get_current_user
-from app.config import get_settings
 from app.core.celery_app import celery_app
 from app.core.storage import OSSStorageService, get_storage_service
 from app.dependencies import (
@@ -35,6 +34,8 @@ from fastapi.params import File

 from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase

+from app.api.routes._helpers import require_project_and_library
+
 router = APIRouter()
 logger = logging.getLogger(__name__)

@@ -113,22 +114,6 @@ def _atomic_check_and_record(upload_id: str, chunk_index: int) -> bool:
            fcntl.flock(f.fileno(), fcntl.LOCK_UN)


-def _require_project_and_library(
-    project_id: str,
-    library_id: str,
-    project_repository: Any,
-    asset_library_repository: Any,
-) -> None:
-    """Verify project and asset library exist"""
-    project = GetProjectUseCase(project_repository).execute(project_id)
-    if project is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
-
-    libraries = asset_library_repository.find_by_project(project_id)
-    if not any(item.id == library_id for item in libraries):
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found")
-
-
 def _load_upload_meta(upload_id: str) -> dict[str, Any]:
    """Load upload metadata"""
    meta_path = _get_upload_meta_path(upload_id)
@@ -206,7 +191,6 @@ async def init_chunked_upload(
    asset_library_repository: Any = Depends(get_asset_library_repository),
 ) -> ChunkedUploadInitResponse:
    """Initialize chunked upload"""
-    settings = get_settings()

    # Validate file size
    if request.file_size > MAX_FILE_SIZE:
@@ -221,7 +205,7 @@ async def init_chunked_upload(
        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")

    # Verify asset library
-    _require_project_and_library(
+    require_project_and_library(
        request.project_id,
        request.library_id,
        project_repository,
@@ -31,12 +31,6 @@ from fastapi import APIRouter, Depends, HTTPException, Query, status
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import Session

-from packages.adapters.sqlalchemy_impl.asset_library_repository import (
-    SQLAlchemyAssetLibraryRepository,
-)
-from packages.adapters.sqlalchemy_impl.asset_repository import (
-    SQLAlchemyAssetRepository,
-)
 from packages.adapters.sqlalchemy_impl.generation_task_repository import (
    SQLAlchemyGenerationTaskRepository,
 )
@@ -684,7 +678,7 @@ def generate_plan(
    except HTTPException:
        # 已处理的 HTTP 异常直接透传
        raise
-    except Exception as exc:
+    except Exception:
        logger.exception("触发剪辑计划生成失败: plan_id=%s", plan_id)
        # 尝试将计划标记为失败（RENDERING → FAILED 是合法的状态流转）
        try:
@@ -883,7 +877,7 @@ def ai_recommend_clips(
            config=normalized_config,
            total_duration=result["total_duration"],
        )
-    except Exception as exc:
+    except Exception:
        logger.exception("AI 推荐写入失败，plan_id=%s 数据可能不一致", plan_id)
        # 尝试回滚未提交的变更
        try:
@@ -1,4 +1,3 @@
-import logging
 import random
 import uuid
 from typing import Any
@@ -25,6 +24,8 @@ from app.schemas.generation_task import (
 )
 from fastapi import APIRouter, Depends, HTTPException

+from app.api.routes._helpers import check_project_access
+
 from packages.application import (
    CreateGenerationTaskCommand,
    CreateGenerationTaskUseCase,
@@ -32,57 +33,9 @@ from packages.application import (
    ListGeneratedVideosByTaskUseCase,
 )

-logger = logging.getLogger(__name__)
-
 router = APIRouter()


-def _safe_enqueue_generation_task(
-    task: Any,
-    generation_task_repository: Any,
-) -> bool:
-    """安全入队：send_task 失败时自动把任务标记为 failed，避免留下 pending 僵尸任务。
-
-    Returns:
-        True 表示入队成功，False 表示入队失败（已标记为 failed）
-    """
-    try:
-        celery_app.send_task("worker.generate_video", args=[task.id])
-        logger.info(
-            "[生成任务] 入队成功: task_id=%s, status=%s",
-            task.id,
-            task.status,
-        )
-        return True
-    except Exception as e:
-        logger.error(
-            "[生成任务] 入队失败，标记为失败: task_id=%s error=%s",
-            task.id,
-            e,
-            exc_info=True,
-        )
-        try:
-            task.mark_failed(f"任务入队失败: {e}")
-            generation_task_repository.update(task)
-        except Exception as update_err:
-            logger.error(
-                "[生成任务] 入队失败后更新状态也失败: task_id=%s error=%s",
-                task.id,
-                update_err,
-                exc_info=True,
-            )
-        return False
-
-
-def _check_project_access(project_id: str, user_id: str, project_repository) -> None:
-    """检查用户是否有项目访问权限"""
-    project = project_repository.find_by_id(project_id)
-    if project is None:
-        raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
-    if not project.can_access(user_id):
-        raise HTTPException(status_code=403, detail="Access denied to project")
-
-
 def _to_generation_task_response(task) -> GenerationTaskResponse:
    return GenerationTaskResponse(
        id=task.id,
@@ -97,7 +50,6 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
        source_edit_plan_id=task.source_edit_plan_id or "",
        asset_select_mode=getattr(task, "asset_select_mode", ""),
        batch_id=getattr(task, "batch_id", ""),
-        logs=getattr(task, "logs", "[]"),
        status=task.status,
        progress=task.progress,
        result_count=task.result_count,
@@ -222,37 +174,19 @@ def create_generation_task(
    asset_library_repository: Any = Depends(get_asset_library_repository),
    asset_repository: Any = Depends(get_asset_repository),
 ) -> BatchGenerationTaskResponse:
-    logger.info(
-        "[生成任务] 接收请求: user_id=%s, template_id=%s, asset_count=%d, mode=%s, count=%d",
-        authenticated_user.user.id,
-        request.template_id,
-        len(request.asset_ids),
-        request.asset_select_mode,
-        request.count,
+    project_id, asset_library_id = _resolve_project_and_library(
+        request, project_repository, asset_library_repository, asset_repository, authenticated_user
    )

-    try:
-        project_id, asset_library_id = _resolve_project_and_library(
-            request, project_repository, asset_library_repository, asset_repository, authenticated_user
-        )
-    except HTTPException as e:
-        logger.warning("[生成任务] 校验失败: %s", e.detail)
-        raise
-
    # asset_library 存在性校验（仅在提供了 asset_library_id 时）
    resolved_asset_ids: list[str] = list(request.asset_ids)
    if asset_library_id:
        library = asset_library_repository.get(asset_library_id)
        if library is None or (project_id and library.project_id != project_id):
-            logger.warning("[生成任务] 素材库不存在: library_id=%s", asset_library_id)
            raise HTTPException(status_code=404, detail=f"AssetLibrary {asset_library_id} not found")

        assets = asset_repository.find_by_library(asset_library_id)
-        try:
-            _ensure_library_has_ready_video_assets(assets)
-        except HTTPException as e:
-            logger.warning("[生成任务] 素材校验失败: %s", e.detail)
-            raise
+        _ensure_library_has_ready_video_assets(assets)

        # 素材库自动匹配：当未显式指定 asset_ids 时，按模式自动选取
        if not resolved_asset_ids:
@@ -265,37 +199,30 @@ def create_generation_task(
    use_case = CreateGenerationTaskUseCase(generation_task_repository)
    count = request.count
    created_tasks = []
-    failed_tasks = []
    # 同批次任务共享 batch_id，用于视频查重时批次内比对
    batch_id = uuid.uuid4().hex if count > 1 else ""

-    try:
-        for _ in range(count):
-            task = use_case.execute(
-                CreateGenerationTaskCommand(
-                    project_id=project_id,
-                    asset_library_id=asset_library_id,
-                    strategy_id=request.strategy_id,
-                    voice_library_id=request.voice_library_id,
-                    template_id=request.template_id,
-                    asset_ids=resolved_asset_ids,
-                    title_ids=request.title_ids,
-                    voice_ids=request.voice_ids,
-                    created_by_user_id=authenticated_user.user.id,
-                    source_edit_plan_id=request.source_edit_plan_id,
-                    asset_select_mode=request.asset_select_mode,
-                    batch_id=batch_id,
-                )
+    for _ in range(count):
+        task = use_case.execute(
+            CreateGenerationTaskCommand(
+                project_id=project_id,
+                asset_library_id=asset_library_id,
+                strategy_id=request.strategy_id,
+                voice_library_id=request.voice_library_id,
+                template_id=request.template_id,
+                asset_ids=resolved_asset_ids,
+                title_ids=request.title_ids,
+                voice_ids=request.voice_ids,
+                created_by_user_id=authenticated_user.user.id,
+                source_edit_plan_id=request.source_edit_plan_id,
+                asset_select_mode=request.asset_select_mode,
+                batch_id=batch_id,
            )
-            if _safe_enqueue_generation_task(task, generation_task_repository):
-                created_tasks.append(task)
-            else:
-                failed_tasks.append(task)
-    except Exception as e:
-        logger.error("[生成任务] 创建失败: %s", e, exc_info=True)
-        raise HTTPException(status_code=500, detail="创建生成任务失败，请稍后重试或查看任务日志")
+        )
+        celery_app.send_task("worker.generate_video", args=[task.id])
+        created_tasks.append(task)

-    items = [_to_generation_task_response(t) for t in created_tasks + failed_tasks]
+    items = [_to_generation_task_response(t) for t in created_tasks]
    return BatchGenerationTaskResponse(items=items, total=len(items))


@@ -322,7 +249,7 @@ def get_generation_task(
    if task is None:
        raise HTTPException(status_code=404, detail=f"GenerationTask {task_id} not found")
    if task.project_id:
-        _check_project_access(task.project_id, authenticated_user.user.id, project_repository)
+        check_project_access(task.project_id, authenticated_user.user.id, project_repository)
    return _to_generation_task_response(task)


@@ -339,7 +266,7 @@ def list_generation_results(
    if task is None:
        raise HTTPException(status_code=404, detail=f"GenerationTask {task_id} not found")
    if task.project_id:
-        _check_project_access(task.project_id, authenticated_user.user.id, project_repository)
+        check_project_access(task.project_id, authenticated_user.user.id, project_repository)
    use_case = ListGeneratedVideosByTaskUseCase(generated_video_repository)
    items = use_case.execute(task_id)
    responses = []
@@ -381,6 +308,5 @@ def retry_generation_task(
            asset_select_mode=getattr(task, "asset_select_mode", ""),
        )
    )
-    if not _safe_enqueue_generation_task(retried, generation_task_repository):
-        logger.warning("[生成任务] 重试入队失败: task_id=%s", retried.id)
+    celery_app.send_task("worker.generate_video", args=[retried.id])
    return _to_generation_task_response(retried)
@@ -20,7 +20,7 @@ from typing import Any

 from app.auth import AuthenticatedUser, get_current_user
 from app.core.celery_app import celery_app
-from app.dependencies import get_db_session, get_job_repository, get_project_repository
+from app.dependencies import get_job_repository, get_project_repository
 from app.schemas.job import (
    CompleteJobRequest,
    CreateJobRequest,
@@ -51,6 +51,8 @@ from packages.application.jobs import (
 )
 from packages.domain.job import JobType

+from app.api.routes._helpers import check_project_access
+
 logger = logging.getLogger(__name__)

 router = APIRouter()
@@ -66,15 +68,6 @@ _JOB_TYPE_TO_CELERY_TASK: dict[str, str] = {
 }


-def _check_project_access(project_id: str, user_id: str, project_repository) -> None:
-    """检查用户是否有项目访问权限。"""
-    project = project_repository.find_by_id(project_id)
-    if project is None:
-        raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
-    if not project.can_access(user_id):
-        raise HTTPException(status_code=403, detail="Access denied to project")
-
-
 # ── 创建任务 ──────────────────────────────────────────────────────────────────


@@ -89,7 +82,7 @@ def create_job(

    创建后任务处于 pending 状态，需要调用 /submit 提交执行。
    """
-    _check_project_access(request.project_id, authenticated_user.user.id, project_repository)
+    check_project_access(request.project_id, authenticated_user.user.id, project_repository)

    # 校验 job_type
    try:
@@ -182,7 +175,7 @@ def list_project_jobs(
    offset: int = Query(default=0, ge=0),
 ) -> ListJobsResponse:
    """获取项目下的任务列表。"""
-    _check_project_access(project_id, authenticated_user.user.id, project_repository)
+    check_project_access(project_id, authenticated_user.user.id, project_repository)

    use_case = ListJobsUseCase(job_repo)
    jobs = use_case.execute(
@@ -204,7 +197,7 @@ def get_job_statistics(
    project_repository: Any = Depends(get_project_repository),
 ) -> JobStatisticsResponse:
    """获取项目任务统计摘要。"""
-    _check_project_access(project_id, authenticated_user.user.id, project_repository)
+    check_project_access(project_id, authenticated_user.user.id, project_repository)

    use_case = GetJobStatisticsUseCase(job_repo)
    stats = use_case.execute(project_id)
@@ -33,6 +33,8 @@ from packages.application.recipe.use_cases import (
 )
 from packages.ports.user_repository import UserRepository

+from app.api.routes._helpers import get_user_plan
+
 router = APIRouter()


@@ -40,13 +42,6 @@ def _get_recipe_repository(session: Session = Depends(get_db_session)) -> SQLAlc
    return SQLAlchemyRecipeRepository(session)


-def _get_user_plan(user_id: str, user_repository: UserRepository) -> str:
-    user = user_repository.find_by_id(user_id)
-    if user is None:
-        return "free"
-    return getattr(user, "subscription_plan", "free") or "free"
-
-
 def _item_to_response(item) -> RecipeItemResponse:
    return RecipeItemResponse(
        id=item.id,
@@ -194,7 +189,7 @@ def use_recipe(
    user_repository: UserRepository = Depends(get_user_repository),
 ) -> UseRecipeResponse:
    user_id = authenticated_user.user.id
-    plan_name = _get_user_plan(user_id, user_repository)
+    plan_name = get_user_plan(user_id, user_repository)
    use_case = UseRecipeUseCase(recipe_repository)
    try:
        result = use_case.execute(recipe_id, user_id, user_plan=plan_name)
@@ -232,7 +232,7 @@ async def payment_callback(

        # 创建账单记录
        record_id = uuid.uuid4().hex
-        record = repo.create(
+        repo.create(
            {
                "id": record_id,
                "user_id": user_id,
@@ -25,35 +25,6 @@ from packages.application import (
 router = APIRouter()


-def _safe_enqueue_generation_task(
-    task: Any,
-    generation_task_repository: Any,
-) -> bool:
-    """安全入队：send_task 失败时自动把任务标记为 failed，避免留下 pending 僵尸任务。"""
-    try:
-        celery_app.send_task("worker.generate_video", args=[task.id])
-        logger.info("[任务中心] 生成任务入队成功: task_id=%s", task.id)
-        return True
-    except Exception as e:
-        logger.error(
-            "[任务中心] 生成任务入队失败，标记为失败: task_id=%s error=%s",
-            task.id,
-            e,
-            exc_info=True,
-        )
-        try:
-            task.mark_failed(f"任务入队失败: {e}")
-            generation_task_repository.update(task)
-        except Exception as update_err:
-            logger.error(
-                "[任务中心] 入队失败后更新状态也失败: task_id=%s error=%s",
-                task.id,
-                update_err,
-                exc_info=True,
-            )
-        return False
-
-
 def _humanize_task_error(error_message: str) -> str:
    raw = (error_message or "").strip()
    if not raw:
@@ -182,8 +153,7 @@ def retry_task_by_id(
            created_by_user_id=authenticated_user.user.id,
        )
    )
-    if not _safe_enqueue_generation_task(retried, generation_task_repository):
-        logger.warning("[任务中心] 用户级重试入队失败: task_id=%s", retried.id)
+    celery_app.send_task("worker.generate_video", args=[retried.id])
    return UserTaskResponse(
        id=f"generation:{retried.id}",
        task_type="generation",
@@ -265,8 +235,7 @@ def retry_project_task(
                created_by_user_id=authenticated_user.user.id,
            )
        )
-        if not _safe_enqueue_generation_task(retried, generation_task_repository):
-            logger.warning("[任务中心] 项目级重试用队失败: task_id=%s", retried.id)
+        celery_app.send_task("worker.generate_video", args=[retried.id])
        return _generation_task_to_project_response(retried)
    if task_type == "ingest":
        job = ingest_job_repository.get(source_id)
@@ -28,6 +28,8 @@ from packages.application.title_library.use_cases import (
 )
 from packages.ports.user_repository import UserRepository

+from app.api.routes._helpers import get_user_plan
+
 router = APIRouter()


@@ -51,13 +53,6 @@ def _to_response(item) -> TitleLibraryItemResponse:
    )


-def _get_user_plan(user_id: str, user_repository: UserRepository) -> str:
-    user = user_repository.find_by_id(user_id)
-    if user is None:
-        return "free"
-    return getattr(user, "subscription_plan", "free") or "free"
-
-
@router.get("", response_model=ListTitleLibraryResponse)
 def list_titles(
    category: Optional[str] = Query(None),
@@ -98,7 +93,7 @@ def create_title(
    user_repository: UserRepository = Depends(get_user_repository),
 ) -> TitleLibraryItemResponse:
    user_id = authenticated_user.user.id
-    plan_name = _get_user_plan(user_id, user_repository)
+    plan_name = get_user_plan(user_id, user_repository)
    command = CreateTitleLibraryCommand(
        user_id=user_id,
        name=request.name,
@@ -1,5 +1,5 @@
 import logging
-from typing import Annotated, Any
+from typing import Any
 from uuid import uuid4

 from app.auth import AuthenticatedUser, get_current_user
@@ -17,12 +17,13 @@ from app.schemas.upload import (
    DirectUploadCompleteResponse,
    DirectUploadPrepareRequest,
    DirectUploadPrepareResponse,
-    UploadAssetRequest,
    UploadAssetResponse,
 )
 from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, status

-from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase
+from packages.application import SubmitIngestJobCommand, SubmitIngestJobUseCase
+
+from app.api.routes._helpers import require_project_and_library

 logger = logging.getLogger(__name__)

@@ -80,21 +81,6 @@ def _validate_mime_type(content_type: str | None) -> str:
    return base_type


-def _require_project_and_library(
-    project_id: str,
-    library_id: str,
-    project_repository: Any,
-    asset_library_repository: Any,
-) -> None:
-    project = GetProjectUseCase(project_repository).execute(project_id)
-    if project is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
-
-    libraries = asset_library_repository.find_by_project(project_id)
-    if not any(item.id == library_id for item in libraries):
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found")
-
-
 def _submit_ingest_job(
    project_id: str,
    library_id: str,
@@ -135,7 +121,7 @@ async def prepare_direct_upload(
    # P2-5: 服务端验证 MIME 类型
    validated_content_type = _validate_mime_type(request.content_type)

-    _require_project_and_library(
+    require_project_and_library(
        request.project_id,
        request.library_id,
        project_repository,
@@ -183,7 +169,7 @@ async def complete_direct_upload(
    storage_service: OSSStorageService = Depends(get_storage_service),
 ) -> DirectUploadCompleteResponse:
    """确认浏览器直传完成并创建导入任务。"""
-    _require_project_and_library(
+    require_project_and_library(
        request.project_id,
        request.library_id,
        project_repository,
@@ -252,7 +238,7 @@ async def upload_asset(
    storage_service: OSSStorageService = Depends(get_storage_service),
 ) -> UploadAssetResponse:
    """上传素材文件并触发导入流水线。"""
-    _require_project_and_library(project_id, library_id, project_repository, asset_library_repository)
+    require_project_and_library(project_id, library_id, project_repository, asset_library_repository)

    # ── 素材去重检测：上传前检查同素材库 + 同 file_hash ──
    if file_hash:
@@ -28,7 +28,6 @@ from packages.application.voice_clone.use_cases import (
    VoiceCloneNotRetryableError,
 )
 from packages.application.voice_clone.workflow import (
-    VoiceCloneWorkflowError,
    VoiceCloneWorkflowService,
 )

@@ -39,6 +39,8 @@ from packages.application.voice_library.use_cases import (
 from packages.domain.preset_voices import PRESET_VOICES
 from packages.ports.user_repository import UserRepository

+from app.api.routes._helpers import get_user_plan
+
 router = APIRouter()


@@ -118,13 +120,6 @@ def _preset_to_unified_response(preset) -> UnifiedVoiceItemResponse:
    )


-def _get_user_plan(user_id: str, user_repository: UserRepository) -> str:
-    user = user_repository.find_by_id(user_id)
-    if user is None:
-        return "free"
-    return getattr(user, "subscription_plan", "free") or "free"
-
-
 # ==================== 统一配音列表（预置 + 克隆）====================


@@ -260,7 +255,7 @@ def create_voice(
    user_repository: UserRepository = Depends(get_user_repository),
 ) -> VoiceLibraryItemResponse:
    user_id = authenticated_user.user.id
-    plan_name = _get_user_plan(user_id, user_repository)
+    plan_name = get_user_plan(user_id, user_repository)
    command = CreateVoiceLibraryCommand(
        user_id=user_id,
        name=request.name,
@@ -25,7 +25,7 @@ class Settings(BaseSettings):
    DATABASE_POOL_SIZE: int = 20
    DATABASE_MAX_OVERFLOW: int = 10  # 调整为合理值：pool_size(20) + max_overflow(10) = 最大30连接
    DATABASE_POOL_TIMEOUT: int = 30
-    DATABASE_POOL_RECYLE: int = 3600
+    DATABASE_POOL_RECYCLE: int = 3600
    USE_IN_MEMORY_DB: bool = False
    AUTO_CREATE_SCHEMA: bool = False

@@ -41,6 +41,11 @@ class Settings(BaseSettings):
    # 密钥轮换天数（到达此天数后建议更换密钥）
    SECRET_ROTATION_DAYS: int = 90

+    # JWT 算法与过期时间（与 .env.example 对齐）
+    JWT_ALGORITHM: str = "HS256"
+    JWT_ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
+    JWT_REFRESH_TOKEN_EXPIRE_DAYS: int = 30
+
    @field_validator("JWT_SECRET_KEY", mode="before")
    @classmethod
    def validate_jwt_secret_key(cls, v):
@@ -75,7 +80,7 @@ class Settings(BaseSettings):
    CELERY_RESULT_BACKEND: str = "redis://localhost:6379/1"

    # OSS 七牛云相关
-    OSS_ENDPOINT: str = "oss-cn-hangzhou.aliiyuncs.com"
+    OSS_ENDPOINT: str = "oss-cn-hangzhou.aliyuncs.com"
    OSS_ACCESS_KEY_ID: str = ""
    OSS_ACCESS_KEY_SECRET: str = ""
    OSS_BUCKET_NAME: str = "xiaoxia-autocut"
@@ -1 +0,0 @@
-"""Core configuration package."""
@@ -50,20 +50,8 @@ from packages.adapters.sqlalchemy_impl.voice_clone_profile_repository import (
 from packages.adapters.sqlalchemy_impl.voice_library_repository import (
    SQLAlchemyVoiceLibraryRepository,
 )
-from packages.ports.asset_library_repository import AssetLibraryRepository
-from packages.ports.asset_repository import AssetRepository
-from packages.ports.classification_job_repository import ClassificationJobRepository
-from packages.ports.duplication_repository import DuplicationRecordRepository
-from packages.ports.generated_video_repository import GeneratedVideoRepository
-from packages.ports.generation_task_repository import GenerationTaskRepository
-from packages.ports.ingest_job_repository import IngestJobRepository
-from packages.ports.job_repository import JobRepository
-from packages.ports.project_repository import ProjectRepository
 from packages.ports.tag_repository import TagRepository
-from packages.ports.title_library_repository import TitleLibraryRepository
 from packages.ports.user_repository import UserRepository
-from packages.ports.voice_clone_profile_repository import VoiceCloneProfileRepository
-from packages.ports.voice_library_repository import VoiceLibraryRepository

 _engine, _SessionLocal = build_session_factory(settings.DATABASE_URL)

@@ -201,18 +189,7 @@ def get_voice_clone_profile_repository(


 def get_cosyvoice_service():
-    """Provide the CosyVoice service instance.
-
-    注入 OSS 音频URL预签名函数，确保私有bucket下的参考音频
-    能被 CosyVoice 服务器下载。
-    """
-    from app.core.storage import get_storage_service
+    """Provide the CosyVoice service instance."""
    from packages.application.cosyvoice_service import CosyVoiceService

-    storage = get_storage_service()
-
-    def _sign_audio_url(url: str) -> str:
-        """对音频URL做预签名，私有bucket下 CosyVoice 服务器才能下载."""
-        return storage.get_download_url(url, expires_seconds=86400)
-
-    return CosyVoiceService(audio_url_signer=_sign_audio_url)
+    return CosyVoiceService()
@@ -10,7 +10,7 @@ from __future__ import annotations
 from app.auth import AuthenticatedUser
 from app.auth import get_current_user as get_authenticated_user
 from app.dependencies import get_user_repository
-from fastapi import Depends
+from fastapi import Depends, HTTPException
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer

 from packages.domain.entities import User
@@ -6,7 +6,7 @@ import logging
 import time
 from typing import Callable

-from fastapi import Request, Response
+from fastapi import Request
 from starlette.middleware.base import BaseHTTPMiddleware

 logger = logging.getLogger(__name__)
@@ -1,6 +1,4 @@
-import json
-
-from pydantic import BaseModel, Field, field_validator, model_validator
+from pydantic import BaseModel, Field, model_validator


 class CreateGenerationTaskRequest(BaseModel):
@@ -64,21 +62,6 @@ class GenerationTaskResponse(BaseModel):
    progress: float
    result_count: int
    error_message: str
-    logs: list[dict] = Field(default_factory=list)
-
-    @field_validator("logs", mode="before")
-    @classmethod
-    def _parse_logs(cls, v: object) -> list[dict]:
-        """将 JSON 字符串解析为 list[dict]。"""
-        if isinstance(v, str):
-            try:
-                parsed = json.loads(v)
-                return parsed if isinstance(parsed, list) else []
-            except (json.JSONDecodeError, TypeError):
-                return []
-        if isinstance(v, list):
-            return v
-        return []


 class BatchGenerationTaskResponse(BaseModel):
@@ -2,7 +2,7 @@

 from __future__ import annotations

-from typing import List, Optional
+from typing import Optional

 from pydantic import BaseModel, Field

@@ -24,7 +24,7 @@ from packages.adapters.sqlalchemy_impl import (
 )
 from packages.domain.asset import AssetType
 from packages.domain.classification import AssetClassification
-from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
+from packages.domain.edit_plan_clip import EditPlanClip

 logger = logging.getLogger(__name__)

@@ -18,7 +18,6 @@ from packages.adapters.sqlalchemy_impl import (
 )
 from packages.domain.edit_plan import EditPlan, EditPlanStatus
 from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
-from packages.domain.generation_task import GenerationTaskStatus

 logger = logging.getLogger(__name__)

@@ -13,7 +13,6 @@ from __future__ import annotations
 import logging
 from typing import Any

-from sqlalchemy.orm import Session

 from packages.application.jobs import (
    CancelJobUseCase,
@@ -13,7 +13,7 @@
 from __future__ import annotations

 import logging
-from typing import Any, List, Optional
+from typing import Any, List

 from sqlalchemy.orm import Session

@@ -16,7 +16,6 @@ FFmpeg 视频合成编排服务：
 from __future__ import annotations

 import logging
-import shutil
 from dataclasses import dataclass, field
 from typing import Any

@@ -28,7 +27,7 @@ from packages.adapters.sqlalchemy_impl.edit_plan_clip_repository import (
 from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
    SQLAlchemyEditPlanRepository,
 )
-from packages.domain.edit_plan import EditPlan, EditPlanStatus
+from packages.domain.edit_plan import EditPlanStatus
 from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
 from packages.domain.template_clip_config import TransitionEffect

@@ -40,9 +40,6 @@ def oss_settings() -> tuple[str, str, str, str] | None:
 def oss_bucket() -> oss2.Bucket | None:
    """获取 OSS Bucket 实例。

-    P0-2 修复：endpoint 不带 scheme 时自动补 https:// 前缀，
-    确保 sign_url 等依赖 scheme 的方法返回 HTTPS URL。
-
    Returns:
        oss2.Bucket 实例，配置缺失时返回 None。
    """
@@ -50,9 +47,6 @@ def oss_bucket() -> oss2.Bucket | None:
    if settings is None:
        return None
    access_key_id, access_key_secret, endpoint, bucket_name = settings
-    # endpoint 无 scheme 时补 https://，与 API 端 storage.py 保持一致
-    if not endpoint.startswith(("http://", "https://")):
-        endpoint = f"https://{endpoint}"
    return oss2.Bucket(oss2.Auth(access_key_id, access_key_secret), endpoint, bucket_name)


@@ -111,37 +105,13 @@ def upload_to_oss(local_path: Path, storage_key: str) -> str | None:
        settings = oss_settings()
        if settings:
            _, _, endpoint, bucket_name = settings
-            endpoint_clean = endpoint.replace("https://", "").replace("http://", "")
-            return f"https://{bucket_name}.{endpoint_clean}/{storage_key}"
+            return f"https://{bucket_name}.{endpoint.replace('https://', '').replace('http://', '')}/{storage_key}"
        return None
    except Exception:
        logger.exception("上传 OSS 失败: %s", storage_key)
        return None


-def get_signed_download_url(storage_key_or_url: str, expires_seconds: int = 3600) -> str | None:
-    """生成预签名下载 URL（用于私有 bucket 的 URL 校验或临时下载）。
-
-    Args:
-        storage_key_or_url: 存储键或完整 URL（URL 会自动提取 path）
-        expires_seconds: 签名有效期（秒）
-
-    Returns:
-        预签名 URL，失败或 OSS 未配置时返回 None。
-    """
-    bucket = oss_bucket()
-    if bucket is None:
-        return None
-    try:
-        storage_key = normalize_storage_key(storage_key_or_url)
-        signed = bucket.sign_url("GET", storage_key, expires_seconds)
-        logger.info("生成预签名URL: key=%s url_prefix=%s", storage_key[:80], signed[:60])
-        return signed
-    except Exception:
-        logger.exception("生成预签名URL失败: %s", storage_key_or_url[:80])
-        return None
-
-
 # ── Asset 解析 ────────────────────────────────────────────────────────────────


@@ -339,8 +339,8 @@ class UnifiedRenderService:
                )
                filters.append(f"pad={self.output_width}:{self.output_height}" ":(ow-iw)/2:(oh-ih)/2:black")

-            filters.append("setpts=PTS-STARTPTS")
            filters.append(f"fps={self.output_fps}")
+            filters.append("setpts=PTS-STARTPTS")

            filter_str = f"[{i}:v]{','.join(filters)}[{label}]"
            filter_parts.append(filter_str)
@@ -13,13 +13,10 @@

 from __future__ import annotations

-import json
 import logging
 import os
 import tempfile
-import time
 from dataclasses import dataclass, field
-from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Optional

@@ -84,33 +81,12 @@ def _update_task_status(task_id: str, status_action: str, **kwargs) -> bool:
        return False


-# ── 日志持久化辅助 ────────────────────────────────────────────────────────────
-
-
-def _flush_logs(task_id: str, gen_task) -> None:
-    """将 gen_task.logs 持久化到 DB（独立 session，失败不抛异常）。"""
-    try:
-        session = SessionLocal()
-        try:
-            from packages.adapters.sqlalchemy_impl.models import GenerationTaskModel
-
-            model = session.query(GenerationTaskModel).filter(GenerationTaskModel.id == task_id).first()
-            if model:
-                model.logs = gen_task.logs
-                session.commit()
-        finally:
-            session.close()
-    except Exception:
-        logger.warning("[task_id=%s] 日志持久化失败", task_id, exc_info=True)
-
-
 # ── 共享工具模块导入 ──────────────────────────────────────────────────────────

 from video_processing.dedup_helpers import create_video_record_and_dedup
 from video_processing.ffmpeg_utils import FFMPEG_BIN, probe_duration, run_ffmpeg
 from video_processing.oss_helpers import (
    download_asset,
-    get_signed_download_url,
    upload_to_oss,
 )
 from video_processing.unified_render_service import UnifiedRenderService
@@ -343,8 +319,6 @@ def _download_library_assets(
    asset_ids: list[str] | None = None,
    video_extensions: tuple = (".mp4", ".mov", ".avi", ".mkv", ".webm"),
    strict: bool = True,
-    task_id: str = "",
-    gen_task=None,
 ) -> list[Path]:
    """下载视频素材 — 同时支持素材库模式和项目级模式。

@@ -444,65 +418,19 @@ def _download_library_assets(
                storage_key = asset.file_url if asset.file_url else None
                if not storage_key:
                    failed_assets.append(f"{asset.name}({asset.id})")
-                    logger.warning(
-                        "[task_id=%s] 素材缺少 file_url, 跳过: asset_id=%s name=%s", task_id, asset.id, asset.name
-                    )
-                    if gen_task:
-                        gen_task.append_log(
-                            "下载素材",
-                            "素材缺少file_url, 跳过",
-                            level="WARN",
-                            asset_id=asset.id,
-                            asset_name=asset.name,
-                            success=False,
-                            file_size=0,
-                            duration=0.0,
-                        )
+                    logger.warning("素材缺少 file_url, 跳过: asset_id=%s name=%s", asset.id, asset.name)
                    if strict:
                        raise RuntimeError(f"素材缺少 file_url: asset_id={asset.id}, name={asset.name}")
                    continue

                ext = Path(storage_key).suffix or ".mp4"
                local_file = temp_path / f"asset_{i:03d}_{asset.id}{ext}"
-                asset_start = time.monotonic()
-                download_ok = download_asset(storage_key, local_file)
-                asset_elapsed = time.monotonic() - asset_start
-
-                if download_ok:
-                    file_size = local_file.stat().st_size if local_file.exists() else 0
+                if download_asset(storage_key, local_file):
                    downloaded.append(local_file)
-                    logger.info(
-                        "[task_id=%s] Downloaded asset: %s -> %s (size=%d, time=%.1fs)",
-                        task_id,
-                        asset.name,
-                        local_file,
-                        file_size,
-                        asset_elapsed,
-                    )
-                    if gen_task:
-                        gen_task.append_log(
-                            "下载素材",
-                            f"下载成功: {asset.name}",
-                            asset_id=asset.id,
-                            asset_name=asset.name,
-                            success=True,
-                            file_size=file_size,
-                            duration=round(asset_elapsed, 2),
-                        )
+                    logger.info("Downloaded asset: %s -> %s", asset.name, local_file)
                else:
                    failed_assets.append(f"{asset.name}({asset.id})")
-                    logger.warning("[task_id=%s] Failed to download asset: %s (id=%s)", task_id, asset.name, asset.id)
-                    if gen_task:
-                        gen_task.append_log(
-                            "下载素材",
-                            f"下载失败: {asset.name}",
-                            level="WARN",
-                            asset_id=asset.id,
-                            asset_name=asset.name,
-                            success=False,
-                            file_size=0,
-                            duration=round(asset_elapsed, 2),
-                        )
+                    logger.warning("Failed to download asset: %s (id=%s)", asset.name, asset.id)
                    if strict:
                        raise RuntimeError(f"素材下载失败: asset_id={asset.id}, name={asset.name}")

@@ -582,7 +510,7 @@ def generate_video(self, task_id: str) -> dict:
    """
    from packages.domain import EditingMode

-    logger.info("[task_id=%s] [接收任务] 开始生成视频任务", task_id)
+    logger.info("开始生成视频任务: task_id=%s", task_id)

    # 从数据库加载任务信息
    session = SessionLocal()
@@ -594,7 +522,7 @@ def generate_video(self, task_id: str) -> dict:
        task_repo = SQLAlchemyGenerationTaskRepository(session)
        gen_task = task_repo.get(task_id)
        if gen_task is None:
-            logger.error("[task_id=%s] [接收任务] 任务不存在", task_id)
+            logger.error("生成任务不存在: task_id=%s", task_id)
            return {"status": "failed", "error": f"generation task {task_id} not found"}
        project_id = gen_task.project_id
        asset_library_id = gen_task.asset_library_id
@@ -603,16 +531,6 @@ def generate_video(self, task_id: str) -> dict:
        mode = gen_task.strategy_id or "one_take"
        task_asset_ids = list(gen_task.asset_ids or [])
        batch_id = getattr(gen_task, "batch_id", "") or ""
-
-        # 记录接收任务日志
-        gen_task.append_log(
-            "接收任务",
-            f"模式={mode}, 模板={template_id}, 素材数={len(task_asset_ids)}",
-            mode=mode,
-            template_id=template_id,
-            asset_count=len(task_asset_ids),
-        )
-        _flush_logs(task_id, gen_task)
    finally:
        session.close()

@@ -639,40 +557,12 @@ def generate_video(self, task_id: str) -> dict:
            output_path = temp_path / output_name

            # 1. 从素材库/项目下载视频素材
-            logger.info("[task_id=%s] [下载素材] 开始下载视频素材", task_id)
-            download_start = time.monotonic()
            downloaded_videos = _download_library_assets(
                temp_path,
                asset_library_id=asset_library_id,
                project_id=project_id,
                asset_ids=task_asset_ids or None,
-                task_id=task_id,
-                gen_task=gen_task,
            )
-            download_elapsed = time.monotonic() - download_start
-            logger.info(
-                "[task_id=%s] [下载素材] 完成: 成功=%d个, 耗时=%.1fs",
-                task_id,
-                len(downloaded_videos),
-                download_elapsed,
-            )
-
-            # 重新加载 gen_task 以追加日志（session 已关闭）
-            _session = SessionLocal()
-            try:
-                _repo = SQLAlchemyGenerationTaskRepository(_session)
-                gen_task = _repo.get(task_id)
-            finally:
-                _session.close()
-
-            if gen_task:
-                gen_task.append_log(
-                    "下载素材",
-                    f"成功下载 {len(downloaded_videos)} 个视频素材",
-                    count=len(downloaded_videos),
-                    duration=round(download_elapsed, 2),
-                )
-                _flush_logs(task_id, gen_task)

            # 2. 下载配音（如有）
            audio_path: str | None = None
@@ -680,7 +570,6 @@ def generate_video(self, task_id: str) -> dict:
                local_audio = temp_path / "voice.mp3"
                if _download_voice_asset(voice_library_id, local_audio):
                    audio_path = str(local_audio)
-                    logger.info("[task_id=%s] [下载配音] 配音下载成功", task_id)

            # 3. 渲染
            if not downloaded_videos:
@@ -698,26 +587,7 @@ def generate_video(self, task_id: str) -> dict:
                mode=editing_mode.value,
            )

-            total_duration = sum(c.duration for c in virtual_clips)
-            logger.info(
-                "[task_id=%s] [剪辑计划] 片段数=%d, 总时长=%.1fs",
-                task_id,
-                len(virtual_clips),
-                total_duration,
-            )
-
-            if gen_task:
-                gen_task.append_log(
-                    "剪辑计划",
-                    f"片段数={len(virtual_clips)}, 总时长={total_duration:.1f}s",
-                    segment_count=len(virtual_clips),
-                    total_duration=round(total_duration, 2),
-                )
-                _flush_logs(task_id, gen_task)
-
            # 使用 UnifiedRenderService 渲染
-            logger.info("[task_id=%s] [渲染] FFmpeg 渲染开始", task_id)
-            render_start = time.monotonic()
            render_service = UnifiedRenderService(
                plan=virtual_plan,
                clips=virtual_clips,
@@ -728,20 +598,6 @@ def generate_video(self, task_id: str) -> dict:
                output_fps=int(OUTPUT_FPS),
            )
            render_result = render_service.render()
-            render_elapsed = time.monotonic() - render_start
-            logger.info(
-                "[task_id=%s] [渲染] FFmpeg 渲染完成: 耗时=%.1fs",
-                task_id,
-                render_elapsed,
-            )
-
-            if gen_task:
-                gen_task.append_log(
-                    "渲染",
-                    f"FFmpeg 渲染完成, 耗时={render_elapsed:.1f}s",
-                    duration=round(render_elapsed, 2),
-                )
-                _flush_logs(task_id, gen_task)

            # 4. 如有配音，后处理混音
            if audio_path:
@@ -751,7 +607,7 @@ def generate_video(self, task_id: str) -> dict:
                    # 混音成功，使用混音后的文件
                    output_path = final_path
                except Exception as mux_err:
-                    logger.warning("[task_id=%s] [混音] 音频混合失败，使用无音频版本: %s", task_id, mux_err)
+                    logger.warning("音频混合失败，使用无音频版本: %s", mux_err)
                    output_path = render_result.output_path
            else:
                output_path = render_result.output_path
@@ -760,59 +616,18 @@ def generate_video(self, task_id: str) -> dict:
            duration = probe_duration(output_path)

            # 5. 上传到 OSS — 失败必须抛异常，不能静默忽略
-            logger.info("[task_id=%s] [OSS上传] 开始上传: size=%d", task_id, file_size)
-            upload_start = time.monotonic()
            file_url = upload_to_oss(output_path, storage_key)
-            upload_elapsed = time.monotonic() - upload_start
            if not file_url:
                # OSS 未配置或上传失败
-                if gen_task:
-                    gen_task.append_log("OSS上传", "上传失败", level="ERROR")
-                    _flush_logs(task_id, gen_task)
                raise RuntimeError(
                    f"OSS 上传失败: task_id={task_id}, storage_key={storage_key}, " f"output_path={output_path}"
                )

-            # P0-2 修复：私有 bucket 下裸 URL 永远 403，改用预签名 URL 校验
-            # 先用预签名 URL 校验，失败则降级为检查文件是否存在（object_exists）
-            verify_url = get_signed_download_url(file_url, expires_seconds=300) or file_url
-            if not _verify_url_accessible(verify_url):
-                # 预签名 URL 也访问失败时，退一步用 object_exists 确认上传成功
-                from video_processing.oss_helpers import oss_bucket, normalize_storage_key
+            # HEAD 校验 URL 可访问
+            if not _verify_url_accessible(file_url):
+                raise RuntimeError(f"OSS 上传后 URL 不可访问: file_url={file_url}, " f"storage_key={storage_key}")

-                bucket = oss_bucket()
-                key = normalize_storage_key(file_url)
-                if bucket and bucket.object_exists(key):
-                    logger.info(
-                        "URL 校验失败但 object_exists 确认文件存在，视为上传成功: storage_key=%s", key
-                    )
-                    if gen_task:
-                        gen_task.append_log("OSS上传", "URL校验降级: object_exists确认存在", level="WARN")
-                else:
-                    if gen_task:
-                        gen_task.append_log("OSS上传", "上传后URL不可访问", level="ERROR", file_url=file_url)
-                        _flush_logs(task_id, gen_task)
-                    raise RuntimeError(
-                        f"OSS 上传后 URL 不可访问且 object_exists 失败: file_url={file_url}, "
-                        f"storage_key={storage_key}"
-                    )
-
-            logger.info(
-                "[task_id=%s] [OSS上传] 成功: 耗时=%.1fs, file_url=%s",
-                task_id,
-                upload_elapsed,
-                file_url,
-            )
-
-            if gen_task:
-                gen_task.append_log(
-                    "OSS上传",
-                    f"上传成功, 大小={file_size}, 耗时={upload_elapsed:.1f}s",
-                    file_size=file_size,
-                    duration=round(upload_elapsed, 2),
-                    file_url=file_url,
-                )
-                _flush_logs(task_id, gen_task)
+            logger.info("OSS 上传成功: file_url=%s", file_url)

            # 6. 创建 GeneratedVideo 记录 + 查重
            dedup_session = SessionLocal()
@@ -834,23 +649,7 @@ def generate_video(self, task_id: str) -> dict:
            # 7. 标记任务为 completed
            _update_task_status(task_id, "mark_completed", result_count=video_count or 1)

-            # 记录完成日志
-            if gen_task:
-                gen_task.append_log(
-                    "任务完成",
-                    f"视频生成完成: 时长={duration:.2f}s, 大小={file_size}",
-                    duration=round(duration, 2),
-                    file_size=file_size,
-                    video_count=video_count or 1,
-                )
-                _flush_logs(task_id, gen_task)
-
-            logger.info(
-                "[task_id=%s] [任务完成] duration=%.2fs file_size=%d",
-                task_id,
-                duration,
-                file_size,
-            )
+            logger.info("视频生成完成: task_id=%s duration=%.2fs file_size=%d", task_id, duration, file_size)

            return {
                "status": "completed",
@@ -863,27 +662,7 @@ def generate_video(self, task_id: str) -> dict:
                "mode": editing_mode.value,
            }
    except Exception as error:
-        logger.error("[task_id=%s] [任务失败] %s", task_id, error, exc_info=True)
-
-        # 记录失败日志
-        try:
-            _session = SessionLocal()
-            try:
-                _repo = SQLAlchemyGenerationTaskRepository(_session)
-                gen_task = _repo.get(task_id)
-                if gen_task:
-                    gen_task.append_log(
-                        "任务失败",
-                        str(error),
-                        level="ERROR",
-                        error_type=type(error).__name__,
-                    )
-                    _flush_logs(task_id, gen_task)
-            finally:
-                _session.close()
-        except Exception:
-            logger.warning("[task_id=%s] 记录失败日志异常", task_id, exc_info=True)
-
+        logger.error("Video generation failed: %s", error, exc_info=True)
        _update_task_status(task_id, "mark_failed", error_message=str(error))
        return {
            "status": "failed",
@@ -16,7 +16,6 @@ from packages.application.cosyvoice_service import (
    CosyVoiceTimeoutError,
 )
 from packages.application.voice_clone.workflow import VoiceCloneWorkflowService
-from video_processing.oss_helpers import get_signed_download_url

 logger = logging.getLogger(__name__)

@@ -49,9 +48,7 @@ def process_voice_clone(self: Task, profile_id: str) -> dict:
        repo = SQLAlchemyVoiceCloneProfileRepository(session)
        workflow = VoiceCloneWorkflowService(
            repository=repo,
-            cosyvoice_service=CosyVoiceService(
-                audio_url_signer=lambda url: get_signed_download_url(url, expires_seconds=86400) or url
-            ),
+            cosyvoice_service=CosyVoiceService(),
        )

        updated_profile = workflow.poll_and_process_clone(profile_id, timeout=300)
@@ -1549,14 +1549,6 @@
          "type": "JSON",
          "unique": false
        },
-        {
-          "index": false,
-          "name": "logs",
-          "nullable": false,
-          "primary_key": false,
-          "type": "TEXT",
-          "unique": false
-        },
        {
          "index": false,
          "name": "created_at",
@@ -6,14 +6,14 @@
 # 基础镜像：Python 3.12
 FROM git.xiaoxiajianji.com/xiaoxia/base/python:3.12-slim

-# 构建参数：版本号（CI 传入 commit hash）
-ARG APP_VERSION=dev
-
 # 使用阿里云镜像加速
-RUN sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null ||     sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list 2>/dev/null || true
+RUN sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null || \
+    sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list 2>/dev/null || true

 # 安装系统依赖
-RUN apt-get update && apt-get install -y --no-install-recommends     libpq-dev     && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libpq-dev \
+    && rm -rf /var/lib/apt/lists/*

 # 设置工作目录
 WORKDIR /app
@@ -21,12 +21,15 @@ WORKDIR /app
 # ---- 依赖分层：基础依赖（变化少，缓存命中率高）----
 COPY requirements-base.txt /tmp/requirements-base.txt

-RUN python -m venv /opt/venv     && /opt/venv/bin/pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements-base.txt     && rm /tmp/requirements-base.txt
+RUN python -m venv /opt/venv \
+    && /opt/venv/bin/pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements-base.txt \
+    && rm /tmp/requirements-base.txt

 # ---- 依赖分层：业务依赖（变化频繁）----
 COPY requirements.txt /tmp/requirements.txt

-RUN /opt/venv/bin/pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt     && rm /tmp/requirements.txt
+RUN /opt/venv/bin/pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \
+    && rm /tmp/requirements.txt

 # 复制应用代码
 COPY apps/api/ /app/apps/api/
@@ -37,13 +40,13 @@ COPY alembic/ /app/alembic/
 COPY scripts/ /app/scripts/

 # 设置环境变量
-ENV PATH="/opt/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ENV PATH="/opt/venv/bin:$PATH"
 ENV PYTHONPATH=/app
 ENV PYTHONUNBUFFERED=1
-ENV APP_VERSION=$APP_VERSION

 # 健康检查
-HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3     CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/health', timeout=5)"
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+    CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/health', timeout=5)"

 # API 入口点
 WORKDIR /app/apps/api
@@ -1,13 +0,0 @@
-#!/bin/bash
-# Worker 启动脚本 — 支持 WORKER_CONCURRENCY 环境变量
-# 未设置时默认 2（保持向后兼容）
-
-set -e
-
-CONCURRENCY="${WORKER_CONCURRENCY:-2}"
-
-exec celery \
-  -A worker_app.celery_app \
-  worker \
-  --loglevel=info \
-  "--concurrency=${CONCURRENCY}"
@@ -6,9 +6,6 @@
 # 基础镜像：Python 3.12 + ffmpeg
 FROM git.xiaoxiajianji.com/xiaoxia/base/python:3.12-slim

-# 构建参数：版本号（CI 传入 commit hash）
-ARG APP_VERSION=dev
-
 # 使用阿里云镜像加速
 RUN sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null || \
    sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list 2>/dev/null || true
@@ -51,15 +48,10 @@ COPY packages/ /app/packages/
 COPY alembic.ini /app/alembic.ini
 COPY migrations/ /app/migrations/

-# 复制 Worker 启动脚本（支持 WORKER_CONCURRENCY 环境变量）
-COPY infra/docker/entrypoint-worker.sh /usr/local/bin/entrypoint-worker.sh
-RUN chmod +x /usr/local/bin/entrypoint-worker.sh
-
 # 设置 Python 路径
 ENV PATH="/opt/venv/bin:$PATH"
 ENV PYTHONPATH=/app
 ENV PYTHONUNBUFFERED=1
-ENV APP_VERSION=$APP_VERSION

 # 创建非 root 用户运行 Worker
 RUN groupadd -r celery && useradd -r -g celery -d /app -s /sbin/nologin celery \
@@ -69,4 +61,4 @@ USER celery

 # Worker 入口点
 WORKDIR /app/apps/worker
-CMD ["/usr/local/bin/entrypoint-worker.sh"]
+CMD ["celery", "-A", "worker_app.celery_app", "worker", "--loglevel=info", "--concurrency=2"]
@@ -1 +0,0 @@
-"""Packages root."""
@@ -1 +0,0 @@
-"""Adapters package for external implementations."""
@@ -27,7 +27,6 @@ def _to_domain(model: GenerationTaskModel) -> GenerationTask:
        source_edit_plan_id=model.source_edit_plan_id or "",
        asset_select_mode=model.asset_select_mode or "",
        batch_id=model.batch_id or "",
-        logs=model.logs or "[]",
        created_at=model.created_at,
    )

@@ -57,7 +56,6 @@ class SQLAlchemyGenerationTaskRepository:
            source_edit_plan_id=task.source_edit_plan_id or None,
            asset_select_mode=task.asset_select_mode or "",
            batch_id=task.batch_id or "",
-            logs=task.logs,
            created_at=task.created_at,
        )
        self.session.add(model)
@@ -131,6 +129,5 @@ class SQLAlchemyGenerationTaskRepository:
        model.source_edit_plan_id = task.source_edit_plan_id or None
        model.asset_select_mode = task.asset_select_mode or ""
        model.batch_id = task.batch_id or ""
-        model.logs = task.logs
        self.session.commit()
        return task
@@ -1,6 +1,6 @@
 from datetime import datetime, timezone

-from sqlalchemy import JSON, Boolean, Column, DateTime, Float, Integer, String, Text, UniqueConstraint, create_engine
+from sqlalchemy import JSON, Boolean, Column, DateTime, Float, Integer, String, Text, UniqueConstraint
 from sqlalchemy.orm import declarative_base

 Base = declarative_base()
@@ -257,7 +257,6 @@ class GenerationTaskModel(Base):
    asset_select_mode = Column(String(20), nullable=False, default="")
    batch_id = Column(String(36), nullable=False, default="", index=True)
    extra_meta = Column("metadata", JSON, nullable=False, default=dict)
-    logs = Column(Text, nullable=False, default="[]", server_default="[]")
    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))


@@ -27,7 +27,6 @@ from .generated_videos import (
 from .generation_tasks import (
    CreateGenerationTaskCommand,
    CreateGenerationTaskUseCase,
-    GetGenerationTaskUseCase,
 )
 from .ingest_jobs import SubmitIngestJobCommand, SubmitIngestJobUseCase
 from .jobs import (
@@ -12,10 +12,9 @@ JWT 处理器委托层
    payload = jwt_handler.verify_access_token(token)
 """

-from datetime import datetime, timedelta
 from typing import Any, Dict, Optional

-from packages.application.auth.jwt_service import JWTConfig, JWTService, TokenType
+from packages.application.auth.jwt_service import JWTConfig, JWTService


 class JWTHandler:
@@ -208,10 +208,10 @@ def _get_jwt_service():
        kw = dict(secret_key=settings.JWT_SECRET_KEY)
        if hasattr(settings, "JWT_ALGORITHM"):
            kw["algorithm"] = settings.JWT_ALGORITHM
-        if hasattr(settings, "ACCESS_TOKEN_EXPIRE_MINUTES"):
-            kw["access_token_expire_minutes"] = settings.ACCESS_TOKEN_EXPIRE_MINUTES
-        if hasattr(settings, "REFRESH_TOKEN_EXPIRE_DAYS"):
-            kw["refresh_token_expire_days"] = settings.REFRESH_TOKEN_EXPIRE_DAYS
+        if hasattr(settings, "JWT_ACCESS_TOKEN_EXPIRE_MINUTES"):
+            kw["access_token_expire_minutes"] = settings.JWT_ACCESS_TOKEN_EXPIRE_MINUTES
+        if hasattr(settings, "JWT_REFRESH_TOKEN_EXPIRE_DAYS"):
+            kw["refresh_token_expire_days"] = settings.JWT_REFRESH_TOKEN_EXPIRE_DAYS
        _jwt_service_instance = JWTService(JWTConfig(**kw))
    return _jwt_service_instance

@@ -293,7 +293,7 @@ class LogoutUseCase:
        try:
            if request.logout_all_devices:
                # 删除所有设备的 session
-                count = self.session_store.delete_all_user_sessions(request.user_id)
+                self.session_store.delete_all_user_sessions(request.user_id)
                return True, None
            else:
                # 删除当前 session
@@ -85,8 +85,6 @@ class PasswordHasher:
            True 如果需要重新哈希
        """
        try:
-            hashed_bytes = hashed_password.encode("utf-8")
-            current_rounds = bcrypt.getsalt(hashed_bytes)

            # 提取当前的 cost factor
            # bcrypt hash 格式: $2b$rounds$salt+hash
@@ -3,7 +3,7 @@
 """

 import secrets
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timezone
 from typing import Optional
 from uuid import uuid4

@@ -3,7 +3,7 @@
 """

 from math import ceil
-from typing import Generic, List, Optional, TypeVar
+from typing import Generic, List, TypeVar

 from pydantic import BaseModel, Field

@@ -1,13 +1,11 @@
-"""CosyVoice 语音服务 — 适配阿里云百炼 DashScope API.
+"""CosyVoice 语音服务 — Phase 3.

-封装阿里云百炼 CosyVoice 语音合成 API，提供：
+封装阿里云 CosyVoice 语音合成 API，提供：
 - 预置音色列表查询
- 音色克隆（提交 + 轮询状态）
- 语音合成（同步非流式调用）
+- 音色克隆（提交任务 + 轮询状态）
+- 语音合成（提交任务 + 轮询状态）

-API 文档:
- 音色克隆: https://help.aliyun.com/document_detail/3027318.html
- 语音合成: https://help.aliyun.com/zh/model-studio/cosyvoice-tts-http-api
+API 文档: https://help.aliyun.com/zh/model-studio/cosyvoice
 """

 from __future__ import annotations
@@ -62,24 +60,23 @@ class SynthesizeResult:


 class CosyVoiceService:
-    """CosyVoice 语音服务.
+    """CosyVoice 语音服务。

-    封装阿里云百炼 CosyVoice API，提供音色克隆和语音合成功能.
-
-    接口总览:
-    - 音色克隆: POST /services/audio/tts/customization (model=voice-enrollment)
-      - action=create_voice: 创建克隆音色，返回 voice_id（状态 DEPLOYING）
-      - action=query_voice: 查询音色状态（DEPLOYING / OK / UNDEPLOYED）
-    - 语音合成: POST /services/audio/tts/SpeechSynthesizer (model=cosyvoice-v3.5-plus)
-      - 非流式: 同步返回音频 URL
+    封装阿里云 CosyVoice API，提供音色克隆和语音合成功能。
+    支持同步和异步两种模式：
+    - 同步：API 直接返回结果
+    - 异步：API 返回 task_id，需要轮询状态

    使用示例:
        service = CosyVoiceService(
            api_key="your-api-key",
-            base_url="https://dashscope.aliyuncs.com/api/v1",
-            model="cosyvoice-v3.5-plus",
+            base_url="https://dashscope.aliyuncs.com/api/v1/services/aigc/text2audio",
+            model="cosyvoice-v1",
        )

+        # 获取预置音色
+        voices = service.list_preset_voices()
+
        # 音色克隆
        result = service.clone_voice(audio_url="https://example.com/audio.mp3")

@@ -87,9 +84,9 @@ class CosyVoiceService:
        result = service.synthesize_speech(text="你好世界", voice_id="longxiaochun")
    """

-    # 音色状态轮询配置
-    CLONE_POLL_INTERVAL = 5.0  # 秒
-    CLONE_MAX_POLL_ATTEMPTS = 60  # 最多轮询 60 次（5分钟）
+    # 轮询配置
+    POLL_INTERVAL = 2.0  # 秒
+    MAX_POLL_ATTEMPTS = 60  # 最多轮询 60 次（2分钟）

    # 重试配置
    MAX_RETRIES = 3
@@ -100,34 +97,24 @@ class CosyVoiceService:
        api_key: str = "",
        base_url: str = "",
        model: str = "",
-        clone_model: str = "",
        http_client: Optional[httpx.Client] = None,
-        audio_url_signer: Optional[callable] = None,
    ) -> None:
-        """初始化 CosyVoice 服务.
+        """初始化 CosyVoice 服务。

        Args:
-            api_key: DashScope API Key，为空时从配置读取
-            base_url: DashScope API Base URL，为空时从配置读取
-            model: 语音合成模型名称，为空时从配置读取
-            clone_model: 音色克隆模型名称，为空时从配置读取
+            api_key: CosyVoice API Key，为空时从配置读取
+            base_url: CosyVoice API Base URL，为空时从配置读取
+            model: CosyVoice 模型名称，为空时从配置读取
            http_client: 可选的 HTTP 客户端（用于测试注入）
-            audio_url_signer: 可选的音频URL预签名函数，签名式 fn(url) -> str.
-                用于私有 bucket 下，将裸 URL 转为预签名 URL，
-                确保 CosyVoice 服务器能下载参考音频.
        """
        settings = get_shared_settings()

        self._api_key = api_key or settings.cosyvoice_api_key
        self._base_url = base_url or settings.cosyvoice_base_url
        self._model = model or settings.cosyvoice_model
-        self._clone_model = clone_model or getattr(
-            settings, "cosyvoice_clone_model", "voice-enrollment"
-        )
-        self._audio_url_signer = audio_url_signer

        self._client = http_client or httpx.Client(
-            timeout=httpx.Timeout(60.0, connect=10.0),
+            timeout=httpx.Timeout(30.0, connect=10.0),
        )
        self._owns_client = http_client is None

@@ -145,7 +132,7 @@ class CosyVoiceService:
    # ── 预置音色 ─────────────────────────────────────────

    def list_preset_voices(self) -> list[PresetVoice]:
-        """获取预置音色列表.
+        """获取预置音色列表。

        Returns:
            预置音色列表
@@ -159,22 +146,20 @@ class CosyVoiceService:
        audio_url: str,
        voice_name: str = "",
        language: str = "zh-CN",
-        target_model: str = "",
    ) -> dict:
-        """提交音色克隆任务（非阻塞）.
+        """提交音色克隆任务（非阻塞）。

-        调用百炼 voice-enrollment API 创建克隆音色.
-        创建后音色状态为 DEPLOYING，需通过 query_voice_status 轮询直到 OK.
+        只提交任务到 CosyVoice API，不轮询结果。
+        返回的 dict 包含 task_id（异步）或 voice_id（同步）。

        Args:
-            audio_url: 参考音频 URL（必须公网可访问）
-            voice_name: 音色名称前缀（字母数字，最多10字符）
-            language: 语言代码（zh-CN 会转换为 zh）
-            target_model: 目标合成模型，默认使用当前 model
+            audio_url: 参考音频 URL
+            voice_name: 音色名称（可选）
+            language: 语言代码

        Returns:
-            dict: {"voice_id": str, "status": str, "request_id": str}
-                  voice_id 非空，status 通常为 DEPLOYING
+            dict: {"task_id": str, "voice_id": str, "request_id": str}
+                  task_id 和 voice_id 至少有一个非空

        Raises:
            CosyVoiceError: API 调用失败
@@ -186,68 +171,48 @@ class CosyVoiceService:
        if not self._api_key:
            raise CosyVoiceAuthError("CosyVoice API Key 未配置")

-        # voice_name 作为 prefix，限制字母数字，最多10字符
-        # 不符合要求的做清洗
-        prefix = self._sanitize_prefix(voice_name) if voice_name else "clone"
-
-        # 语言转换：zh-CN → zh，保留 ISO 639-1 格式
-        lang_code = language.split("-")[0].lower() if language else "zh"
-
-        target = target_model or self._model
-
-        # 如果配置了 audio_url_signer，对音频URL做预签名
-        # （私有 bucket 下 CosyVoice 服务器无法直接访问裸 URL）
-        signed_audio_url = audio_url
-        if self._audio_url_signer:
-            try:
-                signed_audio_url = self._audio_url_signer(audio_url)
-                logger.info("音频URL已预签名: original=%s signed_prefix=%s",
-                            audio_url[:80], signed_audio_url[:80])
-            except Exception as e:
-                logger.warning("音频URL预签名失败，使用原始URL: %s", e)
-
        payload = {
-            "model": self._clone_model,
+            "model": self._model,
            "input": {
-                "action": "create_voice",
-                "target_model": target,
-                "prefix": prefix,
-                "url": signed_audio_url,
-                "language_hints": [lang_code],
+                "audio_url": audio_url,
+            },
+            "parameters": {
+                "language": language,
            },
        }
+        if voice_name:
+            payload["parameters"]["voice_name"] = voice_name

        response = self._call_api(
            method="POST",
-            path="/services/audio/tts/customization",
+            path="/services/audio/voice-clone",
            json=payload,
            timeout=60.0,
        )

        output = response.get("output", {})
+        task_id = output.get("task_id", "")
        voice_id = output.get("voice_id", "")
-        status = output.get("status", "DEPLOYING")
        request_id = response.get("request_id", "")

-        if not voice_id:
-            raise CosyVoiceError(f"CosyVoice API 未返回 voice_id: {response}")
+        if not task_id and not voice_id:
+            raise CosyVoiceError(f"CosyVoice API 未返回 task_id 或 voice_id: {response}")

        return {
+            "task_id": task_id,
            "voice_id": voice_id,
-            "status": status,
            "request_id": request_id,
        }

-    def query_voice_status(self, voice_id: str) -> dict:
-        """查询音色状态（单次查询，不轮询）.
+    def check_task_status(self, task_id: str) -> dict:
+        """查询克隆任务状态（单次查询，不轮询）。

        Args:
-            voice_id: 音色 ID
+            task_id: 任务 ID

        Returns:
-            dict: {"status": str, "target_model": str, "gmt_create": str,
-                   "gmt_modified": str, "resource_link": str}
-                  status 为 DEPLOYING / OK / UNDEPLOYED
+            dict: {"status": str, "voice_id": str, "message": str}
+                  status 为 SUCCEEDED/FAILED/PENDING/RUNNING

        Raises:
            CosyVoiceError: API 调用失败
@@ -256,98 +221,40 @@ class CosyVoiceService:
        if not self._api_key:
            raise CosyVoiceAuthError("CosyVoice API Key 未配置")

-        if not voice_id:
-            raise ValueError("voice_id 不能为空")
-
-        payload = {
-            "model": self._clone_model,
-            "input": {
-                "action": "query_voice",
-                "voice_id": voice_id,
-            },
-        }
-
        response = self._call_api(
-            method="POST",
-            path="/services/audio/tts/customization",
-            json=payload,
+            method="GET",
+            path=f"/tasks/{task_id}",
            timeout=30.0,
        )

        output = response.get("output", {})
+        status = output.get("task_status", "").upper()
+        voice_id = output.get("voice_id", "")
+        message = output.get("message", "")
+
        return {
-            "status": output.get("status", ""),
-            "target_model": output.get("target_model", ""),
-            "gmt_create": output.get("gmt_create", ""),
-            "gmt_modified": output.get("gmt_modified", ""),
-            "resource_link": output.get("resource_link", ""),
+            "status": status,
+            "voice_id": voice_id,
+            "message": message,
        }

-    def check_task_status(self, task_id: str) -> dict:
-        """查询克隆任务状态（兼容旧接口，实际用 voice_id 查询）.
+    def poll_clone_task(self, task_id: str, timeout: float = 300.0) -> dict:
+        """轮询音色克隆任务状态（公开方法）。

-        为了兼容旧代码，task_id 参数名保留，但实际传的是 voice_id.
+        供 Celery 后台任务调用，轮询直到完成或超时。

        Args:
-            task_id: 音色 ID（兼容旧接口名）
-
-        Returns:
-            dict: {"status": str, "voice_id": str, "message": str}
-        """
-        result = self.query_voice_status(task_id)
-        return {
-            "status": result["status"],
-            "voice_id": task_id,
-            "message": "",
-        }
-
-    def poll_clone_task(self, voice_id: str, timeout: float = 300.0) -> dict:
-        """轮询音色克隆状态直到完成或超时.
-
-        供 Celery 后台任务调用，轮询直到状态变为 OK 或 UNDEPLOYED.
-
-        Args:
-            voice_id: 音色 ID
+            task_id: CosyVoice 任务 ID
            timeout: 超时时间（秒），默认 300

        Returns:
            dict: {"voice_id": str}

        Raises:
-            CosyVoiceError: 任务失败（状态 UNDEPLOYED）
+            CosyVoiceError: 任务失败
            CosyVoiceTimeoutError: 超时
        """
-        start_time = time.time()
-        attempts = 0
-
-        while attempts < self.CLONE_MAX_POLL_ATTEMPTS:
-            elapsed = time.time() - start_time
-            if elapsed > timeout:
-                raise CosyVoiceTimeoutError(
-                    f"音色克隆任务超时（{timeout}秒）: voice_id={voice_id}"
-                )
-
-            result = self.query_voice_status(voice_id)
-            status = result.get("status", "").upper()
-
-            if status == "OK":
-                return {"voice_id": voice_id}
-            elif status == "UNDEPLOYED":
-                raise CosyVoiceError(
-                    f"音色克隆任务失败（审核未通过）: voice_id={voice_id}"
-                )
-            elif status in ("DEPLOYING", "PENDING", "PROCESSING", ""):
-                # 继续轮询
-                time.sleep(self.CLONE_POLL_INTERVAL)
-                attempts += 1
-            else:
-                logger.warning("未知的音色状态: %s (voice_id=%s)", status, voice_id)
-                time.sleep(self.CLONE_POLL_INTERVAL)
-                attempts += 1
-
-        raise CosyVoiceTimeoutError(
-            f"音色克隆任务轮询次数超限: voice_id={voice_id}"
-        )
+        return self._poll_clone_task(task_id, timeout=timeout)

    def clone_voice(
        self,
@@ -355,45 +262,122 @@ class CosyVoiceService:
        voice_name: str = "",
        language: str = "zh-CN",
        timeout: float = 300.0,
-        target_model: str = "",
    ) -> CloneResult:
-        """克隆音色（阻塞，直到完成或超时）.
+        """克隆音色。

-        提交音色克隆到百炼 API，并轮询直到状态变为 OK 或超时.
+        提交音色克隆任务到 CosyVoice API，并轮询直到完成或超时。

        Args:
-            audio_url: 参考音频 URL（必须公网可访问）
-            voice_name: 音色名称前缀
+            audio_url: 参考音频 URL
+            voice_name: 音色名称（可选）
            language: 语言代码
            timeout: 超时时间（秒）
-            target_model: 目标合成模型

        Returns:
            CloneResult: 克隆结果，包含 voice_id

        Raises:
-            CosyVoiceError: API 调用失败或克隆失败
+            CosyVoiceError: API 调用失败
            CosyVoiceTimeoutError: 超时
            CosyVoiceAuthError: 认证失败
            ValueError: 参数无效
        """
-        submit_result = self.submit_clone_task(
-            audio_url=audio_url,
-            voice_name=voice_name,
-            language=language,
-            target_model=target_model,
+        if not audio_url:
+            raise ValueError("audio_url 不能为空")
+        if not self._api_key:
+            raise CosyVoiceAuthError("CosyVoice API Key 未配置")
+
+        # 构建请求
+        payload = {
+            "model": self._model,
+            "input": {
+                "audio_url": audio_url,
+            },
+            "parameters": {
+                "language": language,
+            },
+        }
+        if voice_name:
+            payload["parameters"]["voice_name"] = voice_name
+
+        # 调用 API
+        response = self._call_api(
+            method="POST",
+            path="/services/audio/voice-clone",
+            json=payload,
+            timeout=timeout,
        )

-        voice_id = submit_result["voice_id"]
-        request_id = submit_result["request_id"]
+        # 解析响应
+        output = response.get("output", {})

-        # 如果创建时已经是 OK 状态，直接返回
-        if submit_result.get("status", "").upper() == "OK":
-            return CloneResult(voice_id=voice_id, request_id=request_id)
+        # 检查是否有 task_id（异步模式）
+        task_id = output.get("task_id")
+        voice_id = output.get("voice_id")

-        # 否则轮询
-        result = self.poll_clone_task(voice_id, timeout=timeout)
-        return CloneResult(voice_id=result["voice_id"], request_id=request_id)
+        if task_id:
+            # 异步模式：轮询任务状态
+            result = self._poll_clone_task(task_id, timeout)
+            return CloneResult(
+                voice_id=result["voice_id"],
+                request_id=response.get("request_id", ""),
+            )
+        elif voice_id:
+            # 同步模式：直接返回结果
+            return CloneResult(
+                voice_id=voice_id,
+                request_id=response.get("request_id", ""),
+            )
+        else:
+            raise CosyVoiceError(f"CosyVoice API 未返回 task_id 或 voice_id: {response}")
+
+    def _poll_clone_task(self, task_id: str, timeout: float) -> dict:
+        """轮询音色克隆任务状态。
+
+        Args:
+            task_id: 任务 ID
+            timeout: 超时时间（秒）
+
+        Returns:
+            任务结果字典
+
+        Raises:
+            CosyVoiceError: 任务失败
+            CosyVoiceTimeoutError: 超时
+        """
+        start_time = time.time()
+        attempts = 0
+
+        while attempts < self.MAX_POLL_ATTEMPTS:
+            elapsed = time.time() - start_time
+            if elapsed > timeout:
+                raise CosyVoiceTimeoutError(f"音色克隆任务超时（{timeout}秒）: task_id={task_id}")
+
+            response = self._call_api(
+                method="GET",
+                path=f"/tasks/{task_id}",
+                timeout=30.0,
+            )
+
+            output = response.get("output", {})
+            status = output.get("task_status", "").upper()
+
+            if status == "SUCCEEDED":
+                voice_id = output.get("voice_id", "")
+                if not voice_id:
+                    raise CosyVoiceError(f"音色克隆任务成功但未返回 voice_id: {response}")
+                return {"voice_id": voice_id}
+            elif status == "FAILED":
+                error_msg = output.get("message", "未知错误")
+                raise CosyVoiceError(f"音色克隆任务失败: {error_msg}")
+            elif status in ("PENDING", "RUNNING"):
+                # 继续轮询
+                time.sleep(self.POLL_INTERVAL)
+                attempts += 1
+            else:
+                raise CosyVoiceError(f"未知的任务状态: {status}")
+
+        raise CosyVoiceTimeoutError(f"音色克隆任务轮询次数超限: task_id={task_id}")

    # ── 语音合成 ─────────────────────────────────────────

@@ -404,12 +388,11 @@ class CosyVoiceService:
        sample_rate: int = 0,
        format: str = "",
        speed: float = 1.0,
-        volume: int = 50,
    ) -> dict:
-        """提交语音合成任务（同步非流式，直接返回结果）.
+        """提交语音合成任务（非阻塞）。

-        CosyVoice SpeechSynthesizer 非流式接口是同步的，
-        调用后直接返回音频 URL. 此方法保持与旧接口兼容.
+        只提交任务到 CosyVoice API，不轮询结果。
+        返回的 dict 包含 task_id（异步）或 audio_url（同步）。

        Args:
            text: 要合成的文本
@@ -417,11 +400,10 @@ class CosyVoiceService:
            sample_rate: 采样率（Hz），0 表示使用配置默认值
            format: 输出格式（mp3/wav/pcm），空表示使用配置默认值
            speed: 语速（0.5-2.0），1.0 为正常速度
-            volume: 音量（0-100），默认 50

        Returns:
-            dict: {"audio_url": str, "request_id": str,
-                   "duration": float, "file_size": int}
+            dict: {"task_id": str, "audio_url": str, "request_id": str}
+                  task_id 和 audio_url 至少有一个非空

        Raises:
            CosyVoiceError: API 调用失败
@@ -441,54 +423,55 @@ class CosyVoiceService:
            "model": self._model,
            "input": {
                "text": text,
+            },
+            "parameters": {
                "voice": voice_id,
-                "format": format or settings.cosyvoice_format,
                "sample_rate": sample_rate or settings.cosyvoice_sample_rate,
+                "format": format or settings.cosyvoice_format,
                "rate": speed,
-                "volume": volume,
            },
        }

        response = self._call_api(
            method="POST",
-            path="/services/audio/tts/SpeechSynthesizer",
+            path="/services/aigc/text2audio/generation",
            json=payload,
-            timeout=120.0,
+            timeout=60.0,
        )

        output = response.get("output", {})
-        audio = output.get("audio", {})
-        audio_url = audio.get("url", "")
+        task_id = output.get("task_id", "")
+        audio_url = output.get("audio_url", "")
        request_id = response.get("request_id", "")

-        if not audio_url:
-            raise CosyVoiceError(
-                f"CosyVoice API 未返回 audio_url: {response}"
-            )
+        if not task_id and not audio_url:
+            raise CosyVoiceError(f"CosyVoice API 未返回 task_id 或 audio_url: {response}")

        return {
-            "task_id": "",  # 同步接口无 task_id，兼容旧接口
+            "task_id": task_id,
            "audio_url": audio_url,
-            "duration": 0.0,  # 同步接口不返回 duration
-            "file_size": 0,  # 同步接口不返回 file_size
+            "duration": output.get("duration", 0.0),
+            "file_size": output.get("file_size", 0),
            "request_id": request_id,
        }

-    def poll_synthesize_task(
-        self, task_id: str, timeout: float = 120.0
-    ) -> dict:
-        """轮询合成任务（同步接口无需轮询，保留兼容）.
+    def poll_synthesize_task(self, task_id: str, timeout: float = 120.0) -> dict:
+        """轮询语音合成任务状态（公开方法）。

-        CosyVoice SpeechSynthesizer 非流式接口是同步的，
-        此方法仅为保持接口兼容，实际调用时 task_id 应该为空.
+        供 Celery 后台任务调用，轮询直到完成或超时。
+
+        Args:
+            task_id: CosyVoice 任务 ID
+            timeout: 超时时间（秒），默认 120
+
+        Returns:
+            dict: {"audio_url": str, "duration": float, "file_size": int}

        Raises:
-            CosyVoiceError: 同步接口无需轮询
+            CosyVoiceError: 任务失败
+            CosyVoiceTimeoutError: 超时
        """
-        raise CosyVoiceError(
-            "CosyVoice 非流式合成接口是同步的，无需轮询. "
-            "请直接使用 submit_synthesize_task()."
-        )
+        return self._poll_synthesize_task(task_id, timeout=timeout)

    def synthesize_speech(
        self,
@@ -497,13 +480,11 @@ class CosyVoiceService:
        sample_rate: int = 0,
        format: str = "",
        speed: float = 1.0,
-        volume: int = 50,
        timeout: float = 120.0,
    ) -> SynthesizeResult:
-        """语音合成（同步非流式）.
+        """语音合成。

-        调用百炼 CosyVoice SpeechSynthesizer 非流式接口，
-        直接返回合成音频 URL.
+        提交语音合成任务到 CosyVoice API，并轮询直到完成或超时。

        Args:
            text: 要合成的文本
@@ -511,52 +492,128 @@ class CosyVoiceService:
            sample_rate: 采样率（Hz），0 表示使用配置默认值
            format: 输出格式（mp3/wav/pcm），空表示使用配置默认值
            speed: 语速（0.5-2.0），1.0 为正常速度
-            volume: 音量（0-100），默认 50
-            timeout: 超时时间（秒），保留参数兼容
+            timeout: 超时时间（秒）

        Returns:
            SynthesizeResult: 合成结果，包含 audio_url

        Raises:
            CosyVoiceError: API 调用失败
+            CosyVoiceTimeoutError: 超时
            CosyVoiceAuthError: 认证失败
            ValueError: 参数无效
        """
-        result = self.submit_synthesize_task(
-            text=text,
-            voice_id=voice_id,
-            sample_rate=sample_rate,
-            format=format,
-            speed=speed,
-            volume=volume,
+        if not text:
+            raise ValueError("text 不能为空")
+        if not voice_id:
+            raise ValueError("voice_id 不能为空")
+        if not self._api_key:
+            raise CosyVoiceAuthError("CosyVoice API Key 未配置")
+
+        settings = get_shared_settings()
+
+        # 构建请求
+        payload = {
+            "model": self._model,
+            "input": {
+                "text": text,
+            },
+            "parameters": {
+                "voice": voice_id,
+                "sample_rate": sample_rate or settings.cosyvoice_sample_rate,
+                "format": format or settings.cosyvoice_format,
+                "rate": speed,
+            },
+        }
+
+        # 调用 API
+        response = self._call_api(
+            method="POST",
+            path="/services/aigc/text2audio/generation",
+            json=payload,
+            timeout=timeout,
        )

-        return SynthesizeResult(
-            audio_url=result["audio_url"],
-            duration=result.get("duration", 0.0),
-            file_size=result.get("file_size", 0),
-            request_id=result.get("request_id", ""),
-        )
+        # 解析响应
+        output = response.get("output", {})

-    # ── 内部方法 ─────────────────────────────────────────
+        # 检查是否有 task_id（异步模式）
+        task_id = output.get("task_id")
+        audio_url = output.get("audio_url")

-    def _sanitize_prefix(self, name: str) -> str:
-        """清洗音色名称为合法的 prefix（字母数字，最多10字符）.
+        if task_id:
+            # 异步模式：轮询任务状态
+            result = self._poll_synthesize_task(task_id, timeout)
+            return SynthesizeResult(
+                audio_url=result["audio_url"],
+                duration=result.get("duration", 0.0),
+                file_size=result.get("file_size", 0),
+                request_id=response.get("request_id", ""),
+            )
+        elif audio_url:
+            # 同步模式：直接返回结果
+            return SynthesizeResult(
+                audio_url=audio_url,
+                duration=output.get("duration", 0.0),
+                file_size=output.get("file_size", 0),
+                request_id=response.get("request_id", ""),
+            )
+        else:
+            raise CosyVoiceError(f"CosyVoice API 未返回 audio_url 或 task_id: {response}")
+
+    def _poll_synthesize_task(self, task_id: str, timeout: float) -> dict:
+        """轮询语音合成任务状态。

        Args:
-            name: 原始音色名称
+            task_id: 任务 ID
+            timeout: 超时时间（秒）

        Returns:
-            清洗后的 prefix
+            任务结果字典
+
+        Raises:
+            CosyVoiceError: 任务失败
+            CosyVoiceTimeoutError: 超时
        """
-        # 只保留字母和数字
-        cleaned = "".join(c for c in name if c.isalnum())
-        # 最多10字符
-        cleaned = cleaned[:10]
-        # 如果清洗后为空，用默认值
-        if not cleaned:
-            cleaned = "clone"
-        return cleaned
+        start_time = time.time()
+        attempts = 0
+
+        while attempts < self.MAX_POLL_ATTEMPTS:
+            elapsed = time.time() - start_time
+            if elapsed > timeout:
+                raise CosyVoiceTimeoutError(f"语音合成任务超时（{timeout}秒）: task_id={task_id}")
+
+            response = self._call_api(
+                method="GET",
+                path=f"/tasks/{task_id}",
+                timeout=30.0,
+            )
+
+            output = response.get("output", {})
+            status = output.get("task_status", "").upper()
+
+            if status == "SUCCEEDED":
+                audio_url = output.get("audio_url", "")
+                if not audio_url:
+                    raise CosyVoiceError(f"语音合成任务成功但未返回 audio_url: {response}")
+                return {
+                    "audio_url": audio_url,
+                    "duration": output.get("duration", 0.0),
+                    "file_size": output.get("file_size", 0),
+                }
+            elif status == "FAILED":
+                error_msg = output.get("message", "未知错误")
+                raise CosyVoiceError(f"语音合成任务失败: {error_msg}")
+            elif status in ("PENDING", "RUNNING"):
+                # 继续轮询
+                time.sleep(self.POLL_INTERVAL)
+                attempts += 1
+            else:
+                raise CosyVoiceError(f"未知的任务状态: {status}")
+
+        raise CosyVoiceTimeoutError(f"语音合成任务轮询次数超限: task_id={task_id}")
+
+    # ── 内部方法 ─────────────────────────────────────────

    def _call_api(
        self,
@@ -565,13 +622,13 @@ class CosyVoiceService:
        json: Optional[dict] = None,
        timeout: float = 30.0,
    ) -> dict:
-        """调用 DashScope API.
+        """调用 CosyVoice API。

-        支持重试和错误处理.
+        支持重试和错误处理。

        Args:
            method: HTTP 方法（GET/POST）
-            path: API 路径（以 / 开头）
+            path: API 路径
            json: 请求体
            timeout: 超时时间（秒）

@@ -605,57 +662,25 @@ class CosyVoiceService:
                if response.status_code == 200:
                    return response.json()
                elif response.status_code in (401, 403):
-                    raise CosyVoiceAuthError(
-                        f"CosyVoice API 认证失败: HTTP {response.status_code}"
-                    )
-                elif response.status_code == 400:
-                    # 客户端错误，不重试
-                    body_text = response.text
-                    try:
-                        body = response.json()
-                        code = body.get("code", "")
-                        message = body.get("message", "")
-                        raise CosyVoiceError(
-                            f"CosyVoice API 参数错误: HTTP 400, "
-                            f"code={code}, message={message}"
-                        )
-                    except ValueError:
-                        raise CosyVoiceError(
-                            f"CosyVoice API 调用失败: HTTP 400, body={body_text}"
-                        )
+                    raise CosyVoiceAuthError(f"CosyVoice API 认证失败: HTTP {response.status_code}")
                elif response.status_code >= 500:
                    # 服务端错误，可重试
-                    last_error = CosyVoiceError(
-                        f"CosyVoice API 服务端错误: HTTP {response.status_code}"
-                    )
+                    last_error = CosyVoiceError(f"CosyVoice API 服务端错误: HTTP {response.status_code}")
                    logger.warning(
-                        "CosyVoice API 失败 (尝试 %d/%d): HTTP %d",
-                        attempt + 1,
-                        self.MAX_RETRIES,
-                        response.status_code,
+                        f"CosyVoice API 失败 (尝试 {attempt + 1}/{self.MAX_RETRIES}): " f"HTTP {response.status_code}"
                    )
                else:
-                    # 其他客户端错误，不重试
+                    # 客户端错误，不重试
                    raise CosyVoiceError(
-                        f"CosyVoice API 调用失败: HTTP {response.status_code}, "
-                        f"body={response.text}"
+                        f"CosyVoice API 调用失败: HTTP {response.status_code}, " f"body={response.text}"
                    )

            except httpx.TimeoutException as e:
                last_error = CosyVoiceTimeoutError(f"请求超时: {e}")
-                logger.warning(
-                    "CosyVoice API 超时 (尝试 %d/%d)",
-                    attempt + 1,
-                    self.MAX_RETRIES,
-                )
+                logger.warning(f"CosyVoice API 超时 (尝试 {attempt + 1}/{self.MAX_RETRIES})")
            except httpx.RequestError as e:
                last_error = CosyVoiceError(f"请求错误: {e}")
-                logger.warning(
-                    "CosyVoice API 请求错误 (尝试 %d/%d): %s",
-                    attempt + 1,
-                    self.MAX_RETRIES,
-                    e,
-                )
+                logger.warning(f"CosyVoice API 请求错误 (尝试 {attempt + 1}/{self.MAX_RETRIES}): {e}")

            # 指数退避
            if attempt < self.MAX_RETRIES - 1:
@@ -7,9 +7,7 @@ from __future__ import annotations

 import logging
 from dataclasses import dataclass, field
-from datetime import datetime, timezone
 from typing import Any
-from uuid import uuid4

 from packages.domain.job import Job, JobStatus, JobType
 from packages.ports.job_repository import JobRepository
@@ -9,7 +9,6 @@ from typing import List, Optional
 from packages.adapters.sqlalchemy_impl.recipe_repository import SQLAlchemyRecipeRepository
 from packages.application.recipe.commands import (
    CreateRecipeCommand,
-    RecipeItemCommand,
    UpdateRecipeCommand,
 )
 from packages.domain.recipe import Recipe, RecipeItem
@@ -1 +0,0 @@
-"""TTS Job application layer."""
@@ -148,7 +148,6 @@ class TTSStreamingService:

        # 并发合成所有分段，按顺序流式推送
        queue: asyncio.Queue[tuple[int, Optional[bytes], Optional[str]]] = asyncio.Queue()
-        completed_count = 0

        async def _synthesize_one(idx: int, seg_text: str) -> None:
            """合成单个分段并放入队列。"""
@@ -14,6 +14,7 @@ import logging
 import os
 import shutil
 import tempfile
+import time
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from typing import Optional

@@ -24,9 +25,9 @@ from packages.application.cosyvoice_service import (
    CosyVoiceError,
    CosyVoiceService,
 )
-from packages.application.tts_job.audio_merger import AudioMergeError, AudioMerger
+from packages.application.tts_job.audio_merger import AudioMerger
 from packages.application.tts_job.text_splitter import split_text
-from packages.domain.tts_job import TTSJob, TTSJobStatus
+from packages.domain.tts_job import TTSJob
 from packages.ports.tts_job_repository import TTSJobRepository
 from packages.shared.storage import SharedStorageService, get_shared_storage_service

@@ -189,13 +190,10 @@ class TTSWorkflowService:
        return job

    def poll_and_process_synthesis(self, job_id: str, timeout: float = 120.0) -> TTSJob:
-        """轮询/检查 CosyVoice 合成任务并处理结果.
+        """轮询 CosyVoice 合成任务并处理结果。

-        新 CosyVoice SpeechSynthesizer 非流式接口是同步的，
-        start_synthesis 阶段通常已经完成. 此方法用于：
-        1. job 已 completed → 直接返回（同步路径已处理）
-        2. job 仍在 processing → 重新提交合成（兜底）
-        3. 分段任务 → 检查分段状态
+        从 job.metadata 获取 task_id，调用 CosyVoiceService.poll_synthesize_task()
+        轮询状态，然后通过 process_synthesis_result / process_synthesis_failure 更新 job。

        供 Celery 后台任务调用。
        """
@@ -203,42 +201,22 @@ class TTSWorkflowService:
        if job is None:
            raise TTSJobNotFoundError(f"TTS job {job_id} not found")

-        # 已完成直接返回（同步路径在 start_synthesis 里已处理）
-        if job.status == TTSJobStatus.COMPLETED.value:
-            logger.info(f"TTS 任务已完成，跳过轮询: job_id={job_id}")
-            return job
-
        # 检查是否为分段合成任务
        segment_task_ids = (job.metadata or {}).get("segment_task_ids", [])
        if segment_task_ids:
            return self._poll_segment_tasks(job)

-        # 单段模式：同步接口下通常不会走到这里，
-        # 但如果因为异常导致仍在 processing，重新提交一次
        task_id = (job.metadata or {}).get("cosyvoice_task_id", "")
-
-        # 新接口（同步）：没有 task_id，重新合成
        if not task_id:
-            logger.info(
-                f"TTS 任务无 task_id，重新同步合成: job_id={job_id}"
-            )
-            return self._resynthesize_and_complete(job)
+            raise ValueError(f"TTSJob {job_id} has no cosyvoice_task_id in metadata")

-        # 旧接口遗留的 task_id，尝试轮询（兼容过渡）
-        try:
-            result = self.cosyvoice_service.poll_synthesize_task(task_id, timeout=timeout)
-            return self.process_synthesis_result(
-                job_id,
-                audio_url=result["audio_url"],
-                duration=result.get("duration", 0.0),
-                file_size=result.get("file_size", 0),
-            )
-        except CosyVoiceError:
-            # 旧接口轮询失败，重新同步合成
-            logger.warning(
-                f"旧 task_id 轮询失败，重新同步合成: job_id={job_id}, task_id={task_id}"
-            )
-            return self._resynthesize_and_complete(job)
+        result = self.cosyvoice_service.poll_synthesize_task(task_id, timeout=timeout)
+        return self.process_synthesis_result(
+            job_id,
+            audio_url=result["audio_url"],
+            duration=result.get("duration", 0.0),
+            file_size=result.get("file_size", 0),
+        )

    def process_synthesis_result(
        self,
@@ -279,40 +257,6 @@ class TTSWorkflowService:
        logger.info(f"TTS 合成成功: job_id={job_id}, audio_url={permanent_url}")
        return job

-    def _resynthesize_and_complete(self, job: TTSJob) -> TTSJob:
-        """重新同步合成并完成任务（兜底路径）.
-
-        当 poll_and_process_synthesis 发现 job 仍在 processing 且无 task_id 时，
-        重新调用同步合成接口，转存 OSS 后标记完成。
-        """
-        try:
-            # 从 metadata 读取合成参数（兼容旧数据，无则用默认值）
-            job_metadata = job.metadata or {}
-            speed = float(job_metadata.get("speed", 1.0))
-            volume = int(job_metadata.get("volume", 50))
-
-            result = self.cosyvoice_service.submit_synthesize_task(
-                text=job.input_text,
-                voice_id=job.voice_id,
-                sample_rate=job.sample_rate,
-                format=job.format,
-                speed=speed,
-                volume=volume,
-            )
-            audio_url = result.get("audio_url", "")
-            if not audio_url:
-                raise CosyVoiceError("重新合成未返回 audio_url")
-
-            return self.process_synthesis_result(
-                job.id,
-                audio_url=audio_url,
-                duration=result.get("duration", 0.0),
-                file_size=result.get("file_size", 0),
-            )
-        except Exception as e:
-            logger.error(f"重新同步合成失败: job_id={job.id}, error={e}")
-            return self.process_synthesis_failure(job.id, str(e))
-
    def process_synthesis_failure(self, job_id: str, error_message: str) -> TTSJob:
        """处理合成失败结果。

@@ -485,108 +429,69 @@ class TTSWorkflowService:
            shutil.rmtree(temp_dir, ignore_errors=True)

    def _poll_segment_tasks(self, job: TTSJob) -> TTSJob:
-        """分段任务完成检查（适配新同步接口）.
-
-        新 CosyVoice SpeechSynthesizer 非流式接口为同步接口，
-        分段任务在提交时应已同步返回 audio_url。
-        若历史任务处于 processing 且有 segment_task_ids 但缺少 audio_url，
-        则对缺失分段重新同步合成，全部完成后合并音频。
-        """
+        """轮询所有分段异步任务，全部完成后合并音频。"""
        segment_task_ids: list[str] = (job.metadata or {}).get("segment_task_ids", [])
        segment_audio_urls: list[str] = (job.metadata or {}).get("segment_audio_urls", [])
        segment_count = len(segment_task_ids)

-        if segment_count == 0:
-            logger.warning(f"分段任务无 task_id: job_id={job.id}")
-            self._handle_segment_failure(job, "分段任务数据异常：无分段信息")
-            return self.repository.get(job.id)
+        poll_start = time.monotonic()
+        poll_timeout = 300.0  # 分段任务超时更长
+        poll_interval = 2.0

-        # 从 metadata 读取合成参数
-        job_metadata = job.metadata or {}
-        speed = float(job_metadata.get("speed", 1.0))
-        volume = int(job_metadata.get("volume", 50))
+        while time.monotonic() - poll_start < poll_timeout:
+            all_done = True
+            results: list[dict | None] = [None] * segment_count

-        # 分段文本（用于缺失段重新合成）
-        segments = split_text(job.input_text, max_chars=_SEGMENT_THRESHOLD)
+            for idx, task_id in enumerate(segment_task_ids):
+                # 已经有音频的分段跳过轮询
+                if idx < len(segment_audio_urls) and segment_audio_urls[idx]:
+                    results[idx] = {
+                        "audio_url": segment_audio_urls[idx],
+                        "duration": 0.0,
+                        "file_size": 0,
+                    }
+                    continue

-        results: list[dict | None] = [None] * segment_count
+                try:
+                    result = self.cosyvoice_service.poll_synthesize_task(task_id, timeout=poll_timeout)
+                    results[idx] = result
+                except Exception as e:
+                    logger.error(f"分段任务轮询失败: job_id={job.id}, " f"segment={idx}, error={e}")
+                    self._handle_segment_failure(job, f"分段 {idx + 1} 轮询失败: {e}")
+                    return self.repository.get(job.id)

-        # 已有音频的分段直接用
-        for idx in range(segment_count):
-            if idx < len(segment_audio_urls) and segment_audio_urls[idx]:
-                results[idx] = {
-                    "audio_url": segment_audio_urls[idx],
-                    "duration": 0.0,
-                    "file_size": 0,
-                }
+                if results[idx] is None:
+                    all_done = False

-        # 找出缺失音频的分段索引
-        missing_indices = [i for i in range(segment_count) if results[i] is None]
+            if all_done and all(r is not None for r in results):
+                # 所有分段完成，下载合并
+                try:
+                    merged_data, total_duration = self._download_and_merge_segments(results, job)

-        if missing_indices:
-            logger.info(
-                f"分段任务重新合成缺失段: job_id={job.id}, "
-                f"缺失={len(missing_indices)}/{segment_count}"
-            )
-            # 并发重新合成缺失分段
-            max_workers = min(len(missing_indices), _MAX_SEGMENT_WORKERS)
-            with ThreadPoolExecutor(max_workers=max_workers) as executor:
-                future_to_idx = {}
-                for idx in missing_indices:
-                    segment_text = segments[idx] if idx < len(segments) else ""
-                    future = executor.submit(
-                        self.cosyvoice_service.submit_synthesize_task,
-                        text=segment_text,
-                        voice_id=job.voice_id,
-                        sample_rate=job.sample_rate,
-                        format=job.format,
-                        speed=speed,
-                        volume=volume,
+                    # 转存 OSS
+                    permanent_url, storage_key = self._upload_merged_to_oss(
+                        merged_data, job.user_id, job.id, job.format
                    )
-                    future_to_idx[future] = idx

-                for future in as_completed(future_to_idx):
-                    idx = future_to_idx[future]
-                    try:
-                        results[idx] = future.result()
-                    except Exception as e:
-                        logger.error(
-                            f"分段重新合成失败: job_id={job.id}, "
-                            f"segment={idx}, error={e}"
-                        )
-                        self._handle_segment_failure(
-                            job, f"分段 {idx + 1} 重新合成失败: {e}"
-                        )
-                        return self.repository.get(job.id)
+                    job.mark_completed(
+                        output_audio_url=permanent_url,
+                        output_audio_key=storage_key,
+                        duration=total_duration,
+                        file_size=len(merged_data),
+                    )
+                    job = self.repository.update(job)
+                    logger.info(f"分段合成轮询完成: job_id={job.id}, " f"merged_size={len(merged_data)}")
+                    return job

-        # 所有分段完成，下载合并
-        if all(r is not None for r in results):
-            try:
-                merged_data, total_duration = self._download_and_merge_segments(results, job)
+                except Exception as e:
+                    self._handle_segment_failure(job, f"分段合并失败: {e}")
+                    return self.repository.get(job.id)

-                permanent_url, storage_key = self._upload_merged_to_oss(
-                    merged_data, job.user_id, job.id, job.format
-                )
+            # 等待后重试
+            time.sleep(poll_interval)

-                job.mark_completed(
-                    output_audio_url=permanent_url,
-                    output_audio_key=storage_key,
-                    duration=total_duration,
-                    file_size=len(merged_data),
-                )
-                job = self.repository.update(job)
-                logger.info(
-                    f"分段合成完成（重新合成路径）: job_id={job.id}, "
-                    f"merged_size={len(merged_data)}"
-                )
-                return job
-
-            except Exception as e:
-                self._handle_segment_failure(job, f"分段合并失败: {e}")
-                return self.repository.get(job.id)
-
-        # 理论上不会到这里（全部重新合成要么成功要么失败）
-        self._handle_segment_failure(job, "分段合成结果不完整")
+        # 超时
+        self._handle_segment_failure(job, "分段合成轮询超时（300 秒）")
        return self.repository.get(job.id)

    def _handle_segment_failure(self, job: TTSJob, error_message: str) -> None:
@@ -2,7 +2,6 @@

 from __future__ import annotations

-import uuid
 from typing import List, Optional

 from packages.domain.voice_clone_profile import VoiceCloneProfile
@@ -10,7 +10,7 @@
 from __future__ import annotations

 import logging
-from typing import Any, Optional
+from typing import Optional

 from packages.application.cosyvoice_service import (
    CosyVoiceAuthError,
@@ -21,9 +21,8 @@ from packages.application.voice_clone.use_cases import (
    CreateVoiceCloneUseCase,
    RetryVoiceCloneUseCase,
    VoiceCloneNotFoundError,
-    VoiceCloneNotRetryableError,
 )
-from packages.domain.voice_clone_profile import VoiceCloneProfile, VoiceCloneStatus
+from packages.domain.voice_clone_profile import VoiceCloneProfile
 from packages.ports.voice_clone_profile_repository import VoiceCloneProfileRepository

 logger = logging.getLogger(__name__)
@@ -115,16 +114,14 @@ class VoiceCloneWorkflowService:
                    language=language,
                )

-                # 4. 保存 voice_id / request_id 到 metadata
-                # 注意：key 保留 cosyvoice_task_id 以兼容旧数据，实际存的是 voice_id
+                # 4. 保存 task_id / voice_id 到 metadata
                task_metadata = dict(profile.metadata)
-                task_metadata["cosyvoice_task_id"] = submit_result.get("voice_id", "")
+                task_metadata["cosyvoice_task_id"] = submit_result.get("task_id", "")
                task_metadata["cosyvoice_request_id"] = submit_result.get("request_id", "")

-                # 如果 CosyVoice 直接返回了 OK 状态，直接标记 ready
+                # 如果 CosyVoice 同步返回了 voice_id，直接标记 ready
                voice_id = submit_result.get("voice_id", "")
-                status = submit_result.get("status", "").upper()
-                if voice_id and status == "OK":
+                if voice_id:
                    profile.mark_ready(voice_id)
                    profile.metadata = task_metadata
                    profile = self.repository.update(profile)
@@ -133,7 +130,7 @@ class VoiceCloneWorkflowService:

                profile.metadata = task_metadata
                profile = self.repository.update(profile)
-                logger.info(f"音色克隆任务已提交: profile_id={profile.id}, " f"voice_id={submit_result.get('voice_id')}")
+                logger.info(f"音色克隆任务已提交: profile_id={profile.id}, " f"task_id={submit_result.get('task_id')}")

            except (CosyVoiceError, CosyVoiceAuthError) as e:
                # CosyVoice 提交失败，标记为 failed
@@ -250,12 +247,11 @@ class VoiceCloneWorkflowService:
                )

                task_metadata = dict(profile.metadata)
-                task_metadata["cosyvoice_task_id"] = submit_result.get("voice_id", "")
+                task_metadata["cosyvoice_task_id"] = submit_result.get("task_id", "")
                task_metadata["cosyvoice_request_id"] = submit_result.get("request_id", "")

                voice_id = submit_result.get("voice_id", "")
-                status = submit_result.get("status", "").upper()
-                if voice_id and status == "OK":
+                if voice_id:
                    profile.mark_ready(voice_id)
                    profile.metadata = task_metadata
                    profile = self.repository.update(profile)
@@ -13,7 +13,6 @@ else:
        pass


-from typing import Any
 from uuid import uuid4


@@ -10,7 +10,7 @@ from __future__ import annotations

 import copy
 from enum import Enum
-from typing import List, Optional
+from typing import Optional

 from pydantic import BaseModel, Field

@@ -8,7 +8,6 @@

 from __future__ import annotations

-import json
 import sys
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
@@ -86,7 +85,6 @@ class GenerationTask:
    created_by_user_id: str = ""
    asset_select_mode: str = ""
    batch_id: str = ""
-    logs: str = "[]"
    created_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))

    @classmethod
@@ -229,43 +227,6 @@ class GenerationTask:
        self.transition_to(GenerationTaskStatus.CANCELLED)
        self.completed_at = datetime.now(timezone.utc)

-    # ── 日志辅助 ────────────────────────────────────────────────────────────
-
-    _MAX_LOGS = 200
-
-    def append_log(self, stage: str, message: str, level: str = "INFO", **kwargs) -> None:
-        """追加一条结构化日志到 logs 字段。
-
-        Args:
-            stage: 阶段名称（如 "接收任务"、"下载素材"、"渲染"）
-            message: 日志消息
-            level: 日志级别（INFO / WARN / ERROR）
-            **kwargs: 额外字段（如 asset_id、duration 等）
-        """
-        try:
-            entries = json.loads(self.logs) if self.logs else []
-        except (json.JSONDecodeError, TypeError):
-            entries = []
-        entry = {
-            "ts": datetime.now(timezone.utc).isoformat(),
-            "level": level,
-            "stage": stage,
-            "message": message,
-            **kwargs,
-        }
-        entries.append(entry)
-        # 限制最多保留 _MAX_LOGS 条，防止字段过大
-        if len(entries) > self._MAX_LOGS:
-            entries = entries[-self._MAX_LOGS :]
-        self.logs = json.dumps(entries, ensure_ascii=False)
-
-    def get_logs(self) -> list[dict]:
-        """解析 logs 字段为 list[dict]。"""
-        try:
-            return json.loads(self.logs) if self.logs else []
-        except (json.JSONDecodeError, TypeError):
-            return []
-
    def mark_pending_from_failed(self) -> None:
        """从失败状态重置为待处理（用于重试）。

@@ -24,7 +24,7 @@ from __future__ import annotations

 import logging
 from dataclasses import dataclass, field
-from typing import Any, Dict, Optional, Set
+from typing import Dict, Optional

 logger = logging.getLogger(__name__)

@@ -14,7 +14,7 @@ from __future__ import annotations
 import logging
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Any, Callable, Dict, List, Optional, Set
+from typing import Any, Callable, Dict, List, Optional

 logger = logging.getLogger(__name__)

@@ -2,7 +2,7 @@

 from abc import ABC, abstractmethod

-from packages.domain import AssetLibrary, AssetLibraryKind
+from packages.domain import AssetLibrary


 class AssetLibraryRepository(ABC):
@@ -24,20 +24,18 @@ class SharedSettings(BaseSettings):
    celery_result_backend: str = "redis://localhost:6379/1"

    # OSS Aliyun
-    oss_endpoint: str = "oss-cn-hangzhou.aliiyuncs.com"
+    oss_endpoint: str = "oss-cn-hangzhou.aliyuncs.com"
    oss_access_key_id: str = ""
    oss_access_key_secret: str = ""
    oss_bucket_name: str = "xiaoxia-autocut"

-    # CosyVoice (阿里云百炼语音合成)
+    # CosyVoice (阿里云语音合成)
    cosyvoice_api_key: str = ""
-    cosyvoice_base_url: str = "https://dashscope.aliyuncs.com/api/v1"
-    cosyvoice_model: str = "cosyvoice-v3.5-plus"
+    cosyvoice_base_url: str = "https://dashscope.aliyuncs.com/api/v1/services/aigc/text2audio"
+    cosyvoice_model: str = "cosyvoice-v1"
    cosyvoice_voice: str = "longxiaochun"  # 默认音色
    cosyvoice_sample_rate: int = 22050
    cosyvoice_format: str = "mp3"  # 输出格式：mp3/wav/pcm
-    # 音色克隆模型名（固定为 voice-enrollment）
-    cosyvoice_clone_model: str = "voice-enrollment"

    # Environment
    environment: str = "development"
@@ -57,7 +57,6 @@ fi
 echo "=== Building API image ==="
 if [ "$USE_CACHE" -eq 1 ]; then
  docker buildx build \
-    --build-arg APP_VERSION="$VERSION" \
    --cache-from "type=registry,ref=${CACHE_REGISTRY}/api-cache:${CACHE_TAG},ignore-error=true" \
    --cache-to "type=registry,ref=${CACHE_REGISTRY}/api-cache:${CACHE_TAG},mode=max" \
    -f infra/docker/api.Dockerfile \
@@ -65,13 +64,12 @@ if [ "$USE_CACHE" -eq 1 ]; then
    --load \
    .
 else
-  docker build --pull=false --build-arg APP_VERSION="$VERSION" -f infra/docker/api.Dockerfile -t "$API_IMAGE" -t "$API_LATEST" .
+  docker build --pull=false -f infra/docker/api.Dockerfile -t "$API_IMAGE" -t "$API_LATEST" .
 fi

 echo "=== Building Worker image ==="
 if [ "$USE_CACHE" -eq 1 ]; then
  docker buildx build \
-    --build-arg APP_VERSION="$VERSION" \
    --cache-from "type=registry,ref=${CACHE_REGISTRY}/worker-cache:${CACHE_TAG},ignore-error=true" \
    --cache-to "type=registry,ref=${CACHE_REGISTRY}/worker-cache:${CACHE_TAG},mode=max" \
    -f infra/docker/worker.Dockerfile \
@@ -79,7 +77,7 @@ if [ "$USE_CACHE" -eq 1 ]; then
    --load \
    .
 else
-  docker build --pull=false --build-arg APP_VERSION="$VERSION" -f infra/docker/worker.Dockerfile -t "$WORKER_IMAGE" -t "$WORKER_LATEST" .
+  docker build --pull=false -f infra/docker/worker.Dockerfile -t "$WORKER_IMAGE" -t "$WORKER_LATEST" .
 fi

 echo "=== Building Web image (with buildx cache) ==="
@@ -247,3 +247,4 @@ def main() -> int:

 if __name__ == "__main__":
    sys.exit(main())
+
@@ -1,244 +0,0 @@
-"""
-一键生成链路日志最小集 单元测试
-
-覆盖：
- GenerationTask.append_log() 正确追加结构化日志
- GenerationTask.append_log() 超过 200 条时截断
- GenerationTask.get_logs() 正确解析 JSON
- GenerationTask.get_logs() 异常 JSON 不抛异常
- GenerationTaskResponse logs 字段 validator 解析 JSON 字符串
- GenerationTaskResponse logs 字段 validator 处理非法输入
- Worker 日志格式 [task_id=xxx] [阶段] 消息
- _flush_logs 异常不抛出
-"""
-
-from __future__ import annotations
-
-import json
-import sys
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
-sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "worker"))
-
-from app.schemas.generation_task import GenerationTaskResponse
-
-from packages.domain.generation_task import GenerationTask, GenerationTaskStatus
-
-
-def _make_task(**kwargs) -> GenerationTask:
-    """创建测试用 GenerationTask。"""
-    defaults = {
-        "id": "task-001",
-        "project_id": "proj-001",
-        "asset_library_id": "lib-001",
-        "strategy_id": "one_take",
-        "voice_library_id": "",
-        "template_id": "tpl-001",
-        "asset_ids": ["asset-1", "asset-2"],
-        "title_ids": [],
-        "voice_ids": [],
-        "status": GenerationTaskStatus.PENDING,
-        "progress": 0.0,
-        "result_count": 0,
-        "error_message": "",
-        "created_by_user_id": "user-001",
-        "source_edit_plan_id": "",
-        "asset_select_mode": "all",
-        "batch_id": "",
-    }
-    defaults.update(kwargs)
-    return GenerationTask(**defaults)
-
-
-class TestAppendLog:
-    """GenerationTask.append_log() 单元测试。"""
-
-    def test_append_single_log(self):
-        task = _make_task()
-        task.append_log("接收任务", "任务开始", mode="one_take")
-
-        logs = task.get_logs()
-        assert len(logs) == 1
-        entry = logs[0]
-        assert entry["level"] == "INFO"
-        assert entry["stage"] == "接收任务"
-        assert entry["message"] == "任务开始"
-        assert entry["mode"] == "one_take"
-        assert "ts" in entry
-
-    def test_append_multiple_logs(self):
-        task = _make_task()
-        task.append_log("接收任务", "任务开始")
-        task.append_log("下载素材", "下载完成", count=3)
-        task.append_log("渲染", "渲染完成", duration=12.5)
-
-        logs = task.get_logs()
-        assert len(logs) == 3
-        assert logs[0]["stage"] == "接收任务"
-        assert logs[1]["stage"] == "下载素材"
-        assert logs[1]["count"] == 3
-        assert logs[2]["stage"] == "渲染"
-        assert logs[2]["duration"] == 12.5
-
-    def test_append_log_with_error_level(self):
-        task = _make_task()
-        task.append_log("任务失败", "OSS上传失败", level="ERROR", error_type="RuntimeError")
-
-        logs = task.get_logs()
-        assert len(logs) == 1
-        assert logs[0]["level"] == "ERROR"
-        assert logs[0]["error_type"] == "RuntimeError"
-
-    def test_append_log_truncates_at_200(self):
-        task = _make_task()
-        for i in range(250):
-            task.append_log("阶段", f"消息{i}")
-
-        logs = task.get_logs()
-        assert len(logs) == 200
-        # 保留最后 200 条
-        assert logs[0]["message"] == "消息50"
-        assert logs[-1]["message"] == "消息249"
-
-    def test_append_log_handles_corrupted_json(self):
-        task = _make_task(logs="not-valid-json")
-        task.append_log("接收任务", "任务开始")
-
-        logs = task.get_logs()
-        assert len(logs) == 1
-        assert logs[0]["message"] == "任务开始"
-
-    def test_append_log_handles_empty_string(self):
-        task = _make_task(logs="")
-        task.append_log("接收任务", "任务开始")
-
-        logs = task.get_logs()
-        assert len(logs) == 1
-
-
-class TestGetLogs:
-    """GenerationTask.get_logs() 单元测试。"""
-
-    def test_get_logs_empty(self):
-        task = _make_task()
-        assert task.get_logs() == []
-
-    def test_get_logs_parses_json(self):
-        entries = [{"ts": "2026-01-01T00:00:00Z", "level": "INFO", "stage": "test", "message": "hello"}]
-        task = _make_task(logs=json.dumps(entries, ensure_ascii=False))
-        logs = task.get_logs()
-        assert len(logs) == 1
-        assert logs[0]["message"] == "hello"
-
-    def test_get_logs_handles_invalid_json(self):
-        task = _make_task(logs="{broken")
-        assert task.get_logs() == []
-
-    def test_get_logs_handles_none(self):
-        task = _make_task(logs=None)
-        assert task.get_logs() == []
-
-
-class TestGenerationTaskResponseLogs:
-    """GenerationTaskResponse logs 字段 validator 测试。"""
-
-    def _make_response_data(self, logs_value) -> dict:
-        return {
-            "id": "task-001",
-            "project_id": "proj-001",
-            "asset_library_id": "lib-001",
-            "strategy_id": "one_take",
-            "voice_library_id": "",
-            "template_id": "",
-            "asset_ids": [],
-            "title_ids": [],
-            "voice_ids": [],
-            "source_edit_plan_id": "",
-            "asset_select_mode": "all",
-            "batch_id": "",
-            "status": "completed",
-            "progress": 1.0,
-            "result_count": 1,
-            "error_message": "",
-            "logs": logs_value,
-        }
-
-    def test_logs_json_string_parsed(self):
-        entries = [{"ts": "2026-01-01T00:00:00Z", "level": "INFO", "stage": "test", "message": "ok"}]
-        data = self._make_response_data(json.dumps(entries, ensure_ascii=False))
-        resp = GenerationTaskResponse(**data)
-        assert isinstance(resp.logs, list)
-        assert len(resp.logs) == 1
-        assert resp.logs[0]["message"] == "ok"
-
-    def test_logs_list_passthrough(self):
-        entries = [{"ts": "2026-01-01T00:00:00Z", "level": "INFO", "stage": "test", "message": "ok"}]
-        data = self._make_response_data(entries)
-        resp = GenerationTaskResponse(**data)
-        assert resp.logs == entries
-
-    def test_logs_invalid_json_returns_empty(self):
-        data = self._make_response_data("{broken")
-        resp = GenerationTaskResponse(**data)
-        assert resp.logs == []
-
-    def test_logs_empty_string_returns_empty(self):
-        data = self._make_response_data("")
-        resp = GenerationTaskResponse(**data)
-        assert resp.logs == []
-
-    def test_logs_default_empty(self):
-        data = self._make_response_data("[]")
-        resp = GenerationTaskResponse(**data)
-        assert resp.logs == []
-
-
-class TestWorkerLogFormat:
-    """Worker 日志格式 [task_id=xxx] [阶段] 消息 测试。"""
-
-    def test_log_format_pattern(self):
-        """验证日志格式匹配 [task_id=xxx] [阶段] 消息。"""
-        import re
-
-        task_id = "abc123"
-        stage = "下载素材"
-        message = "完成: 成功=3个, 耗时=1.5s"
-        formatted = f"[task_id={task_id}] [{stage}] {message}"
-
-        pattern = r"^\[task_id=[\w-]+\] \[.+\] .+$"
-        assert re.match(pattern, formatted)
-
-    def test_log_entries_contain_required_fields(self):
-        """验证 append_log 生成的条目包含所有必需字段。"""
-        task = _make_task()
-        task.append_log("OSS上传", "上传成功", file_size=1024000, duration=2.5)
-
-        logs = task.get_logs()
-        entry = logs[0]
-        assert "ts" in entry
-        assert "level" in entry
-        assert "stage" in entry
-        assert "message" in entry
-        assert entry["file_size"] == 1024000
-        assert entry["duration"] == 2.5
-
-
-class TestFlushLogs:
-    """_flush_logs 异常安全测试。"""
-
-    def test_flush_logs_exception_not_raised(self):
-        """_flush_logs 在 DB 异常时不应抛出。"""
-        # 模拟 worker 环境
-        sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "worker"))
-
-        from worker_app.tasks.generation import _flush_logs
-
-        task = _make_task()
-        task.append_log("测试", "消息")
-
-        # Mock SessionLocal 抛异常
-        with patch("worker_app.tasks.generation.SessionLocal", side_effect=RuntimeError("DB error")):
-            # 不应抛出
-            _flush_logs("task-001", task)
@@ -1,268 +0,0 @@
-"""P0-2 深度修复：Worker 端 OSS 工具函数测试.
-
-测试：
-1. oss_bucket() endpoint 自动补 https:// 前缀
-2. get_signed_download_url() 生成预签名 URL
-3. upload_to_oss() 返回 HTTPS URL
-"""
-
-from __future__ import annotations
-
-import os
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-
-# ── oss_bucket endpoint scheme 修复 ──────────────────────────────────────────
-
-
-class TestOSSBucketEndpointScheme:
-    """测试 oss_bucket() 自动为 endpoint 补 https:// 前缀."""
-
-    def test_endpoint_without_scheme_adds_https(self):
-        """endpoint 不带 scheme 时，自动补 https://."""
-        from video_processing.oss_helpers import oss_bucket
-
-        mock_bucket_instance = MagicMock()
-        with patch.dict(
-            os.environ,
-            {
-                "OSS_ACCESS_KEY_ID": "test-key",
-                "OSS_ACCESS_KEY_SECRET": "test-secret",
-                "OSS_ENDPOINT": "oss-cn-hangzhou.aliyuncs.com",
-                "OSS_BUCKET_NAME": "test-bucket",
-            },
-        ), patch("video_processing.oss_helpers.oss2.Auth") as mock_auth, patch(
-            "video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket_instance
-        ) as mock_bucket_cls:
-            # 清除缓存，确保重新创建
-            import video_processing.oss_helpers as oss_mod
-
-            bucket = oss_bucket()
-
-            assert bucket is mock_bucket_instance
-            # 验证 endpoint 传的是带 https:// 的
-            call_args = mock_bucket_cls.call_args
-            endpoint_arg = call_args[0][1]  # 第 2 个位置参数是 endpoint
-            assert endpoint_arg.startswith("https://"), (
-                f"endpoint 应该带 https:// 前缀，实际为: {endpoint_arg}"
-            )
-            assert "oss-cn-hangzhou.aliyuncs.com" in endpoint_arg
-
-    def test_endpoint_with_https_keeps_as_is(self):
-        """endpoint 已有 https:// 时，不重复添加."""
-        from video_processing.oss_helpers import oss_bucket
-
-        mock_bucket_instance = MagicMock()
-        with patch.dict(
-            os.environ,
-            {
-                "OSS_ACCESS_KEY_ID": "test-key",
-                "OSS_ACCESS_KEY_SECRET": "test-secret",
-                "OSS_ENDPOINT": "https://oss-cn-hangzhou.aliyuncs.com",
-                "OSS_BUCKET_NAME": "test-bucket",
-            },
-        ), patch("video_processing.oss_helpers.oss2.Auth"), patch(
-            "video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket_instance
-        ) as mock_bucket_cls:
-            import video_processing.oss_helpers as oss_mod
-
-            bucket = oss_bucket()
-
-            call_args = mock_bucket_cls.call_args
-            endpoint_arg = call_args[0][1]
-            # 不应该出现 https://https:// 这种双重前缀
-            assert endpoint_arg.count("https://") == 1
-            assert endpoint_arg == "https://oss-cn-hangzhou.aliyuncs.com"
-
-    def test_endpoint_with_http_keeps_as_is(self):
-        """endpoint 已有 http:// 时，不修改（保留用户选择）."""
-        from video_processing.oss_helpers import oss_bucket
-
-        mock_bucket_instance = MagicMock()
-        with patch.dict(
-            os.environ,
-            {
-                "OSS_ACCESS_KEY_ID": "test-key",
-                "OSS_ACCESS_KEY_SECRET": "test-secret",
-                "OSS_ENDPOINT": "http://oss-cn-hangzhou.aliyuncs.com",
-                "OSS_BUCKET_NAME": "test-bucket",
-            },
-        ), patch("video_processing.oss_helpers.oss2.Auth"), patch(
-            "video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket_instance
-        ) as mock_bucket_cls:
-            import video_processing.oss_helpers as oss_mod
-
-            bucket = oss_bucket()
-
-            call_args = mock_bucket_cls.call_args
-            endpoint_arg = call_args[0][1]
-            assert endpoint_arg == "http://oss-cn-hangzhou.aliyuncs.com"
-
-    def test_missing_credentials_returns_none(self):
-        """凭证缺失时返回 None."""
-        from video_processing.oss_helpers import oss_bucket
-
-        with patch.dict(
-            os.environ,
-            {
-                "OSS_ACCESS_KEY_ID": "",
-                "OSS_ACCESS_KEY_SECRET": "",
-                "OSS_ENDPOINT": "oss-cn-hangzhou.aliyuncs.com",
-                "OSS_BUCKET_NAME": "test-bucket",
-            },
-            clear=True,
-        ):
-            import video_processing.oss_helpers as oss_mod
-
-            bucket = oss_bucket()
-            assert bucket is None
-
-
-# ── get_signed_download_url ──────────────────────────────────────────────────
-
-
-class TestGetSignedDownloadUrl:
-    """测试 get_signed_download_url() 预签名 URL 生成."""
-
-    def test_returns_signed_url_with_storage_key(self):
-        """传入 storage key 时，调用 sign_url 并返回结果."""
-        from video_processing.oss_helpers import get_signed_download_url
-
-        mock_bucket = MagicMock()
-        mock_bucket.sign_url.return_value = "https://test-bucket.oss-cn-hangzhou.aliyuncs.com/generated/test.mp4?OSSAccessKeyId=xxx&Expires=xxx&Signature=xxx"
-
-        with patch.dict(
-            os.environ,
-            {
-                "OSS_ACCESS_KEY_ID": "test-key",
-                "OSS_ACCESS_KEY_SECRET": "test-secret",
-                "OSS_ENDPOINT": "oss-cn-hangzhou.aliyuncs.com",
-                "OSS_BUCKET_NAME": "test-bucket",
-            },
-        ), patch("video_processing.oss_helpers.oss2.Auth"), patch(
-            "video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket
-        ):
-            result = get_signed_download_url("generated/test.mp4", expires_seconds=3600)
-
-            assert result is not None
-            assert "Signature=" in result
-            mock_bucket.sign_url.assert_called_once_with("GET", "generated/test.mp4", 3600)
-
-    def test_normalizes_full_url_to_storage_key(self):
-        """传入完整 URL 时，提取 storage key 再生成签名."""
-        from video_processing.oss_helpers import get_signed_download_url
-
-        mock_bucket = MagicMock()
-        mock_bucket.sign_url.return_value = "https://test-bucket.oss-cn-hangzhou.aliyuncs.com/generated/test.mp4?sign=xxx"
-
-        with patch.dict(
-            os.environ,
-            {
-                "OSS_ACCESS_KEY_ID": "test-key",
-                "OSS_ACCESS_KEY_SECRET": "test-secret",
-                "OSS_ENDPOINT": "oss-cn-hangzhou.aliyuncs.com",
-                "OSS_BUCKET_NAME": "test-bucket",
-            },
-        ), patch("video_processing.oss_helpers.oss2.Auth"), patch(
-            "video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket
-        ):
-            result = get_signed_download_url(
-                "https://test-bucket.oss-cn-hangzhou.aliyuncs.com/generated/test.mp4"
-            )
-
-            mock_bucket.sign_url.assert_called_once()
-            # 验证传给 sign_url 的是纯 storage key，不是完整 URL
-            call_key = mock_bucket.sign_url.call_args[0][1]
-            assert not call_key.startswith("http")
-            assert call_key == "generated/test.mp4"
-
-    def test_returns_none_when_bucket_none(self):
-        """bucket 为 None 时返回 None（不抛异常）."""
-        from video_processing.oss_helpers import get_signed_download_url
-
-        with patch.dict(os.environ, {}, clear=True):
-            result = get_signed_download_url("generated/test.mp4")
-            assert result is None
-
-    def test_sign_url_exception_returns_none(self):
-        """sign_url 抛异常时，返回 None（不向上抛出）."""
-        from video_processing.oss_helpers import get_signed_download_url
-
-        mock_bucket = MagicMock()
-        mock_bucket.sign_url.side_effect = Exception("sign failed")
-
-        with patch.dict(
-            os.environ,
-            {
-                "OSS_ACCESS_KEY_ID": "test-key",
-                "OSS_ACCESS_KEY_SECRET": "test-secret",
-                "OSS_ENDPOINT": "oss-cn-hangzhou.aliyuncs.com",
-                "OSS_BUCKET_NAME": "test-bucket",
-            },
-        ), patch("video_processing.oss_helpers.oss2.Auth"), patch(
-            "video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket
-        ):
-            result = get_signed_download_url("generated/test.mp4")
-            assert result is None
-
-
-# ── upload_to_oss 返回 HTTPS URL ─────────────────────────────────────────────
-
-
-class TestUploadToOSSReturnsHTTPS:
-    """测试 upload_to_oss() 返回的 URL 始终是 HTTPS."""
-
-    def test_endpoint_without_scheme_returns_https_url(self):
-        """endpoint 不带 scheme 时，返回 HTTPS URL."""
-        from video_processing.oss_helpers import upload_to_oss
-
-        mock_bucket = MagicMock()
-        mock_bucket.put_object_from_file = MagicMock()
-
-        from pathlib import Path
-
-        with patch.dict(
-            os.environ,
-            {
-                "OSS_ACCESS_KEY_ID": "test-key",
-                "OSS_ACCESS_KEY_SECRET": "test-secret",
-                "OSS_ENDPOINT": "oss-cn-hangzhou.aliyuncs.com",
-                "OSS_BUCKET_NAME": "test-bucket",
-            },
-        ), patch("video_processing.oss_helpers.oss2.Auth"), patch(
-            "video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket
-        ):
-            result = upload_to_oss(Path("/tmp/test.mp4"), "generated/test.mp4")
-
-            assert result is not None
-            assert result.startswith("https://")
-            assert "test-bucket.oss-cn-hangzhou.aliyuncs.com/generated/test.mp4" in result
-
-    def test_endpoint_with_https_returns_clean_url(self):
-        """endpoint 带 https:// 时，URL 里不会有双重 https."""
-        from video_processing.oss_helpers import upload_to_oss
-
-        mock_bucket = MagicMock()
-        mock_bucket.put_object_from_file = MagicMock()
-
-        from pathlib import Path
-
-        with patch.dict(
-            os.environ,
-            {
-                "OSS_ACCESS_KEY_ID": "test-key",
-                "OSS_ACCESS_KEY_SECRET": "test-secret",
-                "OSS_ENDPOINT": "https://oss-cn-hangzhou.aliyuncs.com",
-                "OSS_BUCKET_NAME": "test-bucket",
-            },
-        ), patch("video_processing.oss_helpers.oss2.Auth"), patch(
-            "video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket
-        ):
-            result = upload_to_oss(Path("/tmp/test.mp4"), "generated/test.mp4")
-
-            assert result is not None
-            assert result.startswith("https://")
-            # 不应该出现 https://https://
-            assert result.count("https://") == 1
@@ -353,11 +353,16 @@ class TestHandleSegmentFailure:


 class TestPollSegmentTasks:
-    """测试 _poll_segment_tasks 分段缺失重新合成（适配同步接口）。"""
+    """测试 _poll_segment_tasks 异步轮询。"""

+    @patch("packages.application.tts_job.workflow.time")
    @patch("packages.application.tts_job.workflow.httpx")
-    def test_all_segments_done(self, mock_httpx: MagicMock) -> None:
-        """所有分段缺少 audio_url 时重新同步合成，合并后标记完成。"""
+    def test_all_segments_done(self, mock_httpx: MagicMock, mock_time: MagicMock) -> None:
+        """所有分段完成后合并并标记完成。"""
+        # Mock time.monotonic 让循环只执行一次
+        mock_time.monotonic.side_effect = [0.0, 1.0, 2.0]
+        mock_time.sleep = MagicMock()
+
        # Mock 下载分段音频
        mock_resp = MagicMock()
        mock_resp.content = b"seg audio"
@@ -365,7 +370,7 @@ class TestPollSegmentTasks:
        mock_httpx.get.return_value = mock_resp

        service = MagicMock(spec=CosyVoiceService)
-        service.submit_synthesize_task.side_effect = [
+        service.poll_synthesize_task.side_effect = [
            {"audio_url": "https://temp.com/seg1.mp3", "duration": 2.0, "file_size": 100},
            {"audio_url": "https://temp.com/seg2.mp3", "duration": 3.0, "file_size": 200},
        ]
@@ -376,8 +381,6 @@ class TestPollSegmentTasks:
        repo = MagicMock()
        job = _make_job(
            status=TTSJobStatus.PROCESSING,
-            # 长文本触发分段，用于重新合成时切分
-            input_text="这是一段很长的测试文本。" * 30,
            metadata={
                "segment_task_ids": ["task_1", "task_2"],
                "segment_audio_urls": ["", ""],
@@ -397,18 +400,19 @@ class TestPollSegmentTasks:
            result = workflow._poll_segment_tasks(job)

        assert result.status == TTSJobStatus.COMPLETED
-        # 两个缺失分段都重新合成了
-        assert service.submit_synthesize_task.call_count == 2

-    def test_segment_resynthesis_failure(self) -> None:
-        """分段重新合成失败时标记 job failed。"""
+    @patch("packages.application.tts_job.workflow.time")
+    def test_segment_poll_failure(self, mock_time: MagicMock) -> None:
+        """分段轮询失败时标记 job failed。"""
+        mock_time.monotonic.side_effect = [0.0, 1.0]
+        mock_time.sleep = MagicMock()
+
        service = MagicMock(spec=CosyVoiceService)
-        service.submit_synthesize_task.side_effect = CosyVoiceError("Synthesis failed")
+        service.poll_synthesize_task.side_effect = CosyVoiceError("Poll failed")

        repo = MagicMock()
        job = _make_job(
            status=TTSJobStatus.PROCESSING,
-            input_text="这是一段很长的测试文本。" * 30,
            metadata={
                "segment_task_ids": ["task_1"],
                "segment_audio_urls": [""],
@@ -422,51 +426,6 @@ class TestPollSegmentTasks:

        assert result.status == TTSJobStatus.FAILED

-    @patch("packages.application.tts_job.workflow.httpx")
-    def test_partial_audio_urls_reuse_existing(self, mock_httpx: MagicMock) -> None:
-        """部分分段已有 audio_url 时直接复用，缺失的重新合成。"""
-        mock_resp = MagicMock()
-        mock_resp.content = b"seg audio"
-        mock_resp.raise_for_status.return_value = None
-        mock_httpx.get.return_value = mock_resp
-
-        service = MagicMock(spec=CosyVoiceService)
-        # 只有 1 个分段需要重新合成
-        service.submit_synthesize_task.return_value = {
-            "audio_url": "https://temp.com/seg2.mp3",
-            "duration": 3.0,
-            "file_size": 200,
-        }
-
-        storage = MagicMock()
-        storage.upload_file.return_value = "https://oss.example.com/merged.mp3"
-
-        repo = MagicMock()
-        job = _make_job(
-            status=TTSJobStatus.PROCESSING,
-            input_text="这是一段很长的测试文本。" * 30,
-            metadata={
-                "segment_task_ids": ["task_1", "task_2"],
-                "segment_audio_urls": ["https://temp.com/seg1.mp3", ""],
-                "segment_format": "mp3",
-            },
-        )
-        repo.get.return_value = job
-        repo.update.side_effect = lambda j: j
-
-        workflow = _make_workflow(cosyvoice_service=service, repo=repo, storage=storage)
-
-        with patch("packages.application.tts_job.workflow.AudioMerger") as MockMerger:
-            mock_merger = MagicMock()
-            mock_merger.merge.return_value = b"merged data"
-            MockMerger.return_value = mock_merger
-
-            result = workflow._poll_segment_tasks(job)
-
-        assert result.status == TTSJobStatus.COMPLETED
-        # 只有 1 个缺失分段被重新合成
-        assert service.submit_synthesize_task.call_count == 1
-

 class TestPollAndProcessSynthesisSegmentDetection:
    """测试 poll_and_process_synthesis 正确识别分段任务。"""
@@ -356,89 +356,6 @@ class TestBuildFilterComplex:
        assert "overlay=" in fc
        assert "[final_video]" in fc

-    def test_setpts_before_fps_in_xfade_inputs(self):
-        """多视频 xfade 模式：setpts=PTS-STARTPTS 必须在 fps 之前，确保 xfade 时各片段 PTS 一致。
-
-        构造两个不同时长的视频片段，验证生成的 filter_complex 中每个片段的
-        预处理滤镜链里 setpts 都在 fps 前面。
-        """
-        clips = [
-            _make_clip("c1", "main", order=0, duration=3.0),
-            _make_clip("c2", "main", order=1, duration=5.0),
-        ]
-        asset_paths = {
-            "asset_c1.mp4": Path("/tmp/asset_c1.mp4"),
-            "asset_c2.mp4": Path("/tmp/asset_c2.mp4"),
-        }
-        svc = _make_service(clips, asset_paths)
-
-        with _patch_path_exists(), patch("video_processing.unified_render_service.probe_duration", return_value=5.0):
-            resolved = svc._resolve_clips()
-            layers = svc._group_clips_into_layers(resolved)
-            fc, _ = svc._build_filter_complex(layers)
-
-        # 确保 xfade 存在
-        assert "xfade=" in fc
-
-        # 提取每个 clip 的预处理滤镜链（[i:v]...[vi] 部分）
-        # 验证：每个 clip 滤镜链中，setpts=PTS-STARTPTS 的最后一次出现
-        # 必须在 fps= 的前面（PTS 归一化后再统一帧率）
-        import re
-
-        clip_pattern = re.compile(r"\[(\d+):v\](.+?)\[v\d+\]")
-        matches = clip_pattern.findall(fc)
-        assert len(matches) == 2, f"Expected 2 clip preprocessing chains, got {len(matches)}"
-
-        for idx, chain_str in matches:
-            # 找到所有 setpts 和 fps 的位置
-            setpts_positions = [m.start() for m in re.finditer(r"setpts=PTS-STARTPTS", chain_str)]
-            fps_positions = [m.start() for m in re.finditer(r"fps=\d+", chain_str)]
-
-            assert setpts_positions, f"clip {idx}: 未找到 setpts=PTS-STARTPTS"
-            assert fps_positions, f"clip {idx}: 未找到 fps="
-
-            # 最后一个 setpts 必须在第一个 fps 之前
-            last_setpts = max(setpts_positions)
-            first_fps = min(fps_positions)
-            assert last_setpts < first_fps, (
-                f"clip {idx}: setpts(position={last_setpts}) 应该在 fps(position={first_fps}) 之前。"
-                f"滤镜链: {chain_str}"
-            )
-
-    def test_setpts_before_fps_single_clip(self):
-        """单视频模式（一镜到底）：setpts 也必须在 fps 之前。
-
-        单视频虽然没有 xfade，但滤镜链顺序应保持一致，确保 PTS 处理逻辑统一。
-        """
-        clips = [_make_clip("c1", "main", order=0, duration=5.0)]
-        asset_paths = {"asset_c1.mp4": Path("/tmp/asset_c1.mp4")}
-        svc = _make_service(clips, asset_paths)
-
-        with _patch_path_exists(), patch("video_processing.unified_render_service.probe_duration", return_value=5.0):
-            resolved = svc._resolve_clips()
-            layers = svc._group_clips_into_layers(resolved)
-            fc, _ = svc._build_filter_complex(layers)
-
-        import re
-
-        clip_pattern = re.compile(r"\[(\d+):v\](.+?)\[v\d+\]")
-        matches = clip_pattern.findall(fc)
-        assert len(matches) == 1
-
-        chain_str = matches[0][1]
-        setpts_positions = [m.start() for m in re.finditer(r"setpts=PTS-STARTPTS", chain_str)]
-        fps_positions = [m.start() for m in re.finditer(r"fps=\d+", chain_str)]
-
-        assert setpts_positions, "单视频: 未找到 setpts=PTS-STARTPTS"
-        assert fps_positions, "单视频: 未找到 fps="
-
-        last_setpts = max(setpts_positions)
-        first_fps = min(fps_positions)
-        assert last_setpts < first_fps, (
-            f"单视频: setpts(position={last_setpts}) 应该在 fps(position={first_fps}) 之前。"
-            f"滤镜链: {chain_str}"
-        )
-
    def test_empty_layers_raises(self):
        """空图层列表抛出 ValueError。"""
        svc = _make_service()
@@ -57,15 +57,15 @@ def _make_service(
 class TestStartClone:
    """测试 start_clone 方法。"""

-    def test_start_clone_with_deploying(self) -> None:
-        """提交克隆后返回 DEPLOYING 状态，profile 保持 processing。"""
+    def test_start_clone_with_async_task(self) -> None:
+        """异步模式：提交任务后返回 processing 状态的 profile。"""
        mock_repo = MagicMock()
        mock_cosyvoice = MagicMock(spec=CosyVoiceService)

-        # CosyVoice 返回 voice_id + DEPLOYING 状态（需轮询）
+        # CosyVoice 返回 task_id（异步模式）
        mock_cosyvoice.submit_clone_task.return_value = {
-            "voice_id": "voice-abc",
-            "status": "DEPLOYING",
+            "task_id": "task-abc",
+            "voice_id": "",
            "request_id": "req-123",
        }

@@ -81,21 +81,21 @@ class TestStartClone:
        )

        assert profile.status == VoiceCloneStatus.PROCESSING
-        assert profile.metadata["cosyvoice_task_id"] == "voice-abc"
+        assert profile.metadata["cosyvoice_task_id"] == "task-abc"
        assert profile.metadata["cosyvoice_request_id"] == "req-123"
        mock_cosyvoice.submit_clone_task.assert_called_once()
        assert mock_repo.create.call_count == 1
-        # update 至少调用 2 次：mark_processing + 保存 voice_id
+        # update 至少调用 2 次：mark_processing + 保存 task_id
        assert mock_repo.update.call_count >= 2

-    def test_start_clone_with_ok_status(self) -> None:
-        """CosyVoice 直接返回 OK 状态，profile 变为 ready。"""
+    def test_start_clone_with_sync_result(self) -> None:
+        """同步模式：CosyVoice 直接返回 voice_id，profile 变为 ready。"""
        mock_repo = MagicMock()
        mock_cosyvoice = MagicMock(spec=CosyVoiceService)

        mock_cosyvoice.submit_clone_task.return_value = {
+            "task_id": "",
            "voice_id": "voice-sync-123",
-            "status": "OK",
            "request_id": "req-456",
        }

@@ -244,8 +244,8 @@ class TestRetryClone:
        mock_repo.update.side_effect = lambda p: p

        mock_cosyvoice.submit_clone_task.return_value = {
-            "voice_id": "voice-retry",
-            "status": "DEPLOYING",
+            "task_id": "task-retry",
+            "voice_id": "",
            "request_id": "req-retry",
        }

@@ -253,11 +253,11 @@ class TestRetryClone:
        result = service.retry_clone(profile.id, "user-123")

        assert result.status == VoiceCloneStatus.PROCESSING
-        assert result.metadata["cosyvoice_task_id"] == "voice-retry"
+        assert result.metadata["cosyvoice_task_id"] == "task-retry"
        assert result.retry_count == 2  # prepare_retry 增加了一次

-    def test_retry_clone_with_ok_status(self) -> None:
-        """重试成功，直接返回 OK 状态。"""
+    def test_retry_clone_with_sync_result(self) -> None:
+        """重试成功，同步模式。"""
        mock_repo = MagicMock()
        mock_cosyvoice = MagicMock(spec=CosyVoiceService)

@@ -266,8 +266,8 @@ class TestRetryClone:
        mock_repo.update.side_effect = lambda p: p

        mock_cosyvoice.submit_clone_task.return_value = {
+            "task_id": "",
            "voice_id": "voice-retry-sync",
-            "status": "OK",
            "request_id": "req-retry",
        }
Author	SHA1	Message	Date
CI Bot	276342520f	cleanup: Backend Phase 1 — 5项代码清理任务 CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 8s Details CI/CD Pipeline / Frontend Lint (pull_request) Successful in 3m28s Details CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details 1. 修复密码重置接口路径不一致 Bug (auth.py) - forgot_password 硬编码 localhost → 使用 APP_BASE_URL 配置 2. 删除 8 处死代码（未使用 import/变量） - 清理多个文件中的未使用导入和变量 3. 删除 8 个空文件/空模块 - 删除无内容的 __init__.py 文件 4. 合并 3 对 100% 完全重复的函数 - 提取 check_project_access/get_user_plan/require_project_and_library - 新建 apps/api/app/api/routes/_helpers.py 作为共享模块 - 6 个路由文件改为从 _helpers 导入 5. 对齐 6 个废弃/异常环境变量 - 修复 DATABASE_POOL_RECYLE 拼写错误 → DATABASE_POOL_RECYCLE - 添加 JWT_ALGORITHM/JWT_ACCESS_TOKEN_EXPIRE_MINUTES/JWT_REFRESH_TOKEN_EXPIRE_DAYS 到 Settings - 修复 jwt_service.py hasattr 字段名匹配 - .env.example: CORS_ORIGINS → CORS_ORIGINS_RAW（逗号分隔格式） - .env.example: 启用 APP_ENV - 修复 OSS_ENDPOINT 默认值拼写错误 (aliiyuncs.com → aliyuncs.com) - 添加 COSYVOICE_* 变量来源注释修改文件: 52 个（新增 1，删除 8，修改 43）	2026-07-13 13:23:30 +08:00
用户CI Test	6feb541127	fix: P0-2 sign_url 返回 HTTPS URL（endpoint 加 https:// 前缀） CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 10s Details CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m20s Details CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details 根因：oss2.Bucket 的 endpoint 参数不带 scheme 时，sign_url() 默认生成 HTTP URL（如 http://bucket.oss-cn-hangzhou.aliyuncs.com/...），前端/浏览器视为不安全请求拒绝加载。修复：初始化 oss2.Bucket 前检查 endpoint 是否带 http(s):// 前缀，不带则自动补 https://，确保 sign_url 输出 HTTPS URL。新增 2 个测试验证 endpoint scheme 处理逻辑。	2026-07-10 17:27:57 +08:00
用户CI Test	6efac8de4b	fix: P0-2 OSS 凭证启动验证 + 诊断日志 CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 16s Details CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m38s Details CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details - config.py: 非开发环境 OSS_ACCESS_KEY_ID/SECRET 为空时启动失败（fail-fast） - storage.py: 新增 diagnose() 方法，启动时输出 OSS 配置状态 - 新增 7 个单元测试覆盖凭证验证和诊断逻辑注意：staging 实际已有 OSS 凭证配置，预签名 URL 可正常生成。真正问题是 sign_url 返回 HTTP 而非 HTTPS，后续修复。	2026-07-10 17:23:58 +08:00
				`@@ -1 +0,0 @@`
				`"""Adapters package for external implementations."""`