feat: 版本轨道按分支彻底分开，自测分支不再共用 feature 轨

每个分支各有一条独立轨道（轨道名即分支名，master/main 沿用历史名 release），
轨道类型 kind 只决定构建号行为：release 上架自增、feature 自测不自增。

- branch_track 映射分支 → 轨道名，新增分支自动建同名轨道
- 迁移：旧的共用 release / feature 轨按分支拆开并复制已用构建号，
  拆完没有分支引用的旧共用轨直接删除；无自测分支时保留 feature 轨作模板
- 分支管理页的下拉只改轨道类型（是否自增），不再影响版本号归属
- 打包设置页按分支分块填写版本号

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BJaZ913U5GVdTkYHiRpvDU

CLAUDE.md

@@ -26,7 +26,7 @@ FastAPI + Vue 3 iOS app auto-packaging service. Supports Ad_Hoc and App_Store bu
 - `backend/config.py` — loads .env, defines all config constants
 - `frontend/src/views/` — BuildView, HistoryView, ConfigView
 - `config.json` — runtime config (apps, schemes, servers, upload, branches, versions) managed via web UI
-- Versions are per-track: `release` (master/develop, build number auto-increments on App_Store) and `feature` (self-test, never increments); each branch's track lives in `config["branch_track"]`
+- Versions are per-branch: every branch owns a track in `config["versions"]["tracks"]`, named after the branch (master/main keeps the historical name `release`); `config["branch_track"]` maps branch → track name, and each track's `kind` is `release` (build number auto-increments on App_Store) or `feature` (never increments)
 
 ## Conventions
 

README.md

@@ -187,21 +187,36 @@ GIT_PASSWORD=<仅 read_repository 权限的 Personal Access Token>
 | App 管理 | 应用名称、Scheme、服务器环境、upload_key 等 |
 | Scheme 管理 | 打包 Scheme 配置 |
 | 服务器环境 | 测试/正式/自定义环境的 API 地址、Universal Link 等 |
-| 分支管理 | 可打包的代码分支列表，以及每个分支所属的版本轨道 |
+| 分支管理 | 可打包的代码分支列表，以及每个分支的版本轨道类型（上架 / 自测） |
 | 版本号 | 服务端统一管理 App_Ver 和 Build_Ver，不修改分支源码；按版本轨道分开管理（见下） |
 | 上传配置 | 服务端内置 OSS / WebDAV 分发，生成 IPA、manifest、下载页和二维码 |
 
 ### 版本号与版本轨道
 
-版本号按 **轨道（track）** 分开管理，两条轨道的 App_Ver 各自独立填写、互不影响：
+**每个分支各有一条版本轨道（track）**，App_Ver 与构建号完全独立、互不影响。轨道名即分支名（master / main 沿用历史名称 `release`），轨道类型 `kind` 决定构建号行为：
 
-| 轨道 | 适用分支 | 构建号行为 |
-|------|----------|-----------|
-| `release`（上架） | master、develop（共用同一套版本号与构建号序列） | App_Store 打包时按当前 App_Ver 自动 +1 |
-| `feature`（自测） | feature/* 等其他分支 | 永不自增，始终使用配置页填写的值（默认 `.0`） |
+| 轨道类型 | 默认适用分支 | 构建号行为 |
+|----------|--------------|-----------|
+| `release`（上架） | master、main、develop、dev、release-*、hotfix-* | App_Store 打包时按当前 App_Ver 自动 +1 |
+| `feature`（自测） | 其余分支 | 永不自增，始终使用配置页填写的值（默认 `.0`） |
 
-- 分支归属默认按名字推断（master/main/develop/dev/release-*/hotfix-* → release，其余 → feature），可在「分支管理」页逐个改。
+```jsonc
+"versions": {
+  "tracks": {
+    "release": { "kind": "release", "app_ver": "2.195.0", "build_map": { "2.195.0": 7 } },  // master
+    "develop": { "kind": "release", "app_ver": "2.196.0", "build_map": {} },
+    "feature/login": { "kind": "feature", "app_ver": "2.100.0", "build_map": {} }
+  }
+},
+"branch_track": { "master": "release", "develop": "develop", "feature/login": "feature/login" }
+```
+
+- 新增分支时自动建一条同名轨道，类型按分支名推断，可在「分支管理」页逐个改（只改构建号是否自增，版本号仍各自独立）。
+- 「打包设置」页按分支分块填写版本号。
 - 每条轨道内的构建号按 App_Ver 独立记录（`build_map`），回退到打过包的旧版本号时会从它自己的最大值继续，不会与 App Store Connect 上已传构建号冲突。
+- App Store 的构建号唯一性按 App_Ver 全局判定，因此两个上架分支若临时用了同一个 App_Ver，递增时会跨轨道取最大值 +1，避免重号被拒。
+- 旧配置（master/develop 共用的 `release` 轨、各自测分支共用的 `feature` 轨）首次启动时自动拆开：master 留在 `release` 轨，其余分支新建同名轨道并复制一份已用构建号。
+- 需要两个分支共用同一条版本线时，可直接把 `branch_track` 里的值指向另一条轨道名。
 
 ### 服务端自动化资源
 

backend/routers/config.py

