Merge branch 'main' into feat/provider-icon-color

# Conflicts: # src-tauri/src/proxy/types.rs # src-tauri/src/usage_script.rs # src/components/proxy/AutoFailoverConfigPanel.tsx
feat(health): add configurable test models and reasoning effort support
2026-07-25 13:45:03 +08:00 · 2025-12-11 17:08:09 +08:00 · 2025-12-10 16:03:25 +08:00 · 2025-12-10 15:59:55 +08:00 · 2025-12-10 15:54:21 +08:00 · 2025-12-10 15:52:26 +08:00
151 changed files with 2954 additions and 9002 deletions
@@ -5,100 +5,6 @@ All notable changes to CC Switch will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [3.9.0-1] - 2025-12-18
-
-### Beta Release
-
-This beta release introduces the **Local API Proxy** feature, along with Skills multi-app support, UI improvements, and numerous bug fixes.
-
-### Major Features
-
-#### Local Proxy Server
- **Local HTTP Proxy** - High-performance proxy server built on Axum framework
- **Multi-app Support** - Unified proxy for Claude Code, Codex, and Gemini CLI API requests
- **Per-app Takeover** - Independent control over which apps route through the proxy
- **Live Config Takeover** - Automatically backs up and redirects CLI configurations to local proxy
-
-#### Auto Failover
- **Circuit Breaker** - Automatically detects provider failures and triggers protection
- **Smart Failover** - Automatically switches to backup provider when current one is unavailable
- **Health Tracking** - Real-time monitoring of provider availability
- **Independent Failover Queues** - Each app maintains its own failover queue
-
-#### Monitoring
- **Request Logging** - Detailed logging of all proxy requests
- **Usage Statistics** - Token consumption, latency, success rate metrics
- **Real-time Status** - Frontend displays proxy status and statistics
-
-#### Skills Multi-App Support
- **Multi-app Support** - Skills now support both Claude and Codex (#365)
- **Multi-app Migration** - Existing Skills auto-migrate to multi-app structure (#378)
- **Installation Path Fix** - Use directory basename for skill installation path (#358)
-
-### Added
- **Provider Icon Colors** - Customize provider icon colors (#385)
- **Deeplink Usage Config** - Import usage query config via deeplink (#400)
- **Error Request Logging** - Detailed logging for proxy requests (#401)
- **Closable Toast** - Added close button to switch notification toast (#350)
- **Icon Color Component** - ProviderIcon component supports color prop (#384)
-
-### Fixed
-
-#### Proxy Related
- Takeover Codex base_url via model_provider
- Harden crash recovery with fallback detection
- Sync UI when active provider differs from current setting
- Resolve circuit breaker race condition and error classification
- Stabilize live takeover and provider editing
- Reset health badges when proxy stops
- Retry failover for all HTTP errors including 4xx
- Fix HalfOpen counter underflow and config field inconsistencies
- Resolve circuit breaker state persistence and HalfOpen deadlock
- Auto-recover live config after abnormal exit
- Update live backup when hot-switching provider in proxy mode
- Wait for server shutdown before exiting app
- Disable auto-start on app launch by resetting enabled flag on stop
- Sync live config tokens to database before takeover
- Resolve 404 error and auto-setup proxy targets
-
-#### MCP Related
- Skip sync when target CLI app is not installed
- Improve upsert and import robustness
- Use browser-compatible platform detection for MCP presets
-
-#### UI Related
- Restore fade transition for Skills button
- Add close button to all success toasts
- Prevent card jitter when health badge appears
- Update SettingsPage tab styles (#342)
-
-#### Other
- Fix Azure website link (#407)
- Add fallback to provider config for usage credentials (#360)
- Fix Windows black screen on startup (use system titlebar)
- Add fallback for crypto.randomUUID() on older WebViews
- Use correct npm package for Codex CLI version check
- Security fixes for JavaScript executor and usage script (#151)
-
-### Improved
- **Proxy Active Theme** - Apply emerald theme when proxy takeover is active
- **Card Animation** - Improved provider card hover animation
- **Remove Restart Prompt** - No longer prompts restart when switching providers
-
-### Technical
- Implement per-app takeover mode
- Proxy module contains 20+ Rust files with complete layered architecture
- Add 5 new database tables for proxy functionality
- Modularize handlers.rs to reduce code duplication
- Remove is_proxy_target in favor of failover_queue
-
-### Stats
- 55 commits since v3.8.2
- 164 files changed
- +22,164 / -570 lines
-
---
-
 ## [3.8.0] - 2025-11-28

 ### Major Updates
@@ -1,165 +0,0 @@
-# CC Switch 代理功能使用指南
-
-## 功能介绍
-
-CC Switch 的代理功能是一个本地 HTTP 代理服务器，可以统一管理 Claude Code、Codex 和 Gemini CLI 的 API 请求。主要特性包括：
-
- **统一代理入口** - 所有 CLI 应用的请求通过本地代理转发
- **自动故障转移** - 当前供应商故障时自动切换到备用供应商
- **按应用控制** - 可独立控制每个应用是否启用代理
- **配置保护** - 自动备份原始配置，停止代理时安全恢复
-
-## 快速开始
-
-### 1. 启动代理
-
-在 CC Switch 主界面，点击右上角的 **Proxy** 按钮，可以看到代理控制面板。
-
-点击 **启动代理** 按钮启动本地代理服务器。代理默认监听 `127.0.0.1:15721`。
-
-### 2. 启用应用接管
-
-代理启动后，你可以选择让哪些应用的请求通过代理：
-
- **Claude** - 接管 Claude Code 的 API 请求
- **Codex** - 接管 Codex CLI 的 API 请求
- **Gemini** - 接管 Gemini CLI 的 API 请求
-
-点击对应应用的开关即可启用/禁用接管。
-
-> **注意**：启用接管后，CC Switch 会自动修改对应应用的配置文件，将 API 端点指向本地代理。原始配置会被安全备份。
-
-### 3. 正常使用 CLI
-
-启用接管后，你可以正常使用各个 CLI 工具。所有请求都会经过 CC Switch 代理转发到配置的供应商。
-
-### 4. 停止代理
-
-当你不再需要代理时，点击 **停止代理** 按钮。CC Switch 会：
-
-1. 安全关闭代理服务器
-2. 自动恢复所有应用的原始配置
-3. 清除代理状态
-
-## 自动故障转移
-
-### 工作原理
-
-代理功能内置了智能故障转移机制：
-
-1. **健康监控** - 实时监控每个供应商的响应状态
-2. **熔断器** - 连续失败 5 次后触发熔断，暂停使用该供应商
-3. **自动切换** - 熔断后自动切换到列表中的下一个供应商
-4. **自动恢复** - 30 秒后尝试恢复熔断的供应商
-
-### 配置故障转移
-
-要使用故障转移功能，你需要：
-
-1. 在对应应用下添加多个供应商（至少 2 个）
-2. 启动代理并启用接管
-3. 当主供应商故障时，代理会自动切换到备用供应商
-
-### 健康状态指示
-
-在供应商卡片上可以看到健康状态指示：
-
- **绿色** - 供应商正常
- **红色** - 供应商故障/熔断中
- **灰色** - 未使用代理或未检测
-
-## 按应用接管
-
-v3.9.0 新增了按应用分粒度控制功能：
-
- 你可以只接管 Claude，而让 Codex 使用原始配置
- 每个应用的接管状态独立管理
- 启用/禁用不会影响其他应用
-
-### 接管状态检测
-
-CC Switch 通过检测配置备份来判断接管状态：
-
- 存在备份 = 已接管
- 无备份 = 未接管
-
-这确保了即使 CC Switch 异常退出，重新启动后也能正确识别状态。
-
-## 代理配置
-
-在代理面板中，你可以配置以下参数：
-
-| 参数 | 默认值 | 说明 |
-|------|--------|------|
-| 监听地址 | 127.0.0.1 | 代理服务器绑定地址 |
-| 监听端口 | 15721 | 代理服务器端口 |
-| 最大重试 | 3 | 请求失败时的最大重试次数 |
-| 请求超时 | 120 秒 | 单个请求的超时时间 |
-| 启用日志 | 是 | 是否记录请求日志 |
-
-## 常见问题
-
-### Q: 代理启动失败，提示端口被占用？
-
-A: 默认端口 15721 可能被其他程序占用。你可以：
- 关闭占用该端口的程序
- 在代理配置中修改端口号
-
-### Q: 启用接管后 CLI 无法使用？
-
-A: 请检查：
-1. 代理服务器是否正常运行（查看代理面板状态）
-2. 供应商配置是否正确（API Key 等）
-3. 网络连接是否正常
-
-### Q: 如何恢复原始配置？
-
-A: 点击 **停止代理** 按钮，CC Switch 会自动恢复所有应用的原始配置。
-
-如果 CC Switch 异常退出，重新启动后会检测到之前的备份，你可以：
- 点击停止代理来恢复配置
- 或继续使用代理功能
-
-### Q: 故障转移没有生效？
-
-A: 请确保：
-1. 配置了至少 2 个供应商
-2. 代理已启动且接管已启用
-3. 故障转移只在代理模式下工作
-
-### Q: 代理会影响性能吗？
-
-A: 本地代理的延迟开销非常小（通常 < 1ms）。但如果启用了请求日志，在高频请求场景下可能会有少量性能影响。
-
-## 技术细节
-
-### 配置文件位置
-
-启用接管后，CC Switch 会修改以下配置文件：
-
-| 应用 | 配置文件 | 修改内容 |
-|------|----------|----------|
-| Claude | `~/.claude/settings.json` | `apiBaseUrl` 指向代理 |
-| Codex | `~/.codex/config.toml` | `[api] baseUrl` 指向代理 |
-| Gemini | `~/.gemini/.env` | `GEMINI_BASE_URL` 指向代理 |
-
-原始配置备份在 CC Switch 数据库中，停止代理时自动恢复。
-
-### 代理模式
-
-代理服务器运行在接管模式下，会：
-
-1. 接收来自 CLI 的 HTTPS 请求
-2. 根据当前供应商配置转发到真实 API 端点
-3. 返回响应给 CLI
-4. 记录请求日志和健康状态
-
-### 数据库表
-
-代理功能使用以下数据库表：
-
- `proxy_config` - 代理配置
- `provider_health` - 供应商健康状态
- `proxy_request_logs` - 请求日志
- `circuit_breaker_config` - 熔断器配置
- `proxy_live_backup` - Live 配置备份
@@ -1,6 +1,6 @@
 {
  "name": "cc-switch",
-  "version": "3.9.0-2",
+  "version": "3.8.2",
  "description": "All-in-One Assistant for Claude Code, Codex & Gemini CLI",
  "scripts": {
    "dev": "pnpm tauri dev",
@@ -586,12 +586,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

-[[package]]
-name = "byteorder-lite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
-
 [[package]]
 name = "bytes"
 version = "1.10.1"
@@ -701,7 +695,7 @@ dependencies = [

 [[package]]
 name = "cc-switch"
-version = "3.9.0-2"
+version = "3.8.2"
 dependencies = [
 "anyhow",
 "async-stream",
@@ -2220,7 +2214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98"
 dependencies = [
 "byteorder",
- "png 0.17.16",
+ "png",
 ]

 [[package]]
@@ -2336,19 +2330,6 @@ dependencies = [
 "icu_properties",
 ]

-[[package]]
-name = "image"
-version = "0.25.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7"
-dependencies = [
- "bytemuck",
- "byteorder-lite",
- "moxcms",
- "num-traits",
- "png 0.18.0",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -2778,16 +2759,6 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

-[[package]]
-name = "moxcms"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbdd3d7436f8b5e892b8b7ea114271ff0fa00bc5acae845d53b07d498616ef6"
-dependencies = [
- "num-traits",
- "pxfm",
-]
-
 [[package]]
 name = "muda"
 version = "0.17.1"
@@ -2803,7 +2774,7 @@ dependencies = [
 "objc2-core-foundation",
 "objc2-foundation 0.3.1",
 "once_cell",
- "png 0.17.16",
+ "png",
 "serde",
 "thiserror 2.0.17",
 "windows-sys 0.60.2",
@@ -3592,19 +3563,6 @@ dependencies = [
 "miniz_oxide",
 ]

-[[package]]
-name = "png"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
-dependencies = [
- "bitflags 2.9.4",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
 [[package]]
 name = "polling"
 version = "3.11.0"
@@ -3736,15 +3694,6 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "pxfm"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3cbdf373972bf78df4d3b518d07003938e2c7d1fb5891e55f9cb6df57009d84"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "quick-xml"
 version = "0.37.5"
@@ -5038,7 +4987,6 @@ dependencies = [
 "heck 0.5.0",
 "http",
 "http-range",
- "image",
 "jni",
 "libc",
 "log",
@@ -5107,7 +5055,7 @@ dependencies = [
 "ico",
 "json-patch",
 "plist",
- "png 0.17.16",
+ "png",
 "proc-macro2",
 "quote",
 "semver",
@@ -5862,7 +5810,7 @@ dependencies = [
 "objc2-core-graphics",
 "objc2-foundation 0.3.1",
 "once_cell",
- "png 0.17.16",
+ "png",
 "serde",
 "thiserror 2.0.17",
 "windows-sys 0.59.0",
@@ -1,6 +1,6 @@
 [package]
 name = "cc-switch"
-version = "3.9.0-2"
+version = "3.8.2"
 description = "All-in-One Assistant for Claude Code, Codex & Gemini CLI"
 authors = ["Jason Young"]
 license = "MIT"
@@ -26,7 +26,7 @@ serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
 chrono = { version = "0.4", features = ["serde"] }
-tauri = { version = "2.8.2", features = ["tray-icon", "protocol-asset", "image-png"] }
+tauri = { version = "2.8.2", features = ["tray-icon", "protocol-asset"] }
 tauri-plugin-log = "2"
 tauri-plugin-opener = "2"
 tauri-plugin-process = "2"
@@ -105,55 +105,6 @@ pub fn read_mcp_json() -> Result<Option<String>, AppError> {
    Ok(Some(content))
 }

-/// 在 ~/.claude.json 根对象写入 hasCompletedOnboarding=true（用于跳过 Claude Code 初次安装确认）
-/// 仅增量写入该字段，其他字段保持不变
-pub fn set_has_completed_onboarding() -> Result<bool, AppError> {
-    let path = user_config_path();
-    let mut root = if path.exists() {
-        read_json_value(&path)?
-    } else {
-        serde_json::json!({})
-    };
-
-    let obj = root
-        .as_object_mut()
-        .ok_or_else(|| AppError::Config("~/.claude.json 根必须是对象".into()))?;
-
-    let already = obj
-        .get("hasCompletedOnboarding")
-        .and_then(|v| v.as_bool())
-        .unwrap_or(false);
-    if already {
-        return Ok(false);
-    }
-
-    obj.insert("hasCompletedOnboarding".into(), Value::Bool(true));
-    write_json_value(&path, &root)?;
-    Ok(true)
-}
-
-/// 删除 ~/.claude.json 根对象的 hasCompletedOnboarding 字段（恢复 Claude Code 初次安装确认）
-/// 仅增量删除该字段，其他字段保持不变
-pub fn clear_has_completed_onboarding() -> Result<bool, AppError> {
-    let path = user_config_path();
-    if !path.exists() {
-        return Ok(false);
-    }
-
-    let mut root = read_json_value(&path)?;
-    let obj = root
-        .as_object_mut()
-        .ok_or_else(|| AppError::Config("~/.claude.json 根必须是对象".into()))?;
-
-    let existed = obj.remove("hasCompletedOnboarding").is_some();
-    if !existed {
-        return Ok(false);
-    }
-
-    write_json_value(&path, &root)?;
-    Ok(true)
-}
-
 pub fn upsert_mcp_server(id: &str, spec: Value) -> Result<bool, AppError> {
    if id.trim().is_empty() {
        return Err(AppError::InvalidInput("MCP 服务器 ID 不能为空".into()));
@@ -1,90 +0,0 @@
-//! 故障转移队列命令
-//!
-//! 管理代理模式下的故障转移队列（基于 providers 表的 in_failover_queue 字段）
-
-use crate::database::FailoverQueueItem;
-use crate::provider::Provider;
-use crate::store::AppState;
-
-/// 获取故障转移队列
-#[tauri::command]
-pub async fn get_failover_queue(
-    state: tauri::State<'_, AppState>,
-    app_type: String,
-) -> Result<Vec<FailoverQueueItem>, String> {
-    state
-        .db
-        .get_failover_queue(&app_type)
-        .map_err(|e| e.to_string())
-}
-
-/// 获取可添加到故障转移队列的供应商（不在队列中的）
-#[tauri::command]
-pub async fn get_available_providers_for_failover(
-    state: tauri::State<'_, AppState>,
-    app_type: String,
-) -> Result<Vec<Provider>, String> {
-    state
-        .db
-        .get_available_providers_for_failover(&app_type)
-        .map_err(|e| e.to_string())
-}
-
-/// 添加供应商到故障转移队列
-#[tauri::command]
-pub async fn add_to_failover_queue(
-    state: tauri::State<'_, AppState>,
-    app_type: String,
-    provider_id: String,
-) -> Result<(), String> {
-    state
-        .db
-        .add_to_failover_queue(&app_type, &provider_id)
-        .map_err(|e| e.to_string())
-}
-
-/// 从故障转移队列移除供应商
-#[tauri::command]
-pub async fn remove_from_failover_queue(
-    state: tauri::State<'_, AppState>,
-    app_type: String,
-    provider_id: String,
-) -> Result<(), String> {
-    state
-        .db
-        .remove_from_failover_queue(&app_type, &provider_id)
-        .map_err(|e| e.to_string())
-}
-
-/// 获取指定应用的自动故障转移开关状态
-#[tauri::command]
-pub async fn get_auto_failover_enabled(
-    state: tauri::State<'_, AppState>,
-    app_type: String,
-) -> Result<bool, String> {
-    let key = format!("auto_failover_enabled_{app_type}");
-    state
-        .db
-        .get_setting(&key)
-        .map(|v| v.map(|s| s == "true").unwrap_or(false)) // 默认关闭
-        .map_err(|e| e.to_string())
-}
-
-/// 设置指定应用的自动故障转移开关状态
-///
-/// 注意：关闭故障转移时不会清除队列，队列内容会保留供下次开启时使用
-#[tauri::command]
-pub async fn set_auto_failover_enabled(
-    state: tauri::State<'_, AppState>,
-    app_type: String,
-    enabled: bool,
-) -> Result<(), String> {
-    let key = format!("auto_failover_enabled_{app_type}");
-    let value = if enabled { "true" } else { "false" };
-
-    log::info!(
-        "[Failover] Setting auto_failover_enabled: key='{key}', value='{value}', app_type='{app_type}'"
-    );
-
-    state.db.set_setting(&key, value).map_err(|e| e.to_string())
-}
@@ -4,12 +4,6 @@ use crate::init_status::InitErrorPayload;
 use tauri::AppHandle;
 use tauri_plugin_opener::OpenerExt;

-#[cfg(target_os = "windows")]
-use std::os::windows::process::CommandExt;
-
-#[cfg(target_os = "windows")]
-const CREATE_NO_WINDOW: u32 = 0x08000000;
-
 /// 打开外部链接
 #[tauri::command]
 pub async fn open_external(app: AppHandle, url: String) -> Result<bool, String> {
@@ -148,16 +142,11 @@ fn extract_version(raw: &str) -> String {
 fn try_get_version(tool: &str) -> (Option<String>, Option<String>) {
    use std::process::Command;

-    #[cfg(target_os = "windows")]
-    let output = {
+    let output = if cfg!(target_os = "windows") {
        Command::new("cmd")
            .args(["/C", &format!("{tool} --version")])
-            .creation_flags(CREATE_NO_WINDOW)
            .output()
-    };
-
-    #[cfg(not(target_os = "windows"))]
-    let output = {
+    } else {
        Command::new("sh")
            .arg("-c")
            .arg(format!("{tool} --version"))
@@ -166,17 +155,11 @@ fn try_get_version(tool: &str) -> (Option<String>, Option<String>) {

    match output {
        Ok(out) => {
-            let stdout = String::from_utf8_lossy(&out.stdout).trim().to_string();
-            let stderr = String::from_utf8_lossy(&out.stderr).trim().to_string();
            if out.status.success() {
-                let raw = if stdout.is_empty() { &stderr } else { &stdout };
-                if raw.is_empty() {
-                    (None, Some("未安装或无法执行".to_string()))
-                } else {
-                    (Some(extract_version(raw)), None)
-                }
+                let raw = String::from_utf8_lossy(&out.stdout).trim().to_string();
+                (Some(extract_version(&raw)), None)
            } else {
-                let err = if stderr.is_empty() { stdout } else { stderr };
+                let err = String::from_utf8_lossy(&out.stderr).trim().to_string();
                (
                    None,
                    Some(if err.is_empty() {
@@ -249,32 +232,16 @@ fn scan_cli_version(tool: &str) -> (Option<String>, Option<String>) {
            // 构建 PATH 环境变量，确保 node 可被找到
            let current_path = std::env::var("PATH").unwrap_or_default();
            let new_path = format!("{}:{}", path.display(), current_path);
-
-            #[cfg(target_os = "windows")]
-            let output = {
-                Command::new(&tool_path)
-                    .arg("--version")
-                    .env("PATH", &new_path)
-                    .creation_flags(CREATE_NO_WINDOW)
-                    .output()
-            };
-
-            #[cfg(not(target_os = "windows"))]
-            let output = {
-                Command::new(&tool_path)
-                    .arg("--version")
-                    .env("PATH", &new_path)
-                    .output()
-            };
+            
+            let output = Command::new(&tool_path)
+                .arg("--version")
+                .env("PATH", &new_path)
+                .output();

            if let Ok(out) = output {
-                let stdout = String::from_utf8_lossy(&out.stdout).trim().to_string();
-                let stderr = String::from_utf8_lossy(&out.stderr).trim().to_string();
                if out.status.success() {
-                    let raw = if stdout.is_empty() { &stderr } else { &stdout };
-                    if !raw.is_empty() {
-                        return (Some(extract_version(raw)), None);
-                    }
+                    let raw = String::from_utf8_lossy(&out.stdout).trim().to_string();
+                    return (Some(extract_version(&raw)), None);
                }
            }
        }
@@ -3,7 +3,6 @@
 mod config;
 mod deeplink;
 mod env;
-mod failover;
 mod import_export;
 mod mcp;
 mod misc;
@@ -19,7 +18,6 @@ mod usage;
 pub use config::*;
 pub use deeplink::*;
 pub use env::*;
-pub use failover::*;
 pub use import_export::*;
 pub use mcp::*;
 pub use misc::*;
@@ -34,15 +34,3 @@ pub async fn apply_claude_plugin_config(official: bool) -> Result<bool, String>
 pub async fn is_claude_plugin_applied() -> Result<bool, String> {
    crate::claude_plugin::is_claude_config_applied().map_err(|e| e.to_string())
 }
-
-/// Claude Code：跳过初次安装确认（写入 ~/.claude.json 的 hasCompletedOnboarding=true）
-#[tauri::command]
-pub async fn apply_claude_onboarding_skip() -> Result<bool, String> {
-    crate::claude_mcp::set_has_completed_onboarding().map_err(|e| e.to_string())
-}
-
-/// Claude Code：恢复初次安装确认（删除 ~/.claude.json 的 hasCompletedOnboarding 字段）
-#[tauri::command]
-pub async fn clear_claude_onboarding_skip() -> Result<bool, String> {
-    crate::claude_mcp::clear_has_completed_onboarding().map_err(|e| e.to_string())
-}
@@ -86,6 +86,19 @@ pub fn switch_provider(
        .map_err(|e| e.to_string())
 }

+/// 设置代理目标供应商
+#[tauri::command]
+pub fn set_proxy_target_provider(
+    state: State<'_, AppState>,
+    app: String,
+    id: String,
+) -> Result<bool, String> {
+    let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
+    ProviderService::set_proxy_target(state.inner(), app_type, &id)
+        .map(|_| true)
+        .map_err(|e| e.to_string())
+}
+
 fn import_default_config_internal(state: &AppState, app_type: AppType) -> Result<bool, AppError> {
    ProviderService::import_default_config(state, app_type)
 }
@@ -2,16 +2,17 @@
 //!
 //! 提供前端调用的 API 接口

+use crate::provider::Provider;
 use crate::proxy::types::*;
 use crate::proxy::{CircuitBreakerConfig, CircuitBreakerStats};
 use crate::store::AppState;

-/// 启动代理服务器（仅启动服务，不接管 Live 配置）
+/// 启动代理服务器（带 Live 配置接管）
 #[tauri::command]
-pub async fn start_proxy_server(
+pub async fn start_proxy_with_takeover(
    state: tauri::State<'_, AppState>,
 ) -> Result<ProxyServerInfo, String> {
-    state.proxy_service.start().await
+    state.proxy_service.start_with_takeover().await
 }

 /// 停止代理服务器（恢复 Live 配置）
@@ -20,27 +21,6 @@ pub async fn stop_proxy_with_restore(state: tauri::State<'_, AppState>) -> Resul
    state.proxy_service.stop_with_restore().await
 }

-/// 获取各应用接管状态
-#[tauri::command]
-pub async fn get_proxy_takeover_status(
-    state: tauri::State<'_, AppState>,
-) -> Result<ProxyTakeoverStatus, String> {
-    state.proxy_service.get_takeover_status().await
-}
-
-/// 为指定应用开启/关闭接管
-#[tauri::command]
-pub async fn set_proxy_takeover_for_app(
-    state: tauri::State<'_, AppState>,
-    app_type: String,
-    enabled: bool,
-) -> Result<(), String> {
-    state
-        .proxy_service
-        .set_takeover_for_app(&app_type, enabled)
-        .await
-}
-
 /// 获取代理服务器状态
 #[tauri::command]
 pub async fn get_proxy_status(state: tauri::State<'_, AppState>) -> Result<ProxyStatus, String> {
@@ -89,6 +69,47 @@ pub async fn switch_proxy_provider(

 // ==================== 故障转移相关命令 ====================

+/// 获取代理目标列表
+#[tauri::command]
+pub async fn get_proxy_targets(
+    state: tauri::State<'_, AppState>,
+    app_type: String,
+) -> Result<Vec<Provider>, String> {
+    let db = &state.db;
+    db.get_proxy_targets(&app_type)
+        .await
+        .map_err(|e| e.to_string())
+        .map(|providers| providers.into_values().collect())
+}
+
+/// 设置代理目标
+#[tauri::command]
+pub async fn set_proxy_target(
+    state: tauri::State<'_, AppState>,
+    provider_id: String,
+    app_type: String,
+    enabled: bool,
+) -> Result<(), String> {
+    let db = &state.db;
+
+    // 设置代理目标状态
+    db.set_proxy_target(&provider_id, &app_type, enabled)
+        .await
+        .map_err(|e| e.to_string())?;
+
+    // 如果是禁用代理目标，重置健康状态
+    if !enabled {
+        log::info!(
+            "Resetting health status for provider {provider_id} (app: {app_type}) after disabling proxy target"
+        );
+        if let Err(e) = db.reset_provider_health(&provider_id, &app_type).await {
+            log::warn!("Failed to reset provider health: {e}");
+        }
+    }
+
+    Ok(())
+}
+
 /// 获取供应商健康状态
 #[tauri::command]
 pub async fn get_provider_health(
@@ -103,97 +124,21 @@ pub async fn get_provider_health(
 }

 /// 重置熔断器
-///
-/// 重置后会检查是否应该切回队列中优先级更高的供应商：
-/// 1. 检查自动故障转移是否开启
-/// 2. 如果恢复的供应商在队列中优先级更高（queue_order 更小），则自动切换
 #[tauri::command]
 pub async fn reset_circuit_breaker(
-    app_handle: tauri::AppHandle,
    state: tauri::State<'_, AppState>,
    provider_id: String,
    app_type: String,
 ) -> Result<(), String> {
-    // 1. 重置数据库健康状态
+    // 重置数据库健康状态
    let db = &state.db;
    db.update_provider_health(&provider_id, &app_type, true, None)
        .await
        .map_err(|e| e.to_string())?;

-    // 2. 如果代理正在运行，重置内存中的熔断器状态
-    state
-        .proxy_service
-        .reset_provider_circuit_breaker(&provider_id, &app_type)
-        .await?;
-
-    // 3. 检查是否应该切回优先级更高的供应商
-    let failover_key = format!("auto_failover_enabled_{app_type}");
-    let auto_failover_enabled = match db.get_setting(&failover_key) {
-        Ok(Some(value)) => value == "true",
-        Ok(None) => {
-            log::debug!(
-                "[{app_type}] Failover setting '{failover_key}' not found, defaulting to disabled"
-            );
-            false
-        }
-        Err(e) => {
-            log::error!(
-                "[{app_type}] Failed to read failover setting '{failover_key}': {e}, defaulting to disabled"
-            );
-            false
-        }
-    };
-
-    if auto_failover_enabled && state.proxy_service.is_running().await {
-        // 获取当前供应商 ID
-        let current_id = db
-            .get_current_provider(&app_type)
-            .map_err(|e| e.to_string())?;
-
-        if let Some(current_id) = current_id {
-            // 获取故障转移队列
-            let queue = db
-                .get_failover_queue(&app_type)
-                .map_err(|e| e.to_string())?;
-
-            // 找到恢复的供应商和当前供应商在队列中的位置（使用 sort_index）
-            let restored_order = queue
-                .iter()
-                .find(|item| item.provider_id == provider_id)
-                .and_then(|item| item.sort_index);
-
-            let current_order = queue
-                .iter()
-                .find(|item| item.provider_id == current_id)
-                .and_then(|item| item.sort_index);
-
-            // 如果恢复的供应商优先级更高（sort_index 更小），则切换
-            if let (Some(restored), Some(current)) = (restored_order, current_order) {
-                if restored < current {
-                    log::info!(
-                        "[Recovery] 供应商 {provider_id} 已恢复且优先级更高 (P{restored} vs P{current})，自动切换"
-                    );
-
-                    // 获取供应商名称用于日志和事件
-                    let provider_name = db
-                        .get_all_providers(&app_type)
-                        .ok()
-                        .and_then(|providers| providers.get(&provider_id).map(|p| p.name.clone()))
-                        .unwrap_or_else(|| provider_id.clone());
-
-                    // 创建故障转移切换管理器并执行切换
-                    let switch_manager =
-                        crate::proxy::failover_switch::FailoverSwitchManager::new(db.clone());
-                    if let Err(e) = switch_manager
-                        .try_switch(Some(&app_handle), &app_type, &provider_id, &provider_name)
-                        .await
-                    {
-                        log::error!("[Recovery] 自动切换失败: {e}");
-                    }
-                }
-            }
-        }
-    }
+    // 注意：熔断器状态在内存中，重启代理服务器后会重置
+    // 如果代理服务器正在运行，需要通知它重置熔断器
+    // 目前先通过数据库重置健康状态，熔断器会在下次超时后自动尝试半开

    Ok(())
 }
@@ -216,19 +161,9 @@ pub async fn update_circuit_breaker_config(
    config: CircuitBreakerConfig,
 ) -> Result<(), String> {
    let db = &state.db;
-
-    // 1. 更新数据库配置
    db.update_circuit_breaker_config(&config)
        .await
-        .map_err(|e| e.to_string())?;
-
-    // 2. 如果代理正在运行，热更新内存中的熔断器配置
-    state
-        .proxy_service
-        .update_circuit_breaker_configs(config)
-        .await?;
-
-    Ok(())
+        .map_err(|e| e.to_string())
 }

 /// 获取熔断器统计信息（仅当代理服务器运行时）
@@ -6,7 +6,6 @@ use crate::services::stream_check::{
    HealthStatus, StreamCheckConfig, StreamCheckResult, StreamCheckService,
 };
 use crate::store::AppState;
-use std::collections::HashSet;
 use tauri::State;

 /// 流式健康检查（单个供应商）
@@ -45,26 +44,10 @@ pub async fn stream_check_all_providers(
    let providers = state.db.get_all_providers(app_type.as_str())?;

    let mut results = Vec::new();
-    let allowed_ids: Option<HashSet<String>> = if proxy_targets_only {
-        let mut ids = HashSet::new();
-        if let Ok(Some(current_id)) = state.db.get_current_provider(app_type.as_str()) {
-            ids.insert(current_id);
-        }
-        if let Ok(queue) = state.db.get_failover_queue(app_type.as_str()) {
-            for item in queue {
-                ids.insert(item.provider_id);
-            }
-        }
-        Some(ids)
-    } else {
-        None
-    };

    for (id, provider) in providers {
-        if let Some(ids) = &allowed_ids {
-            if !ids.contains(&id) {
-                continue;
-            }
+        if proxy_targets_only && !provider.is_proxy_target.unwrap_or(false) {
+            continue;
        }

        let result = StreamCheckService::check_with_retry(&app_type, &provider, &config)
@@ -13,8 +13,6 @@ use std::fs;
 use std::path::{Path, PathBuf};
 use tempfile::NamedTempFile;

-const CC_SWITCH_SQL_EXPORT_HEADER: &str = "-- CC Switch SQLite 导出";
-
 impl Database {
    /// 导出为 SQLite 兼容的 SQL 文本
    pub fn export_sql(&self, target_path: &Path) -> Result<(), AppError> {
@@ -38,8 +36,7 @@ impl Database {
        }

        let sql_raw = fs::read_to_string(source_path).map_err(|e| AppError::io(source_path, e))?;
-        let sql_content = sql_raw.trim_start_matches('\u{feff}');
-        Self::validate_cc_switch_sql_export(sql_content)?;
+        let sql_content = Self::sanitize_import_sql(&sql_raw);

        // 导入前备份现有数据库
        let backup_path = self.backup_database_file()?;
@@ -54,7 +51,7 @@ impl Database {
            Connection::open(&temp_path).map_err(|e| AppError::Database(e.to_string()))?;

        temp_conn
-            .execute_batch(sql_content)
+            .execute_batch(&sql_content)
            .map_err(|e| AppError::Database(format!("执行 SQL 导入失败: {e}")))?;

        // 补齐缺失表/索引并进行基础校验
@@ -96,17 +93,26 @@ impl Database {
        Ok(snapshot)
    }

-    fn validate_cc_switch_sql_export(sql: &str) -> Result<(), AppError> {
-        let trimmed = sql.trim_start();
-        if trimmed.starts_with(CC_SWITCH_SQL_EXPORT_HEADER) {
-            return Ok(());
+    /// 移除 SQLite 保留对象相关语句（如 sqlite_sequence），避免导入报错
+    fn sanitize_import_sql(sql: &str) -> String {
+        let mut cleaned = String::new();
+        let lower_keyword = "sqlite_sequence";
+
+        for stmt in sql.split(';') {
+            let trimmed = stmt.trim();
+            if trimmed.is_empty() {
+                continue;
+            }
+
+            if trimmed.to_ascii_lowercase().contains(lower_keyword) {
+                continue;
+            }
+
+            cleaned.push_str(trimmed);
+            cleaned.push_str(";\n");
        }

-        Err(AppError::localized(
-            "backup.sql.invalid_format",
-            "仅支持导入由 CC Switch 导出的 SQL 备份文件。",
-            "Only SQL backups exported by CC Switch are supported.",
-        ))
+        cleaned
    }

    /// 生成一致性快照备份，返回备份文件路径（不存在主库时返回 None）
@@ -123,15 +129,8 @@ impl Database {

        fs::create_dir_all(&backup_dir).map_err(|e| AppError::io(&backup_dir, e))?;

-        let base_id = format!("db_backup_{}", Utc::now().format("%Y%m%d_%H%M%S"));
-        let mut backup_id = base_id.clone();
-        let mut backup_path = backup_dir.join(format!("{backup_id}.db"));
-        let mut counter = 1;
-        while backup_path.exists() {
-            backup_id = format!("{base_id}_{counter}");
-            backup_path = backup_dir.join(format!("{backup_id}.db"));
-            counter += 1;
-        }
+        let backup_id = format!("db_backup_{}", Utc::now().format("%Y%m%d_%H%M%S"));
+        let backup_path = backup_dir.join(format!("{backup_id}.db"));

        {
            let conn = lock_conn!(self.conn);
@@ -1,146 +0,0 @@
-//! 故障转移队列 DAO
-//!
-//! 管理代理模式下的故障转移队列（基于 providers 表的 in_failover_queue 字段）
-
-use crate::database::{lock_conn, Database};
-use crate::error::AppError;
-use crate::provider::Provider;
-use serde::{Deserialize, Serialize};
-
-/// 故障转移队列条目（简化版，用于前端展示）
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FailoverQueueItem {
-    pub provider_id: String,
-    pub provider_name: String,
-    pub sort_index: Option<usize>,
-}
-
-impl Database {
-    /// 获取故障转移队列（按 sort_index 排序）
-    pub fn get_failover_queue(&self, app_type: &str) -> Result<Vec<FailoverQueueItem>, AppError> {
-        let conn = lock_conn!(self.conn);
-
-        let mut stmt = conn
-            .prepare(
-                "SELECT id, name, sort_index
-                 FROM providers
-                 WHERE app_type = ?1 AND in_failover_queue = 1
-                 ORDER BY COALESCE(sort_index, 999999), id ASC",
-            )
-            .map_err(|e| AppError::Database(e.to_string()))?;
-
-        let items = stmt
-            .query_map([app_type], |row| {
-                Ok(FailoverQueueItem {
-                    provider_id: row.get(0)?,
-                    provider_name: row.get(1)?,
-                    sort_index: row.get(2)?,
-                })
-            })
-            .map_err(|e| AppError::Database(e.to_string()))?
-            .collect::<Result<Vec<_>, _>>()
-            .map_err(|e| AppError::Database(e.to_string()))?;
-
-        Ok(items)
-    }
-
-    /// 获取故障转移队列中的供应商（完整 Provider 信息，按顺序）
-    pub fn get_failover_providers(&self, app_type: &str) -> Result<Vec<Provider>, AppError> {
-        let all_providers = self.get_all_providers(app_type)?;
-
-        let result: Vec<Provider> = all_providers
-            .into_values()
-            .filter(|p| p.in_failover_queue)
-            .collect();
-
-        Ok(result)
-    }
-
-    /// 添加供应商到故障转移队列
-    pub fn add_to_failover_queue(&self, app_type: &str, provider_id: &str) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-
-        conn.execute(
-            "UPDATE providers SET in_failover_queue = 1 WHERE id = ?1 AND app_type = ?2",
-            rusqlite::params![provider_id, app_type],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        Ok(())
-    }
-
-    /// 从故障转移队列中移除供应商
-    pub fn remove_from_failover_queue(
-        &self,
-        app_type: &str,
-        provider_id: &str,
-    ) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-
-        // 1. 从队列中移除
-        conn.execute(
-            "UPDATE providers SET in_failover_queue = 0 WHERE id = ?1 AND app_type = ?2",
-            rusqlite::params![provider_id, app_type],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        // 2. 清除该供应商的健康状态（退出队列后不再需要健康监控）
-        conn.execute(
-            "DELETE FROM provider_health WHERE provider_id = ?1 AND app_type = ?2",
-            rusqlite::params![provider_id, app_type],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        log::info!("已从故障转移队列移除供应商 {provider_id} ({app_type}), 并清除其健康状态");
-
-        Ok(())
-    }
-
-    /// 清空故障转移队列
-    pub fn clear_failover_queue(&self, app_type: &str) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-
-        conn.execute(
-            "UPDATE providers SET in_failover_queue = 0 WHERE app_type = ?1",
-            [app_type],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        Ok(())
-    }
-
-    /// 检查供应商是否在故障转移队列中
-    pub fn is_in_failover_queue(
-        &self,
-        app_type: &str,
-        provider_id: &str,
-    ) -> Result<bool, AppError> {
-        let conn = lock_conn!(self.conn);
-
-        let in_queue: bool = conn
-            .query_row(
-                "SELECT in_failover_queue FROM providers WHERE id = ?1 AND app_type = ?2",
-                rusqlite::params![provider_id, app_type],
-                |row| row.get(0),
-            )
-            .unwrap_or(false);
-
-        Ok(in_queue)
-    }
-
-    /// 获取可添加到故障转移队列的供应商（不在队列中的）
-    pub fn get_available_providers_for_failover(
-        &self,
-        app_type: &str,
-    ) -> Result<Vec<Provider>, AppError> {
-        let all_providers = self.get_all_providers(app_type)?;
-
-        let available: Vec<Provider> = all_providers
-            .into_values()
-            .filter(|p| !p.in_failover_queue)
-            .collect();
-
-        Ok(available)
-    }
-}
@@ -2,7 +2,6 @@
 //!
 //! Database access operations for each domain

-pub mod failover;
 pub mod mcp;
 pub mod prompts;
 pub mod providers;
@@ -12,5 +11,3 @@ pub mod skills;
 pub mod stream_check;

 // 所有 DAO 方法都通过 Database impl 提供，无需单独导出
-// 导出 FailoverQueueItem 供外部使用
-pub use failover::FailoverQueueItem;
@@ -17,7 +17,7 @@ impl Database {
    ) -> Result<IndexMap<String, Provider>, AppError> {
        let conn = lock_conn!(self.conn);
        let mut stmt = conn.prepare(
-            "SELECT id, name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta, in_failover_queue
+            "SELECT id, name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta, is_proxy_target
             FROM providers WHERE app_type = ?1
             ORDER BY COALESCE(sort_index, 999999), created_at ASC, id ASC"
        ).map_err(|e| AppError::Database(e.to_string()))?;
@@ -35,7 +35,7 @@ impl Database {
                let icon: Option<String> = row.get(8)?;
                let icon_color: Option<String> = row.get(9)?;
                let meta_str: String = row.get(10)?;
-                let in_failover_queue: bool = row.get(11)?;
+                let is_proxy_target: bool = row.get(11)?;

                let settings_config =
                    serde_json::from_str(&settings_config_str).unwrap_or(serde_json::Value::Null);
@@ -55,7 +55,7 @@ impl Database {
                        meta: Some(meta),
                        icon,
                        icon_color,
-                        in_failover_queue,
+                        is_proxy_target: Some(is_proxy_target),
                    },
                ))
            })
@@ -131,7 +131,7 @@ impl Database {
    ) -> Result<Option<Provider>, AppError> {
        let conn = lock_conn!(self.conn);
        let result = conn.query_row(
-            "SELECT name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta, in_failover_queue
+            "SELECT name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta, is_proxy_target
             FROM providers WHERE id = ?1 AND app_type = ?2",
            params![id, app_type],
            |row| {
@@ -145,7 +145,7 @@ impl Database {
                let icon: Option<String> = row.get(7)?;
                let icon_color: Option<String> = row.get(8)?;
                let meta_str: String = row.get(9)?;
-                let in_failover_queue: bool = row.get(10)?;
+                let is_proxy_target: bool = row.get(10)?;

                let settings_config = serde_json::from_str(&settings_config_str).unwrap_or(serde_json::Value::Null);
                let meta: ProviderMeta = serde_json::from_str(&meta_str).unwrap_or_default();
@@ -162,7 +162,7 @@ impl Database {
                    meta: Some(meta),
                    icon,
                    icon_color,
-                    in_failover_queue,
+                    is_proxy_target: Some(is_proxy_target),
                })
            },
        );
@@ -174,6 +174,26 @@ impl Database {
        }
    }

+    /// 获取代理目标供应商 ID
+    pub fn get_proxy_target_provider(&self, app_type: &str) -> Result<Option<String>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn
+            .prepare("SELECT id FROM providers WHERE app_type = ?1 AND is_proxy_target = 1 LIMIT 1")
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut rows = stmt
+            .query(params![app_type])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        if let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
+            Ok(Some(
+                row.get(0).map_err(|e| AppError::Database(e.to_string()))?,
+            ))
+        } else {
+            Ok(None)
+        }
+    }
+
    /// 保存供应商（新增或更新）
    ///
    /// 注意：更新模式下不同步 endpoints，因为编辑模式下端点通过单独的 API 管理
@@ -188,18 +208,17 @@ impl Database {
        let mut meta_clone = provider.meta.clone().unwrap_or_default();
        let endpoints = std::mem::take(&mut meta_clone.custom_endpoints);

-        // 检查是否存在（用于判断新增/更新，以及保留 is_current 和 in_failover_queue）
+        // 检查是否存在（用于判断新增/更新，以及保留 is_current 和 is_proxy_target）
        let existing: Option<(bool, bool)> = tx
            .query_row(
-                "SELECT is_current, in_failover_queue FROM providers WHERE id = ?1 AND app_type = ?2",
+                "SELECT is_current, is_proxy_target FROM providers WHERE id = ?1 AND app_type = ?2",
                params![provider.id, app_type],
                |row| Ok((row.get(0)?, row.get(1)?)),
            )
            .ok();

        let is_update = existing.is_some();
-        let (is_current, in_failover_queue) =
-            existing.unwrap_or((false, provider.in_failover_queue));
+        let (is_current, is_proxy_target) = existing.unwrap_or((false, false));

        if is_update {
            // 更新模式：使用 UPDATE 避免触发 ON DELETE CASCADE
@@ -216,7 +235,7 @@ impl Database {
                    icon_color = ?9,
                    meta = ?10,
                    is_current = ?11,
-                    in_failover_queue = ?12
+                    is_proxy_target = ?12
                WHERE id = ?13 AND app_type = ?14",
                params![
                    provider.name,
@@ -230,7 +249,7 @@ impl Database {
                    provider.icon_color,
                    serde_json::to_string(&meta_clone).unwrap(),
                    is_current,
-                    in_failover_queue,
+                    is_proxy_target,
                    provider.id,
                    app_type,
                ],
@@ -241,7 +260,7 @@ impl Database {
            tx.execute(
                "INSERT INTO providers (
                    id, app_type, name, settings_config, website_url, category,
-                    created_at, sort_index, notes, icon, icon_color, meta, is_current, in_failover_queue
+                    created_at, sort_index, notes, icon, icon_color, meta, is_current, is_proxy_target
                ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14)",
                params![
                    provider.id,
@@ -257,7 +276,7 @@ impl Database {
                    provider.icon_color,
                    serde_json::to_string(&meta_clone).unwrap(),
                    is_current,
-                    in_failover_queue,
+                    is_proxy_target,
                ],
            )
            .map_err(|e| AppError::Database(e.to_string()))?;
@@ -313,6 +332,157 @@ impl Database {
        Ok(())
    }

+    /// 设置代理目标供应商
+    pub fn set_proxy_target_provider(&self, app_type: &str, id: &str) -> Result<(), AppError> {
+        let mut conn = lock_conn!(self.conn);
+        let tx = conn
+            .transaction()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 重置所有为 0
+        tx.execute(
+            "UPDATE providers SET is_proxy_target = 0 WHERE app_type = ?1",
+            params![app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 设置新的代理目标供应商
+        tx.execute(
+            "UPDATE providers SET is_proxy_target = 1 WHERE id = ?1 AND app_type = ?2",
+            params![id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        tx.commit().map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 设置单个供应商的代理目标状态（支持多个代理目标）
+    pub async fn set_proxy_target(
+        &self,
+        provider_id: &str,
+        app_type: &str,
+        enabled: bool,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "UPDATE providers SET is_proxy_target = ?1
+             WHERE id = ?2 AND app_type = ?3",
+            params![if enabled { 1 } else { 0 }, provider_id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 获取指定应用类型的所有代理目标供应商（按 sort_index 排序）
+    pub async fn get_proxy_targets(
+        &self,
+        app_type: &str,
+    ) -> Result<IndexMap<String, Provider>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn.prepare(
+            "SELECT id, name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta, is_proxy_target
+             FROM providers WHERE app_type = ?1 AND is_proxy_target = 1
+             ORDER BY COALESCE(sort_index, 999999), created_at ASC, id ASC"
+        ).map_err(|e| AppError::Database(e.to_string()))?;
+
+        let provider_iter = stmt
+            .query_map(params![app_type], |row| {
+                let id: String = row.get(0)?;
+                let name: String = row.get(1)?;
+                let settings_config_str: String = row.get(2)?;
+                let website_url: Option<String> = row.get(3)?;
+                let category: Option<String> = row.get(4)?;
+                let created_at: Option<i64> = row.get(5)?;
+                let sort_index: Option<usize> = row.get(6)?;
+                let notes: Option<String> = row.get(7)?;
+                let icon: Option<String> = row.get(8)?;
+                let icon_color: Option<String> = row.get(9)?;
+                let meta_str: String = row.get(10)?;
+                let is_proxy_target: bool = row.get(11)?;
+
+                let settings_config =
+                    serde_json::from_str(&settings_config_str).unwrap_or(serde_json::Value::Null);
+                let meta: ProviderMeta = serde_json::from_str(&meta_str).unwrap_or_default();
+
+                Ok((
+                    id,
+                    Provider {
+                        id: "".to_string(),
+                        name,
+                        settings_config,
+                        website_url,
+                        category,
+                        created_at,
+                        sort_index,
+                        notes,
+                        meta: Some(meta),
+                        icon,
+                        icon_color,
+                        is_proxy_target: Some(is_proxy_target),
+                    },
+                ))
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut providers = IndexMap::new();
+        for provider_res in provider_iter {
+            let (id, mut provider) = provider_res.map_err(|e| AppError::Database(e.to_string()))?;
+            provider.id = id.clone();
+
+            // 加载 endpoints
+            let mut stmt_endpoints = conn.prepare(
+                "SELECT url, added_at FROM provider_endpoints WHERE provider_id = ?1 AND app_type = ?2 ORDER BY added_at ASC, url ASC"
+            ).map_err(|e| AppError::Database(e.to_string()))?;
+
+            let endpoints_iter = stmt_endpoints
+                .query_map(params![id, app_type], |row| {
+                    let url: String = row.get(0)?;
+                    let added_at: Option<i64> = row.get(1)?;
+                    Ok((
+                        url,
+                        crate::settings::CustomEndpoint {
+                            url: "".to_string(),
+                            added_at: added_at.unwrap_or(0),
+                            last_used: None,
+                        },
+                    ))
+                })
+                .map_err(|e| AppError::Database(e.to_string()))?;
+
+            let mut custom_endpoints = HashMap::new();
+            for ep_res in endpoints_iter {
+                let (url, mut ep) = ep_res.map_err(|e| AppError::Database(e.to_string()))?;
+                ep.url = url.clone();
+                custom_endpoints.insert(url, ep);
+            }
+
+            if let Some(meta) = &mut provider.meta {
+                meta.custom_endpoints = custom_endpoints;
+            }
+
+            providers.insert(id, provider);
+        }
+
+        Ok(providers)
+    }
+
+    /// 获取所有活跃的代理目标
+    pub fn get_all_proxy_targets(&self) -> Result<Vec<(String, String, String)>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn
+            .prepare("SELECT app_type, name, id FROM providers WHERE is_proxy_target = 1")
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let targets = stmt
+            .query_map([], |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)))
+            .map_err(|e| AppError::Database(e.to_string()))?
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(targets)
+    }
+
    /// 更新供应商的 settings_config（仅更新配置，不改变其他字段）
    pub fn update_provider_settings_config(
        &self,
@@ -16,18 +16,19 @@ impl Database {
        let result = {
            let conn = lock_conn!(self.conn);
            conn.query_row(
-                "SELECT listen_address, listen_port, max_retries,
+                "SELECT enabled, listen_address, listen_port, max_retries,
                        request_timeout, enable_logging, live_takeover_active
                 FROM proxy_config WHERE id = 1",
                [],
                |row| {
                    Ok(ProxyConfig {
-                        listen_address: row.get(0)?,
-                        listen_port: row.get::<_, i32>(1)? as u16,
-                        max_retries: row.get::<_, i32>(2)? as u8,
-                        request_timeout: row.get::<_, i32>(3)? as u64,
-                        enable_logging: row.get::<_, i32>(4)? != 0,
-                        live_takeover_active: row.get::<_, i32>(5).unwrap_or(0) != 0,
+                        enabled: row.get::<_, i32>(0)? != 0,
+                        listen_address: row.get(1)?,
+                        listen_port: row.get::<_, i32>(2)? as u16,
+                        max_retries: row.get::<_, i32>(3)? as u8,
+                        request_timeout: row.get::<_, i32>(4)? as u64,
+                        enable_logging: row.get::<_, i32>(5)? != 0,
+                        live_takeover_active: row.get::<_, i32>(6).unwrap_or(0) != 0,
                    })
                },
            )
@@ -56,7 +57,7 @@ impl Database {
                     COALESCE((SELECT created_at FROM proxy_config WHERE id = 1), datetime('now')),
                     datetime('now'))",
            rusqlite::params![
-                0, // 已移除自动启用逻辑，保留列但固定为 0
+                if config.enabled { 1 } else { 0 },
                config.listen_address,
                config.listen_port as i32,
                config.max_retries as i32,
@@ -71,27 +72,28 @@ impl Database {
        Ok(())
    }

-    /// 设置 Live 接管状态（仅更新 proxy_config 表，兼容旧逻辑）
-    ///
-    /// 注意：此方法不会清除 settings 表中的 proxy_takeover_* 状态。
-    /// settings 表的状态由 set_proxy_takeover_enabled 单独管理，用于跨重启保持状态。
+    /// 设置 Live 接管状态
    pub async fn set_live_takeover_active(&self, active: bool) -> Result<(), AppError> {
-        // 仅更新 proxy_config 表（兼容旧版本）
        let conn = lock_conn!(self.conn);
        conn.execute(
            "UPDATE proxy_config SET live_takeover_active = ?1, updated_at = datetime('now') WHERE id = 1",
            rusqlite::params![if active { 1 } else { 0 }],
        )
        .map_err(|e| AppError::Database(e.to_string()))?;
-
        Ok(())
    }

    /// 检查是否处于 Live 接管模式
-    ///
-    /// v3.8.0+：以 settings 表中的 `proxy_takeover_{app_type}` 为真实来源
    pub async fn is_live_takeover_active(&self) -> Result<bool, AppError> {
-        self.has_any_proxy_takeover()
+        let conn = lock_conn!(self.conn);
+        let active: i32 = conn
+            .query_row(
+                "SELECT COALESCE(live_takeover_active, 0) FROM proxy_config WHERE id = 1",
+                [],
+                |row| row.get(0),
+            )
+            .unwrap_or(0);
+        Ok(active != 0)
    }

    // ==================== Provider Health ====================
@@ -102,73 +104,37 @@ impl Database {
        provider_id: &str,
        app_type: &str,
    ) -> Result<ProviderHealth, AppError> {
-        let result = {
-            let conn = lock_conn!(self.conn);
+        let conn = lock_conn!(self.conn);

-            conn.query_row(
-                "SELECT provider_id, app_type, is_healthy, consecutive_failures,
-                        last_success_at, last_failure_at, last_error, updated_at
-                 FROM provider_health
-                 WHERE provider_id = ?1 AND app_type = ?2",
-                rusqlite::params![provider_id, app_type],
-                |row| {
-                    Ok(ProviderHealth {
-                        provider_id: row.get(0)?,
-                        app_type: row.get(1)?,
-                        is_healthy: row.get::<_, i64>(2)? != 0,
-                        consecutive_failures: row.get::<_, i64>(3)? as u32,
-                        last_success_at: row.get(4)?,
-                        last_failure_at: row.get(5)?,
-                        last_error: row.get(6)?,
-                        updated_at: row.get(7)?,
-                    })
-                },
-            )
-        };
-
-        match result {
-            Ok(health) => Ok(health),
-            // 缺少记录时视为健康（关闭后清空状态，再次打开时默认正常）
-            Err(rusqlite::Error::QueryReturnedNoRows) => Ok(ProviderHealth {
-                provider_id: provider_id.to_string(),
-                app_type: app_type.to_string(),
-                is_healthy: true,
-                consecutive_failures: 0,
-                last_success_at: None,
-                last_failure_at: None,
-                last_error: None,
-                updated_at: chrono::Utc::now().to_rfc3339(),
-            }),
-            Err(e) => Err(AppError::Database(e.to_string())),
-        }
+        conn.query_row(
+            "SELECT provider_id, app_type, is_healthy, consecutive_failures,
+                    last_success_at, last_failure_at, last_error, updated_at
+             FROM provider_health
+             WHERE provider_id = ?1 AND app_type = ?2",
+            rusqlite::params![provider_id, app_type],
+            |row| {
+                Ok(ProviderHealth {
+                    provider_id: row.get(0)?,
+                    app_type: row.get(1)?,
+                    is_healthy: row.get::<_, i64>(2)? != 0,
+                    consecutive_failures: row.get::<_, i64>(3)? as u32,
+                    last_success_at: row.get(4)?,
+                    last_failure_at: row.get(5)?,
+                    last_error: row.get(6)?,
+                    updated_at: row.get(7)?,
+                })
+            },
+        )
+        .map_err(|e| AppError::Database(e.to_string()))
    }

    /// 更新Provider健康状态
-    ///
-    /// 使用默认阈值（5）判断是否健康，建议使用 `update_provider_health_with_threshold` 传入配置的阈值
    pub async fn update_provider_health(
        &self,
        provider_id: &str,
        app_type: &str,
        success: bool,
        error_msg: Option<String>,
-    ) -> Result<(), AppError> {
-        // 默认阈值与 CircuitBreakerConfig::default() 保持一致
-        self.update_provider_health_with_threshold(provider_id, app_type, success, error_msg, 5)
-            .await
-    }
-
-    /// 更新Provider健康状态（带阈值参数）
-    ///
-    /// # Arguments
-    /// * `failure_threshold` - 连续失败多少次后标记为不健康
-    pub async fn update_provider_health_with_threshold(
-        &self,
-        provider_id: &str,
-        app_type: &str,
-        success: bool,
-        error_msg: Option<String>,
-        failure_threshold: u32,
    ) -> Result<(), AppError> {
        let conn = lock_conn!(self.conn);

@@ -176,7 +142,7 @@ impl Database {

        // 先查询当前状态
        let current = conn.query_row(
-            "SELECT consecutive_failures FROM provider_health
+            "SELECT consecutive_failures FROM provider_health 
             WHERE provider_id = ?1 AND app_type = ?2",
            rusqlite::params![provider_id, app_type],
            |row| Ok(row.get::<_, i64>(0)? as u32),
@@ -188,8 +154,7 @@ impl Database {
        } else {
            // 失败：增加失败计数
            let failures = current.unwrap_or(0) + 1;
-            // 使用传入的阈值而非硬编码
-            let healthy = if failures >= failure_threshold { 0 } else { 1 };
+            let healthy = if failures >= 3 { 0 } else { 1 };
            (healthy, failures)
        };

@@ -204,10 +169,10 @@ impl Database {
            "INSERT OR REPLACE INTO provider_health
             (provider_id, app_type, is_healthy, consecutive_failures,
              last_success_at, last_failure_at, last_error, updated_at)
-             VALUES (?1, ?2, ?3, ?4,
-                     COALESCE(?5, (SELECT last_success_at FROM provider_health
+             VALUES (?1, ?2, ?3, ?4, 
+                     COALESCE(?5, (SELECT last_success_at FROM provider_health 
                                   WHERE provider_id = ?1 AND app_type = ?2)),
-                     COALESCE(?6, (SELECT last_failure_at FROM provider_health
+                     COALESCE(?6, (SELECT last_failure_at FROM provider_health 
                                   WHERE provider_id = ?1 AND app_type = ?2)),
                     ?7, ?8)",
            rusqlite::params![
@@ -245,31 +210,6 @@ impl Database {
        Ok(())
    }

-    /// 清空指定应用的健康状态（关闭单个代理时使用）
-    pub async fn clear_provider_health_for_app(&self, app_type: &str) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-
-        conn.execute(
-            "DELETE FROM provider_health WHERE app_type = ?1",
-            [app_type],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        log::debug!("Cleared provider health records for app {app_type}");
-        Ok(())
-    }
-
-    /// 清空所有Provider健康状态（代理停止时调用）
-    pub async fn clear_all_provider_health(&self) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-
-        conn.execute("DELETE FROM provider_health", [])
-            .map_err(|e| AppError::Database(e.to_string()))?;
-
-        log::debug!("Cleared all provider health records");
-        Ok(())
-    }
-
    // ==================== Circuit Breaker Config ====================

    /// 获取熔断器配置
@@ -350,17 +290,6 @@ impl Database {
        Ok(())
    }

-    /// 检查是否存在任意 Live 配置备份
-    pub async fn has_any_live_backup(&self) -> Result<bool, AppError> {
-        let conn = lock_conn!(self.conn);
-        let count: i64 = conn
-            .query_row("SELECT COUNT(*) FROM proxy_live_backup", [], |row| {
-                row.get(0)
-            })
-            .map_err(|e| AppError::Database(e.to_string()))?;
-        Ok(count > 0)
-    }
-
    /// 获取 Live 配置备份
    pub async fn get_live_backup(&self, app_type: &str) -> Result<Option<LiveBackup>, AppError> {
        let conn = lock_conn!(self.conn);
@@ -62,56 +62,4 @@ impl Database {
            Ok(())
        }
    }
-
-    // --- 代理接管状态管理 ---
-
-    /// 获取指定应用的代理接管状态
-    ///
-    /// 使用 settings 表存储各应用的接管状态，key 格式: `proxy_takeover_{app_type}`
-    pub fn get_proxy_takeover_enabled(&self, app_type: &str) -> Result<bool, AppError> {
-        let key = format!("proxy_takeover_{app_type}");
-        match self.get_setting(&key)? {
-            Some(value) => Ok(value == "true"),
-            None => Ok(false),
-        }
-    }
-
-    /// 设置指定应用的代理接管状态
-    ///
-    /// - `true` = 开启代理接管
-    /// - `false` = 关闭代理接管
-    pub fn set_proxy_takeover_enabled(
-        &self,
-        app_type: &str,
-        enabled: bool,
-    ) -> Result<(), AppError> {
-        let key = format!("proxy_takeover_{app_type}");
-        let value = if enabled { "true" } else { "false" };
-        self.set_setting(&key, value)
-    }
-
-    /// 检查是否有任一应用开启了代理接管
-    pub fn has_any_proxy_takeover(&self) -> Result<bool, AppError> {
-        let conn = lock_conn!(self.conn);
-        let count: i64 = conn
-            .query_row(
-                "SELECT COUNT(*) FROM settings WHERE key LIKE 'proxy_takeover_%' AND value = 'true'",
-                [],
-                |row| row.get(0),
-            )
-            .map_err(|e| AppError::Database(e.to_string()))?;
-        Ok(count > 0)
-    }
-
-    /// 清除所有代理接管状态（将所有 proxy_takeover_* 设置为 false）
-    pub fn clear_all_proxy_takeover(&self) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-        conn.execute(
-            "UPDATE settings SET value = 'false' WHERE key LIKE 'proxy_takeover_%'",
-            [],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-        log::info!("已清除所有代理接管状态");
-        Ok(())
-    }
 }
@@ -31,9 +31,6 @@ mod schema;
 #[cfg(test)]
 mod tests;

-// DAO 类型导出供外部使用
-pub use dao::FailoverQueueItem;
-
 use crate::config::get_app_config_dir;
 use crate::error::AppError;
 use rusqlite::Connection;
@@ -31,13 +31,19 @@ impl Database {
                icon_color TEXT,
                meta TEXT NOT NULL DEFAULT '{}',
                is_current BOOLEAN NOT NULL DEFAULT 0,
-                in_failover_queue BOOLEAN NOT NULL DEFAULT 0,
+                is_proxy_target BOOLEAN NOT NULL DEFAULT 0,
                PRIMARY KEY (id, app_type)
            )",
            [],
        )
        .map_err(|e| AppError::Database(e.to_string()))?;

+        // 尝试添加 is_proxy_target 列（如果表已存在但缺少该列）
+        let _ = conn.execute(
+            "ALTER TABLE providers ADD COLUMN is_proxy_target BOOLEAN NOT NULL DEFAULT 0",
+            [],
+        );
+
        // 2. Provider Endpoints 表
        conn.execute(
            "CREATE TABLE IF NOT EXISTS provider_endpoints (
@@ -313,25 +319,6 @@ impl Database {
            [],
        );

-        // 确保 in_failover_queue 列存在（对于已存在的 v2 数据库）
-        Self::add_column_if_missing(
-            conn,
-            "providers",
-            "in_failover_queue",
-            "BOOLEAN NOT NULL DEFAULT 0",
-        )?;
-
-        // 删除旧的 failover_queue 表（如果存在）
-        let _ = conn.execute("DROP INDEX IF EXISTS idx_failover_queue_order", []);
-        let _ = conn.execute("DROP TABLE IF EXISTS failover_queue", []);
-
-        // 为故障转移队列创建索引（基于 providers 表）
-        let _ = conn.execute(
-            "CREATE INDEX IF NOT EXISTS idx_providers_failover
-             ON providers(app_type, in_failover_queue, sort_index)",
-            [],
-        );
-
        Ok(())
    }

@@ -468,26 +455,6 @@ impl Database {
        Self::add_column_if_missing(conn, "providers", "limit_daily_usd", "TEXT")?;
        Self::add_column_if_missing(conn, "providers", "limit_monthly_usd", "TEXT")?;
        Self::add_column_if_missing(conn, "providers", "provider_type", "TEXT")?;
-        Self::add_column_if_missing(
-            conn,
-            "providers",
-            "in_failover_queue",
-            "BOOLEAN NOT NULL DEFAULT 0",
-        )?;
-
-        // 删除旧的 failover_queue 表（如果存在）
-        conn.execute("DROP INDEX IF EXISTS idx_failover_queue_order", [])
-            .map_err(|e| AppError::Database(format!("删除 failover_queue 索引失败: {e}")))?;
-        conn.execute("DROP TABLE IF EXISTS failover_queue", [])
-            .map_err(|e| AppError::Database(format!("删除 failover_queue 表失败: {e}")))?;
-
-        // 创建 failover 索引
-        conn.execute(
-            "CREATE INDEX IF NOT EXISTS idx_providers_failover
-             ON providers(app_type, in_failover_queue, sort_index)",
-            [],
-        )
-        .map_err(|e| AppError::Database(format!("创建 failover 索引失败: {e}")))?;

        // proxy_request_logs 表（包含所有字段）
        conn.execute(
@@ -245,7 +245,7 @@ fn dry_run_validates_schema_compatibility() {
            meta: None,
            icon: None,
            icon_color: None,
-            in_failover_queue: false,
+            is_proxy_target: Some(false),
        },
    );

@@ -113,27 +113,4 @@ pub struct DeepLinkImportRequest {
    /// Remote config URL
    #[serde(skip_serializing_if = "Option::is_none")]
    pub config_url: Option<String>,
-
-    // ============ Usage script fields (v3.9+) ============
-    /// Whether to enable usage query (default: true if usage_script is provided)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub usage_enabled: Option<bool>,
-    /// Base64 encoded usage query script code
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub usage_script: Option<String>,
-    /// Usage query API key (if different from provider API key)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub usage_api_key: Option<String>,
-    /// Usage query base URL (if different from provider endpoint)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub usage_base_url: Option<String>,
-    /// Usage query access token (for NewAPI template)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub usage_access_token: Option<String>,
-    /// Usage query user ID (for NewAPI template)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub usage_user_id: Option<String>,
-    /// Auto query interval in minutes (0 to disable)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub usage_auto_interval: Option<u64>,
 }
@@ -122,19 +122,6 @@ fn parse_provider_deeplink(
    let config_url = params.get("configUrl").cloned();
    let enabled = params.get("enabled").and_then(|v| v.parse::<bool>().ok());

-    // Extract usage script fields (v3.9+)
-    let usage_enabled = params
-        .get("usageEnabled")
-        .and_then(|v| v.parse::<bool>().ok());
-    let usage_script = params.get("usageScript").cloned();
-    let usage_api_key = params.get("usageApiKey").cloned();
-    let usage_base_url = params.get("usageBaseUrl").cloned();
-    let usage_access_token = params.get("usageAccessToken").cloned();
-    let usage_user_id = params.get("usageUserId").cloned();
-    let usage_auto_interval = params
-        .get("usageAutoInterval")
-        .and_then(|v| v.parse::<u64>().ok());
-
    Ok(DeepLinkImportRequest {
        version,
        resource,
@@ -159,13 +146,6 @@ fn parse_provider_deeplink(
        config,
        config_format,
        config_url,
-        usage_enabled,
-        usage_script,
-        usage_api_key,
-        usage_base_url,
-        usage_access_token,
-        usage_user_id,
-        usage_auto_interval,
    })
 }

@@ -226,13 +206,6 @@ fn parse_prompt_deeplink(
        config: None,
        config_format: None,
        config_url: None,
-        usage_enabled: None,
-        usage_script: None,
-        usage_api_key: None,
-        usage_base_url: None,
-        usage_access_token: None,
-        usage_user_id: None,
-        usage_auto_interval: None,
    })
 }

@@ -288,13 +261,6 @@ fn parse_mcp_deeplink(
        directory: None,
        branch: None,
        config_url: None,
-        usage_enabled: None,
-        usage_script: None,
-        usage_api_key: None,
-        usage_base_url: None,
-        usage_access_token: None,
-        usage_user_id: None,
-        usage_auto_interval: None,
    })
 }

@@ -343,12 +309,5 @@ fn parse_skill_deeplink(
        config: None,
        config_format: None,
        config_url: None,
-        usage_enabled: None,
-        usage_script: None,
-        usage_api_key: None,
-        usage_base_url: None,
-        usage_access_token: None,
-        usage_user_id: None,
-        usage_auto_interval: None,
    })
 }
@@ -5,7 +5,7 @@
 use super::utils::{decode_base64_param, infer_homepage_from_endpoint};
 use super::DeepLinkImportRequest;
 use crate::error::AppError;
-use crate::provider::{Provider, ProviderMeta, UsageScript};
+use crate::provider::Provider;
 use crate::services::ProviderService;
 use crate::store::AppState;
 use crate::AppType;
@@ -117,9 +117,6 @@ pub(crate) fn build_provider_from_request(
        AppType::Gemini => build_gemini_settings(request),
    };

-    // Build usage script configuration if provided
-    let meta = build_provider_meta(request)?;
-
    let provider = Provider {
        id: String::new(), // Will be generated by caller
        name: request.name.clone().unwrap_or_default(),
@@ -129,66 +126,15 @@ pub(crate) fn build_provider_from_request(
        created_at: None,
        sort_index: None,
        notes: request.notes.clone(),
-        meta,
+        meta: None,
        icon: request.icon.clone(),
        icon_color: None,
-        in_failover_queue: false,
+        is_proxy_target: None,
    };

    Ok(provider)
 }

-/// Build provider meta with usage script configuration
-fn build_provider_meta(request: &DeepLinkImportRequest) -> Result<Option<ProviderMeta>, AppError> {
-    // Check if any usage script fields are provided
-    if request.usage_script.is_none()
-        && request.usage_enabled.is_none()
-        && request.usage_api_key.is_none()
-        && request.usage_base_url.is_none()
-        && request.usage_access_token.is_none()
-        && request.usage_user_id.is_none()
-        && request.usage_auto_interval.is_none()
-    {
-        return Ok(None);
-    }
-
-    // Decode usage script code if provided
-    let code = if let Some(script_b64) = &request.usage_script {
-        let decoded = decode_base64_param("usage_script", script_b64)?;
-        String::from_utf8(decoded)
-            .map_err(|e| AppError::InvalidInput(format!("Invalid UTF-8 in usage_script: {e}")))?
-    } else {
-        String::new()
-    };
-
-    // Determine enabled state: explicit param > has code > false
-    let enabled = request.usage_enabled.unwrap_or(!code.is_empty());
-
-    // Build UsageScript - use provider's API key and endpoint as defaults
-    let usage_script = UsageScript {
-        enabled,
-        language: "javascript".to_string(),
-        code,
-        timeout: Some(10),
-        api_key: request
-            .usage_api_key
-            .clone()
-            .or_else(|| request.api_key.clone()),
-        base_url: request
-            .usage_base_url
-            .clone()
-            .or_else(|| request.endpoint.clone()),
-        access_token: request.usage_access_token.clone(),
-        user_id: request.usage_user_id.clone(),
-        auto_query_interval: request.usage_auto_interval,
-    };
-
-    Ok(Some(ProviderMeta {
-        usage_script: Some(usage_script),
-        ..Default::default()
-    }))
-}
-
 /// Build Claude settings configuration
 fn build_claude_settings(request: &DeepLinkImportRequest) -> serde_json::Value {
    let mut env = serde_json::Map::new();
@@ -145,13 +145,6 @@ fn test_build_gemini_provider_with_model() {
        content: None,
        description: None,
        enabled: None,
-        usage_enabled: None,
-        usage_script: None,
-        usage_api_key: None,
-        usage_base_url: None,
-        usage_access_token: None,
-        usage_user_id: None,
-        usage_auto_interval: None,
    };

    let provider = build_provider_from_request(&AppType::Gemini, &request).unwrap();
@@ -198,13 +191,6 @@ fn test_build_gemini_provider_without_model() {
        content: None,
        description: None,
        enabled: None,
-        usage_enabled: None,
-        usage_script: None,
-        usage_api_key: None,
-        usage_base_url: None,
-        usage_access_token: None,
-        usage_user_id: None,
-        usage_auto_interval: None,
    };

    let provider = build_provider_from_request(&AppType::Gemini, &request).unwrap();
@@ -246,13 +232,6 @@ fn test_parse_and_merge_config_claude() {
        content: None,
        description: None,
        enabled: None,
-        usage_enabled: None,
-        usage_script: None,
-        usage_api_key: None,
-        usage_base_url: None,
-        usage_access_token: None,
-        usage_user_id: None,
-        usage_auto_interval: None,
    };

    let merged = parse_and_merge_config(&request).unwrap();
@@ -296,13 +275,6 @@ fn test_parse_and_merge_config_url_override() {
        content: None,
        description: None,
        enabled: None,
-        usage_enabled: None,
-        usage_script: None,
-        usage_api_key: None,
-        usage_base_url: None,
-        usage_access_token: None,
-        usage_user_id: None,
-        usage_auto_interval: None,
    };

    let merged = parse_and_merge_config(&request).unwrap();
@@ -42,8 +42,8 @@ fn write_json_value(path: &Path, value: &Value) -> Result<(), AppError> {
 ///
 /// 执行反向格式转换以保持与统一 MCP 结构的兼容性：
 /// - httpUrl → url + type: "http"
-/// - 仅有 url 字段 → 补齐 type: "sse"（Gemini 以字段名推断传输类型）
-/// - 仅有 command 字段 → 补齐 type: "stdio"
+/// - 仅有 url 字段 → 保持不变（SSE 类型）
+/// - 仅有 command 字段 → 保持不变（stdio 类型）
 pub fn read_mcp_servers_map() -> Result<std::collections::HashMap<String, Value>, AppError> {
    let path = user_config_path();
    if !path.exists() {
@@ -65,15 +65,8 @@ pub fn read_mcp_servers_map() -> Result<std::collections::HashMap<String, Value>
                obj.insert("url".to_string(), http_url);
                obj.insert("type".to_string(), Value::String("http".to_string()));
            }
-
-            // Gemini CLI 不使用 type 字段：这里补齐成统一结构，便于校验与导入
-            if obj.get("type").is_none() {
-                if obj.contains_key("command") {
-                    obj.insert("type".to_string(), Value::String("stdio".to_string()));
-                } else if obj.contains_key("url") {
-                    obj.insert("type".to_string(), Value::String("sse".to_string()));
-                }
-            }
+            // 如果有 url 但没有 type，不添加 type（默认为 SSE）
+            // 如果有 command 但没有 type，不添加 type（默认为 stdio）
        }
    }

@@ -39,8 +39,8 @@ pub use mcp::{
 };
 pub use provider::{Provider, ProviderMeta};
 pub use services::{
-    ConfigService, EndpointLatency, McpService, PromptService, ProviderService, ProxyService,
-    SkillService, SpeedtestService,
+    ConfigService, EndpointLatency, McpService, PromptService, ProviderService, SkillService,
+    SpeedtestService,
 };
 pub use settings::{update_settings, AppSettings};
 pub use store::AppState;
@@ -48,9 +48,8 @@ use tauri_plugin_deep_link::DeepLinkExt;
 use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogKind};

 use std::sync::Arc;
-#[cfg(target_os = "macos")]
-use tauri::image::Image;
 use tauri::tray::{TrayIconBuilder, TrayIconEvent};
+#[cfg(target_os = "macos")]
 use tauri::RunEvent;
 use tauri::{Emitter, Manager};

@@ -135,19 +134,6 @@ async fn update_tray_menu(
    }
 }

-#[cfg(target_os = "macos")]
-fn macos_tray_icon() -> Option<Image<'static>> {
-    const ICON_BYTES: &[u8] = include_bytes!("../icons/tray/macos/statusbar_template_3x.png");
-
-    match Image::from_bytes(ICON_BYTES) {
-        Ok(icon) => Some(icon),
-        Err(err) => {
-            log::warn!("Failed to load macOS tray icon: {err}");
-            None
-        }
-    }
-}
-
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
    let mut builder = tauri::Builder::default();
@@ -223,6 +209,44 @@ pub fn run() {
                    log::warn!("初始化 Updater 插件失败，已跳过：{e}");
                }
            }
+            #[cfg(target_os = "macos")]
+            {
+                // 设置 macOS 标题栏背景色为主界面蓝色
+                if let Some(window) = app.get_webview_window("main") {
+                    use objc2::rc::Retained;
+                    use objc2::runtime::AnyObject;
+                    use objc2_app_kit::NSColor;
+
+                    match window.ns_window() {
+                        Ok(ns_window_ptr) => {
+                            if let Some(ns_window) =
+                                unsafe { Retained::retain(ns_window_ptr as *mut AnyObject) }
+                            {
+                                // 使用与主界面 banner 相同的蓝色 #3498db
+                                // #3498db = RGB(52, 152, 219)
+                                let bg_color = unsafe {
+                                    NSColor::colorWithRed_green_blue_alpha(
+                                        52.0 / 255.0,  // R: 52
+                                        152.0 / 255.0, // G: 152
+                                        219.0 / 255.0, // B: 219
+                                        1.0,           // Alpha: 1.0
+                                    )
+                                };
+
+                                unsafe {
+                                    use objc2::msg_send;
+                                    let _: () =
+                                        msg_send![&*ns_window, setBackgroundColor: &*bg_color];
+                                }
+                            } else {
+                                log::warn!("Failed to retain NSWindow reference");
+                            }
+                        }
+                        Err(e) => log::warn!("Failed to get NSWindow pointer: {e}"),
+                    }
+                }
+            }
+
            // 初始化日志
            if cfg!(debug_assertions) {
                app.handle().plugin(
@@ -308,9 +332,6 @@ pub fn run() {

            let app_state = AppState::new(db);

-            // 设置 AppHandle 用于代理故障转移时的 UI 更新
-            app_state.proxy_service.set_app_handle(app.handle().clone());
-
            // ============================================================
            // 按表独立判断的导入逻辑（各类数据独立检查，互不影响）
            // ============================================================
@@ -480,26 +501,11 @@ pub fn run() {
                })
                .show_menu_on_left_click(true);

-            // 使用平台对应的托盘图标（macOS 使用模板图标适配深浅色）
-            #[cfg(target_os = "macos")]
-            {
-                if let Some(icon) = macos_tray_icon() {
-                    tray_builder = tray_builder.icon(icon).icon_as_template(true);
-                } else if let Some(icon) = app.default_window_icon() {
-                    log::warn!("Falling back to default window icon for tray");
-                    tray_builder = tray_builder.icon(icon.clone());
-                } else {
-                    log::warn!("Failed to load macOS tray icon for tray");
-                }
-            }
-
-            #[cfg(not(target_os = "macos"))]
-            {
-                if let Some(icon) = app.default_window_icon() {
-                    tray_builder = tray_builder.icon(icon.clone());
-                } else {
-                    log::warn!("Failed to get default window icon for tray");
-                }
+            // 统一使用应用默认图标；待托盘模板图标就绪后再启用
+            if let Some(icon) = app.default_window_icon() {
+                tray_builder = tray_builder.icon(icon.clone());
+            } else {
+                log::warn!("Failed to get default window icon for tray");
            }

            let _tray = tray_builder.build(app)?;
@@ -516,33 +522,26 @@ pub fn run() {
                }
            }

-            // 异常退出恢复 + 代理状态自动恢复
+            // 自动启动代理服务器
            let app_handle = app.handle().clone();
            tauri::async_runtime::spawn(async move {
                let state = app_handle.state::<AppState>();
-
-                // 检查是否有 Live 备份（表示上次异常退出时可能处于接管状态）
-                let has_backups = match state.db.has_any_live_backup().await {
-                    Ok(v) => v,
-                    Err(e) => {
-                        log::error!("检查 Live 备份失败: {e}");
-                        false
-                    }
-                };
-                // 检查 Live 配置是否仍处于被接管状态（包含占位符）
-                let live_taken_over = state.proxy_service.detect_takeover_in_live_configs();
-
-                if has_backups || live_taken_over {
-                    log::warn!("检测到上次异常退出（存在接管残留），正在恢复 Live 配置...");
-                    if let Err(e) = state.proxy_service.recover_from_crash().await {
-                        log::error!("恢复 Live 配置失败: {e}");
-                    } else {
-                        log::info!("Live 配置已恢复");
+                match state.db.get_proxy_config().await {
+                    Ok(config) => {
+                        if config.enabled {
+                            log::info!("代理服务配置为启用，正在启动...");
+                            match state.proxy_service.start_with_takeover().await {
+                                Ok(info) => log::info!(
+                                    "代理服务器自动启动成功: {}:{}",
+                                    info.address,
+                                    info.port
+                                ),
+                                Err(e) => log::error!("代理服务器自动启动失败: {e}"),
+                            }
+                        }
                    }
+                    Err(e) => log::error!("启动时获取代理配置失败: {e}"),
                }
-
-                // 检查 settings 表中的代理状态，自动恢复代理服务
-                restore_proxy_state_on_startup(&state).await;
            });

            Ok(())
@@ -554,6 +553,7 @@ pub fn run() {
            commands::update_provider,
            commands::delete_provider,
            commands::switch_provider,
+            commands::set_proxy_target_provider,
            commands::import_default_config,
            commands::get_claude_config_status,
            commands::get_config_status,
@@ -580,8 +580,6 @@ pub fn run() {
            commands::read_claude_plugin_config,
            commands::apply_claude_plugin_config,
            commands::is_claude_plugin_applied,
-            commands::apply_claude_onboarding_skip,
-            commands::clear_claude_onboarding_skip,
            // Claude MCP management
            commands::get_claude_mcp_status,
            commands::read_claude_mcp_config,
@@ -649,10 +647,8 @@ pub fn run() {
            commands::set_auto_launch,
            commands::get_auto_launch_status,
            // Proxy server management
-            commands::start_proxy_server,
+            commands::start_proxy_with_takeover,
            commands::stop_proxy_with_restore,
-            commands::get_proxy_takeover_status,
-            commands::set_proxy_takeover_for_app,
            commands::get_proxy_status,
            commands::get_proxy_config,
            commands::update_proxy_config,
@@ -660,18 +656,13 @@ pub fn run() {
            commands::is_live_takeover_active,
            commands::switch_proxy_provider,
            // Proxy failover commands
+            commands::get_proxy_targets,
+            commands::set_proxy_target,
            commands::get_provider_health,
            commands::reset_circuit_breaker,
            commands::get_circuit_breaker_config,
            commands::update_circuit_breaker_config,
            commands::get_circuit_breaker_stats,
-            // Failover queue management
-            commands::get_failover_queue,
-            commands::get_available_providers_for_failover,
-            commands::add_to_failover_queue,
-            commands::remove_from_failover_queue,
-            commands::get_auto_failover_enabled,
-            commands::set_auto_failover_enabled,
            // Usage statistics
            commands::get_usage_summary,
            commands::get_usage_trends,
@@ -706,10 +697,6 @@ pub fn run() {
            tauri::async_runtime::spawn(async move {
                cleanup_before_exit(&app_handle).await;
                log::info!("清理完成，退出应用");
-
-                // 短暂等待确保所有 I/O 操作（如数据库写入）刷新到磁盘
-                tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-
                // 使用 std::process::exit 避免再次触发 ExitRequested
                std::process::exit(0);
            });
@@ -803,89 +790,32 @@ pub fn run() {
 ///
 /// 在应用退出前检查代理服务器状态，如果正在运行则停止代理并恢复 Live 配置。
 /// 确保 Claude Code/Codex/Gemini 的配置不会处于损坏状态。
-/// 使用 stop_with_restore_keep_state 保留 settings 表中的代理状态，下次启动时自动恢复。
 pub async fn cleanup_before_exit(app_handle: &tauri::AppHandle) {
    if let Some(state) = app_handle.try_state::<store::AppState>() {
        let proxy_service = &state.proxy_service;

-        // 退出时也需要兜底：代理可能已崩溃/未运行，但 Live 接管残留仍在（占位符/备份）。
-        let has_backups = match state.db.has_any_live_backup().await {
-            Ok(v) => v,
-            Err(e) => {
-                log::error!("退出时检查 Live 备份失败: {e}");
-                false
-            }
-        };
-        let live_taken_over = proxy_service.detect_takeover_in_live_configs();
-        let needs_restore = has_backups || live_taken_over;
-
-        if needs_restore {
-            log::info!("检测到接管残留，开始恢复 Live 配置（保留代理状态）...");
-            // 使用 keep_state 版本，保留 settings 表中的代理状态
-            if let Err(e) = proxy_service.stop_with_restore_keep_state().await {
-                log::error!("退出时恢复 Live 配置失败: {e}");
-            } else {
-                log::info!("已恢复 Live 配置（代理状态已保留，下次启动将自动恢复）");
-            }
-            return;
-        }
-
-        // 非接管模式：代理在运行则仅停止代理
+        // 检查代理是否在运行
        if proxy_service.is_running().await {
-            log::info!("检测到代理服务器正在运行，开始停止...");
-            if let Err(e) = proxy_service.stop().await {
-                log::error!("退出时停止代理失败: {e}");
-            }
-            log::info!("代理服务器清理完成");
-        }
-    }
-}
+            log::info!("检测到代理服务器正在运行，开始清理...");

-// ============================================================
-// 启动时恢复代理状态
-// ============================================================
-
-/// 启动时根据 settings 表中的代理状态自动恢复代理服务
-///
-/// 检查 `proxy_takeover_claude`、`proxy_takeover_codex`、`proxy_takeover_gemini` 的值，
-/// 如果有任一应用的状态为 `true`，则自动启动代理服务并接管对应应用的 Live 配置。
-async fn restore_proxy_state_on_startup(state: &store::AppState) {
-    // 收集需要恢复接管的应用列表
-    let apps_to_restore: Vec<&str> = ["claude", "codex", "gemini"]
-        .iter()
-        .filter(|app_type| {
-            state
-                .db
-                .get_proxy_takeover_enabled(app_type)
-                .unwrap_or(false)
-        })
-        .copied()
-        .collect();
-
-    if apps_to_restore.is_empty() {
-        log::debug!("启动时无需恢复代理状态");
-        return;
-    }
-
-    log::info!("检测到上次代理状态需要恢复，应用列表: {apps_to_restore:?}");
-
-    // 逐个恢复接管状态
-    for app_type in apps_to_restore {
-        match state
-            .proxy_service
-            .set_takeover_for_app(app_type, true)
-            .await
-        {
-            Ok(()) => {
-                log::info!("✓ 已恢复 {app_type} 的代理接管状态");
-            }
-            Err(e) => {
-                log::error!("✗ 恢复 {app_type} 的代理接管状态失败: {e}");
-                // 失败时清除该应用的状态，避免下次启动再次尝试
-                if let Err(clear_err) = state.db.set_proxy_takeover_enabled(app_type, false) {
-                    log::error!("清除 {app_type} 代理状态失败: {clear_err}");
+            // 检查是否处于 Live 接管模式
+            if let Ok(is_takeover) = state.db.is_live_takeover_active().await {
+                if is_takeover {
+                    // 接管模式：停止并恢复配置
+                    if let Err(e) = proxy_service.stop_with_restore().await {
+                        log::error!("退出时恢复 Live 配置失败: {e}");
+                    } else {
+                        log::info!("已恢复 Live 配置");
+                    }
+                } else {
+                    // 非接管模式：仅停止代理
+                    if let Err(e) = proxy_service.stop().await {
+                        log::error!("退出时停止代理失败: {e}");
+                    }
                }
            }
+
+            log::info!("代理服务器清理完成");
        }
    }
 }
@@ -8,12 +8,6 @@ use crate::error::AppError;

 use super::validation::{extract_server_spec, validate_server_spec};

-fn should_sync_claude_mcp() -> bool {
-    // Claude 未安装/未初始化时：通常 ~/.claude 目录与 ~/.claude.json 都不存在。
-    // 按用户偏好：此时跳过写入/删除，不创建任何文件或目录。
-    crate::config::get_claude_config_dir().exists() || crate::config::get_claude_mcp_path().exists()
-}
-
 /// 返回已启用的 MCP 服务器（过滤 enabled==true）
 fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {
    let mut out = HashMap::new();
@@ -39,9 +33,6 @@ fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {

 /// 将 config.json 中 enabled==true 的项投影写入 ~/.claude.json
 pub fn sync_enabled_to_claude(config: &MultiAppConfig) -> Result<(), AppError> {
-    if !should_sync_claude_mcp() {
-        return Ok(());
-    }
    let enabled = collect_enabled_servers(&config.mcp.claude);
    crate::claude_mcp::set_mcp_servers_map(&enabled)
 }
@@ -116,9 +107,6 @@ pub fn sync_single_server_to_claude(
    id: &str,
    server_spec: &Value,
 ) -> Result<(), AppError> {
-    if !should_sync_claude_mcp() {
-        return Ok(());
-    }
    // 读取现有的 MCP 配置
    let current = crate::claude_mcp::read_mcp_servers_map()?;

@@ -132,9 +120,6 @@ pub fn sync_single_server_to_claude(

 /// 从 Claude live 配置中移除单个 MCP 服务器
 pub fn remove_server_from_claude(id: &str) -> Result<(), AppError> {
-    if !should_sync_claude_mcp() {
-        return Ok(());
-    }
    // 读取现有的 MCP 配置
    let mut current = crate::claude_mcp::read_mcp_servers_map()?;

@@ -13,12 +13,6 @@ use crate::error::AppError;

 use super::validation::{extract_server_spec, validate_server_spec};

-fn should_sync_codex_mcp() -> bool {
-    // Codex 未安装/未初始化时：~/.codex 目录不存在。
-    // 按用户偏好：目录缺失时跳过写入/删除，不创建任何文件或目录。
-    crate::codex_config::get_codex_config_dir().exists()
-}
-
 /// 返回已启用的 MCP 服务器（过滤 enabled==true）
 fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {
    let mut out = HashMap::new();
@@ -279,9 +273,6 @@ pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError>
 /// - 仅更新 `mcp_servers` 表，保留其它键
 /// - 仅写入启用项；无启用项时清理 mcp_servers 表
 pub fn sync_enabled_to_codex(config: &MultiAppConfig) -> Result<(), AppError> {
-    if !should_sync_codex_mcp() {
-        return Ok(());
-    }
    use toml_edit::{Item, Table};

    // 1) 收集启用项（Codex 维度）
@@ -348,9 +339,6 @@ pub fn sync_single_server_to_codex(
    id: &str,
    server_spec: &Value,
 ) -> Result<(), AppError> {
-    if !should_sync_codex_mcp() {
-        return Ok(());
-    }
    use toml_edit::Item;

    // 读取现有的 config.toml
@@ -388,8 +376,7 @@ pub fn sync_single_server_to_codex(
    doc["mcp_servers"][id] = Item::Table(toml_table);

    // 写回文件
-    let new_text = doc.to_string();
-    crate::config::write_text_file(&config_path, &new_text)?;
+    std::fs::write(&config_path, doc.to_string()).map_err(|e| AppError::io(&config_path, e))?;

    Ok(())
 }
@@ -397,9 +384,6 @@ pub fn sync_single_server_to_codex(
 /// 从 Codex live 配置中移除单个 MCP 服务器
 /// 从正确的 [mcp_servers] 表中删除，同时清理可能存在于错误位置 [mcp.servers] 的数据
 pub fn remove_server_from_codex(id: &str) -> Result<(), AppError> {
-    if !should_sync_codex_mcp() {
-        return Ok(());
-    }
    let config_path = crate::codex_config::get_codex_config_path();

    if !config_path.exists() {
@@ -428,8 +412,7 @@ pub fn remove_server_from_codex(id: &str) -> Result<(), AppError> {
    }

    // 写回文件
-    let new_text = doc.to_string();
-    crate::config::write_text_file(&config_path, &new_text)?;
+    std::fs::write(&config_path, doc.to_string()).map_err(|e| AppError::io(&config_path, e))?;

    Ok(())
 }
@@ -8,12 +8,6 @@ use crate::error::AppError;

 use super::validation::{extract_server_spec, validate_server_spec};

-fn should_sync_gemini_mcp() -> bool {
-    // Gemini 未安装/未初始化时：~/.gemini 目录不存在。
-    // 按用户偏好：目录缺失时跳过写入/删除，不创建任何文件或目录。
-    crate::gemini_config::get_gemini_dir().exists()
-}
-
 /// 返回已启用的 MCP 服务器（过滤 enabled==true）
 fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {
    let mut out = HashMap::new();
@@ -39,9 +33,6 @@ fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {

 /// 将 config.json 中 Gemini 的 enabled==true 项写入 Gemini MCP 配置
 pub fn sync_enabled_to_gemini(config: &MultiAppConfig) -> Result<(), AppError> {
-    if !should_sync_gemini_mcp() {
-        return Ok(());
-    }
    let enabled = collect_enabled_servers(&config.mcp.gemini);
    crate::gemini_mcp::set_mcp_servers_map(&enabled)
 }
@@ -112,9 +103,6 @@ pub fn sync_single_server_to_gemini(
    id: &str,
    server_spec: &Value,
 ) -> Result<(), AppError> {
-    if !should_sync_gemini_mcp() {
-        return Ok(());
-    }
    // 读取现有的 MCP 配置
    let mut current = crate::gemini_mcp::read_mcp_servers_map()?;

@@ -127,9 +115,6 @@ pub fn sync_single_server_to_gemini(

 /// 从 Gemini live 配置中移除单个 MCP 服务器
 pub fn remove_server_from_gemini(id: &str) -> Result<(), AppError> {
-    if !should_sync_gemini_mcp() {
-        return Ok(());
-    }
    // 读取现有的 MCP 配置
    let mut current = crate::gemini_mcp::read_mcp_servers_map()?;

@@ -36,10 +36,10 @@ pub struct Provider {
    #[serde(skip_serializing_if = "Option::is_none")]
    #[serde(rename = "iconColor")]
    pub icon_color: Option<String>,
-    /// 是否加入故障转移队列
-    #[serde(default)]
-    #[serde(rename = "inFailoverQueue")]
-    pub in_failover_queue: bool,
+    /// 是否为代理目标（数据库专用字段，不写入配置文件）
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "isProxyTarget")]
+    pub is_proxy_target: Option<bool>,
 }

 impl Provider {
@@ -62,7 +62,7 @@ impl Provider {
            meta: None,
            icon: None,
            icon_color: None,
-            in_failover_queue: false,
+            is_proxy_target: None,
        }
    }
 }
@@ -72,20 +72,8 @@ pub struct CircuitBreaker {
    failed_requests: Arc<AtomicU32>,
    /// 上次打开时间
    last_opened_at: Arc<RwLock<Option<Instant>>>,
-    /// 配置（支持热更新）
-    config: Arc<RwLock<CircuitBreakerConfig>>,
-    /// 半开状态已放行的请求数（用于限流）
-    half_open_requests: Arc<AtomicU32>,
-}
-
-/// 熔断器放行结果
-///
-/// `used_half_open_permit` 表示本次放行是否占用了 HalfOpen 探测名额。
-/// 调用方应在请求结束后把该值传回 `record_success` / `record_failure` 用于正确释放名额。
-#[derive(Debug, Clone, Copy)]
-pub struct AllowResult {
-    pub allowed: bool,
-    pub used_half_open_permit: bool,
+    /// 配置
+    config: CircuitBreakerConfig,
 }

 impl CircuitBreaker {
@@ -98,35 +86,20 @@ impl CircuitBreaker {
            total_requests: Arc::new(AtomicU32::new(0)),
            failed_requests: Arc::new(AtomicU32::new(0)),
            last_opened_at: Arc::new(RwLock::new(None)),
-            config: Arc::new(RwLock::new(config)),
-            half_open_requests: Arc::new(AtomicU32::new(0)),
+            config,
        }
    }

-    /// 更新熔断器配置（热更新，不重置状态）
-    pub async fn update_config(&self, new_config: CircuitBreakerConfig) {
-        *self.config.write().await = new_config;
-        log::debug!("Circuit breaker config updated");
-    }
-
-    /// 判断当前 Provider 是否“可被纳入候选链路”
-    ///
-    /// 这个方法不会占用 HalfOpen 探测名额，仅用于路由选择阶段的“可用性判断”：
-    /// - Closed / HalfOpen：可用（返回 true）
-    /// - Open：若超时到达则切到 HalfOpen 并返回 true，否则返回 false
-    ///
-    /// 注意：真正发起请求前仍需调用 `allow_request()` 来获取 HalfOpen 探测名额，
-    /// 并在请求结束后通过 `record_success()` / `record_failure()` 释放。
-    pub async fn is_available(&self) -> bool {
+    /// 检查是否允许请求通过
+    pub async fn allow_request(&self) -> bool {
        let state = *self.state.read().await;
-        let config = self.config.read().await;

        match state {
-            CircuitState::Closed | CircuitState::HalfOpen => true,
+            CircuitState::Closed => true,
            CircuitState::Open => {
+                // 检查是否应该尝试半开
                if let Some(opened_at) = *self.last_opened_at.read().await {
-                    if opened_at.elapsed().as_secs() >= config.timeout_seconds {
-                        drop(config); // 释放读锁再转换状态
+                    if opened_at.elapsed().as_secs() >= self.config.timeout_seconds {
                        log::info!(
                            "Circuit breaker transitioning from Open to HalfOpen (timeout reached)"
                        );
@@ -136,62 +109,13 @@ impl CircuitBreaker {
                }
                false
            }
-        }
-    }
-
-    /// 检查是否允许请求通过
-    pub async fn allow_request(&self) -> AllowResult {
-        let state = *self.state.read().await;
-
-        match state {
-            CircuitState::Closed => AllowResult {
-                allowed: true,
-                used_half_open_permit: false,
-            },
-            CircuitState::Open => {
-                let config = self.config.read().await;
-                // 检查是否应该尝试半开
-                if let Some(opened_at) = *self.last_opened_at.read().await {
-                    if opened_at.elapsed().as_secs() >= config.timeout_seconds {
-                        drop(config); // 释放读锁再转换状态
-                        log::info!(
-                            "Circuit breaker transitioning from Open to HalfOpen (timeout reached)"
-                        );
-                        self.transition_to_half_open().await;
-
-                        // 转换后按当前状态决定是否需要获取 HalfOpen 探测名额
-                        let current_state = *self.state.read().await;
-                        return match current_state {
-                            CircuitState::Closed => AllowResult {
-                                allowed: true,
-                                used_half_open_permit: false,
-                            },
-                            CircuitState::HalfOpen => self.allow_half_open_probe(),
-                            CircuitState::Open => AllowResult {
-                                allowed: false,
-                                used_half_open_permit: false,
-                            },
-                        };
-                    }
-                }
-
-                AllowResult {
-                    allowed: false,
-                    used_half_open_permit: false,
-                }
-            }
-            CircuitState::HalfOpen => self.allow_half_open_probe(),
+            CircuitState::HalfOpen => true,
        }
    }

    /// 记录成功
-    pub async fn record_success(&self, used_half_open_permit: bool) {
+    pub async fn record_success(&self) {
        let state = *self.state.read().await;
-        let config = self.config.read().await;
-
-        if used_half_open_permit {
-            self.release_half_open_permit();
-        }

        // 重置失败计数
        self.consecutive_failures.store(0, Ordering::SeqCst);
@@ -203,11 +127,10 @@ impl CircuitBreaker {
                log::debug!(
                    "Circuit breaker HalfOpen: {} consecutive successes (threshold: {})",
                    successes,
-                    config.success_threshold
+                    self.config.success_threshold
                );

-                if successes >= config.success_threshold {
-                    drop(config); // 释放读锁再转换状态
+                if successes >= self.config.success_threshold {
                    log::info!("Circuit breaker transitioning from HalfOpen to Closed (success threshold reached)");
                    self.transition_to_closed().await;
                }
@@ -220,13 +143,8 @@ impl CircuitBreaker {
    }

    /// 记录失败
-    pub async fn record_failure(&self, used_half_open_permit: bool) {
+    pub async fn record_failure(&self) {
        let state = *self.state.read().await;
-        let config = self.config.read().await;
-
-        if used_half_open_permit {
-            self.release_half_open_permit();
-        }

        // 更新计数器
        let failures = self.consecutive_failures.fetch_add(1, Ordering::SeqCst) + 1;
@@ -240,33 +158,26 @@ impl CircuitBreaker {
            "Circuit breaker {:?}: {} consecutive failures (threshold: {})",
            state,
            failures,
-            config.failure_threshold
+            self.config.failure_threshold
        );

        // 检查是否应该打开熔断器
        match state {
-            CircuitState::HalfOpen => {
-                // HalfOpen 状态下失败，立即转为 Open
-                log::warn!("Circuit breaker HalfOpen probe failed, transitioning to Open");
-                drop(config);
-                self.transition_to_open().await;
-            }
-            CircuitState::Closed => {
+            CircuitState::Closed | CircuitState::HalfOpen => {
                // 检查连续失败次数
-                if failures >= config.failure_threshold {
+                if failures >= self.config.failure_threshold {
                    log::warn!(
                        "Circuit breaker opening due to {} consecutive failures (threshold: {})",
                        failures,
-                        config.failure_threshold
+                        self.config.failure_threshold
                    );
-                    drop(config); // 释放读锁再转换状态
                    self.transition_to_open().await;
                } else {
                    // 检查错误率
                    let total = self.total_requests.load(Ordering::SeqCst);
                    let failed = self.failed_requests.load(Ordering::SeqCst);

-                    if total >= config.min_requests {
+                    if total >= self.config.min_requests {
                        let error_rate = failed as f64 / total as f64;
                        log::debug!(
                            "Circuit breaker error rate: {:.2}% ({}/{} requests)",
@@ -275,13 +186,12 @@ impl CircuitBreaker {
                            total
                        );

-                        if error_rate >= config.error_rate_threshold {
+                        if error_rate >= self.config.error_rate_threshold {
                            log::warn!(
                                "Circuit breaker opening due to high error rate: {:.2}% (threshold: {:.2}%)",
                                error_rate * 100.0,
-                                config.error_rate_threshold * 100.0
+                                self.config.error_rate_threshold * 100.0
                            );
-                            drop(config); // 释放读锁再转换状态
                            self.transition_to_open().await;
                        }
                    }
@@ -292,7 +202,6 @@ impl CircuitBreaker {
    }

    /// 获取当前状态
-    #[allow(dead_code)]
    pub async fn get_state(&self) -> CircuitState {
        *self.state.read().await
    }
@@ -316,56 +225,6 @@ impl CircuitBreaker {
        self.transition_to_closed().await;
    }

-    fn allow_half_open_probe(&self) -> AllowResult {
-        // 半开状态限流：只允许有限请求通过进行探测
-        // 默认最多允许 1 个请求（可在配置中扩展）
-        let max_half_open_requests = 1u32;
-        let current = self.half_open_requests.fetch_add(1, Ordering::SeqCst);
-
-        if current < max_half_open_requests {
-            log::debug!(
-                "Circuit breaker HalfOpen: allowing probe request ({}/{})",
-                current + 1,
-                max_half_open_requests
-            );
-            AllowResult {
-                allowed: true,
-                used_half_open_permit: true,
-            }
-        } else {
-            // 超过限额，回退计数，拒绝请求
-            self.half_open_requests.fetch_sub(1, Ordering::SeqCst);
-            log::debug!(
-                "Circuit breaker HalfOpen: rejecting request (limit reached: {max_half_open_requests})"
-            );
-            AllowResult {
-                allowed: false,
-                used_half_open_permit: false,
-            }
-        }
-    }
-
-    fn release_half_open_permit(&self) {
-        let mut current = self.half_open_requests.load(Ordering::SeqCst);
-        loop {
-            if current == 0 {
-                // 理论上不应该发生：说明调用方传入的 used_half_open_permit 与实际占用不一致
-                log::debug!("Circuit breaker HalfOpen permit already released (counter=0)");
-                return;
-            }
-
-            match self.half_open_requests.compare_exchange(
-                current,
-                current - 1,
-                Ordering::SeqCst,
-                Ordering::SeqCst,
-            ) {
-                Ok(_) => return,
-                Err(actual) => current = actual,
-            }
-        }
-    }
-
    /// 转换到打开状态
    async fn transition_to_open(&self) {
        *self.state.write().await = CircuitState::Open;
@@ -376,15 +235,8 @@ impl CircuitBreaker {

    /// 转换到半开状态
    async fn transition_to_half_open(&self) {
-        let mut state = self.state.write().await;
-        if *state != CircuitState::Open {
-            return;
-        }
-
-        *state = CircuitState::HalfOpen;
+        *self.state.write().await = CircuitState::HalfOpen;
        self.consecutive_successes.store(0, Ordering::SeqCst);
-        // 重置半开状态的请求限流计数
-        self.half_open_requests.store(0, Ordering::SeqCst);
    }

    /// 转换到关闭状态
@@ -423,16 +275,16 @@ mod tests {

        // 初始状态应该是关闭
        assert_eq!(breaker.get_state().await, CircuitState::Closed);
-        assert!(breaker.allow_request().await.allowed);
+        assert!(breaker.allow_request().await);

        // 记录 3 次失败
        for _ in 0..3 {
-            breaker.record_failure(false).await;
+            breaker.record_failure().await;
        }

        // 应该转换到打开状态
        assert_eq!(breaker.get_state().await, CircuitState::Open);
-        assert!(!breaker.allow_request().await.allowed);
+        assert!(!breaker.allow_request().await);
    }

    #[tokio::test]
@@ -445,8 +297,8 @@ mod tests {
        let breaker = CircuitBreaker::new(config);

        // 打开熔断器
-        breaker.record_failure(false).await;
-        breaker.record_failure(false).await;
+        breaker.record_failure().await;
+        breaker.record_failure().await;
        assert_eq!(breaker.get_state().await, CircuitState::Open);

        // 手动转换到半开状态
@@ -454,37 +306,13 @@ mod tests {
        assert_eq!(breaker.get_state().await, CircuitState::HalfOpen);

        // 记录 2 次成功
-        breaker.record_success(false).await;
-        breaker.record_success(false).await;
+        breaker.record_success().await;
+        breaker.record_success().await;

        // 应该转换到关闭状态
        assert_eq!(breaker.get_state().await, CircuitState::Closed);
    }

-    #[tokio::test]
-    async fn test_half_open_transition_does_not_reset_inflight_permit() {
-        let config = CircuitBreakerConfig {
-            timeout_seconds: 0,
-            ..Default::default()
-        };
-        let breaker = CircuitBreaker::new(config);
-
-        // 进入 Open，然后由于 timeout_seconds=0，allow_request 会立即切换到 HalfOpen 并占用探测名额
-        breaker.transition_to_open().await;
-        let first = breaker.allow_request().await;
-        assert!(first.allowed);
-        assert!(first.used_half_open_permit);
-        assert_eq!(breaker.get_state().await, CircuitState::HalfOpen);
-
-        // 模拟并发下的“重复 HalfOpen 转换调用”，不应重置 in-flight 计数
-        breaker.transition_to_half_open().await;
-
-        // 由于名额仍被占用，第二次请求应被拒绝
-        let second = breaker.allow_request().await;
-        assert!(!second.allowed);
-        assert!(!second.used_half_open_permit);
-    }
-
    #[tokio::test]
    async fn test_circuit_breaker_reset() {
        let config = CircuitBreakerConfig {
@@ -494,13 +322,13 @@ mod tests {
        let breaker = CircuitBreaker::new(config);

        // 打开熔断器
-        breaker.record_failure(false).await;
-        breaker.record_failure(false).await;
+        breaker.record_failure().await;
+        breaker.record_failure().await;
        assert_eq!(breaker.get_state().await, CircuitState::Open);

        // 重置
        breaker.reset().await;
        assert_eq!(breaker.get_state().await, CircuitState::Closed);
-        assert!(breaker.allow_request().await.allowed);
+        assert!(breaker.allow_request().await);
    }
 }
@@ -1,110 +0,0 @@
-//! 错误类型到 HTTP 状态码的映射
-//!
-//! 将 ProxyError 映射到合适的 HTTP 状态码，用于日志记录
-
-use super::ProxyError;
-
-/// 将 ProxyError 映射到 HTTP 状态码
-///
-/// 映射规则：
-/// - 上游错误：直接使用上游返回的状态码
-/// - 超时：504 Gateway Timeout
-/// - 连接失败：502 Bad Gateway
-/// - 无可用 Provider：503 Service Unavailable
-/// - 重试耗尽：503 Service Unavailable
-/// - 其他错误：500 Internal Server Error
-pub fn map_proxy_error_to_status(error: &ProxyError) -> u16 {
-    match error {
-        // 上游错误：使用实际状态码
-        ProxyError::UpstreamError { status, .. } => *status,
-
-        // 超时错误：504 Gateway Timeout
-        ProxyError::Timeout(_) => 504,
-
-        // 转发失败/连接失败：502 Bad Gateway
-        ProxyError::ForwardFailed(_) => 502,
-
-        // 无可用 Provider：503 Service Unavailable
-        ProxyError::NoAvailableProvider => 503,
-
-        // 重试耗尽：503 Service Unavailable
-        ProxyError::MaxRetriesExceeded => 503,
-
-        // Provider 不健康：503 Service Unavailable
-        ProxyError::ProviderUnhealthy(_) => 503,
-
-        // 数据库错误：500 Internal Server Error
-        ProxyError::DatabaseError(_) => 500,
-
-        // 转换错误：500 Internal Server Error
-        ProxyError::TransformError(_) => 500,
-
-        // 其他未知错误：500 Internal Server Error
-        _ => 500,
-    }
-}
-
-/// 将 ProxyError 转换为用户友好的错误消息
-pub fn get_error_message(error: &ProxyError) -> String {
-    match error {
-        ProxyError::UpstreamError { status, body } => {
-            if let Some(body) = body {
-                format!("上游错误 ({status}): {body}")
-            } else {
-                format!("上游错误 ({status})")
-            }
-        }
-        ProxyError::Timeout(msg) => format!("请求超时: {msg}"),
-        ProxyError::ForwardFailed(msg) => format!("转发失败: {msg}"),
-        ProxyError::NoAvailableProvider => "无可用 Provider".to_string(),
-        ProxyError::MaxRetriesExceeded => "所有 Provider 都失败，重试耗尽".to_string(),
-        ProxyError::ProviderUnhealthy(msg) => format!("Provider 不健康: {msg}"),
-        ProxyError::DatabaseError(msg) => format!("数据库错误: {msg}"),
-        ProxyError::TransformError(msg) => format!("请求/响应转换错误: {msg}"),
-        _ => error.to_string(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_map_upstream_error() {
-        let error = ProxyError::UpstreamError {
-            status: 401,
-            body: Some("Unauthorized".to_string()),
-        };
-        assert_eq!(map_proxy_error_to_status(&error), 401);
-    }
-
-    #[test]
-    fn test_map_timeout_error() {
-        let error = ProxyError::Timeout("Request timeout".to_string());
-        assert_eq!(map_proxy_error_to_status(&error), 504);
-    }
-
-    #[test]
-    fn test_map_connection_error() {
-        let error = ProxyError::ForwardFailed("Connection refused".to_string());
-        assert_eq!(map_proxy_error_to_status(&error), 502);
-    }
-
-    #[test]
-    fn test_map_no_provider_error() {
-        let error = ProxyError::NoAvailableProvider;
-        assert_eq!(map_proxy_error_to_status(&error), 503);
-    }
-
-    #[test]
-    fn test_get_error_message() {
-        let error = ProxyError::UpstreamError {
-            status: 500,
-            body: Some("Internal Server Error".to_string()),
-        };
-        let msg = get_error_message(&error);
-        assert!(msg.contains("上游错误"));
-        assert!(msg.contains("500"));
-        assert!(msg.contains("Internal Server Error"));
-    }
-}
@@ -1,134 +0,0 @@
-//! 故障转移切换模块
-//!
-//! 处理故障转移成功后的供应商切换逻辑，包括：
-//! - 去重控制（避免多个请求同时触发）
-//! - 数据库更新
-//! - 托盘菜单更新
-//! - 前端事件发射
-//! - Live 备份更新
-
-use crate::database::Database;
-use crate::error::AppError;
-use std::collections::HashSet;
-use std::str::FromStr;
-use std::sync::Arc;
-use tauri::{Emitter, Manager};
-use tokio::sync::RwLock;
-
-/// 故障转移切换管理器
-///
-/// 负责处理故障转移成功后的供应商切换，确保 UI 能够直观反映当前使用的供应商。
-#[derive(Clone)]
-pub struct FailoverSwitchManager {
-    /// 正在处理中的切换（key = "app_type:provider_id"）
-    pending_switches: Arc<RwLock<HashSet<String>>>,
-    db: Arc<Database>,
-}
-
-impl FailoverSwitchManager {
-    pub fn new(db: Arc<Database>) -> Self {
-        Self {
-            pending_switches: Arc::new(RwLock::new(HashSet::new())),
-            db,
-        }
-    }
-
-    /// 尝试执行故障转移切换
-    ///
-    /// 如果相同的切换已在进行中，则跳过；否则执行切换逻辑。
-    ///
-    /// # Returns
-    /// - `Ok(true)` - 切换成功执行
-    /// - `Ok(false)` - 切换已在进行中，跳过
-    /// - `Err(e)` - 切换过程中发生错误
-    pub async fn try_switch(
-        &self,
-        app_handle: Option<&tauri::AppHandle>,
-        app_type: &str,
-        provider_id: &str,
-        provider_name: &str,
-    ) -> Result<bool, AppError> {
-        let switch_key = format!("{app_type}:{provider_id}");
-
-        // 去重检查：如果相同切换已在进行中，跳过
-        {
-            let mut pending = self.pending_switches.write().await;
-            if pending.contains(&switch_key) {
-                log::debug!("[Failover] 切换已在进行中，跳过: {app_type} -> {provider_id}");
-                return Ok(false);
-            }
-            pending.insert(switch_key.clone());
-        }
-
-        // 执行切换（确保最后清理 pending 标记）
-        let result = self
-            .do_switch(app_handle, app_type, provider_id, provider_name)
-            .await;
-
-        // 清理 pending 标记
-        {
-            let mut pending = self.pending_switches.write().await;
-            pending.remove(&switch_key);
-        }
-
-        result
-    }
-
-    async fn do_switch(
-        &self,
-        app_handle: Option<&tauri::AppHandle>,
-        app_type: &str,
-        provider_id: &str,
-        provider_name: &str,
-    ) -> Result<bool, AppError> {
-        log::info!("[Failover] 开始切换供应商: {app_type} -> {provider_name} ({provider_id})");
-
-        // 1. 更新数据库 is_current
-        self.db.set_current_provider(app_type, provider_id)?;
-
-        // 2. 更新本地 settings（设备级）
-        let app_type_enum = crate::app_config::AppType::from_str(app_type)
-            .map_err(|_| AppError::Message(format!("无效的应用类型: {app_type}")))?;
-        crate::settings::set_current_provider(&app_type_enum, Some(provider_id))?;
-
-        // 3. 更新托盘菜单和发射事件
-        if let Some(app) = app_handle {
-            // 更新托盘菜单
-            if let Some(app_state) = app.try_state::<crate::store::AppState>() {
-                // 更新 Live 备份（确保代理停止时恢复正确配置）
-                if let Ok(Some(provider)) = self.db.get_provider_by_id(provider_id, app_type) {
-                    if let Err(e) = app_state
-                        .proxy_service
-                        .update_live_backup_from_provider(app_type, &provider)
-                        .await
-                    {
-                        log::warn!("[Failover] 更新 Live 备份失败: {e}");
-                    }
-                }
-
-                // 重建托盘菜单
-                if let Ok(new_menu) = crate::tray::create_tray_menu(app, app_state.inner()) {
-                    if let Some(tray) = app.tray_by_id("main") {
-                        if let Err(e) = tray.set_menu(Some(new_menu)) {
-                            log::error!("[Failover] 更新托盘菜单失败: {e}");
-                        }
-                    }
-                }
-            }
-
-            // 发射事件到前端
-            let event_data = serde_json::json!({
-                "appType": app_type,
-                "providerId": provider_id,
-                "source": "failover"  // 标识来源是故障转移
-            });
-            if let Err(e) = app.emit("provider-switched", event_data) {
-                log::error!("[Failover] 发射供应商切换事件失败: {e}");
-            }
-        }
-
-        log::info!("[Failover] 供应商切换完成: {app_type} -> {provider_name} ({provider_id})");
-
-        Ok(true)
-    }
-}
@@ -4,56 +4,34 @@

 use super::{
    error::*,
-    failover_switch::FailoverSwitchManager,
-    provider_router::ProviderRouter,
+    provider_router::ProviderRouter as NewProviderRouter,
    providers::{get_adapter, ProviderAdapter},
    types::ProxyStatus,
    ProxyError,
 };
-use crate::{app_config::AppType, provider::Provider};
+use crate::{app_config::AppType, database::Database, provider::Provider};
 use reqwest::{Client, Response};
 use serde_json::Value;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use tokio::sync::RwLock;

-pub struct ForwardResult {
-    pub response: Response,
-    pub provider: Provider,
-}
-
-pub struct ForwardError {
-    pub error: ProxyError,
-    pub provider: Option<Provider>,
-}
-
 pub struct RequestForwarder {
    client: Client,
-    /// 共享的 ProviderRouter（持有熔断器状态）
-    router: Arc<ProviderRouter>,
-    /// 单个 Provider 内的最大重试次数
+    router: Arc<NewProviderRouter>,
+    #[allow(dead_code)]
    max_retries: u8,
    status: Arc<RwLock<ProxyStatus>>,
    current_providers: Arc<RwLock<std::collections::HashMap<String, (String, String)>>>,
-    /// 故障转移切换管理器
-    failover_manager: Arc<FailoverSwitchManager>,
-    /// AppHandle，用于发射事件和更新托盘
-    app_handle: Option<tauri::AppHandle>,
-    /// 请求开始时的“当前供应商 ID”（用于判断是否需要同步 UI/托盘）
-    current_provider_id_at_start: String,
 }

 impl RequestForwarder {
-    #[allow(clippy::too_many_arguments)]
    pub fn new(
-        router: Arc<ProviderRouter>,
+        db: Arc<Database>,
        timeout_secs: u64,
        max_retries: u8,
        status: Arc<RwLock<ProxyStatus>>,
        current_providers: Arc<RwLock<std::collections::HashMap<String, (String, String)>>>,
-        failover_manager: Arc<FailoverSwitchManager>,
-        app_handle: Option<tauri::AppHandle>,
-        current_provider_id_at_start: String,
    ) -> Self {
        let mut client_builder = Client::builder();
        if timeout_secs > 0 {
@@ -66,94 +44,34 @@ impl RequestForwarder {

        Self {
            client,
-            router,
+            router: Arc::new(NewProviderRouter::new(db)),
            max_retries,
            status,
            current_providers,
-            failover_manager,
-            app_handle,
-            current_provider_id_at_start,
        }
    }

-    /// 对单个 Provider 执行请求（带重试）
-    ///
-    /// 在同一个 Provider 上最多重试 max_retries 次，使用指数退避
-    async fn forward_with_provider_retry(
-        &self,
-        provider: &Provider,
-        endpoint: &str,
-        body: &Value,
-        headers: &axum::http::HeaderMap,
-        adapter: &dyn ProviderAdapter,
-    ) -> Result<Response, ProxyError> {
-        let mut last_error = None;
-
-        for attempt in 0..=self.max_retries {
-            if attempt > 0 {
-                // 指数退避：100ms, 200ms, 400ms, ...
-                let delay_ms = 100 * 2u64.pow(attempt as u32 - 1);
-                log::info!(
-                    "[{}] 重试第 {}/{} 次（等待 {}ms）",
-                    adapter.name(),
-                    attempt,
-                    self.max_retries,
-                    delay_ms
-                );
-                tokio::time::sleep(Duration::from_millis(delay_ms)).await;
-            }
-
-            match self
-                .forward(provider, endpoint, body, headers, adapter)
-                .await
-            {
-                Ok(response) => return Ok(response),
-                Err(e) => {
-                    // 只有“同一 Provider 内可重试”的错误才继续重试
-                    if !self.should_retry_same_provider(&e) {
-                        return Err(e);
-                    }
-
-                    log::debug!(
-                        "[{}] Provider {} 第 {} 次请求失败: {}",
-                        adapter.name(),
-                        provider.name,
-                        attempt + 1,
-                        e
-                    );
-                    last_error = Some(e);
-                }
-            }
-        }
-
-        Err(last_error.unwrap_or(ProxyError::MaxRetriesExceeded))
-    }
-
    /// 转发请求（带故障转移）
-    ///
-    /// # Arguments
-    /// * `app_type` - 应用类型
-    /// * `endpoint` - API 端点
-    /// * `body` - 请求体
-    /// * `headers` - 请求头
-    /// * `providers` - 已选择的 Provider 列表（由 RequestContext 提供，避免重复调用 select_providers）
    pub async fn forward_with_retry(
        &self,
        app_type: &AppType,
        endpoint: &str,
        body: Value,
        headers: axum::http::HeaderMap,
-        providers: Vec<Provider>,
-    ) -> Result<ForwardResult, ForwardError> {
+    ) -> Result<Response, ProxyError> {
        // 获取适配器
        let adapter = get_adapter(app_type);
        let app_type_str = app_type.as_str();

+        // 使用新的 ProviderRouter 选择所有可用供应商
+        let providers = self
+            .router
+            .select_providers(app_type_str)
+            .await
+            .map_err(|e| ProxyError::DatabaseError(e.to_string()))?;
+
        if providers.is_empty() {
-            return Err(ForwardError {
-                error: ProxyError::NoAvailableProvider,
-                provider: None,
-            });
+            return Err(ProxyError::NoAvailableProvider);
        }

        log::info!(
@@ -163,33 +81,14 @@ impl RequestForwarder {
        );

        let mut last_error = None;
-        let mut last_provider = None;
-        let mut attempted_providers = 0usize;
+        let mut failover_happened = false;

        // 依次尝试每个供应商
-        for provider in providers.iter() {
-            // 发起请求前先获取熔断器放行许可（HalfOpen 会占用探测名额）
-            let permit = self
-                .router
-                .allow_provider_request(&provider.id, app_type_str)
-                .await;
-            if !permit.allowed {
-                log::debug!(
-                    "[{}] Provider {} 熔断器拒绝本次请求，跳过",
-                    app_type_str,
-                    provider.name
-                );
-                continue;
-            }
-
-            let used_half_open_permit = permit.used_half_open_permit;
-
-            attempted_providers += 1;
-
+        for (attempt, provider) in providers.iter().enumerate() {
            log::info!(
                "[{}] 尝试 {}/{} - 使用Provider: {} (sort_index: {})",
                app_type_str,
-                attempted_providers,
+                attempt + 1,
                providers.len(),
                provider.name,
                provider.sort_index.unwrap_or(999999)
@@ -202,13 +101,16 @@ impl RequestForwarder {
                status.current_provider_id = Some(provider.id.clone());
                status.total_requests += 1;
                status.last_request_at = Some(chrono::Utc::now().to_rfc3339());
+                if attempt > 0 {
+                    failover_happened = true;
+                }
            }

            let start = Instant::now();

-            // 转发请求（带单 Provider 内重试）
+            // 转发请求
            match self
-                .forward_with_provider_retry(provider, endpoint, &body, &headers, adapter.as_ref())
+                .forward(provider, endpoint, &body, &headers, adapter.as_ref())
                .await
            {
                Ok(response) => {
@@ -217,13 +119,7 @@ impl RequestForwarder {
                    // 成功：记录成功并更新熔断器
                    if let Err(e) = self
                        .router
-                        .record_result(
-                            &provider.id,
-                            app_type_str,
-                            used_half_open_permit,
-                            true,
-                            None,
-                        )
+                        .record_result(&provider.id, app_type_str, true, None)
                        .await
                    {
                        log::warn!("Failed to record success: {e}");
@@ -243,30 +139,14 @@ impl RequestForwarder {
                        let mut status = self.status.write().await;
                        status.success_requests += 1;
                        status.last_error = None;
-                        let should_switch =
-                            self.current_provider_id_at_start.as_str() != provider.id.as_str();
-                        if should_switch {
+                        if failover_happened {
                            status.failover_count += 1;
                            log::info!(
-                                "[{}] 代理目标已切换到 Provider: {} (耗时: {}ms)",
+                                "[{}] 故障转移成功！切换到 Provider: {} (耗时: {}ms)",
                                app_type_str,
                                provider.name,
                                latency
                            );
-
-                            // 异步触发供应商切换，更新 UI/托盘，并把“当前供应商”同步为实际使用的 provider
-                            let fm = self.failover_manager.clone();
-                            let ah = self.app_handle.clone();
-                            let pid = provider.id.clone();
-                            let pname = provider.name.clone();
-                            let at = app_type_str.to_string();
-
-                            tokio::spawn(async move {
-                                if let Err(e) = fm.try_switch(ah.as_ref(), &at, &pid, &pname).await
-                                {
-                                    log::error!("[Failover] 切换供应商失败: {e}");
-                                }
-                            });
                        }
                        // 重新计算成功率
                        if status.total_requests > 0 {
@@ -283,10 +163,7 @@ impl RequestForwarder {
                        latency
                    );

-                    return Ok(ForwardResult {
-                        response,
-                        provider: provider.clone(),
-                    });
+                    return Ok(response);
                }
                Err(e) => {
                    let latency = start.elapsed().as_millis() as u64;
@@ -294,13 +171,7 @@ impl RequestForwarder {
                    // 失败：记录失败并更新熔断器
                    if let Err(record_err) = self
                        .router
-                        .record_result(
-                            &provider.id,
-                            app_type_str,
-                            used_half_open_permit,
-                            false,
-                            Some(e.to_string()),
-                        )
+                        .record_result(&provider.id, app_type_str, false, Some(e.to_string()))
                        .await
                    {
                        log::warn!("Failed to record failure: {record_err}");
@@ -327,7 +198,6 @@ impl RequestForwarder {
                            );

                            last_error = Some(e);
-                            last_provider = Some(provider.clone());
                            // 继续尝试下一个供应商
                            continue;
                        }
@@ -349,33 +219,13 @@ impl RequestForwarder {
                                provider.name,
                                e
                            );
-                            return Err(ForwardError {
-                                error: e,
-                                provider: Some(provider.clone()),
-                            });
+                            return Err(e);
                        }
                    }
                }
            }
        }

-        if attempted_providers == 0 {
-            // providers 列表非空，但全部被熔断器拒绝（典型：HalfOpen 探测名额被占用）
-            {
-                let mut status = self.status.write().await;
-                status.failed_requests += 1;
-                status.last_error = Some("所有供应商暂时不可用（熔断器限制）".to_string());
-                if status.total_requests > 0 {
-                    status.success_rate =
-                        (status.success_requests as f32 / status.total_requests as f32) * 100.0;
-                }
-            }
-            return Err(ForwardError {
-                error: ProxyError::NoAvailableProvider,
-                provider: None,
-            });
-        }
-
        // 所有供应商都失败了
        {
            let mut status = self.status.write().await;
@@ -393,10 +243,7 @@ impl RequestForwarder {
            providers.len()
        );

-        Err(ForwardError {
-            error: last_error.unwrap_or(ProxyError::MaxRetriesExceeded),
-            provider: last_provider,
-        })
+        Err(last_error.unwrap_or(ProxyError::MaxRetriesExceeded))
    }

    /// 转发单个请求（使用适配器）
@@ -526,43 +373,21 @@ impl RequestForwarder {
    }

    /// 分类ProxyError
-    ///
-    /// 决定哪些错误应该触发故障转移到下一个 Provider
-    ///
-    /// 设计原则：既然用户配置了多个供应商，就应该让所有供应商都尝试一遍。
-    /// 只有明确是客户端中断的情况才不重试。
-    fn should_retry_same_provider(&self, error: &ProxyError) -> bool {
-        match error {
-            // 网络类错误：短暂抖动时同一 Provider 内重试有意义
-            ProxyError::Timeout(_) => true,
-            ProxyError::ForwardFailed(_) => true,
-            // 上游 HTTP 错误：只对“可能瞬态”的状态码做同 Provider 重试（其余交给 failover）
-            ProxyError::UpstreamError { status, .. } => {
-                *status == 408 || *status == 429 || *status >= 500
-            }
-            _ => false,
-        }
-    }
-
    fn categorize_proxy_error(&self, error: &ProxyError) -> ErrorCategory {
        match error {
-            // 网络和上游错误：都应该尝试下一个供应商
            ProxyError::Timeout(_) => ErrorCategory::Retryable,
            ProxyError::ForwardFailed(_) => ErrorCategory::Retryable,
+            ProxyError::UpstreamError { status, .. } => {
+                if *status >= 500 {
+                    ErrorCategory::Retryable
+                } else if *status >= 400 && *status < 500 {
+                    ErrorCategory::NonRetryable
+                } else {
+                    ErrorCategory::Retryable
+                }
+            }
            ProxyError::ProviderUnhealthy(_) => ErrorCategory::Retryable,
-            // 上游 HTTP 错误：无论状态码如何，都尝试下一个供应商
-            // 原因：不同供应商有不同的限制和认证，一个供应商的 4xx 错误
-            // 不代表其他供应商也会失败
-            ProxyError::UpstreamError { .. } => ErrorCategory::Retryable,
-            // Provider 级配置/转换问题：换一个 Provider 可能就能成功
-            ProxyError::ConfigError(_) => ErrorCategory::Retryable,
-            ProxyError::TransformError(_) => ErrorCategory::Retryable,
-            ProxyError::AuthError(_) => ErrorCategory::Retryable,
-            ProxyError::StreamIdleTimeout(_) => ErrorCategory::Retryable,
-            ProxyError::MaxRetriesExceeded => ErrorCategory::Retryable,
-            // 无可用供应商：所有供应商都试过了，无法重试
            ProxyError::NoAvailableProvider => ErrorCategory::NonRetryable,
-            // 其他错误（数据库/内部错误等）：不是换供应商能解决的问题
            _ => ErrorCategory::NonRetryable,
        }
    }
@@ -1,164 +0,0 @@
-//! Handler 配置模块
-//!
-//! 定义各 API 处理器的配置结构和使用量解析器
-
-use crate::app_config::AppType;
-use crate::proxy::usage::parser::TokenUsage;
-use serde_json::Value;
-
-/// 使用量解析器类型别名
-pub type StreamUsageParser = fn(&[Value]) -> Option<TokenUsage>;
-pub type ResponseUsageParser = fn(&Value) -> Option<TokenUsage>;
-
-/// 模型提取器类型别名
-/// 参数: (流式事件列表, 请求中的模型名称) -> 最终使用的模型名称
-pub type StreamModelExtractor = fn(&[Value], &str) -> String;
-
-/// 各 API 的使用量解析配置
-#[derive(Clone, Copy)]
-pub struct UsageParserConfig {
-    /// 流式响应解析器
-    pub stream_parser: StreamUsageParser,
-    /// 非流式响应解析器
-    pub response_parser: ResponseUsageParser,
-    /// 流式响应中的模型提取器
-    pub model_extractor: StreamModelExtractor,
-    /// 应用类型字符串（用于日志记录）
-    pub app_type_str: &'static str,
-}
-
-// ============================================================================
-// 模型提取器实现
-// ============================================================================
-
-/// Claude 流式响应模型提取（直接使用请求模型）
-fn claude_model_extractor(_events: &[Value], request_model: &str) -> String {
-    request_model.to_string()
-}
-
-/// OpenAI Chat Completions 流式响应模型提取
-fn openai_model_extractor(events: &[Value], request_model: &str) -> String {
-    events
-        .iter()
-        .find_map(|e| e.get("model")?.as_str())
-        .unwrap_or(request_model)
-        .to_string()
-}
-
-/// Codex Responses API 流式响应模型提取
-fn codex_model_extractor(events: &[Value], request_model: &str) -> String {
-    events
-        .iter()
-        .find_map(|e| {
-            if e.get("type")?.as_str()? == "response.completed" {
-                e.get("response")?.get("model")?.as_str()
-            } else {
-                None
-            }
-        })
-        .unwrap_or(request_model)
-        .to_string()
-}
-
-/// Gemini 流式响应模型提取（优先使用 usage.model）
-fn gemini_model_extractor(events: &[Value], request_model: &str) -> String {
-    // 首先尝试从解析的 usage 中获取模型
-    if let Some(usage) = TokenUsage::from_gemini_stream_chunks(events) {
-        if let Some(model) = usage.model {
-            return model;
-        }
-    }
-    request_model.to_string()
-}
-
-// ============================================================================
-// 预定义配置
-// ============================================================================
-
-/// Claude API 解析配置
-pub const CLAUDE_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
-    stream_parser: TokenUsage::from_claude_stream_events,
-    response_parser: TokenUsage::from_claude_response,
-    model_extractor: claude_model_extractor,
-    app_type_str: "claude",
-};
-
-/// OpenAI Chat Completions API 解析配置（用于 Codex /v1/chat/completions）
-pub const OPENAI_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
-    stream_parser: TokenUsage::from_openai_stream_events,
-    response_parser: TokenUsage::from_openai_response,
-    model_extractor: openai_model_extractor,
-    app_type_str: "codex",
-};
-
-/// Codex Responses API 解析配置（用于 /v1/responses）
-pub const CODEX_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
-    stream_parser: TokenUsage::from_codex_stream_events,
-    response_parser: TokenUsage::from_codex_response,
-    model_extractor: codex_model_extractor,
-    app_type_str: "codex",
-};
-
-/// Gemini API 解析配置
-pub const GEMINI_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
-    stream_parser: TokenUsage::from_gemini_stream_chunks,
-    response_parser: TokenUsage::from_gemini_response,
-    model_extractor: gemini_model_extractor,
-    app_type_str: "gemini",
-};
-
-// ============================================================================
-// Handler 配置（预留，用于进一步简化）
-// ============================================================================
-
-/// Handler 基础配置
-///
-/// 预留结构，可用于进一步统一各 handler 的配置
-#[allow(dead_code)]
-#[derive(Clone)]
-pub struct HandlerConfig {
-    /// 应用类型
-    pub app_type: AppType,
-    /// 日志标签
-    pub tag: &'static str,
-    /// 应用类型字符串
-    pub app_type_str: &'static str,
-    /// 使用量解析配置
-    pub parser_config: &'static UsageParserConfig,
-}
-
-/// Claude Handler 配置
-#[allow(dead_code)]
-pub const CLAUDE_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
-    app_type: AppType::Claude,
-    tag: "Claude",
-    app_type_str: "claude",
-    parser_config: &CLAUDE_PARSER_CONFIG,
-};
-
-/// Codex Chat Completions Handler 配置
-#[allow(dead_code)]
-pub const CODEX_CHAT_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
-    app_type: AppType::Codex,
-    tag: "Codex",
-    app_type_str: "codex",
-    parser_config: &OPENAI_PARSER_CONFIG,
-};
-
-/// Codex Responses Handler 配置
-#[allow(dead_code)]
-pub const CODEX_RESPONSES_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
-    app_type: AppType::Codex,
-    tag: "Codex",
-    app_type_str: "codex",
-    parser_config: &CODEX_PARSER_CONFIG,
-};
-
-/// Gemini Handler 配置
-#[allow(dead_code)]
-pub const GEMINI_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
-    app_type: AppType::Gemini,
-    tag: "Gemini",
-    app_type_str: "gemini",
-    parser_config: &GEMINI_PARSER_CONFIG,
-};
@@ -1,160 +0,0 @@
-//! 请求上下文模块
-//!
-//! 提供请求生命周期的上下文管理，封装通用初始化逻辑
-
-use crate::app_config::AppType;
-use crate::provider::Provider;
-use crate::proxy::{
-    forwarder::RequestForwarder, server::ProxyState, types::ProxyConfig, ProxyError,
-};
-use std::time::Instant;
-
-/// 请求上下文
-///
-/// 贯穿整个请求生命周期，包含：
-/// - 计时信息
-/// - 代理配置
-/// - 选中的 Provider 列表（用于故障转移）
-/// - 请求模型名称
-/// - 日志标签
-pub struct RequestContext {
-    /// 请求开始时间
-    pub start_time: Instant,
-    /// 代理配置快照
-    pub config: ProxyConfig,
-    /// 选中的 Provider（故障转移链的第一个）
-    pub provider: Provider,
-    /// 完整的 Provider 列表（用于故障转移）
-    providers: Vec<Provider>,
-    /// 请求开始时的“当前供应商”（用于判断是否需要同步 UI/托盘）
-    ///
-    /// 这里使用本地 settings 的设备级 current provider。
-    /// 代理模式下如果实际使用的 provider 与此不一致，会触发切换以确保 UI 始终准确。
-    pub current_provider_id: String,
-    /// 请求中的模型名称
-    pub request_model: String,
-    /// 日志标签（如 "Claude"、"Codex"、"Gemini"）
-    pub tag: &'static str,
-    /// 应用类型字符串（如 "claude"、"codex"、"gemini"）
-    pub app_type_str: &'static str,
-    /// 应用类型（预留，目前通过 app_type_str 使用）
-    #[allow(dead_code)]
-    pub app_type: AppType,
-}
-
-impl RequestContext {
-    /// 创建请求上下文
-    ///
-    /// # Arguments
-    /// * `state` - 代理服务器状态
-    /// * `body` - 请求体 JSON
-    /// * `app_type` - 应用类型
-    /// * `tag` - 日志标签
-    /// * `app_type_str` - 应用类型字符串
-    ///
-    /// # Errors
-    /// 返回 `ProxyError` 如果 Provider 选择失败
-    pub async fn new(
-        state: &ProxyState,
-        body: &serde_json::Value,
-        app_type: AppType,
-        tag: &'static str,
-        app_type_str: &'static str,
-    ) -> Result<Self, ProxyError> {
-        let start_time = Instant::now();
-        let config = state.config.read().await.clone();
-        let current_provider_id =
-            crate::settings::get_current_provider(&app_type).unwrap_or_default();
-
-        // 从请求体提取模型名称
-        let request_model = body
-            .get("model")
-            .and_then(|m| m.as_str())
-            .unwrap_or("unknown")
-            .to_string();
-
-        // 使用共享的 ProviderRouter 选择 Provider（熔断器状态跨请求保持）
-        // 注意：只在这里调用一次，结果传递给 forwarder，避免重复消耗 HalfOpen 名额
-        let providers = state
-            .provider_router
-            .select_providers(app_type_str)
-            .await
-            .map_err(|e| ProxyError::DatabaseError(e.to_string()))?;
-
-        let provider = providers
-            .first()
-            .cloned()
-            .ok_or(ProxyError::NoAvailableProvider)?;
-
-        log::info!(
-            "[{}] Provider: {}, model: {}, failover chain: {} providers",
-            tag,
-            provider.name,
-            request_model,
-            providers.len()
-        );
-
-        Ok(Self {
-            start_time,
-            config,
-            provider,
-            providers,
-            current_provider_id,
-            request_model,
-            tag,
-            app_type_str,
-            app_type,
-        })
-    }
-
-    /// 从 URI 提取模型名称（Gemini 专用）
-    ///
-    /// Gemini API 的模型名称在 URI 中，格式如：
-    /// `/v1beta/models/gemini-pro:generateContent`
-    pub fn with_model_from_uri(mut self, uri: &axum::http::Uri) -> Self {
-        let endpoint = uri
-            .path_and_query()
-            .map(|pq| pq.as_str())
-            .unwrap_or(uri.path());
-
-        self.request_model = endpoint
-            .split('/')
-            .find(|s| s.starts_with("models/"))
-            .and_then(|s| s.strip_prefix("models/"))
-            .map(|s| s.split(':').next().unwrap_or(s))
-            .unwrap_or("unknown")
-            .to_string();
-
-        log::info!("[{}] 从 URI 提取模型: {}", self.tag, self.request_model);
-        self
-    }
-
-    /// 创建 RequestForwarder
-    ///
-    /// 使用共享的 ProviderRouter，确保熔断器状态跨请求保持
-    pub fn create_forwarder(&self, state: &ProxyState) -> RequestForwarder {
-        RequestForwarder::new(
-            state.provider_router.clone(),
-            self.config.request_timeout,
-            self.config.max_retries,
-            state.status.clone(),
-            state.current_providers.clone(),
-            state.failover_manager.clone(),
-            state.app_handle.clone(),
-            self.current_provider_id.clone(),
-        )
-    }
-
-    /// 获取 Provider 列表（用于故障转移）
-    ///
-    /// 返回在创建上下文时已选择的 providers，避免重复调用 select_providers()
-    pub fn get_providers(&self) -> Vec<Provider> {
-        self.providers.clone()
-    }
-
-    /// 计算请求延迟（毫秒）
-    #[inline]
-    pub fn latency_ms(&self) -> u64 {
-        self.start_time.elapsed().as_millis() as u64
-    }
-}
@@ -4,17 +4,13 @@

 pub mod circuit_breaker;
 pub mod error;
-pub mod error_mapper;
-pub(crate) mod failover_switch;
 mod forwarder;
-pub mod handler_config;
-pub mod handler_context;
 mod handlers;
 mod health;
 pub mod provider_router;
 pub mod providers;
 pub mod response_handler;
-pub mod response_processor;
+mod router;
 pub(crate) mod server;
 pub mod session;
 pub(crate) mod types;
@@ -5,7 +5,7 @@
 use crate::database::Database;
 use crate::error::AppError;
 use crate::provider::Provider;
-use crate::proxy::circuit_breaker::{AllowResult, CircuitBreaker, CircuitBreakerConfig};
+use crate::proxy::circuit_breaker::CircuitBreaker;
 use std::collections::HashMap;
 use std::sync::Arc;
 use tokio::sync::RwLock;
@@ -28,123 +28,44 @@ impl ProviderRouter {
    }

    /// 选择可用的供应商（支持故障转移）
-    ///
-    /// 返回按优先级排序的可用供应商列表：
-    /// - 故障转移关闭时：仅返回当前供应商
-    /// - 故障转移开启时：完全按照故障转移队列顺序返回，忽略当前供应商设置
+    /// 返回按优先级排序的可用供应商列表
    pub async fn select_providers(&self, app_type: &str) -> Result<Vec<Provider>, AppError> {
-        let mut result = Vec::new();
+        // 直接获取当前选中的供应商（基于 is_current 字段）
+        let current_id = self
+            .db
+            .get_current_provider(app_type)?
+            .ok_or_else(|| AppError::Config(format!("No current provider for {}", app_type)))?;

-        // 检查该应用的自动故障转移开关是否开启
-        let failover_key = format!("auto_failover_enabled_{app_type}");
-        let auto_failover_enabled = match self.db.get_setting(&failover_key) {
-            Ok(Some(value)) => {
-                let enabled = value == "true";
-                log::info!(
-                    "[{app_type}] Failover setting '{failover_key}' = '{value}', enabled: {enabled}"
-                );
-                enabled
-            }
-            Ok(None) => {
-                log::warn!(
-                    "[{app_type}] Failover setting '{failover_key}' not found in database, defaulting to disabled"
-                );
-                false
-            }
-            Err(e) => {
-                log::error!(
-                    "[{app_type}] Failed to read failover setting '{failover_key}': {e}, defaulting to disabled"
-                );
-                false
-            }
-        };
+        let providers = self.db.get_all_providers(app_type)?;
+        let provider = providers
+            .get(&current_id)
+            .ok_or_else(|| AppError::Config(format!("Current provider {} not found", current_id)))?
+            .clone();

-        if auto_failover_enabled {
-            // 故障转移开启：使用 in_failover_queue 标记的供应商，按 sort_index 排序
-            let failover_providers = self.db.get_failover_providers(app_type)?;
-            log::info!(
-                "[{}] Failover enabled, using queue order ({} items)",
-                app_type,
-                failover_providers.len()
+        log::info!(
+            "[{}] Selected current provider: {} ({})",
+            app_type,
+            provider.name,
+            provider.id
+        );
+
+        // 检查熔断器状态
+        let circuit_key = format!("{}:{}", app_type, provider.id);
+        let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
+
+        if !breaker.allow_request().await {
+            log::warn!(
+                "Provider {} is unavailable (circuit breaker open)",
+                provider.id
            );
-
-            for provider in failover_providers {
-                // 检查熔断器状态
-                let circuit_key = format!("{}:{}", app_type, provider.id);
-                let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
-
-                if breaker.is_available().await {
-                    log::info!(
-                        "[{}] Queue provider available: {} ({}) at sort_index {:?}",
-                        app_type,
-                        provider.name,
-                        provider.id,
-                        provider.sort_index
-                    );
-                    result.push(provider);
-                } else {
-                    log::debug!(
-                        "[{}] Queue provider {} circuit breaker open, skipping",
-                        app_type,
-                        provider.name
-                    );
-                }
-            }
-        } else {
-            // 故障转移关闭：仅使用当前供应商
-            log::info!("[{app_type}] Failover disabled, using current provider only");
-
-            if let Some(current_id) = self.db.get_current_provider(app_type)? {
-                if let Some(current) = self.db.get_provider_by_id(&current_id, app_type)? {
-                    let circuit_key = format!("{}:{}", app_type, current.id);
-                    let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
-
-                    if breaker.is_available().await {
-                        log::info!(
-                            "[{}] Current provider available: {} ({})",
-                            app_type,
-                            current.name,
-                            current.id
-                        );
-                        result.push(current);
-                    } else {
-                        log::warn!(
-                            "[{}] Current provider {} circuit breaker open",
-                            app_type,
-                            current.name
-                        );
-                    }
-                }
-            }
-        }
-
-        if result.is_empty() {
            return Err(AppError::Config(format!(
-                "No available provider for {app_type} (all circuit breakers open or no providers configured)"
+                "Current provider {} is unavailable (circuit breaker open)",
+                provider.name
            )));
        }

-        log::info!(
-            "[{}] Provider chain: {} provider(s) available",
-            app_type,
-            result.len()
-        );
-
-        Ok(result)
-    }
-
-    /// 请求执行前获取熔断器“放行许可”
-    ///
-    /// - Closed：直接放行
-    /// - Open：超时到达后切到 HalfOpen 并放行一次探测
-    /// - HalfOpen：按限流规则放行探测
-    ///
-    /// 注意：调用方必须在请求结束后通过 `record_result()` 释放 HalfOpen 名额，
-    /// 否则会导致该 Provider 长时间无法进入探测状态。
-    pub async fn allow_provider_request(&self, provider_id: &str, app_type: &str) -> AllowResult {
-        let circuit_key = format!("{app_type}:{provider_id}");
-        let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
-        breaker.allow_request().await
+        // 返回单个供应商（保留 Vec 接口以兼容现有代码）
+        Ok(vec![provider])
    }

    /// 记录供应商请求结果
@@ -152,23 +73,18 @@ impl ProviderRouter {
        &self,
        provider_id: &str,
        app_type: &str,
-        used_half_open_permit: bool,
        success: bool,
        error_msg: Option<String>,
    ) -> Result<(), AppError> {
-        // 1. 获取熔断器配置（用于更新健康状态和判断是否禁用）
-        let config = self.db.get_circuit_breaker_config().await.ok();
-        let failure_threshold = config.map(|c| c.failure_threshold).unwrap_or(5);
-
-        // 2. 更新熔断器状态
+        // 1. 更新熔断器状态
        let circuit_key = format!("{app_type}:{provider_id}");
        let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;

        if success {
-            breaker.record_success(used_half_open_permit).await;
+            breaker.record_success().await;
            log::debug!("Provider {provider_id} request succeeded");
        } else {
-            breaker.record_failure(used_half_open_permit).await;
+            breaker.record_failure().await;
            log::warn!(
                "Provider {} request failed: {}",
                provider_id,
@@ -176,21 +92,38 @@ impl ProviderRouter {
            );
        }

-        // 3. 更新数据库健康状态（使用配置的阈值）
+        // 2. 更新数据库健康状态
        self.db
-            .update_provider_health_with_threshold(
-                provider_id,
-                app_type,
-                success,
-                error_msg.clone(),
-                failure_threshold,
-            )
+            .update_provider_health(provider_id, app_type, success, error_msg.clone())
            .await?;

+        // 3. 如果连续失败达到熔断阈值，自动禁用代理目标
+        if !success {
+            let health = self.db.get_provider_health(provider_id, app_type).await?;
+
+            // 获取熔断器配置
+            let config = self.db.get_circuit_breaker_config().await.ok();
+            let failure_threshold = config.map(|c| c.failure_threshold).unwrap_or(5);
+
+            // 如果连续失败达到阈值，自动关闭该供应商的代理开关
+            if health.consecutive_failures >= failure_threshold {
+                log::warn!(
+                    "Provider {} has failed {} times (threshold: {}), auto-disabling proxy target",
+                    provider_id,
+                    health.consecutive_failures,
+                    failure_threshold
+                );
+                self.db
+                    .set_proxy_target(provider_id, app_type, false)
+                    .await?;
+            }
+        }
+
        Ok(())
    }

    /// 重置熔断器（手动恢复）
+    #[allow(dead_code)]
    pub async fn reset_circuit_breaker(&self, circuit_key: &str) {
        let breakers = self.circuit_breakers.read().await;
        if let Some(breaker) = breakers.get(circuit_key) {
@@ -199,27 +132,6 @@ impl ProviderRouter {
        }
    }

-    /// 重置指定供应商的熔断器
-    pub async fn reset_provider_breaker(&self, provider_id: &str, app_type: &str) {
-        let circuit_key = format!("{app_type}:{provider_id}");
-        self.reset_circuit_breaker(&circuit_key).await;
-    }
-
-    /// 更新所有熔断器的配置（热更新）
-    ///
-    /// 当用户在 UI 中修改熔断器配置后调用此方法，
-    /// 所有现有的熔断器会立即使用新配置
-    pub async fn update_all_configs(&self, config: CircuitBreakerConfig) {
-        let breakers = self.circuit_breakers.read().await;
-        let count = breakers.len();
-
-        for breaker in breakers.values() {
-            breaker.update_config(config.clone()).await;
-        }
-
-        log::info!("已更新 {count} 个熔断器的配置");
-    }
-
    /// 获取熔断器状态
    #[allow(dead_code)]
    pub async fn get_circuit_breaker_stats(
@@ -275,103 +187,14 @@ impl ProviderRouter {
 mod tests {
    use super::*;
    use crate::database::Database;
-    use serde_json::json;

    #[tokio::test]
    async fn test_provider_router_creation() {
        let db = Arc::new(Database::memory().unwrap());
        let router = ProviderRouter::new(db);

+        // 测试创建熔断器
        let breaker = router.get_or_create_circuit_breaker("claude:test").await;
-        assert!(breaker.allow_request().await.allowed);
-    }
-
-    #[tokio::test]
-    async fn test_failover_disabled_uses_current_provider() {
-        let db = Arc::new(Database::memory().unwrap());
-
-        let provider_a =
-            Provider::with_id("a".to_string(), "Provider A".to_string(), json!({}), None);
-        let provider_b =
-            Provider::with_id("b".to_string(), "Provider B".to_string(), json!({}), None);
-
-        db.save_provider("claude", &provider_a).unwrap();
-        db.save_provider("claude", &provider_b).unwrap();
-        db.set_current_provider("claude", "a").unwrap();
-        db.add_to_failover_queue("claude", "b").unwrap();
-
-        let router = ProviderRouter::new(db.clone());
-        let providers = router.select_providers("claude").await.unwrap();
-
-        assert_eq!(providers.len(), 1);
-        assert_eq!(providers[0].id, "a");
-    }
-
-    #[tokio::test]
-    async fn test_failover_enabled_uses_queue_order() {
-        let db = Arc::new(Database::memory().unwrap());
-
-        // 设置 sort_index 来控制顺序：b=1, a=2
-        let mut provider_a =
-            Provider::with_id("a".to_string(), "Provider A".to_string(), json!({}), None);
-        provider_a.sort_index = Some(2);
-        let mut provider_b =
-            Provider::with_id("b".to_string(), "Provider B".to_string(), json!({}), None);
-        provider_b.sort_index = Some(1);
-
-        db.save_provider("claude", &provider_a).unwrap();
-        db.save_provider("claude", &provider_b).unwrap();
-        db.set_current_provider("claude", "a").unwrap();
-
-        db.add_to_failover_queue("claude", "b").unwrap();
-        db.add_to_failover_queue("claude", "a").unwrap();
-        db.set_setting("auto_failover_enabled_claude", "true")
-            .unwrap();
-
-        let router = ProviderRouter::new(db.clone());
-        let providers = router.select_providers("claude").await.unwrap();
-
-        assert_eq!(providers.len(), 2);
-        // 按 sort_index 排序：b(1) 在前，a(2) 在后
-        assert_eq!(providers[0].id, "b");
-        assert_eq!(providers[1].id, "a");
-    }
-
-    #[tokio::test]
-    async fn test_select_providers_does_not_consume_half_open_permit() {
-        let db = Arc::new(Database::memory().unwrap());
-
-        db.update_circuit_breaker_config(&CircuitBreakerConfig {
-            failure_threshold: 1,
-            timeout_seconds: 0,
-            ..Default::default()
-        })
-        .await
-        .unwrap();
-
-        let provider_a =
-            Provider::with_id("a".to_string(), "Provider A".to_string(), json!({}), None);
-        let provider_b =
-            Provider::with_id("b".to_string(), "Provider B".to_string(), json!({}), None);
-
-        db.save_provider("claude", &provider_a).unwrap();
-        db.save_provider("claude", &provider_b).unwrap();
-
-        db.add_to_failover_queue("claude", "a").unwrap();
-        db.add_to_failover_queue("claude", "b").unwrap();
-        db.set_setting("auto_failover_enabled_claude", "true")
-            .unwrap();
-
-        let router = ProviderRouter::new(db.clone());
-
-        router
-            .record_result("b", "claude", false, false, Some("fail".to_string()))
-            .await
-            .unwrap();
-
-        let providers = router.select_providers("claude").await.unwrap();
-        assert_eq!(providers.len(), 2);
-
-        assert!(router.allow_provider_request("b", "claude").await.allowed);
+        assert!(breaker.allow_request().await);
    }
 }
@@ -87,7 +87,7 @@ pub trait ProviderAdapter: Send + Sync {
    /// 是否需要格式转换
    ///
    /// 默认返回 `false`（透传模式）。
-    /// 仅当供应商需要格式转换时（如 Claude + OpenRouter 旧 OpenAI 兼容接口）才返回 `true`。
+    /// 仅当供应商需要格式转换时（如 Claude + OpenRouter）才返回 `true`。
    ///
    /// # Arguments
    /// * `provider` - Provider 配置
@@ -5,7 +5,7 @@
 //! ## 认证模式
 //! - **Claude**: Anthropic 官方 API (x-api-key + anthropic-version)
 //! - **ClaudeAuth**: 中转服务 (仅 Bearer 认证，无 x-api-key)
-//! - **OpenRouter**: 已支持 Claude Code 兼容接口，默认透传（保留旧转换逻辑备用）
+//! - **OpenRouter**: 需要 Anthropic ↔ OpenAI 格式转换

 use super::{AuthInfo, AuthStrategy, ProviderAdapter, ProviderType};
 use crate::provider::Provider;
@@ -28,8 +28,10 @@ impl ClaudeAdapter {
    /// - Claude: 默认 Anthropic 官方
    pub fn provider_type(&self, provider: &Provider) -> ProviderType {
        // 检测 OpenRouter
-        if self.is_openrouter(provider) {
-            return ProviderType::OpenRouter;
+        if let Ok(base_url) = self.extract_base_url(provider) {
+            if base_url.contains("openrouter.ai") {
+                return ProviderType::OpenRouter;
+            }
        }

        // 检测 ClaudeAuth (仅 Bearer 认证)
@@ -85,14 +87,6 @@ impl ClaudeAdapter {
                log::debug!("[Claude] 使用 ANTHROPIC_AUTH_TOKEN");
                return Some(key.to_string());
            }
-            if let Some(key) = env
-                .get("ANTHROPIC_API_KEY")
-                .and_then(|v| v.as_str())
-                .filter(|s| !s.is_empty())
-            {
-                log::debug!("[Claude] 使用 ANTHROPIC_API_KEY");
-                return Some(key.to_string());
-            }
            // OpenRouter key
            if let Some(key) = env
                .get("OPENROUTER_API_KEY")
@@ -192,17 +186,12 @@ impl ProviderAdapter for ClaudeAdapter {
    }

    fn build_url(&self, base_url: &str, endpoint: &str) -> String {
-        // NOTE:
-        // 过去 OpenRouter 只有 OpenAI Chat Completions 兼容接口，需要把 Claude 的 `/v1/messages`
-        // 映射到 `/v1/chat/completions`，并做 Anthropic ↔ OpenAI 的格式转换。
-        //
-        // 现在 OpenRouter 已推出 Claude Code 兼容接口，因此默认直接透传 endpoint。
-        // 如需回退旧逻辑，可恢复下面这段分支：
-        //
-        // if base_url.contains("openrouter.ai") {
-        //     return format!("{}/v1/chat/completions", base_url.trim_end_matches('/'));
-        // }
+        // OpenRouter 使用 /v1/chat/completions
+        if base_url.contains("openrouter.ai") {
+            return format!("{}/v1/chat/completions", base_url.trim_end_matches('/'));
+        }

+        // Anthropic 直连
        format!(
            "{}/{}",
            base_url.trim_end_matches('/'),
@@ -218,25 +207,19 @@ impl ProviderAdapter for ClaudeAdapter {
                .header("x-api-key", &auth.api_key)
                .header("anthropic-version", "2023-06-01"),
            // ClaudeAuth 中转服务: 仅 Bearer，无 x-api-key
-            AuthStrategy::ClaudeAuth => request
-                .header("Authorization", format!("Bearer {}", auth.api_key))
-                .header("anthropic-version", "2023-06-01"),
+            AuthStrategy::ClaudeAuth => {
+                request.header("Authorization", format!("Bearer {}", auth.api_key))
+            }
            // OpenRouter: Bearer
-            AuthStrategy::Bearer => request
-                .header("Authorization", format!("Bearer {}", auth.api_key))
-                .header("anthropic-version", "2023-06-01"),
+            AuthStrategy::Bearer => {
+                request.header("Authorization", format!("Bearer {}", auth.api_key))
+            }
            _ => request,
        }
    }

-    fn needs_transform(&self, _provider: &Provider) -> bool {
-        // NOTE:
-        // OpenRouter 已推出 Claude Code 兼容接口（可直接处理 `/v1/messages`），默认不再启用
-        // Anthropic ↔ OpenAI 的格式转换。
-        //
-        // 如果未来需要回退到旧的 OpenAI Chat Completions 方案，可恢复下面这行：
-        // self.is_openrouter(_provider)
-        false
+    fn needs_transform(&self, provider: &Provider) -> bool {
+        self.is_openrouter(provider)
    }

    fn transform_request(
@@ -270,7 +253,7 @@ mod tests {
            meta: None,
            icon: None,
            icon_color: None,
-            in_failover_queue: false,
+            is_proxy_target: None,
        }
    }

@@ -302,21 +285,6 @@ mod tests {
        assert_eq!(auth.strategy, AuthStrategy::Anthropic);
    }

-    #[test]
-    fn test_extract_auth_anthropic_api_key() {
-        let adapter = ClaudeAdapter::new();
-        let provider = create_provider(json!({
-            "env": {
-                "ANTHROPIC_BASE_URL": "https://api.anthropic.com",
-                "ANTHROPIC_API_KEY": "sk-ant-test-key"
-            }
-        }));
-
-        let auth = adapter.extract_auth(&provider).unwrap();
-        assert_eq!(auth.api_key, "sk-ant-test-key");
-        assert_eq!(auth.strategy, AuthStrategy::Anthropic);
-    }
-
    #[test]
    fn test_extract_auth_openrouter() {
        let adapter = ClaudeAdapter::new();
@@ -411,7 +379,7 @@ mod tests {
    fn test_build_url_openrouter() {
        let adapter = ClaudeAdapter::new();
        let url = adapter.build_url("https://openrouter.ai/api", "/v1/messages");
-        assert_eq!(url, "https://openrouter.ai/api/v1/messages");
+        assert_eq!(url, "https://openrouter.ai/api/v1/chat/completions");
    }

    #[test]
@@ -430,6 +398,6 @@ mod tests {
                "ANTHROPIC_BASE_URL": "https://openrouter.ai/api"
            }
        }));
-        assert!(!adapter.needs_transform(&openrouter_provider));
+        assert!(adapter.needs_transform(&openrouter_provider));
    }
 }
@@ -174,7 +174,7 @@ mod tests {
            meta: None,
            icon: None,
            icon_color: None,
-            in_failover_queue: false,
+            is_proxy_target: None,
        }
    }

@@ -120,7 +120,11 @@ impl GeminiAdapter {
    /// 从 Provider 配置中提取原始 API Key
    fn extract_key_raw(&self, provider: &Provider) -> Option<String> {
        if let Some(env) = provider.settings_config.get("env") {
-            // 使用 GEMINI_API_KEY
+            // 优先使用 GOOGLE_GEMINI_API_KEY
+            if let Some(key) = env.get("GOOGLE_GEMINI_API_KEY").and_then(|v| v.as_str()) {
+                return Some(key.to_string());
+            }
+            // 备选 GEMINI_API_KEY
            if let Some(key) = env.get("GEMINI_API_KEY").and_then(|v| v.as_str()) {
                return Some(key.to_string());
            }
@@ -250,7 +254,7 @@ mod tests {
            meta: None,
            icon: None,
            icon_color: None,
-            in_failover_queue: false,
+            is_proxy_target: None,
        }
    }

@@ -272,7 +276,7 @@ mod tests {
        let adapter = GeminiAdapter::new();
        let provider = create_provider(json!({
            "env": {
-                "GEMINI_API_KEY": "AIza-test-key-12345678"
+                "GOOGLE_GEMINI_API_KEY": "AIza-test-key-12345678"
            }
        }));

@@ -287,7 +291,7 @@ mod tests {
        let adapter = GeminiAdapter::new();
        let provider = create_provider(json!({
            "env": {
-                "GEMINI_API_KEY": "ya29.test-access-token-12345"
+                "GOOGLE_GEMINI_API_KEY": "ya29.test-access-token-12345"
            }
        }));

@@ -304,7 +308,7 @@ mod tests {
        let adapter = GeminiAdapter::new();
        let provider = create_provider(json!({
            "env": {
-                "GEMINI_API_KEY": "{\"access_token\":\"ya29.test-token\",\"refresh_token\":\"1//refresh\"}"
+                "GOOGLE_GEMINI_API_KEY": "{\"access_token\":\"ya29.test-token\",\"refresh_token\":\"1//refresh\"}"
            }
        }));

@@ -320,7 +324,7 @@ mod tests {
        // API Key
        let api_key_provider = create_provider(json!({
            "env": {
-                "GEMINI_API_KEY": "AIza-test-key"
+                "GOOGLE_GEMINI_API_KEY": "AIza-test-key"
            }
        }));
        assert_eq!(
@@ -331,7 +335,7 @@ mod tests {
        // OAuth access_token
        let oauth_provider = create_provider(json!({
            "env": {
-                "GEMINI_API_KEY": "ya29.test-token"
+                "GOOGLE_GEMINI_API_KEY": "ya29.test-token"
            }
        }));
        assert_eq!(
@@ -342,7 +346,7 @@ mod tests {
        // OAuth JSON
        let oauth_json_provider = create_provider(json!({
            "env": {
-                "GEMINI_API_KEY": "{\"access_token\":\"ya29.test\"}"
+                "GOOGLE_GEMINI_API_KEY": "{\"access_token\":\"ya29.test\"}"
            }
        }));
        assert_eq!(
@@ -48,21 +48,17 @@ pub enum ProviderType {
    Gemini,
    /// Google Gemini CLI (OAuth Bearer)
    GeminiCli,
-    /// OpenRouter（已支持 Claude Code 兼容接口，默认透传；保留旧转换逻辑备用）
+    /// OpenRouter (需要 Anthropic ↔ OpenAI 格式转换)
    OpenRouter,
 }

 impl ProviderType {
    /// 是否需要格式转换
    ///
-    /// 过去 OpenRouter 需要将 Anthropic 格式转换为 OpenAI 格式；
-    /// 现在默认关闭转换（因为 OpenRouter 已支持 Claude Code 兼容接口）。
+    /// OpenRouter 需要将 Anthropic 格式转换为 OpenAI 格式
    #[allow(dead_code)]
    pub fn needs_transform(&self) -> bool {
-        match self {
-            ProviderType::OpenRouter => false,
-            _ => false,
-        }
+        matches!(self, ProviderType::OpenRouter)
    }

    /// 获取默认端点
@@ -209,7 +205,7 @@ mod tests {
            meta: None,
            icon: None,
            icon_color: None,
-            in_failover_queue: false,
+            is_proxy_target: None,
        }
    }

@@ -220,7 +216,7 @@ mod tests {
        assert!(!ProviderType::Codex.needs_transform());
        assert!(!ProviderType::Gemini.needs_transform());
        assert!(!ProviderType::GeminiCli.needs_transform());
-        assert!(!ProviderType::OpenRouter.needs_transform());
+        assert!(ProviderType::OpenRouter.needs_transform());
    }

    #[test]
@@ -373,7 +369,7 @@ mod tests {
    fn test_from_app_type_gemini_api_key() {
        let provider = create_provider(json!({
            "env": {
-                "GEMINI_API_KEY": "AIza-test-key"
+                "GOOGLE_GEMINI_API_KEY": "AIza-test-key"
            }
        }));

@@ -385,7 +381,7 @@ mod tests {
    fn test_from_app_type_gemini_cli_oauth() {
        let provider = create_provider(json!({
            "env": {
-                "GEMINI_API_KEY": "ya29.test-access-token"
+                "GOOGLE_GEMINI_API_KEY": "ya29.test-access-token"
            }
        }));

@@ -397,7 +393,7 @@ mod tests {
    fn test_from_app_type_gemini_cli_json() {
        let provider = create_provider(json!({
            "env": {
-                "GEMINI_API_KEY": "{\"access_token\":\"ya29.test\",\"refresh_token\":\"1//test\"}"
+                "GOOGLE_GEMINI_API_KEY": "{\"access_token\":\"ya29.test\",\"refresh_token\":\"1//test\"}"
            }
        }));

@@ -394,7 +394,7 @@ mod tests {
            meta: None,
            icon: None,
            icon_color: None,
-            in_failover_queue: false,
+            is_proxy_target: None,
        }
    }

@@ -1,411 +0,0 @@
-//! 响应处理器模块
-//!
-//! 统一处理流式和非流式 API 响应
-
-use super::{
-    handler_config::UsageParserConfig, handler_context::RequestContext, server::ProxyState,
-    usage::parser::TokenUsage, ProxyError,
-};
-use axum::response::Response;
-use bytes::Bytes;
-use futures::stream::{Stream, StreamExt};
-use rust_decimal::Decimal;
-use serde_json::Value;
-use std::{
-    str::FromStr,
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    },
-};
-use tokio::sync::Mutex;
-
-// ============================================================================
-// 公共接口
-// ============================================================================
-
-/// 检测响应是否为 SSE 流式响应
-#[inline]
-pub fn is_sse_response(response: &reqwest::Response) -> bool {
-    response
-        .headers()
-        .get("content-type")
-        .and_then(|v| v.to_str().ok())
-        .map(|ct| ct.contains("text/event-stream"))
-        .unwrap_or(false)
-}
-
-/// 处理流式响应
-pub async fn handle_streaming(
-    response: reqwest::Response,
-    ctx: &RequestContext,
-    state: &ProxyState,
-    parser_config: &UsageParserConfig,
-) -> Response {
-    log::info!("[{}] 流式透传响应 (SSE)", ctx.tag);
-
-    let status = response.status();
-    let mut builder = axum::response::Response::builder().status(status);
-
-    // 复制响应头
-    for (key, value) in response.headers() {
-        builder = builder.header(key, value);
-    }
-
-    // 创建字节流
-    let stream = response
-        .bytes_stream()
-        .map(|chunk| chunk.map_err(|e| std::io::Error::other(e.to_string())));
-
-    // 创建使用量收集器
-    let usage_collector = create_usage_collector(ctx, state, status.as_u16(), parser_config);
-
-    // 创建带日志的透传流
-    let logged_stream = create_logged_passthrough_stream(stream, ctx.tag, Some(usage_collector));
-
-    let body = axum::body::Body::from_stream(logged_stream);
-    builder.body(body).unwrap()
-}
-
-/// 处理非流式响应
-pub async fn handle_non_streaming(
-    response: reqwest::Response,
-    ctx: &RequestContext,
-    state: &ProxyState,
-    parser_config: &UsageParserConfig,
-) -> Result<Response, ProxyError> {
-    let response_headers = response.headers().clone();
-    let status = response.status();
-
-    // 读取响应体
-    let body_bytes = response.bytes().await.map_err(|e| {
-        log::error!("[{}] 读取响应失败: {e}", ctx.tag);
-        ProxyError::ForwardFailed(format!("Failed to read response body: {e}"))
-    })?;
-
-    // 解析并记录使用量
-    if let Ok(json_value) = serde_json::from_slice::<Value>(&body_bytes) {
-        log::info!(
-            "[{}] <<< 响应 JSON:\n{}",
-            ctx.tag,
-            serde_json::to_string_pretty(&json_value).unwrap_or_default()
-        );
-
-        // 解析使用量
-        if let Some(usage) = (parser_config.response_parser)(&json_value) {
-            let model = json_value
-                .get("model")
-                .and_then(|m| m.as_str())
-                .unwrap_or(&ctx.request_model);
-
-            spawn_log_usage(state, ctx, usage, model, status.as_u16(), false);
-        } else {
-            log::debug!(
-                "[{}] 未能解析 usage 信息，跳过记录",
-                parser_config.app_type_str
-            );
-        }
-    } else {
-        log::info!(
-            "[{}] <<< 响应 (非 JSON): {} bytes",
-            ctx.tag,
-            body_bytes.len()
-        );
-    }
-
-    log::info!("[{}] ====== 请求结束 ======", ctx.tag);
-
-    // 构建响应
-    let mut builder = axum::response::Response::builder().status(status);
-    for (key, value) in response_headers.iter() {
-        builder = builder.header(key, value);
-    }
-
-    let body = axum::body::Body::from(body_bytes);
-    Ok(builder.body(body).unwrap())
-}
-
-/// 通用响应处理入口
-///
-/// 根据响应类型自动选择流式或非流式处理
-pub async fn process_response(
-    response: reqwest::Response,
-    ctx: &RequestContext,
-    state: &ProxyState,
-    parser_config: &UsageParserConfig,
-) -> Result<Response, ProxyError> {
-    if is_sse_response(&response) {
-        Ok(handle_streaming(response, ctx, state, parser_config).await)
-    } else {
-        handle_non_streaming(response, ctx, state, parser_config).await
-    }
-}
-
-// ============================================================================
-// SSE 使用量收集器
-// ============================================================================
-
-type UsageCallbackWithTiming = Arc<dyn Fn(Vec<Value>, Option<u64>) + Send + Sync + 'static>;
-
-/// SSE 使用量收集器
-#[derive(Clone)]
-pub struct SseUsageCollector {
-    inner: Arc<SseUsageCollectorInner>,
-}
-
-struct SseUsageCollectorInner {
-    events: Mutex<Vec<Value>>,
-    first_event_time: Mutex<Option<std::time::Instant>>,
-    start_time: std::time::Instant,
-    on_complete: UsageCallbackWithTiming,
-    finished: AtomicBool,
-}
-
-impl SseUsageCollector {
-    /// 创建新的使用量收集器
-    pub fn new(
-        start_time: std::time::Instant,
-        callback: impl Fn(Vec<Value>, Option<u64>) + Send + Sync + 'static,
-    ) -> Self {
-        let on_complete: UsageCallbackWithTiming = Arc::new(callback);
-        Self {
-            inner: Arc::new(SseUsageCollectorInner {
-                events: Mutex::new(Vec::new()),
-                first_event_time: Mutex::new(None),
-                start_time,
-                on_complete,
-                finished: AtomicBool::new(false),
-            }),
-        }
-    }
-
-    /// 推送 SSE 事件
-    pub async fn push(&self, event: Value) {
-        // 记录首个事件时间
-        {
-            let mut first_time = self.inner.first_event_time.lock().await;
-            if first_time.is_none() {
-                *first_time = Some(std::time::Instant::now());
-            }
-        }
-        let mut events = self.inner.events.lock().await;
-        events.push(event);
-    }
-
-    /// 完成收集并触发回调
-    pub async fn finish(&self) {
-        if self.inner.finished.swap(true, Ordering::SeqCst) {
-            return;
-        }
-
-        let events = {
-            let mut guard = self.inner.events.lock().await;
-            std::mem::take(&mut *guard)
-        };
-
-        let first_token_ms = {
-            let first_time = self.inner.first_event_time.lock().await;
-            first_time.map(|t| (t - self.inner.start_time).as_millis() as u64)
-        };
-
-        (self.inner.on_complete)(events, first_token_ms);
-    }
-}
-
-// ============================================================================
-// 内部辅助函数
-// ============================================================================
-
-/// 创建使用量收集器
-fn create_usage_collector(
-    ctx: &RequestContext,
-    state: &ProxyState,
-    status_code: u16,
-    parser_config: &UsageParserConfig,
-) -> SseUsageCollector {
-    let state = state.clone();
-    let provider_id = ctx.provider.id.clone();
-    let request_model = ctx.request_model.clone();
-    let app_type_str = parser_config.app_type_str;
-    let tag = ctx.tag;
-    let start_time = ctx.start_time;
-    let stream_parser = parser_config.stream_parser;
-    let model_extractor = parser_config.model_extractor;
-
-    SseUsageCollector::new(start_time, move |events, first_token_ms| {
-        if let Some(usage) = stream_parser(&events) {
-            let model = model_extractor(&events, &request_model);
-            let latency_ms = start_time.elapsed().as_millis() as u64;
-
-            let state = state.clone();
-            let provider_id = provider_id.clone();
-
-            tokio::spawn(async move {
-                log_usage_internal(
-                    &state,
-                    &provider_id,
-                    app_type_str,
-                    &model,
-                    usage,
-                    latency_ms,
-                    first_token_ms,
-                    true, // is_streaming
-                    status_code,
-                )
-                .await;
-            });
-        } else {
-            log::debug!("[{tag}] 流式响应缺少 usage 统计，跳过消费记录");
-        }
-    })
-}
-
-/// 异步记录使用量
-fn spawn_log_usage(
-    state: &ProxyState,
-    ctx: &RequestContext,
-    usage: TokenUsage,
-    model: &str,
-    status_code: u16,
-    is_streaming: bool,
-) {
-    let state = state.clone();
-    let provider_id = ctx.provider.id.clone();
-    let app_type_str = ctx.app_type_str.to_string();
-    let model = model.to_string();
-    let latency_ms = ctx.latency_ms();
-
-    tokio::spawn(async move {
-        log_usage_internal(
-            &state,
-            &provider_id,
-            &app_type_str,
-            &model,
-            usage,
-            latency_ms,
-            None,
-            is_streaming,
-            status_code,
-        )
-        .await;
-    });
-}
-
-/// 内部使用量记录函数
-#[allow(clippy::too_many_arguments)]
-async fn log_usage_internal(
-    state: &ProxyState,
-    provider_id: &str,
-    app_type: &str,
-    model: &str,
-    usage: TokenUsage,
-    latency_ms: u64,
-    first_token_ms: Option<u64>,
-    is_streaming: bool,
-    status_code: u16,
-) {
-    use super::usage::logger::UsageLogger;
-
-    let logger = UsageLogger::new(&state.db);
-
-    // 获取 provider 的 cost_multiplier
-    let multiplier = match state.db.get_provider_by_id(provider_id, app_type) {
-        Ok(Some(p)) => {
-            if let Some(meta) = p.meta {
-                if let Some(cm) = meta.cost_multiplier {
-                    Decimal::from_str(&cm).unwrap_or(Decimal::from(1))
-                } else {
-                    Decimal::from(1)
-                }
-            } else {
-                Decimal::from(1)
-            }
-        }
-        _ => Decimal::from(1),
-    };
-
-    let request_id = uuid::Uuid::new_v4().to_string();
-
-    if let Err(e) = logger.log_with_calculation(
-        request_id,
-        provider_id.to_string(),
-        app_type.to_string(),
-        model.to_string(),
-        usage,
-        multiplier,
-        latency_ms,
-        first_token_ms,
-        status_code,
-        None,
-        None, // provider_type
-        is_streaming,
-    ) {
-        log::warn!("记录使用量失败: {e}");
-    }
-}
-
-/// 创建带日志记录的透传流
-pub fn create_logged_passthrough_stream(
-    stream: impl Stream<Item = Result<Bytes, std::io::Error>> + Send + 'static,
-    tag: &'static str,
-    usage_collector: Option<SseUsageCollector>,
-) -> impl Stream<Item = Result<Bytes, std::io::Error>> + Send {
-    async_stream::stream! {
-        let mut buffer = String::new();
-        let mut collector = usage_collector;
-
-        tokio::pin!(stream);
-
-        while let Some(chunk) = stream.next().await {
-            match chunk {
-                Ok(bytes) => {
-                    let text = String::from_utf8_lossy(&bytes);
-                    buffer.push_str(&text);
-
-                    // 尝试解析并记录完整的 SSE 事件
-                    while let Some(pos) = buffer.find("\n\n") {
-                        let event_text = buffer[..pos].to_string();
-                        buffer = buffer[pos + 2..].to_string();
-
-                        if !event_text.trim().is_empty() {
-                            // 提取 data 部分并尝试解析为 JSON
-                            for line in event_text.lines() {
-                                if let Some(data) = line.strip_prefix("data: ") {
-                                    if data.trim() != "[DONE]" {
-                                        if let Ok(json_value) = serde_json::from_str::<Value>(data) {
-                                            if let Some(c) = &collector {
-                                                c.push(json_value.clone()).await;
-                                            }
-                                            log::info!(
-                                                "[{}] <<< SSE 事件:\n{}",
-                                                tag,
-                                                serde_json::to_string_pretty(&json_value).unwrap_or_else(|_| data.to_string())
-                                            );
-                                        } else {
-                                            log::info!("[{tag}] <<< SSE 数据: {data}");
-                                        }
-                                    } else {
-                                        log::info!("[{tag}] <<< SSE: [DONE]");
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    yield Ok(bytes);
-                }
-                Err(e) => {
-                    log::error!("[{tag}] 流错误: {e}");
-                    yield Err(std::io::Error::other(e.to_string()));
-                    break;
-                }
-            }
-        }
-
-        log::info!("[{}] ====== 流结束 ======", tag);
-
-        if let Some(c) = collector.take() {
-            c.finish().await;
-        }
-    }
-}
@@ -0,0 +1,70 @@
+//! Provider路由器
+//!
+//! 负责选择合适的Provider进行请求转发
+
+use super::ProxyError;
+use crate::{app_config::AppType, database::Database, provider::Provider};
+use std::sync::Arc;
+
+pub struct ProviderRouter {
+    db: Arc<Database>,
+}
+
+impl ProviderRouter {
+    pub fn new(db: Arc<Database>) -> Self {
+        Self { db }
+    }
+
+    /// 选择Provider（只使用标记为代理目标的 Provider）
+    pub async fn select_provider(
+        &self,
+        app_type: &AppType,
+        _failed_ids: &[String],
+    ) -> Result<Provider, ProxyError> {
+        // 1. 获取 Proxy Target Provider ID
+        let proxy_target_id = self
+            .db
+            .get_proxy_target_provider(app_type.as_str())
+            .map_err(|e| ProxyError::DatabaseError(e.to_string()))?;
+
+        let target_id = proxy_target_id.ok_or_else(|| {
+            log::warn!("[{}] 未设置代理目标 Provider", app_type.as_str());
+            ProxyError::NoAvailableProvider
+        })?;
+
+        // 2. 获取所有 Provider
+        let providers = self
+            .db
+            .get_all_providers(app_type.as_str())
+            .map_err(|e| ProxyError::DatabaseError(e.to_string()))?;
+
+        // 3. 找到目标 Provider
+        let target = providers.get(&target_id).ok_or_else(|| {
+            log::warn!(
+                "[{}] 代理目标 Provider 不存在: {}",
+                app_type.as_str(),
+                target_id
+            );
+            ProxyError::NoAvailableProvider
+        })?;
+
+        log::info!(
+            "[{}] 使用代理目标 Provider: {}",
+            app_type.as_str(),
+            target.name
+        );
+        Ok(target.clone())
+    }
+
+    /// 更新Provider健康状态（保留接口但不影响选择）
+    #[allow(dead_code)]
+    pub async fn update_health(
+        &self,
+        _provider: &Provider,
+        _app_type: &AppType,
+        _success: bool,
+        _error_msg: Option<String>,
+    ) {
+        // 不再记录健康状态
+    }
+}
@@ -2,10 +2,7 @@
 //!
 //! 基于Axum的HTTP服务器，处理代理请求

-use super::{
-    failover_switch::FailoverSwitchManager, handlers, provider_router::ProviderRouter, types::*,
-    ProxyError,
-};
+use super::{handlers, types::*, ProxyError};
 use crate::database::Database;
 use axum::{
    routing::{get, post},
@@ -14,7 +11,6 @@ use axum::{
 use std::net::SocketAddr;
 use std::sync::Arc;
 use tokio::sync::{oneshot, RwLock};
-use tokio::task::JoinHandle;
 use tower_http::cors::{Any, CorsLayer};

 /// 代理服务器状态（共享）
@@ -26,12 +22,6 @@ pub struct ProxyState {
    pub start_time: Arc<RwLock<Option<std::time::Instant>>>,
    /// 每个应用类型当前使用的 provider (app_type -> (provider_id, provider_name))
    pub current_providers: Arc<RwLock<std::collections::HashMap<String, (String, String)>>>,
-    /// 共享的 ProviderRouter（持有熔断器状态，跨请求保持）
-    pub provider_router: Arc<ProviderRouter>,
-    /// AppHandle，用于发射事件和更新托盘菜单
-    pub app_handle: Option<tauri::AppHandle>,
-    /// 故障转移切换管理器
-    pub failover_manager: Arc<FailoverSwitchManager>,
 }

 /// 代理HTTP服务器
@@ -39,37 +29,22 @@ pub struct ProxyServer {
    config: ProxyConfig,
    state: ProxyState,
    shutdown_tx: Arc<RwLock<Option<oneshot::Sender<()>>>>,
-    /// 服务器任务句柄，用于等待服务器实际关闭
-    server_handle: Arc<RwLock<Option<JoinHandle<()>>>>,
 }

 impl ProxyServer {
-    pub fn new(
-        config: ProxyConfig,
-        db: Arc<Database>,
-        app_handle: Option<tauri::AppHandle>,
-    ) -> Self {
-        // 创建共享的 ProviderRouter（熔断器状态将跨所有请求保持）
-        let provider_router = Arc::new(ProviderRouter::new(db.clone()));
-        // 创建故障转移切换管理器
-        let failover_manager = Arc::new(FailoverSwitchManager::new(db.clone()));
-
+    pub fn new(config: ProxyConfig, db: Arc<Database>) -> Self {
        let state = ProxyState {
            db,
            config: Arc::new(RwLock::new(config.clone())),
            status: Arc::new(RwLock::new(ProxyStatus::default())),
            start_time: Arc::new(RwLock::new(None)),
            current_providers: Arc::new(RwLock::new(std::collections::HashMap::new())),
-            provider_router,
-            app_handle,
-            failover_manager,
        };

        Self {
            config,
            state,
            shutdown_tx: Arc::new(RwLock::new(None)),
-            server_handle: Arc::new(RwLock::new(None)),
        }
    }

@@ -112,7 +87,7 @@ impl ProxyServer {

        // 启动服务器
        let state = self.state.clone();
-        let handle = tokio::spawn(async move {
+        tokio::spawn(async move {
            axum::serve(listener, app)
                .with_graceful_shutdown(async {
                    shutdown_rx.await.ok();
@@ -125,9 +100,6 @@ impl ProxyServer {
            *state.start_time.write().await = None;
        });

-        // 保存服务器任务句柄
-        *self.server_handle.write().await = Some(handle);
-
        Ok(ProxyServerInfo {
            address: self.config.listen_address.clone(),
            port: self.config.listen_port,
@@ -136,23 +108,12 @@ impl ProxyServer {
    }

    pub async fn stop(&self) -> Result<(), ProxyError> {
-        // 1. 发送关闭信号
        if let Some(tx) = self.shutdown_tx.write().await.take() {
            let _ = tx.send(());
+            Ok(())
        } else {
-            return Err(ProxyError::NotRunning);
+            Err(ProxyError::NotRunning)
        }
-
-        // 2. 等待服务器任务结束（带 5 秒超时保护）
-        if let Some(handle) = self.server_handle.write().await.take() {
-            match tokio::time::timeout(std::time::Duration::from_secs(5), handle).await {
-                Ok(Ok(())) => log::info!("代理服务器已完全停止"),
-                Ok(Err(e)) => log::warn!("代理服务器任务异常终止: {e}"),
-                Err(_) => log::warn!("代理服务器停止超时（5秒），强制继续"),
-            }
-        }
-
-        Ok(())
    }

    pub async fn get_status(&self) -> ProxyStatus {
@@ -191,23 +152,16 @@ impl ProxyServer {
            .route("/v1/messages", post(handlers::handle_messages))
            .route("/claude/v1/messages", post(handlers::handle_messages))
            // OpenAI Chat Completions API (Codex CLI，支持带前缀和不带前缀)
-            .route("/chat/completions", post(handlers::handle_chat_completions))
            .route(
                "/v1/chat/completions",
                post(handlers::handle_chat_completions),
            )
-            .route(
-                "/v1/v1/chat/completions",
-                post(handlers::handle_chat_completions),
-            )
            .route(
                "/codex/v1/chat/completions",
                post(handlers::handle_chat_completions),
            )
            // OpenAI Responses API (Codex CLI，支持带前缀和不带前缀)
-            .route("/responses", post(handlers::handle_responses))
            .route("/v1/responses", post(handlers::handle_responses))
-            .route("/v1/v1/responses", post(handlers::handle_responses))
            .route("/codex/v1/responses", post(handlers::handle_responses))
            // Gemini API (支持带前缀和不带前缀)
            .route("/v1beta/*path", post(handlers::handle_gemini))
@@ -220,22 +174,4 @@ impl ProxyServer {
    pub async fn apply_runtime_config(&self, config: &ProxyConfig) {
        *self.state.config.write().await = config.clone();
    }
-
-    /// 热更新熔断器配置
-    ///
-    /// 将新配置应用到所有已创建的熔断器实例
-    pub async fn update_circuit_breaker_configs(
-        &self,
-        config: super::circuit_breaker::CircuitBreakerConfig,
-    ) {
-        self.state.provider_router.update_all_configs(config).await;
-    }
-
-    /// 重置指定 Provider 的熔断器
-    pub async fn reset_provider_circuit_breaker(&self, provider_id: &str, app_type: &str) {
-        self.state
-            .provider_router
-            .reset_provider_breaker(provider_id, app_type)
-            .await;
-    }
 }
@@ -3,6 +3,8 @@ use serde::{Deserialize, Serialize};
 /// 代理服务器配置
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ProxyConfig {
+    /// 是否启用代理服务
+    pub enabled: bool,
    /// 监听地址
    pub listen_address: String,
    /// 监听端口
@@ -21,6 +23,7 @@ pub struct ProxyConfig {
 impl Default for ProxyConfig {
    fn default() -> Self {
        Self {
+            enabled: false,
            listen_address: "127.0.0.1".to_string(),
            listen_port: 15721, // 使用较少占用的高位端口
            max_retries: 3,
@@ -83,14 +86,6 @@ pub struct ProxyServerInfo {
    pub started_at: String,
 }

-/// 各应用的接管状态（是否改写该应用的 Live 配置指向本地代理）
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
-pub struct ProxyTakeoverStatus {
-    pub claude: bool,
-    pub codex: bool,
-    pub gemini: bool,
-}
-
 /// API 格式类型（预留，当前不需要格式转换）
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[allow(dead_code)]
@@ -107,8 +107,6 @@ impl<'a> UsageLogger<'a> {
    }

    /// 记录失败的请求
-    ///
-    /// 用于记录无法从上游获取 usage 信息的失败请求
    #[allow(dead_code, clippy::too_many_arguments)]
    pub fn log_error(
        &self,
@@ -140,43 +138,6 @@ impl<'a> UsageLogger<'a> {
        self.log_request(&log)
    }

-    /// 记录失败的请求（带更多上下文信息）
-    ///
-    /// 相比 log_error，这个方法接受更多参数以提供完整的请求上下文
-    #[allow(clippy::too_many_arguments)]
-    pub fn log_error_with_context(
-        &self,
-        request_id: String,
-        provider_id: String,
-        app_type: String,
-        model: String,
-        status_code: u16,
-        error_message: String,
-        latency_ms: u64,
-        is_streaming: bool,
-        session_id: Option<String>,
-        provider_type: Option<String>,
-    ) -> Result<(), AppError> {
-        let log = RequestLog {
-            request_id,
-            provider_id,
-            app_type,
-            model,
-            usage: TokenUsage::default(),
-            cost: None,
-            latency_ms,
-            first_token_ms: None,
-            status_code,
-            error_message: Some(error_message),
-            session_id,
-            provider_type,
-            is_streaming,
-            cost_multiplier: "1.0".to_string(),
-        };
-
-        self.log_request(&log)
-    }
-
    /// 获取模型定价
    pub fn get_model_pricing(&self, model_id: &str) -> Result<Option<ModelPricing>, AppError> {
        let conn = crate::database::lock_conn!(self.db.conn);
@@ -146,9 +146,7 @@ impl ConfigService {
        let cfg_text = settings.get("config").and_then(Value::as_str);

        crate::codex_config::write_codex_live_atomic(auth, cfg_text)?;
-        // 注意：MCP 同步在 v3.7.0 中已通过 McpService 进行，不再在此调用
-        // sync_enabled_to_codex 使用旧的 config.mcp.codex 结构，在新架构中为空
-        // MCP 的启用/禁用应通过 McpService::toggle_app 进行
+        crate::mcp::sync_enabled_to_codex(config)?;

        let cfg_text_after = crate::codex_config::read_and_validate_codex_config_text()?;
        if let Some(manager) = config.get_manager_mut(&AppType::Codex) {
@@ -17,27 +17,8 @@ impl McpService {

    /// 添加或更新 MCP 服务器
    pub fn upsert_server(state: &AppState, server: McpServer) -> Result<(), AppError> {
-        // 读取旧状态：用于处理“编辑时取消勾选某个应用”的场景（需要从对应 live 配置中移除）
-        let prev_apps = state
-            .db
-            .get_all_mcp_servers()?
-            .get(&server.id)
-            .map(|s| s.apps.clone())
-            .unwrap_or_default();
-
        state.db.save_mcp_server(&server)?;

-        // 处理禁用：若旧版本启用但新版本取消，则需要从该应用的 live 配置移除
-        if prev_apps.claude && !server.apps.claude {
-            Self::remove_server_from_app(state, &server.id, &AppType::Claude)?;
-        }
-        if prev_apps.codex && !server.apps.codex {
-            Self::remove_server_from_app(state, &server.id, &AppType::Codex)?;
-        }
-        if prev_apps.gemini && !server.apps.gemini {
-            Self::remove_server_from_app(state, &server.id, &AppType::Gemini)?;
-        }
-
        // 同步到各个启用的应用
        Self::sync_server_to_apps(state, &server)?;

@@ -209,22 +190,10 @@ impl McpService {
        // 如果有导入的服务器，保存到数据库
        if count > 0 {
            if let Some(servers) = &temp_config.mcp.servers {
-                let mut existing = state.db.get_all_mcp_servers()?;
                for server in servers.values() {
-                    // 已存在：仅启用 Claude，不覆盖其他字段（与导入模块语义保持一致）
-                    let to_save = if let Some(existing_server) = existing.get(&server.id) {
-                        let mut merged = existing_server.clone();
-                        merged.apps.claude = true;
-                        merged
-                    } else {
-                        server.clone()
-                    };
-
-                    state.db.save_mcp_server(&to_save)?;
-                    existing.insert(to_save.id.clone(), to_save.clone());
-
-                    // 同步到对应应用 live 配置
-                    Self::sync_server_to_apps(state, &to_save)?;
+                    state.db.save_mcp_server(server)?;
+                    // 同步到 Claude live 配置
+                    Self::sync_server_to_apps(state, server)?;
                }
            }
        }
@@ -243,22 +212,10 @@ impl McpService {
        // 如果有导入的服务器，保存到数据库
        if count > 0 {
            if let Some(servers) = &temp_config.mcp.servers {
-                let mut existing = state.db.get_all_mcp_servers()?;
                for server in servers.values() {
-                    // 已存在：仅启用 Codex，不覆盖其他字段（与导入模块语义保持一致）
-                    let to_save = if let Some(existing_server) = existing.get(&server.id) {
-                        let mut merged = existing_server.clone();
-                        merged.apps.codex = true;
-                        merged
-                    } else {
-                        server.clone()
-                    };
-
-                    state.db.save_mcp_server(&to_save)?;
-                    existing.insert(to_save.id.clone(), to_save.clone());
-
-                    // 同步到对应应用 live 配置
-                    Self::sync_server_to_apps(state, &to_save)?;
+                    state.db.save_mcp_server(server)?;
+                    // 同步到 Codex live 配置
+                    Self::sync_server_to_apps(state, server)?;
                }
            }
        }
@@ -277,22 +234,10 @@ impl McpService {
        // 如果有导入的服务器，保存到数据库
        if count > 0 {
            if let Some(servers) = &temp_config.mcp.servers {
-                let mut existing = state.db.get_all_mcp_servers()?;
                for server in servers.values() {
-                    // 已存在：仅启用 Gemini，不覆盖其他字段（与导入模块语义保持一致）
-                    let to_save = if let Some(existing_server) = existing.get(&server.id) {
-                        let mut merged = existing_server.clone();
-                        merged.apps.gemini = true;
-                        merged
-                    } else {
-                        server.clone()
-                    };
-
-                    state.db.save_mcp_server(&to_save)?;
-                    existing.insert(to_save.id.clone(), to_save.clone());
-
-                    // 同步到对应应用 live 配置
-                    Self::sync_server_to_apps(state, &to_save)?;
+                    state.db.save_mcp_server(server)?;
+                    // 同步到 Gemini live 配置
+                    Self::sync_server_to_apps(state, server)?;
                }
            }
        }
@@ -144,29 +144,9 @@ impl ProviderService {
        state.db.save_provider(app_type.as_str(), &provider)?;

        if is_current {
-            // 如果代理接管模式处于激活状态，并且代理服务正在运行：
-            // - 不写 Live 配置（否则会破坏接管）
-            // - 仅更新 Live 备份（保证关闭代理时能恢复到最新配置）
-            let is_app_taken_over =
-                futures::executor::block_on(state.db.get_live_backup(app_type.as_str()))
-                    .ok()
-                    .flatten()
-                    .is_some();
-            let is_proxy_running = futures::executor::block_on(state.proxy_service.is_running());
-            let should_skip_live_write = is_app_taken_over && is_proxy_running;
-
-            if should_skip_live_write {
-                futures::executor::block_on(
-                    state
-                        .proxy_service
-                        .update_live_backup_from_provider(app_type.as_str(), &provider),
-                )
-                .map_err(|e| AppError::Message(format!("更新 Live 备份失败: {e}")))?;
-            } else {
-                write_live_snapshot(&app_type, &provider)?;
-                // Sync MCP
-                McpService::sync_all_enabled(state)?;
-            }
+            write_live_snapshot(&app_type, &provider)?;
+            // Sync MCP
+            McpService::sync_all_enabled(state)?;
        }

        Ok(true)
@@ -211,15 +191,12 @@ impl ProviderService {
        // Check if proxy takeover mode is active AND proxy server is actually running
        // Both conditions must be true to use hot-switch mode
        // Use blocking wait since this is a sync function
-        let is_app_taken_over =
-            futures::executor::block_on(state.db.get_live_backup(app_type.as_str()))
-                .ok()
-                .flatten()
-                .is_some();
+        let is_takeover_flag =
+            futures::executor::block_on(state.db.is_live_takeover_active()).unwrap_or(false);
        let is_proxy_running = futures::executor::block_on(state.proxy_service.is_running());

-        // Hot-switch only when BOTH: this app is taken over AND proxy server is actually running
-        let should_hot_switch = is_app_taken_over && is_proxy_running;
+        // Hot-switch only when BOTH: takeover flag is set AND proxy server is actually running
+        let should_hot_switch = is_takeover_flag && is_proxy_running;

        if should_hot_switch {
            // Proxy takeover mode: hot-switch only, don't write Live config
@@ -229,31 +206,28 @@ impl ProviderService {
                id
            );

-            // 获取新供应商的完整配置（用于更新备份）
-            let provider = providers
-                .get(id)
-                .ok_or_else(|| AppError::Message(format!("供应商 {id} 不存在")))?;
-
            // Update database is_current
            state.db.set_current_provider(app_type.as_str(), id)?;

+            // 同时更新 is_proxy_target（代理路由器使用此字段选择供应商）
+            state.db.set_proxy_target_provider(app_type.as_str(), id)?;
+
            // Update local settings for consistency
            crate::settings::set_current_provider(&app_type, Some(id))?;

-            // 更新 Live 备份（确保代理关闭时恢复正确的供应商配置）
-            futures::executor::block_on(
-                state
-                    .proxy_service
-                    .update_live_backup_from_provider(app_type.as_str(), provider),
-            )
-            .map_err(|e| AppError::Message(format!("更新 Live 备份失败: {e}")))?;
-
            // Note: No Live config write, no MCP sync
-            // The proxy server will route requests to the new provider via is_current
+            // The proxy server will route requests to the new provider via is_proxy_target
            return Ok(());
        }

        // Normal mode: full switch with Live config write
+        // Also clear stale takeover flag if proxy is not running but flag was set
+        if is_takeover_flag && !is_proxy_running {
+            log::warn!("检测到代理接管标志残留（代理已停止），清除标志并执行正常切换");
+            // Clear stale takeover flag
+            let _ = futures::executor::block_on(state.db.set_live_takeover_active(false));
+        }
+
        Self::switch_normal(state, app_type, id, &providers)
    }

@@ -300,6 +274,18 @@ impl ProviderService {
        Ok(())
    }

+    /// Set proxy target provider
+    pub fn set_proxy_target(state: &AppState, app_type: AppType, id: &str) -> Result<(), AppError> {
+        // Check if provider exists
+        let providers = state.db.get_all_providers(app_type.as_str())?;
+        if !providers.contains_key(id) {
+            return Err(AppError::Message(format!("供应商 {id} 不存在")));
+        }
+
+        state.db.set_proxy_target_provider(app_type.as_str(), id)?;
+        Ok(())
+    }
+
    /// Sync current provider to live configuration (re-export)
    pub fn sync_current_to_live(state: &AppState) -> Result<(), AppError> {
        sync_current_to_live(state)
@@ -79,34 +79,6 @@ pub(crate) async fn execute_and_format_usage_result(
    }
 }

-/// Extract API key from provider configuration
-fn extract_api_key_from_provider(provider: &crate::provider::Provider) -> Option<String> {
-    if let Some(env) = provider.settings_config.get("env") {
-        // Try multiple possible API key fields
-        env.get("ANTHROPIC_AUTH_TOKEN")
-            .or_else(|| env.get("ANTHROPIC_API_KEY"))
-            .or_else(|| env.get("OPENROUTER_API_KEY"))
-            .or_else(|| env.get("GOOGLE_API_KEY"))
-            .and_then(|v| v.as_str())
-            .map(|s| s.to_string())
-    } else {
-        None
-    }
-}
-
-/// Extract base URL from provider configuration
-fn extract_base_url_from_provider(provider: &crate::provider::Provider) -> Option<String> {
-    if let Some(env) = provider.settings_config.get("env") {
-        // Try multiple possible base URL fields
-        env.get("ANTHROPIC_BASE_URL")
-            .or_else(|| env.get("GOOGLE_GEMINI_BASE_URL"))
-            .and_then(|v| v.as_str())
-            .map(|s| s.trim_end_matches('/').to_string())
-    } else {
-        None
-    }
-}
-
 /// Query provider usage (using saved script configuration)
 pub async fn query_usage(
    state: &AppState,
@@ -142,26 +114,12 @@ pub async fn query_usage(
            ));
        }

-        // Get credentials: prioritize UsageScript values, fallback to provider config
-        let api_key = usage_script
-            .api_key
-            .clone()
-            .filter(|k| !k.is_empty())
-            .or_else(|| extract_api_key_from_provider(provider))
-            .unwrap_or_default();
-
-        let base_url = usage_script
-            .base_url
-            .clone()
-            .filter(|u| !u.is_empty())
-            .or_else(|| extract_base_url_from_provider(provider))
-            .unwrap_or_default();
-
+        // Get credentials directly from UsageScript, no longer extract from provider config
        (
            usage_script.code.clone(),
            usage_script.timeout.unwrap_or(10),
-            api_key,
-            base_url,
+            usage_script.api_key.clone().unwrap_or_default(),
+            usage_script.base_url.clone().unwrap_or_default(),
            usage_script.access_token.clone(),
            usage_script.user_id.clone(),
        )
@@ -31,51 +31,40 @@ impl SpeedtestService {
            return Ok(vec![]);
        }

-        let mut results: Vec<Option<EndpointLatency>> = vec![None; urls.len()];
-        let mut valid_targets = Vec::new();
-
-        for (idx, raw_url) in urls.into_iter().enumerate() {
-            let trimmed = raw_url.trim().to_string();
-
-            if trimmed.is_empty() {
-                results[idx] = Some(EndpointLatency {
-                    url: raw_url,
-                    latency: None,
-                    status: None,
-                    error: Some("URL 不能为空".to_string()),
-                });
-                continue;
-            }
-
-            match Url::parse(&trimmed) {
-                Ok(parsed_url) => valid_targets.push((idx, trimmed, parsed_url)),
-                Err(err) => {
-                    results[idx] = Some(EndpointLatency {
-                        url: trimmed,
-                        latency: None,
-                        status: None,
-                        error: Some(format!("URL 无效: {err}")),
-                    });
-                }
-            }
-        }
-
-        if valid_targets.is_empty() {
-            return Ok(results.into_iter().flatten().collect::<Vec<_>>());
-        }
-
        let timeout = Self::sanitize_timeout(timeout_secs);
        let client = Self::build_client(timeout)?;

-        let tasks = valid_targets.into_iter().map(|(idx, trimmed, parsed_url)| {
+        let tasks = urls.into_iter().map(|raw_url| {
            let client = client.clone();
            async move {
+                let trimmed = raw_url.trim().to_string();
+                if trimmed.is_empty() {
+                    return EndpointLatency {
+                        url: raw_url,
+                        latency: None,
+                        status: None,
+                        error: Some("URL 不能为空".to_string()),
+                    };
+                }
+
+                let parsed_url = match Url::parse(&trimmed) {
+                    Ok(url) => url,
+                    Err(err) => {
+                        return EndpointLatency {
+                            url: trimmed,
+                            latency: None,
+                            status: None,
+                            error: Some(format!("URL 无效: {err}")),
+                        };
+                    }
+                };
+
                // 先进行一次热身请求，忽略结果，仅用于复用连接/绕过首包惩罚。
                let _ = client.get(parsed_url.clone()).send().await;

                // 第二次请求开始计时，并将其作为结果返回。
                let start = Instant::now();
-                let latency = match client.get(parsed_url).send().await {
+                match client.get(parsed_url).send().await {
                    Ok(resp) => EndpointLatency {
                        url: trimmed,
                        latency: Some(start.elapsed().as_millis()),
@@ -99,17 +88,11 @@ impl SpeedtestService {
                            error: Some(error_message),
                        }
                    }
-                };
-
-                (idx, latency)
+                }
            }
        });

-        for (idx, latency) in join_all(tasks).await {
-            results[idx] = Some(latency);
-        }
-
-        Ok(results.into_iter().flatten().collect::<Vec<_>>())
+        Ok(join_all(tasks).await)
    }

    fn build_client(timeout_secs: u64) -> Result<Client, AppError> {
@@ -31,9 +31,6 @@ pub struct AppSettings {
    /// 是否启用 Claude 插件联动
    #[serde(default)]
    pub enable_claude_plugin_integration: bool,
-    /// 是否跳过 Claude Code 初次安装确认
-    #[serde(default = "default_true")]
-    pub skip_claude_onboarding: bool,
    /// 是否开机自启
    #[serde(default)]
    pub launch_on_startup: bool,
@@ -68,17 +65,12 @@ fn default_minimize_to_tray_on_close() -> bool {
    true
 }

-fn default_true() -> bool {
-    true
-}
-
 impl Default for AppSettings {
    fn default() -> Self {
        Self {
            show_in_tray: true,
            minimize_to_tray_on_close: true,
            enable_claude_plugin_integration: false,
-            skip_claude_onboarding: true,
            launch_on_startup: false,
            language: None,
            claude_config_dir: None,
@@ -1,7 +1,7 @@
 {
  "$schema": "https://schema.tauri.app/config/2",
  "productName": "CC Switch",
-  "version": "3.9.0-2",
+  "version": "3.8.2",
  "identifier": "com.ccswitch.desktop",
  "build": {
    "frontendDist": "../dist",
@@ -4,9 +4,7 @@
    "windows": [
      {
        "label": "main",
-        "titleBarStyle": "Visible",
-        "minWidth": 900,
-        "minHeight": 600
+        "titleBarStyle": "Visible"
      }
    ]
  }
@@ -1,8 +1,6 @@
 use std::sync::Arc;

-use cc_switch_lib::{
-    import_provider_from_deeplink, parse_deeplink_url, AppState, Database, ProxyService,
-};
+use cc_switch_lib::{import_provider_from_deeplink, parse_deeplink_url, AppState, Database};

 #[path = "support.rs"]
 mod support;
@@ -18,11 +16,8 @@ fn deeplink_import_claude_provider_persists_to_db() {
    let request = parse_deeplink_url(url).expect("parse deeplink url");

    let db = Arc::new(Database::memory().expect("create memory db"));
-    let proxy_service = ProxyService::new(db.clone());
-    let state = AppState {
-        db: db.clone(),
-        proxy_service,
-    };
+
+    let state = AppState { db: db.clone() };

    let provider_id = import_provider_from_deeplink(&state, request.clone())
        .expect("import provider from deeplink");
@@ -58,11 +53,8 @@ fn deeplink_import_codex_provider_builds_auth_and_config() {
    let request = parse_deeplink_url(url).expect("parse deeplink url");

    let db = Arc::new(Database::memory().expect("create memory db"));
-    let proxy_service = ProxyService::new(db.clone());
-    let state = AppState {
-        db: db.clone(),
-        proxy_service,
-    };
+
+    let state = AppState { db: db.clone() };

    let provider_id = import_provider_from_deeplink(&state, request.clone())
        .expect("import provider from deeplink");
@@ -76,8 +76,19 @@ fn sync_codex_provider_writes_auth_and_config() {

    let mut config = MultiAppConfig::default();

-    // 注意：v3.7.0 后 MCP 同步由 McpService 独立处理，不再通过 provider 切换触发
-    // 此测试仅验证 auth.json 和 config.toml 基础配置的写入
+    // 添加入测 MCP 启用项，确保 sync_enabled_to_codex 会写入 TOML
+    config.mcp.codex.servers.insert(
+        "echo-server".into(),
+        json!({
+            "id": "echo-server",
+            "enabled": true,
+            "server": {
+                "type": "stdio",
+                "command": "echo",
+                "args": ["hello"]
+            }
+        }),
+    );

    let provider_config = json!({
        "auth": {
@@ -122,10 +133,9 @@ fn sync_codex_provider_writes_auth_and_config() {
    );

    let toml_text = fs::read_to_string(&config_path).expect("read config.toml");
-    // 验证基础配置正确写入
    assert!(
-        toml_text.contains("base_url"),
-        "config.toml should contain base_url from provider config"
+        toml_text.contains("command = \"echo\""),
+        "config.toml should contain serialized enabled MCP server"
    );

    // 当前供应商应同步最新 config 文本
@@ -144,12 +154,6 @@ fn sync_enabled_to_codex_writes_enabled_servers() {
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();

-    // 模拟 Codex 已安装/已初始化：存在 ~/.codex 目录
-    let path = cc_switch_lib::get_codex_config_path();
-    if let Some(parent) = path.parent() {
-        fs::create_dir_all(parent).expect("create codex dir");
-    }
-
    let mut config = MultiAppConfig::default();
    config.mcp.codex.servers.insert(
        "stdio-enabled".into(),
@@ -166,6 +170,7 @@ fn sync_enabled_to_codex_writes_enabled_servers() {

    cc_switch_lib::sync_enabled_to_codex(&config).expect("sync codex");

+    let path = cc_switch_lib::get_codex_config_path();
    assert!(path.exists(), "config.toml should be created");
    let text = fs::read_to_string(&path).expect("read config.toml");
    assert!(
@@ -589,11 +594,6 @@ command = "echo"
 fn sync_claude_enabled_mcp_projects_to_user_config() {
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 模拟 Claude 已安装/已初始化：存在 ~/.claude 目录
-    fs::create_dir_all(home.join(".claude")).expect("create claude dir");
-
    let mut config = MultiAppConfig::default();

    config.mcp.claude.servers.insert(
@@ -993,76 +993,3 @@ fn export_sql_returns_error_for_invalid_path() {
        other => panic!("expected IoContext or Io error, got {other:?}"),
    }
 }
-
-#[test]
-fn import_sql_rejects_non_cc_switch_backup() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    let state = create_test_state().expect("create test state");
-
-    let import_path = home.join("not-cc-switch.sql");
-    fs::write(&import_path, "CREATE TABLE x (id INTEGER);").expect("write import sql");
-
-    let err = state
-        .db
-        .import_sql(&import_path)
-        .expect_err("non-cc-switch sql should be rejected");
-
-    match err {
-        AppError::Localized { key, .. } => {
-            assert_eq!(key, "backup.sql.invalid_format");
-        }
-        other => panic!("expected Localized error, got {other:?}"),
-    }
-}
-
-#[test]
-fn import_sql_accepts_cc_switch_exported_backup() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // Create a database with some data and export it.
-    let mut config = MultiAppConfig::default();
-    {
-        let manager = config
-            .get_manager_mut(&AppType::Claude)
-            .expect("claude manager");
-        manager.current = "test-provider".to_string();
-        manager.providers.insert(
-            "test-provider".to_string(),
-            Provider::with_id(
-                "test-provider".to_string(),
-                "Test Provider".to_string(),
-                json!({"env": {"ANTHROPIC_API_KEY": "test-key"}}),
-                None,
-            ),
-        );
-    }
-
-    let state = create_test_state_with_config(&config).expect("create test state");
-    let export_path = home.join("cc-switch-export.sql");
-    state
-        .db
-        .export_sql(&export_path)
-        .expect("export should succeed");
-
-    // Reset database, then import into a fresh one.
-    reset_test_fs();
-    let state = create_test_state().expect("create test state");
-    state
-        .db
-        .import_sql(&export_path)
-        .expect("import should succeed");
-
-    let providers = state
-        .db
-        .get_all_providers(AppType::Claude.as_str())
-        .expect("load providers");
-    assert!(
-        providers.contains_key("test-provider"),
-        "imported providers should contain test-provider"
-    );
-}
@@ -246,311 +246,3 @@ fn set_mcp_enabled_for_codex_writes_live_config() {
        "codex config should include the enabled server definition"
    );
 }
-
-#[test]
-fn enabling_codex_mcp_skips_when_codex_dir_missing() {
-    use support::create_test_state;
-
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 确认 Codex 配置目录不存在（模拟“未安装/未运行过 Codex CLI”）
-    assert!(
-        !home.join(".codex").exists(),
-        "~/.codex should not exist in fresh test environment"
-    );
-
-    let state = create_test_state().expect("create test state");
-
-    // 先插入一个未启用 Codex 的 MCP 服务器（避免 upsert 触发同步）
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "codex-server".to_string(),
-            name: "Codex Server".to_string(),
-            server: json!({
-                "type": "stdio",
-                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("insert server without syncing");
-
-    // 启用 Codex：目录缺失时应跳过写入（不创建 ~/.codex/config.toml）
-    McpService::toggle_app(&state, "codex-server", AppType::Codex, true)
-        .expect("toggle codex should succeed even when ~/.codex is missing");
-
-    assert!(
-        !home.join(".codex").exists(),
-        "~/.codex should still not exist after skipped sync"
-    );
-}
-
-#[test]
-fn upsert_mcp_server_disabling_app_removes_from_claude_live_config() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 模拟 Claude 已安装/已初始化：存在 ~/.claude 目录
-    fs::create_dir_all(home.join(".claude")).expect("create ~/.claude dir");
-
-    // 先创建一个启用 Claude 的 MCP 服务器
-    let state = support::create_test_state().expect("create test state");
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "echo".to_string(),
-            name: "echo".to_string(),
-            server: json!({
-                "type": "stdio",
-                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: true,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("upsert should sync to Claude live config");
-
-    // 确认已写入 ~/.claude.json
-    let mcp_path = get_claude_mcp_path();
-    let text = fs::read_to_string(&mcp_path).expect("read ~/.claude.json");
-    let v: serde_json::Value = serde_json::from_str(&text).expect("parse ~/.claude.json");
-    assert!(
-        v.pointer("/mcpServers/echo").is_some(),
-        "echo should exist in Claude live config after enabling"
-    );
-
-    // 再次 upsert：取消勾选 Claude（apps.claude=false），应从 Claude live 配置中移除
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "echo".to_string(),
-            name: "echo".to_string(),
-            server: json!({
-                "type": "stdio",
-                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("upsert disabling app should remove from Claude live config");
-
-    let text = fs::read_to_string(&mcp_path).expect("read ~/.claude.json after disable");
-    let v: serde_json::Value = serde_json::from_str(&text).expect("parse ~/.claude.json");
-    assert!(
-        v.pointer("/mcpServers/echo").is_none(),
-        "echo should be removed from Claude live config after disabling"
-    );
-}
-
-#[test]
-fn import_mcp_from_multiple_apps_merges_enabled_flags() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 1) Claude: ~/.claude.json
-    let mcp_path = get_claude_mcp_path();
-    let claude_json = json!({
-        "mcpServers": {
-            "shared": {
-                "type": "stdio",
-                "command": "echo"
-            }
-        }
-    });
-    fs::write(
-        &mcp_path,
-        serde_json::to_string_pretty(&claude_json).expect("serialize claude mcp"),
-    )
-    .expect("seed ~/.claude.json");
-
-    // 2) Codex: ~/.codex/config.toml
-    let codex_dir = home.join(".codex");
-    fs::create_dir_all(&codex_dir).expect("create codex dir");
-    fs::write(
-        codex_dir.join("config.toml"),
-        r#"[mcp_servers.shared]
-type = "stdio"
-command = "echo"
-"#,
-    )
-    .expect("seed ~/.codex/config.toml");
-
-    let state = support::create_test_state().expect("create test state");
-
-    McpService::import_from_claude(&state).expect("import from claude");
-    McpService::import_from_codex(&state).expect("import from codex");
-
-    let servers = state.db.get_all_mcp_servers().expect("get all mcp servers");
-    let entry = servers.get("shared").expect("shared server exists");
-    assert!(entry.apps.claude, "shared should enable Claude");
-    assert!(entry.apps.codex, "shared should enable Codex");
-}
-
-#[test]
-fn import_mcp_from_gemini_sse_url_only_is_valid() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // Gemini MCP 位于 ~/.gemini/settings.json
-    let gemini_dir = home.join(".gemini");
-    fs::create_dir_all(&gemini_dir).expect("create gemini dir");
-    let settings_path = gemini_dir.join("settings.json");
-
-    // Gemini SSE：只包含 url（Gemini 不使用 type 字段）
-    let gemini_settings = json!({
-        "mcpServers": {
-            "sse-server": {
-                "url": "https://example.com/sse"
-            }
-        }
-    });
-    fs::write(
-        &settings_path,
-        serde_json::to_string_pretty(&gemini_settings).expect("serialize gemini settings"),
-    )
-    .expect("seed ~/.gemini/settings.json");
-
-    let state = support::create_test_state().expect("create test state");
-    let changed = McpService::import_from_gemini(&state).expect("import from gemini");
-    assert!(changed > 0, "should import at least 1 server");
-
-    let servers = state.db.get_all_mcp_servers().expect("get all mcp servers");
-    let entry = servers.get("sse-server").expect("sse-server exists");
-    assert!(entry.apps.gemini, "imported server should enable Gemini");
-    assert_eq!(
-        entry.server.get("type").and_then(|v| v.as_str()),
-        Some("sse"),
-        "Gemini url-only server should be normalized to type=sse in unified structure"
-    );
-}
-
-#[test]
-fn enabling_gemini_mcp_skips_when_gemini_dir_missing() {
-    use support::create_test_state;
-
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 确认 Gemini 配置目录不存在（模拟“未安装/未运行过 Gemini CLI”）
-    assert!(
-        !home.join(".gemini").exists(),
-        "~/.gemini should not exist in fresh test environment"
-    );
-
-    let state = create_test_state().expect("create test state");
-
-    // 先插入一个未启用 Gemini 的 MCP 服务器（避免 upsert 触发同步）
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "gemini-server".to_string(),
-            name: "Gemini Server".to_string(),
-            server: json!({
-                "type": "sse",
-                "url": "https://example.com/sse"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("insert server without syncing");
-
-    // 启用 Gemini：目录缺失时应跳过写入（不创建 ~/.gemini/settings.json）
-    McpService::toggle_app(&state, "gemini-server", AppType::Gemini, true)
-        .expect("toggle gemini should succeed even when ~/.gemini is missing");
-
-    assert!(
-        !home.join(".gemini").exists(),
-        "~/.gemini should still not exist after skipped sync"
-    );
-}
-
-#[test]
-fn enabling_claude_mcp_skips_when_claude_config_absent() {
-    use support::create_test_state;
-
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 确认 Claude 相关目录/文件都不存在（模拟“未安装/未运行过 Claude”）
-    assert!(
-        !home.join(".claude").exists(),
-        "~/.claude should not exist in fresh test environment"
-    );
-    assert!(
-        !home.join(".claude.json").exists(),
-        "~/.claude.json should not exist in fresh test environment"
-    );
-
-    let state = create_test_state().expect("create test state");
-
-    // 先插入一个未启用 Claude 的 MCP 服务器（避免 upsert 触发同步）
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "claude-server".to_string(),
-            name: "Claude Server".to_string(),
-            server: json!({
-                "type": "stdio",
-                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("insert server without syncing");
-
-    // 启用 Claude：配置缺失时应跳过写入（不创建 ~/.claude.json）
-    McpService::toggle_app(&state, "claude-server", AppType::Claude, true)
-        .expect("toggle claude should succeed even when ~/.claude is missing");
-
-    assert!(
-        !home.join(".claude.json").exists(),
-        "~/.claude.json should still not exist after skipped sync"
-    );
-}
@@ -1,9 +1,7 @@
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, OnceLock};

-use cc_switch_lib::{
-    update_settings, AppSettings, AppState, Database, MultiAppConfig, ProxyService,
-};
+use cc_switch_lib::{update_settings, AppSettings, AppState, Database, MultiAppConfig};

 /// 为测试设置隔离的 HOME 目录，避免污染真实用户数据。
 pub fn ensure_test_home() -> &'static Path {
@@ -50,17 +48,15 @@ pub fn test_mutex() -> &'static Mutex<()> {

 /// 创建测试用的 AppState，包含一个空的数据库
 pub fn create_test_state() -> Result<AppState, Box<dyn std::error::Error>> {
-    let db = Arc::new(Database::init()?);
-    let proxy_service = ProxyService::new(db.clone());
-    Ok(AppState { db, proxy_service })
+    let db = Database::init()?;
+    Ok(AppState { db: Arc::new(db) })
 }

 /// 创建测试用的 AppState，并从 MultiAppConfig 迁移数据
 pub fn create_test_state_with_config(
    config: &MultiAppConfig,
 ) -> Result<AppState, Box<dyn std::error::Error>> {
-    let db = Arc::new(Database::init()?);
+    let db = Database::init()?;
    db.migrate_from_json(config)?;
-    let proxy_service = ProxyService::new(db.clone());
-    Ok(AppState { db, proxy_service })
+    Ok(AppState { db: Arc::new(db) })
 }
@@ -1,9 +1,7 @@
 import { useEffect, useMemo, useState, useRef } from "react";
 import { useTranslation } from "react-i18next";
-import { motion, AnimatePresence } from "framer-motion";
 import { toast } from "sonner";
 import { invoke } from "@tauri-apps/api/core";
-import { useQueryClient } from "@tanstack/react-query";
 import {
  Plus,
  Settings,
@@ -47,13 +45,8 @@ import { Button } from "@/components/ui/button";

 type View = "providers" | "settings" | "prompts" | "skills" | "mcp" | "agents";

-const DRAG_BAR_HEIGHT = 28; // px
-const HEADER_HEIGHT = 64; // px
-const CONTENT_TOP_OFFSET = DRAG_BAR_HEIGHT + HEADER_HEIGHT;
-
 function App() {
  const { t } = useTranslation();
-  const queryClient = useQueryClient();

  const [activeApp, setActiveApp] = useState<AppId>("claude");
  const [currentView, setCurrentView] = useState<View>("providers");
@@ -65,22 +58,6 @@ function App() {
  const [envConflicts, setEnvConflicts] = useState<EnvConflict[]>([]);
  const [showEnvBanner, setShowEnvBanner] = useState(false);

-  // 保存最后一个有效的 provider，用于动画退出期间显示内容
-  const lastUsageProviderRef = useRef<Provider | null>(null);
-  const lastEditingProviderRef = useRef<Provider | null>(null);
-
-  useEffect(() => {
-    if (usageProvider) {
-      lastUsageProviderRef.current = usageProvider;
-    }
-  }, [usageProvider]);
-
-  useEffect(() => {
-    if (editingProvider) {
-      lastEditingProviderRef.current = editingProvider;
-    }
-  }, [editingProvider]);
-
  const promptPanelRef = useRef<any>(null);
  const mcpPanelRef = useRef<any>(null);
  const skillsPageRef = useRef<any>(null);
@@ -88,20 +65,7 @@ function App() {
    "bg-orange-500 hover:bg-orange-600 dark:bg-orange-500 dark:hover:bg-orange-600 text-white shadow-lg shadow-orange-500/30 dark:shadow-orange-500/40 rounded-full w-8 h-8";

  // 获取代理服务状态
-  const {
-    isRunning: isProxyRunning,
-    takeoverStatus,
-    status: proxyStatus,
-  } = useProxyStatus();
-  // 当前应用的代理是否开启
-  const isCurrentAppTakeoverActive = takeoverStatus?.[activeApp] || false;
-  // 当前应用代理实际使用的供应商 ID（从 active_targets 中获取）
-  const activeProviderId = useMemo(() => {
-    const target = proxyStatus?.active_targets?.find(
-      (t) => t.app_type === activeApp,
-    );
-    return target?.provider_id;
-  }, [proxyStatus?.active_targets, activeApp]);
+  const { isRunning: isProxyRunning, isTakeoverActive } = useProxyStatus();

  // 获取供应商列表，当代理服务运行时自动刷新
  const { data, isLoading, refetch } = useProvidersQuery(activeApp, {
@@ -178,7 +142,6 @@ function App() {
        if (migrated) {
          toast.success(
            t("migration.success", { defaultValue: "配置迁移成功" }),
-            { closeButton: true },
          );
        }
      } catch (error) {
@@ -304,20 +267,7 @@ function App() {

  // 导入配置成功后刷新
  const handleImportSuccess = async () => {
-    try {
-      // 导入会影响所有应用的供应商数据：刷新所有 providers 缓存
-      await queryClient.invalidateQueries({
-        queryKey: ["providers"],
-        refetchType: "all",
-      });
-      await queryClient.refetchQueries({
-        queryKey: ["providers"],
-        type: "all",
-      });
-    } catch (error) {
-      console.error("[App] Failed to refresh providers after import", error);
-      await refetch();
-    }
+    await refetch();
    try {
      await providersApi.updateTrayMenu();
    } catch (error) {
@@ -326,109 +276,79 @@ function App() {
  };

  const renderContent = () => {
-    const content = (() => {
-      switch (currentView) {
-        case "settings":
-          return (
-            <SettingsPage
-              open={true}
-              onOpenChange={() => setCurrentView("providers")}
-              onImportSuccess={handleImportSuccess}
-            />
-          );
-        case "prompts":
-          return (
-            <PromptPanel
-              ref={promptPanelRef}
-              open={true}
-              onOpenChange={() => setCurrentView("providers")}
-              appId={activeApp}
-            />
-          );
-        case "skills":
-          return (
-            <SkillsPage
-              ref={skillsPageRef}
-              onClose={() => setCurrentView("providers")}
-              initialApp={activeApp}
-            />
-          );
-        case "mcp":
-          return (
-            <UnifiedMcpPanel
-              ref={mcpPanelRef}
-              onOpenChange={() => setCurrentView("providers")}
-            />
-          );
-        case "agents":
-          return (
-            <AgentsPanel onOpenChange={() => setCurrentView("providers")} />
-          );
-        default:
-          return (
-            <div className="mx-auto max-w-[56rem] px-5 flex flex-col h-[calc(100vh-8rem)] overflow-hidden">
-              {/* 独立滚动容器 - 解决 Linux/Ubuntu 下 DndContext 与滚轮事件冲突 */}
-              <div className="flex-1 overflow-y-auto overflow-x-hidden pb-12 px-1">
-                <AnimatePresence mode="wait">
-                  <motion.div
-                    key={activeApp}
-                    initial={{ opacity: 0 }}
-                    animate={{ opacity: 1 }}
-                    exit={{ opacity: 0 }}
-                    transition={{ duration: 0.15 }}
-                    className="space-y-4"
-                  >
-                    <ProviderList
-                      providers={providers}
-                      currentProviderId={currentProviderId}
-                      appId={activeApp}
-                      isLoading={isLoading}
-                      isProxyRunning={isProxyRunning}
-                      isProxyTakeover={
-                        isProxyRunning && isCurrentAppTakeoverActive
-                      }
-                      activeProviderId={activeProviderId}
-                      onSwitch={switchProvider}
-                      onEdit={setEditingProvider}
-                      onDelete={setConfirmDelete}
-                      onDuplicate={handleDuplicateProvider}
-                      onConfigureUsage={setUsageProvider}
-                      onOpenWebsite={handleOpenWebsite}
-                      onCreate={() => setIsAddOpen(true)}
-                    />
-                  </motion.div>
-                </AnimatePresence>
+    switch (currentView) {
+      case "settings":
+        return (
+          <SettingsPage
+            open={true}
+            onOpenChange={() => setCurrentView("providers")}
+            onImportSuccess={handleImportSuccess}
+          />
+        );
+      case "prompts":
+        return (
+          <PromptPanel
+            ref={promptPanelRef}
+            open={true}
+            onOpenChange={() => setCurrentView("providers")}
+            appId={activeApp}
+          />
+        );
+      case "skills":
+        return (
+          <SkillsPage
+            ref={skillsPageRef}
+            onClose={() => setCurrentView("providers")}
+            initialApp={activeApp}
+          />
+        );
+      case "mcp":
+        return (
+          <UnifiedMcpPanel
+            ref={mcpPanelRef}
+            onOpenChange={() => setCurrentView("providers")}
+          />
+        );
+      case "agents":
+        return <AgentsPanel onOpenChange={() => setCurrentView("providers")} />;
+      default:
+        return (
+          <div className="mx-auto max-w-[56rem] px-5 flex flex-col h-[calc(100vh-8rem)] overflow-hidden">
+            {/* 独立滚动容器 - 解决 Linux/Ubuntu 下 DndContext 与滚轮事件冲突 */}
+            <div className="flex-1 overflow-y-auto overflow-x-hidden pb-12 px-1">
+              <div className="space-y-4">
+                <ProviderList
+                  providers={providers}
+                  currentProviderId={currentProviderId}
+                  appId={activeApp}
+                  isLoading={isLoading}
+                  isProxyRunning={isProxyRunning}
+                  isProxyTakeover={isProxyRunning && isTakeoverActive}
+                  onSwitch={switchProvider}
+                  onEdit={setEditingProvider}
+                  onDelete={setConfirmDelete}
+                  onDuplicate={handleDuplicateProvider}
+                  onConfigureUsage={setUsageProvider}
+                  onOpenWebsite={handleOpenWebsite}
+                  onCreate={() => setIsAddOpen(true)}
+                />
              </div>
            </div>
-          );
-      }
-    })();
-
-    return (
-      <AnimatePresence mode="wait">
-        <motion.div
-          key={currentView}
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 1 }}
-          exit={{ opacity: 0 }}
-          transition={{ duration: 0.2 }}
-        >
-          {content}
-        </motion.div>
-      </AnimatePresence>
-    );
+          </div>
+        );
+    }
  };

  return (
    <div
-      className="flex flex-col h-screen overflow-hidden bg-background text-foreground selection:bg-primary/30"
-      style={{ overflowX: "hidden", paddingTop: CONTENT_TOP_OFFSET }}
+      className="flex min-h-screen flex-col bg-background text-foreground selection:bg-primary/30"
+      style={{ overflowX: "hidden" }}
    >
-      {/* 全局拖拽区域（顶部 28px），避免上边框无法拖动 */}
+      {/* 全局拖拽区域（顶部 4px），避免上边框无法拖动 */}
      <div
-        className="fixed top-0 left-0 right-0 z-[60]"
+        className="fixed top-0 left-0 right-0 h-4 z-[60]"
        data-tauri-drag-region
-        style={{ WebkitAppRegion: "drag", height: DRAG_BAR_HEIGHT } as any}
+        style={{ WebkitAppRegion: "drag" } as any}
      />
      {/* 环境变量警告横幅 */}
      {showEnvBanner && envConflicts.length > 0 && (
@@ -458,18 +378,13 @@ function App() {
      )}

      <header
-        className="fixed z-50 w-full transition-all duration-300 bg-background/80 backdrop-blur-md"
+        className="fixed top-0 z-50 w-full py-3 bg-background/80 backdrop-blur-md transition-all duration-300"
        data-tauri-drag-region
-        style={
-          {
-            WebkitAppRegion: "drag",
-            top: DRAG_BAR_HEIGHT,
-            height: HEADER_HEIGHT,
-          } as any
-        }
+        style={{ WebkitAppRegion: "drag" } as any}
      >
+        <div className="h-4 w-full" aria-hidden data-tauri-drag-region />
        <div
-          className="mx-auto flex h-full max-w-[56rem] flex-wrap items-center justify-between gap-2 px-6"
+          className="mx-auto max-w-[56rem] px-6 flex flex-wrap items-center justify-between gap-2"
          data-tauri-drag-region
          style={{ WebkitAppRegion: "drag" } as any}
        >
@@ -485,7 +400,7 @@ function App() {
                  onClick={() => setCurrentView("providers")}
                  className="mr-2 rounded-lg"
                >
-                  <ArrowLeft className="w-4 h-4" />
+                  <ArrowLeft className="h-4 w-4" />
                </Button>
                <h1 className="text-lg font-semibold">
                  {currentView === "settings" && t("settings.title")}
@@ -505,9 +420,9 @@ function App() {
                    rel="noreferrer"
                    className={cn(
                      "text-xl font-semibold transition-colors",
-                      isProxyRunning && isCurrentAppTakeoverActive
+                      isProxyRunning && isTakeoverActive
                        ? "text-emerald-500 hover:text-emerald-600 dark:text-emerald-400 dark:hover:text-emerald-300"
-                        : "text-blue-500 hover:text-blue-600 dark:text-blue-400 dark:hover:text-blue-300",
+                        : "text-blue-500 hover:text-blue-600 dark:text-blue-400 dark:hover:text-blue-300"
                    )}
                  >
                    CC Switch
@@ -519,7 +434,7 @@ function App() {
                    title={t("common.settings")}
                    className="hover:bg-black/5 dark:hover:bg-white/5"
                  >
-                    <Settings className="w-4 h-4" />
+                    <Settings className="h-4 w-4" />
                  </Button>
                </div>
                <UpdateBadge onClick={() => setCurrentView("settings")} />
@@ -528,27 +443,27 @@ function App() {
          </div>

          <div
-            className="flex items-center gap-2 h-[32px]"
+            className="flex items-center gap-2"
            style={{ WebkitAppRegion: "no-drag" } as any}
          >
            {currentView === "prompts" && (
              <Button
                size="icon"
                onClick={() => promptPanelRef.current?.openAdd()}
-                className={`ml-auto ${addActionButtonClass}`}
+                className={addActionButtonClass}
                title={t("prompts.add")}
              >
-                <Plus className="w-5 h-5" />
+                <Plus className="h-5 w-5" />
              </Button>
            )}
            {currentView === "mcp" && (
              <Button
                size="icon"
                onClick={() => mcpPanelRef.current?.openAdd()}
-                className={`ml-auto ${addActionButtonClass}`}
+                className={addActionButtonClass}
                title={t("mcp.unifiedPanel.addServer")}
              >
-                <Plus className="w-5 h-5" />
+                <Plus className="h-5 w-5" />
              </Button>
            )}
            {currentView === "skills" && (
@@ -559,7 +474,7 @@ function App() {
                  onClick={() => skillsPageRef.current?.refresh()}
                  className="hover:bg-black/5 dark:hover:bg-white/5"
                >
-                  <RefreshCw className="w-4 h-4 mr-2" />
+                  <RefreshCw className="h-4 w-4 mr-2" />
                  {t("skills.refresh")}
                </Button>
                <Button
@@ -568,45 +483,41 @@ function App() {
                  onClick={() => skillsPageRef.current?.openRepoManager()}
                  className="hover:bg-black/5 dark:hover:bg-white/5"
                >
-                  <Settings className="w-4 h-4 mr-2" />
+                  <Settings className="h-4 w-4 mr-2" />
                  {t("skills.repoManager")}
                </Button>
              </>
            )}
            {currentView === "providers" && (
              <>
-                <ProxyToggle activeApp={activeApp} />
+                <ProxyToggle />

                <AppSwitcher activeApp={activeApp} onSwitch={setActiveApp} />

-                <div className="flex items-center gap-1 p-1 bg-muted rounded-xl">
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    onClick={() => setCurrentView("skills")}
-                    className={cn(
-                      "text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5",
-                      "transition-all duration-200 ease-in-out overflow-hidden",
-                      hasSkillsSupport
-                        ? "opacity-100 w-8 scale-100 px-2"
-                        : "opacity-0 w-0 scale-75 pointer-events-none px-0 -ml-1",
-                    )}
-                    title={t("skills.manage")}
-                  >
-                    <Wrench className="flex-shrink-0 w-4 h-4" />
-                  </Button>
+                <div className="bg-muted p-1 rounded-xl flex items-center gap-1">
+                  {hasSkillsSupport && (
+                    <Button
+                      variant="ghost"
+                      size="sm"
+                      onClick={() => setCurrentView("skills")}
+                      className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
+                      title={t("skills.manage")}
+                    >
+                      <Wrench className="h-4 w-4" />
+                    </Button>
+                  )}
                  {/* TODO: Agents 功能开发中，暂时隐藏入口 */}
                  {/* {isClaudeApp && (
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => setCurrentView("agents")}
-                        className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
-                        title="Agents"
-                      >
-                        <Bot className="w-4 h-4" />
-                      </Button>
-                    )} */}
+                    <Button
+                      variant="ghost"
+                      size="sm"
+                      onClick={() => setCurrentView("agents")}
+                      className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
+                      title="Agents"
+                    >
+                      <Bot className="h-4 w-4" />
+                    </Button>
+                  )} */}
                  <Button
                    variant="ghost"
                    size="sm"
@@ -614,7 +525,7 @@ function App() {
                    className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
                    title={t("prompts.manage")}
                  >
-                    <Book className="w-4 h-4" />
+                    <Book className="h-4 w-4" />
                  </Button>
                  <Button
                    variant="ghost"
@@ -623,7 +534,7 @@ function App() {
                    className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
                    title={t("mcp.title")}
                  >
-                    <Server className="w-4 h-4" />
+                    <Server className="h-4 w-4" />
                  </Button>
                </div>

@@ -632,7 +543,7 @@ function App() {
                  size="icon"
                  className={`ml-2 ${addActionButtonClass}`}
                >
-                  <Plus className="w-5 h-5" />
+                  <Plus className="h-5 w-5" />
                </Button>
              </>
            )}
@@ -640,10 +551,13 @@ function App() {
        </div>
      </header>

-      <main className="flex-1 pb-12 animate-fade-in ">
-        <div className="pb-12">
-          {renderContent()}
-        </div>
+      <main
+        className={`flex-1 overflow-y-auto pb-12 animate-fade-in scroll-overlay ${
+          currentView === "providers" ? "pt-24" : "pt-20"
+        }`}
+        style={{ overflowX: "hidden" }}
+      >
+        {renderContent()}
      </main>

      <AddProviderDialog
@@ -655,7 +569,7 @@ function App() {

      <EditProviderDialog
        open={Boolean(editingProvider)}
-        provider={lastEditingProviderRef.current}
+        provider={editingProvider}
        onOpenChange={(open) => {
          if (!open) {
            setEditingProvider(null);
@@ -663,19 +577,16 @@ function App() {
        }}
        onSubmit={handleEditProvider}
        appId={activeApp}
-        isProxyTakeover={isProxyRunning && isCurrentAppTakeoverActive}
      />

-      {lastUsageProviderRef.current && (
+      {usageProvider && (
        <UsageScriptModal
-          provider={lastUsageProviderRef.current}
+          provider={usageProvider}
          appId={activeApp}
          isOpen={Boolean(usageProvider)}
          onClose={() => setUsageProvider(null)}
          onSave={(script) => {
-            if (usageProvider) {
-              void saveUsageScript(usageProvider, script);
-            }
+            void saveUsageScript(usageProvider, script);
          }}
        />
      )}
@@ -24,11 +24,11 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
  };

  return (
-    <div className="inline-flex bg-muted rounded-xl p-1 gap-1">
+    <div className="inline-flex bg-muted rounded-lg p-1 gap-1">
      <button
        type="button"
        onClick={() => handleSwitch("claude")}
-        className={`group inline-flex items-center gap-2 px-3 h-8 rounded-md text-sm font-medium transition-all duration-200 ${
+        className={`group inline-flex items-center gap-2 px-3 py-2 rounded-md text-sm font-medium transition-all duration-200 ${
          activeApp === "claude"
            ? "bg-background text-foreground shadow-sm"
            : "text-muted-foreground hover:text-foreground hover:bg-background/50"
@@ -50,7 +50,7 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
      <button
        type="button"
        onClick={() => handleSwitch("codex")}
-        className={`group inline-flex items-center gap-2 px-3 h-8 rounded-md text-sm font-medium transition-all duration-200 ${
+        className={`group inline-flex items-center gap-2 px-3 py-2 rounded-md text-sm font-medium transition-all duration-200 ${
          activeApp === "codex"
            ? "bg-background text-foreground shadow-sm"
            : "text-muted-foreground hover:text-foreground hover:bg-background/50"
@@ -72,7 +72,7 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
      <button
        type="button"
        onClick={() => handleSwitch("gemini")}
-        className={`group inline-flex items-center gap-2 px-3 h-8 rounded-md text-sm font-medium transition-all duration-200 ${
+        className={`group inline-flex items-center gap-2 px-3 py-2 rounded-md text-sm font-medium transition-all duration-200 ${
          activeApp === "gemini"
            ? "bg-background text-foreground shadow-sm"
            : "text-muted-foreground hover:text-foreground hover:bg-background/50"
@@ -128,7 +128,6 @@ export function DeepLinkImportDialog() {
            description: t("deeplink.mcpImportSuccessDescription", {
              count: summary.importedCount,
            }),
-            closeButton: true,
          });
        }
      };
@@ -143,7 +142,6 @@ export function DeepLinkImportDialog() {
            description: t("deeplink.importSuccessDescription", {
              name: request.name,
            }),
-            closeButton: true,
          });
        } else if (result.type === "prompt") {
          // Prompts don't use React Query, trigger a custom event for refresh
@@ -156,7 +154,6 @@ export function DeepLinkImportDialog() {
            description: t("deeplink.promptImportSuccessDescription", {
              name: request.name,
            }),
-            closeButton: true,
          });
        } else if (result.type === "mcp") {
          await refreshMcp(result);
@@ -174,7 +171,6 @@ export function DeepLinkImportDialog() {
            description: t("deeplink.skillImportSuccessDescription", {
              repo: request.repo,
            }),
-            closeButton: true,
          });
        }
      } else if (isMcpImportResult(result)) {
@@ -189,7 +185,6 @@ export function DeepLinkImportDialog() {
          description: t("deeplink.importSuccessDescription", {
            name: request.name,
          }),
-          closeButton: true,
        });
      }

@@ -610,86 +605,6 @@ export function DeepLinkImportDialog() {
                    </div>
                  )}

-                  {/* Usage Script Configuration (v3.9+) */}
-                  {request.usageScript && (
-                    <div className="space-y-3 pt-2 border-t border-border-default">
-                      <div className="grid grid-cols-3 items-center gap-4">
-                        <div className="font-medium text-sm text-muted-foreground">
-                          {t("deeplink.usageScript", {
-                            defaultValue: "用量查询",
-                          })}
-                        </div>
-                        <div className="col-span-2 text-sm">
-                          <span
-                            className={`inline-flex items-center px-2 py-0.5 rounded-md text-xs font-medium ${
-                              request.usageEnabled !== false
-                                ? "bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-300"
-                                : "bg-gray-100 dark:bg-gray-800 text-gray-600 dark:text-gray-400"
-                            }`}
-                          >
-                            {request.usageEnabled !== false
-                              ? t("deeplink.usageScriptEnabled", {
-                                  defaultValue: "已启用",
-                                })
-                              : t("deeplink.usageScriptDisabled", {
-                                  defaultValue: "未启用",
-                                })}
-                          </span>
-                        </div>
-                      </div>
-
-                      {/* Usage API Key (if different from provider) */}
-                      {request.usageApiKey &&
-                        request.usageApiKey !== request.apiKey && (
-                          <div className="grid grid-cols-3 items-center gap-4">
-                            <div className="font-medium text-sm text-muted-foreground">
-                              {t("deeplink.usageApiKey", {
-                                defaultValue: "用量 API Key",
-                              })}
-                            </div>
-                            <div className="col-span-2 text-sm font-mono text-muted-foreground">
-                              {request.usageApiKey.length > 4
-                                ? `${request.usageApiKey.substring(0, 4)}${"*".repeat(12)}`
-                                : "****"}
-                            </div>
-                          </div>
-                        )}
-
-                      {/* Usage Base URL (if different from provider) */}
-                      {request.usageBaseUrl &&
-                        request.usageBaseUrl !== request.endpoint && (
-                          <div className="grid grid-cols-3 items-center gap-4">
-                            <div className="font-medium text-sm text-muted-foreground">
-                              {t("deeplink.usageBaseUrl", {
-                                defaultValue: "用量查询地址",
-                              })}
-                            </div>
-                            <div className="col-span-2 text-sm break-all">
-                              {request.usageBaseUrl}
-                            </div>
-                          </div>
-                        )}
-
-                      {/* Auto Query Interval */}
-                      {request.usageAutoInterval &&
-                        request.usageAutoInterval > 0 && (
-                          <div className="grid grid-cols-3 items-center gap-4">
-                            <div className="font-medium text-sm text-muted-foreground">
-                              {t("deeplink.usageAutoInterval", {
-                                defaultValue: "自动查询",
-                              })}
-                            </div>
-                            <div className="col-span-2 text-sm">
-                              {t("deeplink.usageAutoIntervalValue", {
-                                defaultValue: "每 {{minutes}} 分钟",
-                                minutes: request.usageAutoInterval,
-                              })}
-                            </div>
-                          </div>
-                        )}
-                    </div>
-                  )}
-
                  {/* Warning */}
                  <div className="rounded-lg bg-yellow-50 dark:bg-yellow-900/20 p-3 text-sm text-yellow-800 dark:text-yellow-200">
                    {t("deeplink.warning")}
@@ -234,9 +234,7 @@ const JsonEditor: React.FC<JsonEditorProps> = ({
    try {
      const formatted = formatJSON(currentValue);
      onChange(formatted);
-      toast.success(t("common.formatSuccess", { defaultValue: "格式化成功" }), {
-        closeButton: true,
-      });
+      toast.success(t("common.formatSuccess", { defaultValue: "格式化成功" }));
    } catch (error) {
      const errorMessage =
        error instanceof Error ? error.message : String(error);
@@ -56,7 +56,7 @@ export function UpdateBadge({ className = "", onClick }: UpdateBadgeProps) {
        "
        aria-label={t("common.close")}
      >
-        <X className="w-3 h-3 text-muted-foreground" />
+        <X className="w-3 h-3 text-gray-400 dark:text-gray-500" />
      </button>
    </div>
  );
@@ -114,7 +114,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
        {/* 第一行：更新时间和刷新按钮 */}
        <div className="flex items-center gap-2 justify-end">
          {/* 上次查询时间 */}
-          <span className="text-[10px] text-muted-foreground/70 flex items-center gap-1">
+          <span className="text-[10px] text-gray-400 dark:text-gray-500 flex items-center gap-1">
            <Clock size={10} />
            {lastQueriedAt
              ? formatRelativeTime(lastQueriedAt, now, t)
@@ -128,7 +128,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
              refetch();
            }}
            disabled={loading}
-            className="p-1 rounded hover:bg-muted transition-colors disabled:opacity-50 flex-shrink-0 text-muted-foreground"
+            className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors disabled:opacity-50 flex-shrink-0 text-gray-400 dark:text-gray-500"
            title={t("usage.refreshUsage")}
          >
            <RefreshCw size={12} className={loading ? "animate-spin" : ""} />
@@ -191,7 +191,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
        <div className="flex items-center gap-2">
          {/* 自动查询时间提示 */}
          {lastQueriedAt && (
-            <span className="text-[10px] text-muted-foreground/70 flex items-center gap-1">
+            <span className="text-[10px] text-gray-400 dark:text-gray-500 flex items-center gap-1">
              <Clock size={10} />
              {formatRelativeTime(lastQueriedAt, now, t)}
            </span>
@@ -227,7 +227,6 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
          .join(", ");
        toast.success(`${t("usageScript.testSuccess")}${summary}`, {
          duration: 3000,
-          closeButton: true,
        });
      } else {
        toast.error(
@@ -260,10 +259,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
        printWidth: 80,
      });
      setScript({ ...script, code: formatted.trim() });
-      toast.success(t("usageScript.formatSuccess"), {
-        duration: 1000,
-        closeButton: true,
-      });
+      toast.success(t("usageScript.formatSuccess"), { duration: 1000 });
    } catch (error: any) {
      toast.error(
        `${t("usageScript.formatFailed")}: ${error?.message || t("jsonEditor.invalidJson")}`,
@@ -404,25 +400,15 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
            {/* 凭证配置 */}
            {shouldShowCredentialsConfig && (
              <div className="space-y-4">
-                <div className="flex items-start justify-between">
-                  <h4 className="text-sm font-medium text-foreground">
-                    {t("usageScript.credentialsConfig")}
-                  </h4>
-                  <p className="text-xs text-muted-foreground">
-                    {t("usageScript.credentialsHint")}
-                  </p>
-                </div>
+                <h4 className="text-sm font-medium text-foreground">
+                  {t("usageScript.credentialsConfig")}
+                </h4>

                <div className="grid gap-4 md:grid-cols-2">
                  {selectedTemplate === TEMPLATE_KEYS.GENERAL && (
                    <>
                      <div className="space-y-2">
-                        <Label htmlFor="usage-api-key">
-                          API Key{" "}
-                          <span className="text-xs text-muted-foreground font-normal">
-                            ({t("usageScript.optional")})
-                          </span>
-                        </Label>
+                        <Label htmlFor="usage-api-key">API Key</Label>
                        <div className="relative">
                          <Input
                            id="usage-api-key"
@@ -431,7 +417,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
                            onChange={(e) =>
                              setScript({ ...script, apiKey: e.target.value })
                            }
-                            placeholder={t("usageScript.apiKeyPlaceholder")}
+                            placeholder="sk-xxxxx"
                            autoComplete="off"
                            className="border-white/10"
                          />
@@ -458,10 +444,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({

                      <div className="space-y-2">
                        <Label htmlFor="usage-base-url">
-                          {t("usageScript.baseUrl")}{" "}
-                          <span className="text-xs text-muted-foreground font-normal">
-                            ({t("usageScript.optional")})
-                          </span>
+                          {t("usageScript.baseUrl")}
                        </Label>
                        <Input
                          id="usage-base-url"
@@ -470,7 +453,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
                          onChange={(e) =>
                            setScript({ ...script, baseUrl: e.target.value })
                          }
-                          placeholder={t("usageScript.baseUrlPlaceholder")}
+                          placeholder="https://api.example.com"
                          autoComplete="off"
                          className="border-white/10"
                        />
@@ -1,6 +1,5 @@
 import React from "react";
 import { createPortal } from "react-dom";
-import { motion, AnimatePresence } from "framer-motion";
 import { ArrowLeft } from "lucide-react";
 import { Button } from "@/components/ui/button";

@@ -33,52 +32,46 @@ export const FullScreenPanel: React.FC<FullScreenPanelProps> = ({
    };
  }, [isOpen]);

+  if (!isOpen) return null;
+
  return createPortal(
-    <AnimatePresence>
-      {isOpen && (
-        <motion.div
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 1 }}
-          exit={{ opacity: 0 }}
-          transition={{ duration: 0.2 }}
-          className="fixed inset-0 z-[60] flex flex-col"
+    <div
+      className="fixed inset-0 z-[60] flex flex-col"
+      style={{ backgroundColor: "hsl(var(--background))" }}
+    >
+      {/* Header */}
+      <div
+        className="flex-shrink-0 py-3 border-b border-border-default"
+        style={{ backgroundColor: "hsl(var(--background))" }}
+      >
+        <div className="h-4 w-full" data-tauri-drag-region />
+        <div className="mx-auto max-w-[56rem] px-6 flex items-center gap-4">
+          <Button type="button" variant="outline" size="icon" onClick={onClose}>
+            <ArrowLeft className="h-4 w-4" />
+          </Button>
+          <h2 className="text-lg font-semibold text-foreground">{title}</h2>
+        </div>
+      </div>
+
+      {/* Content */}
+      <div className="flex-1 overflow-y-auto scroll-overlay">
+        <div className="mx-auto max-w-[56rem] px-6 py-6 space-y-6 w-full">
+          {children}
+        </div>
+      </div>
+
+      {/* Footer */}
+      {footer && (
+        <div
+          className="flex-shrink-0 py-4 border-t border-border-default"
          style={{ backgroundColor: "hsl(var(--background))" }}
        >
-          {/* Header */}
-          <div
-            className="flex-shrink-0 py-3 border-b border-border-default"
-            style={{ backgroundColor: "hsl(var(--background))" }}
-          >
-            <div className="h-4 w-full" data-tauri-drag-region />
-            <div className="mx-auto max-w-[56rem] px-6 flex items-center gap-4">
-              <Button type="button" variant="outline" size="icon" onClick={onClose}>
-                <ArrowLeft className="h-4 w-4" />
-              </Button>
-              <h2 className="text-lg font-semibold text-foreground">{title}</h2>
-            </div>
+          <div className="mx-auto max-w-[56rem] px-6 flex items-center justify-end gap-3">
+            {footer}
          </div>
-
-          {/* Content */}
-          <div className="flex-1 overflow-y-auto scroll-overlay">
-            <div className="mx-auto max-w-[56rem] px-6 py-6 space-y-6 w-full">
-              {children}
-            </div>
-          </div>
-
-          {/* Footer */}
-          {footer && (
-            <div
-              className="flex-shrink-0 py-4 border-t border-border-default"
-              style={{ backgroundColor: "hsl(var(--background))" }}
-            >
-              <div className="mx-auto max-w-[56rem] px-6 flex items-center justify-end gap-3">
-                {footer}
-              </div>
-            </div>
-          )}
-        </motion.div>
+        </div>
      )}
-    </AnimatePresence>,
+    </div>,
    document.body,
  );
 };
@@ -79,7 +79,6 @@ export function EnvWarningBanner({
          path: backupInfo.backupPath,
        }),
        duration: 5000,
-        closeButton: true,
      });

      // 清空选择并通知父组件
@@ -198,7 +197,7 @@ export function EnvWarningBanner({
                            <p className="text-xs text-gray-600 dark:text-gray-400 mt-1 break-all">
                              {t("env.field.value")}: {conflict.varValue}
                            </p>
-                            <p className="text-xs text-muted-foreground mt-1">
+                            <p className="text-xs text-gray-500 dark:text-gray-500 mt-1">
                              {t("env.field.source")}:{" "}
                              {getSourceDescription(conflict)}
                            </p>
@@ -391,7 +391,7 @@ const McpFormModal: React.FC<McpFormModalProps> = ({
      }

      await upsertMutation.mutateAsync(entry);
-      toast.success(t("common.success"), { closeButton: true });
+      toast.success(t("common.success"));
      await onSave();
    } catch (error: any) {
      const detail = extractErrorMessage(error);
@@ -99,7 +99,7 @@ const UnifiedMcpPanel = React.forwardRef<
        try {
          await deleteServerMutation.mutateAsync(id);
          setConfirmDialog(null);
-          toast.success(t("common.success"), { closeButton: true });
+          toast.success(t("common.success"));
        } catch (error) {
          toast.error(t("common.error"), {
            description: String(error),
@@ -129,18 +129,18 @@ const UnifiedMcpPanel = React.forwardRef<
      {/* Content - Scrollable */}
      <div className="flex-1 overflow-y-auto overflow-x-hidden pb-24">
        {isLoading ? (
-          <div className="text-center py-12 text-muted-foreground">
+          <div className="text-center py-12 text-gray-500 dark:text-gray-400">
            {t("mcp.loading")}
          </div>
        ) : serverEntries.length === 0 ? (
          <div className="text-center py-12">
-            <div className="w-16 h-16 mx-auto mb-4 bg-muted rounded-full flex items-center justify-center">
-              <Server size={24} className="text-muted-foreground" />
+            <div className="w-16 h-16 mx-auto mb-4 bg-gray-100 dark:bg-gray-800 rounded-full flex items-center justify-center">
+              <Server size={24} className="text-gray-400 dark:text-gray-500" />
            </div>
-            <h3 className="text-lg font-medium text-foreground mb-2">
+            <h3 className="text-lg font-medium text-gray-900 dark:text-gray-100 mb-2">
              {t("mcp.unifiedPanel.noServers")}
            </h3>
-            <p className="text-muted-foreground text-sm">
+            <p className="text-gray-500 dark:text-gray-400 text-sm">
              {t("mcp.emptyDescription")}
            </p>
          </div>
@@ -237,7 +237,9 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
      {/* 左侧：服务器信息 */}
      <div className="flex-1 min-w-0">
        <div className="flex items-center gap-2 mb-1">
-          <h3 className="font-medium text-foreground">{name}</h3>
+          <h3 className="font-medium text-gray-900 dark:text-gray-100">
+            {name}
+          </h3>
          {docsUrl && (
            <Button
              type="button"
@@ -251,12 +253,12 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
          )}
        </div>
        {description && (
-          <p className="text-sm text-muted-foreground line-clamp-2">
+          <p className="text-sm text-gray-500 dark:text-gray-400 line-clamp-2">
            {description}
          </p>
        )}
        {!description && tags && tags.length > 0 && (
-          <p className="text-xs text-muted-foreground/70 truncate">
+          <p className="text-xs text-gray-400 dark:text-gray-500 truncate">
            {tags.join(", ")}
          </p>
        )}
@@ -267,7 +269,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
        <div className="flex items-center justify-between gap-3">
          <label
            htmlFor={`${id}-claude`}
-            className="text-sm text-foreground/80 cursor-pointer"
+            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
          >
            {t("mcp.unifiedPanel.apps.claude")}
          </label>
@@ -283,7 +285,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
        <div className="flex items-center justify-between gap-3">
          <label
            htmlFor={`${id}-codex`}
-            className="text-sm text-foreground/80 cursor-pointer"
+            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
          >
            {t("mcp.unifiedPanel.apps.codex")}
          </label>
@@ -299,7 +301,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
        <div className="flex items-center justify-between gap-3">
          <label
            htmlFor={`${id}-gemini`}
-            className="text-sm text-foreground/80 cursor-pointer"
+            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
          >
            {t("mcp.unifiedPanel.apps.gemini")}
          </label>
@@ -36,9 +36,11 @@ const PromptListItem: React.FC<PromptListItemProps> = ({
        </div>

        <div className="flex-1 min-w-0">
-          <h3 className="font-medium text-foreground mb-1">{prompt.name}</h3>
+          <h3 className="font-medium text-gray-900 dark:text-gray-100 mb-1">
+            {prompt.name}
+          </h3>
          {prompt.description && (
-            <p className="text-sm text-muted-foreground truncate">
+            <p className="text-sm text-gray-500 dark:text-gray-400 truncate">
              {prompt.description}
            </p>
          )}
@@ -108,18 +108,21 @@ const PromptPanel = React.forwardRef<PromptPanelHandle, PromptPanelProps>(

        <div className="flex-1 overflow-y-auto pb-16">
          {loading ? (
-            <div className="text-center py-12 text-muted-foreground">
+            <div className="text-center py-12 text-gray-500 dark:text-gray-400">
              {t("prompts.loading")}
            </div>
          ) : promptEntries.length === 0 ? (
            <div className="text-center py-12">
-              <div className="w-16 h-16 mx-auto mb-4 bg-muted rounded-full flex items-center justify-center">
-                <FileText size={24} className="text-muted-foreground" />
+              <div className="w-16 h-16 mx-auto mb-4 bg-gray-100 dark:bg-gray-800 rounded-full flex items-center justify-center">
+                <FileText
+                  size={24}
+                  className="text-gray-400 dark:text-gray-500"
+                />
              </div>
-              <h3 className="text-lg font-medium text-foreground mb-2">
+              <h3 className="text-lg font-medium text-gray-900 dark:text-gray-100 mb-2">
                {t("prompts.empty")}
              </h3>
-              <p className="text-muted-foreground text-sm">
+              <p className="text-gray-500 dark:text-gray-400 text-sm">
                {t("prompts.emptyDescription")}
              </p>
            </div>
@@ -16,7 +16,6 @@ interface EditProviderDialogProps {
  onOpenChange: (open: boolean) => void;
  onSubmit: (provider: Provider) => Promise<void> | void;
  appId: AppId;
-  isProxyTakeover?: boolean; // 代理接管模式下不读取 live（避免显示被接管后的代理配置）
 }

 export function EditProviderDialog({
@@ -25,7 +24,6 @@ export function EditProviderDialog({
  onOpenChange,
  onSubmit,
  appId,
-  isProxyTakeover = false,
 }: EditProviderDialogProps) {
  const { t } = useTranslation();

@@ -52,16 +50,6 @@ export function EditProviderDialog({
        return;
      }

-      // 代理接管模式：Live 配置已被代理改写，读取 live 会导致编辑界面展示代理地址/占位符等内容
-      // 因此直接回退到 SSOT（数据库）配置，避免用户困惑与误保存
-      if (isProxyTakeover) {
-        if (!cancelled) {
-          setLiveSettings(null);
-          setHasLoadedLive(true);
-        }
-        return;
-      }
-
      try {
        const currentId = await providersApi.getCurrent(appId);
        if (currentId && provider.id === currentId) {
@@ -94,7 +82,7 @@ export function EditProviderDialog({
    return () => {
      cancelled = true;
    };
-  }, [open, provider?.id, appId, hasLoadedLive, isProxyTakeover]); // 只依赖 provider.id，不依赖整个 provider 对象
+  }, [open, provider?.id, appId, hasLoadedLive]); // 只依赖 provider.id，不依赖整个 provider 对象

  const initialSettingsConfig = useMemo(() => {
    return (liveSettings ?? provider?.settingsConfig ?? {}) as Record<
@@ -1,34 +0,0 @@
-import { cn } from "@/lib/utils";
-import { useTranslation } from "react-i18next";
-
-interface FailoverPriorityBadgeProps {
-  priority: number; // 1, 2, 3, ...
-  className?: string;
-}
-
-/**
- * 故障转移优先级徽章
- * 显示供应商在故障转移队列中的优先级顺序
- */
-export function FailoverPriorityBadge({
-  priority,
-  className,
-}: FailoverPriorityBadgeProps) {
-  const { t } = useTranslation();
-
-  return (
-    <div
-      className={cn(
-        "inline-flex items-center px-1.5 py-0.5 rounded text-xs font-semibold",
-        "bg-emerald-500/10 text-emerald-600 dark:text-emerald-400",
-        className,
-      )}
-      title={t("failover.priority.tooltip", {
-        priority,
-        defaultValue: `故障转移优先级 ${priority}`,
-      })}
-    >
-      P{priority}
-    </div>
-  );
-}
@@ -1,7 +1,6 @@
 import React from "react";
 import { cn } from "@/lib/utils";
 import type { HealthStatus } from "@/lib/api/model-test";
-import { useTranslation } from "react-i18next";

 interface HealthStatusIndicatorProps {
  status: HealthStatus;
@@ -12,20 +11,17 @@ interface HealthStatusIndicatorProps {
 const statusConfig = {
  operational: {
    color: "bg-emerald-500",
-    labelKey: "health.operational",
-    labelFallback: "正常",
+    label: "正常",
    textColor: "text-emerald-600 dark:text-emerald-400",
  },
  degraded: {
    color: "bg-yellow-500",
-    labelKey: "health.degraded",
-    labelFallback: "降级",
+    label: "降级",
    textColor: "text-yellow-600 dark:text-yellow-400",
  },
  failed: {
    color: "bg-red-500",
-    labelKey: "health.failed",
-    labelFallback: "失败",
+    label: "失败",
    textColor: "text-red-600 dark:text-red-400",
  },
 };
@@ -35,15 +31,13 @@ export const HealthStatusIndicator: React.FC<HealthStatusIndicatorProps> = ({
  responseTimeMs,
  className,
 }) => {
-  const { t } = useTranslation();
  const config = statusConfig[status];
-  const label = t(config.labelKey, { defaultValue: config.labelFallback });

  return (
    <div className={cn("flex items-center gap-2", className)}>
      <div className={cn("w-2 h-2 rounded-full", config.color)} />
      <span className={cn("text-xs font-medium", config.textColor)}>
-        {label}
+        {config.label}
        {responseTimeMs !== undefined && ` (${responseTimeMs}ms)`}
      </span>
    </div>
@@ -5,9 +5,9 @@ import {
  Edit,
  Loader2,
  Play,
-  Plus,
  TestTube2,
  Trash2,
+  RotateCcw,
 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
@@ -23,10 +23,9 @@ interface ProviderActionsProps {
  onTest?: () => void;
  onConfigureUsage: () => void;
  onDelete: () => void;
-  // 故障转移相关
-  isAutoFailoverEnabled?: boolean;
-  isInFailoverQueue?: boolean;
-  onToggleFailover?: (enabled: boolean) => void;
+  onResetCircuitBreaker?: () => void;
+  isProxyTarget?: boolean;
+  consecutiveFailures?: number;
 }

 export function ProviderActions({
@@ -39,88 +38,41 @@ export function ProviderActions({
  onTest,
  onConfigureUsage,
  onDelete,
-  // 故障转移相关
-  isAutoFailoverEnabled = false,
-  isInFailoverQueue = false,
-  onToggleFailover,
+  onResetCircuitBreaker,
+  isProxyTarget,
+  consecutiveFailures = 0,
 }: ProviderActionsProps) {
  const { t } = useTranslation();
  const iconButtonClass = "h-8 w-8 p-1";

-  // 故障转移模式下的按钮逻辑
-  const isFailoverMode = isAutoFailoverEnabled && onToggleFailover;
-
-  // 处理主按钮点击
-  const handleMainButtonClick = () => {
-    if (isFailoverMode) {
-      // 故障转移模式：切换队列状态
-      onToggleFailover(!isInFailoverQueue);
-    } else {
-      // 普通模式：切换供应商
-      onSwitch();
-    }
-  };
-
-  // 主按钮的状态和样式
-  const getMainButtonState = () => {
-    if (isFailoverMode) {
-      // 故障转移模式
-      if (isInFailoverQueue) {
-        return {
-          disabled: false,
-          variant: "secondary" as const,
-          className:
-            "bg-blue-100 text-blue-600 hover:bg-blue-200 dark:bg-blue-900/50 dark:text-blue-400 dark:hover:bg-blue-900/70",
-          icon: <Check className="h-4 w-4" />,
-          text: t("failover.inQueue", { defaultValue: "已加入" }),
-        };
-      }
-      return {
-        disabled: false,
-        variant: "default" as const,
-        className:
-          "bg-blue-500 hover:bg-blue-600 dark:bg-blue-600 dark:hover:bg-blue-700",
-        icon: <Plus className="h-4 w-4" />,
-        text: t("failover.addQueue", { defaultValue: "加入" }),
-      };
-    }
-
-    // 普通模式
-    if (isCurrent) {
-      return {
-        disabled: true,
-        variant: "secondary" as const,
-        className:
-          "bg-gray-200 text-muted-foreground hover:bg-gray-200 hover:text-muted-foreground dark:bg-gray-700 dark:hover:bg-gray-700",
-        icon: <Check className="h-4 w-4" />,
-        text: t("provider.inUse"),
-      };
-    }
-
-    return {
-      disabled: false,
-      variant: "default" as const,
-      className: isProxyTakeover
-        ? "bg-emerald-500 hover:bg-emerald-600 dark:bg-emerald-600 dark:hover:bg-emerald-700"
-        : "",
-      icon: <Play className="h-4 w-4" />,
-      text: t("provider.enable"),
-    };
-  };
-
-  const buttonState = getMainButtonState();
-
  return (
    <div className="flex items-center gap-1.5">
      <Button
        size="sm"
-        variant={buttonState.variant}
-        onClick={handleMainButtonClick}
-        disabled={buttonState.disabled}
-        className={cn("w-[4.5rem] px-2.5", buttonState.className)}
+        variant={isCurrent ? "secondary" : "default"}
+        onClick={onSwitch}
+        disabled={isCurrent}
+        className={cn(
+          "w-[4.5rem] px-2.5",
+          isCurrent &&
+            "bg-gray-200 text-muted-foreground hover:bg-gray-200 hover:text-muted-foreground dark:bg-gray-700 dark:hover:bg-gray-700",
+          // 代理接管模式下启用按钮使用绿色
+          !isCurrent &&
+            isProxyTakeover &&
+            "bg-emerald-500 hover:bg-emerald-600 dark:bg-emerald-600 dark:hover:bg-emerald-700"
+        )}
      >
-        {buttonState.icon}
-        {buttonState.text}
+        {isCurrent ? (
+          <>
+            <Check className="h-4 w-4" />
+            {t("provider.inUse")}
+          </>
+        ) : (
+          <>
+            <Play className="h-4 w-4" />
+            {t("provider.enable")}
+          </>
+        )}
      </Button>

      <div className="flex items-center gap-1">
@@ -171,6 +123,33 @@ export function ProviderActions({
          <BarChart3 className="h-4 w-4" />
        </Button>

+        {/* 重置熔断器按钮 - 代理目标启用时显示 */}
+        {/* TODO: 暂时隐藏，后续根据故障转移功能启用 */}
+        {/* {onResetCircuitBreaker && isProxyTarget && (
+          <Button
+            size="icon"
+            variant="ghost"
+            onClick={onResetCircuitBreaker}
+            disabled={consecutiveFailures === 0}
+            title={
+              consecutiveFailures > 0
+                ? t("provider.resetCircuitBreaker", {
+                    defaultValue: "重置熔断器",
+                  })
+                : t("provider.noFailures", {
+                    defaultValue: "当前无失败记录",
+                  })
+            }
+            className={cn(
+              iconButtonClass,
+              consecutiveFailures > 0 &&
+                "hover:text-orange-500 dark:hover:text-orange-400",
+            )}
+          >
+            <RotateCcw className="h-4 w-4" />
+          </Button>
+        )} */}
+
        <Button
          size="icon"
          variant="ghost"
@@ -179,7 +158,7 @@ export function ProviderActions({
          className={cn(
            iconButtonClass,
            !isCurrent && "hover:text-red-500 dark:hover:text-red-400",
-            isCurrent && "opacity-40 cursor-not-allowed text-muted-foreground",
+            isCurrent && "opacity-40 cursor-not-allowed text-muted-foreground"
          )}
        >
          <Trash2 className="h-4 w-4" />
@@ -1,5 +1,5 @@
-import { useMemo, useState, useEffect } from "react";
-import { GripVertical, ChevronDown, ChevronUp } from "lucide-react";
+import { useMemo } from "react";
+import { GripVertical } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import type {
  DraggableAttributes,
@@ -12,9 +12,11 @@ import { ProviderActions } from "@/components/providers/ProviderActions";
 import { ProviderIcon } from "@/components/ProviderIcon";
 import UsageFooter from "@/components/UsageFooter";
 import { ProviderHealthBadge } from "@/components/providers/ProviderHealthBadge";
-import { FailoverPriorityBadge } from "@/components/providers/FailoverPriorityBadge";
-import { useProviderHealth } from "@/lib/query/failover";
-import { useUsageQuery } from "@/lib/query/queries";
+import {
+  useProviderHealth,
+  useResetCircuitBreaker,
+} from "@/lib/query/failover";
+import { toast } from "sonner";

 interface DragHandleProps {
  attributes: DraggableAttributes;
@@ -37,12 +39,6 @@ interface ProviderCardProps {
  isProxyRunning: boolean;
  isProxyTakeover?: boolean; // 代理接管模式（Live配置已被接管，切换为热切换）
  dragHandleProps?: DragHandleProps;
-  // 故障转移相关
-  isAutoFailoverEnabled?: boolean; // 是否开启自动故障转移
-  failoverPriority?: number; // 故障转移优先级（1 = P1, 2 = P2, ...）
-  isInFailoverQueue?: boolean; // 是否在故障转移队列中
-  onToggleFailover?: (enabled: boolean) => void; // 切换故障转移队列
-  activeProviderId?: string; // 代理当前实际使用的供应商 ID（用于故障转移模式下标注绿色边框）
 }

 const extractApiUrl = (provider: Provider, fallbackText: string) => {
@@ -95,18 +91,37 @@ export function ProviderCard({
  isProxyRunning,
  isProxyTakeover = false,
  dragHandleProps,
-  // 故障转移相关
-  isAutoFailoverEnabled = false,
-  failoverPriority,
-  isInFailoverQueue = false,
-  onToggleFailover,
-  activeProviderId,
 }: ProviderCardProps) {
  const { t } = useTranslation();

  // 获取供应商健康状态
  const { data: health } = useProviderHealth(provider.id, appId);

+  // 重置熔断器
+  const resetCircuitBreaker = useResetCircuitBreaker();
+
+  const handleResetCircuitBreaker = async () => {
+    try {
+      await resetCircuitBreaker.mutateAsync({
+        providerId: provider.id,
+        appType: appId,
+      });
+      toast.success(
+        t("provider.circuitBreakerReset", {
+          defaultValue: "熔断器已重置",
+        }),
+      );
+    } catch (error) {
+      toast.error(
+        t("provider.circuitBreakerResetFailed", {
+          defaultValue: "重置失败",
+        }) +
+          ": " +
+          String(error),
+      );
+    }
+  };
+
  const fallbackUrlText = t("provider.notConfigured", {
    defaultValue: "未配置接口地址",
  });
@@ -131,29 +146,6 @@ export function ProviderCard({

  const usageEnabled = provider.meta?.usage_script?.enabled ?? false;

-  // 获取用量数据以判断是否有多套餐
-  const autoQueryInterval = isCurrent
-    ? provider.meta?.usage_script?.autoQueryInterval || 0
-    : 0;
-
-  const { data: usage } = useUsageQuery(provider.id, appId, {
-    enabled: usageEnabled,
-    autoQueryInterval,
-  });
-
-  const hasMultiplePlans =
-    usage?.success && usage.data && usage.data.length > 1;
-
-  // 多套餐默认展开
-  const [isExpanded, setIsExpanded] = useState(false);
-
-  // 当检测到多套餐时自动展开
-  useEffect(() => {
-    if (hasMultiplePlans) {
-      setIsExpanded(true);
-    }
-  }, [hasMultiplePlans]);
-
  const handleOpenWebsite = () => {
    if (!isClickableUrl) {
      return;
@@ -161,46 +153,29 @@ export function ProviderCard({
    onOpenWebsite(displayUrl);
  };

-  // 判断是否是"当前使用中"的供应商
-  // - 故障转移模式：代理实际使用的供应商（activeProviderId）
-  // - 代理接管模式（非故障转移）：isCurrent
-  // - 普通模式：isCurrent
-  const isActiveProvider = isAutoFailoverEnabled
-    ? activeProviderId === provider.id
-    : isCurrent;
-
-  // 判断是否使用绿色（代理接管模式）还是蓝色（普通模式）
-  const shouldUseGreen = isProxyTakeover && isActiveProvider;
-  const shouldUseBlue = !isProxyTakeover && isActiveProvider;
-
  return (
    <div
      className={cn(
        "relative overflow-hidden rounded-xl border border-border p-4 transition-all duration-300",
        "bg-card text-card-foreground group",
-        // hover 时的边框效果
-        isAutoFailoverEnabled || isProxyTakeover
-          ? "hover:border-emerald-500/50"
-          : "hover:border-border-active",
-        // 当前激活的供应商边框样式
-        shouldUseGreen &&
-          "border-emerald-500/60 shadow-sm shadow-emerald-500/10",
-        shouldUseBlue && "border-blue-500/60 shadow-sm shadow-blue-500/10",
-        !isActiveProvider && "hover:shadow-sm",
+        // 代理接管模式下 hover 使用绿色边框，否则使用蓝色
+        isProxyTakeover ? "hover:border-emerald-500/50" : "hover:border-border-active",
+        // 代理接管模式下当前供应商使用绿色边框
+        isProxyTakeover && isCurrent
+          ? "border-emerald-500/60 shadow-sm shadow-emerald-500/10"
+          : isCurrent
+            ? "border-primary/50 shadow-sm"
+            : "hover:shadow-sm",
        dragHandleProps?.isDragging &&
          "cursor-grabbing border-primary shadow-lg scale-105 z-10",
      )}
    >
-      <div
-        className={cn(
-          "absolute inset-0 bg-gradient-to-r to-transparent transition-opacity duration-500 pointer-events-none",
-          // 代理接管模式使用绿色渐变，普通模式使用蓝色渐变
-          shouldUseGreen && "from-emerald-500/10",
-          shouldUseBlue && "from-blue-500/10",
-          !isActiveProvider && "from-primary/10",
-          isActiveProvider ? "opacity-100" : "opacity-0",
-        )}
-      />
+      <div className={cn(
+        "absolute inset-0 bg-gradient-to-r to-transparent transition-opacity duration-500 pointer-events-none",
+        // 代理接管模式下使用绿色渐变，否则使用蓝色主色调
+        isProxyTakeover && isCurrent ? "from-emerald-500/10" : "from-primary/10",
+        isCurrent ? "opacity-100" : "opacity-0"
+      )} />
      <div className="relative flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
        <div className="flex flex-1 items-center gap-2">
          <button
@@ -228,25 +203,18 @@ export function ProviderCard({
          </div>

          <div className="space-y-1">
-            <div className="flex flex-wrap items-center gap-2 min-h-7">
+            <div className="flex flex-wrap items-center gap-2 min-h-[20px]">
              <h3 className="text-base font-semibold leading-none">
                {provider.name}
              </h3>

-              {/* 健康状态徽章 */}
-              {isProxyRunning && isInFailoverQueue && health && (
+              {/* 健康状态徽章和优先级 */}
+              {isProxyRunning && health && (
                <ProviderHealthBadge
                  consecutiveFailures={health.consecutive_failures}
                />
              )}

-              {/* 故障转移优先级徽章 */}
-              {isAutoFailoverEnabled &&
-                isInFailoverQueue &&
-                failoverPriority && (
-                  <FailoverPriorityBadge priority={failoverPriority} />
-                )}
-
              {provider.category === "third_party" &&
                provider.meta?.isPartner && (
                  <span
@@ -279,56 +247,19 @@ export function ProviderCard({
          </div>
        </div>

-        <div className="relative flex items-center ml-auto min-w-0">
-          {/* 用量信息区域 - hover 时向左移动，为操作按钮腾出空间 */}
-          <div className="ml-auto transition-transform duration-200 group-hover:-translate-x-[14.5rem] group-focus-within:-translate-x-[14.5rem] sm:group-hover:-translate-x-[16rem] sm:group-focus-within:-translate-x-[16rem]">
-            <div className="flex items-center gap-1">
-              {/* 多套餐时显示套餐数量，单套餐时显示详细信息 */}
-              {hasMultiplePlans ? (
-                <div className="flex items-center gap-2 text-xs text-gray-600 dark:text-gray-400">
-                  <span className="font-medium">
-                    {t("usage.multiplePlans", {
-                      count: usage?.data?.length || 0,
-                      defaultValue: `${usage?.data?.length || 0} 个套餐`,
-                    })}
-                  </span>
-                </div>
-              ) : (
-                <UsageFooter
-                  provider={provider}
-                  providerId={provider.id}
-                  appId={appId}
-                  usageEnabled={usageEnabled}
-                  isCurrent={isCurrent}
-                  inline={true}
-                />
-              )}
-              {/* 展开/折叠按钮 - 仅在有多套餐时显示 */}
-              {hasMultiplePlans && (
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    setIsExpanded(!isExpanded);
-                  }}
-                  className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors text-gray-500 dark:text-gray-400 flex-shrink-0"
-                  title={
-                    isExpanded
-                      ? t("usage.collapse", { defaultValue: "收起" })
-                      : t("usage.expand", { defaultValue: "展开" })
-                  }
-                >
-                  {isExpanded ? (
-                    <ChevronUp size={14} />
-                  ) : (
-                    <ChevronDown size={14} />
-                  )}
-                </button>
-              )}
-            </div>
+        <div className="relative flex items-center ml-auto">
+          <div className="ml-auto transition-transform duration-300 ease-out group-hover:-translate-x-[14.5rem] group-focus-within:-translate-x-[14.5rem] sm:group-hover:-translate-x-[16.5rem] sm:group-focus-within:-translate-x-[16.5rem]">
+            <UsageFooter
+              provider={provider}
+              providerId={provider.id}
+              appId={appId}
+              usageEnabled={usageEnabled}
+              isCurrent={isCurrent}
+              inline={true}
+            />
          </div>

-          {/* 操作按钮区域 - 绝对定位在右侧，hover 时滑入 */}
-          <div className="absolute right-0 top-1/2 -translate-y-1/2 flex items-center gap-1.5 opacity-0 pointer-events-none group-hover:opacity-100 group-focus-within:opacity-100 group-hover:pointer-events-auto group-focus-within:pointer-events-auto transition-all duration-200 translate-x-2 group-hover:translate-x-0 group-focus-within:translate-x-0">
+          <div className="absolute right-0 top-1/2 -translate-y-1/2 flex items-center gap-1.5 opacity-0 pointer-events-none group-hover:opacity-100 group-focus-within:opacity-100 group-hover:pointer-events-auto group-focus-within:pointer-events-auto transition-all duration-300 ease-out translate-x-2 group-hover:translate-x-0 group-focus-within:translate-x-0">
            <ProviderActions
              isCurrent={isCurrent}
              isTesting={isTesting}
@@ -339,28 +270,17 @@ export function ProviderCard({
              onTest={onTest ? () => onTest(provider) : undefined}
              onConfigureUsage={() => onConfigureUsage(provider)}
              onDelete={() => onDelete(provider)}
-              // 故障转移相关
-              isAutoFailoverEnabled={isAutoFailoverEnabled}
-              isInFailoverQueue={isInFailoverQueue}
-              onToggleFailover={onToggleFailover}
+              onResetCircuitBreaker={
+                isProxyRunning && provider.isProxyTarget
+                  ? handleResetCircuitBreaker
+                  : undefined
+              }
+              isProxyTarget={provider.isProxyTarget}
+              consecutiveFailures={health?.consecutive_failures ?? 0}
            />
          </div>
        </div>
      </div>
-
-      {/* 展开的完整套餐列表 */}
-      {isExpanded && hasMultiplePlans && (
-        <div className="mt-4 pt-4 border-t border-border-default">
-          <UsageFooter
-            provider={provider}
-            providerId={provider.id}
-            appId={appId}
-            usageEnabled={usageEnabled}
-            isCurrent={isCurrent}
-            inline={false}
-          />
-        </div>
-      )}
    </div>
  );
 }
@@ -1,6 +1,5 @@
 import { cn } from "@/lib/utils";
 import { ProviderHealthStatus } from "@/types/proxy";
-import { useTranslation } from "react-i18next";

 interface ProviderHealthBadgeProps {
  consecutiveFailures: number;
@@ -15,14 +14,11 @@ export function ProviderHealthBadge({
  consecutiveFailures,
  className,
 }: ProviderHealthBadgeProps) {
-  const { t } = useTranslation();
-
  // 根据失败次数计算状态
  const getStatus = () => {
    if (consecutiveFailures === 0) {
      return {
-        labelKey: "health.operational",
-        labelFallback: "正常",
+        label: "正常",
        status: ProviderHealthStatus.Healthy,
        color: "bg-green-500",
        // 使用更深/柔和的背景色，去除可能的白色内容感
@@ -31,8 +27,7 @@ export function ProviderHealthBadge({
      };
    } else if (consecutiveFailures < 5) {
      return {
-        labelKey: "health.degraded",
-        labelFallback: "降级",
+        label: "降级",
        status: ProviderHealthStatus.Degraded,
        color: "bg-yellow-500",
        bgColor: "bg-yellow-500/10",
@@ -40,8 +35,7 @@ export function ProviderHealthBadge({
      };
    } else {
      return {
-        labelKey: "health.circuitOpen",
-        labelFallback: "熔断",
+        label: "熔断",
        status: ProviderHealthStatus.Failed,
        color: "bg-red-500",
        bgColor: "bg-red-500/10",
@@ -51,9 +45,6 @@ export function ProviderHealthBadge({
  };

  const statusConfig = getStatus();
-  const label = t(statusConfig.labelKey, {
-    defaultValue: statusConfig.labelFallback,
-  });

  return (
    <div
@@ -63,13 +54,10 @@ export function ProviderHealthBadge({
        statusConfig.textColor,
        className,
      )}
-      title={t("health.consecutiveFailures", {
-        count: consecutiveFailures,
-        defaultValue: `连续失败 ${consecutiveFailures} 次`,
-      })}
+      title={`连续失败 ${consecutiveFailures} 次`}
    >
      <div className={cn("w-2 h-2 rounded-full", statusConfig.color)} />
-      <span>{label}</span>
+      <span>{statusConfig.label}</span>
    </div>
  );
 }
@@ -5,31 +5,13 @@ import {
  useSortable,
  verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
-import {
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-  type CSSProperties,
-} from "react";
-import { AnimatePresence, motion } from "framer-motion";
-import { Search, X } from "lucide-react";
-import { useTranslation } from "react-i18next";
+import type { CSSProperties } from "react";
 import type { Provider } from "@/types";
 import type { AppId } from "@/lib/api";
 import { useDragSort } from "@/hooks/useDragSort";
 import { useStreamCheck } from "@/hooks/useStreamCheck";
 import { ProviderCard } from "@/components/providers/ProviderCard";
 import { ProviderEmptyState } from "@/components/providers/ProviderEmptyState";
-import {
-  useAutoFailoverEnabled,
-  useFailoverQueue,
-  useAddToFailoverQueue,
-  useRemoveFromFailoverQueue,
-} from "@/lib/query/failover";
-import { useCallback } from "react";
-import { Input } from "@/components/ui/input";
-import { Button } from "@/components/ui/button";

 interface ProviderListProps {
  providers: Record<string, Provider>;
@@ -45,7 +27,6 @@ interface ProviderListProps {
  isLoading?: boolean;
  isProxyRunning?: boolean; // 代理服务运行状态
  isProxyTakeover?: boolean; // 代理接管模式（Live配置已被接管）
-  activeProviderId?: string; // 代理当前实际使用的供应商 ID（用于故障转移模式下标注绿色边框）
 }

 export function ProviderList({
@@ -60,11 +41,9 @@ export function ProviderList({
  onOpenWebsite,
  onCreate,
  isLoading = false,
-  isProxyRunning = false,
-  isProxyTakeover = false,
-  activeProviderId,
+  isProxyRunning = false, // 默认值为 false
+  isProxyTakeover = false, // 默认值为 false
 }: ProviderListProps) {
-  const { t } = useTranslation();
  const { sortedProviders, sensors, handleDragEnd } = useDragSort(
    providers,
    appId,
@@ -73,103 +52,17 @@ export function ProviderList({
  // 流式健康检查
  const { checkProvider, isChecking } = useStreamCheck(appId);

-  // 故障转移相关
-  const { data: isAutoFailoverEnabled } = useAutoFailoverEnabled(appId);
-  const { data: failoverQueue } = useFailoverQueue(appId);
-  const addToQueue = useAddToFailoverQueue();
-  const removeFromQueue = useRemoveFromFailoverQueue();
-
-  // 联动状态：只有当前应用开启代理接管且故障转移开启时才启用故障转移模式
-  const isFailoverModeActive =
-    isProxyTakeover === true && isAutoFailoverEnabled === true;
-
-  // 计算供应商在故障转移队列中的优先级（基于 sortIndex 排序）
-  const getFailoverPriority = useCallback(
-    (providerId: string): number | undefined => {
-      if (!isFailoverModeActive || !failoverQueue) return undefined;
-      const index = failoverQueue.findIndex(
-        (item) => item.providerId === providerId,
-      );
-      return index >= 0 ? index + 1 : undefined;
-    },
-    [isFailoverModeActive, failoverQueue],
-  );
-
-  // 判断供应商是否在故障转移队列中
-  const isInFailoverQueue = useCallback(
-    (providerId: string): boolean => {
-      if (!isFailoverModeActive || !failoverQueue) return false;
-      return failoverQueue.some((item) => item.providerId === providerId);
-    },
-    [isFailoverModeActive, failoverQueue],
-  );
-
-  // 切换供应商的故障转移队列状态
-  const handleToggleFailover = useCallback(
-    (providerId: string, enabled: boolean) => {
-      if (enabled) {
-        addToQueue.mutate({ appType: appId, providerId });
-      } else {
-        removeFromQueue.mutate({ appType: appId, providerId });
-      }
-    },
-    [appId, addToQueue, removeFromQueue],
-  );
-
  const handleTest = (provider: Provider) => {
    checkProvider(provider.id, provider.name);
  };

-  const [searchTerm, setSearchTerm] = useState("");
-  const [isSearchOpen, setIsSearchOpen] = useState(false);
-  const searchInputRef = useRef<HTMLInputElement>(null);
-
-  useEffect(() => {
-    const handleKeyDown = (event: KeyboardEvent) => {
-      const key = event.key.toLowerCase();
-      if ((event.metaKey || event.ctrlKey) && key === "f") {
-        event.preventDefault();
-        setIsSearchOpen(true);
-        return;
-      }
-
-      if (key === "escape") {
-        setIsSearchOpen(false);
-      }
-    };
-
-    window.addEventListener("keydown", handleKeyDown);
-    return () => window.removeEventListener("keydown", handleKeyDown);
-  }, []);
-
-  useEffect(() => {
-    if (isSearchOpen) {
-      const frame = requestAnimationFrame(() => {
-        searchInputRef.current?.focus();
-        searchInputRef.current?.select();
-      });
-      return () => cancelAnimationFrame(frame);
-    }
-  }, [isSearchOpen]);
-
-  const filteredProviders = useMemo(() => {
-    const keyword = searchTerm.trim().toLowerCase();
-    if (!keyword) return sortedProviders;
-    return sortedProviders.filter((provider) => {
-      const fields = [provider.name, provider.notes, provider.websiteUrl];
-      return fields.some((field) =>
-        field?.toString().toLowerCase().includes(keyword),
-      );
-    });
-  }, [searchTerm, sortedProviders]);
-
  if (isLoading) {
    return (
      <div className="space-y-3">
        {[0, 1, 2].map((index) => (
          <div
            key={index}
-            className="w-full border border-dashed rounded-lg h-28 border-muted-foreground/40 bg-muted/40"
+            className="h-28 w-full rounded-lg border border-dashed border-muted-foreground/40 bg-muted/40"
          />
        ))}
      </div>
@@ -180,18 +73,21 @@ export function ProviderList({
    return <ProviderEmptyState onCreate={onCreate} />;
  }

-  const renderProviderList = () => (
+  return (
    <DndContext
      sensors={sensors}
      collisionDetection={closestCenter}
      onDragEnd={handleDragEnd}
    >
      <SortableContext
-        items={filteredProviders.map((provider) => provider.id)}
+        items={sortedProviders.map((provider) => provider.id)}
        strategy={verticalListSortingStrategy}
      >
-        <div className="space-y-3">
-          {filteredProviders.map((provider) => (
+        <div
+          className="space-y-3 animate-slide-up"
+          style={{ animationDelay: "0.1s" }}
+        >
+          {sortedProviders.map((provider) => (
            <SortableProviderCard
              key={provider.id}
              provider={provider}
@@ -207,98 +103,12 @@ export function ProviderList({
              isTesting={isChecking(provider.id)}
              isProxyRunning={isProxyRunning}
              isProxyTakeover={isProxyTakeover}
-              // 故障转移相关：联动状态
-              isAutoFailoverEnabled={isFailoverModeActive}
-              failoverPriority={getFailoverPriority(provider.id)}
-              isInFailoverQueue={isInFailoverQueue(provider.id)}
-              onToggleFailover={(enabled) =>
-                handleToggleFailover(provider.id, enabled)
-              }
-              activeProviderId={activeProviderId}
            />
          ))}
        </div>
      </SortableContext>
    </DndContext>
  );
-
-  return (
-    <div className="mt-4 space-y-4">
-      <AnimatePresence>
-        {isSearchOpen && (
-          <motion.div
-            key="provider-search"
-            initial={{ opacity: 0, y: -8, scale: 0.98 }}
-            animate={{ opacity: 1, y: 0, scale: 1 }}
-            exit={{ opacity: 0, y: -8, scale: 0.98 }}
-            transition={{ duration: 0.18, ease: "easeOut" }}
-            className="fixed left-1/2 top-[6.5rem] z-40 w-[min(90vw,26rem)] -translate-x-1/2 sm:right-6 sm:left-auto sm:translate-x-0"
-          >
-            <div className="p-4 space-y-3 border shadow-md rounded-2xl border-white/10 bg-background/95 shadow-black/20 backdrop-blur-md">
-              <div className="relative flex items-center gap-2">
-                <Search className="absolute w-4 h-4 -translate-y-1/2 pointer-events-none left-3 top-1/2 text-muted-foreground" />
-                <Input
-                  ref={searchInputRef}
-                  value={searchTerm}
-                  onChange={(event) => setSearchTerm(event.target.value)}
-                  placeholder={t("provider.searchPlaceholder", {
-                    defaultValue: "Search name, notes, or URL...",
-                  })}
-                  aria-label={t("provider.searchAriaLabel", {
-                    defaultValue: "Search providers",
-                  })}
-                  className="pr-16 pl-9"
-                />
-                {searchTerm && (
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    className="absolute text-xs -translate-y-1/2 right-11 top-1/2"
-                    onClick={() => setSearchTerm("")}
-                  >
-                    {t("common.clear", { defaultValue: "Clear" })}
-                  </Button>
-                )}
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  className="ml-auto"
-                  onClick={() => setIsSearchOpen(false)}
-                  aria-label={t("provider.searchCloseAriaLabel", {
-                    defaultValue: "Close provider search",
-                  })}
-                >
-                  <X className="w-4 h-4" />
-                </Button>
-              </div>
-              <div className="flex flex-wrap items-center justify-between gap-2 text-[11px] text-muted-foreground">
-                <span>
-                  {t("provider.searchScopeHint", {
-                    defaultValue: "Matches provider name, notes, and URL.",
-                  })}
-                </span>
-                <span>
-                  {t("provider.searchCloseHint", {
-                    defaultValue: "Press Esc to close",
-                  })}
-                </span>
-              </div>
-            </div>
-          </motion.div>
-        )}
-      </AnimatePresence>
-
-      {filteredProviders.length === 0 ? (
-        <div className="px-6 py-8 text-sm text-center border border-dashed rounded-lg border-border text-muted-foreground">
-          {t("provider.noSearchResults", {
-            defaultValue: "No providers match your search.",
-          })}
-        </div>
-      ) : (
-        renderProviderList()
-      )}
-    </div>
-  );
 }

 interface SortableProviderCardProps {
@@ -315,12 +125,6 @@ interface SortableProviderCardProps {
  isTesting: boolean;
  isProxyRunning: boolean;
  isProxyTakeover: boolean;
-  // 故障转移相关
-  isAutoFailoverEnabled: boolean;
-  failoverPriority?: number;
-  isInFailoverQueue: boolean;
-  onToggleFailover: (enabled: boolean) => void;
-  activeProviderId?: string;
 }

 function SortableProviderCard({
@@ -337,11 +141,6 @@ function SortableProviderCard({
  isTesting,
  isProxyRunning,
  isProxyTakeover,
-  isAutoFailoverEnabled,
-  failoverPriority,
-  isInFailoverQueue,
-  onToggleFailover,
-  activeProviderId,
 }: SortableProviderCardProps) {
  const {
    setNodeRef,
@@ -380,12 +179,6 @@ function SortableProviderCard({
          listeners,
          isDragging,
        }}
-        // 故障转移相关
-        isAutoFailoverEnabled={isAutoFailoverEnabled}
-        failoverPriority={failoverPriority}
-        isInFailoverQueue={isInFailoverQueue}
-        onToggleFailover={onToggleFailover}
-        activeProviderId={activeProviderId}
      />
    </div>
  );
@@ -30,7 +30,7 @@ const ApiKeyInput: React.FC<ApiKeyInputProps> = ({

  const inputClass = `w-full px-3 py-2 pr-10 border rounded-lg text-sm transition-colors ${
    disabled
-      ? "bg-muted border-border-default text-muted-foreground cursor-not-allowed"
+      ? "bg-gray-100 dark:bg-gray-800 border-border-default text-gray-400 dark:text-gray-500 cursor-not-allowed"
      : "border-border-default dark:bg-gray-800 dark:text-gray-100 focus:outline-none focus:ring-2 focus:ring-blue-500/20 dark:focus:ring-blue-400/20"
  }`;

@@ -52,15 +52,7 @@ export function BasicFormFields({ form }: BasicFormFieldsProps) {
            <button
              type="button"
              className="w-20 h-20 p-3 rounded-xl border-2 border-muted hover:border-primary transition-colors cursor-pointer bg-muted/30 hover:bg-muted/50 flex items-center justify-center"
-              title={
-                currentIcon
-                  ? t("providerIcon.clickToChange", {
-                      defaultValue: "点击更换图标",
-                    })
-                  : t("providerIcon.clickToSelect", {
-                      defaultValue: "点击选择图标",
-                    })
-              }
+              title={currentIcon ? "点击更换图标" : "点击选择图标"}
            >
              <ProviderIcon
                icon={currentIcon}
@@ -153,10 +145,7 @@ export function BasicFormFields({ form }: BasicFormFieldsProps) {
          <FormItem>
            <FormLabel>{t("provider.websiteUrl")}</FormLabel>
            <FormControl>
-              <Input
-                {...field}
-                placeholder={t("providerForm.websiteUrlPlaceholder")}
-              />
+              <Input {...field} placeholder="https://" />
            </FormControl>
            <FormMessage />
          </FormItem>
@@ -149,7 +149,10 @@ export function ProviderPresetSelector({
                className={`${getPresetButtonClass(isSelected, entry.preset)} relative`}
                style={getPresetButtonStyle(isSelected, entry.preset)}
                title={
-                  presetCategoryLabels[category] ?? t("providerPreset.other")
+                  presetCategoryLabels[category] ??
+                  t("providerPreset.categoryOther", {
+                    defaultValue: "其他",
+                  })
                }
              >
                {renderPresetIcon(entry.preset)}
@@ -1,4 +1,4 @@
-import { useEffect, useState, useCallback } from "react";
+import { useState, useCallback } from "react";
 import type { ProviderCategory } from "@/types";
 import {
  getApiKeyFromConfig,
@@ -32,28 +32,6 @@ export function useApiKeyState({
    return "";
  });

-  // 当外部通过 form.reset / 读取 live 等方式更新配置时，同步回 API Key 状态
-  // - 仅在 JSON 可解析时同步，避免用户编辑 JSON 过程中因临时无效导致输入框闪烁
-  useEffect(() => {
-    if (!initialConfig) return;
-
-    try {
-      JSON.parse(initialConfig);
-    } catch {
-      return;
-    }
-
-    // 仅当配置确实包含 API Key 字段时才同步（避免无意清空用户正在输入的 key）
-    if (!hasApiKeyField(initialConfig, appType)) {
-      return;
-    }
-
-    const extracted = getApiKeyFromConfig(initialConfig, appType);
-    if (extracted !== apiKey) {
-      setApiKey(extracted);
-    }
-  }, [initialConfig, appType, apiKey]);
-
  const handleApiKeyChange = useCallback(
    (key: string) => {
      setApiKey(key);
@@ -12,14 +12,14 @@ import {
 } from "@/lib/query/failover";

 export interface AutoFailoverConfigPanelProps {
-  enabled?: boolean;
-  onEnabledChange?: (enabled: boolean) => void;
+  enabled: boolean;
+  onEnabledChange: (enabled: boolean) => void;
 }

 export function AutoFailoverConfigPanel({
-  enabled = true,
+  enabled,
  onEnabledChange: _onEnabledChange,
-}: AutoFailoverConfigPanelProps = {}) {
+}: AutoFailoverConfigPanelProps) {
  // Note: onEnabledChange is currently unused but kept in the interface
  // for potential future use by parent components
  void _onEnabledChange;
@@ -54,7 +54,6 @@ export function AutoFailoverConfigPanel({
      });
      toast.success(
        t("proxy.autoFailover.configSaved", "自动故障转移配置已保存"),
-        { closeButton: true },
      );
    } catch (e) {
      toast.error(
@@ -101,7 +100,7 @@ export function AutoFailoverConfigPanel({
          <AlertDescription className="text-sm">
            {t(
              "proxy.autoFailover.info",
-              "当故障转移队列中配置了多个供应商时，系统会在请求失败时按优先级顺序依次尝试。当某个供应商连续失败达到阈值时，熔断器会打开并在一段时间内跳过该供应商。",
+              "当启用多个代理目标时，系统会按优先级顺序依次尝试。当某个供应商连续失败达到阈值时，熔断器会自动打开，跳过该供应商。",
            )}
          </AlertDescription>
        </Alert>
@@ -34,7 +34,7 @@ export function CircuitBreakerConfigPanel() {
  const handleSave = async () => {
    try {
      await updateConfig.mutateAsync(formData);
-      toast.success("熔断器配置已保存", { closeButton: true });
+      toast.success("熔断器配置已保存");
    } catch (error) {
      toast.error("保存失败: " + String(error));
    }
@@ -1,300 +0,0 @@
-/**
- * 故障转移队列管理组件
- *
- * 允许用户管理代理模式下的故障转移队列，支持：
- * - 添加/移除供应商
- * - 队列顺序基于首页供应商列表的 sort_index
- */
-
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
-import { Plus, Trash2, Loader2, Info, AlertTriangle } from "lucide-react";
-import { Button } from "@/components/ui/button";
-import { Switch } from "@/components/ui/switch";
-import { Alert, AlertDescription } from "@/components/ui/alert";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import { cn } from "@/lib/utils";
-import type { FailoverQueueItem } from "@/types/proxy";
-import type { AppId } from "@/lib/api";
-import {
-  useFailoverQueue,
-  useAvailableProvidersForFailover,
-  useAddToFailoverQueue,
-  useRemoveFromFailoverQueue,
-  useAutoFailoverEnabled,
-  useSetAutoFailoverEnabled,
-} from "@/lib/query/failover";
-
-interface FailoverQueueManagerProps {
-  appType: AppId;
-  disabled?: boolean;
-}
-
-export function FailoverQueueManager({
-  appType,
-  disabled = false,
-}: FailoverQueueManagerProps) {
-  const { t } = useTranslation();
-  const [selectedProviderId, setSelectedProviderId] = useState<string>("");
-
-  // 故障转移开关状态（每个应用独立）
-  const { data: isFailoverEnabled = false } = useAutoFailoverEnabled(appType);
-  const setFailoverEnabled = useSetAutoFailoverEnabled();
-
-  // 查询数据
-  const {
-    data: queue,
-    isLoading: isQueueLoading,
-    error: queueError,
-  } = useFailoverQueue(appType);
-  const { data: availableProviders, isLoading: isProvidersLoading } =
-    useAvailableProvidersForFailover(appType);
-
-  // Mutations
-  const addToQueue = useAddToFailoverQueue();
-  const removeFromQueue = useRemoveFromFailoverQueue();
-
-  // 切换故障转移开关
-  const handleToggleFailover = (enabled: boolean) => {
-    setFailoverEnabled.mutate({ appType, enabled });
-  };
-
-  // 添加供应商到队列
-  const handleAddProvider = async () => {
-    if (!selectedProviderId) return;
-
-    try {
-      await addToQueue.mutateAsync({
-        appType,
-        providerId: selectedProviderId,
-      });
-      setSelectedProviderId("");
-      toast.success(
-        t("proxy.failoverQueue.addSuccess", "已添加到故障转移队列"),
-        { closeButton: true },
-      );
-    } catch (error) {
-      toast.error(
-        t("proxy.failoverQueue.addFailed", "添加失败") + ": " + String(error),
-      );
-    }
-  };
-
-  // 从队列移除供应商
-  const handleRemoveProvider = async (providerId: string) => {
-    try {
-      await removeFromQueue.mutateAsync({ appType, providerId });
-      toast.success(
-        t("proxy.failoverQueue.removeSuccess", "已从故障转移队列移除"),
-        { closeButton: true },
-      );
-    } catch (error) {
-      toast.error(
-        t("proxy.failoverQueue.removeFailed", "移除失败") +
-          ": " +
-          String(error),
-      );
-    }
-  };
-
-  if (isQueueLoading) {
-    return (
-      <div className="flex items-center justify-center p-8">
-        <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
-      </div>
-    );
-  }
-
-  if (queueError) {
-    return (
-      <Alert variant="destructive">
-        <AlertTriangle className="h-4 w-4" />
-        <AlertDescription>{String(queueError)}</AlertDescription>
-      </Alert>
-    );
-  }
-
-  return (
-    <div className="space-y-4">
-      {/* 自动故障转移开关 */}
-      <div className="flex items-center justify-between p-4 rounded-lg bg-muted/50 border border-border/50">
-        <div className="space-y-0.5">
-          <div className="flex items-center gap-2">
-            <span className="text-sm font-medium">
-              {t("proxy.failover.autoSwitch", {
-                defaultValue: "自动故障转移",
-              })}
-            </span>
-            {isFailoverEnabled && (
-              <span className="px-2 py-0.5 text-xs rounded-full bg-emerald-500/20 text-emerald-600 dark:text-emerald-400">
-                {t("common.enabled", { defaultValue: "已开启" })}
-              </span>
-            )}
-          </div>
-          <p className="text-xs text-muted-foreground">
-            {t("proxy.failover.autoSwitchDescription", {
-              defaultValue: "开启后，请求失败时自动切换到队列中的下一个供应商",
-            })}
-          </p>
-        </div>
-        <Switch
-          checked={isFailoverEnabled}
-          onCheckedChange={handleToggleFailover}
-          disabled={disabled || setFailoverEnabled.isPending}
-        />
-      </div>
-
-      {/* 说明信息 */}
-      <Alert className="border-blue-500/40 bg-blue-500/10">
-        <Info className="h-4 w-4" />
-        <AlertDescription className="text-sm">
-          {t(
-            "proxy.failoverQueue.info",
-            "队列顺序与首页供应商列表顺序一致。当请求失败时，系统会按顺序依次尝试队列中的供应商。",
-          )}
-        </AlertDescription>
-      </Alert>
-
-      {/* 添加供应商 */}
-      <div className="flex items-center gap-2">
-        <Select
-          value={selectedProviderId}
-          onValueChange={setSelectedProviderId}
-          disabled={disabled || isProvidersLoading}
-        >
-          <SelectTrigger className="flex-1">
-            <SelectValue
-              placeholder={t(
-                "proxy.failoverQueue.selectProvider",
-                "选择供应商添加到队列",
-              )}
-            />
-          </SelectTrigger>
-          <SelectContent>
-            {availableProviders?.map((provider) => (
-              <SelectItem key={provider.id} value={provider.id}>
-                {provider.name}
-              </SelectItem>
-            ))}
-            {(!availableProviders || availableProviders.length === 0) && (
-              <div className="px-2 py-4 text-center text-sm text-muted-foreground">
-                {t(
-                  "proxy.failoverQueue.noAvailableProviders",
-                  "没有可添加的供应商",
-                )}
-              </div>
-            )}
-          </SelectContent>
-        </Select>
-        <Button
-          onClick={handleAddProvider}
-          disabled={disabled || !selectedProviderId || addToQueue.isPending}
-          size="icon"
-          variant="outline"
-        >
-          {addToQueue.isPending ? (
-            <Loader2 className="h-4 w-4 animate-spin" />
-          ) : (
-            <Plus className="h-4 w-4" />
-          )}
-        </Button>
-      </div>
-
-      {/* 队列列表 */}
-      {!queue || queue.length === 0 ? (
-        <div className="rounded-lg border border-dashed border-muted-foreground/40 p-8 text-center">
-          <p className="text-sm text-muted-foreground">
-            {t(
-              "proxy.failoverQueue.empty",
-              "故障转移队列为空。添加供应商以启用自动故障转移。",
-            )}
-          </p>
-        </div>
-      ) : (
-        <div className="space-y-2">
-          {queue.map((item, index) => (
-            <QueueItem
-              key={item.providerId}
-              item={item}
-              index={index}
-              disabled={disabled}
-              onRemove={handleRemoveProvider}
-              isRemoving={removeFromQueue.isPending}
-            />
-          ))}
-        </div>
-      )}
-
-      {/* 队列说明 */}
-      {queue && queue.length > 0 && (
-        <p className="text-xs text-muted-foreground">
-          {t(
-            "proxy.failoverQueue.orderHint",
-            "队列顺序与首页供应商列表顺序一致，可在首页拖拽调整顺序。",
-          )}
-        </p>
-      )}
-    </div>
-  );
-}
-
-interface QueueItemProps {
-  item: FailoverQueueItem;
-  index: number;
-  disabled: boolean;
-  onRemove: (providerId: string) => void;
-  isRemoving: boolean;
-}
-
-function QueueItem({
-  item,
-  index,
-  disabled,
-  onRemove,
-  isRemoving,
-}: QueueItemProps) {
-  const { t } = useTranslation();
-
-  return (
-    <div
-      className={cn(
-        "flex items-center gap-3 rounded-lg border bg-card p-3 transition-colors",
-      )}
-    >
-      {/* 序号 */}
-      <div className="flex h-6 w-6 items-center justify-center rounded-full bg-muted text-xs font-medium">
-        {index + 1}
-      </div>
-
-      {/* 供应商名称 */}
-      <div className="flex-1 min-w-0">
-        <span className="text-sm font-medium truncate block">
-          {item.providerName}
-        </span>
-      </div>
-
-      {/* 删除按钮 */}
-      <Button
-        variant="ghost"
-        size="icon"
-        className="h-8 w-8 text-muted-foreground hover:text-destructive"
-        onClick={() => onRemove(item.providerId)}
-        disabled={disabled || isRemoving}
-        aria-label={t("common.delete", "删除")}
-      >
-        {isRemoving ? (
-          <Loader2 className="h-4 w-4 animate-spin" />
-        ) : (
-          <Trash2 className="h-4 w-4" />
-        )}
-      </Button>
-    </div>
-  );
-}
@@ -1,32 +1,22 @@
 import { useState } from "react";
-import {
-  Activity,
-  Clock,
-  TrendingUp,
-  Server,
-  ListOrdered,
-  Settings,
-} from "lucide-react";
+import { Activity, Clock, TrendingUp, Server, ListOrdered } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { useProxyStatus } from "@/hooks/useProxyStatus";
 import { ProxySettingsDialog } from "./ProxySettingsDialog";
 import { toast } from "sonner";
-import { useFailoverQueue } from "@/lib/query/failover";
+import { useProxyTargets } from "@/lib/query/failover";
 import { ProviderHealthBadge } from "@/components/providers/ProviderHealthBadge";
 import { useProviderHealth } from "@/lib/query/failover";
 import type { ProxyStatus } from "@/types/proxy";
-import { useTranslation } from "react-i18next";

 export function ProxyPanel() {
-  const { t } = useTranslation();
  const { status, isRunning } = useProxyStatus();
  const [showSettings, setShowSettings] = useState(false);

-  // 获取所有三个应用类型的故障转移队列（不包含当前供应商）
-  // 当前供应商始终优先，队列仅用于失败后的备用顺序
-  const { data: claudeQueue = [] } = useFailoverQueue("claude");
-  const { data: codexQueue = [] } = useFailoverQueue("codex");
-  const { data: geminiQueue = [] } = useFailoverQueue("gemini");
+  // 获取所有三个应用类型的代理目标列表
+  const { data: claudeTargets = [] } = useProxyTargets("claude");
+  const { data: codexTargets = [] } = useProxyTargets("codex");
+  const { data: geminiTargets = [] } = useProxyTargets("gemini");

  const formatUptime = (seconds: number): string => {
    const hours = Math.floor(seconds / 3600);
@@ -49,23 +39,8 @@ export function ProxyPanel() {
          <div className="space-y-6">
            <div className="rounded-lg border border-border bg-muted/40 p-4 space-y-4">
              <div>
-                <div className="flex items-center justify-between mb-2">
-                  <p className="text-xs text-muted-foreground">
-                    {t("proxy.panel.serviceAddress", {
-                      defaultValue: "服务地址",
-                    })}
-                  </p>
-                  <Button
-                    size="sm"
-                    variant="ghost"
-                    onClick={() => setShowSettings(true)}
-                    className="h-7 gap-1.5 text-xs"
-                  >
-                    <Settings className="h-3.5 w-3.5" />
-                    {t("common.settings")}
-                  </Button>
-                </div>
-                <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
+                <p className="text-xs text-muted-foreground">服务地址</p>
+                <div className="mt-2 flex flex-col gap-2 sm:flex-row sm:items-center">
                  <code className="flex-1 text-sm bg-background px-3 py-2 rounded border border-border/60">
                    http://{status.address}:{status.port}
                  </code>
@@ -76,23 +51,16 @@ export function ProxyPanel() {
                      navigator.clipboard.writeText(
                        `http://${status.address}:${status.port}`,
                      );
-                      toast.success(
-                        t("proxy.panel.addressCopied", {
-                          defaultValue: "地址已复制",
-                        }),
-                        { closeButton: true },
-                      );
+                      toast.success("地址已复制");
                    }}
                  >
-                    {t("common.copy")}
+                    复制
                  </Button>
                </div>
              </div>

              <div className="pt-3 border-t border-border space-y-2">
-                <p className="text-xs text-muted-foreground">
-                  {t("provider.inUse")}
-                </p>
+                <p className="text-xs text-muted-foreground">使用中</p>
                {status.active_targets && status.active_targets.length > 0 ? (
                  <div className="grid gap-2 sm:grid-cols-2">
                    {status.active_targets.map((target) => (
@@ -114,69 +82,56 @@ export function ProxyPanel() {
                  </div>
                ) : status.current_provider ? (
                  <p className="text-sm text-muted-foreground">
-                    {t("proxy.panel.currentProvider", {
-                      defaultValue: "当前 Provider：",
-                    })}{" "}
+                    当前 Provider：{" "}
                    <span className="font-medium text-foreground">
                      {status.current_provider}
                    </span>
                  </p>
                ) : (
                  <p className="text-sm text-yellow-600 dark:text-yellow-400">
-                    {t("proxy.panel.waitingFirstRequest", {
-                      defaultValue: "当前 Provider：等待首次请求…",
-                    })}
+                    当前 Provider：等待首次请求…
                  </p>
                )}
              </div>

              {/* 供应商队列 - 按应用类型分组展示 */}
-              {(claudeQueue.length > 0 ||
-                codexQueue.length > 0 ||
-                geminiQueue.length > 0) && (
+              {(claudeTargets.length > 0 ||
+                codexTargets.length > 0 ||
+                geminiTargets.length > 0) && (
                <div className="pt-3 border-t border-border space-y-3">
                  <div className="flex items-center gap-2">
                    <ListOrdered className="h-3.5 w-3.5 text-muted-foreground" />
                    <p className="text-xs text-muted-foreground">
-                      {t("proxy.failoverQueue.title")}
+                      故障转移队列
                    </p>
                  </div>

                  {/* Claude 队列 */}
-                  {claudeQueue.length > 0 && (
+                  {claudeTargets.length > 0 && (
                    <ProviderQueueGroup
                      appType="claude"
                      appLabel="Claude"
-                      targets={claudeQueue.map((item) => ({
-                        id: item.providerId,
-                        name: item.providerName,
-                      }))}
+                      targets={claudeTargets}
                      status={status}
                    />
                  )}

                  {/* Codex 队列 */}
-                  {codexQueue.length > 0 && (
+                  {codexTargets.length > 0 && (
                    <ProviderQueueGroup
                      appType="codex"
                      appLabel="Codex"
-                      targets={codexQueue.map((item) => ({
-                        id: item.providerId,
-                        name: item.providerName,
-                      }))}
+                      targets={codexTargets}
                      status={status}
                    />
                  )}

                  {/* Gemini 队列 */}
-                  {geminiQueue.length > 0 && (
+                  {geminiTargets.length > 0 && (
                    <ProviderQueueGroup
                      appType="gemini"
                      appLabel="Gemini"
-                      targets={geminiQueue.map((item) => ({
-                        id: item.providerId,
-                        name: item.providerName,
-                      }))}
+                      targets={geminiTargets}
                      status={status}
                    />
                  )}
@@ -187,31 +142,23 @@ export function ProxyPanel() {
            <div className="grid gap-3 md:grid-cols-4">
              <StatCard
                icon={<Activity className="h-4 w-4" />}
-                label={t("proxy.panel.stats.activeConnections", {
-                  defaultValue: "活跃连接",
-                })}
+                label="活跃连接"
                value={status.active_connections}
              />
              <StatCard
                icon={<TrendingUp className="h-4 w-4" />}
-                label={t("proxy.panel.stats.totalRequests", {
-                  defaultValue: "总请求数",
-                })}
+                label="总请求数"
                value={status.total_requests}
              />
              <StatCard
                icon={<Clock className="h-4 w-4" />}
-                label={t("proxy.panel.stats.successRate", {
-                  defaultValue: "成功率",
-                })}
+                label="成功率"
                value={`${status.success_rate.toFixed(1)}%`}
                variant={status.success_rate > 90 ? "success" : "warning"}
              />
              <StatCard
                icon={<Clock className="h-4 w-4" />}
-                label={t("proxy.panel.stats.uptime", {
-                  defaultValue: "运行时间",
-                })}
+                label="运行时间"
                value={formatUptime(status.uptime_seconds)}
              />
            </div>
@@ -222,26 +169,11 @@ export function ProxyPanel() {
              <Server className="h-8 w-8" />
            </div>
            <p className="text-base font-medium text-foreground mb-1">
-              {t("proxy.panel.stoppedTitle", {
-                defaultValue: "代理服务已停止",
-              })}
+              代理服务已停止
            </p>
-            <p className="text-sm text-muted-foreground mb-4">
-              {t("proxy.panel.stoppedDescription", {
-                defaultValue: "使用右上角开关即可启动服务",
-              })}
+            <p className="text-sm text-muted-foreground">
+              使用右上角开关即可启动服务
            </p>
-            <Button
-              size="sm"
-              variant="outline"
-              onClick={() => setShowSettings(true)}
-              className="gap-1.5"
-            >
-              <Settings className="h-4 w-4" />
-              {t("proxy.panel.openSettings", {
-                defaultValue: "配置代理服务",
-              })}
-            </Button>
          </div>
        )}
      </section>
@@ -341,7 +273,6 @@ function ProviderQueueItem({
  appType,
  isCurrent,
 }: ProviderQueueItemProps) {
-  const { t } = useTranslation();
  const { data: health } = useProviderHealth(provider.id, appType);

  return (
@@ -367,7 +298,7 @@ function ProviderQueueItem({
        </span>
        {isCurrent && (
          <span className="text-xs px-1.5 py-0.5 rounded bg-primary/20 text-primary">
-            {t("provider.inUse")}
+            使用中
          </span>
        )}
      </div>
@@ -26,15 +26,8 @@ import { useTranslation } from "react-i18next";
 import type { TFunction } from "i18next";
 import type { ProxyConfig } from "@/types/proxy";

-// 表单数据类型（仅包含可编辑字段）
-type ProxyConfigForm = Pick<
-  ProxyConfig,
-  | "listen_address"
-  | "listen_port"
-  | "max_retries"
-  | "request_timeout"
-  | "enable_logging"
->;
+// 表单数据类型（不包含 enabled 字段，该字段由后端自动管理）
+type ProxyConfigForm = Omit<ProxyConfig, "enabled">;

 const createProxyConfigSchema = (t: TFunction) => {
  const requestTimeoutSchema = z
@@ -127,18 +120,19 @@ export function ProxySettingsDialog({
  useEffect(() => {
    if (config) {
      form.reset({
-        listen_address: config.listen_address,
-        listen_port: config.listen_port,
-        max_retries: config.max_retries,
-        request_timeout: config.request_timeout,
-        enable_logging: config.enable_logging,
+        ...config,
      });
    }
  }, [config, form]);

  const onSubmit = async (data: ProxyConfigForm) => {
    try {
-      await updateConfig(data);
+      // 添加 enabled 字段（从当前配置中获取，保持不变）
+      const configToSave: ProxyConfig = {
+        ...data,
+        enabled: config?.enabled ?? true,
+      };
+      await updateConfig(configToSave);
      closePanel();
    } catch (error) {
      console.error("Save config failed:", error);
@@ -9,79 +9,74 @@ import { Radio, Loader2 } from "lucide-react";
 import { Switch } from "@/components/ui/switch";
 import { useProxyStatus } from "@/hooks/useProxyStatus";
 import { cn } from "@/lib/utils";
-import { useTranslation } from "react-i18next";
-import type { AppId } from "@/lib/api";

 interface ProxyToggleProps {
  className?: string;
-  activeApp: AppId;
 }

-export function ProxyToggle({ className, activeApp }: ProxyToggleProps) {
-  const { t } = useTranslation();
-  const { isRunning, takeoverStatus, setTakeoverForApp, isPending, status } =
-    useProxyStatus();
+export function ProxyToggle({ className }: ProxyToggleProps) {
+  const {
+    isRunning,
+    isTakeoverActive,
+    startWithTakeover,
+    stopWithRestore,
+    isPending,
+    status,
+  } = useProxyStatus();

  const handleToggle = async (checked: boolean) => {
-    await setTakeoverForApp({ appType: activeApp, enabled: checked });
+    if (checked) {
+      await startWithTakeover();
+    } else {
+      await stopWithRestore();
+    }
  };

-  const takeoverEnabled = takeoverStatus?.[activeApp] || false;
+  const isActive = isRunning && isTakeoverActive;

-  const appLabel =
-    activeApp === "claude"
-      ? "Claude"
-      : activeApp === "codex"
-        ? "Codex"
-        : "Gemini";
-
-  const tooltipText = takeoverEnabled
-    ? isRunning
-      ? t("proxy.takeover.tooltip.active", {
-          defaultValue: `${appLabel} 已接管 - ${status?.address}:${status?.port}\n切换该应用供应商为热切换`,
-        })
-      : t("proxy.takeover.tooltip.broken", {
-          defaultValue: `${appLabel} 已接管，但代理服务未运行`,
-        })
-    : t("proxy.takeover.tooltip.inactive", {
-        defaultValue: `接管 ${appLabel} 的 Live 配置，让该应用请求走本地代理`,
-      });
+  const tooltipText = isActive
+    ? `代理模式运行中 - ${status?.address}:${status?.port}\n切换供应商为热切换`
+    : "开启代理模式\n启用后自动接管 Live 配置";

  return (
    <div
-      className={cn("p-1 rounded-xl transition-all", className)}
+      className={cn(
+        "flex items-center gap-2 px-3 py-1.5 rounded-lg transition-all cursor-default",
+        isActive
+          ? "bg-emerald-500/10 border border-emerald-500/30"
+          : "bg-muted/50 hover:bg-muted",
+        className,
+      )}
      title={tooltipText}
    >
-      <div className="flex items-center gap-2 px-2 h-8 rounded-md cursor-default">
-        {isPending ? (
-          <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
-        ) : (
-          <Radio
-            className={cn(
-              "h-4 w-4 transition-colors",
-              takeoverEnabled
-                ? "text-emerald-500 animate-pulse"
-                : "text-muted-foreground",
-            )}
-          />
-        )}
-        <span
+      {isPending ? (
+        <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
+      ) : (
+        <Radio
          className={cn(
-            "text-sm font-medium transition-colors select-none",
-            takeoverEnabled
-              ? "text-emerald-600 dark:text-emerald-400"
+            "h-4 w-4 transition-colors",
+            isActive
+              ? "text-emerald-500 animate-pulse"
              : "text-muted-foreground",
          )}
-        >
-          Proxy
-        </span>
-        <Switch
-          checked={takeoverEnabled}
-          onCheckedChange={handleToggle}
-          disabled={isPending}
-          className="ml-1"
        />
-      </div>
+      )}
+      <span
+        className={cn(
+          "text-sm font-medium transition-colors select-none",
+          isActive
+            ? "text-emerald-600 dark:text-emerald-400"
+            : "text-muted-foreground",
+        )}
+      >
+        Proxy
+      </span>
+      <Switch
+        checked={isActive}
+        onCheckedChange={handleToggle}
+        disabled={isPending}
+        className="ml-1"
+      />
    </div>
  );
 }
@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useState } from "react";
 import {
  Download,
-  Copy,
  ExternalLink,
  Info,
  Loader2,
@@ -9,7 +8,6 @@ import {
  Terminal,
  CheckCircle2,
  AlertCircle,
-  Sparkles,
 } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { useTranslation } from "react-i18next";
@@ -19,7 +17,6 @@ import { settingsApi } from "@/lib/api";
 import { useUpdate } from "@/contexts/UpdateContext";
 import { relaunchApp } from "@/lib/updater";
 import { Badge } from "@/components/ui/badge";
-import { motion } from "framer-motion";

 interface AboutSectionProps {
  isPortable: boolean;
@@ -32,10 +29,6 @@ interface ToolVersion {
  error: string | null;
 }

-const ONE_CLICK_INSTALL_COMMANDS = `npm i -g @anthropic-ai/claude-code@latest
-npm i -g @openai/codex@latest
-npm i -g @google/gemini-cli@latest`;
-
 export function AboutSection({ isPortable }: AboutSectionProps) {
  // ... (use hooks as before) ...
  const { t } = useTranslation();
@@ -54,18 +47,6 @@ export function AboutSection({ isPortable }: AboutSectionProps) {
    isChecking,
  } = useUpdate();

-  const loadToolVersions = useCallback(async () => {
-    setIsLoadingTools(true);
-    try {
-      const tools = await settingsApi.getToolVersions();
-      setToolVersions(tools);
-    } catch (error) {
-      console.error("[AboutSection] Failed to load tool versions", error);
-    } finally {
-      setIsLoadingTools(false);
-    }
-  }, []);
-
  useEffect(() => {
    let active = true;
    const load = async () => {
@@ -161,7 +142,7 @@ export function AboutSection({ isPortable }: AboutSectionProps) {
    try {
      const available = await checkUpdate();
      if (!available) {
-        toast.success(t("settings.upToDate"), { closeButton: true });
+        toast.success(t("settings.upToDate"));
      }
    } catch (error) {
      console.error("[AboutSection] Check update failed", error);
@@ -169,25 +150,10 @@ export function AboutSection({ isPortable }: AboutSectionProps) {
    }
  }, [checkUpdate, hasUpdate, isPortable, resetDismiss, t, updateHandle]);

-  const handleCopyInstallCommands = useCallback(async () => {
-    try {
-      await navigator.clipboard.writeText(ONE_CLICK_INSTALL_COMMANDS);
-      toast.success(t("settings.installCommandsCopied"), { closeButton: true });
-    } catch (error) {
-      console.error("[AboutSection] Failed to copy install commands", error);
-      toast.error(t("settings.installCommandsCopyFailed"));
-    }
-  }, [t]);
-
  const displayVersion = version ?? t("common.unknown");

  return (
-    <motion.section
-      initial={{ opacity: 0, y: 10 }}
-      animate={{ opacity: 1, y: 0 }}
-      transition={{ duration: 0.3 }}
-      className="space-y-6"
-    >
+    <section className="space-y-6">
      <header className="space-y-1">
        <h3 className="text-sm font-medium">{t("common.about")}</h3>
        <p className="text-xs text-muted-foreground">
@@ -195,22 +161,12 @@ export function AboutSection({ isPortable }: AboutSectionProps) {
        </p>
      </header>

-      <motion.div
-        initial={{ opacity: 0, scale: 0.98 }}
-        animate={{ opacity: 1, scale: 1 }}
-        transition={{ duration: 0.3, delay: 0.1 }}
-        className="rounded-xl border border-border bg-gradient-to-br from-card/80 to-card/40 p-6 space-y-5 shadow-sm"
-      >
+      <div className="rounded-xl border border-border bg-card/50 p-6 space-y-6">
        <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
          <div className="space-y-2">
+            <h4 className="text-lg font-semibold text-foreground">CC Switch</h4>
            <div className="flex items-center gap-2">
-              <Sparkles className="h-5 w-5 text-primary" />
-              <h4 className="text-lg font-semibold text-foreground">
-                CC Switch
-              </h4>
-            </div>
-            <div className="flex items-center gap-2">
-              <Badge variant="outline" className="gap-1.5 bg-background/80">
+              <Badge variant="outline" className="gap-1.5 bg-background">
                <span className="text-muted-foreground">
                  {t("common.version")}
                </span>
@@ -229,15 +185,15 @@ export function AboutSection({ isPortable }: AboutSectionProps) {
            </div>
          </div>

-          <div className="flex items-center gap-2">
+          <div className="flex flex-wrap items-center gap-2">
            <Button
              type="button"
              variant="outline"
              size="sm"
              onClick={handleOpenReleaseNotes}
-              className="h-8 gap-1.5 text-xs"
+              className="h-9"
            >
-              <ExternalLink className="h-3.5 w-3.5" />
+              <ExternalLink className="mr-2 h-4 w-4" />
              {t("settings.releaseNotes")}
            </Button>
            <Button
@@ -245,41 +201,34 @@ export function AboutSection({ isPortable }: AboutSectionProps) {
              size="sm"
              onClick={handleCheckUpdate}
              disabled={isChecking || isDownloading}
-              className="h-8 gap-1.5 text-xs"
+              className="min-w-[140px] h-9"
            >
              {isDownloading ? (
-                <>
-                  <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                <span className="inline-flex items-center gap-2">
+                  <Loader2 className="h-4 w-4 animate-spin" />
                  {t("settings.updating")}
-                </>
+                </span>
              ) : hasUpdate ? (
-                <>
-                  <Download className="h-3.5 w-3.5" />
+                <span className="inline-flex items-center gap-2">
+                  <Download className="h-4 w-4" />
                  {t("settings.updateTo", {
                    version: updateInfo?.availableVersion ?? "",
                  })}
-                </>
+                </span>
              ) : isChecking ? (
-                <>
-                  <RefreshCw className="h-3.5 w-3.5 animate-spin" />
+                <span className="inline-flex items-center gap-2">
+                  <RefreshCw className="h-4 w-4 animate-spin" />
                  {t("settings.checking")}
-                </>
+                </span>
              ) : (
-                <>
-                  <RefreshCw className="h-3.5 w-3.5" />
-                  {t("settings.checkForUpdates")}
-                </>
+                t("settings.checkForUpdates")
              )}
            </Button>
          </div>
        </div>

        {hasUpdate && updateInfo && (
-          <motion.div
-            initial={{ opacity: 0, height: 0 }}
-            animate={{ opacity: 1, height: "auto" }}
-            className="rounded-lg bg-primary/10 border border-primary/20 px-4 py-3 text-sm"
-          >
+          <div className="rounded-lg bg-primary/10 border border-primary/20 px-4 py-3 text-sm">
            <p className="font-medium text-primary mb-1">
              {t("settings.updateAvailable", {
                version: updateInfo.availableVersion,
@@ -290,111 +239,60 @@ export function AboutSection({ isPortable }: AboutSectionProps) {
                {updateInfo.notes}
              </p>
            )}
-          </motion.div>
+          </div>
        )}
-      </motion.div>
-
-      <div className="space-y-3">
-        <div className="flex items-center justify-between px-1">
-          <h3 className="text-sm font-medium">{t("settings.localEnvCheck")}</h3>
-          <Button
-            size="sm"
-            variant="outline"
-            className="h-7 gap-1.5 text-xs"
-            onClick={loadToolVersions}
-            disabled={isLoadingTools}
-          >
-            <RefreshCw
-              className={
-                isLoadingTools ? "h-3.5 w-3.5 animate-spin" : "h-3.5 w-3.5"
-              }
-            />
-            {isLoadingTools ? t("common.refreshing") : t("common.refresh")}
-          </Button>
-        </div>
-        <div className="grid gap-3 sm:grid-cols-3">
-          {["claude", "codex", "gemini"].map((toolName, index) => {
-            const tool = toolVersions.find((item) => item.name === toolName);
-            const displayName = tool?.name ?? toolName;
-            const title = tool?.version || tool?.error || t("common.unknown");
-
-            return (
-              <motion.div
-                key={toolName}
-                initial={{ opacity: 0, y: 10 }}
-                animate={{ opacity: 1, y: 0 }}
-                transition={{ duration: 0.3, delay: 0.15 + index * 0.05 }}
-                whileHover={{ scale: 1.02 }}
-                className="flex flex-col gap-2 rounded-xl border border-border bg-gradient-to-br from-card/80 to-card/40 p-4 shadow-sm transition-colors hover:border-primary/30"
-              >
-                <div className="flex items-center justify-between">
-                  <div className="flex items-center gap-2">
-                    <Terminal className="h-4 w-4 text-muted-foreground" />
-                    <span className="text-sm font-medium capitalize">
-                      {displayName}
-                    </span>
-                  </div>
-                  {isLoadingTools ? (
-                    <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
-                  ) : tool?.version ? (
-                    <div className="flex items-center gap-1.5">
-                      {tool.latest_version &&
-                        tool.version !== tool.latest_version && (
-                          <span className="text-[10px] px-1.5 py-0.5 rounded-full bg-yellow-500/10 text-yellow-600 dark:text-yellow-400 border border-yellow-500/20">
-                            {tool.latest_version}
-                          </span>
-                        )}
-                      <CheckCircle2 className="h-4 w-4 text-green-500" />
-                    </div>
-                  ) : (
-                    <AlertCircle className="h-4 w-4 text-yellow-500" />
-                  )}
-                </div>
-                <div
-                  className="text-xs font-mono text-muted-foreground truncate"
-                  title={title}
-                >
-                  {isLoadingTools
-                    ? t("common.loading")
-                    : tool?.version
-                      ? tool.version
-                      : tool?.error || t("common.notInstalled")}
-                </div>
-              </motion.div>
-            );
-          })}
-        </div>
      </div>

-      <motion.div
-        initial={{ opacity: 0, y: 10 }}
-        animate={{ opacity: 1, y: 0 }}
-        transition={{ duration: 0.3, delay: 0.3 }}
-        className="space-y-3"
-      >
-        <h3 className="text-sm font-medium px-1">
-          {t("settings.oneClickInstall")}
-        </h3>
-        <div className="rounded-xl border border-border bg-gradient-to-br from-card/80 to-card/40 p-4 space-y-3 shadow-sm">
-          <div className="flex items-center justify-between gap-2">
-            <p className="text-xs text-muted-foreground">
-              {t("settings.oneClickInstallHint")}
-            </p>
-            <Button
-              size="sm"
-              variant="outline"
-              onClick={handleCopyInstallCommands}
-              className="h-7 gap-1.5 text-xs"
-            >
-              <Copy className="h-3.5 w-3.5" />
-              {t("common.copy")}
-            </Button>
-          </div>
-          <pre className="text-xs font-mono bg-background/80 px-3 py-2.5 rounded-lg border border-border/60 overflow-x-auto">
-            {ONE_CLICK_INSTALL_COMMANDS}
-          </pre>
+      <div className="space-y-3">
+        <h4 className="text-sm font-medium text-muted-foreground px-1">
+          本地环境检查
+        </h4>
+        <div className="grid gap-3 sm:grid-cols-3">
+          {isLoadingTools
+            ? Array.from({ length: 3 }).map((_, i) => (
+                <div
+                  key={i}
+                  className="h-20 rounded-xl border border-border bg-card/50 animate-pulse"
+                />
+              ))
+            : toolVersions.map((tool) => (
+                <div
+                  key={tool.name}
+                  className="flex flex-col gap-2 rounded-xl border border-border bg-card/50 p-4 transition-colors hover:bg-muted/50"
+                >
+                  <div className="flex items-center justify-between">
+                    <div className="flex items-center gap-2">
+                      <Terminal className="h-4 w-4 text-muted-foreground" />
+                      <span className="text-sm font-medium capitalize">
+                        {tool.name}
+                      </span>
+                    </div>
+                    {tool.version ? (
+                      <div className="flex items-center gap-1.5">
+                        {tool.latest_version &&
+                          tool.version !== tool.latest_version && (
+                            <span className="text-[10px] px-1.5 py-0.5 rounded-full bg-yellow-500/10 text-yellow-600 dark:text-yellow-400 border border-yellow-500/20">
+                              Update: {tool.latest_version}
+                            </span>
+                          )}
+                        <CheckCircle2 className="h-4 w-4 text-green-500" />
+                      </div>
+                    ) : (
+                      <AlertCircle className="h-4 w-4 text-yellow-500" />
+                    )}
+                  </div>
+                  <div className="flex flex-col gap-0.5">
+                    <div
+                      className="text-xs font-mono truncate"
+                      title={tool.version || tool.error || "Unknown"}
+                    >
+                      {tool.version ? tool.version : tool.error || "未安装"}
+                    </div>
+                  </div>
+                </div>
+              ))}
        </div>
-      </motion.div>
-    </motion.section>
+      </div>
+    </section>
  );
 }
@@ -93,7 +93,7 @@ export function ImportExportSection({
                type="button"
                onClick={onClear}
                className="absolute -top-2 -right-2 h-6 w-6 rounded-full bg-red-500 hover:bg-red-600 text-white flex items-center justify-center shadow-lg transition-colors z-10"
-                aria-label={t("common.clear")}
+                aria-label="Clear selection"
              >
                <XCircle className="h-4 w-4" />
              </button>
@@ -1,5 +1,4 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { motion } from "framer-motion";
 import {
  Loader2,
  Save,
@@ -8,9 +7,7 @@ import {
  Coins,
  Database,
  Server,
-  ChevronDown,
 } from "lucide-react";
-import * as AccordionPrimitive from "@radix-ui/react-accordion";
 import { toast } from "sonner";
 import {
  Dialog,
@@ -38,7 +35,6 @@ import { ProxyPanel } from "@/components/proxy";
 import { PricingConfigPanel } from "@/components/usage/PricingConfigPanel";
 import { ModelTestConfigPanel } from "@/components/usage/ModelTestConfigPanel";
 import { AutoFailoverConfigPanel } from "@/components/proxy/AutoFailoverConfigPanel";
-import { FailoverQueueManager } from "@/components/proxy/FailoverQueueManager";
 import { UsageDashboard } from "@/components/usage/UsageDashboard";
 import { useSettings } from "@/hooks/useSettings";
 import { useImportExport } from "@/hooks/useImportExport";
@@ -139,7 +135,7 @@ export function SettingsPage({
  const handleRestartNow = useCallback(async () => {
    setShowRestartPrompt(false);
    if (import.meta.env.DEV) {
-      toast.success(t("settings.devModeRestartHint"), { closeButton: true });
+      toast.success(t("settings.devModeRestartHint"));
      closeAfterSave();
      return;
    }
@@ -178,17 +174,18 @@ export function SettingsPage({

  const {
    isRunning,
-    startProxyServer,
-    stopWithRestore,
+    startWithTakeover: startProxy,
+    stopWithRestore: stopProxy,
    isPending: isProxyPending,
  } = useProxyStatus();
+  const [failoverEnabled, setFailoverEnabled] = useState(true);

  const handleToggleProxy = async (checked: boolean) => {
    try {
      if (!checked) {
-        await stopWithRestore();
+        await stopProxy();
      } else {
-        await startProxyServer();
+        await startProxy();
      }
    } catch (error) {
      console.error("Toggle proxy failed:", error);
@@ -214,19 +211,16 @@ export function SettingsPage({
            <TabsTrigger value="advanced">
              {t("settings.tabAdvanced")}
            </TabsTrigger>
-            <TabsTrigger value="usage">{t("usage.title")}</TabsTrigger>
+            <TabsTrigger value="usage">
+              {t("usage.title", "使用统计")}
+            </TabsTrigger>
            <TabsTrigger value="about">{t("common.about")}</TabsTrigger>
          </TabsList>

          <div className="flex-1 overflow-y-auto overflow-x-hidden pr-2">
            <TabsContent value="general" className="space-y-6 mt-0">
              {settings ? (
-                <motion.div
-                  initial={{ opacity: 0, y: 10 }}
-                  animate={{ opacity: 1, y: 0 }}
-                  transition={{ duration: 0.3 }}
-                  className="space-y-6"
-                >
+                <>
                  <LanguageSettings
                    value={settings.language}
                    onChange={(lang) => handleAutoSave({ language: lang })}
@@ -236,18 +230,13 @@ export function SettingsPage({
                    settings={settings}
                    onChange={handleAutoSave}
                  />
-                </motion.div>
+                </>
              ) : null}
            </TabsContent>

            <TabsContent value="advanced" className="space-y-6 mt-0 pb-6">
              {settings ? (
-                <motion.div
-                  initial={{ opacity: 0, y: 10 }}
-                  animate={{ opacity: 1, y: 0 }}
-                  transition={{ duration: 0.3 }}
-                  className="space-y-4"
-                >
+                <div className="space-y-4">
                  <Accordion
                    type="multiple"
                    defaultValue={[]}
@@ -262,10 +251,10 @@ export function SettingsPage({
                          <FolderSearch className="h-5 w-5 text-primary" />
                          <div className="text-left">
                            <h3 className="text-base font-semibold">
-                              {t("settings.advanced.configDir.title")}
+                              配置文件目录
                            </h3>
                            <p className="text-sm text-muted-foreground font-normal">
-                              {t("settings.advanced.configDir.description")}
+                              管理 Claude、Codex 和 Gemini 的配置存储路径
                            </p>
                          </div>
                        </div>
@@ -289,43 +278,42 @@ export function SettingsPage({

                    <AccordionItem
                      value="proxy"
-                      className="rounded-xl glass-card overflow-hidden [&[data-state=open]>.accordion-header]:bg-muted/50"
+                      className="rounded-xl glass-card overflow-hidden"
                    >
-                      <AccordionPrimitive.Header className="accordion-header flex items-center justify-between px-6 py-4 hover:bg-muted/50">
-                        <AccordionPrimitive.Trigger className="flex flex-1 items-center justify-between hover:no-underline [&[data-state=open]>svg]:rotate-180">
+                      <AccordionTrigger className="px-6 py-4 hover:no-underline hover:bg-muted/50 data-[state=open]:bg-muted/50">
+                        <div className="flex flex-1 items-center justify-between pr-4">
                          <div className="flex items-center gap-3">
                            <Server className="h-5 w-5 text-green-500" />
                            <div className="text-left">
                              <h3 className="text-base font-semibold">
-                                {t("settings.advanced.proxy.title")}
+                                本地代理
                              </h3>
                              <p className="text-sm text-muted-foreground font-normal">
-                                {t("settings.advanced.proxy.description")}
+                                控制代理服务开关、查看状态与端口信息
                              </p>
                            </div>
                          </div>
-                          <ChevronDown className="h-4 w-4 shrink-0 transition-transform duration-200" />
-                        </AccordionPrimitive.Trigger>
-
-                        <div className="flex items-center gap-4 pl-4">
-                          <Badge
-                            variant={isRunning ? "default" : "secondary"}
-                            className="gap-1.5 h-6"
+                          <div
+                            className="flex items-center gap-4"
+                            onClick={(e) => e.stopPropagation()}
                          >
-                            <Activity
-                              className={`h-3 w-3 ${isRunning ? "animate-pulse" : ""}`}
+                            <Badge
+                              variant={isRunning ? "default" : "secondary"}
+                              className="gap-1.5 h-6"
+                            >
+                              <Activity
+                                className={`h-3 w-3 ${isRunning ? "animate-pulse" : ""}`}
+                              />
+                              {isRunning ? "运行中" : "已停止"}
+                            </Badge>
+                            <Switch
+                              checked={isRunning}
+                              onCheckedChange={handleToggleProxy}
+                              disabled={isProxyPending}
                            />
-                            {isRunning
-                              ? t("settings.advanced.proxy.running")
-                              : t("settings.advanced.proxy.stopped")}
-                          </Badge>
-                          <Switch
-                            checked={isRunning}
-                            onCheckedChange={handleToggleProxy}
-                            disabled={isProxyPending}
-                          />
+                          </div>
                        </div>
-                      </AccordionPrimitive.Header>
+                      </AccordionTrigger>
                      <AccordionContent className="px-6 pb-6 pt-0 border-t border-border/50">
                        <ProxyPanel />
                      </AccordionContent>
@@ -340,10 +328,10 @@ export function SettingsPage({
                          <Activity className="h-5 w-5 text-indigo-500" />
                          <div className="text-left">
                            <h3 className="text-base font-semibold">
-                              {t("settings.advanced.modelTest.title")}
+                              模型测试配置
                            </h3>
                            <p className="text-sm text-muted-foreground font-normal">
-                              {t("settings.advanced.modelTest.description")}
+                              配置模型测试使用的默认模型和提示词
                            </p>
                          </div>
                        </div>
@@ -358,74 +346,37 @@ export function SettingsPage({
                      className="rounded-xl glass-card overflow-hidden"
                    >
                      <AccordionTrigger className="px-6 py-4 hover:no-underline hover:bg-muted/50 data-[state=open]:bg-muted/50">
-                        <div className="flex items-center gap-3">
-                          <Activity className="h-5 w-5 text-orange-500" />
-                          <div className="text-left">
-                            <h3 className="text-base font-semibold">
-                              {t("settings.advanced.failover.title")}
-                            </h3>
-                            <p className="text-sm text-muted-foreground font-normal">
-                              {t("settings.advanced.failover.description")}
-                            </p>
+                        <div className="flex flex-1 items-center justify-between pr-4">
+                          <div className="flex items-center gap-3">
+                            <Activity className="h-5 w-5 text-orange-500" />
+                            <div className="text-left">
+                              <h3 className="text-base font-semibold">
+                                自动故障转移
+                              </h3>
+                              <p className="text-sm text-muted-foreground font-normal">
+                                配置自动故障转移和熔断策略
+                              </p>
+                            </div>
+                          </div>
+                          <div
+                            className="flex items-center gap-4"
+                            onClick={(e) => e.stopPropagation()}
+                          >
+                            <div className="flex items-center gap-2">
+                              {/* Removed status text as requested */}
+                              <Switch
+                                checked={failoverEnabled}
+                                onCheckedChange={setFailoverEnabled}
+                              />
+                            </div>
                          </div>
                        </div>
                      </AccordionTrigger>
                      <AccordionContent className="px-6 pb-6 pt-4 border-t border-border/50">
-                        <div className="space-y-6">
-                          {/* 代理未运行时的提示 */}
-                          {!isRunning && (
-                            <div className="p-4 rounded-lg bg-yellow-500/10 border border-yellow-500/20">
-                              <p className="text-sm text-yellow-600 dark:text-yellow-400">
-                                {t("proxy.failover.proxyRequired", {
-                                  defaultValue:
-                                    "需要先启动代理服务才能配置故障转移",
-                                })}
-                              </p>
-                            </div>
-                          )}
-
-                          {/* 故障转移队列管理 - 每个应用独立 */}
-                          <div className="space-y-4">
-                            <div>
-                              <h4 className="text-sm font-semibold">
-                                {t("proxy.failoverQueue.title")}
-                              </h4>
-                              <p className="text-xs text-muted-foreground">
-                                {t("proxy.failoverQueue.description")}
-                              </p>
-                            </div>
-                            <Tabs defaultValue="claude" className="w-full">
-                              <TabsList className="grid w-full grid-cols-3">
-                                <TabsTrigger value="claude">Claude</TabsTrigger>
-                                <TabsTrigger value="codex">Codex</TabsTrigger>
-                                <TabsTrigger value="gemini">Gemini</TabsTrigger>
-                              </TabsList>
-                              <TabsContent value="claude" className="mt-4">
-                                <FailoverQueueManager
-                                  appType="claude"
-                                  disabled={!isRunning}
-                                />
-                              </TabsContent>
-                              <TabsContent value="codex" className="mt-4">
-                                <FailoverQueueManager
-                                  appType="codex"
-                                  disabled={!isRunning}
-                                />
-                              </TabsContent>
-                              <TabsContent value="gemini" className="mt-4">
-                                <FailoverQueueManager
-                                  appType="gemini"
-                                  disabled={!isRunning}
-                                />
-                              </TabsContent>
-                            </Tabs>
-                          </div>
-
-                          {/* 熔断器配置 - 全局共享 */}
-                          <div className="border-t border-border/50 pt-6">
-                            <AutoFailoverConfigPanel />
-                          </div>
-                        </div>
+                        <AutoFailoverConfigPanel
+                          enabled={failoverEnabled}
+                          onEnabledChange={setFailoverEnabled}
+                        />
                      </AccordionContent>
                    </AccordionItem>

@@ -438,10 +389,10 @@ export function SettingsPage({
                          <Coins className="h-5 w-5 text-yellow-500" />
                          <div className="text-left">
                            <h3 className="text-base font-semibold">
-                              {t("settings.advanced.pricing.title")}
+                              成本定价
                            </h3>
                            <p className="text-sm text-muted-foreground font-normal">
-                              {t("settings.advanced.pricing.description")}
+                              管理各模型 Token 计费规则
                            </p>
                          </div>
                        </div>
@@ -460,10 +411,10 @@ export function SettingsPage({
                          <Database className="h-5 w-5 text-blue-500" />
                          <div className="text-left">
                            <h3 className="text-base font-semibold">
-                              {t("settings.advanced.data.title")}
+                              数据管理
                            </h3>
                            <p className="text-sm text-muted-foreground font-normal">
-                              {t("settings.advanced.data.description")}
+                              导入导出配置与备份恢复
                            </p>
                          </div>
                        </div>
@@ -503,7 +454,7 @@ export function SettingsPage({
                      )}
                    </Button>
                  </div>
-                </motion.div>
+                </div>
              ) : null}
            </TabsContent>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
YoVinchen	344a4f1a5c	Merge branch 'main' into feat/provider-icon-color # Conflicts: # src-tauri/src/proxy/types.rs # src-tauri/src/usage_script.rs # src/components/proxy/AutoFailoverConfigPanel.tsx	2025-12-11 17:08:09 +08:00
YoVinchen	87ca36fc6d	feat(health): add configurable test models and reasoning effort support Enhance stream check service with configurable test models: - Add claude_model, codex_model, gemini_model to StreamCheckConfig - Support reasoning effort syntax (model@level or model#level) - Parse and apply reasoning_effort for OpenAI-compatible models - Remove hardcoded model names from check functions - Add unit tests for model parsing logic - Remove obsolete model_test source files This allows users to customize which models are used for health checks.	2025-12-10 16:03:25 +08:00
YoVinchen	86ebb524f7	refactor(ui): update frontend components for stream check Update frontend components to use stream check API: - Refactor ModelTestConfigPanel to use stream check config - Update API layer to use stream_check commands - Add HealthStatus type and StreamCheckResult interface - Update ProviderList to use new health check integration - Update AutoFailoverConfigPanel with stream check references - Improve UI layout and configuration options This completes the frontend migration from model_test to stream_check.	2025-12-10 15:59:55 +08:00
YoVinchen	ed5ad7ad3d	refactor(db): clean up unused database tables and optimize schema Remove deprecated and unused database tables: - Remove proxy_usage table (replaced by proxy_request_logs) - Remove usage_daily_stats table (aggregation done on-the-fly) - Rename model_test_logs to stream_check_logs with updated schema - Remove related DAO methods for proxy_usage - Update usage_stats service to use proxy_request_logs only - Refactor usage_script to work with new schema This simplifies the database schema and removes redundant data storage.	2025-12-10 15:54:21 +08:00
YoVinchen	454c3ed111	refactor(health): replace model_test with stream_check Replace model_test module with stream_check across the codebase: - Remove model_test command and service modules - Update command registry in lib.rs to use stream_check commands - Update module exports in commands/mod.rs and services/mod.rs - Remove frontend useModelTest hook - Update stream_check command implementation This refactoring provides clearer naming and better separation of concerns.	2025-12-10 15:52:26 +08:00
YoVinchen	08647ac3ba	feat(health): add stream check core functionality Add new stream-based health check module to replace model_test: - Add stream_check command layer with single and batch provider checks - Add stream_check DAO layer for config and log persistence - Add stream_check service layer with retry mechanism and health status evaluation - Add frontend HealthStatusIndicator component - Add frontend useStreamCheck hook This provides more comprehensive health checking capabilities.	2025-12-10 15:48:43 +08:00
YoVinchen	6acd6e5090	feat(ui): add color prop support to ProviderIcon component	2025-12-10 14:05:37 +08:00