feat(ci): 拆分构建workflow + buildx动态命名（解决cancel-in-progress踩踏）

- ci-cd.yml：仅保留4个门禁（validate/unit/integration/frontend-lint），cancel-in-progress: true
- ci-build.yml：构建/部署/E2E，cancel-in-progress: false，避免频繁推送取消构建
- buildx builder动态命名：ci-builder--，避免并发job冲突
- 已同步阿里云ACR配置

apps/api/app/api/routes/edit_plans.py

@@ -72,6 +72,7 @@ class EditPlanResponse(BaseModel):
     name: str
     status: str
     total_duration: float
+    result_count: int = 0
     project_id: str = ""
     created_by_user_id: str = ""
     config: dict[str, Any]
@@ -241,6 +242,7 @@ def _to_response(p: EditPlan) -> EditPlanResponse:
         name=p.name,
         status=p.status.value if hasattr(p.status, "value") else p.status,
         total_duration=p.total_duration,
+        result_count=getattr(p, "result_count", 0),
         project_id=p.project_id or "",
         created_by_user_id=p.created_by_user_id or "",
         config=p.config,

apps/web/src/api/editPlans.ts

@@ -130,6 +130,8 @@ export interface EditPlan {
   name: string;
   status: EditPlanStatus;
   total_duration: number;
+  /** 生成视频数量（后端 EditPlanResponse.result_count） */
+  result_count: number;
   config: EditPlanConfig;
   created_at: string;
   updated_at: string;
@@ -161,14 +163,21 @@ export interface GenerateResponse {
   clip_count: number;
 }
 
-/** 剪辑计划关联的生成记录 */
+/** 剪辑计划关联的生成记录（实际是 GenerationTask 对象） */
 export interface EditPlanGeneration {
-  id: string;
-  edit_plan_id: string;
-  generation_task_id: string;
+  id: string; // 即 generation_task_id
+  source_edit_plan_id: string;
+  template_id: string;
+  asset_ids: string[];
   status: EditPlanStatus;
-  created_at: string;
-  updated_at: string;
+  progress: number;
+  result_count: number;
+  error_message: string;
+  error_info: Record<string, unknown>;
+  logs: Array<Record<string, unknown>>;
+  retry_count: number;
+  created_at?: string;
+  updated_at?: string;
 }
 
 /** 片段生成状态 */

apps/web/src/pages/edit-plans/EditPlans.tsx

@@ -254,6 +254,16 @@ export default function EditPlans() {
         <span className="plan-duration">{formatDuration(seconds)}</span>
       ),
     },