@@ -93,74 +93,152 @@ DEFAULT_SERVERS = {
 
 DEFAULT_APP_VER = "2.180.0"
 
-# 版本轨道：上架分支(master/develop)共用 release，自测分支(feature/*)用 feature。
-# 两条轨道的 App_Ver 各自独立填写，互不影响。
-TRACK_RELEASE = "release"
-TRACK_FEATURE = "feature"
-TRACKS = (TRACK_RELEASE, TRACK_FEATURE)
+# 版本轨道：每个分支各有一条独立轨道，轨道名即分支名（master/main 沿用历史名称 release），
+# 各分支的 App_Ver 与构建号互不影响。轨道类型（kind）决定构建号行为：
+#   release（上架）— App_Store 打包时自增；feature（自测）— 永不自增。
+KIND_RELEASE = "release"
+KIND_FEATURE = "feature"
+KINDS = (KIND_RELEASE, KIND_FEATURE)
+TRACK_RELEASE = "release"          # master/main 的轨道名（沿用旧名，历史构建号原地保留）
+TRACK_FEATURE = "feature"          # 旧版所有自测分支共用的轨道名，迁移时按分支拆开
+FIXED_TRACKS = (TRACK_RELEASE, TRACK_FEATURE)
 
-# 按名字推断轨道的默认规则；config["branch_track"] 中的显式配置优先。
-RELEASE_BRANCH_NAMES = {"master", "main", "develop", "dev"}
+# 按名字推断轨道类型的默认规则；轨道记录里的 kind 为准，此处只用于新建轨道。
+MASTER_BRANCH_NAMES = {"master", "main"}
+RELEASE_BRANCH_NAMES = MASTER_BRANCH_NAMES | {"develop", "dev"}
 RELEASE_BRANCH_PREFIXES = ("release/", "release-", "hotfix/", "hotfix-")
 
 
-def _default_track_for_branch(branch: str) -> str:
-    """按分支名推断所属版本轨道。"""
+def _is_release_branch(branch: str) -> bool:
+    """按分支名推断是否为上架分支。"""
     name = (branch or "").strip().lower()
-    if name in RELEASE_BRANCH_NAMES or name.startswith(RELEASE_BRANCH_PREFIXES):
+    return name in RELEASE_BRANCH_NAMES or name.startswith(RELEASE_BRANCH_PREFIXES)
+
+
+def _default_kind_for_branch(branch: str) -> str:
+    """新建轨道时按分支名推断轨道类型。"""
+    return KIND_RELEASE if _is_release_branch(branch) else KIND_FEATURE
+
+
+def _default_track_for_branch(branch: str) -> str:
+    """分支自己的轨道名：master/main 沿用历史名 release，其余即分支名。
+
+    分支恰好叫 release / feature（且不是 master）时加前缀避让，免得撞上固定轨道名。
+    """
+    if (branch or "").strip().lower() in MASTER_BRANCH_NAMES:
         return TRACK_RELEASE
-    return TRACK_FEATURE
+    return f"branch:{branch}" if branch in FIXED_TRACKS else branch
 
 
-def _new_track(app_ver: str = DEFAULT_APP_VER) -> dict:
+def _new_track(app_ver: str = DEFAULT_APP_VER, kind: str = KIND_RELEASE) -> dict:
     # 每个版本号(App_Ver)独立记录已用到的最大构建号第四位。
     # App Store 的构建号唯一性按 MARKETING_VERSION(即完整 App_Ver) 分别计算，
     # 因此必须按版本号分别记录，回退到旧版本号时才能从它自己的最大值继续递增。
-    return {"app_ver": app_ver, "build_map": {}}
+    return {"kind": kind, "app_ver": app_ver, "build_map": {}}
+
+
+def _seed_track(tracks: dict, kind: str, legacy: dict = None) -> dict:
+    """新建轨道的初值：优先沿用被拆分的旧共用轨（含已用构建号），
+    否则沿用任一同类型轨道的 App_Ver，都没有则用默认版本号。"""
+    if legacy:
+        return {"kind": kind, "app_ver": legacy["app_ver"], "build_map": dict(legacy["build_map"])}
+    for track in tracks.values():
+        if isinstance(track, dict) and track.get("kind") == kind:
+            return _new_track(track.get("app_ver") or DEFAULT_APP_VER, kind)
+    return _new_track(kind=kind)
+
+
+def _ensure_track(config: dict, track_name: str, kind: str = None) -> dict:
+    """确保轨道存在（新建时沿用同类型轨道的 App_Ver，构建号从 .0 起）；
+    显式传 kind 时同时把轨道类型改成它。"""
+    tracks = config.setdefault("versions", {}).setdefault("tracks", {})
+    track = tracks.get(track_name)
+    if not isinstance(track, dict):
+        track = tracks[track_name] = _seed_track(
+            tracks, kind or _default_kind_for_track(track_name)
+        )
+    elif kind:
+        track["kind"] = kind
+    return track
+
+
+def _default_kind_for_track(track_name: str) -> str:
+    """轨道记录缺 kind 时按轨道名推断（轨道名即分支名）。"""
+    if track_name == TRACK_RELEASE:
+        return KIND_RELEASE
+    if track_name == TRACK_FEATURE:
+        return KIND_FEATURE
+    return _default_kind_for_branch(track_name)
+
+
+def _legacy_single_track(versions: dict) -> dict:
+    """把最旧的单轨结构读成 {app_ver, build_map}。"""
+    app_ver = versions.get("app_ver") or DEFAULT_APP_VER
+    build_map = versions.get("build_map")
+    if not isinstance(build_map, dict):
+        build_map = {}
+        # 更旧的单值形式 "2.195.0.3" → {"2.195.0": 3}
+        old = versions.get("build_ver")
+        if isinstance(old, str):
+            parts = old.split(".")
+            if len(parts) >= 4 and parts[3].isdigit():
+                build_map[".".join(parts[:3])] = int(parts[3])
+    versions.pop("app_ver", None)
+    versions.pop("build_map", None)
+    versions.pop("build_ver", None)
+    return {"app_ver": app_ver, "build_map": build_map}
+
+
+def _legacy_shared_track(tracks: dict, name: str) -> dict:
+    """取出待拆分的旧共用轨（迁移后的轨道都带 kind，没有 kind 的即旧共用轨）。"""
+    track = tracks.get(name)
+    if not isinstance(track, dict) or "kind" in track:
+        return None
+    build_map = track.get("build_map")
+    return {
+        "app_ver": track.get("app_ver") or DEFAULT_APP_VER,
+        "build_map": build_map if isinstance(build_map, dict) else {},
+    }
 
 
 def _ensure_versions(config: dict) -> bool:
-    """确保 versions 为双轨结构，并迁移旧式单轨/单值 build_ver 配置。
+    """确保 versions 为「每个分支一条轨道」结构，并迁移旧配置。
 
-    旧式 ``{"app_ver": ..., "build_map": ...}`` 整体迁入 release 轨；
-    feature 轨用同一个 App_Ver 初始化，构建号从 .0 起且永不自增。
+    旧式单轨 ``{"app_ver": ..., "build_map": ...}``、旧的 master/develop 共用
+    ``release`` 轨和所有自测分支共用的 ``feature`` 轨，都会按分支拆开：
+    master/main 留在 release 轨（历史构建号原地保留），其余分支新建以分支名命名的
+    轨道并复制一份已用构建号，使拆分后每个分支都从原来的构建号继续。
     """
     versions = config.get("versions")
     changed = False
-
     if not isinstance(versions, dict):
-        config["versions"] = {"tracks": {TRACK_RELEASE: _new_track(), TRACK_FEATURE: _new_track()}}
-        return True
-
-    tracks = versions.get("tracks")
-    if not isinstance(tracks, dict):
-        # 旧式单轨结构 → release 轨
-        legacy_app_ver = versions.get("app_ver") or DEFAULT_APP_VER
-        legacy_build_map = versions.get("build_map")
-        if not isinstance(legacy_build_map, dict):
-            legacy_build_map = {}
-            # 更旧的单值形式 "2.195.0.3" → {"2.195.0": 3}
-            old = versions.get("build_ver")
-            if isinstance(old, str):
-                parts = old.split(".")
-                if len(parts) >= 4 and parts[3].isdigit():
-                    legacy_build_map[".".join(parts[:3])] = int(parts[3])
-        versions.pop("app_ver", None)
-        versions.pop("build_map", None)
-        versions.pop("build_ver", None)
-        tracks = {
-            TRACK_RELEASE: {"app_ver": legacy_app_ver, "build_map": legacy_build_map},
-            TRACK_FEATURE: _new_track(legacy_app_ver),
-        }
-        versions["tracks"] = tracks
+        versions = {}
+        config["versions"] = versions
         changed = True
 
-    for name in TRACKS:
-        track = tracks.get(name)
+    # 待拆分到各分支的旧共用轨（按类型各一条）
+    legacy = {KIND_RELEASE: None, KIND_FEATURE: None}
+    tracks = versions.get("tracks")
+    if not isinstance(tracks, dict):
+        legacy[KIND_RELEASE] = _legacy_single_track(versions)
+        legacy[KIND_FEATURE] = dict(legacy[KIND_RELEASE], build_map={})
+        tracks = {}
+        versions["tracks"] = tracks
+        changed = True
+    else:
+        # release 轨拆分后继续作为 master/main 的轨道，feature 轨拆分后成为无人引用的模板
+        legacy[KIND_RELEASE] = _legacy_shared_track(tracks, TRACK_RELEASE)
+        legacy[KIND_FEATURE] = _legacy_shared_track(tracks, TRACK_FEATURE)
+    splitting = any(legacy.values())
+    split_kinds = set()  # 实际被拆分出去的旧共用轨类型
+
+    for name, track in tracks.items():
         if not isinstance(track, dict):
-            tracks[name] = _new_track()
+            track = tracks[name] = _new_track(kind=_default_kind_for_track(name))
+            changed = True
+        if track.get("kind") not in KINDS:
+            track["kind"] = _default_kind_for_track(name)
             changed = True
-            continue
         if not track.get("app_ver"):
             track["app_ver"] = DEFAULT_APP_VER
             changed = True
@@ -168,33 +246,110 @@ def _ensure_versions(config: dict) -> bool:
             track["build_map"] = {}
             changed = True
 
-    # 分支归属：只存显式配置，缺省按名字规则推断
+    # 分支归属：值为轨道名，缺省用分支自己的轨道
     branch_track = config.get("branch_track")
     if not isinstance(branch_track, dict):
         branch_track = {}
         config["branch_track"] = branch_track
         changed = True
     for branch in config.get("branches", []) or []:
-        if branch_track.get(branch) not in TRACKS:
-            branch_track[branch] = _default_track_for_branch(branch)
+        name = branch_track.get(branch)
+        if splitting and name in FIXED_TRACKS:
+            # 旧的共用轨 → 各分支自己的轨道（master/main 仍留在 release 轨）
+            name = _default_track_for_branch(branch)
+        if not isinstance(name, str) or not name:
+            name = _default_track_for_branch(branch)
+        if branch_track.get(branch) != name:
+            branch_track[branch] = name
+            changed = True
+        if name not in tracks:
+            kind = _default_kind_for_branch(branch)
+            tracks[name] = _seed_track(tracks, kind, legacy[kind])
+            if legacy[kind]:
+                split_kinds.add(kind)
+            changed = True
+
+    # 内容已复制到各分支轨道、又没有分支引用的旧共用轨，直接删掉，免得配置里留下无用条目
+    for name in FIXED_TRACKS:
+        kind = _default_kind_for_track(name)
+        if kind in split_kinds and name in tracks and name not in branch_track.values():
+            tracks.pop(name)
             changed = True
 
     return changed
 
 
+def _primary_track_name(config: dict) -> str:
+    """主上架轨：第一个上架分支（kind=release）所属的轨道；都没有则取第一个分支的轨道。
+
+    仅用于顶层 app_ver/build_ver 的兼容字段和未指定轨道时的缺省值。
+    """
+    fallback = TRACK_RELEASE
+    for index, branch in enumerate(config.get("branches", []) or []):
+        name = get_track_name(config, branch)
+        if index == 0:
+            fallback = name
+        if is_release_track(get_track(config, name)):
+            return name
+    return fallback
+
+
 def get_track_name(config: dict, branch: str) -> str:
     """取分支所属的版本轨道名。"""
-    track = (config.get("branch_track") or {}).get(branch)
-    return track if track in TRACKS else _default_track_for_branch(branch)
+    name = (config.get("branch_track") or {}).get(branch)
+    tracks = (config.get("versions") or {}).get("tracks") or {}
+    if isinstance(name, str) and name in tracks:
+        return name
+    return _default_track_for_branch(branch)
 
 
 def get_track(config: dict, track_name: str) -> dict:
-    """取某条轨道的版本记录（不存在时返回默认值，不写回配置）。"""
+    """取某条轨道的版本记录副本（不存在时返回默认值；只读，不写回配置）。
+
+    未迁移的旧记录没有 kind，按轨道名（即分支名）推断补上。
+    """
     tracks = (config.get("versions") or {}).get("tracks") or {}
     track = tracks.get(track_name)
+    kind = _default_kind_for_track(track_name)
     if not isinstance(track, dict):
-        return _new_track()
-    return track
+        return _new_track(kind=kind)
+    return {**track, "kind": track.get("kind") if track.get("kind") in KINDS else kind}
+
+
+def is_release_track(track: dict) -> bool:
+    """该轨道是否为上架轨（App_Store 打包时构建号自增）。"""
+    return track.get("kind", KIND_RELEASE) == KIND_RELEASE
+
+
+def next_build_no(tracks: dict, app_ver: str) -> int:
+    """该 App_Ver 下一个可用的构建号。
+
+    构建号唯一性由 App Store 按 MARKETING_VERSION 全局判定，与分支无关，
+    因此取所有上架轨在这个版本号上已用到的最大值再 +1，避免两个上架分支
+    临时使用同一 App_Ver 时产生重复构建号被拒。
+    """
+    used = [
+        int((track.get("build_map") or {}).get(app_ver, 0))
+        for track in tracks.values()
+        if isinstance(track, dict) and is_release_track(track)
+    ]
+    return max(used, default=0) + 1
+
+
+def resolve_track(config: dict, branch: str, track: str):
+    """把用户传入的轨道值解析为 (轨道名, 轨道类型)。
+
+    传类型（release / feature）时用分支自己的轨道，并把它设成该类型；
+    也可直接传已存在的轨道名，让这个分支与另一个分支共用同一条版本线（类型不变）。
+    """
+    value = (track or "").strip()
+    if not value:
+        return _default_track_for_branch(branch), _default_kind_for_branch(branch)
+    if value in KINDS:
+        return _default_track_for_branch(branch), value
+    if value in ((config.get("versions") or {}).get("tracks") or {}):
+        return value, None
+    raise HTTPException(status_code=400, detail=f"未知的版本轨道: {track}")
 
 
 def track_build_ver(track: dict) -> str:
@@ -203,6 +358,7 @@ def track_build_ver(track: dict) -> str:
     build_map = track.get("build_map") or {}
     return f"{app_ver}.{int(build_map.get(app_ver, 0))}"
 
+
 # 为已有环境迁移的固定前缀；后续环境从配置中的 next_app_id_prefix 自动分配。
 LEGACY_SERVER_PREFIXES = {
     "测试环境": 1,
@@ -652,43 +808,48 @@ async def get_branches():
 
 @router.post("/branches")
 async def add_branch(data: dict):
-    """新增分支，可指定所属版本轨道（缺省按分支名推断）"""
+    """新增分支，可指定版本轨道类型（缺省按分支名推断）。
+
+    每个分支都有自己独立的一条轨道（轨道名即分支名）：track 传 release 表示上架用、
+    App_Store 打包时构建号自增，feature 表示自测用、构建号不自增；
+    也可直接传已有轨道名，让该分支与另一个分支共用同一条版本线。
+    """
     name = data.get("name", "").strip()
     if not name:
         raise HTTPException(status_code=400, detail="分支名称不能为空")
 
-    track = (data.get("track") or "").strip() or _default_track_for_branch(name)
-    if track not in TRACKS:
-        raise HTTPException(status_code=400, detail=f"未知的版本轨道: {track}")
-
     async with _config_lock:
         config = load_config()
         branches = config.get("branches", ["main"])
         if name in branches:
             raise HTTPException(status_code=400, detail="分支已存在")
+        track, kind = resolve_track(config, name, data.get("track"))
         branches.append(name)
         config["branches"] = branches
         config.setdefault("branch_track", {})[name] = track
+        _ensure_track(config, track, kind)
         save_config(config)
     return {"message": "分支已添加", "track": track}
 
 
 @router.put("/branches/track")
 async def update_branch_track(data: dict):
-    """修改分支所属的版本轨道（release=上架，feature=自测）。
+    """修改分支的版本轨道类型（release=上架，构建号自增；feature=自测，不自增）。
 
+    每个分支用自己的一条轨道，切换类型只改这条轨道的行为，版本号仍与其它分支互不影响。
     分支名可能含 /（如 feature/login），因此走请求体而非路径参数。
     """
     branch = (data.get("branch") or "").strip()
-    track = (data.get("track") or "").strip()
-    if track not in TRACKS:
-        raise HTTPException(status_code=400, detail=f"未知的版本轨道: {track}")
+    if not (data.get("track") or "").strip():
+        raise HTTPException(status_code=400, detail="未指定版本轨道")
 
     async with _config_lock:
         config = load_config()
         if branch not in config.get("branches", []):
             raise HTTPException(status_code=404, detail="分支不存在")
+        track, kind = resolve_track(config, branch, data.get("track"))
         config.setdefault("branch_track", {})[branch] = track
+        _ensure_track(config, track, kind)
         save_config(config)
     return {"message": "分支版本轨道已更新", "branch": branch, "track": track}
 
@@ -755,24 +916,29 @@ async def update_build_settings(settings: BuildConfigUpdate, db: Session = Depen
 # 版本号配置 API
 @router.get("/versions")
 async def get_versions():
-    """获取两条版本轨道各自的 App_Ver 及其当前构建号。
+    """获取各条版本轨道的 App_Ver 及其当前构建号。
 
+    每个上架分支（master / develop 等）一条独立轨道，轨道名即分支名；自测分支共用 feature 轨。
     build_ver 为该轨道当前 App_Ver 已用到的最大构建号（形如 2.195.0.5，尚未打包则 .0），
-    仅供展示；实际递增只发生在 release 轨的 App_Store 打包时，feature 轨永不自增。
-    顶层 app_ver / build_ver 为 release 轨的镜像，保留给旧客户端。
+    仅供展示；实际递增只发生在上架轨的 App_Store 打包时，feature 轨永不自增。
+    顶层 app_ver / build_ver 为主上架轨的镜像，保留给旧客户端。
     """
     config = load_config()
-    tracks = {}
-    for name in TRACKS:
-        track = get_track(config, name)
-        tracks[name] = {
+    tracks = {
+        name: {
+            "kind": track.get("kind") if track.get("kind") in KINDS else _default_kind_for_track(name),
             "app_ver": track.get("app_ver") or DEFAULT_APP_VER,
             "build_ver": track_build_ver(track),
             "build_map": track.get("build_map") or {},
         }
+        for name, track in ((config.get("versions") or {}).get("tracks") or {}).items()
+        if isinstance(track, dict)
+    }
+    primary = _primary_track_name(config)
     return {
-        **tracks[TRACK_RELEASE],
+        **{k: v for k, v in tracks.get(primary, {}).items() if k != "kind"},
         "tracks": tracks,
+        "primary_track": primary,
         "branch_track": {
             branch: get_track_name(config, branch)
             for branch in config.get("branches", []) or []
@@ -787,14 +953,12 @@ async def update_versions(data: dict):
     每个 App_Ver 的构建号在所属轨道内独立保存于 build_map 各自递增，因此来回切换
     版本号（包括回退到打过包的旧版本号）都不会重复，不会被 App Store 拒绝。
 
-    - track：release（master/develop，上架用）或 feature（自测用），缺省 release。
+    - track：轨道名，上架分支为分支名（如 master、develop），自测为 feature；缺省为主上架轨。
     - 不传 build_ver：保留该版本号已记录的构建号，仅更新该轨道的当前 App_Ver。
     - 传 build_ver：形如 2.196.0.3，前三位须与 app_ver 一致，第四位为构建号；
       直接写入该版本号的记录（可用于手动对齐 App Store Connect 上的已传构建号）。
     """
-    track_name = (data.get("track") or TRACK_RELEASE).strip()
-    if track_name not in TRACKS:
-        raise HTTPException(status_code=400, detail=f"未知的版本轨道: {track_name}")
+    track_name = (data.get("track") or "").strip()
 
     app_ver = data.get("app_ver", "").strip()
     if not re.fullmatch(r"\d+\.\d+\.\d+", app_ver):
@@ -814,7 +978,10 @@ async def update_versions(data: dict):
     async with _config_lock:
         config = load_config()
         tracks = config.setdefault("versions", {}).setdefault("tracks", {})
-        track = tracks.setdefault(track_name, _new_track())
+        track_name = track_name or _primary_track_name(config)
+        if track_name not in tracks:
+            raise HTTPException(status_code=400, detail=f"未知的版本轨道: {track_name}")
+        track = tracks[track_name]
         track["app_ver"] = app_ver
         build_map = track.setdefault("build_map", {})
         if build_no is not None:

backend/services/build_service.py

@@ -610,7 +610,7 @@ async def generate_config(task_id: str, task, build_dir: Path) -> dict:
 
     from ..routers.config import (
         load_config, _config_lock, get_track, get_track_name, track_build_ver,
-        TRACK_RELEASE, _new_track,
+        is_release_track, next_build_no, _ensure_track,
     )
 
     config = load_config()
@@ -621,29 +621,29 @@ async def generate_config(task_id: str, task, build_dir: Path) -> dict:
     scheme = schemes.get(task.scheme_id, {})
 
     # 版本号由当前服务配置统一管理，不读取分支源码中的手动打包脚本。
-    # 按分支所属轨道取版本号：master/develop 走 release 轨（上架用），feature 走 feature 轨（自测用），
-    # 两条轨道的 App_Ver 各自独立。
+    # 按分支所属轨道取版本号：每个上架分支（master、develop 等）一条独立轨道，
+    # 自测分支共用 feature 轨，各轨道的 App_Ver 互不影响。
     track_name = get_track_name(config, task.branch)
     track = get_track(config, track_name)
     app_ver = track.get("app_ver") or "2.180.0"
 
     # 构建号按版本号独立记录：build_map[app_ver] 为该版本号已用到的最大第四位。
     build_ver = track_build_ver(track)
+    is_release = is_release_track(track)
     await log_streamer.emit(
         task_id,
-        f"版本轨道: {track_name}（{'上架，App_Store 打包自增' if track_name == TRACK_RELEASE else '自测，构建号不自增'}）",
+        f"版本轨道: {track_name}（{'上架，App_Store 打包自增' if is_release else '自测，构建号不自增'}）",
     )
 
-    # release 轨的 App_Store 打包，在该版本号自己的构建号上 +1
-    # （回退到旧版本号也从它自己的最大值继续）；feature 轨始终使用手动设定的构建号。
-    if track_name == TRACK_RELEASE and task.build_type == "App_Store":
+    # 上架轨的 App_Store 打包，在该版本号的构建号上 +1（回退到旧版本号也从它自己的最大值继续）；
+    # feature 轨始终使用手动设定的构建号。
+    if is_release and task.build_type == "App_Store":
         async with _config_lock:
             config = load_config()
-            tracks = config.setdefault("versions", {}).setdefault("tracks", {})
-            track = tracks.setdefault(track_name, _new_track(app_ver))
-            build_map = track.setdefault("build_map", {})
-            n = int(build_map.get(app_ver, 0)) + 1
-            build_map[app_ver] = n
+            track = _ensure_track(config, track_name)
+            track.setdefault("app_ver", app_ver)
+            n = next_build_no(config["versions"]["tracks"], app_ver)
+            track.setdefault("build_map", {})[app_ver] = n
             build_ver = f"{app_ver}.{n}"
 
             from ..routers.config import save_config

config.example.json

@@ -47,7 +47,7 @@
     }
   },
   "next_app_id_prefix": 3,
