fix(ci): repair GitHub flow failures

BigStrongSun · BigStrongSun · commit 42540cfb3ffc · 2026-07-03T00:37:25.000+08:00
Root causes fixed:

- Collapse Codex model fetch Tauri/service arguments into request structs so Volcengine AgentPlan fields no longer trip clippy::too_many_arguments in Backend Checks.
- Preserve live model_context_window as user-owned Codex display/context state when a provider omits it.
- Treat same-provider live tables containing local proxy base_url or PROXY_MANAGED as takeover residue and replace them from the provider backup so restored configs do not keep proxy routing fields.
- Build and verify the Windows codex-history-repairer sidecar before Tauri bundling, fixing the NSIS missing sidecar failure.
- Cross-build Windows ARM64 release assets on windows-2022 because windows-11-arm can compile the app but WiX v3 light.exe fails there.
- Mark GitHub releases as formal releases with prerelease=false.

Validation:

- cargo fmt --manifest-path src-tauri/Cargo.toml
- cargo clippy --manifest-path src-tauri/Cargo.toml -- -D warnings
- cargo test --manifest-path src-tauri/Cargo.toml
- cargo build --manifest-path src-tauri/Cargo.toml --bin codex-history-repairer --features history-repairer --release
- pnpm typecheck
- pnpm test:unit
- pnpm exec prettier --check src/lib/api/model-fetch.ts .github/workflows/release.yml memory.md
- git diff --check

Notes:

- actionlint is not installed on this machine, so workflow syntax still needs GitHub-side validation after pushing to fork/main.
- Untracked output/release-* and scripts/logs directories were intentionally left untouched.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,9 @@ jobs:
       matrix:
         include:
           - os: windows-2022
-          - os: windows-11-arm
+          # GitHub 的 Windows ARM64 runner 能编译主程序，但 WiX v3 light.exe 在该
+          # 环境中无法可靠启动；ARM64 安装包改由 x64 Windows runner 交叉打包。
+          - os: windows-2022
             arch: arm64
           - os: ubuntu-22.04
           - os: ubuntu-22.04-arm
@@ -95,14 +97,14 @@ jobs:
             || sudo apt-get install -y --no-install-recommends libsoup2.4-dev
 
       - name: Setup pnpm
-        if: runner.os != 'Windows' || matrix.arch != 'arm64'
+        if: runner.os != 'Windows' || runner.arch != 'ARM64'
         uses: pnpm/action-setup@v6
         with:
           version: 10.12.3
           run_install: false
 
       - name: Setup pnpm (Windows ARM64)
-        if: runner.os == 'Windows' && matrix.arch == 'arm64'
+        if: runner.os == 'Windows' && runner.arch == 'ARM64'
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
@@ -112,13 +114,13 @@ jobs:
           pnpm --version
 
       - name: Get pnpm store directory
-        if: runner.os != 'Windows' || matrix.arch != 'arm64'
+        if: runner.os != 'Windows' || runner.arch != 'ARM64'
         id: pnpm-store
         shell: bash
         run: echo "path=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
 
       - name: Setup pnpm cache
-        if: runner.os != 'Windows' || matrix.arch != 'arm64'
+        if: runner.os != 'Windows' || runner.arch != 'ARM64'
         uses: actions/cache@v5
         with:
           path: ${{ steps.pnpm-store.outputs.path }}
@@ -292,6 +294,24 @@ jobs:
             sleep "$sleep_seconds"
           done
 
