diff --git a/src-tauri/src/commands/provider.rs b/src-tauri/src/commands/provider.rs
index b25b63ed..cce5aabd 100644
--- a/src-tauri/src/commands/provider.rs
+++ b/src-tauri/src/commands/provider.rs
@@ -86,19 +86,6 @@ 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)
 }
diff --git a/src-tauri/src/commands/proxy.rs b/src-tauri/src/commands/proxy.rs
index b74e1afe..395ce307 100644
--- a/src-tauri/src/commands/proxy.rs
+++ b/src-tauri/src/commands/proxy.rs
@@ -2,7 +2,6 @@
 //!
 //! 提供前端调用的 API 接口
 
-use crate::provider::Provider;
 use crate::proxy::types::*;
 use crate::proxy::{CircuitBreakerConfig, CircuitBreakerStats};
 use crate::store::AppState;
@@ -69,47 +68,6 @@ 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(
diff --git a/src-tauri/src/commands/stream_check.rs b/src-tauri/src/commands/stream_check.rs
index d0fa13db..13ed3307 100644
--- a/src-tauri/src/commands/stream_check.rs
+++ b/src-tauri/src/commands/stream_check.rs
@@ -6,6 +6,7 @@ use crate::services::stream_check::{
     HealthStatus, StreamCheckConfig, StreamCheckResult, StreamCheckService,
 };
 use crate::store::AppState;
+use std::collections::HashSet;
 use tauri::State;
 
 /// 流式健康检查（单个供应商）
@@ -44,10 +45,28 @@ 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 {
+                if item.enabled {
+                    ids.insert(item.provider_id);
+                }
+            }
+        }
+        Some(ids)
+    } else {
+        None
+    };
 
     for (id, provider) in providers {
-        if proxy_targets_only && !provider.is_proxy_target.unwrap_or(false) {
-            continue;
+        if let Some(ids) = &allowed_ids {
+            if !ids.contains(&id) {
+                continue;
+            }
         }
 
         let result = StreamCheckService::check_with_retry(&app_type, &provider, &config)
diff --git a/src-tauri/src/database/dao/providers.rs b/src-tauri/src/database/dao/providers.rs
index b9cf8de8..1ba3683c 100644
--- a/src-tauri/src/database/dao/providers.rs
+++ b/src-tauri/src/database/dao/providers.rs
@@ -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, is_proxy_target
+            "SELECT id, name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta
              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,6 @@ 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 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 +54,6 @@ impl Database {
                         meta: Some(meta),
                         icon,
                         icon_color,
-                        is_proxy_target: Some(is_proxy_target),
                     },
                 ))
             })
@@ -131,7 +129,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, is_proxy_target
+            "SELECT name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta
              FROM providers WHERE id = ?1 AND app_type = ?2",
             params![id, app_type],
             |row| {
@@ -145,7 +143,6 @@ 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 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 +159,6 @@ impl Database {
                     meta: Some(meta),
                     icon,
                     icon_color,
-                    is_proxy_target: Some(is_proxy_target),
                 })
             },
         );
@@ -174,26 +170,6 @@ 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 管理
@@ -208,17 +184,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 和 is_proxy_target）
-        let existing: Option<(bool, bool)> = tx
+        // 检查是否存在（用于判断新增/更新，以及保留 is_current）
+        let existing: Option<bool> = tx
             .query_row(
-                "SELECT is_current, is_proxy_target FROM providers WHERE id = ?1 AND app_type = ?2",
+                "SELECT is_current FROM providers WHERE id = ?1 AND app_type = ?2",
                 params![provider.id, app_type],
-                |row| Ok((row.get(0)?, row.get(1)?)),
+                |row| row.get(0),
             )
             .ok();
 
         let is_update = existing.is_some();