-  "branches": ["master", "develop"],
+  "branches": ["master", "develop", "feature/示例分支"],
   "upload": {
     "mode": "webdav",
     "oss": {
@@ -74,9 +74,14 @@
   },
   "versions": {
     "tracks": {
-      "release": { "app_ver": "2.180.0", "build_map": {} },
-      "feature": { "app_ver": "2.180.0", "build_map": {} }
+      "release": { "kind": "release", "app_ver": "2.180.0", "build_map": {} },
+      "develop": { "kind": "release", "app_ver": "2.180.0", "build_map": {} },
+      "feature/示例分支": { "kind": "feature", "app_ver": "2.180.0", "build_map": {} }
     }
   },
-  "branch_track": { "master": "release", "develop": "release" }
+  "branch_track": {
+    "master": "release",
+    "develop": "develop",
+    "feature/示例分支": "feature/示例分支"
+  }
 }

frontend/src/__tests__/ConfigView.test.js

@@ -27,11 +27,12 @@ function mockFetch(url) {
     '/api/config/versions': {
       app_ver: '2.195.0',
       build_ver: '2.195.0.0',
+      primary_track: 'release',
       tracks: {
-        release: { app_ver: '2.195.0', build_ver: '2.195.0.0', build_map: {} },
-        feature: { app_ver: '2.100.0', build_ver: '2.100.0.0', build_map: {} },
+        release: { kind: 'release', app_ver: '2.195.0', build_ver: '2.195.0.0', build_map: {} },
+        dev: { kind: 'feature', app_ver: '2.100.0', build_ver: '2.100.0.0', build_map: {} },
       },
-      branch_track: { main: 'release', dev: 'release' },
+      branch_track: { main: 'release', dev: 'dev' },
     },
     '/api/config': { apps: {}, schemes: {}, branches: ['main'] },
   }