+      - name: Build Windows history repair sidecar
+        if: runner.os == 'Windows'
+        shell: pwsh
+        env:
+          WINDOWS_RELEASE_ARCH: ${{ matrix.arch || 'x86_64' }}
+        run: |
+          $ErrorActionPreference = 'Stop'
+          if ($env:WINDOWS_RELEASE_ARCH -eq 'arm64') {
+            cargo build --manifest-path src-tauri/Cargo.toml --bin codex-history-repairer --features history-repairer --target aarch64-pc-windows-msvc --release
+            $sidecar = 'src-tauri/target/aarch64-pc-windows-msvc/release/codex-history-repairer.exe'
+          } else {
+            cargo build --manifest-path src-tauri/Cargo.toml --bin codex-history-repairer --features history-repairer --release
+            $sidecar = 'src-tauri/target/release/codex-history-repairer.exe'
+          }
+          if (-not (Test-Path $sidecar)) {
+            throw "codex-history-repairer sidecar was not produced: $sidecar"
+          }
+
       - name: Build Tauri App (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
@@ -686,7 +706,7 @@ jobs:
         with:
           tag_name: ${{ github.ref_name }}
           name: CC Switch ${{ github.ref_name }}
-          prerelease: true
+          prerelease: false
           body: |
             ## CC Switch ${{ github.ref_name }}
 
diff --git a/memory.md b/memory.md
@@ -1,5 +1,15 @@
 # CC Switch Repository Memory
 
+## 2026-07-03 GitHub Flow CI/Release Failure Root Fix
+
+- `v3.16.4-7` 推到 `BigStrongSun/ccswitchmulti` 后 GitHub Actions 有两类真实失败：CI 的 `Backend Checks` 卡在 Rust Clippy，Release 的 Windows 打包卡在 Windows 资产构建。不要把它归因为 GitHub 本身抽风，也不要只重跑 workflow。
+- CI 根因之一是火山 AgentPlan 模型列表支持把 `fetch_models_for_config` / `model_fetch::fetch_models` 扩成 8 个并列参数，触发 `clippy::too_many_arguments`。修复边界是把 Tauri 命令入参收敛成 `FetchModelsForConfigRequest`，后端服务收敛成 `FetchModelsRequest` / `VolcengineModelListRequest`，前端 `invoke` 改为 `{ request: ... }`。
+- CI 继续暴露的 backend test 根因是 Codex provider 配置合并边界不清：`model_context_window` 应视为用户界面/上下文显示偏好，provider 未声明时不能从 live config 删除；同名 custom provider 表如果 live 里仍带本地代理 `base_url` 或 `PROXY_MANAGED`，恢复 provider 备份时必须按 takeover 残留整表替换，否则本地代理字段会继续劫持后续请求。
+- Release Windows x64 根因是 Tauri bundler 需要 `codex-history-repairer.exe` sidecar，但 workflow 只构建主程序，NSIS 阶段报 `codex-history-repairer.exe` 不存在。修复是在 Windows Tauri build 前显式按架构构建并校验 history repair sidecar。
+- Release Windows ARM64 根因是 `windows-11-arm` runner 能编译主程序，但 WiX v3 `light.exe` 在该 ARM runner 环境无法可靠启动；正式 workflow 应在 `windows-2022` x64 runner 上交叉构建 `aarch64-pc-windows-msvc`，同时 pnpm setup/cache 条件要看 `runner.arch`，不要看目标 `matrix.arch`。
+- `release.yml` 的正式发布语义必须是 `prerelease: false`；否则 GitHub latest 不会按正式 release 晋升，即使 tag 和资产都存在。
+- 本轮本地验证覆盖：`cargo clippy --manifest-path src-tauri\Cargo.toml -- -D warnings`、`cargo test --manifest-path src-tauri\Cargo.toml`、`pnpm typecheck`、`pnpm test:unit`、`pnpm exec prettier --check src/lib/api/model-fetch.ts .github/workflows/release.yml`。`actionlint` 本机未安装，后续若继续改 workflow，优先补装或在 CI 侧验证 workflow 语法。
+
 ## 2026-07-02 CCSwitchMulti v3.16.4-7 Formal Release
 
 - `v3.16.4-7` 是 `v3.16.4-6` 后的 MultiRouter 路由热修复正式发布，核心变更是修复第三方 GPT alias 只出现在聚合 `modelCatalog`、没有回到第三方 route `match.models/modelMap` 时被官方 `gpt` 前缀 route 抢走的问题；版本提交为 `755b69e4ee0b5a91461558e4b7a8d8753b38bc5e`（`chore(release): bump CCSwitchMulti to v3.16.4-7`）。
diff --git a/src-tauri/src/codex_config.rs b/src-tauri/src/codex_config.rs
@@ -2087,6 +2087,39 @@ fn codex_provider_table_has_proxy_placeholder(item: &Item) -> bool {
         == Some(CODEX_PROXY_AUTH_PLACEHOLDER)
 }
 
+/// 判断 URL 是否指向本机代理地址。
+///
+/// 这里不依赖 `proxy.rs` 的运行态端口，只识别接管写入时会出现的本机回环地址。
+/// 该判断只用于清理 takeover 残留，不能把用户配置的真实第三方 URL 当成可删除字段。
+fn codex_base_url_is_local_proxy(url: &str) -> bool {
+    let lower = url.trim().to_ascii_lowercase();
+    let Some((_, rest)) = lower.split_once("://") else {
+        return false;
+    };
+    rest.starts_with("127.")
+        || rest.starts_with("localhost")
+        || rest.starts_with("0.0.0.0")
+        || rest.starts_with("[::1]")
+        || rest.starts_with("[::]")
+        || rest.starts_with("::1")
+        || rest.starts_with("::")
+}
+
+/// 判断同名 provider 表是否仍像接管期间生成的临时代理表。
+///
+/// 恢复 provider 备份时，live config 可能还是接管态：同名表里有本地
+/// `base_url` 或 `PROXY_MANAGED` token。此时不能做“provider 键优先”的
+/// 递归合并，否则备份没有声明的接管字段会被保留下来并继续劫持请求。
+fn codex_provider_table_has_takeover_artifact(item: &Item) -> bool {
+    item.as_table_like().is_some_and(|table| {
+        codex_provider_table_has_proxy_placeholder(item)
+            || table
+                .get("base_url")
+                .and_then(|url| url.as_str())
+                .is_some_and(codex_base_url_is_local_proxy)
+    })
+}
+
 /// 移除目标 provider 不再使用的 CC Switch 自有 provider 表。
 ///
 /// 参数：
@@ -2147,7 +2180,7 @@ fn remove_codex_provider_owned_fields_missing_from_provider(
         remove_active_custom_codex_model_provider_section(live_doc);
     }
 
-    for key in ["model", "model_provider", "model_context_window"] {
+    for key in ["model", "model_provider"] {
         if provider_doc.get(key).is_none() {
             live_doc.as_table_mut().remove(key);
         }
@@ -2256,7 +2289,11 @@ pub(crate) fn merge_codex_provider_config_texts(
             {
                 match live_providers.get_mut(provider_id) {
                     Some(live_item) => {
-                        merge_codex_toml_item_prefer_provider(live_item, &provider_item)
+                        if codex_provider_table_has_takeover_artifact(live_item) {
+                            *live_item = provider_item;
+                        } else {
+                            merge_codex_toml_item_prefer_provider(live_item, &provider_item);
+                        }
                     }
                     None => {
                         live_providers.insert(provider_id, provider_item);
diff --git a/src-tauri/src/commands/model_fetch.rs b/src-tauri/src/commands/model_fetch.rs
@@ -7,6 +7,23 @@ use reqwest::header::{HeaderValue, CONTENT_TYPE, USER_AGENT};
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
 
+/// 前端模型列表刷新命令的完整请求体。
+///
+/// 这个结构体保持 Tauri 命令只有一个入参，避免新增供应商专用字段后继续扩散成
+/// 多个并列参数；字段名由 `camelCase` 与前端 `invoke` 请求保持一致。
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FetchModelsForConfigRequest {
+    pub base_url: String,
+    pub api_key: String,
+    pub is_full_url: Option<bool>,
+    pub models_url: Option<String>,
+    pub custom_user_agent: Option<String>,
+    pub volcengine_model_list_action: Option<String>,
+    pub volcengine_access_key_id: Option<String>,
+    pub volcengine_secret_access_key: Option<String>,
+}
+
 /// Codex 上游协议探测结果。
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -24,29 +41,24 @@ pub struct CodexResponsesProbeResult {
 /// 否则对 baseURL 生成候选列表（含「剥离 Anthropic 兼容子路径」兜底），按序尝试。
 #[tauri::command(rename_all = "camelCase")]
 pub async fn fetch_models_for_config(
-    base_url: String,
-    api_key: String,
-    is_full_url: Option<bool>,
-    models_url: Option<String>,
-    custom_user_agent: Option<String>,
-    volcengine_model_list_action: Option<String>,
-    volcengine_access_key_id: Option<String>,
-    volcengine_secret_access_key: Option<String>,
+    request: FetchModelsForConfigRequest,
 ) -> Result<Vec<FetchedModel>, String> {
     // 与转发 / 检测路径共用 parse_custom_user_agent：非法 UA 静默忽略（不阻断取模型）。
-    let user_agent = crate::provider::parse_custom_user_agent(custom_user_agent.as_deref())
+    let user_agent = crate::provider::parse_custom_user_agent(request.custom_user_agent.as_deref())
         .ok()
         .flatten();
-    model_fetch::fetch_models(
-        &base_url,
-        &api_key,
-        is_full_url.unwrap_or(false),
-        models_url.as_deref(),
+    model_fetch::fetch_models(model_fetch::FetchModelsRequest {
+        base_url: &request.base_url,
+        api_key: &request.api_key,
+        is_full_url: request.is_full_url.unwrap_or(false),
+        models_url_override: request.models_url.as_deref(),
         user_agent,
-        volcengine_model_list_action.as_deref(),
-        volcengine_access_key_id.as_deref(),
-        volcengine_secret_access_key.as_deref(),
-    )
+        volcengine: model_fetch::VolcengineModelListRequest {
+            action: request.volcengine_model_list_action.as_deref(),
+            access_key_id: request.volcengine_access_key_id.as_deref(),
+            secret_access_key: request.volcengine_secret_access_key.as_deref(),
+        },
+    })
     .await
 }
 
diff --git a/src-tauri/src/services/model_fetch.rs b/src-tauri/src/services/model_fetch.rs
@@ -19,6 +19,31 @@ pub struct FetchedModel {
     pub context_window: Option<u64>,
 }
 
+/// 模型列表获取服务的统一入参。
+///
+/// 通用 OpenAI-compatible `/models` 字段和火山 Plan 管控面字段放在同一个请求对象里，
+/// 让服务入口保持稳定；新增 provider 专用取模逻辑时优先扩展子结构而不是继续增加函数参数。
+#[derive(Debug, Clone)]
+pub struct FetchModelsRequest<'a> {
+    pub base_url: &'a str,
+    pub api_key: &'a str,
+    pub is_full_url: bool,
+    pub models_url_override: Option<&'a str>,
+    pub user_agent: Option<HeaderValue>,
+    pub volcengine: VolcengineModelListRequest<'a>,
+}
+
+/// 火山 Agent/Coding Plan 模型枚举的管控面参数。
+///
+/// 这些字段不是推理 API 的 bearer key，而是火山 OpenAPI AK/SK；没有 action 时
+/// 主流程仍回到普通 OpenAI-compatible `/models` 候选逻辑。
+#[derive(Debug, Clone, Copy, Default)]
+pub struct VolcengineModelListRequest<'a> {
+    pub action: Option<&'a str>,
+    pub access_key_id: Option<&'a str>,
+    pub secret_access_key: Option<&'a str>,
+}
+
 /// OpenAI 兼容的 /v1/models 响应格式
 #[derive(Debug, Deserialize)]
 struct ModelsResponse {
@@ -132,46 +157,41 @@ async fn fetch_volcengine_plan_models(
 /// 获取供应商的可用模型列表
 ///
 /// 使用 OpenAI 兼容的 GET /v1/models 端点，按候选列表顺序尝试。
-pub async fn fetch_models(
-    base_url: &str,
-    api_key: &str,
-    is_full_url: bool,
-    models_url_override: Option<&str>,
-    user_agent: Option<HeaderValue>,
-    volcengine_model_list_action: Option<&str>,
-    volcengine_access_key_id: Option<&str>,
-    volcengine_secret_access_key: Option<&str>,
-) -> Result<Vec<FetchedModel>, String> {
-    if let Some(action) = normalize_volcengine_model_list_action(volcengine_model_list_action)? {
+pub async fn fetch_models(options: FetchModelsRequest<'_>) -> Result<Vec<FetchedModel>, String> {
+    if let Some(action) = normalize_volcengine_model_list_action(options.volcengine.action)? {
         return fetch_volcengine_plan_models(
-            base_url,
+            options.base_url,
             action,
-            volcengine_access_key_id,
-            volcengine_secret_access_key,
+            options.volcengine.access_key_id,
+            options.volcengine.secret_access_key,
         )
         .await;
     }
 
-    if api_key.is_empty() {
+    if options.api_key.is_empty() {
         return Err("API Key is required to fetch models".to_string());
     }
 
-    let candidates = build_models_url_candidates(base_url, is_full_url, models_url_override)?;
+    let candidates = build_models_url_candidates(
+        options.base_url,
+        options.is_full_url,
+        options.models_url_override,
+    )?;
     let client = crate::proxy::http_client::get();
     let mut last_err: Option<String> = None;
 
     for url in &candidates {
         log::debug!("[ModelFetch] Trying endpoint: {url}");
-        let mut request = client
+        let mut request_builder = client
             .get(url)
-            .header("Authorization", format!("Bearer {api_key}"))
+            .header("Authorization", format!("Bearer {}", options.api_key))
             .timeout(Duration::from_secs(FETCH_TIMEOUT_SECS));
         // 自定义 User-Agent：部分 /models 端点同样有 UA 白名单（如 Kimi Coding Plan），
         // 与转发 / 检测路径共用同一 UA，避免"代理可用但取模型失败"。
-        if let Some(ua) = &user_agent {
-            request = request.header(USER_AGENT, ua.clone());
+        if let Some(ua) = &options.user_agent {
+            request_builder = request_builder.header(USER_AGENT, ua.clone());
         }
-        let response = match request.send().await {
+        let response = match request_builder.send().await {
             Ok(r) => r,
             Err(e) => {
                 return Err(format!("Request failed: {e}"));
diff --git a/src/lib/api/model-fetch.ts b/src/lib/api/model-fetch.ts
@@ -37,14 +37,16 @@ export async function fetchModelsForConfig(
   volcengineModelList?: VolcengineModelListOptions,
 ): Promise<FetchedModel[]> {
   return invoke("fetch_models_for_config", {
-    baseUrl,
-    apiKey,
-    isFullUrl,
-    modelsUrl,
-    customUserAgent,
-    volcengineModelListAction: volcengineModelList?.action,
-    volcengineAccessKeyId: volcengineModelList?.accessKeyId,
-    volcengineSecretAccessKey: volcengineModelList?.secretAccessKey,
+    request: {
+      baseUrl,
+      apiKey,
+      isFullUrl,
+      modelsUrl,
+      customUserAgent,
+      volcengineModelListAction: volcengineModelList?.action,
+      volcengineAccessKeyId: volcengineModelList?.accessKeyId,
+      volcengineSecretAccessKey: volcengineModelList?.secretAccessKey,
+    },
   });
 }
 