-        let (is_current, is_proxy_target) = existing.unwrap_or((false, false));
+        let is_current = existing.unwrap_or(false);
 
         if is_update {
             // 更新模式：使用 UPDATE 避免触发 ON DELETE CASCADE
@@ -234,9 +210,8 @@ impl Database {
                     icon = ?8,
                     icon_color = ?9,
                     meta = ?10,
-                    is_current = ?11,
-                    is_proxy_target = ?12
-                WHERE id = ?13 AND app_type = ?14",
+                    is_current = ?11
+                WHERE id = ?12 AND app_type = ?13",
                 params![
                     provider.name,
                     serde_json::to_string(&provider.settings_config).unwrap(),
@@ -249,7 +224,6 @@ impl Database {
                     provider.icon_color,
                     serde_json::to_string(&meta_clone).unwrap(),
                     is_current,
-                    is_proxy_target,
                     provider.id,
                     app_type,
                 ],
@@ -260,8 +234,8 @@ 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, is_proxy_target
-                ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14)",
+                    created_at, sort_index, notes, icon, icon_color, meta, is_current
+                ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)",
                 params![
                     provider.id,
                     app_type,
@@ -276,7 +250,6 @@ impl Database {
                     provider.icon_color,
                     serde_json::to_string(&meta_clone).unwrap(),
                     is_current,
-                    is_proxy_target,
                 ],
             )
             .map_err(|e| AppError::Database(e.to_string()))?;
@@ -332,157 +305,6 @@ 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,
diff --git a/src-tauri/src/database/schema.rs b/src-tauri/src/database/schema.rs
index deab11aa..134397a4 100644
--- a/src-tauri/src/database/schema.rs
+++ b/src-tauri/src/database/schema.rs
@@ -31,19 +31,12 @@ impl Database {
                 icon_color TEXT,
                 meta TEXT NOT NULL DEFAULT '{}',
                 is_current 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 (
diff --git a/src-tauri/src/database/tests.rs b/src-tauri/src/database/tests.rs
index 2ce71903..44bf304a 100644
--- a/src-tauri/src/database/tests.rs
+++ b/src-tauri/src/database/tests.rs
@@ -245,7 +245,6 @@ fn dry_run_validates_schema_compatibility() {
             meta: None,
             icon: None,
             icon_color: None,
-            is_proxy_target: Some(false),
         },
     );
 
diff --git a/src-tauri/src/deeplink/provider.rs b/src-tauri/src/deeplink/provider.rs
index f1bac94c..76fce86c 100644
--- a/src-tauri/src/deeplink/provider.rs
+++ b/src-tauri/src/deeplink/provider.rs
@@ -132,7 +132,6 @@ pub(crate) fn build_provider_from_request(
         meta,
         icon: request.icon.clone(),
         icon_color: None,
-        is_proxy_target: None,
     };
 
     Ok(provider)
diff --git a/src-tauri/src/deeplink/tests.rs b/src-tauri/src/deeplink/tests.rs
index b20fa55c..0f7fb5e4 100644
--- a/src-tauri/src/deeplink/tests.rs
+++ b/src-tauri/src/deeplink/tests.rs
@@ -145,6 +145,13 @@ 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();
@@ -191,6 +198,13 @@ 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();
@@ -232,6 +246,13 @@ 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();
@@ -275,6 +296,13 @@ 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();
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 8a9e767f..147bffd3 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -581,7 +581,6 @@ 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,
@@ -684,8 +683,6 @@ 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,
diff --git a/src-tauri/src/provider.rs b/src-tauri/src/provider.rs
index 7de68b70..966b284c 100644
--- a/src-tauri/src/provider.rs
+++ b/src-tauri/src/provider.rs
@@ -36,10 +36,6 @@ pub struct Provider {
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(rename = "iconColor")]
     pub icon_color: Option<String>,
-    /// 是否为代理目标（数据库专用字段，不写入配置文件）
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(rename = "isProxyTarget")]
-    pub is_proxy_target: Option<bool>,
 }
 
 impl Provider {
@@ -62,7 +58,6 @@ impl Provider {
             meta: None,
             icon: None,
             icon_color: None,
-            is_proxy_target: None,
         }
     }
 }