+    {
+      title: "视频数",
+      dataIndex: "result_count",
+      key: "result_count",
+      width: 80,
+      align: "center",
+      render: (count: number) => (
+        <span className="plan-result-count">{count > 0 ? count : "—"}</span>
+      ),
+    },
     {
       title: "创建时间",
       dataIndex: "created_at",

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

@@ -65,7 +65,7 @@ const GenerationHistoryModal: React.FC<GenerationHistoryModalProps> = ({
                   return (
                     <tr key={gen.id} className="ep-gh-table-row">
                       <td className="ep-gh-td ep-gh-td-id">
-                        {gen.generation_task_id.slice(0, 8)}...
+                        {gen.id ? `${gen.id.slice(0, 8)}...` : "—"}
                       </td>
                       <td className="ep-gh-td">
                         <span className={`ep-gh-status-tag ${statusClass}`}>

packages/adapters/sqlalchemy_impl/models.py

@@ -1,9 +1,10 @@
 from datetime import datetime, timezone
+from typing import Any
 
 from sqlalchemy import JSON, Boolean, Column, DateTime, Float, Integer, String, Text, UniqueConstraint
 from sqlalchemy.orm import declarative_base
 
-Base = declarative_base()
+Base: Any = declarative_base()
 
 
 class UserModel(Base):

scripts/check_migration_safety.py

@@ -30,10 +30,13 @@
 from __future__ import annotations
 
 import argparse
+import json
 import os
 import re
 import subprocess
 import sys
+import urllib.error
+import urllib.request
 from pathlib import Path
 from typing import List, Tuple
 
@@ -99,30 +102,37 @@ def extract_upgrade_content(content: str) -> str:
 
 def get_new_migrations_via_diff(diff_target: str) -> List[Path]:
     """
-    通过 git diff 对比目标分支/commit，找出 alembic/versions/ 下新增的迁移文件。
-    只包含新增文件（A状态），不包含修改或删除的文件。
+    通过 Gitea API 对比目标分支，找出 alembic/versions/ 下新增的迁移文件。
+    不依赖本地 git，避免 CI 环境下 git 操作不稳定的问题。
     """
+    api_url = os.environ.get("GITHUB_API_URL", "")
+    repo = os.environ.get("GITHUB_REPOSITORY", "")
+    token = os.environ.get("GITHUB_TOKEN", "")
+    branch = diff_target.replace("origin/", "")
+
+    if not api_url or not repo or not token:
+        print("⚠️  CI 环境变量不完整，降级为检查所有迁移文件")
+        return sorted(ALEMBIC_VERSIONS_DIR.glob("*.py"))
+
     try:
-        result = subprocess.run(
-            [
-                "git",
-                "diff",
-                "--name-only",
-                "--diff-filter=A",
-                diff_target,
-                "HEAD",
-                "--",
-                "alembic/versions/",
-            ],
-            cwd=str(REPO_ROOT),
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-        files = [line.strip() for line in result.stdout.strip().split("\n") if line.strip()]
-        return [REPO_ROOT / f for f in files]
-    except subprocess.CalledProcessError as e:
-        print(f"⚠️  git diff 失败（{diff_target}）：{e.stderr.strip()}")
+        url = f"{api_url}/repos/{repo}/contents/alembic/versions?ref={branch}"
+        req = urllib.request.Request(url, headers={"Authorization": f"token {token}"})
+        with urllib.request.urlopen(req, timeout=15) as resp:
+            data = json.loads(resp.read().decode())
+
+        remote_files = {item["name"] for item in data if item["name"].endswith(".py")}
+        local_files = {f.name for f in ALEMBIC_VERSIONS_DIR.glob("*.py")}
+        new_file_names = sorted(local_files - remote_files)
+
+        if new_file_names:
+            result = [ALEMBIC_VERSIONS_DIR / f for f in new_file_names]
+            print(f"   （API 对比 {branch} 分支，发现 {len(result)} 个新增迁移）")
+            return result
+        else:
+            print(f"   （API 对比 {branch} 分支，无新增迁移）")
+            return []
+    except Exception as e:
+        print(f"⚠️  API 获取迁移列表失败：{e}")
         print("   降级为检查所有迁移文件")
         return sorted(ALEMBIC_VERSIONS_DIR.glob("*.py"))
 

scripts/ci_staging_deploy.sh

@@ -7,7 +7,7 @@
 # 环境变量:
 #   IMAGE_TAG       - 镜像版本 tag（如 commit SHA 或分支名）
 #   REGISTRY_TOKEN  - Registry 访问令牌
-#   REGISTRY        - Registry 地址（默认 git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas）
+#   REGISTRY        - Registry 地址（默认 xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji）
 #   REGISTRY_USER   - Registry 用户名（默认 xiaoxia）
 #   ENV_FILE        - 环境变量文件路径
 #   GENERATED_DIR   - 生成文件目录
@@ -16,9 +16,9 @@
 set -eu
 
 IMAGE_TAG="${IMAGE_TAG:-}"
-REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
-REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
-REGISTRY_TOKEN="${REGISTRY_TOKEN:-}"
+REGISTRY="${REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
+REGISTRY_USER="${ACR_USERNAME:-${REGISTRY_USER:-nick0415343655}}"
+REGISTRY_TOKEN="${ACR_PASSWORD:-${REGISTRY_TOKEN:-}}"
 
 ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-staging/.env}"
 GENERATED_DIR="${GENERATED_DIR:-/var/lib/xiaoxia-saas-staging/generated}"