@@ -191,7 +192,7 @@ describe('ConfigView.vue', () => {
     expect(fetch.mock.calls.map(c => c[0])).toEqual(['/api/config/apps'])
   })
 
-  it('两条版本轨道各自独立展示与保存', async () => {
+  it('每个分支的版本号各自独立展示与保存', async () => {
     const calls = []
     fetch.mockImplementation((url, opts) => {
       if (url === '/api/config/versions' && opts?.method === 'PUT') {
@@ -212,16 +213,20 @@ describe('ConfigView.vue', () => {
     await buildMenu.trigger('click')
     await wrapper.vm.$nextTick()
 
+    // 每个分支一块：main（上架，release 轨）、dev（自测，dev 轨）
+    expect(wrapper.text()).toContain('上架版本号（main）')
+    expect(wrapper.text()).toContain('自测版本号（dev）')
+
     const inputs = wrapper.findAll('input[type="text"]')
-    expect(inputs[0].element.value).toBe('2.195.0')  // release App_Ver
-    expect(inputs[2].element.value).toBe('2.100.0')  // feature App_Ver
+    expect(inputs[0].element.value).toBe('2.195.0')  // main 分支 App_Ver
+    expect(inputs[2].element.value).toBe('2.100.0')  // dev 分支 App_Ver
 
     await inputs[2].setValue('2.101.0')
-    const saveBtn = wrapper.findAll('.btn-primary').find(b => b.text() === '保存自测版本号')
+    const saveBtn = wrapper.findAll('.btn-primary').find(b => b.text() === '保存 dev 版本号')
     await saveBtn.trigger('click')
     await flushPromises()
 
-    expect(calls).toEqual([{ track: 'feature', app_ver: '2.101.0', build_ver: '2.101.0.0' }])
+    expect(calls).toEqual([{ track: 'dev', app_ver: '2.101.0', build_ver: '2.101.0.0' }])
   })
 
   it('分支管理可切换版本轨道', async () => {
@@ -242,7 +247,7 @@ describe('ConfigView.vue', () => {
     await wrapper.vm.$nextTick()
 
     const select = wrapper.find('.config-table select')
-    expect(select.element.value).toBe('release')
+    expect(select.element.value).toBe('release')  // main → release 轨（上架）
     await select.setValue('feature')
     await flushPromises()
 

frontend/src/views/ConfigView.vue

@@ -171,9 +171,9 @@
               <tr v-for="b in branches" :key="b">
                 <td><strong>{{ b }}</strong></td>
                 <td>
-                  <select :value="branchTrack[b] || 'feature'" style="width: auto; padding: 4px 8px;" @change="setBranchTrack(b, $event.target.value)">
-                    <option value="release">上架（master/develop）</option>
-                    <option value="feature">自测（feature）</option>
+                  <select :value="branchKind(b)" style="width: auto; padding: 4px 8px;" @change="setBranchTrack(b, $event.target.value)">
+                    <option value="release">上架（App_Store 打包构建号自增）</option>
+                    <option value="feature">自测（构建号不自增）</option>
                   </select>
                 </td>
                 <td class="action-btns">
@@ -289,36 +289,31 @@
         <div v-if="tab === 'build'">
           <h2>打包设置</h2>
           <div style="max-width: 500px;">
-            <h4 class="section-title">上架版本号（master / develop）</h4>
-            <div class="form-group">
-              <label>App_Ver（应用版本）</label>
-              <input type="text" v-model="versions.release.app_ver" placeholder="2.180.0" @input="onAppVerInput('release')">
-              <div style="font-size: 12px; color: #999; margin-top: 4px;">格式：主版本.次版本.修订号。master 与 develop 共用这一套版本号。</div>
-            </div>
-            <div class="form-group">
-              <label>Build_Ver（构建号）</label>
-              <input type="text" v-model="versions.release.build_ver" placeholder="2.180.0.0">
-              <div style="font-size: 12px; color: #999; margin-top: 4px;">
-                四段数字，前三位须与 App_Ver 一致。修改 App_Ver 会自动切换为该版本号已记录的构建号；
-                每个版本号的构建号独立递增，App_Store 打包时自动 +1。一般无需手动修改。
+            <template v-for="t in branchTracks" :key="t.name">
+              <h4 class="section-title">
+                {{ t.kind === 'release' ? '上架版本号' : '自测版本号' }}（{{ t.branches.join(' / ') }}）
+              </h4>
+              <div class="form-group">
+                <label>App_Ver（应用版本）</label>
+                <input type="text" v-model="versions[t.name].app_ver" placeholder="2.180.0" @input="onAppVerInput(t.name)">
+                <div style="font-size: 12px; color: #999; margin-top: 4px;">
+                  格式：主版本.次版本.修订号。该版本号只用于 {{ t.branches.join(' / ') }} 分支（轨道 {{ t.name }}），与其它分支互不影响。
+                </div>
               </div>
-            </div>
-            <button class="btn btn-primary" style="width: auto; padding: 10px 32px; margin-bottom: 24px;" @click="saveVersions('release')">保存上架版本号</button>
-
-            <h4 class="section-title">自测版本号（feature 分支）</h4>
-            <div class="form-group">
-              <label>App_Ver（应用版本）</label>
-              <input type="text" v-model="versions.feature.app_ver" placeholder="2.180.0" @input="onAppVerInput('feature')">
-              <div style="font-size: 12px; color: #999; margin-top: 4px;">与上架版本号各自独立，互不影响。</div>
-            </div>
-            <div class="form-group">
-              <label>Build_Ver（构建号）</label>
-              <input type="text" v-model="versions.feature.build_ver" placeholder="2.180.0.0">
-              <div style="font-size: 12px; color: #999; margin-top: 4px;">
-                仅供自测，打包时<strong>不会自动递增</strong>，始终使用这里填写的值（默认 .0）。需要区分时请手动修改。
+              <div class="form-group">
+                <label>Build_Ver（构建号）</label>
+                <input type="text" v-model="versions[t.name].build_ver" placeholder="2.180.0.0">
+                <div v-if="t.kind === 'release'" style="font-size: 12px; color: #999; margin-top: 4px;">
+                  四段数字，前三位须与 App_Ver 一致。修改 App_Ver 会自动切换为该版本号已记录的构建号；
+                  每个版本号的构建号独立递增，App_Store 打包时自动 +1。一般无需手动修改。
+                </div>
+                <div v-else style="font-size: 12px; color: #999; margin-top: 4px;">
+                  四段数字，前三位须与 App_Ver 一致。自测轨打包时<strong>不会自动递增</strong>，
+                  始终使用这里填写的值（默认 .0）。需要区分时请手动修改。
+                </div>
               </div>
-            </div>
-            <button class="btn btn-primary" style="width: auto; padding: 10px 32px; margin-bottom: 24px;" @click="saveVersions('feature')">保存自测版本号</button>
+              <button class="btn btn-primary" style="width: auto; padding: 10px 32px; margin-bottom: 24px;" @click="saveVersions(t.name)">保存 {{ t.branches.join(' / ') }} 版本号</button>
+            </template>
 
             <template v-if="isAdmin">
               <h4 class="section-title">打包参数</h4>
@@ -654,27 +649,48 @@ const servers = ref({})
 const branches = ref([])
 const newBranch = ref('')
 const buildSettings = ref({})
-// 两条版本轨道：release（master/develop，上架用）与 feature（自测用），各自独立
-const versions = ref({
-  release: { app_ver: '', build_ver: '' },
-  feature: { app_ver: '', build_ver: '' },
-})
-const buildMap = ref({ release: {}, feature: {} })
-const branchTrack = ref({})
+// 版本轨道：每个分支一条独立轨道，轨道名即分支名（master/main 沿用历史名 release）。
+// 轨道类型 kind 决定构建号行为：release=上架、App_Store 打包自增；feature=自测、不自增。
+const versions = ref({})      // 轨道名 -> { app_ver, build_ver }
+const buildMap = ref({})      // 轨道名 -> { App_Ver: 已用构建号 }
+const trackKind = ref({})     // 轨道名 -> release | feature
+const branchTrack = ref({})   // 分支名 -> 轨道名
 
 const applyVersions = (data) => {
   const tracks = data.tracks || {}
-  for (const track of ['release', 'feature']) {
-    const item = tracks[track] || {}
-    buildMap.value[track] = item.build_map || {}
-    versions.value[track] = { app_ver: item.app_ver || '', build_ver: item.build_ver || '' }
+  const nextVersions = {}
+  const nextMap = {}
+  const nextKind = {}
+  for (const [name, item] of Object.entries(tracks)) {
+    nextVersions[name] = { app_ver: item.app_ver || '', build_ver: item.build_ver || '' }
+    nextMap[name] = item.build_map || {}
+    nextKind[name] = item.kind || 'release'
   }
+  versions.value = nextVersions
+  buildMap.value = nextMap
+  trackKind.value = nextKind
   branchTrack.value = data.branch_track || {}
 }
 
+// 分支所属轨道的类型（供分支管理里的下拉框显示）
+const branchKind = (branch) => trackKind.value[branchTrack.value[branch]] || 'feature'
+
+// 打包设置里按分支分块展示版本号；多个分支共用一条轨道时只显示一块
+const branchTracks = computed(() => {
+  const seen = new Set()
+  return branches.value
+    .map(b => branchTrack.value[b])
+    .filter(name => name && versions.value[name] && !seen.has(name) && seen.add(name))
+    .map(name => ({
+      name,
+      kind: trackKind.value[name] || 'release',
+      branches: branches.value.filter(b => branchTrack.value[b] === name),
+    }))
+})
+
 // 修改 App_Ver 时，自动把 Build_Ver 切换为该版本号已记录的构建号（新版本号则为 .0）
 const onAppVerInput = (track) => {
-  const appVer = (versions.value[track].app_ver || '').trim()
+  const appVer = (versions.value[track]?.app_ver || '').trim()
   if (/^\d+\.\d+\.\d+$/.test(appVer)) {
     const n = Number((buildMap.value[track] || {})[appVer] || 0)
     versions.value[track].build_ver = `${appVer}.${n}`
@@ -1194,7 +1210,8 @@ const setBranchTrack = async (name, track) => {
       const err = await res.json()
       throw new Error(err.detail || '修改失败')
     }
-    branchTrack.value = { ...branchTrack.value, [name]: track }
+    // 切到上架轨可能新建了轨道，重新拉取版本号
+    applyVersions(await (await authFetch('/api/config/versions')).json())
   } catch (e) {
     alert('修改失败: ' + e.message)
     await loadData()
@@ -1222,7 +1239,7 @@ const saveBuildSettings = async () => {
   alert('设置已保存')
 }
 
-const saveVersions = async (track = 'release') => {
+const saveVersions = async (track) => {
   try {
     const res = await authFetch('/api/config/versions', {
       method: 'PUT',

tests/test_api_config.py

@@ -229,15 +229,22 @@ def test_update_versions_rejects_invalid_app_version(client, tmp_config):
 
 
 def test_versions_tracks_are_independent(client, tmp_config):
-    # 两条轨道的 App_Ver 各自独立，互不影响
+    # 每个分支一条轨道（main/master 为 release，其余即分支名），App_Ver 各自独立
+    assert client.post("/api/config/branches", json={"name": "feature/login"}).status_code == 200
     assert client.put("/api/config/versions", json={"track": "release", "app_ver": "2.196.0"}).status_code == 200
-    assert client.put("/api/config/versions", json={"track": "feature", "app_ver": "2.100.0"}).status_code == 200
+    assert client.put("/api/config/versions", json={"track": "dev", "app_ver": "2.198.0"}).status_code == 200
+    assert client.put("/api/config/versions", json={"track": "feature/login", "app_ver": "2.100.0"}).status_code == 200
 
     data = client.get("/api/config/versions").json()
+    assert data["branch_track"] == {"main": "release", "dev": "dev", "feature/login": "feature/login"}
     assert data["tracks"]["release"]["app_ver"] == "2.196.0"
-    assert data["tracks"]["feature"]["app_ver"] == "2.100.0"
-    assert data["tracks"]["feature"]["build_ver"] == "2.100.0.0"
-    # 顶层字段镜像 release 轨，兼容旧客户端
+    assert data["tracks"]["dev"]["app_ver"] == "2.198.0"
+    assert data["tracks"]["feature/login"]["app_ver"] == "2.100.0"
+    assert data["tracks"]["feature/login"]["build_ver"] == "2.100.0.0"
+    assert data["tracks"]["release"]["kind"] == "release"
+    assert data["tracks"]["feature/login"]["kind"] == "feature"
+    # 顶层字段镜像主上架轨（第一个上架分支），兼容旧客户端
+    assert data["primary_track"] == "release"
     assert data["app_ver"] == "2.196.0"
 
 
@@ -246,7 +253,8 @@ def test_update_versions_rejects_unknown_track(client, tmp_config):
     assert resp.status_code == 400
 
 
-def test_legacy_versions_migrate_to_release_track(client, tmp_config):
+def test_legacy_versions_split_per_branch(client, tmp_config):
+    """最旧的单轨配置：拆成每个分支一条轨，各自沿用原来的已用构建号"""
     import json
     with open(tmp_config, "r", encoding="utf-8") as f:
         cfg = json.load(f)
@@ -255,28 +263,78 @@ def test_legacy_versions_migrate_to_release_track(client, tmp_config):
         json.dump(cfg, f)
 
     data = client.get("/api/config/versions").json()
-    assert data["tracks"]["release"] == {
-        "app_ver": "2.195.0",
-        "build_ver": "2.195.0.7",
-        "build_map": {"2.195.0": 7},
+    # main 留在 release 轨，dev 拆出自己的轨，两者都带着原来的已用构建号
+    assert data["branch_track"] == {"main": "release", "dev": "dev"}
+    for track in ("release", "dev"):
+        assert data["tracks"][track] == {
+            "kind": "release",
+            "app_ver": "2.195.0",
+            "build_ver": "2.195.0.7",
+            "build_map": {"2.195.0": 7},
+        }
+    # 拆分后各轨独立：改 release 不影响 dev
+    assert client.put("/api/config/versions", json={"track": "release", "app_ver": "2.196.0"}).status_code == 200
+    data = client.get("/api/config/versions").json()
+    assert data["tracks"]["release"]["app_ver"] == "2.196.0"
+    assert data["tracks"]["dev"]["app_ver"] == "2.195.0"
+
+
+def test_legacy_shared_tracks_split_per_branch(client, tmp_config):
+    """旧的共用轨：master 留在 release 轨，其余分支（含自测分支）各拆出自己的轨"""
+    import json
+    with open(tmp_config, "r", encoding="utf-8") as f:
+        cfg = json.load(f)
+    cfg["branches"] = ["main", "dev", "feature/login", "feature/pay"]
+    cfg["versions"] = {"tracks": {
+        "release": {"app_ver": "2.195.0", "build_map": {"2.195.0": 4}},
+        "feature": {"app_ver": "2.100.0", "build_map": {}},
+    }}
+    cfg["branch_track"] = {
+        "main": "release", "dev": "release",
+        "feature/login": "feature", "feature/pay": "feature",
     }
-    # feature 轨以同一 App_Ver 初始化，构建号从 .0 起
-    assert data["tracks"]["feature"]["app_ver"] == "2.195.0"
-    assert data["tracks"]["feature"]["build_ver"] == "2.195.0.0"
+    with open(tmp_config, "w", encoding="utf-8") as f:
+        json.dump(cfg, f)
+
+    data = client.get("/api/config/versions").json()
+    assert data["branch_track"] == {
+        "main": "release", "dev": "dev",
+        "feature/login": "feature/login", "feature/pay": "feature/pay",
+    }
+    for track in ("release", "dev"):
+        assert data["tracks"][track]["kind"] == "release"
+        assert data["tracks"][track]["build_ver"] == "2.195.0.4"
+    for track in ("feature/login", "feature/pay"):
+        assert data["tracks"][track]["kind"] == "feature"
+        assert data["tracks"][track]["app_ver"] == "2.100.0"
+
+    # 自测分支的版本号各自独立
+    assert client.put("/api/config/versions", json={"track": "feature/login", "app_ver": "2.101.0"}).status_code == 200
+    data = client.get("/api/config/versions").json()
+    assert data["tracks"]["feature/login"]["app_ver"] == "2.101.0"
+    assert data["tracks"]["feature/pay"]["app_ver"] == "2.100.0"
 
 
 def test_branch_track_defaults_and_override(client, tmp_config):
     assert client.post("/api/config/branches", json={"name": "develop"}).status_code == 200
     assert client.post("/api/config/branches", json={"name": "feature/login"}).status_code == 200
 
-    tracks = client.get("/api/config/versions").json()["branch_track"]
-    assert tracks["develop"] == "release"
-    assert tracks["feature/login"] == "feature"
+    data = client.get("/api/config/versions").json()
+    # 每个分支一条自己的轨道，类型按分支名推断
+    assert data["branch_track"]["develop"] == "develop"
+    assert data["branch_track"]["feature/login"] == "feature/login"
+    assert data["tracks"]["develop"]["kind"] == "release"
+    assert data["tracks"]["feature/login"]["kind"] == "feature"
 
-    # 手动改归属
+    # 手动改类型：轨道名不变，只改构建号是否自增
     resp = client.put("/api/config/branches/track", json={"branch": "feature/login", "track": "release"})
     assert resp.status_code == 200
-    assert client.get("/api/config/versions").json()["branch_track"]["feature/login"] == "release"
+    assert resp.json()["track"] == "feature/login"
+    data = client.get("/api/config/versions").json()
+    assert data["tracks"]["feature/login"]["kind"] == "release"
+
+    assert client.put("/api/config/branches/track", json={"branch": "feature/login", "track": "feature"}).status_code == 200
+    assert client.get("/api/config/versions").json()["tracks"]["feature/login"]["kind"] == "feature"
 
     assert client.put("/api/config/branches/track", json={"branch": "nope", "track": "release"}).status_code == 404
     assert client.put("/api/config/branches/track", json={"branch": "develop", "track": "beta"}).status_code == 400

tests/test_build_service.py

@@ -315,14 +315,23 @@ def test_resolve_provisioning_profile_extracts_name_and_team(tmp_path):
         assert _resolve_provisioning_profile(str(profile_path)) == ("a4YX061_adHoc", "MG4Z7FU83W")
 
 
-def _versions_config(release: dict, feature: dict) -> dict:
+def _versions_config(tracks: dict) -> dict:
+    """构造带版本轨道的配置；tracks 为 轨道名 -> {kind, app_ver, build_map}。"""
     return {
         "apps": {"1": {"name": "App", "certificates": {}}},
         "schemes": {"1": {"name": "sch", "ossFloder": "f"}},
-        "versions": {"tracks": {"release": release, "feature": feature}},
+        "versions": {"tracks": tracks},
     }
 
 
+def _release(app_ver: str, build_map: dict = None) -> dict:
+    return {"kind": "release", "app_ver": app_ver, "build_map": build_map or {}}
+
+
+def _feature(app_ver: str, build_map: dict = None) -> dict:
+    return {"kind": "feature", "app_ver": app_ver, "build_map": build_map or {}}
+
+
 async def test_generate_config_uses_saved_version(tmp_path, log_streamer):
     """从服务配置读取版本号，不依赖分支源码脚本"""
     build_dir = tmp_path / "build"
@@ -335,10 +344,7 @@ async def test_generate_config_uses_saved_version(tmp_path, log_streamer):
     task.obfuscation = False
     task.branch = "master"
 
-    mock_config = _versions_config(
-        {"app_ver": "3.0.1", "build_map": {}},
-        {"app_ver": "9.9.9", "build_map": {}},
-    )
+    mock_config = _versions_config({"release": _release("3.0.1"), "feature": _feature("9.9.9")})
 
     with patch("backend.routers.config.load_config", return_value=mock_config):
         result = await generate_config("t1", task, build_dir)
@@ -356,10 +362,10 @@ async def test_generate_config_appstore_increments_per_version(tmp_path, log_str
                      obfuscation=False, branch="master")
 
     # 2.195.0 已打到 .5，切到 2.196.0 后又回退到 2.195.0
-    mock_config = _versions_config(
-        {"app_ver": "2.195.0", "build_map": {"2.195.0": 5, "2.196.0": 3}},
-        {"app_ver": "2.195.0", "build_map": {}},
-    )
+    mock_config = _versions_config({
+        "release": _release("2.195.0", {"2.195.0": 5, "2.196.0": 3}),
+        "feature": _feature("2.195.0"),
+    })
 
     with patch("backend.routers.config.load_config", return_value=mock_config), \
          patch("backend.routers.config.save_config") as save_mock:
@@ -373,39 +379,64 @@ async def test_generate_config_appstore_increments_per_version(tmp_path, log_str
     save_mock.assert_called()
 
 
-async def test_generate_config_develop_shares_release_track(tmp_path, log_streamer):
-    """develop 与 master 共用 release 轨的版本号与构建号序列"""
+async def test_generate_config_release_branches_are_independent(tmp_path, log_streamer):
+    """master 与 develop 各用自己的轨道，版本号与构建号互不影响"""
     build_dir = tmp_path / "build"
     build_dir.mkdir()
 
     task = MagicMock(app_id="1", scheme_id="1", build_type="App_Store",
                      obfuscation=False, branch="develop")
 
-    mock_config = _versions_config(
-        {"app_ver": "2.195.0", "build_map": {"2.195.0": 5}},
-        {"app_ver": "2.100.0", "build_map": {}},
-    )
+    mock_config = _versions_config({
+        "release": _release("2.195.0", {"2.195.0": 5}),      # master
+        "develop": _release("2.196.0", {"2.196.0": 1}),
+        "feature": _feature("2.100.0"),
+    })
 
     with patch("backend.routers.config.load_config", return_value=mock_config), \
          patch("backend.routers.config.save_config"):
         result = await generate_config("t1", task, build_dir)
 
-    assert result["VERSION"] == "2.195.0"
-    assert result["BUILD_VERSION"] == "2.195.0.6"
+    assert result["VERSION"] == "2.196.0"
+    assert result["BUILD_VERSION"] == "2.196.0.2"
+    # master 的 release 轨完全不受影响
+    assert mock_config["versions"]["tracks"]["release"]["build_map"] == {"2.195.0": 5}
+
+
+async def test_generate_config_build_no_skips_other_release_track(tmp_path, log_streamer):
+    """两个上架分支临时用同一 App_Ver 时，构建号跨轨道取最大值 +1，避免 App Store 重号"""
+    build_dir = tmp_path / "build"
+    build_dir.mkdir()
+
+    task = MagicMock(app_id="1", scheme_id="1", build_type="App_Store",
+                     obfuscation=False, branch="develop")
+
+    mock_config = _versions_config({
+        "release": _release("2.196.0", {"2.196.0": 7}),      # master
+        "develop": _release("2.196.0", {"2.196.0": 2}),
+        "feature": _feature("2.100.0"),
+    })
+
+    with patch("backend.routers.config.load_config", return_value=mock_config), \
+         patch("backend.routers.config.save_config"):
+        result = await generate_config("t1", task, build_dir)
+
+    assert result["BUILD_VERSION"] == "2.196.0.8"
+    assert mock_config["versions"]["tracks"]["develop"]["build_map"]["2.196.0"] == 8
 
 
 async def test_generate_config_feature_branch_never_increments(tmp_path, log_streamer):
-    """feature 分支用自己的版本号，且构建号永不自增（即使是 App_Store 打包）"""
+    """自测分支用自己那条轨道的版本号，且构建号永不自增（即使是 App_Store 打包）"""
     build_dir = tmp_path / "build"
     build_dir.mkdir()
 
     task = MagicMock(app_id="1", scheme_id="1", build_type="App_Store",
                      obfuscation=False, branch="feature/login")
 
-    mock_config = _versions_config(
-        {"app_ver": "2.195.0", "build_map": {"2.195.0": 5}},
-        {"app_ver": "2.100.0", "build_map": {}},
-    )
+    mock_config = _versions_config({
+        "release": _release("2.195.0", {"2.195.0": 5}),
+        "feature/login": _feature("2.100.0"),
+    })
 
     with patch("backend.routers.config.load_config", return_value=mock_config), \
          patch("backend.routers.config.save_config") as save_mock:
@@ -413,7 +444,7 @@ async def test_generate_config_feature_branch_never_increments(tmp_path, log_str
 
     assert result["VERSION"] == "2.100.0"
     assert result["BUILD_VERSION"] == "2.100.0.0"
-    assert mock_config["versions"]["tracks"]["feature"]["build_map"] == {}
+    assert mock_config["versions"]["tracks"]["feature/login"]["build_map"] == {}
     save_mock.assert_not_called()
 
 
@@ -425,11 +456,12 @@ async def test_generate_config_branch_track_override(tmp_path, log_streamer):
     task = MagicMock(app_id="1", scheme_id="1", build_type="Ad_Hoc",
                      obfuscation=False, branch="release/2.196")
 
-    mock_config = _versions_config(
-        {"app_ver": "2.196.0", "build_map": {}},
-        {"app_ver": "2.100.0", "build_map": {}},
-    )
-    mock_config["branch_track"] = {"release/2.196": "feature"}
+    mock_config = _versions_config({
+        "release": _release("2.196.0"),
+        "feature/login": _feature("2.100.0"),
+    })
+    # release/2.196 按名字本应是上架轨，显式指到 feature/login 那条轨道
+    mock_config["branch_track"] = {"release/2.196": "feature/login"}
 
     with patch("backend.routers.config.load_config", return_value=mock_config):
         result = await generate_config("t1", task, build_dir)