diff --git a/src-tauri/src/proxy/circuit_breaker.rs b/src-tauri/src/proxy/circuit_breaker.rs
index 21092255..186a3c9b 100644
--- a/src-tauri/src/proxy/circuit_breaker.rs
+++ b/src-tauri/src/proxy/circuit_breaker.rs
@@ -99,6 +99,36 @@ impl CircuitBreaker {
         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 {
+        let state = *self.state.read().await;
+        let config = self.config.read().await;
+
+        match state {
+            CircuitState::Closed | CircuitState::HalfOpen => 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); // 释放读锁再转换状态
+                        log::info!(
+                            "Circuit breaker transitioning from Open to HalfOpen (timeout reached)"
+                        );
+                        self.transition_to_half_open().await;
+                        return true;
+                    }
+                }
+                false
+            }
+        }
+    }
+
     /// 检查是否允许请求通过
     pub async fn allow_request(&self) -> bool {
         let state = *self.state.read().await;
diff --git a/src-tauri/src/proxy/forwarder.rs b/src-tauri/src/proxy/forwarder.rs
index 4eadb00c..8d230000 100644
--- a/src-tauri/src/proxy/forwarder.rs
+++ b/src-tauri/src/proxy/forwarder.rs
@@ -148,13 +148,33 @@ impl RequestForwarder {
 
         let mut last_error = None;
         let mut failover_happened = false;
+        let mut attempted_providers = 0usize;
 
         // 依次尝试每个供应商
-        for (attempt, provider) in providers.iter().enumerate() {
+        for provider in providers.iter() {
+            // 发起请求前先获取熔断器放行许可（HalfOpen 会占用探测名额）
+            if !self
+                .router
+                .allow_provider_request(&provider.id, app_type_str)
+                .await
+            {
+                log::debug!(
+                    "[{}] Provider {} 熔断器拒绝本次请求，跳过",
+                    app_type_str,
+                    provider.name
+                );
+                continue;
+            }
+
+            attempted_providers += 1;
+            if attempted_providers > 1 {
+                failover_happened = true;
+            }
+
             log::info!(
                 "[{}] 尝试 {}/{} - 使用Provider: {} (sort_index: {})",
                 app_type_str,
-                attempt + 1,
+                attempted_providers,
                 providers.len(),
                 provider.name,
                 provider.sort_index.unwrap_or(999999)
@@ -167,9 +187,6 @@ 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();
@@ -306,6 +323,21 @@ impl RequestForwarder {
             }
         }
 
+        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(ProxyError::NoAvailableProvider);
+        }
+
         // 所有供应商都失败了
         {
             let mut status = self.status.write().await;
diff --git a/src-tauri/src/proxy/provider_router.rs b/src-tauri/src/proxy/provider_router.rs
index c3bb237a..dbac96e1 100644
--- a/src-tauri/src/proxy/provider_router.rs
+++ b/src-tauri/src/proxy/provider_router.rs
@@ -43,7 +43,7 @@ impl ProviderRouter {
                 let circuit_key = format!("{}:{}", app_type, current.id);
                 let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
 
-                if breaker.allow_request().await {
+                if breaker.is_available().await {
                     log::info!(
                         "[{}] Current provider available: {} ({})",
                         app_type,
@@ -81,7 +81,7 @@ impl ProviderRouter {
                 let circuit_key = format!("{}:{}", app_type, provider.id);
                 let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
 
-                if breaker.allow_request().await {
+                if breaker.is_available().await {
                     log::info!(
                         "[{}] Failover provider available: {} ({}) at queue position {}",
                         app_type,
@@ -116,6 +116,20 @@ impl ProviderRouter {
         Ok(result)
     }
 
+    /// 请求执行前获取熔断器“放行许可”
+    ///
+    /// - Closed：直接放行
+    /// - Open：超时到达后切到 HalfOpen 并放行一次探测
+    /// - HalfOpen：按限流规则放行探测
+    ///
+    /// 注意：调用方必须在请求结束后通过 `record_result()` 释放 HalfOpen 名额，
+    /// 否则会导致该 Provider 长时间无法进入探测状态。
+    pub async fn allow_provider_request(&self, provider_id: &str, app_type: &str) -> bool {
+        let circuit_key = format!("{app_type}:{provider_id}");
+        let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
+        breaker.allow_request().await
+    }
+
     /// 记录供应商请求结果
     pub async fn record_result(
         &self,
@@ -155,24 +169,6 @@ impl ProviderRouter {
             )
             .await?;
 
-        // 4. 如果连续失败达到熔断阈值，自动禁用代理目标
-        if !success {
-            let health = self.db.get_provider_health(provider_id, app_type).await?;
-
-            // 如果连续失败达到阈值，自动关闭该供应商的代理开关
-            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(())
     }
 
@@ -261,6 +257,7 @@ impl ProviderRouter {
 mod tests {
     use super::*;
     use crate::database::Database;
+    use serde_json::json;
 
     #[tokio::test]
     async fn test_provider_router_creation() {
@@ -271,4 +268,44 @@ mod tests {
         let breaker = router.get_or_create_circuit_breaker("claude:test").await;
         assert!(breaker.allow_request().await);
     }
+
+    #[tokio::test]
+    async fn select_providers_does_not_consume_half_open_permit() {
+        let db = Arc::new(Database::memory().unwrap());
+
+        // 配置：让熔断器 Open 后立刻进入 HalfOpen（timeout_seconds=0），并用 1 次失败就打开熔断器
+        db.update_circuit_breaker_config(&CircuitBreakerConfig {
+            failure_threshold: 1,
+            timeout_seconds: 0,
+            ..Default::default()
+        })
+        .await
+        .unwrap();
+
+        // 准备 2 个 Provider：A（当前）+ B（队列）
+        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());
+
+        // 让 B 进入 Open 状态（failure_threshold=1）
+        router
+            .record_result("b", "claude", false, Some("fail".to_string()))
+            .await
+            .unwrap();
+
+        // select_providers 只做“可用性判断”，不应占用 HalfOpen 探测名额
+        let providers = router.select_providers("claude").await.unwrap();
+        assert_eq!(providers.len(), 2);
+
+        // 如果 select_providers 错误地消耗了 HalfOpen 名额，这里会返回 false（被限流拒绝）
+        assert!(router.allow_provider_request("b", "claude").await);
+    }
 }
diff --git a/src-tauri/src/proxy/providers/claude.rs b/src-tauri/src/proxy/providers/claude.rs
index f54321ca..a9bc2e56 100644
--- a/src-tauri/src/proxy/providers/claude.rs
+++ b/src-tauri/src/proxy/providers/claude.rs
@@ -253,7 +253,6 @@ mod tests {
             meta: None,
             icon: None,
             icon_color: None,
-            is_proxy_target: None,
         }
     }
 
diff --git a/src-tauri/src/proxy/providers/codex.rs b/src-tauri/src/proxy/providers/codex.rs
index a7599b52..22c33c75 100644
--- a/src-tauri/src/proxy/providers/codex.rs
+++ b/src-tauri/src/proxy/providers/codex.rs
@@ -174,7 +174,6 @@ mod tests {
             meta: None,
             icon: None,
             icon_color: None,
-            is_proxy_target: None,
         }
     }
 
diff --git a/src-tauri/src/proxy/providers/gemini.rs b/src-tauri/src/proxy/providers/gemini.rs
index ae869de6..1b4ef359 100644
--- a/src-tauri/src/proxy/providers/gemini.rs
+++ b/src-tauri/src/proxy/providers/gemini.rs
@@ -250,7 +250,6 @@ mod tests {
             meta: None,
             icon: None,
             icon_color: None,
-            is_proxy_target: None,
         }
     }
 
diff --git a/src-tauri/src/proxy/providers/mod.rs b/src-tauri/src/proxy/providers/mod.rs
index e5c589af..f604f60a 100644
--- a/src-tauri/src/proxy/providers/mod.rs
+++ b/src-tauri/src/proxy/providers/mod.rs
@@ -205,7 +205,6 @@ mod tests {
             meta: None,
             icon: None,
             icon_color: None,
-            is_proxy_target: None,
         }
     }
 
diff --git a/src-tauri/src/proxy/providers/transform.rs b/src-tauri/src/proxy/providers/transform.rs
index a841750e..141506fd 100644
--- a/src-tauri/src/proxy/providers/transform.rs
+++ b/src-tauri/src/proxy/providers/transform.rs
@@ -394,7 +394,6 @@ mod tests {
             meta: None,
             icon: None,
             icon_color: None,
-            is_proxy_target: None,
         }
     }
 
diff --git a/src-tauri/src/services/provider/mod.rs b/src-tauri/src/services/provider/mod.rs
index 2d62d5b0..3446b356 100644
--- a/src-tauri/src/services/provider/mod.rs
+++ b/src-tauri/src/services/provider/mod.rs
@@ -214,9 +214,6 @@ impl ProviderService {
             // 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))?;
 
@@ -229,7 +226,7 @@ impl ProviderService {
             .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_proxy_target
+            // The proxy server will route requests to the new provider via is_current
             return Ok(());
         }
 
@@ -287,18 +284,6 @@ 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)
diff --git a/src-tauri/src/services/proxy.rs b/src-tauri/src/services/proxy.rs
index 9c82481f..a897af1a 100644
--- a/src-tauri/src/services/proxy.rs
+++ b/src-tauri/src/services/proxy.rs
@@ -77,25 +77,22 @@ impl ProxyService {
 
     /// 启动代理服务器（带 Live 配置接管）
     pub async fn start_with_takeover(&self) -> Result<ProxyServerInfo, String> {
-        // 1. 自动将各应用当前选中的供应商设置为代理目标
-        self.setup_proxy_targets().await?;
-
-        // 2. 备份各应用的 Live 配置
+        // 1. 备份各应用的 Live 配置
         self.backup_live_configs().await?;
 
-        // 3. 同步 Live 配置中的 Token 到数据库（确保代理能读到最新的 Token）
+        // 2. 同步 Live 配置中的 Token 到数据库（确保代理能读到最新的 Token）
         self.sync_live_to_providers().await?;
 
-        // 4. 接管各应用的 Live 配置（写入代理地址，清空 Token）
+        // 3. 接管各应用的 Live 配置（写入代理地址，清空 Token）
         self.takeover_live_configs().await?;
 
-        // 5. 设置接管状态
+        // 4. 设置接管状态
         self.db
             .set_live_takeover_active(true)
             .await
             .map_err(|e| format!("设置接管状态失败: {e}"))?;
 
-        // 6. 启动代理服务器
+        // 5. 启动代理服务器
         match self.start().await {
             Ok(info) => Ok(info),
             Err(e) => {
@@ -108,31 +105,6 @@ impl ProxyService {
         }
     }
 
-    /// 自动设置代理目标：将各应用当前选中的供应商设置为代理目标
-    async fn setup_proxy_targets(&self) -> Result<(), String> {
-        let app_types = ["claude", "codex", "gemini"];
-
-        for app_type in app_types {
-            // 获取当前选中的供应商
-            if let Ok(Some(provider_id)) = self.db.get_current_provider(app_type) {
-                // 设置为代理目标
-                if let Err(e) = self.db.set_proxy_target(&provider_id, app_type, true).await {
-                    log::warn!("设置 {} 的代理目标 {} 失败: {}", app_type, provider_id, e);
-                } else {
-                    log::info!(
-                        "已将 {} 的当前供应商 {} 设置为代理目标",
-                        app_type,
-                        provider_id
-                    );
-                }
-            } else {
-                log::debug!("{} 没有当前供应商，跳过代理目标设置", app_type);
-            }
-        }
-
-        Ok(())
-    }
-
     /// 同步 Live 配置中的 Token 到数据库
     ///
     /// 在清空 Live Token 之前调用，确保数据库中的 Provider 配置有最新的 Token。
diff --git a/src/components/providers/ProviderActions.tsx b/src/components/providers/ProviderActions.tsx
index 706582cc..361fa2b2 100644
--- a/src/components/providers/ProviderActions.tsx
+++ b/src/components/providers/ProviderActions.tsx
@@ -7,7 +7,6 @@ import {
   Play,
   TestTube2,
   Trash2,
-  RotateCcw,
 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
@@ -23,9 +22,6 @@ interface ProviderActionsProps {
   onTest?: () => void;
   onConfigureUsage: () => void;
   onDelete: () => void;
-  onResetCircuitBreaker?: () => void;
-  isProxyTarget?: boolean;
-  consecutiveFailures?: number;
 }
 
 export function ProviderActions({
@@ -38,9 +34,6 @@ export function ProviderActions({
   onTest,
   onConfigureUsage,
   onDelete,
-  onResetCircuitBreaker,
-  isProxyTarget,
-  consecutiveFailures = 0,
 }: ProviderActionsProps) {
   const { t } = useTranslation();
   const iconButtonClass = "h-8 w-8 p-1";
@@ -123,33 +116,6 @@ 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"
diff --git a/src/components/providers/ProviderCard.tsx b/src/components/providers/ProviderCard.tsx
index 81317139..d5488fad 100644
--- a/src/components/providers/ProviderCard.tsx
+++ b/src/components/providers/ProviderCard.tsx
@@ -12,11 +12,7 @@ import { ProviderActions } from "@/components/providers/ProviderActions";
 import { ProviderIcon } from "@/components/ProviderIcon";
 import UsageFooter from "@/components/UsageFooter";
 import { ProviderHealthBadge } from "@/components/providers/ProviderHealthBadge";
-import {
-  useProviderHealth,
-  useResetCircuitBreaker,
-} from "@/lib/query/failover";
-import { toast } from "sonner";
+import { useProviderHealth } from "@/lib/query/failover";
 import { useUsageQuery } from "@/lib/query/queries";
 
 interface DragHandleProps {
@@ -98,32 +94,6 @@ export function ProviderCard({
   // 获取供应商健康状态
   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: "熔断器已重置",
-        }),
-        { closeButton: true },
-      );
-    } catch (error) {
-      toast.error(
-        t("provider.circuitBreakerResetFailed", {
-          defaultValue: "重置失败",
-        }) +
-          ": " +
-          String(error),
-      );
-    }
-  };
-
   const fallbackUrlText = t("provider.notConfigured", {
     defaultValue: "未配置接口地址",
   });
@@ -338,13 +308,6 @@ export function ProviderCard({
               onTest={onTest ? () => onTest(provider) : undefined}
               onConfigureUsage={() => onConfigureUsage(provider)}
               onDelete={() => onDelete(provider)}
-              onResetCircuitBreaker={
-                isProxyRunning && provider.isProxyTarget
-                  ? handleResetCircuitBreaker
-                  : undefined
-              }
-              isProxyTarget={provider.isProxyTarget}
-              consecutiveFailures={health?.consecutive_failures ?? 0}
             />
           </div>
         </div>
diff --git a/src/components/proxy/AutoFailoverConfigPanel.tsx b/src/components/proxy/AutoFailoverConfigPanel.tsx
index c7d11a62..055fcf25 100644
--- a/src/components/proxy/AutoFailoverConfigPanel.tsx
+++ b/src/components/proxy/AutoFailoverConfigPanel.tsx
@@ -101,7 +101,7 @@ export function AutoFailoverConfigPanel({
           <AlertDescription className="text-sm">
             {t(
               "proxy.autoFailover.info",
-              "当启用多个代理目标时，系统会按优先级顺序依次尝试。当某个供应商连续失败达到阈值时，熔断器会自动打开，跳过该供应商。",
+              "当故障转移队列中配置了多个供应商时，系统会在请求失败时按优先级顺序依次尝试。当某个供应商连续失败达到阈值时，熔断器会打开并在一段时间内跳过该供应商。",
             )}
           </AlertDescription>
         </Alert>
diff --git a/src/components/proxy/ProxyPanel.tsx b/src/components/proxy/ProxyPanel.tsx
index f49803ad..1d2c81d6 100644
--- a/src/components/proxy/ProxyPanel.tsx
+++ b/src/components/proxy/ProxyPanel.tsx
@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button";
 import { useProxyStatus } from "@/hooks/useProxyStatus";
 import { ProxySettingsDialog } from "./ProxySettingsDialog";
 import { toast } from "sonner";
-import { useProxyTargets } from "@/lib/query/failover";
+import { useFailoverQueue } from "@/lib/query/failover";
 import { ProviderHealthBadge } from "@/components/providers/ProviderHealthBadge";
 import { useProviderHealth } from "@/lib/query/failover";
 import type { ProxyStatus } from "@/types/proxy";
@@ -13,10 +13,11 @@ export function ProxyPanel() {
   const { status, isRunning } = useProxyStatus();
   const [showSettings, setShowSettings] = useState(false);
 
-  // 获取所有三个应用类型的代理目标列表
-  const { data: claudeTargets = [] } = useProxyTargets("claude");
-  const { data: codexTargets = [] } = useProxyTargets("codex");
-  const { data: geminiTargets = [] } = useProxyTargets("gemini");
+  // 获取所有三个应用类型的故障转移队列（不包含当前供应商）
+  // 当前供应商始终优先，队列仅用于失败后的备用顺序
+  const { data: claudeQueue = [] } = useFailoverQueue("claude");
+  const { data: codexQueue = [] } = useFailoverQueue("codex");
+  const { data: geminiQueue = [] } = useFailoverQueue("gemini");
 
   const formatUptime = (seconds: number): string => {
     const hours = Math.floor(seconds / 3600);
@@ -95,9 +96,9 @@ export function ProxyPanel() {
               </div>
 
               {/* 供应商队列 - 按应用类型分组展示 */}
-              {(claudeTargets.length > 0 ||
-                codexTargets.length > 0 ||
-                geminiTargets.length > 0) && (
+              {(claudeQueue.length > 0 ||
+                codexQueue.length > 0 ||
+                geminiQueue.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" />
@@ -107,31 +108,49 @@ export function ProxyPanel() {
                   </div>
 
                   {/* Claude 队列 */}
-                  {claudeTargets.length > 0 && (
+                  {claudeQueue.length > 0 && (
                     <ProviderQueueGroup
                       appType="claude"
                       appLabel="Claude"
-                      targets={claudeTargets}
+                      targets={claudeQueue
+                        .filter((item) => item.enabled)
+                        .sort((a, b) => a.queueOrder - b.queueOrder)
+                        .map((item) => ({
+                          id: item.providerId,
+                          name: item.providerName,
+                        }))}
                       status={status}
                     />
                   )}
 
                   {/* Codex 队列 */}
-                  {codexTargets.length > 0 && (
+                  {codexQueue.length > 0 && (
                     <ProviderQueueGroup
                       appType="codex"
                       appLabel="Codex"
-                      targets={codexTargets}
+                      targets={codexQueue
+                        .filter((item) => item.enabled)
+                        .sort((a, b) => a.queueOrder - b.queueOrder)
+                        .map((item) => ({
+                          id: item.providerId,
+                          name: item.providerName,
+                        }))}
                       status={status}
                     />
                   )}
 
                   {/* Gemini 队列 */}
-                  {geminiTargets.length > 0 && (
+                  {geminiQueue.length > 0 && (
                     <ProviderQueueGroup
                       appType="gemini"
                       appLabel="Gemini"
-                      targets={geminiTargets}
+                      targets={geminiQueue
+                        .filter((item) => item.enabled)
+                        .sort((a, b) => a.queueOrder - b.queueOrder)
+                        .map((item) => ({
+                          id: item.providerId,
+                          name: item.providerName,
+                        }))}
                       status={status}
                     />
                   )}
diff --git a/src/components/settings/SettingsPage.tsx b/src/components/settings/SettingsPage.tsx
index 42c2d5cd..1760382b 100644
--- a/src/components/settings/SettingsPage.tsx
+++ b/src/components/settings/SettingsPage.tsx
@@ -7,7 +7,9 @@ import {
   Coins,
   Database,
   Server,
+  ChevronDown,
 } from "lucide-react";
+import * as AccordionPrimitive from "@radix-ui/react-accordion";
 import { toast } from "sonner";
 import {
   Dialog,
@@ -279,10 +281,10 @@ export function SettingsPage({
 
                     <AccordionItem
                       value="proxy"
-                      className="rounded-xl glass-card overflow-hidden"
+                      className="rounded-xl glass-card overflow-hidden [&[data-state=open]>.accordion-header]:bg-muted/50"
                     >
-                      <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">
+                      <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">
                           <div className="flex items-center gap-3">
                             <Server className="h-5 w-5 text-green-500" />
                             <div className="text-left">
@@ -294,27 +296,26 @@ export function SettingsPage({
                               </p>
                             </div>
                           </div>
-                          <div
-                            className="flex items-center gap-4"
-                            onClick={(e) => e.stopPropagation()}
+                          <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"
                           >
-                            <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}
+                            <Activity
+                              className={`h-3 w-3 ${isRunning ? "animate-pulse" : ""}`}
                             />
-                          </div>
+                            {isRunning ? "运行中" : "已停止"}
+                          </Badge>
+                          <Switch
+                            checked={isRunning}
+                            onCheckedChange={handleToggleProxy}
+                            disabled={isProxyPending}
+                          />
                         </div>
-                      </AccordionTrigger>
+                      </AccordionPrimitive.Header>
                       <AccordionContent className="px-6 pb-6 pt-0 border-t border-border/50">
                         <ProxyPanel />
                       </AccordionContent>
@@ -344,10 +345,10 @@ export function SettingsPage({
 
                     <AccordionItem
                       value="failover"
-                      className="rounded-xl glass-card overflow-hidden"
+                      className="rounded-xl glass-card overflow-hidden [&[data-state=open]>.accordion-header]:bg-muted/50"
                     >
-                      <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">
+                      <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">
                           <div className="flex items-center gap-3">
                             <Activity className="h-5 w-5 text-orange-500" />
                             <div className="text-left">
@@ -359,20 +360,16 @@ export function SettingsPage({
                               </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>
+                          <ChevronDown className="h-4 w-4 shrink-0 transition-transform duration-200" />
+                        </AccordionPrimitive.Trigger>
+
+                        <div className="flex items-center gap-2 pl-4">
+                          <Switch
+                            checked={failoverEnabled}
+                            onCheckedChange={setFailoverEnabled}
+                          />
                         </div>
-                      </AccordionTrigger>
+                      </AccordionPrimitive.Header>
                       <AccordionContent className="px-6 pb-6 pt-4 border-t border-border/50">
                         <div className="space-y-6">
                           {/* 故障转移队列管理 */}
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 946e2308..2226b977 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -864,7 +864,7 @@
       "toggleFailed": "Failed to update status"
     },
     "autoFailover": {
-      "info": "When multiple proxy targets are enabled, the system will try them in priority order. When a provider fails consecutively reaching the threshold, the circuit breaker will open and skip that provider.",
+      "info": "When the failover queue has multiple providers, the system will try them in priority order when requests fail. When a provider reaches the consecutive failure threshold, the circuit breaker will open and skip it temporarily.",
       "configSaved": "Auto failover config saved",
       "configSaveFailed": "Failed to save",
       "retrySettings": "Retry & Timeout Settings",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index ea505df0..c63bbc74 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -864,7 +864,7 @@
       "toggleFailed": "状态更新失败"
     },
     "autoFailover": {
-      "info": "当启用多个代理目标时，系统会按优先级顺序依次尝试。当某个供应商连续失败达到阈值时，熔断器会自动打开，跳过该供应商。",
+      "info": "当故障转移队列中配置了多个供应商时，系统会在请求失败时按优先级顺序依次尝试。当某个供应商连续失败达到阈值时，熔断器会打开并在一段时间内跳过该供应商。",
       "configSaved": "自动故障转移配置已保存",
       "configSaveFailed": "保存失败",
       "retrySettings": "重试与超时设置",
diff --git a/src/lib/api/failover.ts b/src/lib/api/failover.ts
index f6adc1ee..58fc26e2 100644
--- a/src/lib/api/failover.ts
+++ b/src/lib/api/failover.ts
@@ -18,26 +18,9 @@ export interface Provider {
   meta?: unknown;
   icon?: string;
   iconColor?: string;
-  isProxyTarget?: boolean;
 }
 
 export const failoverApi = {
-  // ========== 旧版代理目标 API（保留向后兼容）==========
-
-  // 获取代理目标列表
-  async getProxyTargets(appType: string): Promise<Provider[]> {
-    return invoke("get_proxy_targets", { appType });
-  },
-
-  // 设置代理目标
-  async setProxyTarget(
-    providerId: string,
-    appType: string,
-    enabled: boolean,
-  ): Promise<void> {
-    return invoke("set_proxy_target", { providerId, appType, enabled });
-  },
-
   // ========== 熔断器 API ==========
 
   // 获取供应商健康状态
diff --git a/src/lib/api/providers.ts b/src/lib/api/providers.ts
index 4da27059..14c8e115 100644
--- a/src/lib/api/providers.ts
+++ b/src/lib/api/providers.ts
@@ -38,10 +38,6 @@ export const providersApi = {
     return await invoke("switch_provider", { id, app: appId });
   },
 
-  async setProxyTarget(id: string, appId: AppId): Promise<boolean> {
-    return await invoke("set_proxy_target_provider", { id, app: appId });
-  },
-
   async importDefault(appId: AppId): Promise<boolean> {
     return await invoke("import_default_config", { app: appId });
   },
diff --git a/src/lib/query/failover.ts b/src/lib/query/failover.ts
index acfaef56..9f0c7d9f 100644
--- a/src/lib/query/failover.ts
+++ b/src/lib/query/failover.ts
@@ -1,50 +1,6 @@
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { failoverApi } from "@/lib/api/failover";
 
-// ========== 旧版代理目标 Hooks（保留向后兼容）==========
-
-/**
- * 获取代理目标列表
- */
-export function useProxyTargets(appType: string) {
-  return useQuery({
-    queryKey: ["proxyTargets", appType],
-    queryFn: () => failoverApi.getProxyTargets(appType),
-    enabled: !!appType,
-  });
-}
-
-/**
- * 设置代理目标
- */
-export function useSetProxyTarget() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: ({
-      providerId,
-      appType,
-      enabled,
-    }: {
-      providerId: string;
-      appType: string;
-      enabled: boolean;
-    }) => failoverApi.setProxyTarget(providerId, appType, enabled),
-    onSuccess: (_, variables) => {
-      // 刷新代理目标列表
-      queryClient.invalidateQueries({
-        queryKey: ["proxyTargets", variables.appType],
-      });
-      // 刷新供应商列表
-      queryClient.invalidateQueries({ queryKey: ["providers"] });
-      // 刷新健康状态
-      queryClient.invalidateQueries({
-        queryKey: ["providerHealth", variables.providerId, variables.appType],
-      });
-    },
-  });
-}
-
 // ========== 熔断器 Hooks ==========
 
 /**
diff --git a/src/lib/query/mutations.ts b/src/lib/query/mutations.ts
index db2b7de0..b5118680 100644
--- a/src/lib/query/mutations.ts
+++ b/src/lib/query/mutations.ts
@@ -180,35 +180,6 @@ export const useSwitchProviderMutation = (appId: AppId) => {
   });
 };
 
-export const useSetProxyTargetMutation = (appId: AppId) => {
-  const queryClient = useQueryClient();
-  const { t } = useTranslation();
-
-  return useMutation({
-    mutationFn: async (providerId: string) => {
-      return await providersApi.setProxyTarget(providerId, appId);
-    },
-    onSuccess: async () => {
-      await queryClient.invalidateQueries({ queryKey: ["providers", appId] });
-      toast.success(
-        t("notifications.proxyTargetSet", {
-          defaultValue: "已设置代理目标",
-        }),
-        { closeButton: true },
-      );
-    },
-    onError: (error: Error) => {
-      const detail = extractErrorMessage(error) || t("common.unknown");
-      toast.error(
-        t("notifications.setProxyTargetFailed", {
-          defaultValue: "设置代理目标失败: {{error}}",
-          error: detail,
-        }),
-      );
-    },
-  });
-};
-
 export const useSaveSettingsMutation = () => {
   const queryClient = useQueryClient();
 
diff --git a/src/types.ts b/src/types.ts
index 570d7a2d..bdf46fcf 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -23,8 +23,6 @@ export interface Provider {
   // 图标配置
   icon?: string; // 图标名称（如 "openai", "anthropic"）
   iconColor?: string; // 图标颜色（Hex 格式，如 "#00A67E"）
-  // 新增：是否为代理目标
-  isProxyTarget?: boolean;
 }
 
 export interface AppConfig {
diff --git a/tests/components/SettingsDialog.test.tsx b/tests/components/SettingsDialog.test.tsx
index d27827e7..22b33144 100644
--- a/tests/components/SettingsDialog.test.tsx
+++ b/tests/components/SettingsDialog.test.tsx
@@ -19,6 +19,23 @@ vi.mock("react-i18next", () => ({
   useTranslation: () => ({ t: tMock }),
 }));
 
+vi.mock("@/hooks/useProxyStatus", () => ({
+  useProxyStatus: () => ({
+    status: null,
+    isLoading: false,
+    isRunning: false,
+    isTakeoverActive: false,
+    startWithTakeover: vi.fn(),
+    stopWithRestore: vi.fn(),
+    switchProxyProvider: vi.fn(),
+    checkRunning: vi.fn(),
+    checkTakeoverActive: vi.fn(),
+    isStarting: false,
+    isStopping: false,
+    isPending: false,
+  }),
+}));
+
 interface SettingsMock {
   settings: any;
   isLoading: boolean;
@@ -288,6 +305,7 @@ describe("SettingsPage Component", () => {
     });
 
     fireEvent.click(screen.getByText("settings.tabAdvanced"));
+    fireEvent.click(screen.getByText("数据管理"));
 
     // 有文件时，点击导入按钮执行 importConfig
     fireEvent.click(
@@ -363,6 +381,7 @@ describe("SettingsPage Component", () => {
     await waitFor(() => {
       expect(toastSuccessMock).toHaveBeenCalledWith(
         "settings.devModeRestartHint",
+        expect.objectContaining({ closeButton: true }),
       );
     });
   });
@@ -393,6 +412,7 @@ describe("SettingsPage Component", () => {
     render(<SettingsPage open={true} onOpenChange={vi.fn()} />);
 
     fireEvent.click(screen.getByText("settings.tabAdvanced"));
+    fireEvent.click(screen.getByText("配置文件目录"));
 
     fireEvent.click(screen.getByText("browse-directory"));
     expect(settingsMock.browseDirectory).toHaveBeenCalledWith("claude");
diff --git a/tests/hooks/useImportExport.extra.test.tsx b/tests/hooks/useImportExport.extra.test.tsx
index aa5dd3c6..04979413 100644
--- a/tests/hooks/useImportExport.extra.test.tsx
+++ b/tests/hooks/useImportExport.extra.test.tsx
@@ -120,6 +120,7 @@ describe("useImportExport Hook (edge cases)", () => {
     expect(exportConfigMock).toHaveBeenCalledWith("/exports/config.json");
     expect(toastSuccessMock).toHaveBeenCalledWith(
       expect.stringContaining("/final/config.json"),
+      expect.objectContaining({ closeButton: true }),
     );
   });
 });
diff --git a/tests/hooks/useImportExport.test.tsx b/tests/hooks/useImportExport.test.tsx
index 4b2cfa0a..030c228a 100644
--- a/tests/hooks/useImportExport.test.tsx
+++ b/tests/hooks/useImportExport.test.tsx
@@ -180,6 +180,7 @@ describe("useImportExport Hook", () => {
     expect(exportConfigMock).toHaveBeenCalledWith("/export.json");
     expect(toastSuccessMock).toHaveBeenCalledWith(
       expect.stringContaining("/backup/export.json"),
+      expect.objectContaining({ closeButton: true }),
     );
   });
 
diff --git a/tests/integration/SettingsDialog.test.tsx b/tests/integration/SettingsDialog.test.tsx
index 9b015b36..0ebd3eb0 100644
--- a/tests/integration/SettingsDialog.test.tsx
+++ b/tests/integration/SettingsDialog.test.tsx
@@ -150,6 +150,7 @@ describe("SettingsPage integration", () => {
       expect(screen.getByText("language:zh")).toBeInTheDocument(),
     );
     fireEvent.click(screen.getByText("settings.tabAdvanced"));
+    fireEvent.click(screen.getByText("配置文件目录"));
     const appInput = await screen.findByPlaceholderText(
       "settings.browsePlaceholderApp",
     );
@@ -165,6 +166,7 @@ describe("SettingsPage integration", () => {
     );
 
     fireEvent.click(screen.getByText("settings.tabAdvanced"));
+    fireEvent.click(screen.getByText("数据管理"));
     fireEvent.click(screen.getByText("settings.selectConfigFile"));
     await waitFor(() =>
       expect(screen.getByTestId("selected-file").textContent).toContain(
@@ -188,6 +190,7 @@ describe("SettingsPage integration", () => {
     );
 
     fireEvent.click(screen.getByText("settings.tabAdvanced"));
+    fireEvent.click(screen.getByText("配置文件目录"));
     const appInput = await screen.findByPlaceholderText(
       "settings.browsePlaceholderApp",
     );
@@ -214,6 +217,7 @@ describe("SettingsPage integration", () => {
     );
 
     fireEvent.click(screen.getByText("settings.tabAdvanced"));
+    fireEvent.click(screen.getByText("配置文件目录"));
 
     const browseButtons = screen.getAllByTitle("settings.browseDirectory");
     const resetButtons = screen.getAllByTitle("settings.resetDefault");
@@ -253,6 +257,7 @@ describe("SettingsPage integration", () => {
       expect(screen.getByText("language:zh")).toBeInTheDocument(),
     );
     fireEvent.click(screen.getByText("settings.tabAdvanced"));
+    fireEvent.click(screen.getByText("数据管理"));
 
     server.use(
       http.post("http://tauri.local/save_file_dialog", () =>
diff --git a/tests/msw/handlers.ts b/tests/msw/handlers.ts
index 4672fe9e..95937534 100644
--- a/tests/msw/handlers.ts
+++ b/tests/msw/handlers.ts
@@ -236,4 +236,64 @@ export const handlers = [
   http.post(`${TAURI_ENDPOINT}/sync_current_providers_live`, () =>
     success({ success: true }),
   ),
+
+  // Proxy status (for SettingsPage / ProxyPanel hooks)
+  http.post(`${TAURI_ENDPOINT}/get_proxy_status`, () =>
+    success({
+      running: false,
+      address: "127.0.0.1",
+      port: 0,
+      active_connections: 0,
+      total_requests: 0,
+      success_requests: 0,
+      failed_requests: 0,
+      success_rate: 0,
+      uptime_seconds: 0,
+      current_provider: null,
+      current_provider_id: null,
+      last_request_at: null,
+      last_error: null,
+      failover_count: 0,
+      active_targets: [],
+    }),
+  ),
+
+  http.post(`${TAURI_ENDPOINT}/is_live_takeover_active`, () => success(false)),
+
+  // Failover / circuit breaker defaults
+  http.post(`${TAURI_ENDPOINT}/get_failover_queue`, () => success([])),
+  http.post(`${TAURI_ENDPOINT}/get_available_providers_for_failover`, () =>
+    success([]),
+  ),
+  http.post(`${TAURI_ENDPOINT}/add_to_failover_queue`, () => success(true)),
+  http.post(`${TAURI_ENDPOINT}/remove_from_failover_queue`, () => success(true)),
+  http.post(`${TAURI_ENDPOINT}/reorder_failover_queue`, () => success(true)),
+  http.post(`${TAURI_ENDPOINT}/set_failover_item_enabled`, () => success(true)),
+
+  http.post(`${TAURI_ENDPOINT}/get_circuit_breaker_config`, () =>
+    success({
+      failureThreshold: 3,
+      successThreshold: 2,
+      timeoutSeconds: 60,
+      errorRateThreshold: 50,
+      minRequests: 5,
+    }),
+  ),
+  http.post(`${TAURI_ENDPOINT}/update_circuit_breaker_config`, () =>
+    success(true),
+  ),
+  http.post(`${TAURI_ENDPOINT}/get_provider_health`, () =>
+    success({
+      provider_id: "mock-provider",
+      app_type: "claude",
+      is_healthy: true,
+      consecutive_failures: 0,
+      last_success_at: null,
+      last_failure_at: null,
+      last_error: null,
+      updated_at: new Date().toISOString(),
+    }),
+  ),
+  http.post(`${TAURI_ENDPOINT}/reset_circuit_breaker`, () => success(true)),
+  http.post(`${TAURI_ENDPOINT}/get_circuit_breaker_stats`, () => success(null)),
 ];