feat(proxy): extract session ID from client requests for logging

- Add SessionIdExtractor to parse session ID from Claude/Codex requests
- Support extraction from metadata.user_id, headers, previous_response_id
- Pass session_id through RequestContext to usage logger
- Enable request correlation by session in proxy_request_logs

.node-version

@@ -1 +1 @@
-v22.4.1
+22.12.0

CHANGELOG.md

@@ -5,6 +5,64 @@ 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-3] - 2025-12-29
+
+### Beta Release
+
+Third beta release with important bug fixes for Windows compatibility, UI improvements, and new features.
+
+### Added
+
+- **Universal Provider** - Support for universal provider configurations (#348)
+- **Provider Search Filter** - Quick filter to find providers by name (#435)
+- **Keyboard Shortcut** - Open settings with Command+comma / Ctrl+comma (#436)
+- **Xiaomi MiMo Icon** - Added MiMo icon and Claude provider configuration (#470)
+- **Usage Model Extraction** - Extract model info from usage statistics (#455)
+- **Skip First-Run Confirmation** - Option to skip Claude Code first-run confirmation dialog
+- **Exit Animations** - Added exit animation to FullScreenPanel dialogs
+- **Fade Transitions** - Smooth fade transitions for app/view/panel switching
+
+### Fixed
+
+#### Windows
+- Wrap npx/npm commands with `cmd /c` for MCP export
+- Prevent terminal windows from appearing during version check
+
+#### macOS
+- Use .app bundle path for autostart to prevent terminal window popup
+
+#### UI
+- Resolve Dialog/Modal not opening on first click (#492)
+- Improve dark mode text contrast for form labels
+- Reduce header spacing and fix layout shift on view switch
+- Prevent header layout shift when switching views
+
+#### Database & Schema
+- Add missing base columns migration for proxy_config
+- Add backward compatibility check for proxy_config seed insert
+
+#### Other
+- Use local timezone and robust DST handling in usage stats (#500)
+- Remove deprecated `sync_enabled_to_codex` call
+- Gracefully handle invalid Codex config.toml during MCP sync
+- Add missing translations for reasoning model and OpenRouter compat mode
+
+### Improved
+
+- **macOS Tray** - Use macOS tray template icon
+- **Header Alignment** - Remove macOS titlebar tint, align custom header
+- **Shadow Removal** - Cleaner UI by removing shadow styles
+- **Code Inspector** - Added code-inspector-plugin for development
+- **i18n** - Complete internationalization for usage panel and settings
+- **Sponsor Logos** - Made sponsor logos clickable
+
+### Stats
+
+- 35 commits since v3.9.0-2
+- 5 files changed in test/lint fixes
+
+---
+
 ## [3.9.0-1] - 2025-12-18
 
 ### Beta Release

README.md

@@ -2,7 +2,7 @@
 
 # All-in-One Assistant for Claude Code, Codex & Gemini CLI
 
-[![Version](https://img.shields.io/badge/version-3.8.2-blue.svg)](https://github.com/farion1231/cc-switch/releases)
+[![Version](https://img.shields.io/badge/version-3.8.3-blue.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Built with Tauri](https://img.shields.io/badge/built%20with-Tauri%202-orange.svg)](https://tauri.app/)
 [![Downloads](https://img.shields.io/endpoint?url=https://api.pinstudios.net/api/badges/downloads/farion1231/cc-switch/total)](https://github.com/farion1231/cc-switch/releases/latest)
@@ -15,7 +15,7 @@ English | [中文](README_ZH.md) | [日本語](README_JA.md) | [Changelog](CHANG
 
 ## ❤️Sponsor
 
-![Zhipu GLM](assets/partners/banners/glm-en.jpg)
+[![Zhipu GLM](assets/partners/banners/glm-en.jpg)](https://z.ai/subscribe?ic=8JVLJQFSKB)
 
 This project is sponsored by Z.ai, supporting us with their GLM CODING PLAN.GLM CODING PLAN is a subscription service designed for AI coding, starting at just $3/month. It provides access to their flagship GLM-4.6 model across 10+ popular AI coding tools (Claude Code, Cline, Roo Code, etc.), offering developers top-tier, fast, and stable coding experiences.Get 10% OFF the GLM CODING PLAN with [this link](https://z.ai/subscribe?ic=8JVLJQFSKB)!
 
@@ -23,19 +23,18 @@ This project is sponsored by Z.ai, supporting us with their GLM CODING PLAN.GLM
 
 <table>
 <tr>
-<td width="180"><img src="assets/partners/logos/packycode.png" alt="PackyCode" width="150"></td>
+<td width="180"><a href="https://www.packyapi.com/register?aff=cc-switch"><img src="assets/partners/logos/packycode.png" alt="PackyCode" width="150"></a></td>
 <td>Thanks to PackyCode for sponsoring this project! PackyCode is a reliable and efficient API relay service provider, offering relay services for Claude Code, Codex, Gemini, and more. PackyCode provides special discounts for our software users: register using <a href="https://www.packyapi.com/register?aff=cc-switch">this link</a> and enter the "cc-switch" promo code during recharge to get 10% off.</td>
 </tr>
 
 <tr>
-<td width="180"><img src="assets/partners/logos/sds-en.png" alt="ShanDianShuo" width="150"></td>
+<td width="180"><a href="https://aigocode.com/invite/CC-SWITCH"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></a></td>
-<td>Thanks to ShanDianShuo for sponsoring this project! ShanDianShuo is a local-first AI voice input: Millisecond latency, data stays on device, 4x faster than typing, AI-powered correction, Privacy-first, completely free. Doubles your coding efficiency with Claude Code! <a href="https://www.shandianshuo.cn">Free download</a> for Mac/Win</td>
+<td>Thanks to AIGoCode for sponsoring this project! AIGoCode is an all-in-one platform that integrates Claude Code, Codex, and the latest Gemini models, providing you with stable, efficient, and highly cost-effective AI coding services. The platform offers flexible subscription plans, zero risk of account suspension, direct access with no VPN required, and lightning-fast responses. AIGoCode has prepared a special benefit for CC Switch users: if you register via <a href="https://aigocode.com/invite/CC-SWITCH">this link</a>, you'll receive an extra 10% bonus credit on your first top-up!</td>
 </tr>
 
 <tr>
-<td width="180"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></td>
+<td width="180"><a href="https://www.dmxapi.cn/register?aff=bUHu"><img src="assets/partners/logos/dmx-en.jpg" alt="DMXAPI" width="150"></a></td>
-<td>Thanks to AIGoCode for sponsoring this project! AIGoCode is an all-in-one platform that integrates Claude Code, Codex, and the latest Gemini models, providing you with stable, efficient, and highly cost-effective AI coding services. The platform offers flexible subscription plans, zero risk of account suspension, direct access with no VPN required, and lightning-fast responses.AIGoCode has prepared a special benefit for CC Switch users: if you register via <a href="https://aigocode.com/invite/CC-SWITCH">this link</a>, you’ll receive an extra 10% bonus credit on your first top-up!
+<td>Thanks to DMXAPI for sponsoring this project! DMXAPI provides global large model API services to 200+ enterprise users. One API key for all global models. Features include: instant invoicing, unlimited concurrency, starting from $0.15, 24/7 technical support. GPT/Claude/Gemini all at 32% off, domestic models 20-50% off, Claude Code exclusive models at 66% off! <a href="https://www.dmxapi.cn/register?aff=bUHu">Register here</a></td>
-</td>
 </tr>
 
 </table>
@@ -48,7 +47,7 @@ This project is sponsored by Z.ai, supporting us with their GLM CODING PLAN.GLM
 
 ## Features
 
-### Current Version: v3.8.2 | [Full Changelog](CHANGELOG.md) | [Release Notes](docs/release-note-v3.8.0-en.md)
+### Current Version: v3.8.3 | [Full Changelog](CHANGELOG.md) | [Release Notes](docs/release-note-v3.8.0-en.md)
 
 **v3.8.0 Major Update (2025-11-28)**
 

README_JA.md

@@ -2,7 +2,7 @@
 
 # Claude Code / Codex / Gemini CLI オールインワン・アシスタント
 
-[![Version](https://img.shields.io/badge/version-3.8.2-blue.svg)](https://github.com/farion1231/cc-switch/releases)
+[![Version](https://img.shields.io/badge/version-3.8.3-blue.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Built with Tauri](https://img.shields.io/badge/built%20with-Tauri%202-orange.svg)](https://tauri.app/)
 [![Downloads](https://img.shields.io/endpoint?url=https://api.pinstudios.net/api/badges/downloads/farion1231/cc-switch/total)](https://github.com/farion1231/cc-switch/releases/latest)
@@ -15,7 +15,7 @@
 
 ## ❤️スポンサー
 
-![Zhipu GLM](assets/partners/banners/glm-en.jpg)
+[![Zhipu GLM](assets/partners/banners/glm-en.jpg)](https://z.ai/subscribe?ic=8JVLJQFSKB)
 
 本プロジェクトは Z.ai の GLM CODING PLAN による支援を受けています。GLM CODING PLAN は AI コーディング向けのサブスクリプションで、月額わずか 3 ドルから。Claude Code、Cline、Roo Code など 10 以上の人気 AI コーディングツールでフラッグシップモデル GLM-4.6 を利用でき、速く安定した開発体験を提供します。[このリンク](https://z.ai/subscribe?ic=8JVLJQFSKB) から申し込むと 10% オフになります！
 
@@ -23,20 +23,18 @@
 
 <table>
 <tr>
-<td width="180"><img src="assets/partners/logos/packycode.png" alt="PackyCode" width="150"></td>
+<td width="180"><a href="https://www.packyapi.com/register?aff=cc-switch"><img src="assets/partners/logos/packycode.png" alt="PackyCode" width="150"></a></td>
 <td>PackyCode のご支援に感謝します！PackyCode は Claude Code、Codex、Gemini などのリレーサービスを提供する信頼性の高い API 中継プラットフォームです。本ソフト利用者向けに特別割引があります：<a href="https://www.packyapi.com/register?aff=cc-switch">このリンク</a>で登録し、チャージ時に「cc-switch」クーポンを入力すると 10% オフになります。</td>
 </tr>
 
 <tr>
-<td width="180"><img src="assets/partners/logos/sds-en.png" alt="ShanDianShuo" width="150"></td>
+<td width="180"><a href="https://aigocode.com/invite/CC-SWITCH"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></a></td>
-<td>ShanDianShuo のご支援に感謝します！ShanDianShuo はローカルファーストの音声入力ツールで、ミリ秒遅延・データは端末から外に出ず・キーボード入力の 4 倍の速度・AI 自動補正・プライバシー優先で完全無料。Claude Code と組み合わせればコーディング効率が倍増します。<a href="https://www.shandianshuo.cn">Mac/Win 版を無料ダウンロード</a></td>
+<td>本プロジェクトは AIGoCode のスポンサー提供でお届けしています。AIGoCode は、Claude Code・Codex・最新の Gemini モデルを統合したオールインワンのAIコーディングプラットフォームで、安定性・高速性・コストパフォーマンスに優れた開発サービスを提供します。柔軟なサブスクリプションプランを備え、レスポンスも非常に高速です。さらに、CC Switch ユーザー向けの特典として、<a href="https://aigocode.com/invite/CC-SWITCH">このリンク</a>から登録すると、初回チャージ時に10％分のボーナスクレジットが付与されます！</td>
 </tr>
 
 <tr>
-<td width="180"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></td>
+<td width="180"><a href="https://www.dmxapi.cn/register?aff=bUHu"><img src="assets/partners/logos/dmx-en.jpg" alt="DMXAPI" width="150"></a></td>
-<td>本プロジェクトは AIGoCode のスポンサー提供でお届けしています。AIGoCode は、Claude Code・Codex・最新の Gemini モデルを統合したオールインワンのAIコーディングプラットフォームで、安定性・高速性・コストパフォーマンスに優れた開発サービスを提供します。柔軟なサブスクリプションプランを備え、レスポンスも非常に高速です。さらに、CC Switch ユーザー向けの特典として、<a href="https://aigocode.com/invite/CC-SWITCH">このリンク</a>から登録すると、初回チャージ時に10％分のボーナスクレジットが付与されます！
+<td>DMXAPI のご支援に感謝します！DMXAPI は 200 社以上の企業ユーザーにグローバル大規模モデル API サービスを提供しています。1 つの API キーで全世界のモデルにアクセス可能。即時請求書発行、同時接続数無制限、最低 $0.15 から、24 時間年中無休のテクニカルサポート。GPT/Claude/Gemini が全て 32% オフ、国内モデルは 20〜50% オフ、Claude Code 専用モデルは 66% オフ実施中！<a href="https://www.dmxapi.cn/register?aff=bUHu">登録はこちら</a></td>
-
-</td>
 </tr>
 
 </table>
@@ -49,7 +47,7 @@
 
 ## 特長
 
-### 現在のバージョン：v3.8.2 | [完全な更新履歴](CHANGELOG.md) | [リリースノート](docs/release-note-v3.8.0-en.md)
+### 現在のバージョン：v3.8.3 | [完全な更新履歴](CHANGELOG.md) | [リリースノート](docs/release-note-v3.8.0-en.md)
 
 **v3.8.0 メジャーアップデート (2025-11-28)**
 

README_ZH.md

@@ -2,7 +2,7 @@
 
 # Claude Code / Codex / Gemini CLI 全方位辅助工具
 
-[![Version](https://img.shields.io/badge/version-3.8.2-blue.svg)](https://github.com/farion1231/cc-switch/releases)
+[![Version](https://img.shields.io/badge/version-3.8.3-blue.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Built with Tauri](https://img.shields.io/badge/built%20with-Tauri%202-orange.svg)](https://tauri.app/)
 [![Downloads](https://img.shields.io/endpoint?url=https://api.pinstudios.net/api/badges/downloads/farion1231/cc-switch/total)](https://github.com/farion1231/cc-switch/releases/latest)
@@ -15,7 +15,7 @@
 
 ## ❤️赞助商
 
-![智谱 GLM](assets/partners/banners/glm-zh.jpg)
+[![智谱 GLM](assets/partners/banners/glm-zh.jpg)](https://www.bigmodel.cn/claude-code?ic=RRVJPB5SII)
 
 感谢智谱AI的 GLM CODING PLAN 赞助了本项目！GLM CODING PLAN 是专为AI编码打造的订阅套餐,每月最低仅需20元，即可在十余款主流AI编码工具如 Claude Code、Cline 中畅享智谱旗舰模型 GLM-4.6，为开发者提供顶尖、高速、稳定的编码体验。CC Switch 已经预设了智谱GLM，只需要填写 key 即可一键导入编程工具。智谱AI为本软件的用户提供了特别优惠，使用[此链接](https://www.bigmodel.cn/claude-code?ic=RRVJPB5SII)购买可以享受九折优惠。
 
@@ -23,20 +23,20 @@
 
 <table>
 <tr>
-<td width="180"><img src="assets/partners/logos/packycode.png" alt="PackyCode" width="150"></td>
+<td width="180"><a href="https://www.packyapi.com/register?aff=cc-switch"><img src="assets/partners/logos/packycode.png" alt="PackyCode" width="150"></a></td>
 <td>感谢 PackyCode 赞助了本项目！PackyCode 是一家稳定、高效的API中转服务商，提供 Claude Code、Codex、Gemini 等多种中转服务。PackyCode 为本软件的用户提供了特别优惠，使用<a href="https://www.packyapi.com/register?aff=cc-switch">此链接</a>注册并在充值时填写"cc-switch"优惠码，可以享受9折优惠。</td>
 </tr>
 
 <tr>
-<td width="180"><img src="assets/partners/logos/sds-zh.png" alt="ShanDianShuo" width="150"></td>
+<td width="180"><a href="https://aigocode.com/invite/CC-SWITCH"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></a></td>
-<td>感谢闪电说赞助了本项目！闪电说是本地优先的 AI 语音输入法：毫秒级响应，数据不离设备；打字速度提升 4 倍，AI 智能纠错；绝对隐私安全，完全免费，配合 Claude Code 写代码效率翻倍！支持 Mac/Win 双平台，<a href="https://www.shandianshuo.cn">免费下载</a></td>
-</tr>
-
-<tr>
-<td width="180"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></td>
 <td>感谢 AIGoCode 赞助了本项目！AIGoCode 是一个集成了 Claude Code、Codex 以及 Gemini 最新模型的一站式平台，为你提供稳定、高效且高性价比的AI编程服务。本站提供灵活的订阅计划，零封号风险，国内直连，无需魔法，极速响应。AIGoCode 为 CC Switch 的用户提供了特别福利，通过<a href="https://aigocode.com/invite/CC-SWITCH">此链接</a>注册的用户首次充值可以获得额外10%奖励额度！</td>
 </tr>
+<tr>
+<td width="180"><a href="https://www.dmxapi.cn/register?aff=bUHu"><img src="assets/partners/logos/dmx-zh.jpeg" alt="DMXAPI" width="150"></a></td>
+<td>感谢 DMXAPI（大模型API）赞助了本项目！ DMXAPI，一个Key用全球大模型。
+为200多家企业用户提供全球大模型API服务。· 充值即开票 ·当天开票 ·并发不限制  ·1元起充 ·  7x24 在线技术辅导，GPT/Claude/Gemini全部6.8折，国内模型5~8折，Claude Code 专属模型3.4折进行中！<a href="https://www.dmxapi.cn/register?aff=bUHu">点击这里注册</a></td>
 
+</tr>
 </table>
 
 ## 界面预览
@@ -47,7 +47,7 @@
 
 ## 功能特性
 
-### 当前版本：v3.8.2 | [完整更新日志](CHANGELOG.md)
+### 当前版本：v3.8.3 | [完整更新日志](CHANGELOG.md)
 
 **v3.8.0 重大更新（2025-11-28）**
 

components.json

@@ -4,7 +4,7 @@
   "rsc": false,
   "tsx": true,
   "tailwind": {
-    "config": "tailwind.config.js",
+    "config": "tailwind.config.cjs",
     "css": "src/index.css",
     "baseColor": "neutral",
     "cssVariables": true,

package.json

@@ -1,7 +1,8 @@
 {
   "name": "cc-switch",
-  "version": "3.9.0-1",
+  "version": "3.9.0-3",
   "description": "All-in-One Assistant for Claude Code, Codex & Gemini CLI",
+  "type": "module",
   "scripts": {
     "dev": "pnpm tauri dev",
     "build": "pnpm tauri build",
@@ -27,6 +28,7 @@
     "@types/react-dom": "^18.2.0",
     "@vitejs/plugin-react": "^4.2.0",
     "autoprefixer": "^10.4.20",
+    "code-inspector-plugin": "^1.3.3",
     "cross-fetch": "^4.1.0",
     "jsdom": "^25.0.0",
     "msw": "^2.11.6",
@@ -34,7 +36,7 @@
     "prettier": "^3.6.2",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.3.0",
-    "vite": "^5.0.0",
+    "vite": "^7.3.0",
     "vitest": "^2.0.5"
   },
   "dependencies": {

src-tauri/Cargo.lock

@@ -586,6 +586,12 @@ 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"
@@ -695,7 +701,7 @@ dependencies = [
 
 [[package]]
 name = "cc-switch"
-version = "3.9.0-1"
+version = "3.9.0-3"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -2214,7 +2220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98"
 dependencies = [
  "byteorder",
- "png",
+ "png 0.17.16",
 ]
 
 [[package]]
@@ -2330,6 +2336,19 @@ 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"
@@ -2759,6 +2778,16 @@ 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"
@@ -2774,7 +2803,7 @@ dependencies = [
  "objc2-core-foundation",
  "objc2-foundation 0.3.1",
  "once_cell",
- "png",
+ "png 0.17.16",
  "serde",
  "thiserror 2.0.17",
  "windows-sys 0.60.2",
@@ -3563,6 +3592,19 @@ 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"
@@ -3694,6 +3736,15 @@ 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"
@@ -4987,6 +5038,7 @@ dependencies = [
  "heck 0.5.0",
  "http",
  "http-range",
+ "image",
  "jni",
  "libc",
  "log",
@@ -5055,7 +5107,7 @@ dependencies = [
  "ico",
  "json-patch",
  "plist",
- "png",
+ "png 0.17.16",
  "proc-macro2",
  "quote",
  "semver",
@@ -5810,7 +5862,7 @@ dependencies = [
  "objc2-core-graphics",
  "objc2-foundation 0.3.1",
  "once_cell",
- "png",
+ "png 0.17.16",
  "serde",
  "thiserror 2.0.17",
  "windows-sys 0.59.0",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cc-switch"
-version = "3.9.0-1"
+version = "3.9.0-3"
 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"] }
+tauri = { version = "2.8.2", features = ["tray-icon", "protocol-asset", "image-png"] }
 tauri-plugin-log = "2"
 tauri-plugin-opener = "2"
 tauri-plugin-process = "2"

src-tauri/src/auto_launch.rs

@@ -1,16 +1,36 @@
 use crate::error::AppError;
 use auto_launch::{AutoLaunch, AutoLaunchBuilder};
 
+/// 获取 macOS 上的 .app bundle 路径
+/// 将 `/path/to/CC Switch.app/Contents/MacOS/CC Switch` 转换为 `/path/to/CC Switch.app`
+#[cfg(target_os = "macos")]
+fn get_macos_app_bundle_path(exe_path: &std::path::Path) -> Option<std::path::PathBuf> {
+    let path_str = exe_path.to_string_lossy();
+    // 查找 .app/Contents/MacOS/ 模式
+    if let Some(app_pos) = path_str.find(".app/Contents/MacOS/") {
+        let app_bundle_end = app_pos + 4; // ".app" 的结束位置
+        Some(std::path::PathBuf::from(&path_str[..app_bundle_end]))
+    } else {
+        None
+    }
+}
+
 /// 初始化 AutoLaunch 实例
 fn get_auto_launch() -> Result<AutoLaunch, AppError> {
     let app_name = "CC Switch";
-    let app_path =
+    let exe_path =
         std::env::current_exe().map_err(|e| AppError::Message(format!("无法获取应用路径: {e}")))?;
 
+    // macOS 需要使用 .app bundle 路径，否则 AppleScript login item 会打开终端
+    #[cfg(target_os = "macos")]
+    let app_path = get_macos_app_bundle_path(&exe_path).unwrap_or(exe_path);
+
+    #[cfg(not(target_os = "macos"))]
+    let app_path = exe_path;
+
     // 使用 AutoLaunchBuilder 消除平台差异
-    // Windows/Linux: new() 接受 3 参数
+    // macOS: 使用 AppleScript 方式（默认），需要 .app bundle 路径
-    // macOS: new() 接受 4 参数（含 hidden 参数）
+    // Windows/Linux: 使用注册表/XDG autostart
-    // Builder 模式自动处理这些差异
     let auto_launch = AutoLaunchBuilder::new()
         .set_app_name(app_name)
         .set_app_path(&app_path.to_string_lossy())
@@ -47,3 +67,50 @@ pub fn is_auto_launch_enabled() -> Result<bool, AppError> {
         .is_enabled()
         .map_err(|e| AppError::Message(format!("检查开机自启状态失败: {e}")))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn test_get_macos_app_bundle_path_valid() {
+        let exe_path = std::path::Path::new("/Applications/CC Switch.app/Contents/MacOS/CC Switch");
+        let result = get_macos_app_bundle_path(exe_path);
+        assert_eq!(
+            result,
+            Some(std::path::PathBuf::from("/Applications/CC Switch.app"))
+        );
+    }
+
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn test_get_macos_app_bundle_path_with_spaces() {
+        let exe_path =
+            std::path::Path::new("/Users/test/My Apps/CC Switch.app/Contents/MacOS/CC Switch");
+        let result = get_macos_app_bundle_path(exe_path);
+        assert_eq!(
+            result,
+            Some(std::path::PathBuf::from(
+                "/Users/test/My Apps/CC Switch.app"
+            ))
+        );
+    }
+
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn test_get_macos_app_bundle_path_not_in_bundle() {
+        let exe_path = std::path::Path::new("/usr/local/bin/cc-switch");
+        let result = get_macos_app_bundle_path(exe_path);
+        assert_eq!(result, None);
+    }
+
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn test_get_macos_app_bundle_path_dev_build() {
+        // 开发环境下的路径通常不在 .app bundle 内
+        let exe_path = std::path::Path::new("/Users/dev/project/target/debug/cc-switch");
+        let result = get_macos_app_bundle_path(exe_path);
+        assert_eq!(result, None);
+    }
+}

src-tauri/src/claude_mcp.rs

@@ -7,6 +7,64 @@ use std::path::{Path, PathBuf};
 use crate::config::{atomic_write, get_claude_mcp_path, get_default_claude_mcp_path};
 use crate::error::AppError;
 
+/// 需要在 Windows 上用 cmd /c 包装的命令
+/// 这些命令在 Windows 上实际是 .cmd 批处理文件，需要通过 cmd /c 来执行
+#[cfg(windows)]
+const WINDOWS_WRAP_COMMANDS: &[&str] = &["npx", "npm", "yarn", "pnpm", "node", "bun", "deno"];
+
+/// Windows 平台：将 `npx args...` 转换为 `cmd /c npx args...`
+/// 解决 Claude Code /doctor 报告的 "Windows requires 'cmd /c' wrapper to execute npx" 警告
+#[cfg(windows)]
+fn wrap_command_for_windows(obj: &mut Map<String, Value>) {
+    // 只处理 stdio 类型（默认或显式）
+    let server_type = obj.get("type").and_then(|v| v.as_str()).unwrap_or("stdio");
+    if server_type != "stdio" {
+        return;
+    }
+
+    let Some(cmd) = obj.get("command").and_then(|v| v.as_str()) else {
+        return;
+    };
+
+    // 已经是 cmd 的不重复包装
+    if cmd.eq_ignore_ascii_case("cmd") || cmd.eq_ignore_ascii_case("cmd.exe") {
+        return;
+    }
+
+    // 提取命令名（去掉 .cmd 后缀和路径）
+    let cmd_name = Path::new(cmd)
+        .file_stem()
+        .and_then(|s| s.to_str())
+        .unwrap_or(cmd);
+
+    let needs_wrap = WINDOWS_WRAP_COMMANDS
+        .iter()
+        .any(|&c| cmd_name.eq_ignore_ascii_case(c));
+
+    if !needs_wrap {
+        return;
+    }
+
+    // 构建新的 args: ["/c", "原命令", ...原args]
+    let original_args = obj
+        .get("args")
+        .and_then(|v| v.as_array())
+        .cloned()
+        .unwrap_or_default();
+
+    let mut new_args = vec![Value::String("/c".into()), Value::String(cmd.into())];
+    new_args.extend(original_args);
+
+    obj.insert("command".into(), Value::String("cmd".into()));
+    obj.insert("args".into(), Value::Array(new_args));
+}
+
+/// 非 Windows 平台无需处理
+#[cfg(not(windows))]
+fn wrap_command_for_windows(_obj: &mut Map<String, Value>) {
+    // 非 Windows 平台不做任何处理
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct McpStatus {
@@ -105,6 +163,55 @@ 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()));
@@ -290,6 +397,9 @@ pub fn set_mcp_servers_map(
         obj.remove("homepage");
         obj.remove("docs");
 
+        // Windows 平台自动包装 npx/npm 等命令为 cmd /c 格式
+        wrap_command_for_windows(&mut obj);
+
         out.insert(id.clone(), Value::Object(obj));
     }
 
@@ -303,3 +413,136 @@ pub fn set_mcp_servers_map(
     write_json_value(&path, &root)?;
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    /// 测试 Windows 命令包装功能
+    /// 由于使用条件编译，在非 Windows 平台上测试的是空函数
+    #[test]
+    fn test_wrap_command_for_windows_npx() {
+        let mut obj = json!({"command": "npx", "args": ["-y", "@upstash/context7-mcp"]})
+            .as_object()
+            .unwrap()
+            .clone();
+        wrap_command_for_windows(&mut obj);
+
+        #[cfg(windows)]
+        {
+            assert_eq!(obj["command"], "cmd");
+            assert_eq!(
+                obj["args"],
+                json!(["/c", "npx", "-y", "@upstash/context7-mcp"])
+            );
+        }
+
+        #[cfg(not(windows))]
+        {
+            // 非 Windows 平台不做任何处理
+            assert_eq!(obj["command"], "npx");
+        }
+    }
+
+    #[test]
+    fn test_wrap_command_for_windows_npm() {
+        let mut obj = json!({"command": "npm", "args": ["run", "start"]})
+            .as_object()
+            .unwrap()
+            .clone();
+        wrap_command_for_windows(&mut obj);
+
+        #[cfg(windows)]
+        {
+            assert_eq!(obj["command"], "cmd");
+            assert_eq!(obj["args"], json!(["/c", "npm", "run", "start"]));
+        }
+    }
+
+    #[test]
+    fn test_wrap_command_for_windows_already_cmd() {
+        // 已经是 cmd 的不应该重复包装
+        let mut obj = json!({"command": "cmd", "args": ["/c", "npx", "-y", "foo"]})
+            .as_object()
+            .unwrap()
+            .clone();
+        wrap_command_for_windows(&mut obj);
+
+        assert_eq!(obj["command"], "cmd");
+        // args 应该保持不变，不会变成 ["/c", "cmd", "/c", "npx", ...]
+        assert_eq!(obj["args"], json!(["/c", "npx", "-y", "foo"]));
+    }
+
+    #[test]
+    fn test_wrap_command_for_windows_http_type_skipped() {
+        // http 类型不应该被处理
+        let mut obj = json!({"type": "http", "url": "https://example.com/mcp"})
+            .as_object()
+            .unwrap()
+            .clone();
+        wrap_command_for_windows(&mut obj);
+
+        assert!(!obj.contains_key("command"));
+        assert_eq!(obj["url"], "https://example.com/mcp");
+    }
+
+    #[test]
+    fn test_wrap_command_for_windows_other_command_skipped() {
+        // 非目标命令（如 python）不应该被包装
+        let mut obj = json!({"command": "python", "args": ["server.py"]})
+            .as_object()
+            .unwrap()
+            .clone();
+        wrap_command_for_windows(&mut obj);
+
+        // python 不在 WINDOWS_WRAP_COMMANDS 列表中，不应该被包装
+        assert_eq!(obj["command"], "python");
+        assert_eq!(obj["args"], json!(["server.py"]));
+    }
+
+    #[test]
+    fn test_wrap_command_for_windows_no_args() {
+        // 没有 args 的情况
+        let mut obj = json!({"command": "npx"}).as_object().unwrap().clone();
+        wrap_command_for_windows(&mut obj);
+
+        #[cfg(windows)]
+        {
+            assert_eq!(obj["command"], "cmd");
+            assert_eq!(obj["args"], json!(["/c", "npx"]));
+        }
+    }
+
+    #[test]
+    fn test_wrap_command_for_windows_with_cmd_suffix() {
+        // 处理 npx.cmd 格式
+        let mut obj = json!({"command": "npx.cmd", "args": ["-y", "foo"]})
+            .as_object()
+            .unwrap()
+            .clone();
+        wrap_command_for_windows(&mut obj);
+
+        #[cfg(windows)]
+        {
+            assert_eq!(obj["command"], "cmd");
+            assert_eq!(obj["args"], json!(["/c", "npx.cmd", "-y", "foo"]));
+        }
+    }
+
+    #[test]
+    fn test_wrap_command_for_windows_case_insensitive() {
+        // 大小写不敏感
+        let mut obj = json!({"command": "NPX", "args": ["-y", "foo"]})
+            .as_object()
+            .unwrap()
+            .clone();
+        wrap_command_for_windows(&mut obj);
+
+        #[cfg(windows)]
+        {
+            assert_eq!(obj["command"], "cmd");
+            assert_eq!(obj["args"], json!(["/c", "NPX", "-y", "foo"]));
+        }
+    }
+}

src-tauri/src/commands/failover.rs

@@ -1,6 +1,6 @@
 //! 故障转移队列命令
 //!
-//! 管理代理模式下的故障转移队列
+//! 管理代理模式下的故障转移队列（基于 providers 表的 in_failover_queue 字段）
 
 use crate::database::FailoverQueueItem;
 use crate::provider::Provider;
@@ -56,29 +56,47 @@ pub async fn remove_from_failover_queue(
         .map_err(|e| e.to_string())
 }
 
-/// 重新排序故障转移队列
+/// 获取指定应用的自动故障转移开关状态（从 proxy_config 表读取）
 #[tauri::command]
-pub async fn reorder_failover_queue(
+pub async fn get_auto_failover_enabled(
     state: tauri::State<'_, AppState>,
     app_type: String,
-    provider_ids: Vec<String>,
+) -> Result<bool, String> {
-) -> Result<(), String> {
     state
         .db
-        .reorder_failover_queue(&app_type, &provider_ids)
+        .get_proxy_config_for_app(&app_type)
+        .await
+        .map(|config| config.auto_failover_enabled)
         .map_err(|e| e.to_string())
 }
 
-/// 设置故障转移队列项的启用状态
+/// 设置指定应用的自动故障转移开关状态（写入 proxy_config 表）
+///
+/// 注意：关闭故障转移时不会清除队列，队列内容会保留供下次开启时使用
 #[tauri::command]
-pub async fn set_failover_item_enabled(
+pub async fn set_auto_failover_enabled(
     state: tauri::State<'_, AppState>,
     app_type: String,
-    provider_id: String,
     enabled: bool,
 ) -> Result<(), String> {
+    log::info!(
+        "[Failover] Setting auto_failover_enabled: app_type='{app_type}', enabled={enabled}"
+    );
+
+    // 读取当前配置
+    let mut config = state
+        .db
+        .get_proxy_config_for_app(&app_type)
+        .await
+        .map_err(|e| e.to_string())?;
+
+    // 更新 auto_failover_enabled 字段
+    config.auto_failover_enabled = enabled;
+
+    // 写回数据库
     state
         .db
-        .set_failover_item_enabled(&app_type, &provider_id, enabled)
+        .update_proxy_config_for_app(config)
+        .await
         .map_err(|e| e.to_string())
 }

src-tauri/src/commands/misc.rs

@@ -4,6 +4,12 @@ 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> {
@@ -142,11 +148,16 @@ fn extract_version(raw: &str) -> String {
 fn try_get_version(tool: &str) -> (Option<String>, Option<String>) {
     use std::process::Command;
 
-    let output = if cfg!(target_os = "windows") {
+    #[cfg(target_os = "windows")]
+    let output = {
         Command::new("cmd")
             .args(["/C", &format!("{tool} --version")])
+            .creation_flags(CREATE_NO_WINDOW)
             .output()
-    } else {
+    };
+
+    #[cfg(not(target_os = "windows"))]
+    let output = {
         Command::new("sh")
             .arg("-c")
             .arg(format!("{tool} --version"))
@@ -237,12 +248,30 @@ fn scan_cli_version(tool: &str) -> (Option<String>, Option<String>) {
         if tool_path.exists() {
             // 构建 PATH 环境变量，确保 node 可被找到
             let current_path = std::env::var("PATH").unwrap_or_default();
+
+            #[cfg(target_os = "windows")]
+            let new_path = format!("{};{}", path.display(), current_path);
+
+            #[cfg(not(target_os = "windows"))]
             let new_path = format!("{}:{}", path.display(), current_path);
 
-            let output = Command::new(&tool_path)
+            #[cfg(target_os = "windows")]
+            let output = {
+                // 使用 cmd /C 包装执行，确保子进程也在隐藏的控制台中运行
+                Command::new("cmd")
+                    .args(["/C", &format!("\"{}\" --version", tool_path.display())])
+                    .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();
+                    .output()
+            };
 
             if let Ok(out) = output {
                 let stdout = String::from_utf8_lossy(&out.stdout).trim().to_string();

src-tauri/src/commands/plugin.rs

@@ -34,3 +34,15 @@ 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())
+}

src-tauri/src/commands/provider.rs

@@ -229,3 +229,97 @@ pub fn update_providers_sort_order(
     let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
     ProviderService::update_sort_order(state.inner(), app_type, updates).map_err(|e| e.to_string())
 }
+
+// ============================================================================
+// 统一供应商（Universal Provider）命令
+// ============================================================================
+
+use crate::provider::UniversalProvider;
+use std::collections::HashMap;
+use tauri::{AppHandle, Emitter};
+
+/// 统一供应商同步完成事件的 payload
+#[derive(Clone, serde::Serialize)]
+pub struct UniversalProviderSyncedEvent {
+    /// 操作类型: "upsert" | "delete" | "sync"
+    pub action: String,
+    /// 统一供应商 ID
+    pub id: String,
+}
+
+/// 发送统一供应商同步事件，通知前端刷新供应商列表
+fn emit_universal_provider_synced(app: &AppHandle, action: &str, id: &str) {
+    let _ = app.emit(
+        "universal-provider-synced",
+        UniversalProviderSyncedEvent {
+            action: action.to_string(),
+            id: id.to_string(),
+        },
+    );
+}
+
+/// 获取所有统一供应商
+#[tauri::command]
+pub fn get_universal_providers(
+    state: State<'_, AppState>,
+) -> Result<HashMap<String, UniversalProvider>, String> {
+    ProviderService::list_universal(state.inner()).map_err(|e| e.to_string())
+}
+
+/// 获取单个统一供应商
+#[tauri::command]
+pub fn get_universal_provider(
+    state: State<'_, AppState>,
+    id: String,
+) -> Result<Option<UniversalProvider>, String> {
+    ProviderService::get_universal(state.inner(), &id).map_err(|e| e.to_string())
+}
+
+/// 添加或更新统一供应商
+#[tauri::command]
+pub fn upsert_universal_provider(
+    app: AppHandle,
+    state: State<'_, AppState>,
+    provider: UniversalProvider,
+) -> Result<bool, String> {
+    let id = provider.id.clone();
+    let result =
+        ProviderService::upsert_universal(state.inner(), provider).map_err(|e| e.to_string())?;
+
+    // 发送事件通知前端刷新
+    emit_universal_provider_synced(&app, "upsert", &id);
+
+    Ok(result)
+}
+
+/// 删除统一供应商
+#[tauri::command]
+pub fn delete_universal_provider(
+    app: AppHandle,
+    state: State<'_, AppState>,
+    id: String,
+) -> Result<bool, String> {
+    let result =
+        ProviderService::delete_universal(state.inner(), &id).map_err(|e| e.to_string())?;
+
+    // 发送事件通知前端刷新
+    emit_universal_provider_synced(&app, "delete", &id);
+
+    Ok(result)
+}
+
+/// 同步统一供应商到各应用（手动触发）
+#[tauri::command]
+pub fn sync_universal_provider(
+    app: AppHandle,
+    state: State<'_, AppState>,
+    id: String,
+) -> Result<bool, String> {
+    let result =
+        ProviderService::sync_universal_to_apps(state.inner(), &id).map_err(|e| e.to_string())?;
+
+    // 发送事件通知前端刷新
+    emit_universal_provider_synced(&app, "sync", &id);
+
+    Ok(result)
+}

src-tauri/src/commands/proxy.rs

@@ -11,15 +11,7 @@ use crate::store::AppState;
 pub async fn start_proxy_server(
     state: tauri::State<'_, AppState>,
 ) -> Result<ProxyServerInfo, String> {
-    state.proxy_service.start(true).await
+    state.proxy_service.start().await
-}
-
-/// 启动代理服务器（带 Live 配置接管）
-#[tauri::command]
-pub async fn start_proxy_with_takeover(
-    state: tauri::State<'_, AppState>,
-) -> Result<ProxyServerInfo, String> {
-    state.proxy_service.start_with_takeover().await
 }
 
 /// 停止代理服务器（恢复 Live 配置）
@@ -70,6 +62,63 @@ pub async fn update_proxy_config(
     state.proxy_service.update_config(&config).await
 }
 
+// ==================== Global & Per-App Config ====================
+
+/// 获取全局代理配置
+///
+/// 返回统一的全局配置字段（代理开关、监听地址、端口、日志开关）
+#[tauri::command]
+pub async fn get_global_proxy_config(
+    state: tauri::State<'_, AppState>,
+) -> Result<GlobalProxyConfig, String> {
+    let db = &state.db;
+    db.get_global_proxy_config()
+        .await
+        .map_err(|e| e.to_string())
+}
+
+/// 更新全局代理配置
+///
+/// 更新统一的全局配置字段，会同时更新三行（claude/codex/gemini）
+#[tauri::command]
+pub async fn update_global_proxy_config(
+    state: tauri::State<'_, AppState>,
+    config: GlobalProxyConfig,
+) -> Result<(), String> {
+    let db = &state.db;
+    db.update_global_proxy_config(config)
+        .await
+        .map_err(|e| e.to_string())
+}
+
+/// 获取指定应用的代理配置
+///
+/// 返回应用级配置（enabled、auto_failover、超时、熔断器等）
+#[tauri::command]
+pub async fn get_proxy_config_for_app(
+    state: tauri::State<'_, AppState>,
+    app_type: String,
+) -> Result<AppProxyConfig, String> {
+    let db = &state.db;
+    db.get_proxy_config_for_app(&app_type)
+        .await
+        .map_err(|e| e.to_string())
+}
+
+/// 更新指定应用的代理配置
+///
+/// 更新应用级配置（enabled、auto_failover、超时、熔断器等）
+#[tauri::command]
+pub async fn update_proxy_config_for_app(
+    state: tauri::State<'_, AppState>,
+    config: AppProxyConfig,
+) -> Result<(), String> {
+    let db = &state.db;
+    db.update_proxy_config_for_app(config)
+        .await
+        .map_err(|e| e.to_string())
+}
+
 /// 检查代理服务器是否正在运行
 #[tauri::command]
 pub async fn is_proxy_running(state: tauri::State<'_, AppState>) -> Result<bool, String> {
@@ -111,8 +160,13 @@ 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,
@@ -129,6 +183,67 @@ pub async fn reset_circuit_breaker(
         .reset_provider_circuit_breaker(&provider_id, &app_type)
         .await?;
 
+    // 3. 检查是否应该切回优先级更高的供应商（从 proxy_config 表读取）
+    // 只有当该应用已被代理接管（enabled=true）且开启了自动故障转移时才执行
+    let (app_enabled, auto_failover_enabled) = match db.get_proxy_config_for_app(&app_type).await {
+        Ok(config) => (config.enabled, config.auto_failover_enabled),
+        Err(e) => {
+            log::error!("[{app_type}] Failed to read proxy_config: {e}, defaulting to disabled");
+            (false, false)
+        }
+    };
+
+    if app_enabled && 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(())
 }
 

src-tauri/src/commands/stream_check.rs

@@ -52,11 +52,9 @@ pub async fn stream_check_all_providers(
         }
         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

src-tauri/src/commands/usage.rs

@@ -19,9 +19,10 @@ pub fn get_usage_summary(
 #[tauri::command]
 pub fn get_usage_trends(
     state: State<'_, AppState>,
-    days: u32,
+    start_date: Option<i64>,
+    end_date: Option<i64>,
 ) -> Result<Vec<DailyStats>, AppError> {
-    state.db.get_daily_trends(days)
+    state.db.get_daily_trends(start_date, end_date)
 }
 
 /// 获取 Provider 统计

src-tauri/src/database/backup.rs

@@ -13,6 +13,8 @@ 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> {
@@ -36,7 +38,8 @@ impl Database {
         }
 
         let sql_raw = fs::read_to_string(source_path).map_err(|e| AppError::io(source_path, e))?;
-        let sql_content = Self::sanitize_import_sql(&sql_raw);
+        let sql_content = sql_raw.trim_start_matches('\u{feff}');
+        Self::validate_cc_switch_sql_export(sql_content)?;
 
         // 导入前备份现有数据库
         let backup_path = self.backup_database_file()?;
@@ -51,7 +54,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}")))?;
 
         // 补齐缺失表/索引并进行基础校验
@@ -93,26 +96,17 @@ impl Database {
         Ok(snapshot)
     }
 
-    /// 移除 SQLite 保留对象相关语句（如 sqlite_sequence），避免导入报错
+    fn validate_cc_switch_sql_export(sql: &str) -> Result<(), AppError> {
-    fn sanitize_import_sql(sql: &str) -> String {
+        let trimmed = sql.trim_start();
-        let mut cleaned = String::new();
+        if trimmed.starts_with(CC_SWITCH_SQL_EXPORT_HEADER) {
-        let lower_keyword = "sqlite_sequence";
+            return Ok(());
-
-        for stmt in sql.split(';') {
-            let trimmed = stmt.trim();
-            if trimmed.is_empty() {
-                continue;
         }
 
-            if trimmed.to_ascii_lowercase().contains(lower_keyword) {
+        Err(AppError::localized(
-                continue;
+            "backup.sql.invalid_format",
-            }
+            "仅支持导入由 CC Switch 导出的 SQL 备份文件。",
-
+            "Only SQL backups exported by CC Switch are supported.",
-            cleaned.push_str(trimmed);
+        ))
-            cleaned.push_str(";\n");
-        }
-
-        cleaned
     }
 
     /// 生成一致性快照备份，返回备份文件路径（不存在主库时返回 None）
@@ -129,8 +123,15 @@ impl Database {
 
         fs::create_dir_all(&backup_dir).map_err(|e| AppError::io(&backup_dir, e))?;
 
-        let backup_id = format!("db_backup_{}", Utc::now().format("%Y%m%d_%H%M%S"));
+        let base_id = format!("db_backup_{}", Utc::now().format("%Y%m%d_%H%M%S"));
-        let backup_path = backup_dir.join(format!("{backup_id}.db"));
+        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 conn = lock_conn!(self.conn);

src-tauri/src/database/dao/failover.rs

@@ -1,36 +1,32 @@
 //! 故障转移队列 DAO
 //!
-//! 管理代理模式下的故障转移队列
+//! 管理代理模式下的故障转移队列（基于 providers 表的 in_failover_queue 字段）
 
 use crate::database::{lock_conn, Database};
 use crate::error::AppError;
 use crate::provider::Provider;
 use serde::{Deserialize, Serialize};
-use std::time::{SystemTime, UNIX_EPOCH};
 
-/// 故障转移队列条目
+/// 故障转移队列条目（简化版，用于前端展示）
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FailoverQueueItem {
     pub provider_id: String,
     pub provider_name: String,
-    pub queue_order: i32,
+    pub sort_index: Option<usize>,
-    pub enabled: bool,
-    pub created_at: i64,
 }
 
 impl Database {
-    /// 获取故障转移队列（按 queue_order 排序）
+    /// 获取故障转移队列（按 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 fq.provider_id, p.name, fq.queue_order, fq.enabled, fq.created_at
+                "SELECT id, name, sort_index
-                 FROM failover_queue fq
+                 FROM providers
-                 JOIN providers p ON fq.provider_id = p.id AND fq.app_type = p.app_type
+                 WHERE app_type = ?1 AND in_failover_queue = 1
-                 WHERE fq.app_type = ?1
+                 ORDER BY COALESCE(sort_index, 999999), id ASC",
-                 ORDER BY fq.queue_order ASC",
             )
             .map_err(|e| AppError::Database(e.to_string()))?;
 
@@ -39,9 +35,7 @@ impl Database {
                 Ok(FailoverQueueItem {
                     provider_id: row.get(0)?,
                     provider_name: row.get(1)?,
-                    queue_order: row.get(2)?,
+                    sort_index: row.get(2)?,
-                    enabled: row.get(3)?,
-                    created_at: row.get(4)?,
                 })
             })
             .map_err(|e| AppError::Database(e.to_string()))?
@@ -53,43 +47,23 @@ impl Database {
 
     /// 获取故障转移队列中的供应商（完整 Provider 信息，按顺序）
     pub fn get_failover_providers(&self, app_type: &str) -> Result<Vec<Provider>, AppError> {
-        let queue = self.get_failover_queue(app_type)?;
         let all_providers = self.get_all_providers(app_type)?;
 
-        let mut result = Vec::new();
+        let result: Vec<Provider> = all_providers
-        for item in queue {
+            .into_values()
-            if item.enabled {
+            .filter(|p| p.in_failover_queue)
-                if let Some(provider) = all_providers.get(&item.provider_id) {
+            .collect();
-                    result.push(provider.clone());
-                }
-            }
-        }
 
         Ok(result)
     }
 
-    /// 添加供应商到故障转移队列末尾
+    /// 添加供应商到故障转移队列
     pub fn add_to_failover_queue(&self, app_type: &str, provider_id: &str) -> Result<(), AppError> {
         let conn = lock_conn!(self.conn);
 
-        // 获取当前最大 queue_order
-        let max_order: i32 = conn
-            .query_row(
-                "SELECT COALESCE(MAX(queue_order), 0) FROM failover_queue WHERE app_type = ?1",
-                [app_type],
-                |row| row.get(0),
-            )
-            .map_err(|e| AppError::Database(e.to_string()))?;
-
-        let now = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .unwrap_or_default()
-            .as_secs() as i64;
-
         conn.execute(
-            "INSERT OR IGNORE INTO failover_queue (app_type, provider_id, queue_order, enabled, created_at)
+            "UPDATE providers SET in_failover_queue = 1 WHERE id = ?1 AND app_type = ?2",
-             VALUES (?1, ?2, ?3, 1, ?4)",
+            rusqlite::params![provider_id, app_type],
-            rusqlite::params![app_type, provider_id, max_order + 1, now],
         )
         .map_err(|e| AppError::Database(e.to_string()))?;
 
@@ -104,89 +78,21 @@ impl Database {
     ) -> Result<(), AppError> {
         let conn = lock_conn!(self.conn);
 
-        // 获取被删除项的 queue_order
+        // 1. 从队列中移除
-        let removed_order: Option<i32> = conn
-            .query_row(
-                "SELECT queue_order FROM failover_queue WHERE app_type = ?1 AND provider_id = ?2",
-                [app_type, provider_id],
-                |row| row.get(0),
-            )
-            .ok();
-
-        // 删除该项
         conn.execute(
-            "DELETE FROM failover_queue WHERE app_type = ?1 AND provider_id = ?2",
+            "UPDATE providers SET in_failover_queue = 0 WHERE id = ?1 AND app_type = ?2",
-            [app_type, provider_id],
+            rusqlite::params![provider_id, app_type],
         )
         .map_err(|e| AppError::Database(e.to_string()))?;
 
-        // 重新排序后面的项（填补空隙）
+        // 2. 清除该供应商的健康状态（退出队列后不再需要健康监控）
-        if let Some(order) = removed_order {
         conn.execute(
-                "UPDATE failover_queue
+            "DELETE FROM provider_health WHERE provider_id = ?1 AND app_type = ?2",
-                 SET queue_order = queue_order - 1
+            rusqlite::params![provider_id, app_type],
-                 WHERE app_type = ?1 AND queue_order > ?2",
-                rusqlite::params![app_type, order],
         )
         .map_err(|e| AppError::Database(e.to_string()))?;
-        }
 
-        Ok(())
+        log::info!("已从故障转移队列移除供应商 {provider_id} ({app_type}), 并清除其健康状态");
-    }
-
-    /// 重新排序故障转移队列
-    /// provider_ids: 按新顺序排列的 provider_id 列表
-    pub fn reorder_failover_queue(
-        &self,
-        app_type: &str,
-        provider_ids: &[String],
-    ) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-
-        // 使用事务确保原子性
-        conn.execute("BEGIN TRANSACTION", [])
-            .map_err(|e| AppError::Database(e.to_string()))?;
-
-        let result = (|| {
-            for (index, provider_id) in provider_ids.iter().enumerate() {
-                conn.execute(
-                    "UPDATE failover_queue
-                     SET queue_order = ?3
-                     WHERE app_type = ?1 AND provider_id = ?2",
-                    rusqlite::params![app_type, provider_id, (index + 1) as i32],
-                )
-                .map_err(|e| AppError::Database(e.to_string()))?;
-            }
-            Ok(())
-        })();
-
-        match result {
-            Ok(_) => {
-                conn.execute("COMMIT", [])
-                    .map_err(|e| AppError::Database(e.to_string()))?;
-                Ok(())
-            }
-            Err(e) => {
-                conn.execute("ROLLBACK", []).ok();
-                Err(e)
-            }
-        }
-    }
-
-    /// 设置故障转移队列中供应商的启用状态
-    pub fn set_failover_item_enabled(
-        &self,
-        app_type: &str,
-        provider_id: &str,
-        enabled: bool,
-    ) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-
-        conn.execute(
-            "UPDATE failover_queue SET enabled = ?3 WHERE app_type = ?1 AND provider_id = ?2",
-            rusqlite::params![app_type, provider_id, enabled],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
 
         Ok(())
     }
@@ -195,7 +101,10 @@ impl Database {
     pub fn clear_failover_queue(&self, app_type: &str) -> Result<(), AppError> {
         let conn = lock_conn!(self.conn);
 
-        conn.execute("DELETE FROM failover_queue WHERE app_type = ?1", [app_type])
+        conn.execute(
+            "UPDATE providers SET in_failover_queue = 0 WHERE app_type = ?1",
+            [app_type],
+        )
         .map_err(|e| AppError::Database(e.to_string()))?;
 
         Ok(())
@@ -209,15 +118,15 @@ impl Database {
     ) -> Result<bool, AppError> {
         let conn = lock_conn!(self.conn);
 
-        let count: i32 = conn
+        let in_queue: bool = conn
             .query_row(
-                "SELECT COUNT(*) FROM failover_queue WHERE app_type = ?1 AND provider_id = ?2",
+                "SELECT in_failover_queue FROM providers WHERE id = ?1 AND app_type = ?2",
-                [app_type, provider_id],
+                rusqlite::params![provider_id, app_type],
                 |row| row.get(0),
             )
-            .map_err(|e| AppError::Database(e.to_string()))?;
+            .unwrap_or(false);
 
-        Ok(count > 0)
+        Ok(in_queue)
     }
 
     /// 获取可添加到故障转移队列的供应商（不在队列中的）
@@ -226,14 +135,10 @@ impl Database {
         app_type: &str,
     ) -> Result<Vec<Provider>, AppError> {
         let all_providers = self.get_all_providers(app_type)?;
-        let queue = self.get_failover_queue(app_type)?;
-
-        let queue_ids: std::collections::HashSet<_> =
-            queue.iter().map(|item| &item.provider_id).collect();
 
         let available: Vec<Provider> = all_providers
             .into_values()
-            .filter(|p| !queue_ids.contains(&p.id))
+            .filter(|p| !p.in_failover_queue)
             .collect();
 
         Ok(available)

src-tauri/src/database/dao/mod.rs

@@ -10,6 +10,7 @@ pub mod proxy;
 pub mod settings;
 pub mod skills;
 pub mod stream_check;
+pub mod universal_providers;
 
 // 所有 DAO 方法都通过 Database impl 提供，无需单独导出
 // 导出 FailoverQueueItem 供外部使用

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
+            "SELECT id, name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta, in_failover_queue
              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,6 +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 settings_config =
                     serde_json::from_str(&settings_config_str).unwrap_or(serde_json::Value::Null);
@@ -54,6 +55,7 @@ impl Database {
                         meta: Some(meta),
                         icon,
                         icon_color,
+                        in_failover_queue,
                     },
                 ))
             })
@@ -129,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
+            "SELECT name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta, in_failover_queue
              FROM providers WHERE id = ?1 AND app_type = ?2",
             params![id, app_type],
             |row| {
@@ -143,6 +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 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();
@@ -159,6 +162,7 @@ impl Database {
                     meta: Some(meta),
                     icon,
                     icon_color,
+                    in_failover_queue,
                 })
             },
         );
@@ -184,17 +188,18 @@ 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_current 和 in_failover_queue）
-        let existing: Option<bool> = tx
+        let existing: Option<(bool, bool)> = tx
             .query_row(
-                "SELECT is_current FROM providers WHERE id = ?1 AND app_type = ?2",
+                "SELECT is_current, in_failover_queue FROM providers WHERE id = ?1 AND app_type = ?2",
                 params![provider.id, app_type],
-                |row| row.get(0),
+                |row| Ok((row.get(0)?, row.get(1)?)),
             )
             .ok();
 
         let is_update = existing.is_some();
-        let is_current = existing.unwrap_or(false);
+        let (is_current, in_failover_queue) =
+            existing.unwrap_or((false, provider.in_failover_queue));
 
         if is_update {
             // 更新模式：使用 UPDATE 避免触发 ON DELETE CASCADE
@@ -210,8 +215,9 @@ impl Database {
                     icon = ?8,
                     icon_color = ?9,
                     meta = ?10,
-                    is_current = ?11
+                    is_current = ?11,
-                WHERE id = ?12 AND app_type = ?13",
+                    in_failover_queue = ?12
+                WHERE id = ?13 AND app_type = ?14",
                 params![
                     provider.name,
                     serde_json::to_string(&provider.settings_config).unwrap(),
@@ -224,6 +230,7 @@ impl Database {
                     provider.icon_color,
                     serde_json::to_string(&meta_clone).unwrap(),
                     is_current,
+                    in_failover_queue,
                     provider.id,
                     app_type,
                 ],
@@ -234,8 +241,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
+                    created_at, sort_index, notes, icon, icon_color, meta, is_current, in_failover_queue
-                ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)",
+                ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14)",
                 params![
                     provider.id,
                     app_type,
@@ -250,6 +257,7 @@ impl Database {
                     provider.icon_color,
                     serde_json::to_string(&meta_clone).unwrap(),
                     is_current,
+                    in_failover_queue,
                 ],
             )
             .map_err(|e| AppError::Database(e.to_string()))?;

src-tauri/src/database/dao/proxy.rs

@@ -8,63 +8,66 @@ use crate::proxy::types::*;
 use super::super::{lock_conn, Database};
 
 impl Database {
-    // ==================== Proxy Config ====================
+    // ==================== Global Proxy Config ====================
 
-    /// 获取代理配置
+    /// 获取全局代理配置（统一字段）
-    pub async fn get_proxy_config(&self) -> Result<ProxyConfig, AppError> {
+    ///
-        // 在一个作用域内获取锁并查询，确保锁在await之前释放
+    /// 从 claude 行读取（三行镜像一致）
+    pub async fn get_global_proxy_config(&self) -> Result<GlobalProxyConfig, AppError> {
+        // 使用 block 限制 conn 的作用域，避免跨 await 持有锁
         let result = {
             let conn = lock_conn!(self.conn);
             conn.query_row(
-                "SELECT enabled, listen_address, listen_port, max_retries,
+                "SELECT proxy_enabled, listen_address, listen_port, enable_logging
-                        request_timeout, enable_logging, live_takeover_active
+                 FROM proxy_config WHERE app_type = 'claude'",
-                 FROM proxy_config WHERE id = 1",
                 [],
                 |row| {
-                    Ok(ProxyConfig {
+                    Ok(GlobalProxyConfig {
-                        enabled: row.get::<_, i32>(0)? != 0,
+                        proxy_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,
+                        enable_logging: row.get::<_, i32>(3)? != 0,
-                        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,
                     })
                 },
             )
-        }; // conn锁在这里释放
+        };
+        // conn 已在 block 结束时释放
 
         match result {
             Ok(config) => Ok(config),
             Err(rusqlite::Error::QueryReturnedNoRows) => {
-                // 如果不存在，插入默认配置
+                // 如果不存在，创建默认配置
-                let default_config = ProxyConfig::default();
+                self.init_proxy_config_rows().await?;
-                self.update_proxy_config(default_config.clone()).await?;
+                Ok(GlobalProxyConfig {
-                Ok(default_config)
+                    proxy_enabled: false,
+                    listen_address: "127.0.0.1".to_string(),
+                    listen_port: 5000,
+                    enable_logging: true,
+                })
             }
             Err(e) => Err(AppError::Database(e.to_string())),
         }
     }
 
-    /// 更新代理配置
+    /// 更新全局代理配置（镜像写三行）
-    pub async fn update_proxy_config(&self, config: ProxyConfig) -> Result<(), AppError> {
+    pub async fn update_global_proxy_config(
+        &self,
+        config: GlobalProxyConfig,
+    ) -> Result<(), AppError> {
         let conn = lock_conn!(self.conn);
 
         conn.execute(
-            "INSERT OR REPLACE INTO proxy_config
+            "UPDATE proxy_config SET
-             (id, enabled, listen_address, listen_port, max_retries, request_timeout, enable_logging, live_takeover_active, target_app, created_at, updated_at)
+                proxy_enabled = ?1,
-             VALUES (1, ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8,
+                listen_address = ?2,
-                     COALESCE((SELECT created_at FROM proxy_config WHERE id = 1), datetime('now')),
+                listen_port = ?3,
-                     datetime('now'))",
+                enable_logging = ?4,
+                updated_at = datetime('now')",
             rusqlite::params![
-                if config.enabled { 1 } else { 0 },
+                if config.proxy_enabled { 1 } else { 0 },
                 config.listen_address,
                 config.listen_port as i32,
-                config.max_retries as i32,
-                config.request_timeout as i32,
                 if config.enable_logging { 1 } else { 0 },
-                if config.live_takeover_active { 1 } else { 0 },
-                "claude", // 兼容旧字段，写入默认值
             ],
         )
         .map_err(|e| AppError::Database(e.to_string()))?;
@@ -72,21 +75,214 @@ impl Database {
         Ok(())
     }
 
-    /// 设置 Live 接管状态
+    /// 获取应用级代理配置
-    pub async fn set_live_takeover_active(&self, active: bool) -> Result<(), AppError> {
+    pub async fn get_proxy_config_for_app(
+        &self,
+        app_type: &str,
+    ) -> Result<AppProxyConfig, AppError> {
+        // 使用 block 限制 conn 的作用域，避免跨 await 持有锁
+        let app_type_owned = app_type.to_string();
+        let result = {
             let conn = lock_conn!(self.conn);
+            conn.query_row(
+                "SELECT app_type, enabled, auto_failover_enabled,
+                        max_retries, streaming_first_byte_timeout, streaming_idle_timeout, non_streaming_timeout,
+                        circuit_failure_threshold, circuit_success_threshold, circuit_timeout_seconds,
+                        circuit_error_rate_threshold, circuit_min_requests
+                 FROM proxy_config WHERE app_type = ?1",
+                [app_type],
+                |row| {
+                    Ok(AppProxyConfig {
+                        app_type: row.get(0)?,
+                        enabled: row.get::<_, i32>(1)? != 0,
+                        auto_failover_enabled: row.get::<_, i32>(2)? != 0,
+                        max_retries: row.get::<_, i32>(3)? as u32,
+                        streaming_first_byte_timeout: row.get::<_, i32>(4)? as u32,
+                        streaming_idle_timeout: row.get::<_, i32>(5)? as u32,
+                        non_streaming_timeout: row.get::<_, i32>(6)? as u32,
+                        circuit_failure_threshold: row.get::<_, i32>(7)? as u32,
+                        circuit_success_threshold: row.get::<_, i32>(8)? as u32,
+                        circuit_timeout_seconds: row.get::<_, i32>(9)? as u32,
+                        circuit_error_rate_threshold: row.get(10)?,
+                        circuit_min_requests: row.get::<_, i32>(11)? as u32,
+                    })
+                },
+            )
+        };
+        // conn 已在 block 结束时释放
+
+        match result {
+            Ok(config) => Ok(config),
+            Err(rusqlite::Error::QueryReturnedNoRows) => {
+                // 如果不存在，创建默认配置
+                self.init_proxy_config_rows().await?;
+                Ok(AppProxyConfig {
+                    app_type: app_type_owned,
+                    enabled: false,
+                    auto_failover_enabled: false,
+                    max_retries: 3,
+                    streaming_first_byte_timeout: 30,
+                    streaming_idle_timeout: 60,
+                    non_streaming_timeout: 300,
+                    circuit_failure_threshold: 5,
+                    circuit_success_threshold: 2,
+                    circuit_timeout_seconds: 60,
+                    circuit_error_rate_threshold: 0.5,
+                    circuit_min_requests: 10,
+                })
+            }
+            Err(e) => Err(AppError::Database(e.to_string())),
+        }
+    }
+
+    /// 更新应用级代理配置
+    pub async fn update_proxy_config_for_app(
+        &self,
+        config: AppProxyConfig,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
         conn.execute(
-            "UPDATE proxy_config SET live_takeover_active = ?1, updated_at = datetime('now') WHERE id = 1",
+            "UPDATE proxy_config SET
-            rusqlite::params![if active { 1 } else { 0 }],
+                enabled = ?2,
+                auto_failover_enabled = ?3,
+                max_retries = ?4,
+                streaming_first_byte_timeout = ?5,
+                streaming_idle_timeout = ?6,
+                non_streaming_timeout = ?7,
+                circuit_failure_threshold = ?8,
+                circuit_success_threshold = ?9,
+                circuit_timeout_seconds = ?10,
+                circuit_error_rate_threshold = ?11,
+                circuit_min_requests = ?12,
+                updated_at = datetime('now')
+             WHERE app_type = ?1",
+            rusqlite::params![
+                config.app_type,
+                if config.enabled { 1 } else { 0 },
+                if config.auto_failover_enabled { 1 } else { 0 },
+                config.max_retries as i32,
+                config.streaming_first_byte_timeout as i32,
+                config.streaming_idle_timeout as i32,
+                config.non_streaming_timeout as i32,
+                config.circuit_failure_threshold as i32,
+                config.circuit_success_threshold as i32,
+                config.circuit_timeout_seconds as i32,
+                config.circuit_error_rate_threshold,
+                config.circuit_min_requests as i32,
+            ],
         )
         .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// 初始化 proxy_config 表的三行数据
+    async fn init_proxy_config_rows(&self) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        for app_type in &["claude", "codex", "gemini"] {
+            conn.execute(
+                "INSERT OR IGNORE INTO proxy_config (app_type) VALUES (?1)",
+                [app_type],
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        }
+
+        Ok(())
+    }
+
+    // ==================== Legacy Proxy Config (兼容旧代码) ====================
+
+    /// 获取代理配置（兼容旧接口，返回 claude 行的配置）
+    pub async fn get_proxy_config(&self) -> Result<ProxyConfig, AppError> {
+        // 使用 block 限制 conn 的作用域，避免跨 await 持有锁
+        let result = {
+            let conn = lock_conn!(self.conn);
+            conn.query_row(
+                "SELECT listen_address, listen_port, max_retries,
+                        enable_logging,
+                        streaming_first_byte_timeout, streaming_idle_timeout, non_streaming_timeout
+                 FROM proxy_config WHERE app_type = 'claude'",
+                [],
+                |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: 300, // 废弃字段，返回默认值
+                        enable_logging: row.get::<_, i32>(3)? != 0,
+                        live_takeover_active: false, // 废弃字段
+                        streaming_first_byte_timeout: row.get::<_, i32>(4).unwrap_or(30) as u64,
+                        streaming_idle_timeout: row.get::<_, i32>(5).unwrap_or(60) as u64,
+                        non_streaming_timeout: row.get::<_, i32>(6).unwrap_or(300) as u64,
+                    })
+                },
+            )
+        };
+        // conn 已在 block 结束时释放
+
+        match result {
+            Ok(config) => Ok(config),
+            Err(rusqlite::Error::QueryReturnedNoRows) => {
+                // 如果不存在，初始化默认配置
+                self.init_proxy_config_rows().await?;
+                Ok(ProxyConfig::default())
+            }
+            Err(e) => Err(AppError::Database(e.to_string())),
+        }
+    }
+
+    /// 更新代理配置（兼容旧接口，更新所有三行的公共字段）
+    pub async fn update_proxy_config(&self, config: ProxyConfig) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        // 更新所有三行的公共字段
+        conn.execute(
+            "UPDATE proxy_config SET
+                listen_address = ?1,
+                listen_port = ?2,
+                max_retries = ?3,
+                enable_logging = ?4,
+                streaming_first_byte_timeout = ?5,
+                streaming_idle_timeout = ?6,
+                non_streaming_timeout = ?7,
+                updated_at = datetime('now')",
+            rusqlite::params![
+                config.listen_address,
+                config.listen_port as i32,
+                config.max_retries as i32,
+                if config.enable_logging { 1 } else { 0 },
+                config.streaming_first_byte_timeout as i32,
+                config.streaming_idle_timeout as i32,
+                config.non_streaming_timeout as i32,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// 设置 Live 接管状态（兼容旧版本，更新 enabled 字段）
+    pub async fn set_live_takeover_active(&self, _active: bool) -> Result<(), AppError> {
+        // 不再使用此字段，由 enabled 字段替代
+        // 保留空实现以兼容旧代码
         Ok(())
     }
 
     /// 检查是否处于 Live 接管模式
+    ///
+    /// 检查是否有任一 app 的 enabled = true
     pub async fn is_live_takeover_active(&self) -> Result<bool, AppError> {
-        // v3.7.0+：以 proxy_live_backup 是否存在作为“接管状态”的真实来源（更贴近 per-app 接管）
+        let conn = lock_conn!(self.conn);
-        self.has_any_live_backup().await
+        let count: i64 = conn
+            .query_row(
+                "SELECT COUNT(*) FROM proxy_config WHERE enabled = 1",
+                [],
+                |row| row.get(0),
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(count > 0)
     }
 
     // ==================== Provider Health ====================
@@ -97,6 +293,7 @@ impl Database {
         provider_id: &str,
         app_type: &str,
     ) -> Result<ProviderHealth, AppError> {
+        let result = {
             let conn = lock_conn!(self.conn);
 
             conn.query_row(
@@ -118,7 +315,23 @@ impl Database {
                     })
                 },
             )
-        .map_err(|e| AppError::Database(e.to_string()))
+        };
+
+        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())),
+        }
     }
 
     /// 更新Provider健康状态
@@ -223,6 +436,20 @@ 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);
@@ -234,19 +461,22 @@ impl Database {
         Ok(())
     }
 
-    // ==================== Circuit Breaker Config ====================
+    // ==================== Circuit Breaker Config (Legacy Compatibility) ====================
 
-    /// 获取熔断器配置
+    /// 获取熔断器配置（兼容旧接口，从 claude 行读取）
+    ///
+    /// 熔断器配置已合并到 proxy_config 表，每 app 独立
+    /// 此方法保留用于兼容旧代码，建议使用 get_proxy_config_for_app
     pub async fn get_circuit_breaker_config(
         &self,
     ) -> Result<crate::proxy::circuit_breaker::CircuitBreakerConfig, AppError> {
+        // 使用 block 限制 conn 的作用域，避免跨 await 持有锁
+        let result = {
             let conn = lock_conn!(self.conn);
-
+            conn.query_row(
-        let config = conn
+                "SELECT circuit_failure_threshold, circuit_success_threshold, circuit_timeout_seconds,
-            .query_row(
+                        circuit_error_rate_threshold, circuit_min_requests
-                "SELECT failure_threshold, success_threshold, timeout_seconds,
+                 FROM proxy_config WHERE app_type = 'claude'",
-                        error_rate_threshold, min_requests
-                 FROM circuit_breaker_config WHERE id = 1",
                 [],
                 |row| {
                     Ok(crate::proxy::circuit_breaker::CircuitBreakerConfig {
@@ -258,27 +488,39 @@ impl Database {
                     })
                 },
             )
-            .map_err(|e| AppError::Database(e.to_string()))?;
+        };
+        // conn 已在 block 结束时释放
 
-        Ok(config)
+        match result {
+            Ok(config) => Ok(config),
+            Err(rusqlite::Error::QueryReturnedNoRows) => {
+                // 如果不存在，初始化默认配置
+                self.init_proxy_config_rows().await?;
+                Ok(crate::proxy::circuit_breaker::CircuitBreakerConfig::default())
+            }
+            Err(e) => Err(AppError::Database(e.to_string())),
+        }
     }
 
-    /// 更新熔断器配置
+    /// 更新熔断器配置（兼容旧接口，更新所有三行）
+    ///
+    /// 熔断器配置已合并到 proxy_config 表
+    /// 此方法保留用于兼容旧代码，建议使用 update_proxy_config_for_app
     pub async fn update_circuit_breaker_config(
         &self,
         config: &crate::proxy::circuit_breaker::CircuitBreakerConfig,
     ) -> Result<(), AppError> {
         let conn = lock_conn!(self.conn);
 
+        // 更新所有三行的熔断器配置
         conn.execute(
-            "UPDATE circuit_breaker_config
+            "UPDATE proxy_config SET
-             SET failure_threshold = ?1,
+                circuit_failure_threshold = ?1,
-                 success_threshold = ?2,
+                circuit_success_threshold = ?2,
-                 timeout_seconds = ?3,
+                circuit_timeout_seconds = ?3,
-                 error_rate_threshold = ?4,
+                circuit_error_rate_threshold = ?4,
-                 min_requests = ?5,
+                circuit_min_requests = ?5,
-                 updated_at = CURRENT_TIMESTAMP
+                updated_at = datetime('now')",
-             WHERE id = 1",
             rusqlite::params![
                 config.failure_threshold as i32,
                 config.success_threshold as i32,

src-tauri/src/database/dao/settings.rs

@@ -62,4 +62,70 @@ impl Database {
             Ok(())
         }
     }
+
+    // --- 代理接管状态管理（已废弃，使用 proxy_config.enabled 替代）---
+
+    /// 获取指定应用的代理接管状态
+    ///
+    /// **已废弃**: 请使用 `proxy_config.enabled` 字段替代
+    /// 此方法仅用于数据库迁移时读取旧数据
+    #[deprecated(since = "3.9.0", note = "使用 get_proxy_config_for_app().enabled 替代")]
+    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),
+        }
+    }
+
+    /// 设置指定应用的代理接管状态
+    ///
+    /// **已废弃**: 请使用 `proxy_config.enabled` 字段替代
+    #[deprecated(
+        since = "3.9.0",
+        note = "使用 update_proxy_config_for_app() 修改 enabled 字段"
+    )]
+    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)
+    }
+
+    /// 检查是否有任一应用开启了代理接管
+    ///
+    /// **已废弃**: 请使用 `is_live_takeover_active()` 替代
+    #[deprecated(since = "3.9.0", note = "使用 is_live_takeover_active() 替代")]
+    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）
+    ///
+    /// **已废弃**: settings 表不再用于存储代理状态
+    #[deprecated(
+        since = "3.9.0",
+        note = "使用 update_proxy_config_for_app() 清除各应用的 enabled 字段"
+    )]
+    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(())
+    }
 }

src-tauri/src/database/dao/universal_providers.rs

@@ -0,0 +1,74 @@
+//! 统一供应商 (Universal Provider) DAO
+//!
+//! 提供统一供应商的 CRUD 操作。
+
+use crate::database::{lock_conn, to_json_string, Database};
+use crate::error::AppError;
+use crate::provider::UniversalProvider;
+use std::collections::HashMap;
+
+/// 统一供应商的 Settings Key
+const UNIVERSAL_PROVIDERS_KEY: &str = "universal_providers";
+
+impl Database {
+    /// 获取所有统一供应商
+    pub fn get_all_universal_providers(
+        &self,
+    ) -> Result<HashMap<String, UniversalProvider>, AppError> {
+        let conn = lock_conn!(self.conn);
+
+        let mut stmt = conn
+            .prepare("SELECT value FROM settings WHERE key = ?")
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let result: Option<String> = stmt
+            .query_row([UNIVERSAL_PROVIDERS_KEY], |row| row.get(0))
+            .ok();
+
+        match result {
+            Some(json) => serde_json::from_str(&json)
+                .map_err(|e| AppError::Database(format!("解析统一供应商数据失败: {e}"))),
+            None => Ok(HashMap::new()),
+        }
+    }
+
+    /// 获取单个统一供应商
+    pub fn get_universal_provider(&self, id: &str) -> Result<Option<UniversalProvider>, AppError> {
+        let providers = self.get_all_universal_providers()?;
+        Ok(providers.get(id).cloned())
+    }
+
+    /// 保存统一供应商（添加或更新）
+    pub fn save_universal_provider(&self, provider: &UniversalProvider) -> Result<(), AppError> {
+        let mut providers = self.get_all_universal_providers()?;
+        providers.insert(provider.id.clone(), provider.clone());
+        self.save_all_universal_providers(&providers)
+    }
+
+    /// 删除统一供应商
+    pub fn delete_universal_provider(&self, id: &str) -> Result<bool, AppError> {
+        let mut providers = self.get_all_universal_providers()?;
+        let existed = providers.remove(id).is_some();
+        if existed {
+            self.save_all_universal_providers(&providers)?;
+        }
+        Ok(existed)
+    }
+
+    /// 保存所有统一供应商（内部方法）
+    fn save_all_universal_providers(
+        &self,
+        providers: &HashMap<String, UniversalProvider>,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        let json = to_json_string(providers)?;
+
+        conn.execute(
+            "INSERT OR REPLACE INTO settings (key, value) VALUES (?, ?)",
+            [UNIVERSAL_PROVIDERS_KEY, &json],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+}

src-tauri/src/database/tests.rs

@@ -53,7 +53,6 @@ const LEGACY_SCHEMA_SQL: &str = r#"
 
 #[derive(Debug)]
 struct ColumnInfo {
-    name: String,
     r#type: String,
     notnull: i64,
     default: Option<String>,
@@ -65,10 +64,9 @@ fn get_column_info(conn: &Connection, table: &str, column: &str) -> ColumnInfo {
         .expect("prepare pragma");
     let mut rows = stmt.query([]).expect("query pragma");
     while let Some(row) = rows.next().expect("read row") {
-        let name: String = row.get(1).expect("name");
+        let column_name: String = row.get(1).expect("name");
-        if name.eq_ignore_ascii_case(column) {
+        if column_name.eq_ignore_ascii_case(column) {
             return ColumnInfo {
-                name,
                 r#type: row.get::<_, String>(2).expect("type"),
                 notnull: row.get::<_, i64>(3).expect("notnull"),
                 default: row.get::<_, Option<String>>(4).ok().flatten(),
@@ -201,6 +199,53 @@ fn migration_aligns_column_defaults_and_types() {
     );
 }
 
+#[test]
+fn create_tables_repairs_legacy_proxy_config_singleton_to_per_app() {
+    let conn = Connection::open_in_memory().expect("open memory db");
+
+    // 模拟测试版 v2：user_version=2，但 proxy_config 仍是单例结构（无 app_type）
+    Database::set_user_version(&conn, 2).expect("set user_version");
+    conn.execute_batch(
+        r#"
+        CREATE TABLE proxy_config (
+            id INTEGER PRIMARY KEY,
+            enabled INTEGER NOT NULL DEFAULT 0,
+            listen_address TEXT NOT NULL DEFAULT '127.0.0.1',
+            listen_port INTEGER NOT NULL DEFAULT 5000,
+            max_retries INTEGER NOT NULL DEFAULT 3,
+            request_timeout INTEGER NOT NULL DEFAULT 300,
+            enable_logging INTEGER NOT NULL DEFAULT 1,
+            target_app TEXT NOT NULL DEFAULT 'claude',
+            created_at TEXT NOT NULL DEFAULT (datetime('now')),
+            updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+        );
+        INSERT INTO proxy_config (id, enabled) VALUES (1, 1);
+        "#,
+    )
+    .expect("seed legacy proxy_config");
+
+    Database::create_tables_on_conn(&conn).expect("create tables should repair proxy_config");
+
+    assert!(
+        Database::has_column(&conn, "proxy_config", "app_type").expect("check app_type"),
+        "proxy_config should be migrated to per-app structure"
+    );
+
+    let count: i32 = conn
+        .query_row("SELECT COUNT(*) FROM proxy_config", [], |r| r.get(0))
+        .expect("count rows");
+    assert_eq!(count, 3, "per-app proxy_config should have 3 rows");
+
+    // 新结构下应能按 app_type 查询
+    let _: i32 = conn
+        .query_row(
+            "SELECT COUNT(*) FROM proxy_config WHERE app_type = 'claude'",
+            [],
+            |r| r.get(0),
+        )
+        .expect("query by app_type");
+}
+
 #[test]
 fn dry_run_does_not_write_to_disk() {
     // Create minimal valid config for migration
@@ -245,12 +290,14 @@ fn dry_run_validates_schema_compatibility() {
             meta: None,
             icon: None,
             icon_color: None,
+            in_failover_queue: false,
         },
     );
 
-    let mut manager = ProviderManager::default();
+    let manager = ProviderManager {
-    manager.providers = providers;
+        providers,
-    manager.current = "test-provider".to_string();
+        current: "test-provider".to_string(),
+    };
 
     let mut apps = HashMap::new();
     apps.insert("claude".to_string(), manager);

src-tauri/src/deeplink/provider.rs

@@ -132,6 +132,7 @@ pub(crate) fn build_provider_from_request(
         meta,
         icon: request.icon.clone(),
         icon_color: None,
+        in_failover_queue: false,
     };
 
     Ok(provider)

src-tauri/src/deeplink/tests.rs

@@ -375,7 +375,7 @@ fn test_parse_prompt_deeplink() {
     assert_eq!(request.name.unwrap(), "test");
     assert_eq!(request.content.unwrap(), content_b64);
     assert_eq!(request.description.unwrap(), "desc");
-    assert_eq!(request.enabled.unwrap(), true);
+    assert!(request.enabled.unwrap());
 }
 
 #[test]
@@ -391,13 +391,13 @@ fn test_parse_mcp_deeplink() {
     assert_eq!(request.resource, "mcp");
     assert_eq!(request.apps.unwrap(), "claude,codex");
     assert_eq!(request.config.unwrap(), config_b64);
-    assert_eq!(request.enabled.unwrap(), true);
+    assert!(request.enabled.unwrap());
 }
 
 #[test]
 fn test_parse_skill_deeplink() {
     let url = "ccswitch://v1/import?resource=skill&repo=owner/repo&directory=skills&branch=dev";
-    let request = parse_deeplink_url(&url).unwrap();
+    let request = parse_deeplink_url(url).unwrap();
 
     assert_eq!(request.resource, "skill");
     assert_eq!(request.repo.unwrap(), "owner/repo");

src-tauri/src/error.rs

@@ -52,6 +52,10 @@ pub enum AppError {
     },
     #[error("数据库错误: {0}")]
     Database(String),
+    #[error("所有供应商已熔断，无可用渠道")]
+    AllProvidersCircuitOpen,
+    #[error("未配置供应商")]
+    NoProvidersConfigured,
 }
 
 impl AppError {

src-tauri/src/lib.rs

@@ -48,6 +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};
 use tauri::RunEvent;
 use tauri::{Emitter, Manager};
@@ -133,6 +135,19 @@ 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();
@@ -208,44 +223,6 @@ 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(
@@ -503,12 +480,27 @@ 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");
                 }
+            }
 
             let _tray = tray_builder.build(app)?;
             // 将同一个实例注入到全局状态，避免重复创建导致的不一致
@@ -524,12 +516,12 @@ pub fn run() {
                 }
             }
 
-            // 异常退出恢复 + 自动启动代理服务器
+            // 异常退出恢复 + 代理状态自动恢复
             let app_handle = app.handle().clone();
             tauri::async_runtime::spawn(async move {
                 let state = app_handle.state::<AppState>();
 
-                // 检查是否有 Live 备份（表示上次有接管状态）
+                // 检查是否有 Live 备份（表示上次异常退出时可能处于接管状态）
                 let has_backups = match state.db.has_any_live_backup().await {
                     Ok(v) => v,
                     Err(e) => {
@@ -537,57 +529,20 @@ pub fn run() {
                         false
                     }
                 };
-
-                // 获取代理配置
-                let proxy_config = match state.db.get_proxy_config().await {
-                    Ok(config) => Some(config),
-                    Err(e) => {
-                        log::error!("启动时获取代理配置失败: {e}");
-                        None
-                    }
-                };
-
-                if has_backups {
-                    // 有备份说明上次退出时有接管状态
                 // 检查 Live 配置是否仍处于被接管状态（包含占位符）
                 let live_taken_over = state.proxy_service.detect_takeover_in_live_configs();
 
-                    if live_taken_over {
+                if has_backups || live_taken_over {
-                        // Live 配置仍是接管状态，尝试重新启动代理服务以恢复接管
+                    log::warn!("检测到上次异常退出（存在接管残留），正在恢复 Live 配置...");
-                        log::info!("检测到上次接管状态，正在重新启动代理服务...");
-                        match state.proxy_service.start(false).await {
-                            Ok(info) => {
-                                log::info!("代理服务器已恢复启动: {}:{}", info.address, info.port);
-                            }
-                            Err(e) => {
-                                // 启动失败，恢复 Live 配置
-                                log::error!("恢复代理服务失败: {e}，正在恢复 Live 配置...");
                     if let Err(e) = state.proxy_service.recover_from_crash().await {
                         log::error!("恢复 Live 配置失败: {e}");
                     } else {
                         log::info!("Live 配置已恢复");
                     }
                 }
-                        }
+
-                    } else {
+                // 检查 settings 表中的代理状态，自动恢复代理服务
-                        // Live 配置已经是正常状态，清理残留备份
+                restore_proxy_state_on_startup(&state).await;
-                        log::info!("Live 配置已是正常状态，清理残留备份...");
-                        if let Err(e) = state.db.delete_all_live_backups().await {
-                            log::warn!("清理残留 Live 备份失败: {e}");
-                        }
-                    }
-                } else if let Some(config) = proxy_config {
-                    // 没有备份，检查是否需要自动启动代理服务器（总开关）
-                    if config.enabled {
-                        log::info!("代理服务配置为启用，正在启动...");
-                        match state.proxy_service.start(true).await {
-                            Ok(info) => {
-                                log::info!("代理服务器自动启动成功: {}:{}", info.address, info.port)
-                            }
-                            Err(e) => log::error!("代理服务器自动启动失败: {e}"),
-                        }
-                    }
-                }
             });
 
             Ok(())
@@ -625,6 +580,8 @@ 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,
@@ -639,7 +596,7 @@ pub fn run() {
             commands::upsert_mcp_server_in_config,
             commands::delete_mcp_server_in_config,
             commands::set_mcp_enabled,
-            // v3.7.0: Unified MCP management
+            // Unified MCP management
             commands::get_mcp_servers,
             commands::upsert_mcp_server,
             commands::delete_mcp_server,
@@ -693,13 +650,17 @@ pub fn run() {
             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,
+            // Global & Per-App Config
+            commands::get_global_proxy_config,
+            commands::update_global_proxy_config,
+            commands::get_proxy_config_for_app,
+            commands::update_proxy_config_for_app,
             commands::is_proxy_running,
             commands::is_live_takeover_active,
             commands::switch_proxy_provider,
@@ -714,8 +675,8 @@ pub fn run() {
             commands::get_available_providers_for_failover,
             commands::add_to_failover_queue,
             commands::remove_from_failover_queue,
-            commands::reorder_failover_queue,
+            commands::get_auto_failover_enabled,
-            commands::set_failover_item_enabled,
+            commands::set_auto_failover_enabled,
             // Usage statistics
             commands::get_usage_summary,
             commands::get_usage_trends,
@@ -733,6 +694,12 @@ pub fn run() {
             commands::get_stream_check_config,
             commands::save_stream_check_config,
             commands::get_tool_versions,
+            // Universal Provider management
+            commands::get_universal_providers,
+            commands::get_universal_provider,
+            commands::upsert_universal_provider,
+            commands::delete_universal_provider,
+            commands::sync_universal_provider,
         ]);
 
     let app = builder
@@ -847,32 +814,91 @@ 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 接管残留仍在（占位符/备份）。
-        if proxy_service.is_running().await {
+        let has_backups = match state.db.has_any_live_backup().await {
-            log::info!("检测到代理服务器正在运行，开始清理...");
+            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;
 
-            // 检查是否处于 Live 接管模式
+        if needs_restore {
-            if let Ok(is_takeover) = state.db.is_live_takeover_active().await {
+            log::info!("检测到接管残留，开始恢复 Live 配置（保留代理状态）...");
-                if is_takeover {
+            // 使用 keep_state 版本，保留 settings 表中的代理状态
-                    // 接管模式：停止并恢复配置
+            if let Err(e) = proxy_service.stop_with_restore_keep_state().await {
-                    if let Err(e) = proxy_service.stop_with_restore().await {
                 log::error!("退出时恢复 Live 配置失败: {e}");
             } else {
-                        log::info!("已恢复 Live 配置");
+                log::info!("已恢复 Live 配置（代理状态已保留，下次启动将自动恢复）");
             }
-                } else {
+            return;
-                    // 非接管模式：仅停止代理
+        }
+
+        // 非接管模式：代理在运行则仅停止代理
+        if proxy_service.is_running().await {
+            log::info!("检测到代理服务器正在运行，开始停止...");
             if let Err(e) = proxy_service.stop().await {
                 log::error!("退出时停止代理失败: {e}");
             }
+            log::info!("代理服务器清理完成");
+        }
+    }
+}
+
+// ============================================================
+// 启动时恢复代理状态
+// ============================================================
+
+/// 启动时根据 proxy_config 表中的代理状态自动恢复代理服务
+///
+/// 检查 `proxy_config.enabled` 字段，如果有任一应用的状态为 `true`，
+/// 则自动启动代理服务并接管对应应用的 Live 配置。
+async fn restore_proxy_state_on_startup(state: &store::AppState) {
+    // 收集需要恢复接管的应用列表（从 proxy_config.enabled 读取）
+    let mut apps_to_restore = Vec::new();
+    for app_type in ["claude", "codex", "gemini"] {
+        if let Ok(config) = state.db.get_proxy_config_for_app(app_type).await {
+            if config.enabled {
+                apps_to_restore.push(app_type);
+            }
         }
     }
 
-            log::info!("代理服务器清理完成");
+    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
+                    .proxy_service
+                    .set_takeover_for_app(app_type, false)
+                    .await
+                {
+                    log::error!("清除 {app_type} 代理状态失败: {clear_err}");
+                }
+            }
         }
     }
 }

src-tauri/src/mcp/codex.rs

@@ -359,9 +359,14 @@ pub fn sync_single_server_to_codex(
     let mut doc = if config_path.exists() {
         let content =
             std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
-        content
+        // 尝试解析现有配置，如果失败则创建新文档（容错处理）
-            .parse::<toml_edit::DocumentMut>()
+        match content.parse::<toml_edit::DocumentMut>() {
-            .map_err(|e| AppError::McpValidation(format!("解析 Codex config.toml 失败: {e}")))?
+            Ok(doc) => doc,
+            Err(e) => {
+                log::warn!("解析 Codex config.toml 失败: {e}，将创建新配置");
+                toml_edit::DocumentMut::new()
+            }
+        }
     } else {
         toml_edit::DocumentMut::new()
     };
@@ -409,9 +414,14 @@ pub fn remove_server_from_codex(id: &str) -> Result<(), AppError> {
     let content =
         std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
 
-    let mut doc = content
+    // 尝试解析现有配置，如果失败则直接返回（无法删除不存在的内容）
-        .parse::<toml_edit::DocumentMut>()
+    let mut doc = match content.parse::<toml_edit::DocumentMut>() {
-        .map_err(|e| AppError::McpValidation(format!("解析 Codex config.toml 失败: {e}")))?;
+        Ok(doc) => doc,
+        Err(e) => {
+            log::warn!("解析 Codex config.toml 失败: {e}，跳过删除操作");
+            return Ok(());
+        }
+    };
 
     // 从正确的位置删除：[mcp_servers]
     if let Some(mcp_servers) = doc.get_mut("mcp_servers").and_then(|s| s.as_table_mut()) {

src-tauri/src/provider.rs

@@ -36,6 +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,
 }
 
 impl Provider {
@@ -58,6 +62,7 @@ impl Provider {
             meta: None,
             icon: None,
             icon_color: None,
+            in_failover_queue: false,
         }
     }
 }
@@ -168,3 +173,285 @@ impl ProviderManager {
         &self.providers
     }
 }
+
+// ============================================================================
+// 统一供应商（Universal Provider）- 跨应用共享配置
+// ============================================================================
+
+/// 统一供应商的应用启用状态
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct UniversalProviderApps {
+    #[serde(default)]
+    pub claude: bool,
+    #[serde(default)]
+    pub codex: bool,
+    #[serde(default)]
+    pub gemini: bool,
+}
+
+/// Claude 模型配置
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct ClaudeModelConfig {
+    /// 主模型
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Haiku 默认模型
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "haikuModel")]
+    pub haiku_model: Option<String>,
+    /// Sonnet 默认模型
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "sonnetModel")]
+    pub sonnet_model: Option<String>,
+    /// Opus 默认模型
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "opusModel")]
+    pub opus_model: Option<String>,
+}
+
+/// Codex 模型配置
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct CodexModelConfig {
+    /// 模型名称
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// 推理强度
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "reasoningEffort")]
+    pub reasoning_effort: Option<String>,
+}
+
+/// Gemini 模型配置
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct GeminiModelConfig {
+    /// 模型名称
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+}
+
+/// 各应用的模型配置
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct UniversalProviderModels {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub claude: Option<ClaudeModelConfig>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub codex: Option<CodexModelConfig>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gemini: Option<GeminiModelConfig>,
+}
+
+/// 统一供应商（跨应用共享配置）
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UniversalProvider {
+    /// 唯一标识
+    pub id: String,
+    /// 供应商名称
+    pub name: String,
+    /// 供应商类型（如 "newapi", "custom"）
+    #[serde(rename = "providerType")]
+    pub provider_type: String,
+    /// 应用启用状态
+    pub apps: UniversalProviderApps,
+    /// API 基础地址
+    #[serde(rename = "baseUrl")]
+    pub base_url: String,
+    /// API 密钥
+    #[serde(rename = "apiKey")]
+    pub api_key: String,
+    /// 各应用的模型配置
+    #[serde(default)]
+    pub models: UniversalProviderModels,
+    /// 网站链接
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "websiteUrl")]
+    pub website_url: Option<String>,
+    /// 备注信息
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub notes: Option<String>,
+    /// 图标名称
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub icon: Option<String>,
+    /// 图标颜色
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "iconColor")]
+    pub icon_color: Option<String>,
+    /// 元数据
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub meta: Option<ProviderMeta>,
+    /// 创建时间戳
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "createdAt")]
+    pub created_at: Option<i64>,
+    /// 排序索引
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "sortIndex")]
+    pub sort_index: Option<usize>,
+}
+
+impl UniversalProvider {
+    /// 创建新的统一供应商
+    pub fn new(
+        id: String,
+        name: String,
+        provider_type: String,
+        base_url: String,
+        api_key: String,
+    ) -> Self {
+        Self {
+            id,
+            name,
+            provider_type,
+            apps: UniversalProviderApps::default(),
+            base_url,
+            api_key,
+            models: UniversalProviderModels::default(),
+            website_url: None,
+            notes: None,
+            icon: None,
+            icon_color: None,
+            meta: None,
+            created_at: Some(chrono::Utc::now().timestamp_millis()),
+            sort_index: None,
+        }
+    }
+
+    /// 生成 Claude 供应商配置
+    pub fn to_claude_provider(&self) -> Option<Provider> {
+        if !self.apps.claude {
+            return None;
+        }
+
+        let models = self.models.claude.as_ref();
+        let model = models
+            .and_then(|m| m.model.clone())
+            .unwrap_or_else(|| "claude-sonnet-4-20250514".to_string());
+        let haiku = models
+            .and_then(|m| m.haiku_model.clone())
+            .unwrap_or_else(|| model.clone());
+        let sonnet = models
+            .and_then(|m| m.sonnet_model.clone())
+            .unwrap_or_else(|| model.clone());
+        let opus = models
+            .and_then(|m| m.opus_model.clone())
+            .unwrap_or_else(|| model.clone());
+
+        let settings_config = serde_json::json!({
+            "env": {
+                "ANTHROPIC_BASE_URL": self.base_url,
+                "ANTHROPIC_AUTH_TOKEN": self.api_key,
+                "ANTHROPIC_MODEL": model,
+                "ANTHROPIC_DEFAULT_HAIKU_MODEL": haiku,
+                "ANTHROPIC_DEFAULT_SONNET_MODEL": sonnet,
+                "ANTHROPIC_DEFAULT_OPUS_MODEL": opus,
+            }
+        });
+
+        Some(Provider {
+            id: format!("universal-claude-{}", self.id),
+            name: self.name.clone(),
+            settings_config,
+            website_url: self.website_url.clone(),
+            category: Some("aggregator".to_string()),
+            created_at: self.created_at,
+            sort_index: self.sort_index,
+            notes: self.notes.clone(),
+            meta: self.meta.clone(),
+            icon: self.icon.clone(),
+            icon_color: self.icon_color.clone(),
+            in_failover_queue: false,
+        })
+    }
+
+    /// 生成 Codex 供应商配置
+    pub fn to_codex_provider(&self) -> Option<Provider> {
+        if !self.apps.codex {
+            return None;
+        }
+
+        let models = self.models.codex.as_ref();
+        let model = models
+            .and_then(|m| m.model.clone())
+            .unwrap_or_else(|| "gpt-4o".to_string());
+        let reasoning_effort = models
+            .and_then(|m| m.reasoning_effort.clone())
+            .unwrap_or_else(|| "high".to_string());
+
+        // 确保 base_url 以 /v1 结尾（Codex 使用 OpenAI 兼容 API）
+        let codex_base_url = if self.base_url.ends_with("/v1") {
+            self.base_url.clone()
+        } else {
+            format!("{}/v1", self.base_url.trim_end_matches('/'))
+        };
+
+        // 生成 Codex 的 config.toml 内容
+        let config_toml = format!(
+            r#"model_provider = "newapi"
+model = "{model}"
+model_reasoning_effort = "{reasoning_effort}"
+disable_response_storage = true
+
+[model_providers.newapi]
+name = "NewAPI"
+base_url = "{codex_base_url}"
+wire_api = "responses"
+requires_openai_auth = true"#
+        );
+
+        let settings_config = serde_json::json!({
+            "auth": {
+                "OPENAI_API_KEY": self.api_key
+            },
+            "config": config_toml
+        });
+
+        Some(Provider {
+            id: format!("universal-codex-{}", self.id),
+            name: self.name.clone(),
+            settings_config,
+            website_url: self.website_url.clone(),
+            category: Some("aggregator".to_string()),
+            created_at: self.created_at,
+            sort_index: self.sort_index,
+            notes: self.notes.clone(),
+            meta: self.meta.clone(),
+            icon: self.icon.clone(),
+            icon_color: self.icon_color.clone(),
+            in_failover_queue: false,
+        })
+    }
+
+    /// 生成 Gemini 供应商配置
+    pub fn to_gemini_provider(&self) -> Option<Provider> {
+        if !self.apps.gemini {
+            return None;
+        }
+
+        let models = self.models.gemini.as_ref();
+        let model = models
+            .and_then(|m| m.model.clone())
+            .unwrap_or_else(|| "gemini-2.5-pro".to_string());
+
+        let settings_config = serde_json::json!({
+            "env": {
+                "GOOGLE_GEMINI_BASE_URL": self.base_url,
+                "GEMINI_API_KEY": self.api_key,
+                "GEMINI_MODEL": model,
+            }
+        });
+
+        Some(Provider {
+            id: format!("universal-gemini-{}", self.id),
+            name: self.name.clone(),
+            settings_config,
+            website_url: self.website_url.clone(),
+            category: Some("aggregator".to_string()),
+            created_at: self.created_at,
+            sort_index: self.sort_index,
+            notes: self.notes.clone(),
+            meta: self.meta.clone(),
+            icon: self.icon.clone(),
+            icon_color: self.icon_color.clone(),
+            in_failover_queue: false,
+        })
+    }
+}

src-tauri/src/proxy/body_filter.rs

@@ -0,0 +1,303 @@
+//! 请求体过滤模块
+//!
+//! 过滤不应透传到上游的私有参数，防止内部信息泄露。
+//!
+//! ## 过滤规则
+//! - 以 `_` 开头的字段被视为私有参数，会被递归过滤
+//! - 支持白名单机制，允许透传特定的 `_` 前缀字段
+//! - 支持嵌套对象和数组的深度过滤
+//!
+//! ## 使用场景
+//! - `_internal_id`: 内部追踪 ID
+//! - `_debug_mode`: 调试标记
+//! - `_session_token`: 会话令牌
+//! - `_client_version`: 客户端版本
+
+use serde_json::Value;
+use std::collections::HashSet;
+
+/// 过滤私有参数（以 `_` 开头的字段）
+///
+/// 递归遍历 JSON 结构，移除所有以下划线开头的字段。
+///
+/// # Arguments
+/// * `body` - 原始请求体
+///
+/// # Returns
+/// 过滤后的请求体
+///
+/// # Example
+/// ```ignore
+/// let input = json!({
+///     "model": "claude-3",
+///     "_internal_id": "abc123",
+///     "messages": [{"role": "user", "content": "hello", "_token": "secret"}]
+/// });
+/// let output = filter_private_params(input);
+/// // output 中不包含 _internal_id 和 _token
+/// ```
+#[cfg(test)]
+pub fn filter_private_params(body: Value) -> Value {
+    filter_private_params_with_whitelist(body, &[])
+}
+
+/// 过滤私有参数（支持白名单）
+///
+/// 递归遍历 JSON 结构，移除所有以下划线开头的字段，
+/// 但保留白名单中指定的字段。
+///
+/// # Arguments
+/// * `body` - 原始请求体
+/// * `whitelist` - 白名单字段列表（不过滤这些字段）
+///
+/// # Returns
+/// 过滤后的请求体
+///
+/// # Example
+/// ```ignore
+/// let input = json!({
+///     "model": "claude-3",
+///     "_metadata": {"key": "value"},  // 白名单中，保留
+///     "_internal_id": "abc123"        // 不在白名单中，过滤
+/// });
+/// let output = filter_private_params_with_whitelist(input, &["_metadata"]);
+/// // output 包含 _metadata，不包含 _internal_id
+/// ```
+pub fn filter_private_params_with_whitelist(body: Value, whitelist: &[String]) -> Value {
+    let whitelist_set: HashSet<&str> = whitelist.iter().map(|s| s.as_str()).collect();
+    filter_recursive_with_whitelist(body, &mut Vec::new(), &whitelist_set)
+}
+
+/// 递归过滤实现
+#[cfg(test)]
+fn filter_recursive(value: Value, removed_keys: &mut Vec<String>) -> Value {
+    filter_recursive_with_whitelist(value, removed_keys, &HashSet::new())
+}
+
+/// 递归过滤实现（支持白名单）
+fn filter_recursive_with_whitelist(
+    value: Value,
+    removed_keys: &mut Vec<String>,
+    whitelist: &HashSet<&str>,
+) -> Value {
+    match value {
+        Value::Object(map) => {
+            let filtered: serde_json::Map<String, Value> = map
+                .into_iter()
+                .filter_map(|(key, val)| {
+                    // 以 _ 开头且不在白名单中的字段被过滤
+                    if key.starts_with('_') && !whitelist.contains(key.as_str()) {
+                        removed_keys.push(key);
+                        None
+                    } else {
+                        Some((
+                            key,
+                            filter_recursive_with_whitelist(val, removed_keys, whitelist),
+                        ))
+                    }
+                })
+                .collect();
+
+            // 仅在有过滤时记录日志（避免每次请求都打印）
+            if !removed_keys.is_empty() {
+                log::debug!("[BodyFilter] 过滤私有参数: {removed_keys:?}");
+                removed_keys.clear();
+            }
+
+            Value::Object(filtered)
+        }
+        Value::Array(arr) => Value::Array(
+            arr.into_iter()
+                .map(|v| filter_recursive_with_whitelist(v, removed_keys, whitelist))
+                .collect(),
+        ),
+        other => other,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn test_filter_top_level_private_params() {
+        let input = json!({
+            "model": "claude-3",
+            "_internal_id": "abc123",
+            "_debug": true,
+            "max_tokens": 1024
+        });
+
+        let output = filter_private_params(input);
+
+        assert!(output.get("model").is_some());
+        assert!(output.get("max_tokens").is_some());
+        assert!(output.get("_internal_id").is_none());
+        assert!(output.get("_debug").is_none());
+    }
+
+    #[test]
+    fn test_filter_nested_private_params() {
+        let input = json!({
+            "model": "claude-3",
+            "messages": [
+                {
+                    "role": "user",
+                    "content": "hello",
+                    "_session_token": "secret"
+                }
+            ],
+            "metadata": {
+                "user_id": "user-1",
+                "_tracking_id": "track-1"
+            }
+        });
+
+        let output = filter_private_params(input);
+
+        // 顶级字段保留
+        assert!(output.get("model").is_some());
+        assert!(output.get("messages").is_some());
+        assert!(output.get("metadata").is_some());
+
+        // messages 数组中的私有参数被过滤
+        let messages = output.get("messages").unwrap().as_array().unwrap();
+        assert!(messages[0].get("role").is_some());
+        assert!(messages[0].get("content").is_some());
+        assert!(messages[0].get("_session_token").is_none());
+
+        // metadata 对象中的私有参数被过滤
+        let metadata = output.get("metadata").unwrap();
+        assert!(metadata.get("user_id").is_some());
+        assert!(metadata.get("_tracking_id").is_none());
+    }
+
+    #[test]
+    fn test_filter_deeply_nested() {
+        let input = json!({
+            "level1": {
+                "level2": {
+                    "level3": {
+                        "keep": "value",
+                        "_remove": "secret"
+                    }
+                }
+            }
+        });
+
+        let output = filter_private_params(input);
+
+        let level3 = output
+            .get("level1")
+            .unwrap()
+            .get("level2")
+            .unwrap()
+            .get("level3")
+            .unwrap();
+
+        assert!(level3.get("keep").is_some());
+        assert!(level3.get("_remove").is_none());
+    }
+
+    #[test]
+    fn test_filter_array_of_objects() {
+        let input = json!({
+            "items": [
+                {"id": 1, "_secret": "a"},
+                {"id": 2, "_secret": "b"},
+                {"id": 3, "_secret": "c"}
+            ]
+        });
+
+        let output = filter_private_params(input);
+        let items = output.get("items").unwrap().as_array().unwrap();
+
+        for item in items {
+            assert!(item.get("id").is_some());
+            assert!(item.get("_secret").is_none());
+        }
+    }
+
+    #[test]
+    fn test_no_private_params() {
+        let input = json!({
+            "model": "claude-3",
+            "messages": [{"role": "user", "content": "hello"}]
+        });
+
+        let output = filter_private_params(input.clone());
+
+        // 无私有参数时，输出应与输入相同
+        assert_eq!(input, output);
+    }
+
+    #[test]
+    fn test_empty_object() {
+        let input = json!({});
+        let output = filter_private_params(input);
+        assert_eq!(output, json!({}));
+    }
+
+    #[test]
+    fn test_primitive_values() {
+        // 原始值不应被修改
+        assert_eq!(filter_private_params(json!(42)), json!(42));
+        assert_eq!(filter_private_params(json!("string")), json!("string"));
+        assert_eq!(filter_private_params(json!(true)), json!(true));
+        assert_eq!(filter_private_params(json!(null)), json!(null));
+    }
+
+    #[test]
+    fn test_whitelist_preserves_private_params() {
+        let input = json!({
+            "model": "claude-3",
+            "_metadata": {"key": "value"},
+            "_internal_id": "abc123",
+            "_stream_options": {"include_usage": true}
+        });
+
+        let whitelist = vec!["_metadata".to_string(), "_stream_options".to_string()];
+        let output = filter_private_params_with_whitelist(input, &whitelist);
+
+        // 白名单中的字段保留
+        assert!(output.get("_metadata").is_some());
+        assert!(output.get("_stream_options").is_some());
+        // 不在白名单中的私有字段被过滤
+        assert!(output.get("_internal_id").is_none());
+        // 普通字段保留
+        assert!(output.get("model").is_some());
+    }
+
+    #[test]
+    fn test_whitelist_nested() {
+        let input = json!({
+            "data": {
+                "_allowed": "keep",
+                "_forbidden": "remove",
+                "normal": "value"
+            }
+        });
+
+        let whitelist = vec!["_allowed".to_string()];
+        let output = filter_private_params_with_whitelist(input, &whitelist);
+
+        let data = output.get("data").unwrap();
+        assert!(data.get("_allowed").is_some());
+        assert!(data.get("_forbidden").is_none());
+        assert!(data.get("normal").is_some());
+    }
+
+    #[test]
+    fn test_empty_whitelist_same_as_default() {
+        let input = json!({
+            "model": "claude-3",
+            "_internal_id": "abc123"
+        });
+
+        let output1 = filter_private_params(input.clone());
+        let output2 = filter_private_params_with_whitelist(input, &[]);
+
+        assert_eq!(output1, output2);
+    }
+}

src-tauri/src/proxy/error.rs

@@ -23,6 +23,12 @@ pub enum ProxyError {
     #[error("无可用的Provider")]
     NoAvailableProvider,
 
+    #[error("所有供应商已熔断，无可用渠道")]
+    AllProvidersCircuitOpen,
+
+    #[error("未配置供应商")]
+    NoProvidersConfigured,
+
     #[allow(dead_code)]
     #[error("Provider不健康: {0}")]
     ProviderUnhealthy(String),
@@ -111,6 +117,12 @@ impl IntoResponse for ProxyError {
                     ProxyError::NoAvailableProvider => {
                         (StatusCode::SERVICE_UNAVAILABLE, self.to_string())
                     }
+                    ProxyError::AllProvidersCircuitOpen => {
+                        (StatusCode::SERVICE_UNAVAILABLE, self.to_string())
+                    }
+                    ProxyError::NoProvidersConfigured => {
+                        (StatusCode::SERVICE_UNAVAILABLE, self.to_string())
+                    }
                     ProxyError::ProviderUnhealthy(_) => {
                         (StatusCode::SERVICE_UNAVAILABLE, self.to_string())
                     }

src-tauri/src/proxy/error_mapper.rs

@@ -27,6 +27,12 @@ pub fn map_proxy_error_to_status(error: &ProxyError) -> u16 {
         // 无可用 Provider：503 Service Unavailable
         ProxyError::NoAvailableProvider => 503,
 
+        // 所有供应商已熔断：503 Service Unavailable
+        ProxyError::AllProvidersCircuitOpen => 503,
+
+        // 未配置供应商：503 Service Unavailable
+        ProxyError::NoProvidersConfigured => 503,
+
         // 重试耗尽：503 Service Unavailable
         ProxyError::MaxRetriesExceeded => 503,
 
@@ -57,6 +63,8 @@ pub fn get_error_message(error: &ProxyError) -> String {
         ProxyError::Timeout(msg) => format!("请求超时: {msg}"),
         ProxyError::ForwardFailed(msg) => format!("转发失败: {msg}"),
         ProxyError::NoAvailableProvider => "无可用 Provider".to_string(),
+        ProxyError::AllProvidersCircuitOpen => "所有供应商已熔断，无可用渠道".to_string(),
+        ProxyError::NoProvidersConfigured => "未配置供应商".to_string(),
         ProxyError::MaxRetriesExceeded => "所有 Provider 都失败，重试耗尽".to_string(),
         ProxyError::ProviderUnhealthy(msg) => format!("Provider 不健康: {msg}"),
         ProxyError::DatabaseError(msg) => format!("数据库错误: {msg}"),

src-tauri/src/proxy/failover_switch.rs

@@ -81,6 +81,21 @@ impl FailoverSwitchManager {
         provider_id: &str,
         provider_name: &str,
     ) -> Result<bool, AppError> {
+        // 检查该应用是否已被代理接管（enabled=true）
+        // 只有被接管的应用才允许执行故障转移切换
+        let app_enabled = match self.db.get_proxy_config_for_app(app_type).await {
+            Ok(config) => config.enabled,
+            Err(e) => {
+                log::warn!("[Failover] 无法读取 {app_type} 配置: {e}，跳过切换");
+                return Ok(false);
+            }
+        };
+
+        if !app_enabled {
+            log::info!("[Failover] {app_type} 未被代理接管（enabled=false），跳过切换");
+            return Ok(false);
+        }
+
         log::info!("[Failover] 开始切换供应商: {app_type} -> {provider_name} ({provider_id})");
 
         // 1. 更新数据库 is_current

src-tauri/src/proxy/forwarder.rs

@@ -1,8 +1,9 @@
 //! 请求转发器
 //!
-//! 负责将请求转发到上游Provider，支持重试和故障转移
+//! 负责将请求转发到上游Provider，支持故障转移
 
 use super::{
+    body_filter::filter_private_params_with_whitelist,
     error::*,
     failover_switch::FailoverSwitchManager,
     provider_router::ProviderRouter,
@@ -17,36 +18,119 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 use tokio::sync::RwLock;
 
+/// Headers 黑名单 - 不透传到上游的 Headers
+///
+/// 参考 Claude Code Hub 设计，过滤以下类别：
+/// 1. 认证类（会被覆盖）
+/// 2. 连接类（由 HTTP 客户端管理）
+/// 3. 代理转发类
+/// 4. CDN/云服务商特定头
+/// 5. 请求追踪类
+/// 6. 浏览器特定头（可能被上游检测）
+///
+/// 注意：客户端 IP 类（x-forwarded-for, x-real-ip）默认透传
+const HEADER_BLACKLIST: &[&str] = &[
+    // 认证类（会被覆盖）
+    "authorization",
+    "x-api-key",
+    // 连接类
+    "host",
+    "content-length",
+    "connection",
+    "transfer-encoding",
+    // 编码类（会被覆盖为 identity）
+    "accept-encoding",
+    // 代理转发类（保留 x-forwarded-for 和 x-real-ip）
+    "x-forwarded-host",
+    "x-forwarded-port",
+    "x-forwarded-proto",
+    "forwarded",
+    // CDN/云服务商特定头
+    "cf-connecting-ip",
+    "cf-ipcountry",
+    "cf-ray",
+    "cf-visitor",
+    "true-client-ip",
+    "fastly-client-ip",
+    "x-azure-clientip",
+    "x-azure-fdid",
+    "x-azure-ref",
+    "akamai-origin-hop",
+    "x-akamai-config-log-detail",
+    // 请求追踪类
+    "x-request-id",
+    "x-correlation-id",
+    "x-trace-id",
+    "x-amzn-trace-id",
+    "x-b3-traceid",
+    "x-b3-spanid",
+    "x-b3-parentspanid",
+    "x-b3-sampled",
+    "traceparent",
+    "tracestate",
+    // 浏览器特定头（可能被上游检测为非 CLI 请求）
+    "sec-fetch-mode",
+    "sec-fetch-site",
+    "sec-fetch-dest",
+    "sec-ch-ua",
+    "sec-ch-ua-mobile",
+    "sec-ch-ua-platform",
+    "accept-language",
+    // anthropic-beta 单独处理，避免重复
+    "anthropic-beta",
+    // 客户端 IP 单独处理（默认透传）
+    "x-forwarded-for",
+    "x-real-ip",
+];
+
+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 内的最大重试次数
-    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/托盘）
+    /// 请求开始时的"当前供应商 ID"（用于判断是否需要同步 UI/托盘）
     current_provider_id_at_start: String,
 }
 
 impl RequestForwarder {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         router: Arc<ProviderRouter>,
-        timeout_secs: u64,
+        non_streaming_timeout: 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,
+        _streaming_first_byte_timeout: u64,
+        _streaming_idle_timeout: u64,
     ) -> Self {
+        // 全局超时设置为 1800 秒（30 分钟），确保业务层超时配置能正常工作
+        // 参考 Claude Code Hub 的 undici 全局超时设计
+        const GLOBAL_TIMEOUT_SECS: u64 = 1800;
+
         let mut client_builder = Client::builder();
-        if timeout_secs > 0 {
+        if non_streaming_timeout > 0 {
-            client_builder = client_builder.timeout(Duration::from_secs(timeout_secs));
+            // 使用配置的非流式超时
+            client_builder = client_builder.timeout(Duration::from_secs(non_streaming_timeout));
+        } else {
+            // 禁用超时时使用全局超时作为保底
+            client_builder = client_builder.timeout(Duration::from_secs(GLOBAL_TIMEOUT_SECS));
         }
 
         let client = client_builder
@@ -56,7 +140,6 @@ impl RequestForwarder {
         Self {
             client,
             router,
-            max_retries,
             status,
             current_providers,
             failover_manager,
@@ -65,59 +148,6 @@ impl RequestForwarder {
         }
     }
 
-    /// 对单个 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
@@ -133,13 +163,16 @@ impl RequestForwarder {
         body: Value,
         headers: axum::http::HeaderMap,
         providers: Vec<Provider>,
-    ) -> Result<Response, ProxyError> {
+    ) -> Result<ForwardResult, ForwardError> {
         // 获取适配器
         let adapter = get_adapter(app_type);
         let app_type_str = app_type.as_str();
 
         if providers.is_empty() {
-            return Err(ProxyError::NoAvailableProvider);
+            return Err(ForwardError {
+                error: ProxyError::NoAvailableProvider,
+                provider: None,
+            });
         }
 
         log::info!(
@@ -149,16 +182,27 @@ impl RequestForwarder {
         );
 
         let mut last_error = None;
+        let mut last_provider = None;
         let mut attempted_providers = 0usize;
 
+        // 单 Provider 场景下跳过熔断器检查（故障转移关闭时）
+        let bypass_circuit_breaker = providers.len() == 1;
+
         // 依次尝试每个供应商
         for provider in providers.iter() {
             // 发起请求前先获取熔断器放行许可（HalfOpen 会占用探测名额）
+            // 单 Provider 场景下跳过此检查，避免熔断器阻塞所有请求
+            let (allowed, used_half_open_permit) = if bypass_circuit_breaker {
+                (true, false)
+            } else {
                 let permit = self
                     .router
                     .allow_provider_request(&provider.id, app_type_str)
                     .await;
-            if !permit.allowed {
+                (permit.allowed, permit.used_half_open_permit)
+            };
+
+            if !allowed {
                 log::debug!(
                     "[{}] Provider {} 熔断器拒绝本次请求，跳过",
                     app_type_str,
@@ -167,8 +211,6 @@ impl RequestForwarder {
                 continue;
             }
 
-            let used_half_open_permit = permit.used_half_open_permit;
-
             attempted_providers += 1;
 
             log::info!(
@@ -191,9 +233,9 @@ impl RequestForwarder {
 
             let start = Instant::now();
 
-            // 转发请求（带单 Provider 内重试）
+            // 转发请求（每个 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) => {
@@ -268,7 +310,10 @@ impl RequestForwarder {
                         latency
                     );
 
-                    return Ok(response);
+                    return Ok(ForwardResult {
+                        response,
+                        provider: provider.clone(),
+                    });
                 }
                 Err(e) => {
                     let latency = start.elapsed().as_millis() as u64;
@@ -309,6 +354,7 @@ impl RequestForwarder {
                             );
 
                             last_error = Some(e);
+                            last_provider = Some(provider.clone());
                             // 继续尝试下一个供应商
                             continue;
                         }
@@ -330,7 +376,10 @@ impl RequestForwarder {
                                 provider.name,
                                 e
                             );
-                            return Err(e);
+                            return Err(ForwardError {
+                                error: e,
+                                provider: Some(provider.clone()),
+                            });
                         }
                     }
                 }
@@ -348,7 +397,10 @@ impl RequestForwarder {
                         (status.success_requests as f32 / status.total_requests as f32) * 100.0;
                 }
             }
-            return Err(ProxyError::NoAvailableProvider);
+            return Err(ForwardError {
+                error: ProxyError::NoAvailableProvider,
+                provider: None,
+            });
         }
 
         // 所有供应商都失败了
@@ -368,7 +420,10 @@ impl RequestForwarder {
             providers.len()
         );
 
-        Err(last_error.unwrap_or(ProxyError::MaxRetriesExceeded))
+        Err(ForwardError {
+            error: last_error.unwrap_or(ProxyError::MaxRetriesExceeded),
+            provider: last_provider,
+        })
     }
 
     /// 转发单个请求（使用适配器）
@@ -384,12 +439,19 @@ impl RequestForwarder {
         let base_url = adapter.extract_base_url(provider)?;
         log::info!("[{}] base_url: {}", adapter.name(), base_url);
 
-        // 使用适配器构建 URL
-        let url = adapter.build_url(&base_url, endpoint);
-
         // 检查是否需要格式转换
         let needs_transform = adapter.needs_transform(provider);
 
+        let effective_endpoint =
+            if needs_transform && adapter.name() == "Claude" && endpoint == "/v1/messages" {
+                "/v1/chat/completions"
+            } else {
+                endpoint
+            };
+
+        // 使用适配器构建 URL
+        let url = adapter.build_url(&base_url, effective_endpoint);
+
         // 记录原始请求 JSON
         log::info!(
             "[{}] ====== 请求开始 ======\n>>> 原始请求 JSON:\n{}",
@@ -397,10 +459,23 @@ impl RequestForwarder {
             serde_json::to_string_pretty(body).unwrap_or_else(|_| body.to_string())
         );
 
+        // 应用模型映射（独立于格式转换）
+        let (mapped_body, _original_model, mapped_model) =
+            super::model_mapper::apply_model_mapping(body.clone(), provider);
+
+        if let Some(ref mapped) = mapped_model {
+            log::info!(
+                "[{}] >>> 模型映射后的请求 JSON:\n{}",
+                adapter.name(),
+                serde_json::to_string_pretty(&mapped_body).unwrap_or_default()
+            );
+            log::info!("[{}] 模型已映射到: {}", adapter.name(), mapped);
+        }
+
         // 转换请求体（如果需要）
         let request_body = if needs_transform {
             log::info!("[{}] 转换请求格式 (Anthropic → OpenAI)", adapter.name());
-            let transformed = adapter.transform_request(body.clone(), provider)?;
+            let transformed = adapter.transform_request(mapped_body, provider)?;
             log::info!(
                 "[{}] >>> 转换后的请求 JSON:\n{}",
                 adapter.name(),
@@ -408,9 +483,31 @@ impl RequestForwarder {
             );
             transformed
         } else {
-            body.clone()
+            mapped_body
         };
 
+        // 过滤私有参数（以 `_` 开头的字段），防止内部信息泄露到上游
+        // 默认使用空白名单，过滤所有 _ 前缀字段
+        let filtered_body = filter_private_params_with_whitelist(request_body, &[]);
+
+        // ========== 请求体日志（截断显示） ==========
+        let body_str = serde_json::to_string_pretty(&filtered_body)
+            .unwrap_or_else(|_| filtered_body.to_string());
+        let body_preview = if body_str.len() > 2000 {
+            format!(
+                "{}...\n[截断，总长度: {} 字符]",
+                &body_str[..2000],
+                body_str.len()
+            )
+        } else {
+            body_str
+        };
+        log::info!(
+            "[{}] ====== 最终请求体 ======\n{}",
+            adapter.name(),
+            body_preview
+        );
+
         log::info!(
             "[{}] 转发请求: {} -> {}",
             adapter.name(),
@@ -421,28 +518,73 @@ impl RequestForwarder {
         // 构建请求
         let mut request = self.client.post(&url);
 
-        // 只透传必要的 Headers（白名单模式）
+        // ========== 详细 Headers 日志 ==========
-        let allowed_headers = [
+        log::info!("[{}] ====== 客户端原始 Headers ======", adapter.name());
-            "accept",
+        for (key, value) in headers {
-            "user-agent",
+            log::info!(
-            "x-request-id",
+                "[{}]   {}: {:?}",
-            "x-stainless-arch",
+                adapter.name(),
-            "x-stainless-lang",
+                key.as_str(),
-            "x-stainless-os",
+                value.to_str().unwrap_or("<binary>")
-            "x-stainless-package-version",
+            );
-            "x-stainless-runtime",
+        }
-            "x-stainless-runtime-version",
+
-        ];
+        // 过滤黑名单 Headers，保护隐私并避免冲突
+        let mut filtered_headers: Vec<String> = Vec::new();
+        let mut passed_headers: Vec<(String, String)> = Vec::new();
 
         for (key, value) in headers {
             let key_str = key.as_str().to_lowercase();
-            if allowed_headers.contains(&key_str.as_str()) {
+            if HEADER_BLACKLIST.contains(&key_str.as_str()) {
+                filtered_headers.push(key_str);
+                continue;
+            }
+            let value_str = value.to_str().unwrap_or("<binary>").to_string();
+            passed_headers.push((key.as_str().to_string(), value_str.clone()));
             request = request.header(key, value);
         }
+
+        if !filtered_headers.is_empty() {
+            log::info!(
+                "[{}] ====== 被过滤的 Headers ({}) ======",
+                adapter.name(),
+                filtered_headers.len()
+            );
+            for h in &filtered_headers {
+                log::info!("[{}]   - {}", adapter.name(), h);
+            }
         }
 
-        // 确保 Content-Type 是 json
+        // 处理 anthropic-beta Header（透传）
-        request = request.header("Content-Type", "application/json");
+        // 参考 Claude Code Hub 的实现，直接透传客户端的 beta 标记
+        if let Some(beta) = headers.get("anthropic-beta") {
+            if let Ok(beta_str) = beta.to_str() {
+                request = request.header("anthropic-beta", beta_str);
+                passed_headers.push(("anthropic-beta".to_string(), beta_str.to_string()));
+                log::info!("[{}] 透传 anthropic-beta: {}", adapter.name(), beta_str);
+            }
+        }
+
+        // 客户端 IP 透传（默认开启）
+        if let Some(xff) = headers.get("x-forwarded-for") {
+            if let Ok(xff_str) = xff.to_str() {
+                request = request.header("x-forwarded-for", xff_str);
+                passed_headers.push(("x-forwarded-for".to_string(), xff_str.to_string()));
+                log::debug!("[{}] 透传 x-forwarded-for: {}", adapter.name(), xff_str);
+            }
+        }
+        if let Some(real_ip) = headers.get("x-real-ip") {
+            if let Ok(real_ip_str) = real_ip.to_str() {
+                request = request.header("x-real-ip", real_ip_str);
+                passed_headers.push(("x-real-ip".to_string(), real_ip_str.to_string()));
+                log::debug!("[{}] 透传 x-real-ip: {}", adapter.name(), real_ip_str);
+            }
+        }
+
+        // 禁用压缩，避免 gzip 流式响应解析错误
+        // 参考 CCH: undici 在连接提前关闭时会对不完整的 gzip 流抛出错误
+        request = request.header("accept-encoding", "identity");
+        passed_headers.push(("accept-encoding".to_string(), "identity".to_string()));
 
         // 使用适配器添加认证头
         if let Some(auth) = adapter.extract_auth(provider) {
@@ -453,6 +595,15 @@ impl RequestForwarder {
                 auth.masked_key()
             );
             request = adapter.add_auth_headers(request, &auth);
+            // 记录认证头（脱敏）
+            passed_headers.push((
+                "authorization".to_string(),
+                format!("Bearer {}...", &auth.api_key[..8.min(auth.api_key.len())]),
+            ));
+            passed_headers.push((
+                "x-api-key".to_string(),
+                format!("{}...", &auth.api_key[..8.min(auth.api_key.len())]),
+            ));
         } else {
             log::error!(
                 "[{}] 未找到 API Key！Provider: {}",
@@ -461,9 +612,34 @@ impl RequestForwarder {
             );
         }
 
+        // anthropic-version 透传：优先使用客户端的版本号
+        // 参考 Claude Code Hub：透传客户端值而非固定版本
+        if let Some(version) = headers.get("anthropic-version") {
+            if let Ok(version_str) = version.to_str() {
+                // 覆盖适配器设置的默认版本
+                request = request.header("anthropic-version", version_str);
+                passed_headers.push(("anthropic-version".to_string(), version_str.to_string()));
+                log::info!(
+                    "[{}] 透传 anthropic-version: {}",
+                    adapter.name(),
+                    version_str
+                );
+            }
+        }
+
+        // ========== 最终发送的 Headers 日志 ==========
+        log::info!(
+            "[{}] ====== 最终发送的 Headers ({}) ======",
+            adapter.name(),
+            passed_headers.len()
+        );
+        for (k, v) in &passed_headers {
+            log::info!("[{}]   {}: {}", adapter.name(), k, v);
+        }
+
         // 发送请求
         log::info!("[{}] 发送请求到: {}", adapter.name(), url);
-        let response = request.json(&request_body).send().await.map_err(|e| {
+        let response = request.json(&filtered_body).send().await.map_err(|e| {
             log::error!("[{}] 请求失败: {}", adapter.name(), e);
             if e.is_timeout() {
                 ProxyError::Timeout(format!("请求超时: {e}"))
@@ -497,25 +673,6 @@ 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 {
             // 网络和上游错误：都应该尝试下一个供应商
@@ -531,7 +688,6 @@ impl RequestForwarder {
             ProxyError::TransformError(_) => ErrorCategory::Retryable,
             ProxyError::AuthError(_) => ErrorCategory::Retryable,
             ProxyError::StreamIdleTimeout(_) => ErrorCategory::Retryable,
-            ProxyError::MaxRetriesExceeded => ErrorCategory::Retryable,
             // 无可用供应商：所有供应商都试过了，无法重试
             ProxyError::NoAvailableProvider => ErrorCategory::NonRetryable,
             // 其他错误（数据库/内部错误等）：不是换供应商能解决的问题

src-tauri/src/proxy/handler_config.rs

@@ -31,13 +31,26 @@ pub struct UsageParserConfig {
 // 模型提取器实现
 // ============================================================================
 
-/// Claude 流式响应模型提取（直接使用请求模型）
+/// Claude 流式响应模型提取（优先使用 usage.model）
-fn claude_model_extractor(_events: &[Value], request_model: &str) -> String {
+fn claude_model_extractor(events: &[Value], request_model: &str) -> String {
+    // 首先尝试从解析的 usage 中获取模型
+    if let Some(usage) = TokenUsage::from_claude_stream_events(events) {
+        if let Some(model) = usage.model {
+            return model;
+        }
+    }
     request_model.to_string()
 }
 
-/// OpenAI Chat Completions 流式响应模型提取
+/// OpenAI Chat Completions 流式响应模型提取（优先使用 usage.model）
 fn openai_model_extractor(events: &[Value], request_model: &str) -> String {
+    // 首先尝试从解析的 usage 中获取模型
+    if let Some(usage) = TokenUsage::from_openai_stream_events(events) {
+        if let Some(model) = usage.model {
+            return model;
+        }
+    }
+    // 回退：从事件中直接提取
     events
         .iter()
         .find_map(|e| e.get("model")?.as_str())
@@ -45,8 +58,15 @@ fn openai_model_extractor(events: &[Value], request_model: &str) -> String {
         .to_string()
 }
 
-/// Codex Responses API 流式响应模型提取
+/// Codex 智能流式响应模型提取（自动检测格式）
-fn codex_model_extractor(events: &[Value], request_model: &str) -> String {
+fn codex_auto_model_extractor(events: &[Value], request_model: &str) -> String {
+    // 首先尝试从解析的 usage 中获取模型
+    if let Some(usage) = TokenUsage::from_codex_stream_events_auto(events) {
+        if let Some(model) = usage.model {
+            return model;
+        }
+    }
+    // 回退：从 response.completed 事件中提取
     events
         .iter()
         .find_map(|e| {
@@ -56,6 +76,10 @@ fn codex_model_extractor(events: &[Value], request_model: &str) -> String {
                 None
             }
         })
+        .or_else(|| {
+            // 再回退：从 OpenAI 格式事件中提取
+            events.iter().find_map(|e| e.get("model")?.as_str())
+        })
         .unwrap_or(request_model)
         .to_string()
 }
@@ -91,11 +115,11 @@ pub const OPENAI_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
     app_type_str: "codex",
 };
 
-/// Codex Responses API 解析配置（用于 /v1/responses）
+/// Codex 智能解析配置（自动检测 OpenAI 或 Codex 格式）
 pub const CODEX_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
-    stream_parser: TokenUsage::from_codex_stream_events,
+    stream_parser: TokenUsage::from_codex_stream_events_auto,
-    response_parser: TokenUsage::from_codex_response,
+    response_parser: TokenUsage::from_codex_response_auto,
-    model_extractor: codex_model_extractor,
+    model_extractor: codex_auto_model_extractor,
     app_type_str: "codex",
 };
 

src-tauri/src/proxy/handler_context.rs

@@ -5,28 +5,40 @@
 use crate::app_config::AppType;
 use crate::provider::Provider;
 use crate::proxy::{
-    forwarder::RequestForwarder, server::ProxyState, types::ProxyConfig, ProxyError,
+    extract_session_id, forwarder::RequestForwarder, server::ProxyState, types::AppProxyConfig,
+    ProxyError,
 };
+use axum::http::HeaderMap;
 use std::time::Instant;
 
+/// 流式超时配置
+#[derive(Debug, Clone, Copy)]
+pub struct StreamingTimeoutConfig {
+    /// 首字节超时（秒），0 表示禁用
+    pub first_byte_timeout: u64,
+    /// 静默期超时（秒），0 表示禁用
+    pub idle_timeout: u64,
+}
+
 /// 请求上下文
 ///
 /// 贯穿整个请求生命周期，包含：
 /// - 计时信息
-/// - 代理配置
+/// - 应用级代理配置（per-app）
 /// - 选中的 Provider 列表（用于故障转移）
 /// - 请求模型名称
 /// - 日志标签
+/// - Session ID（用于日志关联）
 pub struct RequestContext {
     /// 请求开始时间
     pub start_time: Instant,
-    /// 代理配置快照
+    /// 应用级代理配置（per-app，包含重试次数和超时配置）
-    pub config: ProxyConfig,
+    pub app_config: AppProxyConfig,
     /// 选中的 Provider（故障转移链的第一个）
     pub provider: Provider,
     /// 完整的 Provider 列表（用于故障转移）
     providers: Vec<Provider>,
-    /// 请求开始时的“当前供应商”（用于判断是否需要同步 UI/托盘）
+    /// 请求开始时的"当前供应商"（用于判断是否需要同步 UI/托盘）
     ///
     /// 这里使用本地 settings 的设备级 current provider。
     /// 代理模式下如果实际使用的 provider 与此不一致，会触发切换以确保 UI 始终准确。
@@ -40,6 +52,8 @@ pub struct RequestContext {
     /// 应用类型（预留，目前通过 app_type_str 使用）
     #[allow(dead_code)]
     pub app_type: AppType,
+    /// Session ID（从客户端请求提取或新生成）
+    pub session_id: String,
 }
 
 impl RequestContext {
@@ -48,6 +62,7 @@ impl RequestContext {
     /// # Arguments
     /// * `state` - 代理服务器状态
     /// * `body` - 请求体 JSON
+    /// * `headers` - 请求头（用于提取 Session ID）
     /// * `app_type` - 应用类型
     /// * `tag` - 日志标签
     /// * `app_type_str` - 应用类型字符串
@@ -57,12 +72,20 @@ impl RequestContext {
     pub async fn new(
         state: &ProxyState,
         body: &serde_json::Value,
+        headers: &HeaderMap,
         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();
+
+        // 从数据库读取应用级代理配置（per-app）
+        let app_config = state
+            .db
+            .get_proxy_config_for_app(app_type_str)
+            .await
+            .map_err(|e| ProxyError::DatabaseError(e.to_string()))?;
+
         let current_provider_id =
             crate::settings::get_current_provider(&app_type).unwrap_or_default();
 
@@ -73,13 +96,31 @@ impl RequestContext {
             .unwrap_or("unknown")
             .to_string();
 
+        // 提取 Session ID
+        let session_result = extract_session_id(headers, body, app_type_str);
+        let session_id = session_result.session_id.clone();
+
+        log::debug!(
+            "[{}] Session ID: {} (from {:?}, client_provided: {})",
+            tag,
+            session_id,
+            session_result.source,
+            session_result.client_provided
+        );
+
         // 使用共享的 ProviderRouter 选择 Provider（熔断器状态跨请求保持）
         // 注意：只在这里调用一次，结果传递给 forwarder，避免重复消耗 HalfOpen 名额
         let providers = state
             .provider_router
             .select_providers(app_type_str)
             .await
-            .map_err(|e| ProxyError::DatabaseError(e.to_string()))?;
+            .map_err(|e| match e {
+                crate::error::AppError::AllProvidersCircuitOpen => {
+                    ProxyError::AllProvidersCircuitOpen
+                }
+                crate::error::AppError::NoProvidersConfigured => ProxyError::NoProvidersConfigured,
+                _ => ProxyError::DatabaseError(e.to_string()),
+            })?;
 
         let provider = providers
             .first()
@@ -87,16 +128,17 @@ impl RequestContext {
             .ok_or(ProxyError::NoAvailableProvider)?;
 
         log::info!(
-            "[{}] Provider: {}, model: {}, failover chain: {} providers",
+            "[{}] Provider: {}, model: {}, failover chain: {} providers, session: {}",
             tag,
             provider.name,
             request_model,
-            providers.len()
+            providers.len(),
+            session_id
         );
 
         Ok(Self {
             start_time,
-            config,
+            app_config,
             provider,
             providers,
             current_provider_id,
@@ -104,6 +146,7 @@ impl RequestContext {
             tag,
             app_type_str,
             app_type,
+            session_id,
         })
     }
 
@@ -132,16 +175,38 @@ impl RequestContext {
     /// 创建 RequestForwarder
     ///
     /// 使用共享的 ProviderRouter，确保熔断器状态跨请求保持
+    ///
+    /// 配置生效规则：
+    /// - 故障转移开启：超时配置正常生效（0 表示禁用超时）
+    /// - 故障转移关闭：超时配置不生效（全部传入 0）
     pub fn create_forwarder(&self, state: &ProxyState) -> RequestForwarder {
+        let (non_streaming_timeout, first_byte_timeout, idle_timeout) =
+            if self.app_config.auto_failover_enabled {
+                // 故障转移开启：使用配置的值（0 = 禁用超时）
+                (
+                    self.app_config.non_streaming_timeout as u64,
+                    self.app_config.streaming_first_byte_timeout as u64,
+                    self.app_config.streaming_idle_timeout as u64,
+                )
+            } else {
+                // 故障转移关闭：不启用超时配置
+                log::info!(
+                    "[{}] Failover disabled, timeout configs are bypassed",
+                    self.tag
+                );
+                (0, 0, 0)
+            };
+
         RequestForwarder::new(
             state.provider_router.clone(),
-            self.config.request_timeout,
+            non_streaming_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(),
+            first_byte_timeout,
+            idle_timeout,
         )
     }
 
@@ -157,4 +222,26 @@ impl RequestContext {
     pub fn latency_ms(&self) -> u64 {
         self.start_time.elapsed().as_millis() as u64
     }
+
+    /// 获取流式超时配置
+    ///
+    /// 配置生效规则：
+    /// - 故障转移开启：返回配置的值（0 表示禁用超时检查）
+    /// - 故障转移关闭：返回 0（禁用超时检查）
+    #[inline]
+    pub fn streaming_timeout_config(&self) -> StreamingTimeoutConfig {
+        if self.app_config.auto_failover_enabled {
+            // 故障转移开启：使用配置的值（0 = 禁用超时）
+            StreamingTimeoutConfig {
+                first_byte_timeout: self.app_config.streaming_first_byte_timeout as u64,
+                idle_timeout: self.app_config.streaming_idle_timeout as u64,
+            }
+        } else {
+            // 故障转移关闭：禁用流式超时检查
+            StreamingTimeoutConfig {
+                first_byte_timeout: 0,
+                idle_timeout: 0,
+            }
+        }
+    }
 }

src-tauri/src/proxy/handlers.rs

@@ -5,7 +5,7 @@
 //! 重构后的结构：
 //! - 通用逻辑提取到 `handler_context` 和 `response_processor` 模块
 //! - 各 handler 只保留独特的业务逻辑
-//! - Claude 的格式转换逻辑保留在此文件（独有功能）
+//! - Claude 的格式转换逻辑保留在此文件（用于 OpenRouter 旧接口回退）
 
 use super::{
     error_mapper::{get_error_message, map_proxy_error_to_status},
@@ -54,34 +54,24 @@ pub async fn get_status(State(state): State<ProxyState>) -> Result<Json<ProxySta
 /// 处理 /v1/messages 请求（Claude API）
 ///
 /// Claude 处理器包含独特的格式转换逻辑：
-/// - 当使用 OpenRouter 等中转服务时，需要将 Anthropic 格式转换为 OpenAI 格式
+/// - 过去用于 OpenRouter 的 OpenAI Chat Completions 兼容接口（Anthropic ↔ OpenAI 转换）
-/// - 响应需要从 OpenAI 格式转回 Anthropic 格式
+/// - 现在 OpenRouter 已推出 Claude Code 兼容接口，默认不再启用该转换（逻辑保留以备回退）
 pub async fn handle_messages(
     State(state): State<ProxyState>,
     headers: axum::http::HeaderMap,
     Json(body): Json<Value>,
 ) -> Result<axum::response::Response, ProxyError> {
-    let ctx = RequestContext::new(&state, &body, AppType::Claude, "Claude", "claude").await?;
+    let mut ctx =
-
+        RequestContext::new(&state, &body, &headers, AppType::Claude, "Claude", "claude").await?;
-    // 检查是否需要格式转换（OpenRouter 等中转服务）
-    let adapter = get_adapter(&AppType::Claude);
-    let needs_transform = adapter.needs_transform(&ctx.provider);
 
     let is_stream = body
         .get("stream")
         .and_then(|s| s.as_bool())
         .unwrap_or(false);
 
-    log::info!(
-        "[Claude] Provider: {}, needs_transform: {}, is_stream: {}",
-        ctx.provider.name,
-        needs_transform,
-        is_stream
-    );
-
     // 转发请求
     let forwarder = ctx.create_forwarder(&state);
-    let response = match forwarder
+    let result = match forwarder
         .forward_with_retry(
             &AppType::Claude,
             "/v1/messages",
@@ -91,13 +81,30 @@ pub async fn handle_messages(
         )
         .await
     {
-        Ok(resp) => resp,
+        Ok(result) => result,
-        Err(e) => {
+        Err(mut err) => {
-            log_forward_error(&state, &ctx, is_stream, &e);
+            if let Some(provider) = err.provider.take() {
-            return Err(e);
+                ctx.provider = provider;
+            }
+            log_forward_error(&state, &ctx, is_stream, &err.error);
+            return Err(err.error);
         }
     };
 
+    ctx.provider = result.provider;
+    let response = result.response;
+
+    // 检查是否需要格式转换（OpenRouter 等中转服务）
+    let adapter = get_adapter(&AppType::Claude);
+    let needs_transform = adapter.needs_transform(&ctx.provider);
+
+    log::info!(
+        "[Claude] Provider: {}, needs_transform: {}, is_stream: {}",
+        ctx.provider.name,
+        needs_transform,
+        is_stream
+    );
+
     let status = response.status();
     log::info!("[Claude] 上游响应状态: {status}");
 
@@ -112,7 +119,7 @@ pub async fn handle_messages(
 
 /// Claude 格式转换处理（独有逻辑）
 ///
-/// 处理 OpenRouter 等需要格式转换的中转服务
+/// 处理 OpenRouter 旧 OpenAI 兼容接口的回退方案（当前默认不启用）
 async fn handle_claude_transform(
     response: reqwest::Response,
     ctx: &RequestContext,
@@ -164,10 +171,14 @@ async fn handle_claude_transform(
             })
         };
 
+        // 获取流式超时配置
+        let timeout_config = ctx.streaming_timeout_config();
+
         let logged_stream = create_logged_passthrough_stream(
             sse_stream,
             "Claude/OpenRouter",
             Some(usage_collector),
+            timeout_config,
         );
 
         let mut headers = axum::http::HeaderMap::new();
@@ -295,7 +306,8 @@ pub async fn handle_chat_completions(
 ) -> Result<axum::response::Response, ProxyError> {
     log::info!("[Codex] ====== /v1/chat/completions 请求开始 ======");
 
-    let ctx = RequestContext::new(&state, &body, AppType::Codex, "Codex", "codex").await?;
+    let mut ctx =
+        RequestContext::new(&state, &body, &headers, AppType::Codex, "Codex", "codex").await?;
 
     let is_stream = body
         .get("stream")
@@ -309,7 +321,7 @@ pub async fn handle_chat_completions(
     );
 
     let forwarder = ctx.create_forwarder(&state);
-    let response = match forwarder
+    let result = match forwarder
         .forward_with_retry(
             &AppType::Codex,
             "/v1/chat/completions",
@@ -319,13 +331,19 @@ pub async fn handle_chat_completions(
         )
         .await
     {
-        Ok(resp) => resp,
+        Ok(result) => result,
-        Err(e) => {
+        Err(mut err) => {
-            log_forward_error(&state, &ctx, is_stream, &e);
+            if let Some(provider) = err.provider.take() {
-            return Err(e);
+                ctx.provider = provider;
+            }
+            log_forward_error(&state, &ctx, is_stream, &err.error);
+            return Err(err.error);
         }
     };
 
+    ctx.provider = result.provider;
+    let response = result.response;
+
     log::info!("[Codex] 上游响应状态: {}", response.status());
 
     process_response(response, &ctx, &state, &OPENAI_PARSER_CONFIG).await
@@ -337,7 +355,8 @@ pub async fn handle_responses(
     headers: axum::http::HeaderMap,
     Json(body): Json<Value>,
 ) -> Result<axum::response::Response, ProxyError> {
-    let ctx = RequestContext::new(&state, &body, AppType::Codex, "Codex", "codex").await?;
+    let mut ctx =
+        RequestContext::new(&state, &body, &headers, AppType::Codex, "Codex", "codex").await?;
 
     let is_stream = body
         .get("stream")
@@ -345,7 +364,7 @@ pub async fn handle_responses(
         .unwrap_or(false);
 
     let forwarder = ctx.create_forwarder(&state);
-    let response = match forwarder
+    let result = match forwarder
         .forward_with_retry(
             &AppType::Codex,
             "/v1/responses",
@@ -355,13 +374,19 @@ pub async fn handle_responses(
         )
         .await
     {
-        Ok(resp) => resp,
+        Ok(result) => result,
-        Err(e) => {
+        Err(mut err) => {
-            log_forward_error(&state, &ctx, is_stream, &e);
+            if let Some(provider) = err.provider.take() {
-            return Err(e);
+                ctx.provider = provider;
+            }
+            log_forward_error(&state, &ctx, is_stream, &err.error);
+            return Err(err.error);
         }
     };
 
+    ctx.provider = result.provider;
+    let response = result.response;
+
     log::info!("[Codex] 上游响应状态: {}", response.status());
 
     process_response(response, &ctx, &state, &CODEX_PARSER_CONFIG).await
@@ -379,7 +404,7 @@ pub async fn handle_gemini(
     Json(body): Json<Value>,
 ) -> Result<axum::response::Response, ProxyError> {
     // Gemini 的模型名称在 URI 中
-    let ctx = RequestContext::new(&state, &body, AppType::Gemini, "Gemini", "gemini")
+    let mut ctx = RequestContext::new(&state, &body, &headers, AppType::Gemini, "Gemini", "gemini")
         .await?
         .with_model_from_uri(&uri);
 
@@ -397,7 +422,7 @@ pub async fn handle_gemini(
         .unwrap_or(false);
 
     let forwarder = ctx.create_forwarder(&state);
-    let response = match forwarder
+    let result = match forwarder
         .forward_with_retry(
             &AppType::Gemini,
             endpoint,
@@ -407,13 +432,19 @@ pub async fn handle_gemini(
         )
         .await
     {
-        Ok(resp) => resp,
+        Ok(result) => result,
-        Err(e) => {
+        Err(mut err) => {
-            log_forward_error(&state, &ctx, is_stream, &e);
+            if let Some(provider) = err.provider.take() {
-            return Err(e);
+                ctx.provider = provider;
+            }
+            log_forward_error(&state, &ctx, is_stream, &err.error);
+            return Err(err.error);
         }
     };
 
+    ctx.provider = result.provider;
+    let response = result.response;
+
     log::info!("[Gemini] 上游响应状态: {}", response.status());
 
     process_response(response, &ctx, &state, &GEMINI_PARSER_CONFIG).await
@@ -437,7 +468,7 @@ fn log_forward_error(
     let request_id = uuid::Uuid::new_v4().to_string();
 
     if let Err(e) = logger.log_error_with_context(
-        request_id.clone(),
+        request_id,
         ctx.provider.id.clone(),
         ctx.app_type_str.to_string(),
         ctx.request_model.clone(),
@@ -445,7 +476,7 @@ fn log_forward_error(
         error_message,
         ctx.latency_ms(),
         is_streaming,
-        Some(request_id),
+        Some(ctx.session_id.clone()),
         None,
     ) {
         log::warn!("记录失败请求日志失败: {e}");

src-tauri/src/proxy/mod.rs

@@ -2,6 +2,7 @@
 //!
 //! 提供本地HTTP代理服务，支持多Provider故障转移和请求透传
 
+pub mod body_filter;
 pub mod circuit_breaker;
 pub mod error;
 pub mod error_mapper;
@@ -11,6 +12,7 @@ pub mod handler_config;
 pub mod handler_context;
 mod handlers;
 mod health;
+pub mod model_mapper;
 pub mod provider_router;
 pub mod providers;
 pub mod response_handler;
@@ -32,7 +34,9 @@ pub use provider_router::ProviderRouter;
 #[allow(unused_imports)]
 pub use response_handler::{NonStreamHandler, ResponseType, StreamHandler};
 #[allow(unused_imports)]
-pub use session::{ClientFormat, ProxySession};
+pub use session::{
+    extract_session_id, ClientFormat, ProxySession, SessionIdResult, SessionIdSource,
+};
 #[allow(unused_imports)]
 pub use types::{ProxyConfig, ProxyServerInfo, ProxyStatus};
 

src-tauri/src/proxy/model_mapper.rs

@@ -0,0 +1,264 @@
+//! 模型映射模块
+//!
+//! 在请求转发前，根据 Provider 配置替换请求中的模型名称
+
+use crate::provider::Provider;
+use serde_json::Value;
+
+/// 模型映射配置
+pub struct ModelMapping {
+    pub haiku_model: Option<String>,
+    pub sonnet_model: Option<String>,
+    pub opus_model: Option<String>,
+    pub default_model: Option<String>,
+    pub reasoning_model: Option<String>,
+}
+
+impl ModelMapping {
+    /// 从 Provider 配置中提取模型映射
+    pub fn from_provider(provider: &Provider) -> Self {
+        let env = provider.settings_config.get("env");
+
+        Self {
+            haiku_model: env
+                .and_then(|e| e.get("ANTHROPIC_DEFAULT_HAIKU_MODEL"))
+                .and_then(|v| v.as_str())
+                .filter(|s| !s.is_empty())
+                .map(String::from),
+            sonnet_model: env
+                .and_then(|e| e.get("ANTHROPIC_DEFAULT_SONNET_MODEL"))
+                .and_then(|v| v.as_str())
+                .filter(|s| !s.is_empty())
+                .map(String::from),
+            opus_model: env
+                .and_then(|e| e.get("ANTHROPIC_DEFAULT_OPUS_MODEL"))
+                .and_then(|v| v.as_str())
+                .filter(|s| !s.is_empty())
+                .map(String::from),
+            default_model: env
+                .and_then(|e| e.get("ANTHROPIC_MODEL"))
+                .and_then(|v| v.as_str())
+                .filter(|s| !s.is_empty())
+                .map(String::from),
+            reasoning_model: env
+                .and_then(|e| e.get("ANTHROPIC_REASONING_MODEL"))
+                .and_then(|v| v.as_str())
+                .filter(|s| !s.is_empty())
+                .map(String::from),
+        }
+    }
+
+    /// 检查是否配置了任何模型映射
+    pub fn has_mapping(&self) -> bool {
+        self.haiku_model.is_some()
+            || self.sonnet_model.is_some()
+            || self.opus_model.is_some()
+            || self.default_model.is_some()
+    }
+
+    /// 根据原始模型名称获取映射后的模型
+    pub fn map_model(&self, original_model: &str, has_thinking: bool) -> String {
+        let model_lower = original_model.to_lowercase();
+
+        // 1. thinking 模式优先使用推理模型
+        if has_thinking {
+            if let Some(ref m) = self.reasoning_model {
+                return m.clone();
+            }
+        }
+
+        // 2. 按模型类型匹配
+        if model_lower.contains("haiku") {
+            if let Some(ref m) = self.haiku_model {
+                return m.clone();
+            }
+        }
+        if model_lower.contains("opus") {
+            if let Some(ref m) = self.opus_model {
+                return m.clone();
+            }
+        }
+        if model_lower.contains("sonnet") {
+            if let Some(ref m) = self.sonnet_model {
+                return m.clone();
+            }
+        }
+
+        // 3. 默认模型
+        if let Some(ref m) = self.default_model {
+            return m.clone();
+        }
+
+        // 4. 无映射，保持原样
+        original_model.to_string()
+    }
+}
+
+/// 检测请求是否启用了 thinking 模式
+pub fn has_thinking_enabled(body: &Value) -> bool {
+    body.get("thinking")
+        .and_then(|v| v.as_object())
+        .and_then(|o| o.get("type"))
+        .and_then(|t| t.as_str())
+        == Some("enabled")
+}
+
+/// 对请求体应用模型映射
+///
+/// 返回 (映射后的请求体, 原始模型名, 映射后模型名)
+pub fn apply_model_mapping(
+    mut body: Value,
+    provider: &Provider,
+) -> (Value, Option<String>, Option<String>) {
+    let mapping = ModelMapping::from_provider(provider);
+
+    // 如果没有配置映射，直接返回
+    if !mapping.has_mapping() {
+        let original = body.get("model").and_then(|m| m.as_str()).map(String::from);
+        return (body, original, None);
+    }
+
+    // 提取原始模型名
+    let original_model = body.get("model").and_then(|m| m.as_str()).map(String::from);
+
+    if let Some(ref original) = original_model {
+        let has_thinking = has_thinking_enabled(&body);
+        let mapped = mapping.map_model(original, has_thinking);
+
+        if mapped != *original {
+            log::info!("[ModelMapper] 模型映射: {original} → {mapped}");
+            body["model"] = serde_json::json!(mapped);
+            return (body, Some(original.clone()), Some(mapped));
+        }
+    }
+
+    (body, original_model, None)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    fn create_provider_with_mapping() -> Provider {
+        Provider {
+            id: "test".to_string(),
+            name: "Test".to_string(),
+            settings_config: json!({
+                "env": {
+                    "ANTHROPIC_MODEL": "default-model",
+                    "ANTHROPIC_DEFAULT_HAIKU_MODEL": "haiku-mapped",
+                    "ANTHROPIC_DEFAULT_SONNET_MODEL": "sonnet-mapped",
+                    "ANTHROPIC_DEFAULT_OPUS_MODEL": "opus-mapped",
+                    "ANTHROPIC_REASONING_MODEL": "reasoning-model"
+                }
+            }),
+            website_url: None,
+            category: None,
+            created_at: None,
+            sort_index: None,
+            notes: None,
+            meta: None,
+            icon: None,
+            icon_color: None,
+            in_failover_queue: false,
+        }
+    }
+
+    fn create_provider_without_mapping() -> Provider {
+        Provider {
+            id: "test".to_string(),
+            name: "Test".to_string(),
+            settings_config: json!({}),
+            website_url: None,
+            category: None,
+            created_at: None,
+            sort_index: None,
+            notes: None,
+            meta: None,
+            icon: None,
+            icon_color: None,
+            in_failover_queue: false,
+        }
+    }
+
+    #[test]
+    fn test_sonnet_mapping() {
+        let provider = create_provider_with_mapping();
+        let body = json!({"model": "claude-sonnet-4-5-20250929"});
+        let (result, original, mapped) = apply_model_mapping(body, &provider);
+        assert_eq!(result["model"], "sonnet-mapped");
+        assert_eq!(original, Some("claude-sonnet-4-5-20250929".to_string()));
+        assert_eq!(mapped, Some("sonnet-mapped".to_string()));
+    }
+
+    #[test]
+    fn test_haiku_mapping() {
+        let provider = create_provider_with_mapping();
+        let body = json!({"model": "claude-haiku-4-5"});
+        let (result, _, mapped) = apply_model_mapping(body, &provider);
+        assert_eq!(result["model"], "haiku-mapped");
+        assert_eq!(mapped, Some("haiku-mapped".to_string()));
+    }
+
+    #[test]
+    fn test_opus_mapping() {
+        let provider = create_provider_with_mapping();
+        let body = json!({"model": "claude-opus-4-5"});
+        let (result, _, mapped) = apply_model_mapping(body, &provider);
+        assert_eq!(result["model"], "opus-mapped");
+        assert_eq!(mapped, Some("opus-mapped".to_string()));
+    }
+
+    #[test]
+    fn test_thinking_mode() {
+        let provider = create_provider_with_mapping();
+        let body = json!({
+            "model": "claude-sonnet-4-5",
+            "thinking": {"type": "enabled"}
+        });
+        let (result, _, mapped) = apply_model_mapping(body, &provider);
+        assert_eq!(result["model"], "reasoning-model");
+        assert_eq!(mapped, Some("reasoning-model".to_string()));
+    }
+
+    #[test]
+    fn test_thinking_disabled() {
+        let provider = create_provider_with_mapping();
+        let body = json!({
+            "model": "claude-sonnet-4-5",
+            "thinking": {"type": "disabled"}
+        });
+        let (result, _, mapped) = apply_model_mapping(body, &provider);
+        assert_eq!(result["model"], "sonnet-mapped");
+        assert_eq!(mapped, Some("sonnet-mapped".to_string()));
+    }
+
+    #[test]
+    fn test_unknown_model_uses_default() {
+        let provider = create_provider_with_mapping();
+        let body = json!({"model": "some-unknown-model"});
+        let (result, _, mapped) = apply_model_mapping(body, &provider);
+        assert_eq!(result["model"], "default-model");
+        assert_eq!(mapped, Some("default-model".to_string()));
+    }
+
+    #[test]
+    fn test_no_mapping_configured() {
+        let provider = create_provider_without_mapping();
+        let body = json!({"model": "claude-sonnet-4-5"});
+        let (result, original, mapped) = apply_model_mapping(body, &provider);
+        assert_eq!(result["model"], "claude-sonnet-4-5");
+        assert_eq!(original, Some("claude-sonnet-4-5".to_string()));
+        assert!(mapped.is_none());
+    }
+
+    #[test]
+    fn test_case_insensitive() {
+        let provider = create_provider_with_mapping();
+        let body = json!({"model": "Claude-SONNET-4-5"});
+        let (result, _, mapped) = apply_model_mapping(body, &provider);
+        assert_eq!(result["model"], "sonnet-mapped");
+        assert_eq!(mapped, Some("sonnet-mapped".to_string()));
+    }
+}

src-tauri/src/proxy/provider_router.rs

@@ -30,84 +30,107 @@ impl ProviderRouter {
     /// 选择可用的供应商（支持故障转移）
     ///
     /// 返回按优先级排序的可用供应商列表：
-    /// 1. 当前供应商（is_current=true）始终第一位
+    /// - 故障转移关闭时：仅返回当前供应商
-    /// 2. 故障转移队列中的其他供应商（按 queue_order 排序）
+    /// - 故障转移开启时：完全按照故障转移队列顺序返回，忽略当前供应商设置
-    /// 3. 只返回熔断器未打开的供应商
     pub async fn select_providers(&self, app_type: &str) -> Result<Vec<Provider>, AppError> {
         let mut result = Vec::new();
-        let all_providers = self.db.get_all_providers(app_type)?;
+        let mut total_providers = 0usize;
+        let mut circuit_open_count = 0usize;
 
-        // 1. 当前供应商始终第一位
+        // 检查该应用的自动故障转移开关是否开启（从 proxy_config 表读取）
-        if let Some(current_id) = self.db.get_current_provider(app_type)? {
+        let auto_failover_enabled = match self.db.get_proxy_config_for_app(app_type).await {
-            if let Some(current) = all_providers.get(&current_id) {
+            Ok(config) => {
-                let circuit_key = format!("{}:{}", app_type, current.id);
+                let enabled = config.auto_failover_enabled;
+                log::info!("[{app_type}] Failover enabled from proxy_config: {enabled}");
+                enabled
+            }
+            Err(e) => {
+                log::error!(
+                    "[{app_type}] Failed to read proxy_config for auto_failover_enabled: {e}, defaulting to disabled"
+                );
+                false
+            }
+        };
+
+        if auto_failover_enabled {
+            // 故障转移开启：使用 in_failover_queue 标记的供应商，按 sort_index 排序
+            let failover_providers = self.db.get_failover_providers(app_type)?;
+            total_providers = failover_providers.len();
+            log::debug!("[{app_type}] Found {total_providers} failover queue provider(s)");
+            log::info!(
+                "[{app_type}] Failover enabled, using queue order ({total_providers} items)"
+            );
+
+            for provider in failover_providers {
+                // 检查熔断器状态
+                let circuit_key = format!("{}:{}", app_type, provider.id);
                 let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
+                let state = breaker.get_state().await;
 
                 if breaker.is_available().await {
+                    log::debug!(
+                        "[{}] Queue provider available: {} ({}) (state: {:?})",
+                        app_type,
+                        provider.name,
+                        provider.id,
+                        state
+                    );
                     log::info!(
-                        "[{}] Current provider available: {} ({})",
+                        "[{}] Queue provider available: {} ({}) at sort_index {:?}",
+                        app_type,
+                        provider.name,
+                        provider.id,
+                        provider.sort_index
+                    );
+                    result.push(provider);
+                } else {
+                    circuit_open_count += 1;
+                    log::debug!(
+                        "[{}] Queue provider {} circuit breaker open (state: {:?}), skipping",
+                        app_type,
+                        provider.name,
+                        state
+                    );
+                }
+            }
+        } else {
+            // 故障转移关闭：仅使用当前供应商，跳过熔断器检查
+            // 原因：单 Provider 场景下，熔断器打开会导致所有请求失败，用户体验差
+            log::info!("[{app_type}] Failover disabled, using current provider only (circuit breaker bypassed)");
+
+            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)? {
+                    log::info!(
+                        "[{}] Current provider: {} ({})",
                         app_type,
                         current.name,
                         current.id
                     );
-                    result.push(current.clone());
+                    total_providers = 1;
-                } else {
+                    result.push(current);
-                    log::warn!(
-                        "[{}] Current provider {} circuit breaker open, checking failover queue",
-                        app_type,
-                        current.name
-                    );
-                }
-            }
-        }
-
-        // 2. 获取故障转移队列中的供应商
-        let queue = self.db.get_failover_queue(app_type)?;
-
-        for item in queue {
-            // 跳过已添加的当前供应商
-            if result.iter().any(|p| p.id == item.provider_id) {
-                continue;
-            }
-
-            // 跳过禁用的队列项
-            if !item.enabled {
-                continue;
-            }
-
-            // 获取供应商信息
-            if let Some(provider) = all_providers.get(&item.provider_id) {
-                // 检查熔断器状态
-                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!(
-                        "[{}] Failover provider available: {} ({}) at queue position {}",
-                        app_type,
-                        provider.name,
-                        provider.id,
-                        item.queue_order
-                    );
-                    result.push(provider.clone());
                 } else {
                     log::debug!(
-                        "[{}] Failover provider {} circuit breaker open, skipping",
+                        "[{app_type}] Current provider id {current_id} not found in database"
-                        app_type,
-                        provider.name
                     );
                 }
+            } else {
+                log::debug!("[{app_type}] No current provider configured");
             }
         }
 
         if result.is_empty() {
-            return Err(AppError::Config(format!(
+            // 区分两种情况：全部熔断 vs 未配置供应商
-                "No available provider for {app_type} (all circuit breakers open or no providers configured)"
+            if total_providers > 0 && circuit_open_count == total_providers {
-            )));
+                log::warn!("[{app_type}] 所有 {total_providers} 个供应商均已熔断，无可用渠道");
+                return Err(AppError::AllProvidersCircuitOpen);
+            } else {
+                log::warn!("[{app_type}] 未配置供应商或故障转移队列为空");
+                return Err(AppError::NoProvidersConfigured);
+            }
         }
 
         log::info!(
-            "[{}] Failover chain: {} provider(s) available",
+            "[{}] Provider chain: {} provider(s) available",
             app_type,
             result.len()
         );
@@ -138,9 +161,16 @@ impl ProviderRouter {
         success: bool,
         error_msg: Option<String>,
     ) -> Result<(), AppError> {
-        // 1. 获取熔断器配置（用于更新健康状态和判断是否禁用）
+        // 1. 按应用独立获取熔断器配置（用于更新健康状态和判断是否禁用）
-        let config = self.db.get_circuit_breaker_config().await.ok();
+        let failure_threshold = match self.db.get_proxy_config_for_app(app_type).await {
-        let failure_threshold = config.map(|c| c.failure_threshold).unwrap_or(5);
+            Ok(app_config) => app_config.circuit_failure_threshold,
+            Err(e) => {
+                log::warn!(
+                    "Failed to load circuit config for {app_type}, using default threshold: {e}"
+                );
+                5 // 默认值
+            }
+        };
 
         // 2. 更新熔断器状态
         let circuit_key = format!("{app_type}:{provider_id}");
@@ -237,12 +267,34 @@ impl ProviderRouter {
             return breaker.clone();
         }
 
-        // 从数据库加载配置
+        // 从 key 中提取 app_type (格式: "app_type:provider_id")
-        let config = self
+        let app_type = key.split(':').next().unwrap_or("claude");
-            .db
+
-            .get_circuit_breaker_config()
+        // 按应用独立读取熔断器配置
-            .await
+        let config = match self.db.get_proxy_config_for_app(app_type).await {
-            .unwrap_or_default();
+            Ok(app_config) => {
+                log::debug!(
+                    "Loading circuit breaker config for {key} (app={app_type}): \
+                    failure_threshold={}, success_threshold={}, timeout={}s",
+                    app_config.circuit_failure_threshold,
+                    app_config.circuit_success_threshold,
+                    app_config.circuit_timeout_seconds
+                );
+                crate::proxy::circuit_breaker::CircuitBreakerConfig {
+                    failure_threshold: app_config.circuit_failure_threshold,
+                    success_threshold: app_config.circuit_success_threshold,
+                    timeout_seconds: app_config.circuit_timeout_seconds as u64,
+                    error_rate_threshold: app_config.circuit_error_rate_threshold,
+                    min_requests: app_config.circuit_min_requests,
+                }
+            }
+            Err(e) => {
+                log::warn!(
+                    "Failed to load circuit breaker config for {key} (app={app_type}): {e}, using default"
+                );
+                crate::proxy::circuit_breaker::CircuitBreakerConfig::default()
+            }
+        };
 
         log::debug!("Creating new circuit breaker for {key} with config: {config:?}");
 
@@ -264,25 +316,14 @@ mod tests {
         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 select_providers_does_not_consume_half_open_permit() {
+    async fn test_failover_disabled_uses_current_provider() {
         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 =
@@ -293,19 +334,84 @@ mod tests {
         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();
+
+        // 启用自动故障转移（使用新的 proxy_config API）
+        let mut config = db.get_proxy_config_for_app("claude").await.unwrap();
+        config.auto_failover_enabled = true;
+        db.update_proxy_config_for_app(config).await.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();
+
+        // 启用自动故障转移（使用新的 proxy_config API）
+        let mut config = db.get_proxy_config_for_app("claude").await.unwrap();
+        config.auto_failover_enabled = true;
+        db.update_proxy_config_for_app(config).await.unwrap();
+
         let router = ProviderRouter::new(db.clone());
 
-        // 让 B 进入 Open 状态（failure_threshold=1）
         router
             .record_result("b", "claude", false, 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.allowed);
     }
 }

src-tauri/src/proxy/providers/adapter.rs

@@ -87,7 +87,7 @@ pub trait ProviderAdapter: Send + Sync {
     /// 是否需要格式转换
     ///
     /// 默认返回 `false`（透传模式）。
-    /// 仅当供应商需要格式转换时（如 Claude + OpenRouter）才返回 `true`。
+    /// 仅当供应商需要格式转换时（如 Claude + OpenRouter 旧 OpenAI 兼容接口）才返回 `true`。
     ///
     /// # Arguments
     /// * `provider` - Provider 配置

src-tauri/src/proxy/providers/claude.rs

@@ -5,7 +5,7 @@
 //! ## 认证模式
 //! - **Claude**: Anthropic 官方 API (x-api-key + anthropic-version)
 //! - **ClaudeAuth**: 中转服务 (仅 Bearer 认证，无 x-api-key)
-//! - **OpenRouter**: 需要 Anthropic ↔ OpenAI 格式转换
+//! - **OpenRouter**: 已支持 Claude Code 兼容接口，默认透传（保留旧转换逻辑备用）
 
 use super::{AuthInfo, AuthStrategy, ProviderAdapter, ProviderType};
 use crate::provider::Provider;
@@ -28,11 +28,9 @@ impl ClaudeAdapter {
     /// - Claude: 默认 Anthropic 官方
     pub fn provider_type(&self, provider: &Provider) -> ProviderType {
         // 检测 OpenRouter
-        if let Ok(base_url) = self.extract_base_url(provider) {
+        if self.is_openrouter(provider) {
-            if base_url.contains("openrouter.ai") {
             return ProviderType::OpenRouter;
         }
-        }
 
         // 检测 ClaudeAuth (仅 Bearer 认证)
         if self.is_bearer_only_mode(provider) {
@@ -50,6 +48,24 @@ impl ClaudeAdapter {
         false
     }
 
+    /// 检测 OpenRouter 是否启用兼容模式
+    fn is_openrouter_compat_enabled(&self, provider: &Provider) -> bool {
+        if !self.is_openrouter(provider) {
+            return false;
+        }
+
+        let raw = provider.settings_config.get("openrouter_compat_mode");
+        match raw {
+            Some(serde_json::Value::Bool(enabled)) => *enabled,
+            Some(serde_json::Value::Number(num)) => num.as_i64().unwrap_or(0) != 0,
+            Some(serde_json::Value::String(value)) => {
+                let normalized = value.trim().to_lowercase();
+                normalized == "true" || normalized == "1"
+            }
+            _ => true,
+        }
+    }
+
     /// 检测是否为仅 Bearer 认证模式
     fn is_bearer_only_mode(&self, provider: &Provider) -> bool {
         // 检查 settings_config 中的 auth_mode
@@ -87,6 +103,14 @@ 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")
@@ -186,12 +210,13 @@ impl ProviderAdapter for ClaudeAdapter {
     }
 
     fn build_url(&self, base_url: &str, endpoint: &str) -> String {
-        // OpenRouter 使用 /v1/chat/completions
+        // NOTE:
-        if base_url.contains("openrouter.ai") {
+        // 过去 OpenRouter 只有 OpenAI Chat Completions 兼容接口，需要把 Claude 的 `/v1/messages`
-            return format!("{}/v1/chat/completions", base_url.trim_end_matches('/'));
+        // 映射到 `/v1/chat/completions`，并做 Anthropic ↔ OpenAI 的格式转换。
-        }
+        //
+        // 现在 OpenRouter 已推出 Claude Code 兼容接口，因此默认直接透传 endpoint。
+        // 如需回退旧逻辑，可在 forwarder 中根据 needs_transform 改写 endpoint。
 
-        // Anthropic 直连
         format!(
             "{}/{}",
             base_url.trim_end_matches('/'),
@@ -207,19 +232,24 @@ impl ProviderAdapter for ClaudeAdapter {
                 .header("x-api-key", &auth.api_key)
                 .header("anthropic-version", "2023-06-01"),
             // ClaudeAuth 中转服务: 仅 Bearer，无 x-api-key
-            AuthStrategy::ClaudeAuth => {
+            AuthStrategy::ClaudeAuth => request
-                request.header("Authorization", format!("Bearer {}", auth.api_key))
+                .header("Authorization", format!("Bearer {}", auth.api_key))
-            }
+                .header("anthropic-version", "2023-06-01"),
             // OpenRouter: Bearer
-            AuthStrategy::Bearer => {
+            AuthStrategy::Bearer => request
-                request.header("Authorization", format!("Bearer {}", auth.api_key))
+                .header("Authorization", format!("Bearer {}", auth.api_key))
-            }
+                .header("anthropic-version", "2023-06-01"),
             _ => request,
         }
     }
 
-    fn needs_transform(&self, provider: &Provider) -> bool {
+    fn needs_transform(&self, _provider: &Provider) -> bool {
-        self.is_openrouter(provider)
+        // NOTE:
+        // OpenRouter 已推出 Claude Code 兼容接口（可直接处理 `/v1/messages`），默认不再启用
+        // Anthropic ↔ OpenAI 的格式转换。
+        //
+        // 如果未来需要回退到旧的 OpenAI Chat Completions 方案，可恢复下面这行：
+        self.is_openrouter_compat_enabled(_provider)
     }
 
     fn transform_request(
@@ -253,6 +283,7 @@ mod tests {
             meta: None,
             icon: None,
             icon_color: None,
+            in_failover_queue: false,
         }
     }
 
@@ -284,6 +315,21 @@ 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();
@@ -378,7 +424,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/chat/completions");
+        assert_eq!(url, "https://openrouter.ai/api/v1/messages");
     }
 
     #[test]
@@ -398,5 +444,13 @@ mod tests {
             }
         }));
         assert!(adapter.needs_transform(&openrouter_provider));
+
+        let openrouter_disabled = create_provider(json!({
+            "env": {
+                "ANTHROPIC_BASE_URL": "https://openrouter.ai/api"
+            },
+            "openrouter_compat_mode": false
+        }));
+        assert!(!adapter.needs_transform(&openrouter_disabled));
     }
 }

src-tauri/src/proxy/providers/codex.rs

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

src-tauri/src/proxy/providers/gemini.rs

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

src-tauri/src/proxy/providers/mod.rs

@@ -48,17 +48,21 @@ pub enum ProviderType {
     Gemini,
     /// Google Gemini CLI (OAuth Bearer)
     GeminiCli,
-    /// OpenRouter (需要 Anthropic ↔ OpenAI 格式转换)
+    /// OpenRouter（已支持 Claude Code 兼容接口，默认透传；保留旧转换逻辑备用）
     OpenRouter,
 }
 
 impl ProviderType {
     /// 是否需要格式转换
     ///
-    /// OpenRouter 需要将 Anthropic 格式转换为 OpenAI 格式
+    /// 过去 OpenRouter 需要将 Anthropic 格式转换为 OpenAI 格式；
+    /// 现在默认关闭转换（因为 OpenRouter 已支持 Claude Code 兼容接口）。
     #[allow(dead_code)]
     pub fn needs_transform(&self) -> bool {
-        matches!(self, ProviderType::OpenRouter)
+        match self {
+            ProviderType::OpenRouter => false,
+            _ => false,
+        }
     }
 
     /// 获取默认端点
@@ -205,6 +209,7 @@ mod tests {
             meta: None,
             icon: None,
             icon_color: None,
+            in_failover_queue: false,
         }
     }
 
@@ -215,7 +220,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]

src-tauri/src/proxy/providers/transform.rs

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

src-tauri/src/proxy/response_processor.rs

@@ -3,8 +3,11 @@
 //! 统一处理流式和非流式 API 响应
 
 use super::{
-    handler_config::UsageParserConfig, handler_context::RequestContext, server::ProxyState,
+    handler_config::UsageParserConfig,
-    usage::parser::TokenUsage, ProxyError,
+    handler_context::{RequestContext, StreamingTimeoutConfig},
+    server::ProxyState,
+    usage::parser::TokenUsage,
+    ProxyError,
 };
 use axum::response::Response;
 use bytes::Bytes;
@@ -17,6 +20,7 @@ use std::{
         atomic::{AtomicBool, Ordering},
         Arc,
     },
+    time::Duration,
 };
 use tokio::sync::Mutex;
 
@@ -60,8 +64,12 @@ pub async fn handle_streaming(
     // 创建使用量收集器
     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 timeout_config = ctx.streaming_timeout_config();
+
+    // 创建带日志和超时的透传流
+    let logged_stream =
+        create_logged_passthrough_stream(stream, ctx.tag, Some(usage_collector), timeout_config);
 
     let body = axum::body::Body::from_stream(logged_stream);
     builder.body(body).unwrap()
@@ -93,13 +101,30 @@ pub async fn handle_non_streaming(
 
         // 解析使用量
         if let Some(usage) = (parser_config.response_parser)(&json_value) {
+            // 优先使用 usage 中解析出的模型名称，其次使用响应中的 model 字段，最后回退到请求模型
+            let model = if let Some(ref m) = usage.model {
+                m.clone()
+            } else if let Some(m) = json_value.get("model").and_then(|m| m.as_str()) {
+                m.to_string()
+            } else {
+                ctx.request_model.clone()
+            };
+
+            spawn_log_usage(state, ctx, usage, &model, status.as_u16(), false);
+        } else {
             let model = json_value
                 .get("model")
                 .and_then(|m| m.as_str())
-                .unwrap_or(&ctx.request_model);
+                .unwrap_or(&ctx.request_model)
-
+                .to_string();
-            spawn_log_usage(state, ctx, usage, model, status.as_u16(), false);
+            spawn_log_usage(
-        } else {
+                state,
+                ctx,
+                TokenUsage::default(),
+                &model,
+                status.as_u16(),
+                false,
+            );
             log::debug!(
                 "[{}] 未能解析 usage 信息，跳过记录",
                 parser_config.app_type_str
@@ -111,6 +136,14 @@ pub async fn handle_non_streaming(
             ctx.tag,
             body_bytes.len()
         );
+        spawn_log_usage(
+            state,
+            ctx,
+            TokenUsage::default(),
+            &ctx.request_model,
+            status.as_u16(),
+            false,
+        );
     }
 
     log::info!("[{}] ====== 请求结束 ======", ctx.tag);
@@ -231,6 +264,7 @@ fn create_usage_collector(
     let start_time = ctx.start_time;
     let stream_parser = parser_config.stream_parser;
     let model_extractor = parser_config.model_extractor;
+    let session_id = ctx.session_id.clone();
 
     SseUsageCollector::new(start_time, move |events, first_token_ms| {
         if let Some(usage) = stream_parser(&events) {
@@ -239,6 +273,7 @@ fn create_usage_collector(
 
             let state = state.clone();
             let provider_id = provider_id.clone();
+            let session_id = session_id.clone();
 
             tokio::spawn(async move {
                 log_usage_internal(
@@ -251,10 +286,32 @@ fn create_usage_collector(
                     first_token_ms,
                     true, // is_streaming
                     status_code,
+                    Some(session_id),
                 )
                 .await;
             });
         } else {
+            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();
+            let session_id = session_id.clone();
+
+            tokio::spawn(async move {
+                log_usage_internal(
+                    &state,
+                    &provider_id,
+                    app_type_str,
+                    &model,
+                    TokenUsage::default(),
+                    latency_ms,
+                    first_token_ms,
+                    true, // is_streaming
+                    status_code,
+                    Some(session_id),
+                )
+                .await;
+            });
             log::debug!("[{tag}] 流式响应缺少 usage 统计，跳过消费记录");
         }
     })
@@ -274,6 +331,7 @@ fn spawn_log_usage(
     let app_type_str = ctx.app_type_str.to_string();
     let model = model.to_string();
     let latency_ms = ctx.latency_ms();
+    let session_id = ctx.session_id.clone();
 
     tokio::spawn(async move {
         log_usage_internal(
@@ -286,6 +344,7 @@ fn spawn_log_usage(
             None,
             is_streaming,
             status_code,
+            Some(session_id),
         )
         .await;
     });
@@ -303,6 +362,7 @@ async fn log_usage_internal(
     first_token_ms: Option<u64>,
     is_streaming: bool,
     status_code: u16,
+    session_id: Option<String>,
 ) {
     use super::usage::logger::UsageLogger;
 
@@ -326,6 +386,15 @@ async fn log_usage_internal(
 
     let request_id = uuid::Uuid::new_v4().to_string();
 
+    log::debug!(
+        "[{app_type}] 记录请求日志: id={request_id}, provider={provider_id}, model={model}, streaming={is_streaming}, status={status_code}, latency_ms={latency_ms}, first_token_ms={first_token_ms:?}, session={}, input={}, output={}, cache_read={}, cache_creation={}",
+        session_id.as_deref().unwrap_or("none"),
+        usage.input_tokens,
+        usage.output_tokens,
+        usage.cache_read_tokens,
+        usage.cache_creation_tokens
+    );
+
     if let Err(e) = logger.log_with_calculation(
         request_id,
         provider_id.to_string(),
@@ -336,7 +405,7 @@ async fn log_usage_internal(
         latency_ms,
         first_token_ms,
         status_code,
-        None,
+        session_id,
         None, // provider_type
         is_streaming,
     ) {
@@ -344,21 +413,60 @@ async fn log_usage_internal(
     }
 }
 
-/// 创建带日志记录的透传流
+/// 创建带日志记录和超时控制的透传流
 pub fn create_logged_passthrough_stream(
     stream: impl Stream<Item = Result<Bytes, std::io::Error>> + Send + 'static,
     tag: &'static str,
     usage_collector: Option<SseUsageCollector>,
+    timeout_config: StreamingTimeoutConfig,
 ) -> impl Stream<Item = Result<Bytes, std::io::Error>> + Send {
     async_stream::stream! {
         let mut buffer = String::new();
         let mut collector = usage_collector;
+        let mut is_first_chunk = true;
+
+        // 超时配置
+        let first_byte_timeout = if timeout_config.first_byte_timeout > 0 {
+            Some(Duration::from_secs(timeout_config.first_byte_timeout))
+        } else {
+            None
+        };
+        let idle_timeout = if timeout_config.idle_timeout > 0 {
+            Some(Duration::from_secs(timeout_config.idle_timeout))
+        } else {
+            None
+        };
 
         tokio::pin!(stream);
 
-        while let Some(chunk) = stream.next().await {
+        loop {
-            match chunk {
+            // 选择超时时间：首字节超时或静默期超时
-                Ok(bytes) => {
+            let timeout_duration = if is_first_chunk {
+                first_byte_timeout
+            } else {
+                idle_timeout
+            };
+
+            let chunk_result = match timeout_duration {
+                Some(duration) => {
+                    match tokio::time::timeout(duration, stream.next()).await {
+                        Ok(Some(chunk)) => Some(chunk),
+                        Ok(None) => None, // 流结束
+                        Err(_) => {
+                            // 超时
+                            let timeout_type = if is_first_chunk { "首字节" } else { "静默期" };
+                            log::error!("[{tag}] 流式响应{}超时 ({}秒)", timeout_type, duration.as_secs());
+                            yield Err(std::io::Error::other(format!("流式响应{timeout_type}超时")));
+                            break;
+                        }
+                    }
+                }
+                None => stream.next().await, // 无超时限制
+            };
+
+            match chunk_result {
+                Some(Ok(bytes)) => {
+                    is_first_chunk = false;
                     let text = String::from_utf8_lossy(&bytes);
                     buffer.push_str(&text);
 
@@ -394,11 +502,15 @@ pub fn create_logged_passthrough_stream(
 
                     yield Ok(bytes);
                 }
-                Err(e) => {
+                Some(Err(e)) => {
                     log::error!("[{tag}] 流错误: {e}");
                     yield Err(std::io::Error::other(e.to_string()));
                     break;
                 }
+                None => {
+                    // 流正常结束
+                    break;
+                }
             }
         }
 

src-tauri/src/proxy/session.rs

@@ -1,7 +1,15 @@
 //! Proxy Session - 请求会话管理
 //!
 //! 为每个代理请求创建会话上下文，在整个请求生命周期中跟踪状态和元数据。
+//!
+//! ## Session ID 提取
+//!
+//! 支持从客户端请求中提取 Session ID，用于关联同一对话的多个请求：
+//! - Claude: 从 `metadata.user_id` (格式: `user_xxx_session_yyy`) 或 `metadata.session_id` 提取
+//! - Codex: 从 `previous_response_id` 或 headers 中的 `session_id` 提取
+//! - 其他: 生成新的 UUID
 
+use axum::http::HeaderMap;
 use std::time::Instant;
 use uuid::Uuid;
 
@@ -176,6 +184,179 @@ impl ProxySession {
     }
 }
 
+// ============================================================================
+// Session ID 提取器
+// ============================================================================
+
+/// Session ID 来源
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum SessionIdSource {
+    /// 从 metadata.user_id 提取 (Claude)
+    MetadataUserId,
+    /// 从 metadata.session_id 提取
+    MetadataSessionId,
+    /// 从 headers 提取 (Codex)
+    Header,
+    /// 从 previous_response_id 提取 (Codex)
+    PreviousResponseId,
+    /// 新生成
+    Generated,
+}
+
+/// Session ID 提取结果
+#[derive(Debug, Clone)]
+pub struct SessionIdResult {
+    /// 提取或生成的 Session ID
+    pub session_id: String,
+    /// Session ID 来源
+    pub source: SessionIdSource,
+    /// 是否为客户端提供的 ID（非新生成）
+    pub client_provided: bool,
+}
+
+/// 从请求中提取或生成 Session ID
+///
+/// 轻量化实现，仅提取 session_id 用于日志记录，不做复杂的 Session 管理。
+///
+/// ## 提取优先级
+///
+/// ### Claude 请求
+/// 1. `metadata.user_id` (格式: `user_xxx_session_yyy`) → 提取 `yyy` 部分
+/// 2. `metadata.session_id` → 直接使用
+/// 3. 生成新 UUID
+///
+/// ### Codex 请求
+/// 1. Headers: `session_id` 或 `x-session-id`
+/// 2. `metadata.session_id`
+/// 3. `previous_response_id` (对话延续)
+/// 4. 生成新 UUID
+///
+/// ## 示例
+///
+/// ```ignore
+/// let result = extract_session_id(&headers, &body, "claude");
+/// println!("Session ID: {} (from {:?})", result.session_id, result.source);
+/// ```
+pub fn extract_session_id(
+    headers: &HeaderMap,
+    body: &serde_json::Value,
+    client_format: &str,
+) -> SessionIdResult {
+    // Codex 请求特殊处理
+    if client_format == "codex" || client_format == "openai" {
+        if let Some(result) = extract_codex_session(headers, body) {
+            return result;
+        }
+    }
+
+    // Claude 请求：从 metadata 提取
+    if let Some(result) = extract_from_metadata(body) {
+        return result;
+    }
+
+    // 兜底：生成新 Session ID
+    generate_new_session_id()
+}
+
+/// 提取 Codex Session ID
+fn extract_codex_session(headers: &HeaderMap, body: &serde_json::Value) -> Option<SessionIdResult> {
+    // 1. 从 headers 提取
+    for header_name in &["session_id", "x-session-id"] {
+        if let Some(value) = headers.get(*header_name) {
+            if let Ok(session_id) = value.to_str() {
+                // Codex Session ID 通常较长（UUID 格式）
+                if session_id.len() > 20 {
+                    return Some(SessionIdResult {
+                        session_id: format!("codex_{session_id}"),
+                        source: SessionIdSource::Header,
+                        client_provided: true,
+                    });
+                }
+            }
+        }
+    }
+
+    // 2. 从 body.metadata.session_id 提取
+    if let Some(session_id) = body
+        .get("metadata")
+        .and_then(|m| m.get("session_id"))
+        .and_then(|v| v.as_str())
+    {
+        if session_id.len() > 10 {
+            return Some(SessionIdResult {
+                session_id: format!("codex_{session_id}"),
+                source: SessionIdSource::MetadataSessionId,
+                client_provided: true,
+            });
+        }
+    }
+
+    // 3. 从 previous_response_id 提取（对话延续）
+    if let Some(prev_id) = body.get("previous_response_id").and_then(|v| v.as_str()) {
+        if prev_id.len() > 10 {
+            return Some(SessionIdResult {
+                session_id: format!("codex_{prev_id}"),
+                source: SessionIdSource::PreviousResponseId,
+                client_provided: true,
+            });
+        }
+    }
+
+    None
+}
+
+/// 从 metadata 提取 Session ID (Claude)
+fn extract_from_metadata(body: &serde_json::Value) -> Option<SessionIdResult> {
+    let metadata = body.get("metadata")?;
+
+    // 1. 从 metadata.user_id 提取（格式: user_xxx_session_yyy）
+    if let Some(user_id) = metadata.get("user_id").and_then(|v| v.as_str()) {
+        if let Some(session_id) = parse_session_from_user_id(user_id) {
+            return Some(SessionIdResult {
+                session_id,
+                source: SessionIdSource::MetadataUserId,
+                client_provided: true,
+            });
+        }
+    }
+
+    // 2. 直接从 metadata.session_id 提取
+    if let Some(session_id) = metadata.get("session_id").and_then(|v| v.as_str()) {
+        if !session_id.is_empty() {
+            return Some(SessionIdResult {
+                session_id: session_id.to_string(),
+                source: SessionIdSource::MetadataSessionId,
+                client_provided: true,
+            });
+        }
+    }
+
+    None
+}
+
+/// 从 user_id 解析 session_id
+///
+/// 格式: `user_identifier_session_actual_session_id`
+fn parse_session_from_user_id(user_id: &str) -> Option<String> {
+    // 查找 "_session_" 分隔符
+    if let Some(pos) = user_id.find("_session_") {
+        let session_id = &user_id[pos + 9..]; // "_session_" 长度为 9
+        if !session_id.is_empty() {
+            return Some(session_id.to_string());
+        }
+    }
+    None
+}
+
+/// 生成新的 Session ID
+fn generate_new_session_id() -> SessionIdResult {
+    SessionIdResult {
+        session_id: Uuid::new_v4().to_string(),
+        source: SessionIdSource::Generated,
+        client_provided: false,
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -295,4 +476,92 @@ mod tests {
         assert_eq!(ClientFormat::GeminiCli.as_str(), "gemini_cli");
         assert_eq!(ClientFormat::Unknown.as_str(), "unknown");
     }
+
+    // ========== Session ID 提取测试 ==========
+
+    #[test]
+    fn test_extract_session_from_claude_metadata_user_id() {
+        let headers = HeaderMap::new();
+        let body = json!({
+            "model": "claude-3-5-sonnet",
+            "messages": [{"role": "user", "content": "Hello"}],
+            "metadata": {
+                "user_id": "user_john_doe_session_abc123def456"
+            }
+        });
+
+        let result = extract_session_id(&headers, &body, "claude");
+
+        assert_eq!(result.session_id, "abc123def456");
+        assert_eq!(result.source, SessionIdSource::MetadataUserId);
+        assert!(result.client_provided);
+    }
+
+    #[test]
+    fn test_extract_session_from_claude_metadata_session_id() {
+        let headers = HeaderMap::new();
+        let body = json!({
+            "model": "claude-3-5-sonnet",
+            "messages": [{"role": "user", "content": "Hello"}],
+            "metadata": {
+                "session_id": "my-session-123"
+            }
+        });
+
+        let result = extract_session_id(&headers, &body, "claude");
+
+        assert_eq!(result.session_id, "my-session-123");
+        assert_eq!(result.source, SessionIdSource::MetadataSessionId);
+        assert!(result.client_provided);
+    }
+
+    #[test]
+    fn test_extract_session_from_codex_previous_response_id() {
+        let headers = HeaderMap::new();
+        let body = json!({
+            "input": "Write a function",
+            "previous_response_id": "resp_abc123def456789"
+        });
+
+        let result = extract_session_id(&headers, &body, "codex");
+
+        assert_eq!(result.session_id, "codex_resp_abc123def456789");
+        assert_eq!(result.source, SessionIdSource::PreviousResponseId);
+        assert!(result.client_provided);
+    }
+
+    #[test]
+    fn test_extract_session_generates_new_when_not_found() {
+        let headers = HeaderMap::new();
+        let body = json!({
+            "model": "claude-3-5-sonnet",
+            "messages": [{"role": "user", "content": "Hello"}]
+        });
+
+        let result = extract_session_id(&headers, &body, "claude");
+
+        assert!(!result.session_id.is_empty());
+        assert_eq!(result.source, SessionIdSource::Generated);
+        assert!(!result.client_provided);
+    }
+
+    #[test]
+    fn test_parse_session_from_user_id() {
+        assert_eq!(
+            parse_session_from_user_id("user_john_session_abc123"),
+            Some("abc123".to_string())
+        );
+        assert_eq!(
+            parse_session_from_user_id("my_app_session_xyz789"),
+            Some("xyz789".to_string())
+        );
+        // 注意: "_session_" 是分隔符，所以下面的字符串会匹配
+        assert_eq!(
+            parse_session_from_user_id("no_session_marker"),
+            Some("marker".to_string())
+        );
+        // 没有 "_session_" 分隔符的情况
+        assert_eq!(parse_session_from_user_id("user_john_abc123"), None);
+        assert_eq!(parse_session_from_user_id("_session_"), None);
+    }
 }

src-tauri/src/proxy/types.rs

@@ -3,33 +3,54 @@ use serde::{Deserialize, Serialize};
 /// 代理服务器配置
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ProxyConfig {
-    /// 是否启用代理服务
-    pub enabled: bool,
     /// 监听地址
     pub listen_address: String,
     /// 监听端口
     pub listen_port: u16,
     /// 最大重试次数
     pub max_retries: u8,
-    /// 请求超时时间（秒）
+    /// 请求超时时间（秒）- 已废弃，保留兼容
     pub request_timeout: u64,
     /// 是否启用日志
     pub enable_logging: bool,
     /// 是否正在接管 Live 配置
     #[serde(default)]
     pub live_takeover_active: bool,
+    /// 流式首字超时（秒）- 等待首个数据块的最大时间
+    #[serde(default = "default_streaming_first_byte_timeout")]
+    pub streaming_first_byte_timeout: u64,
+    /// 流式静默超时（秒）- 两个数据块之间的最大间隔
+    #[serde(default = "default_streaming_idle_timeout")]
+    pub streaming_idle_timeout: u64,
+    /// 非流式总超时（秒）- 非流式请求的总超时时间
+    #[serde(default = "default_non_streaming_timeout")]
+    pub non_streaming_timeout: u64,
+}
+
+fn default_streaming_first_byte_timeout() -> u64 {
+    30
+}
+
+fn default_streaming_idle_timeout() -> u64 {
+    60
+}
+
+fn default_non_streaming_timeout() -> u64 {
+    600
 }
 
 impl Default for ProxyConfig {
     fn default() -> Self {
         Self {
-            enabled: false,
             listen_address: "127.0.0.1".to_string(),
             listen_port: 15721, // 使用较少占用的高位端口
             max_retries: 3,
             request_timeout: 300,
             enable_logging: true,
             live_takeover_active: false,
+            streaming_first_byte_timeout: 30,
+            streaming_idle_timeout: 60,
+            non_streaming_timeout: 600,
         }
     }
 }
@@ -126,3 +147,47 @@ pub struct LiveBackup {
     /// 备份时间
     pub backed_up_at: String,
 }
+
+/// 全局代理配置（统一字段，三行镜像）
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GlobalProxyConfig {
+    /// 代理总开关
+    pub proxy_enabled: bool,
+    /// 监听地址
+    pub listen_address: String,
+    /// 监听端口
+    pub listen_port: u16,
+    /// 是否启用日志
+    pub enable_logging: bool,
+}
+
+/// 应用级代理配置（每个 app 独立）
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AppProxyConfig {
+    /// 应用类型 (claude/codex/gemini)
+    pub app_type: String,
+    /// 该 app 代理启用开关
+    pub enabled: bool,
+    /// 该 app 自动故障转移开关
+    pub auto_failover_enabled: bool,
+    /// 最大重试次数
+    pub max_retries: u32,
+    /// 流式首字超时（秒）
+    pub streaming_first_byte_timeout: u32,
+    /// 流式静默超时（秒）
+    pub streaming_idle_timeout: u32,
+    /// 非流式总超时（秒）
+    pub non_streaming_timeout: u32,
+    /// 熔断失败阈值
+    pub circuit_failure_threshold: u32,
+    /// 熔断恢复阈值
+    pub circuit_success_threshold: u32,
+    /// 熔断恢复等待时间（秒）
+    pub circuit_timeout_seconds: u32,
+    /// 错误率阈值
+    pub circuit_error_rate_threshold: f64,
+    /// 计算错误率的最小请求数
+    pub circuit_min_requests: u32,
+}

src-tauri/src/proxy/usage/calculator.rs

@@ -35,6 +35,11 @@ impl CostCalculator {
     /// - `usage`: Token 使用量
     /// - `pricing`: 模型定价
     /// - `cost_multiplier`: 成本倍数 (provider 自定义)
+    ///
+    /// # 计算逻辑
+    /// - input_cost: (input_tokens - cache_read_tokens) × 输入价格
+    /// - cache_read_cost: cache_read_tokens × 缓存读取价格
+    /// - 这样避免缓存部分被重复计费
     pub fn calculate(
         usage: &TokenUsage,
         pricing: &ModelPricing,
@@ -42,7 +47,10 @@ impl CostCalculator {
     ) -> CostBreakdown {
         let million = Decimal::from(1_000_000);
 
-        let input_cost = Decimal::from(usage.input_tokens) * pricing.input_cost_per_million
+        // 计算实际需要按输入价格计费的 token 数（减去缓存命中部分）
+        let billable_input_tokens = usage.input_tokens.saturating_sub(usage.cache_read_tokens);
+
+        let input_cost = Decimal::from(billable_input_tokens) * pricing.input_cost_per_million
             / million
             * cost_multiplier;
         let output_cost = Decimal::from(usage.output_tokens) * pricing.output_cost_per_million
@@ -113,8 +121,8 @@ mod tests {
 
         let cost = CostCalculator::calculate(&usage, &pricing, multiplier);
 
-        // input: 1000 * 3.0 / 1M = 0.003
+        // input: (1000 - 200) * 3.0 / 1M = 0.0024 (只计算非缓存部分)
-        assert_eq!(cost.input_cost, Decimal::from_str("0.003").unwrap());
+        assert_eq!(cost.input_cost, Decimal::from_str("0.0024").unwrap());
         // output: 500 * 15.0 / 1M = 0.0075
         assert_eq!(cost.output_cost, Decimal::from_str("0.0075").unwrap());
         // cache_read: 200 * 0.3 / 1M = 0.00006
@@ -124,8 +132,8 @@ mod tests {
             cost.cache_creation_cost,
             Decimal::from_str("0.000375").unwrap()
         );
-        // total: 0.003 + 0.0075 + 0.00006 + 0.000375 = 0.010935
+        // total: 0.0024 + 0.0075 + 0.00006 + 0.000375 = 0.010335
-        assert_eq!(cost.total_cost, Decimal::from_str("0.010935").unwrap());
+        assert_eq!(cost.total_cost, Decimal::from_str("0.010335").unwrap());
     }
 
     #[test]

src-tauri/src/proxy/usage/parser.rs

@@ -34,6 +34,12 @@ impl TokenUsage {
     /// 从 Claude API 非流式响应解析
     pub fn from_claude_response(body: &Value) -> Option<Self> {
         let usage = body.get("usage")?;
+        // 提取响应中的模型名称
+        let model = body
+            .get("model")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string());
+
         Some(Self {
             input_tokens: usage.get("input_tokens")?.as_u64()? as u32,
             output_tokens: usage.get("output_tokens")?.as_u64()? as u32,
@@ -45,7 +51,7 @@ impl TokenUsage {
                 .get("cache_creation_input_tokens")
                 .and_then(|v| v.as_u64())
                 .unwrap_or(0) as u32,
-            model: None,
+            model,
         })
     }
 
@@ -53,11 +59,20 @@ impl TokenUsage {
     #[allow(dead_code)]
     pub fn from_claude_stream_events(events: &[Value]) -> Option<Self> {
         let mut usage = Self::default();
+        let mut model: Option<String> = None;
 
         for event in events {
             if let Some(event_type) = event.get("type").and_then(|v| v.as_str()) {
                 match event_type {
                     "message_start" => {
+                        // 从 message_start 提取模型名称
+                        if model.is_none() {
+                            if let Some(message) = event.get("message") {
+                                if let Some(m) = message.get("model").and_then(|v| v.as_str()) {
+                                    model = Some(m.to_string());
+                                }
+                            }
+                        }
                         if let Some(msg_usage) = event.get("message").and_then(|m| m.get("usage")) {
                             // 从 message_start 获取 input_tokens（原生 Claude API）
                             if let Some(input) =
@@ -102,6 +117,7 @@ impl TokenUsage {
         }
 
         if usage.input_tokens > 0 || usage.output_tokens > 0 {
+            usage.model = model;
             Some(usage)
         } else {
             None
@@ -141,18 +157,32 @@ impl TokenUsage {
             return None;
         }
 
+        // 提取响应中的模型名称
+        let model = body
+            .get("model")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string());
+
+        let cached_tokens = usage
+            .get("cache_read_input_tokens")
+            .and_then(|v| v.as_u64())
+            .or_else(|| {
+                usage
+                    .get("input_tokens_details")
+                    .and_then(|d| d.get("cached_tokens"))
+                    .and_then(|v| v.as_u64())
+            })
+            .unwrap_or(0) as u32;
+
         Some(Self {
             input_tokens: input_tokens? as u32,
             output_tokens: output_tokens? as u32,
-            cache_read_tokens: usage
+            cache_read_tokens: cached_tokens,
-                .get("cache_read_input_tokens")
-                .and_then(|v| v.as_u64())
-                .unwrap_or(0) as u32,
             cache_creation_tokens: usage
                 .get("cache_creation_input_tokens")
                 .and_then(|v| v.as_u64())
                 .unwrap_or(0) as u32,
-            model: None,
+            model,
         })
     }
 
@@ -166,16 +196,27 @@ impl TokenUsage {
         let input_tokens = usage.get("input_tokens")?.as_u64()? as u32;
         let output_tokens = usage.get("output_tokens")?.as_u64()? as u32;
 
-        // 获取 cached_tokens (可能在 input_tokens_details 中)
+        // 获取 cached_tokens (可能在 cache_read_input_tokens 或 input_tokens_details 中)
         let cached_tokens = usage
+            .get("cache_read_input_tokens")
+            .and_then(|v| v.as_u64())
+            .or_else(|| {
+                usage
                     .get("input_tokens_details")
                     .and_then(|d| d.get("cached_tokens"))
                     .and_then(|v| v.as_u64())
+            })
             .unwrap_or(0) as u32;
 
         // 调整 input_tokens: 减去 cached_tokens
         let adjusted_input = input_tokens.saturating_sub(cached_tokens);
 
+        // 提取响应中的模型名称
+        let model = body
+            .get("model")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string());
+
         Some(Self {
             input_tokens: adjusted_input,
             output_tokens,
@@ -184,7 +225,7 @@ impl TokenUsage {
                 .get("cache_creation_input_tokens")
                 .and_then(|v| v.as_u64())
                 .unwrap_or(0) as u32,
-            model: None,
+            model,
         })
     }
 
@@ -198,7 +239,7 @@ impl TokenUsage {
                 if event_type == "response.completed" {
                     if let Some(response) = event.get("response") {
                         log::debug!("[Codex] 找到 response.completed 事件，解析 usage");
-                        return Self::from_codex_response(response);
+                        return Self::from_codex_response_adjusted(response);
                     }
                 }
             }
@@ -207,6 +248,51 @@ impl TokenUsage {
         None
     }
 
+    /// 智能 Codex 响应解析 - 自动检测 OpenAI 或 Codex 格式
+    ///
+    /// Codex 支持两种 API 格式：
+    /// - `/v1/responses`: 使用 input_tokens/output_tokens
+    /// - `/v1/chat/completions`: 使用 prompt_tokens/completion_tokens (OpenAI 格式)
+    ///
+    /// 注意：记录原始 input_tokens，费用计算时再减去 cached_tokens
+    pub fn from_codex_response_auto(body: &Value) -> Option<Self> {
+        let usage = body.get("usage")?;
+
+        // 检测格式：OpenAI 使用 prompt_tokens，Codex 使用 input_tokens
+        if usage.get("prompt_tokens").is_some() {
+            log::debug!("[Codex] 检测到 OpenAI 格式 (prompt_tokens)");
+            Self::from_openai_response(body)
+        } else if usage.get("input_tokens").is_some() {
+            log::debug!("[Codex] 检测到 Codex 格式 (input_tokens)");
+            // 使用非调整版本，记录原始 input_tokens
+            Self::from_codex_response(body)
+        } else {
+            log::debug!("[Codex] 无法识别响应格式，usage: {usage:?}");
+            None
+        }
+    }
+
+    /// 智能 Codex 流式响应解析 - 自动检测 OpenAI 或 Codex 格式
+    pub fn from_codex_stream_events_auto(events: &[Value]) -> Option<Self> {
+        log::debug!("[Codex] 智能解析流式事件，共 {} 个事件", events.len());
+
+        // 先尝试 Codex Responses API 格式 (response.completed 事件)
+        for event in events {
+            if let Some(event_type) = event.get("type").and_then(|v| v.as_str()) {
+                if event_type == "response.completed" {
+                    if let Some(response) = event.get("response") {
+                        log::debug!("[Codex] 找到 response.completed 事件");
+                        return Self::from_codex_response_auto(response);
+                    }
+                }
+            }
+        }
+
+        // 回退到 OpenAI Chat Completions 格式 (最后一个 chunk 包含 usage)
+        log::debug!("[Codex] 尝试 OpenAI 流式格式");
+        Self::from_openai_stream_events(events)
+    }
+
     /// 从 OpenAI Chat Completions API 响应解析 (prompt_tokens, completion_tokens)
     pub fn from_openai_response(body: &Value) -> Option<Self> {
         let usage = body.get("usage")?;
@@ -222,12 +308,18 @@ impl TokenUsage {
             .and_then(|v| v.as_u64())
             .unwrap_or(0) as u32;
 
+        // 提取响应中的模型名称
+        let model = body
+            .get("model")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string());
+
         Some(Self {
             input_tokens: prompt_tokens as u32,
             output_tokens: completion_tokens as u32,
             cache_read_tokens: cached_tokens,
             cache_creation_tokens: 0,
-            model: None,
+            model,
         })
     }
 
@@ -256,9 +348,16 @@ impl TokenUsage {
             .and_then(|v| v.as_str())
             .map(|s| s.to_string());
 
+        let prompt_tokens = usage.get("promptTokenCount")?.as_u64()? as u32;
+        let total_tokens = usage.get("totalTokenCount")?.as_u64()? as u32;
+
+        // 输出 tokens = 总 tokens - 输入 tokens
+        // 这包含了 candidatesTokenCount + thoughtsTokenCount
+        let output_tokens = total_tokens.saturating_sub(prompt_tokens);
+
         Some(Self {
-            input_tokens: usage.get("promptTokenCount")?.as_u64()? as u32,
+            input_tokens: prompt_tokens,
-            output_tokens: usage.get("candidatesTokenCount")?.as_u64()? as u32,
+            output_tokens,
             cache_read_tokens: usage
                 .get("cachedContentTokenCount")
                 .and_then(|v| v.as_u64())
@@ -272,20 +371,25 @@ impl TokenUsage {
     #[allow(dead_code)]
     pub fn from_gemini_stream_chunks(chunks: &[Value]) -> Option<Self> {
         let mut total_input = 0u32;
-        let mut total_output = 0u32;
+        let mut total_tokens = 0u32;
         let mut total_cache_read = 0u32;
         let mut model: Option<String> = None;
 
         for chunk in chunks {
             if let Some(usage) = chunk.get("usageMetadata") {
+                // 输入 tokens (通常在所有 chunk 中保持不变)
                 total_input = usage
                     .get("promptTokenCount")
                     .and_then(|v| v.as_u64())
                     .unwrap_or(0) as u32;
-                total_output += usage
+
-                    .get("candidatesTokenCount")
+                // 总 tokens (包含输入 + 输出 + 思考)
+                total_tokens = usage
+                    .get("totalTokenCount")
                     .and_then(|v| v.as_u64())
                     .unwrap_or(0) as u32;
+
+                // 缓存读取 tokens
                 total_cache_read = usage
                     .get("cachedContentTokenCount")
                     .and_then(|v| v.as_u64())
@@ -300,6 +404,9 @@ impl TokenUsage {
             }
         }
 
+        // 输出 tokens = 总 tokens - 输入 tokens
+        let total_output = total_tokens.saturating_sub(total_input);
+
         if total_input > 0 || total_output > 0 {
             Some(Self {
                 input_tokens: total_input,
@@ -322,6 +429,7 @@ mod tests {
     #[test]
     fn test_claude_response_parsing() {
         let response = json!({
+            "model": "claude-sonnet-4-20250514",
             "usage": {
                 "input_tokens": 100,
                 "output_tokens": 50,
@@ -335,10 +443,60 @@ mod tests {
         assert_eq!(usage.output_tokens, 50);
         assert_eq!(usage.cache_read_tokens, 20);
         assert_eq!(usage.cache_creation_tokens, 10);
+        assert_eq!(usage.model, Some("claude-sonnet-4-20250514".to_string()));
+    }
+
+    #[test]
+    fn test_claude_response_parsing_no_model() {
+        let response = json!({
+            "usage": {
+                "input_tokens": 100,
+                "output_tokens": 50,
+                "cache_read_input_tokens": 20,
+                "cache_creation_input_tokens": 10
+            }
+        });
+
+        let usage = TokenUsage::from_claude_response(&response).unwrap();
+        assert_eq!(usage.input_tokens, 100);
+        assert_eq!(usage.output_tokens, 50);
+        assert_eq!(usage.cache_read_tokens, 20);
+        assert_eq!(usage.cache_creation_tokens, 10);
+        assert_eq!(usage.model, None);
     }
 
     #[test]
     fn test_claude_stream_parsing() {
+        let events = vec![
+            json!({
+                "type": "message_start",
+                "message": {
+                    "model": "claude-sonnet-4-20250514",
+                    "usage": {
+                        "input_tokens": 100,
+                        "cache_read_input_tokens": 20,
+                        "cache_creation_input_tokens": 10
+                    }
+                }
+            }),
+            json!({
+                "type": "message_delta",
+                "usage": {
+                    "output_tokens": 50
+                }
+            }),
+        ];
+
+        let usage = TokenUsage::from_claude_stream_events(&events).unwrap();
+        assert_eq!(usage.input_tokens, 100);
+        assert_eq!(usage.output_tokens, 50);
+        assert_eq!(usage.cache_read_tokens, 20);
+        assert_eq!(usage.cache_creation_tokens, 10);
+        assert_eq!(usage.model, Some("claude-sonnet-4-20250514".to_string()));
+    }
+
+    #[test]
+    fn test_claude_stream_parsing_no_model() {
         let events = vec![
             json!({
                 "type": "message_start",
@@ -363,6 +521,7 @@ mod tests {
         assert_eq!(usage.output_tokens, 50);
         assert_eq!(usage.cache_read_tokens, 20);
         assert_eq!(usage.cache_creation_tokens, 10);
+        assert_eq!(usage.model, None);
     }
 
     #[test]
@@ -386,15 +545,18 @@ mod tests {
         let response = json!({
             "modelVersion": "gemini-3-pro-high",
             "usageMetadata": {
-                "promptTokenCount": 100,
+                "promptTokenCount": 8383,
                 "candidatesTokenCount": 50,
+                "thoughtsTokenCount": 114,
+                "totalTokenCount": 8547,
                 "cachedContentTokenCount": 20
             }
         });
 
         let usage = TokenUsage::from_gemini_response(&response).unwrap();
-        assert_eq!(usage.input_tokens, 100);
+        assert_eq!(usage.input_tokens, 8383);
-        assert_eq!(usage.output_tokens, 50);
+        // output_tokens = totalTokenCount - promptTokenCount = 8547 - 8383 = 164
+        assert_eq!(usage.output_tokens, 164);
         assert_eq!(usage.cache_read_tokens, 20);
         assert_eq!(usage.cache_creation_tokens, 0);
         assert_eq!(usage.model, Some("gemini-3-pro-high".to_string()));
@@ -406,19 +568,78 @@ mod tests {
         let response = json!({
             "usageMetadata": {
                 "promptTokenCount": 100,
-                "candidatesTokenCount": 50,
+                "totalTokenCount": 150,
                 "cachedContentTokenCount": 20
             }
         });
 
         let usage = TokenUsage::from_gemini_response(&response).unwrap();
         assert_eq!(usage.input_tokens, 100);
+        // output_tokens = totalTokenCount - promptTokenCount = 150 - 100 = 50
         assert_eq!(usage.output_tokens, 50);
         assert_eq!(usage.cache_read_tokens, 20);
         assert_eq!(usage.cache_creation_tokens, 0);
         assert_eq!(usage.model, None);
     }
 
+    #[test]
+    fn test_gemini_response_with_thoughts() {
+        // 测试包含 thoughtsTokenCount 的实际响应
+        // 这是用户报告的真实场景
+        let response = json!({
+            "candidates": [
+                {
+                    "content": {
+                        "parts": [
+                            {
+                                "text": "",
+                                "thoughtSignature": "EvcECvQE..."
+                            }
+                        ],
+                        "role": "model"
+                    },
+                    "finishReason": "STOP"
+                }
+            ],
+            "modelVersion": "gemini-3-pro-high",
+            "responseId": "yupTafqLDu-PjMcPhrOx4QQ",
+            "usageMetadata": {
+                "candidatesTokenCount": 50,
+                "promptTokenCount": 8383,
+                "thoughtsTokenCount": 114,
+                "totalTokenCount": 8547
+            }
+        });
+
+        let usage = TokenUsage::from_gemini_response(&response).unwrap();
+        assert_eq!(usage.input_tokens, 8383);
+        // output_tokens = totalTokenCount - promptTokenCount
+        // = 8547 - 8383 = 164 (包含 candidatesTokenCount 50 + thoughtsTokenCount 114)
+        assert_eq!(usage.output_tokens, 164);
+        assert_eq!(usage.cache_read_tokens, 0);
+        assert_eq!(usage.cache_creation_tokens, 0);
+        assert_eq!(usage.model, Some("gemini-3-pro-high".to_string()));
+    }
+
+    #[test]
+    fn test_codex_response_parsing_cached_tokens_in_details() {
+        let response = json!({
+            "usage": {
+                "input_tokens": 1000,
+                "output_tokens": 500,
+                "input_tokens_details": {
+                    "cached_tokens": 300
+                }
+            }
+        });
+
+        let usage = TokenUsage::from_codex_response(&response).unwrap();
+        // 非调整模式：input_tokens 保持原值，但应记录缓存命中
+        assert_eq!(usage.input_tokens, 1000);
+        assert_eq!(usage.output_tokens, 500);
+        assert_eq!(usage.cache_read_tokens, 300);
+    }
+
     #[test]
     fn test_codex_response_adjusted() {
         let response = json!({
@@ -454,6 +675,22 @@ mod tests {
         assert_eq!(usage.cache_read_tokens, 0);
     }
 
+    #[test]
+    fn test_codex_response_adjusted_cache_read_input_tokens() {
+        let response = json!({
+            "usage": {
+                "input_tokens": 1000,
+                "output_tokens": 500,
+                "cache_read_input_tokens": 200
+            }
+        });
+
+        let usage = TokenUsage::from_codex_response_adjusted(&response).unwrap();
+        assert_eq!(usage.input_tokens, 800);
+        assert_eq!(usage.output_tokens, 500);
+        assert_eq!(usage.cache_read_tokens, 200);
+    }
+
     #[test]
     fn test_codex_response_adjusted_saturating_sub() {
         // 测试 cached_tokens > input_tokens 的边界情况
@@ -481,6 +718,7 @@ mod tests {
             json!({
                 "type": "message_start",
                 "message": {
+                    "model": "claude-sonnet-4-20250514",
                     "usage": {
                         "input_tokens": 0,
                         "output_tokens": 0
@@ -502,6 +740,7 @@ mod tests {
         let usage = TokenUsage::from_claude_stream_events(&events).unwrap();
         assert_eq!(usage.input_tokens, 150);
         assert_eq!(usage.output_tokens, 75);
+        assert_eq!(usage.model, Some("claude-sonnet-4-20250514".to_string()));
     }
 
     #[test]
@@ -512,6 +751,7 @@ mod tests {
             json!({
                 "type": "message_start",
                 "message": {
+                    "model": "claude-sonnet-4-20250514",
                     "usage": {
                         "input_tokens": 200,
                         "cache_read_input_tokens": 50
@@ -530,5 +770,112 @@ mod tests {
         assert_eq!(usage.input_tokens, 200);
         assert_eq!(usage.output_tokens, 100);
         assert_eq!(usage.cache_read_tokens, 50);
+        assert_eq!(usage.model, Some("claude-sonnet-4-20250514".to_string()));
+    }
+
+    // ============================================================================
+    // 智能 Codex 解析测试
+    // ============================================================================
+
+    #[test]
+    fn test_codex_response_auto_openai_format() {
+        // OpenAI 格式 (prompt_tokens/completion_tokens)
+        let response = json!({
+            "model": "gpt-4o",
+            "usage": {
+                "prompt_tokens": 1000,
+                "completion_tokens": 500,
+                "prompt_tokens_details": {
+                    "cached_tokens": 200
+                }
+            }
+        });
+
+        let usage = TokenUsage::from_codex_response_auto(&response).unwrap();
+        assert_eq!(usage.input_tokens, 1000);
+        assert_eq!(usage.output_tokens, 500);
+        assert_eq!(usage.cache_read_tokens, 200);
+        assert_eq!(usage.model, Some("gpt-4o".to_string()));
+    }
+
+    #[test]
+    fn test_codex_response_auto_codex_format() {
+        // Codex 格式 (input_tokens/output_tokens)
+        let response = json!({
+            "model": "o3",
+            "usage": {
+                "input_tokens": 1000,
+                "output_tokens": 500,
+                "input_tokens_details": {
+                    "cached_tokens": 300
+                }
+            }
+        });
+
+        let usage = TokenUsage::from_codex_response_auto(&response).unwrap();
+        // 记录原始 input_tokens，不调整
+        assert_eq!(usage.input_tokens, 1000);
+        assert_eq!(usage.output_tokens, 500);
+        assert_eq!(usage.cache_read_tokens, 300);
+        assert_eq!(usage.model, Some("o3".to_string()));
+    }
+
+    #[test]
+    fn test_codex_stream_events_auto_codex_format() {
+        // Codex Responses API 流式格式 (response.completed 事件)
+        let events = vec![
+            json!({
+                "type": "response.created",
+                "response": {
+                    "id": "resp_123"
+                }
+            }),
+            json!({
+                "type": "response.completed",
+                "response": {
+                    "model": "o3",
+                    "usage": {
+                        "input_tokens": 1000,
+                        "output_tokens": 500,
+                        "input_tokens_details": {
+                            "cached_tokens": 200
+                        }
+                    }
+                }
+            }),
+        ];
+
+        let usage = TokenUsage::from_codex_stream_events_auto(&events).unwrap();
+        // 记录原始 input_tokens，不调整
+        assert_eq!(usage.input_tokens, 1000);
+        assert_eq!(usage.output_tokens, 500);
+        assert_eq!(usage.cache_read_tokens, 200);
+        assert_eq!(usage.model, Some("o3".to_string()));
+    }
+
+    #[test]
+    fn test_codex_stream_events_auto_openai_format() {
+        // OpenAI Chat Completions 流式格式 (最后一个 chunk 包含 usage)
+        let events = vec![
+            json!({
+                "id": "chatcmpl-123",
+                "model": "gpt-4o",
+                "choices": [{"delta": {"content": "Hello"}}]
+            }),
+            json!({
+                "id": "chatcmpl-123",
+                "model": "gpt-4o",
+                "choices": [{"delta": {}}],
+                "usage": {
+                    "prompt_tokens": 100,
+                    "completion_tokens": 50
+                }
+            }),
+        ];
+
+        let usage = TokenUsage::from_codex_stream_events_auto(&events).unwrap();
+        assert_eq!(usage.input_tokens, 100);
+        assert_eq!(usage.output_tokens, 50);
+        assert_eq!(usage.model, Some("gpt-4o".to_string()));
     }
 }

src-tauri/src/services/config.rs

@@ -146,7 +146,9 @@ impl ConfigService {
         let cfg_text = settings.get("config").and_then(Value::as_str);
 
         crate::codex_config::write_codex_live_atomic(auth, cfg_text)?;
-        crate::mcp::sync_enabled_to_codex(config)?;
+        // 注意：MCP 同步在 v3.7.0 中已通过 McpService 进行，不再在此调用
+        // sync_enabled_to_codex 使用旧的 config.mcp.codex 结构，在新架构中为空
+        // MCP 的启用/禁用应通过 McpService::toggle_app 进行
 
         let cfg_text_after = crate::codex_config::read_and_validate_codex_config_text()?;
         if let Some(manager) = config.get_manager_mut(&AppType::Codex) {

src-tauri/src/services/provider/mod.rs

@@ -217,9 +217,12 @@ impl ProviderService {
                 .flatten()
                 .is_some();
         let is_proxy_running = futures::executor::block_on(state.proxy_service.is_running());
+        let live_taken_over = state
+            .proxy_service
+            .detect_takeover_in_live_config_for_app(&app_type);
 
         // 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;
+        let should_hot_switch = (is_app_taken_over || live_taken_over) && is_proxy_running;
 
         if should_hot_switch {
             // Proxy takeover mode: hot-switch only, don't write Live config
@@ -690,3 +693,140 @@ pub struct ProviderSortUpdate {
     #[serde(rename = "sortIndex")]
     pub sort_index: usize,
 }
+
+// ============================================================================
+// 统一供应商（Universal Provider）服务方法
+// ============================================================================
+
+use crate::provider::UniversalProvider;
+use std::collections::HashMap;
+
+impl ProviderService {
+    /// 获取所有统一供应商
+    pub fn list_universal(
+        state: &AppState,
+    ) -> Result<HashMap<String, UniversalProvider>, AppError> {
+        state.db.get_all_universal_providers()
+    }
+
+    /// 获取单个统一供应商
+    pub fn get_universal(
+        state: &AppState,
+        id: &str,
+    ) -> Result<Option<UniversalProvider>, AppError> {
+        state.db.get_universal_provider(id)
+    }
+
+    /// 添加或更新统一供应商（不自动同步，需手动调用 sync_universal_to_apps）
+    pub fn upsert_universal(
+        state: &AppState,
+        provider: UniversalProvider,
+    ) -> Result<bool, AppError> {
+        // 保存统一供应商
+        state.db.save_universal_provider(&provider)?;
+
+        Ok(true)
+    }
+
+    /// 删除统一供应商
+    pub fn delete_universal(state: &AppState, id: &str) -> Result<bool, AppError> {
+        // 获取统一供应商（用于删除生成的子供应商）
+        let provider = state.db.get_universal_provider(id)?;
+
+        // 删除统一供应商
+        state.db.delete_universal_provider(id)?;
+
+        // 删除生成的子供应商
+        if let Some(p) = provider {
+            if p.apps.claude {
+                let claude_id = format!("universal-claude-{id}");
+                let _ = state.db.delete_provider("claude", &claude_id);
+            }
+            if p.apps.codex {
+                let codex_id = format!("universal-codex-{id}");
+                let _ = state.db.delete_provider("codex", &codex_id);
+            }
+            if p.apps.gemini {
+                let gemini_id = format!("universal-gemini-{id}");
+                let _ = state.db.delete_provider("gemini", &gemini_id);
+            }
+        }
+
+        Ok(true)
+    }
+
+    /// 同步统一供应商到各应用
+    pub fn sync_universal_to_apps(state: &AppState, id: &str) -> Result<bool, AppError> {
+        let provider = state
+            .db
+            .get_universal_provider(id)?
+            .ok_or_else(|| AppError::Message(format!("统一供应商 {id} 不存在")))?;
+
+        // 同步到 Claude
+        if let Some(mut claude_provider) = provider.to_claude_provider() {
+            // 合并已有配置
+            if let Some(existing) = state.db.get_provider_by_id(&claude_provider.id, "claude")? {
+                let mut merged = existing.settings_config.clone();
+                Self::merge_json(&mut merged, &claude_provider.settings_config);
+                claude_provider.settings_config = merged;
+            }
+            state.db.save_provider("claude", &claude_provider)?;
+        } else {
+            // 如果禁用了 Claude，删除对应的子供应商
+            let claude_id = format!("universal-claude-{id}");
+            let _ = state.db.delete_provider("claude", &claude_id);
+        }
+
+        // 同步到 Codex
+        if let Some(mut codex_provider) = provider.to_codex_provider() {
+            // 合并已有配置
+            if let Some(existing) = state.db.get_provider_by_id(&codex_provider.id, "codex")? {
+                let mut merged = existing.settings_config.clone();
+                Self::merge_json(&mut merged, &codex_provider.settings_config);
+                codex_provider.settings_config = merged;
+            }
+            state.db.save_provider("codex", &codex_provider)?;
+        } else {
+            let codex_id = format!("universal-codex-{id}");
+            let _ = state.db.delete_provider("codex", &codex_id);
+        }
+
+        // 同步到 Gemini
+        if let Some(mut gemini_provider) = provider.to_gemini_provider() {
+            // 合并已有配置
+            if let Some(existing) = state.db.get_provider_by_id(&gemini_provider.id, "gemini")? {
+                let mut merged = existing.settings_config.clone();
+                Self::merge_json(&mut merged, &gemini_provider.settings_config);
+                gemini_provider.settings_config = merged;
+            }
+            state.db.save_provider("gemini", &gemini_provider)?;
+        } else {
+            let gemini_id = format!("universal-gemini-{id}");
+            let _ = state.db.delete_provider("gemini", &gemini_id);
+        }
+
+        Ok(true)
+    }
+
+    /// 递归合并 JSON：base 为底，patch 覆盖同名字段
+    fn merge_json(base: &mut serde_json::Value, patch: &serde_json::Value) {
+        use serde_json::Value;
+
+        match (base, patch) {
+            (Value::Object(base_map), Value::Object(patch_map)) => {
+                for (k, v_patch) in patch_map {
+                    match base_map.get_mut(k) {
+                        Some(v_base) => Self::merge_json(v_base, v_patch),
+                        None => {
+                            base_map.insert(k.clone(), v_patch.clone());
+                        }
+                    }
+                }
+            }
+            // 其它类型：直接覆盖
+            (base_val, patch_val) => {
+                *base_val = patch_val.clone();
+            }
+        }
+    }
+}

src-tauri/src/services/proxy.rs

@@ -8,6 +8,7 @@ use crate::database::Database;
 use crate::provider::Provider;
 use crate::proxy::server::ProxyServer;
 use crate::proxy::types::*;
+use crate::services::provider::write_live_snapshot;
 use serde_json::{json, Value};
 use std::str::FromStr;
 use std::sync::Arc;
@@ -41,31 +42,31 @@ impl ProxyService {
     }
 
     /// 启动代理服务器
-    ///
+    pub async fn start(&self) -> Result<ProxyServerInfo, String> {
-    /// - `persist_enabled = true`：将 `proxy_config.enabled` 持久化为启用（用于“总开关”）
+        // 1. 启动时自动设置 proxy_enabled = true
-    /// - `persist_enabled = false`：仅在当前进程启动代理服务（用于“按 App 接管”自动启动）
+        let mut global_config = self
-    pub async fn start(&self, persist_enabled: bool) -> Result<ProxyServerInfo, String> {
+            .db
-        // 1. 获取配置
+            .get_global_proxy_config()
-        let mut config = self
+            .await
+            .map_err(|e| format!("获取全局代理配置失败: {e}"))?;
+
+        if !global_config.proxy_enabled {
+            global_config.proxy_enabled = true;
+            self.db
+                .update_global_proxy_config(global_config.clone())
+                .await
+                .map_err(|e| format!("更新代理总开关失败: {e}"))?;
+        }
+
+        // 2. 获取配置
+        let config = self
             .db
             .get_proxy_config()
             .await
             .map_err(|e| format!("获取代理配置失败: {e}"))?;
 
-        // 2. 仅在需要时持久化 enabled（避免“按 App 接管”自动启动时误打开总开关）
-        if persist_enabled {
-            config.enabled = true;
-        }
-
         // 3. 若已在运行：确保持久化状态（如需要）并返回当前信息
         if let Some(server) = self.server.read().await.as_ref() {
-            if persist_enabled {
-                self.db
-                    .update_proxy_config(config)
-                    .await
-                    .map_err(|e| format!("保存代理配置失败: {e}"))?;
-            }
-
             let status = server.get_status().await;
             return Ok(ProxyServerInfo {
                 address: status.address,
@@ -86,14 +87,6 @@ impl ProxyService {
         // 5. 保存服务器实例
         *self.server.write().await = Some(server);
 
-        // 6. 持久化 enabled 状态（仅总开关）
-        if persist_enabled {
-            self.db
-                .update_proxy_config(config)
-                .await
-                .map_err(|e| format!("保存代理配置失败: {e}"))?;
-        }
-
         log::info!("代理服务器已启动: {}:{}", info.address, info.port);
         Ok(info)
     }
@@ -138,7 +131,7 @@ impl ProxyService {
         }
 
         // 5. 启动代理服务器
-        match self.start(true).await {
+        match self.start().await {
             Ok(info) => Ok(info),
             Err(e) => {
                 // 启动失败，恢复原始配置
@@ -159,57 +152,73 @@ impl ProxyService {
 
     /// 获取各应用的接管状态（是否改写该应用的 Live 配置指向本地代理）
     pub async fn get_takeover_status(&self) -> Result<ProxyTakeoverStatus, String> {
-        let claude = self
+        // 从 proxy_config.enabled 读取（优先），兼容旧的 live_backup 备份检测
+        let claude_enabled = self
             .db
-            .get_live_backup("claude")
+            .get_proxy_config_for_app("claude")
             .await
-            .map_err(|e| format!("获取 Claude 接管状态失败: {e}"))?
+            .map(|c| c.enabled)
-            .is_some();
+            .unwrap_or(false);
-        let codex = self
+        let codex_enabled = self
             .db
-            .get_live_backup("codex")
+            .get_proxy_config_for_app("codex")
             .await
-            .map_err(|e| format!("获取 Codex 接管状态失败: {e}"))?
+            .map(|c| c.enabled)
-            .is_some();
+            .unwrap_or(false);
-        let gemini = self
+        let gemini_enabled = self
             .db
-            .get_live_backup("gemini")
+            .get_proxy_config_for_app("gemini")
             .await
-            .map_err(|e| format!("获取 Gemini 接管状态失败: {e}"))?
+            .map(|c| c.enabled)
-            .is_some();
+            .unwrap_or(false);
 
         Ok(ProxyTakeoverStatus {
-            claude,
+            claude: claude_enabled,
-            codex,
+            codex: codex_enabled,
-            gemini,
+            gemini: gemini_enabled,
         })
     }
 
     /// 为指定应用开启/关闭 Live 接管
     ///
-    /// - 开启：自动启动代理服务（不影响总开关持久化），仅接管当前 app 的 Live 配置
+    /// - 开启：自动启动代理服务，仅接管当前 app 的 Live 配置
-    /// - 关闭：仅恢复当前 app 的 Live 配置；若总开关未开启且无其它接管，则自动停止代理服务
+    /// - 关闭：仅恢复当前 app 的 Live 配置；若无其它接管，则自动停止代理服务
     pub async fn set_takeover_for_app(&self, app_type: &str, enabled: bool) -> Result<(), String> {
         let app = AppType::from_str(app_type).map_err(|e| format!("无效的应用类型: {e}"))?;
         let app_type_str = app.as_str();
 
         if enabled {
-            // 1) 代理服务未运行则自动启动（不持久化总开关）
+            // 1) 代理服务未运行则自动启动
             if !self.is_running().await {
-                self.start(false).await?;
+                self.start().await?;
             }
 
-            // 2) 已接管则直接返回（幂等）
+            // 2) 已接管则直接返回（幂等）；但如果缺少备份或占位符残留，需要重建接管
-            if self
+            let current_config = self
                 .db
-                .get_live_backup(app_type_str)
+                .get_proxy_config_for_app(app_type_str)
                 .await
-                .map_err(|e| format!("检查 {app_type_str} Live 备份失败: {e}"))?
+                .map_err(|e| format!("获取 {app_type_str} 配置失败: {e}"))?;
-                .is_some()
+
-            {
+            if current_config.enabled {
+                let has_backup = match self.db.get_live_backup(app_type_str).await {
+                    Ok(v) => v.is_some(),
+                    Err(e) => {
+                        log::warn!("读取 {app_type_str} 备份失败（将继续重建接管）: {e}");
+                        false
+                    }
+                };
+                let live_taken_over = self.detect_takeover_in_live_config_for_app(&app);
+
+                if has_backup || live_taken_over {
                     return Ok(());
                 }
 
+                log::warn!(
+                    "{app_type_str} 标记为已接管，但缺少备份或占位符，正在重新接管并补齐备份"
+                );
+            }
+
             // 3) 备份 Live 配置（严格：目标 app 不存在则报错）
             self.backup_live_config_strict(&app).await?;
 
@@ -222,25 +231,46 @@ impl ProxyService {
             // 5) 写入接管配置（仅当前 app）
             if let Err(e) = self.takeover_live_config_strict(&app).await {
                 log::error!("{app_type_str} 接管 Live 配置失败，尝试恢复: {e}");
-                let _ = self.restore_live_config_for_app(&app).await;
+                match self.restore_live_config_for_app(&app).await {
+                    Ok(()) => {
+                        // 恢复成功才清理备份，避免失败场景下丢失唯一可回滚来源
                         let _ = self.db.delete_live_backup(app_type_str).await;
+                    }
+                    Err(restore_err) => {
+                        log::error!(
+                            "{app_type_str} 恢复 Live 配置失败，将保留备份以便下次启动恢复: {restore_err}"
+                        );
+                    }
+                }
                 return Err(e);
             }
 
-            // 6) 兼容旧逻辑：写入 any-of 标志（失败不影响功能）
+            // 6) 设置 proxy_config.enabled = true
+            let mut updated_config = self
+                .db
+                .get_proxy_config_for_app(app_type_str)
+                .await
+                .map_err(|e| format!("获取 {app_type_str} 配置失败: {e}"))?;
+            updated_config.enabled = true;
+            self.db
+                .update_proxy_config_for_app(updated_config)
+                .await
+                .map_err(|e| format!("设置 {app_type_str} enabled 状态失败: {e}"))?;
+
+            // 7) 兼容旧逻辑：写入 any-of 标志（失败不影响功能）
             let _ = self.db.set_live_takeover_active(true).await;
             return Ok(());
         }
 
-        // 关闭接管：无备份则视为未接管（幂等）
+        // 关闭接管：检查 enabled 状态
-        let has_backup = self
+        let current_config = self
             .db
-            .get_live_backup(app_type_str)
+            .get_proxy_config_for_app(app_type_str)
             .await
-            .map_err(|e| format!("检查 {app_type_str} Live 备份失败: {e}"))?
+            .map_err(|e| format!("获取 {app_type_str} 配置失败: {e}"))?;
-            .is_some();
+
-        if !has_backup {
+        if !current_config.enabled {
-            return Ok(());
+            return Ok(()); // 未接管，幂等返回
         }
 
         // 1) 恢复 Live 配置
@@ -252,22 +282,36 @@ impl ProxyService {
             .await
             .map_err(|e| format!("删除 {app_type_str} Live 备份失败: {e}"))?;
 
-        // 3) 若无其它接管，更新旧标志，并在总开关未开启时停止代理服务
+        // 3) 设置 proxy_config.enabled = false
-        let has_any_backup = self
+        let mut updated_config = self
             .db
-            .has_any_live_backup()
+            .get_proxy_config_for_app(app_type_str)
             .await
-            .map_err(|e| format!("检查 Live 备份失败: {e}"))?;
+            .map_err(|e| format!("获取 {app_type_str} 配置失败: {e}"))?;
-        if !has_any_backup {
+        updated_config.enabled = false;
+        self.db
+            .update_proxy_config_for_app(updated_config)
+            .await
+            .map_err(|e| format!("清除 {app_type_str} enabled 状态失败: {e}"))?;
+
+        // 4) 清除该应用的健康状态（关闭代理时重置队列状态）
+        self.db
+            .clear_provider_health_for_app(app_type_str)
+            .await
+            .map_err(|e| format!("清除 {app_type_str} 健康状态失败: {e}"))?;
+
+        // 5) 若无其它接管，更新旧标志，并停止代理服务
+        // 检查是否还有其它 app 的 enabled = true
+        let any_enabled = self
+            .db
+            .is_live_takeover_active()
+            .await
+            .map_err(|e| format!("检查接管状态失败: {e}"))?;
+
+        if !any_enabled {
             let _ = self.db.set_live_takeover_active(false).await;
 
-            let master_enabled = self
+            if self.is_running().await {
-                .db
-                .get_proxy_config()
-                .await
-                .map_err(|e| format!("获取代理配置失败: {e}"))?
-                .enabled;
-            if !master_enabled && self.is_running().await {
                 // 此时没有任何 app 处于接管状态，停止服务即可
                 let _ = self.stop().await;
             }
@@ -331,34 +375,35 @@ impl ProxyService {
 
                                 match env_obj {
                                     Some(obj) => {
-                                        obj.insert(token_key.to_string(), json!(token));
-                                        // ANTHROPIC_AUTH_TOKEN 与 ANTHROPIC_API_KEY 视为同义字段，保持一致
                                         if token_key == "ANTHROPIC_AUTH_TOKEN"
                                             || token_key == "ANTHROPIC_API_KEY"
                                         {
+                                            let mut updated = false;
+                                            if obj.contains_key("ANTHROPIC_AUTH_TOKEN") {
                                                 obj.insert(
                                                     "ANTHROPIC_AUTH_TOKEN".to_string(),
                                                     json!(token),
                                                 );
+                                                updated = true;
+                                            }
+                                            if obj.contains_key("ANTHROPIC_API_KEY") {
                                                 obj.insert(
                                                     "ANTHROPIC_API_KEY".to_string(),
                                                     json!(token),
                                                 );
+                                                updated = true;
+                                            }
+                                            if !updated {
+                                                obj.insert(token_key.to_string(), json!(token));
+                                            }
+                                        } else {
+                                            obj.insert(token_key.to_string(), json!(token));
                                         }
                                     }
                                     None => {
                                         // 至少写入一份可用的 Token
-                                        provider.settings_config["env"] = json!({
+                                        provider.settings_config["env"] =
-                                            token_key: token
+                                            json!({ token_key: token });
-                                        });
-                                        if token_key == "ANTHROPIC_AUTH_TOKEN"
-                                            || token_key == "ANTHROPIC_API_KEY"
-                                        {
-                                            provider.settings_config["env"]
-                                                ["ANTHROPIC_AUTH_TOKEN"] = json!(token);
-                                            provider.settings_config["env"]["ANTHROPIC_API_KEY"] =
-                                                json!(token);
-                                        }
                                     }
                                 }
 
@@ -495,10 +540,18 @@ impl ProxyService {
                 .await
                 .map_err(|e| format!("停止代理服务器失败: {e}"))?;
 
-            // 将 enabled 设为 false，避免下次启动时自动开启
+            // 停止时设置 proxy_enabled = false
-            if let Ok(mut config) = self.db.get_proxy_config().await {
+            let mut global_config = self
-                config.enabled = false;
+                .db
-                let _ = self.db.update_proxy_config(config).await;
+                .get_global_proxy_config()
+                .await
+                .map_err(|e| format!("获取全局代理配置失败: {e}"))?;
+
+            if global_config.proxy_enabled {
+                global_config.proxy_enabled = false;
+                if let Err(e) = self.db.update_global_proxy_config(global_config).await {
+                    log::warn!("更新代理总开关失败: {e}");
+                }
             }
 
             log::info!("代理服务器已停止");
@@ -508,47 +561,88 @@ impl ProxyService {
         }
     }
 
-    /// 停止代理服务器（恢复 Live 配置）
+    /// 停止代理服务器（恢复 Live 配置，用户手动关闭时使用）
+    ///
+    /// 会清除 settings 表中的代理状态，下次启动不会自动恢复。
     pub async fn stop_with_restore(&self) -> Result<(), String> {
         // 1. 停止代理服务器（即使未运行也继续执行恢复逻辑）
         if let Err(e) = self.stop().await {
             log::warn!("停止代理服务器失败（将继续恢复 Live 配置）: {e}");
-
-            // stop() 只有在 server 实例存在时才会把 enabled 设为 false；
-            // 这里兜底确保“总开关关闭”能落盘关闭状态。
-            if let Ok(mut config) = self.db.get_proxy_config().await {
-                if config.enabled {
-                    config.enabled = false;
-                    let _ = self.db.update_proxy_config(config).await;
-                }
-            }
         }
 
         // 2. 恢复原始 Live 配置
         self.restore_live_configs().await?;
 
-        // 3. 清除接管状态
+        // 3. 清除 proxy_config 表中的接管状态（兼容旧版）
         self.db
             .set_live_takeover_active(false)
             .await
             .map_err(|e| format!("清除接管状态失败: {e}"))?;
 
-        // 4. 删除备份
+        // 4. 清除所有应用的 enabled 状态（用户手动关闭，不需要下次自动恢复）
+        for app_type in ["claude", "codex", "gemini"] {
+            if let Ok(mut config) = self.db.get_proxy_config_for_app(app_type).await {
+                if config.enabled {
+                    config.enabled = false;
+                    if let Err(e) = self.db.update_proxy_config_for_app(config).await {
+                        log::warn!("清除 {app_type} enabled 状态失败: {e}");
+                    }
+                }
+            }
+        }
+
+        // 5. 删除备份
         self.db
             .delete_all_live_backups()
             .await
             .map_err(|e| format!("删除备份失败: {e}"))?;
 
-        // 5. 重置健康状态（让健康徽章恢复为正常）
+        // 6. 重置健康状态（让健康徽章恢复为正常）
         self.db
             .clear_all_provider_health()
             .await
             .map_err(|e| format!("重置健康状态失败: {e}"))?;
 
+        // 注意：不清除故障转移队列和开关状态，保留供下次开启代理时使用
         log::info!("代理已停止，Live 配置已恢复");
         Ok(())
     }
 
+    /// 停止代理服务器（恢复 Live 配置，但保留 settings 表中的代理状态）
+    ///
+    /// 用于程序正常退出时，保留代理状态以便下次启动时自动恢复
+    pub async fn stop_with_restore_keep_state(&self) -> Result<(), String> {
+        // 1. 停止代理服务器（即使未运行也继续执行恢复逻辑）
+        if let Err(e) = self.stop().await {
+            log::warn!("停止代理服务器失败（将继续恢复 Live 配置）: {e}");
+        }
+
+        // 2. 恢复原始 Live 配置
+        self.restore_live_configs().await?;
+
+        // 3. 更新 proxy_config 表中的 live_takeover_active 标志（兼容旧版）
+        //    注意：保留 proxy_config.enabled 状态，下次启动时自动恢复
+        if let Ok(mut config) = self.db.get_proxy_config().await {
+            config.live_takeover_active = false;
+            let _ = self.db.update_proxy_config(config).await;
+        }
+
+        // 4. 删除备份（Live 配置已恢复，备份不再需要）
+        self.db
+            .delete_all_live_backups()
+            .await
+            .map_err(|e| format!("删除备份失败: {e}"))?;
+
+        // 5. 重置健康状态
+        self.db
+            .clear_all_provider_health()
+            .await
+            .map_err(|e| format!("重置健康状态失败: {e}"))?;
+
+        log::info!("代理已停止，Live 配置已恢复（保留代理状态，下次启动将自动恢复）");
+        Ok(())
+    }
+
     /// 备份各应用的 Live 配置
     async fn backup_live_configs(&self) -> Result<(), String> {
         // Claude
@@ -909,44 +1003,282 @@ impl ProxyService {
 
     /// 恢复原始 Live 配置
     async fn restore_live_configs(&self) -> Result<(), String> {
-        // Claude
+        let mut errors = Vec::new();
-        if let Ok(Some(backup)) = self.db.get_live_backup("claude").await {
+
+        for app_type in [AppType::Claude, AppType::Codex, AppType::Gemini] {
+            if let Err(e) = self
+                .restore_live_config_for_app_with_fallback(&app_type)
+                .await
+            {
+                errors.push(e);
+            }
+        }
+
+        if errors.is_empty() {
+            Ok(())
+        } else {
+            Err(errors.join("；"))
+        }
+    }
+
+    async fn restore_live_config_for_app_with_fallback(
+        &self,
+        app_type: &AppType,
+    ) -> Result<(), String> {
+        let app_type_str = app_type.as_str();
+
+        // 1) 优先从 Live 备份恢复（这是“原始 Live”的唯一可靠来源）
+        let backup = self
+            .db
+            .get_live_backup(app_type_str)
+            .await
+            .map_err(|e| format!("获取 {app_type_str} Live 备份失败: {e}"))?;
+        if let Some(backup) = backup {
             let config: Value = serde_json::from_str(&backup.original_config)
-                .map_err(|e| format!("解析 Claude 备份失败: {e}"))?;
+                .map_err(|e| format!("解析 {app_type_str} 备份失败: {e}"))?;
+            self.write_live_config_for_app(app_type, &config)?;
+            log::info!("{app_type_str} Live 配置已从备份恢复");
+            return Ok(());
+        }
+
+        // 2) 兜底：备份缺失，但 Live 仍包含接管占位符（异常退出/历史 bug 场景）
+        if !self.detect_takeover_in_live_config_for_app(app_type) {
+            return Ok(());
+        }
+
+        // 2.1) 优先从 SSOT（当前供应商）重建 Live（比“清理字段”更可用）
+        match self.restore_live_from_ssot_for_app(app_type) {
+            Ok(true) => {
+                log::info!("{app_type_str} Live 配置已从 SSOT 恢复（无备份兜底）");
+                return Ok(());
+            }
+            Ok(false) => {
+                log::warn!(
+                    "{app_type_str} Live 备份缺失，且无法从 SSOT 恢复，将尝试清理接管占位符"
+                );
+            }
+            Err(e) => {
+                log::error!(
+                    "{app_type_str} Live 备份缺失，SSOT 恢复失败，将尝试清理接管占位符: {e}"
+                );
+            }
+        }
+
+        // 2.2) 最后兜底：尽力清理占位符与本地代理地址，避免长期卡在代理占位符状态
+        self.cleanup_takeover_placeholders_in_live_for_app(app_type)?;
+        log::info!("{app_type_str} Live 接管占位符已清理（无备份兜底）");
+        Ok(())
+    }
+
+    fn write_live_config_for_app(&self, app_type: &AppType, config: &Value) -> Result<(), String> {
+        match app_type {
+            AppType::Claude => self.write_claude_live(config),
+            AppType::Codex => self.write_codex_live(config),
+            AppType::Gemini => self.write_gemini_live(config),
+        }
+    }
+
+    pub fn detect_takeover_in_live_config_for_app(&self, app_type: &AppType) -> bool {
+        match app_type {
+            AppType::Claude => match self.read_claude_live() {
+                Ok(config) => Self::is_claude_live_taken_over(&config),
+                Err(_) => false,
+            },
+            AppType::Codex => match self.read_codex_live() {
+                Ok(config) => Self::is_codex_live_taken_over(&config),
+                Err(_) => false,
+            },
+            AppType::Gemini => match self.read_gemini_live() {
+                Ok(config) => Self::is_gemini_live_taken_over(&config),
+                Err(_) => false,
+            },
+        }
+    }
+
+    /// 当 Live 备份缺失时，尝试用 SSOT（当前供应商）写回 Live，以解除占位符接管。
+    ///
+    /// 返回值：
+    /// - Ok(true)：已成功写回
+    /// - Ok(false)：缺少当前供应商/供应商不存在，无法写回
+    fn restore_live_from_ssot_for_app(&self, app_type: &AppType) -> Result<bool, String> {
+        let current_id = crate::settings::get_effective_current_provider(&self.db, app_type)
+            .map_err(|e| format!("获取 {app_type:?} 当前供应商失败: {e}"))?;
+
+        let Some(current_id) = current_id else {
+            return Ok(false);
+        };
+
+        let providers = self
+            .db
+            .get_all_providers(app_type.as_str())
+            .map_err(|e| format!("读取 {app_type:?} 供应商列表失败: {e}"))?;
+
+        let Some(provider) = providers.get(&current_id) else {
+            return Ok(false);
+        };
+
+        write_live_snapshot(app_type, provider)
+            .map_err(|e| format!("写入 {app_type:?} Live 配置失败: {e}"))?;
+
+        Ok(true)
+    }
+
+    fn cleanup_takeover_placeholders_in_live_for_app(
+        &self,
+        app_type: &AppType,
+    ) -> Result<(), String> {
+        match app_type {
+            AppType::Claude => self.cleanup_claude_takeover_placeholders_in_live(),
+            AppType::Codex => self.cleanup_codex_takeover_placeholders_in_live(),
+            AppType::Gemini => self.cleanup_gemini_takeover_placeholders_in_live(),
+        }
+    }
+
+    fn is_local_proxy_url(url: &str) -> bool {
+        let url = url.trim();
+        if !url.starts_with("http://") {
+            return false;
+        }
+        let rest = &url["http://".len()..];
+        rest.starts_with("127.0.0.1")
+            || rest.starts_with("localhost")
+            || rest.starts_with("0.0.0.0")
+            || rest.starts_with("[::1]")
+            || rest.starts_with("[::]")
+            || rest.starts_with("::1")
+            || rest.starts_with("::")
+    }
+
+    fn cleanup_claude_takeover_placeholders_in_live(&self) -> Result<(), String> {
+        let mut config = self.read_claude_live()?;
+
+        let Some(env) = config.get_mut("env").and_then(|v| v.as_object_mut()) else {
+            return Ok(());
+        };
+
+        for key in [
+            "ANTHROPIC_AUTH_TOKEN",
+            "ANTHROPIC_API_KEY",
+            "OPENROUTER_API_KEY",
+            "OPENAI_API_KEY",
+        ] {
+            if env.get(key).and_then(|v| v.as_str()) == Some(PROXY_TOKEN_PLACEHOLDER) {
+                env.remove(key);
+            }
+        }
+
+        if env
+            .get("ANTHROPIC_BASE_URL")
+            .and_then(|v| v.as_str())
+            .map(Self::is_local_proxy_url)
+            .unwrap_or(false)
+        {
+            env.remove("ANTHROPIC_BASE_URL");
+        }
+
         self.write_claude_live(&config)?;
-            log::info!("Claude Live 配置已恢复");
+        Ok(())
+    }
+
+    fn cleanup_codex_takeover_placeholders_in_live(&self) -> Result<(), String> {
+        let mut config = self.read_codex_live()?;
+
+        if let Some(auth) = config.get_mut("auth").and_then(|v| v.as_object_mut()) {
+            if auth.get("OPENAI_API_KEY").and_then(|v| v.as_str()) == Some(PROXY_TOKEN_PLACEHOLDER)
+            {
+                auth.remove("OPENAI_API_KEY");
+            }
+        }
+
+        if let Some(cfg_str) = config.get("config").and_then(|v| v.as_str()) {
+            let updated = Self::remove_local_toml_base_url(cfg_str);
+            config["config"] = json!(updated);
         }
 
-        // Codex
-        if let Ok(Some(backup)) = self.db.get_live_backup("codex").await {
-            let config: Value = serde_json::from_str(&backup.original_config)
-                .map_err(|e| format!("解析 Codex 备份失败: {e}"))?;
         self.write_codex_live(&config)?;
-            log::info!("Codex Live 配置已恢复");
+        Ok(())
+    }
+
+    fn remove_local_toml_base_url(toml_str: &str) -> String {
+        use toml_edit::DocumentMut;
+
+        let mut doc = match toml_str.parse::<DocumentMut>() {
+            Ok(doc) => doc,
+            Err(_) => return toml_str.to_string(),
+        };
+
+        let model_provider = doc
+            .get("model_provider")
+            .and_then(|item| item.as_str())
+            .map(str::to_string);
+
+        if let Some(provider_key) = model_provider {
+            if let Some(model_providers) = doc
+                .get_mut("model_providers")
+                .and_then(|v| v.as_table_mut())
+            {
+                if let Some(provider_table) = model_providers
+                    .get_mut(provider_key.as_str())
+                    .and_then(|v| v.as_table_mut())
+                {
+                    let should_remove = provider_table
+                        .get("base_url")
+                        .and_then(|item| item.as_str())
+                        .map(Self::is_local_proxy_url)
+                        .unwrap_or(false);
+                    if should_remove {
+                        provider_table.remove("base_url");
+                    }
+                }
+            }
+        }
+
+        // 兜底：清理顶层 base_url（仅当它看起来像本地代理地址）
+        let should_remove_root = doc
+            .get("base_url")
+            .and_then(|item| item.as_str())
+            .map(Self::is_local_proxy_url)
+            .unwrap_or(false);
+        if should_remove_root {
+            doc.as_table_mut().remove("base_url");
+        }
+
+        doc.to_string()
+    }
+
+    fn cleanup_gemini_takeover_placeholders_in_live(&self) -> Result<(), String> {
+        let mut config = self.read_gemini_live()?;
+
+        let Some(env) = config.get_mut("env").and_then(|v| v.as_object_mut()) else {
+            return Ok(());
+        };
+
+        if env.get("GEMINI_API_KEY").and_then(|v| v.as_str()) == Some(PROXY_TOKEN_PLACEHOLDER) {
+            env.remove("GEMINI_API_KEY");
+        }
+
+        if env
+            .get("GOOGLE_GEMINI_BASE_URL")
+            .and_then(|v| v.as_str())
+            .map(Self::is_local_proxy_url)
+            .unwrap_or(false)
+        {
+            env.remove("GOOGLE_GEMINI_BASE_URL");
         }
 
-        // Gemini
-        if let Ok(Some(backup)) = self.db.get_live_backup("gemini").await {
-            let config: Value = serde_json::from_str(&backup.original_config)
-                .map_err(|e| format!("解析 Gemini 备份失败: {e}"))?;
         self.write_gemini_live(&config)?;
-            log::info!("Gemini Live 配置已恢复");
-        }
-
         Ok(())
     }
 
     /// 检查是否处于 Live 接管模式
     pub async fn is_takeover_active(&self) -> Result<bool, String> {
-        self.db
+        let status = self.get_takeover_status().await?;
-            .is_live_takeover_active()
+        Ok(status.claude || status.codex || status.gemini)
-            .await
-            .map_err(|e| format!("检查接管状态失败: {e}"))
     }
 
     /// 从异常退出中恢复（启动时调用）
     ///
-    /// 检测到 live_takeover_active=true 但代理未运行时调用此方法。
+    /// 检测到 Live 备份残留时调用此方法。
     /// 会恢复 Live 配置、清除接管标志、删除备份。
     pub async fn recover_from_crash(&self) -> Result<(), String> {
         // 1. 恢复 Live 配置
@@ -970,7 +1302,7 @@ impl ProxyService {
 
     /// 检测 Live 配置是否处于“被接管”的残留状态
     ///
-    /// 用于兜底处理：当数据库标志未写入成功（或旧版本遗留）但 Live 文件已经写成代理占位符时，
+    /// 用于兜底处理：当数据库备份缺失但 Live 文件已经写成代理占位符时，
     /// 启动流程可以据此触发恢复逻辑。
     pub fn detect_takeover_in_live_configs(&self) -> bool {
         if let Ok(config) = self.read_claude_live() {
@@ -1255,9 +1587,8 @@ impl ProxyService {
             .await
             .map_err(|e| format!("获取代理配置失败: {e}"))?;
 
-        // 保存到数据库（保持 enabled 和 live_takeover_active 状态不变）
+        // 保存到数据库（保持 live_takeover_active 状态不变）
         let mut new_config = config.clone();
-        new_config.enabled = previous.enabled;
         new_config.live_takeover_active = previous.live_takeover_active;
 
         self.db
@@ -1370,6 +1701,47 @@ impl ProxyService {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use serial_test::serial;
+    use std::env;
+    use tempfile::TempDir;
+
+    struct TempHome {
+        #[allow(dead_code)]
+        dir: TempDir,
+        original_home: Option<String>,
+        original_userprofile: Option<String>,
+    }
+
+    impl TempHome {
+        fn new() -> Self {
+            let dir = TempDir::new().expect("failed to create temp home");
+            let original_home = env::var("HOME").ok();
+            let original_userprofile = env::var("USERPROFILE").ok();
+
+            env::set_var("HOME", dir.path());
+            env::set_var("USERPROFILE", dir.path());
+
+            Self {
+                dir,
+                original_home,
+                original_userprofile,
+            }
+        }
+    }
+
+    impl Drop for TempHome {
+        fn drop(&mut self) {
+            match &self.original_home {
+                Some(value) => env::set_var("HOME", value),
+                None => env::remove_var("HOME"),
+            }
+
+            match &self.original_userprofile {
+                Some(value) => env::set_var("USERPROFILE", value),
+                None => env::remove_var("USERPROFILE"),
+            }
+        }
+    }
 
     #[test]
     fn update_toml_base_url_updates_active_model_provider_base_url() {
@@ -1432,4 +1804,116 @@ model = "gpt-5.1-codex"
 
         assert_eq!(base_url, new_url);
     }
+
+    #[tokio::test]
+    #[serial]
+    async fn sync_claude_token_does_not_add_anthropic_api_key() {
+        let _home = TempHome::new();
+        crate::settings::reload_settings().expect("reload settings");
+
+        let db = Arc::new(Database::memory().expect("init db"));
+        let service = ProxyService::new(db.clone());
+
+        let provider = Provider::with_id(
+            "p1".to_string(),
+            "P1".to_string(),
+            json!({
+                "env": {
+                    "ANTHROPIC_BASE_URL": "https://api.anthropic.com",
+                    "ANTHROPIC_AUTH_TOKEN": "stale"
+                }
+            }),
+            None,
+        );
+        db.save_provider("claude", &provider)
+            .expect("save provider");
+        db.set_current_provider("claude", "p1")
+            .expect("set current provider");
+
+        let live_config = json!({
+            "env": {
+                "ANTHROPIC_AUTH_TOKEN": "fresh"
+            }
+        });
+
+        service
+            .sync_live_config_to_provider(&AppType::Claude, &live_config)
+            .await
+            .expect("sync");
+
+        let updated = db
+            .get_provider_by_id("p1", "claude")
+            .expect("get provider")
+            .expect("provider exists");
+        let env = updated
+            .settings_config
+            .get("env")
+            .and_then(|v| v.as_object())
+            .expect("env object");
+
+        assert_eq!(
+            env.get("ANTHROPIC_AUTH_TOKEN").and_then(|v| v.as_str()),
+            Some("fresh")
+        );
+        assert!(
+            !env.contains_key("ANTHROPIC_API_KEY"),
+            "should not add ANTHROPIC_API_KEY when absent"
+        );
+    }
+
+    #[tokio::test]
+    #[serial]
+    async fn sync_claude_token_respects_existing_api_key_field() {
+        let _home = TempHome::new();
+        crate::settings::reload_settings().expect("reload settings");
+
+        let db = Arc::new(Database::memory().expect("init db"));
+        let service = ProxyService::new(db.clone());
+
+        let provider = Provider::with_id(
+            "p1".to_string(),
+            "P1".to_string(),
+            json!({
+                "env": {
+                    "ANTHROPIC_BASE_URL": "https://api.anthropic.com",
+                    "ANTHROPIC_API_KEY": "stale"
+                }
+            }),
+            None,
+        );
+        db.save_provider("claude", &provider)
+            .expect("save provider");
+        db.set_current_provider("claude", "p1")
+            .expect("set current provider");
+
+        let live_config = json!({
+            "env": {
+                "ANTHROPIC_AUTH_TOKEN": "fresh"
+            }
+        });
+
+        service
+            .sync_live_config_to_provider(&AppType::Claude, &live_config)
+            .await
+            .expect("sync");
+
+        let updated = db
+            .get_provider_by_id("p1", "claude")
+            .expect("get provider")
+            .expect("provider exists");
+        let env = updated
+            .settings_config
+            .get("env")
+            .and_then(|v| v.as_object())
+            .expect("env object");
+
+        assert_eq!(
+            env.get("ANTHROPIC_API_KEY").and_then(|v| v.as_str()),
+            Some("fresh")
+        );
+        assert!(
+            !env.contains_key("ANTHROPIC_AUTH_TOKEN"),
+            "should not add ANTHROPIC_AUTH_TOKEN when absent"
+        );
+    }
 }

src-tauri/src/services/skill.rs

@@ -77,7 +77,7 @@ impl Default for SkillStore {
                 SkillRepo {
                     owner: "ComposioHQ".to_string(),
                     name: "awesome-claude-skills".to_string(),
-                    branch: "main".to_string(),
+                    branch: "master".to_string(),
                     enabled: true,
                 },
                 SkillRepo {

src-tauri/src/services/stream_check.rs

@@ -3,6 +3,7 @@
 //! 使用流式 API 进行快速健康检查，只需接收首个 chunk 即判定成功。
 
 use futures::StreamExt;
+use regex::Regex;
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
@@ -141,15 +142,17 @@ impl StreamCheckService {
             .build()
             .map_err(|e| AppError::Message(format!("创建客户端失败: {e}")))?;
 
+        let model_to_test = Self::resolve_test_model(app_type, provider, config);
+
         let result = match app_type {
             AppType::Claude => {
-                Self::check_claude_stream(&client, &base_url, &auth, &config.claude_model).await
+                Self::check_claude_stream(&client, &base_url, &auth, &model_to_test).await
             }
             AppType::Codex => {
-                Self::check_codex_stream(&client, &base_url, &auth, &config.codex_model).await
+                Self::check_codex_stream(&client, &base_url, &auth, &model_to_test).await
             }
             AppType::Gemini => {
-                Self::check_gemini_stream(&client, &base_url, &auth, &config.gemini_model).await
+                Self::check_gemini_stream(&client, &base_url, &auth, &model_to_test).await
             }
         };
 
@@ -379,6 +382,48 @@ impl StreamCheckService {
             AppError::Message(e.to_string())
         }
     }
+
+    fn resolve_test_model(
+        app_type: &AppType,
+        provider: &Provider,
+        config: &StreamCheckConfig,
+    ) -> String {
+        match app_type {
+            AppType::Claude => Self::extract_env_model(provider, "ANTHROPIC_MODEL")
+                .unwrap_or_else(|| config.claude_model.clone()),
+            AppType::Codex => {
+                Self::extract_codex_model(provider).unwrap_or_else(|| config.codex_model.clone())
+            }
+            AppType::Gemini => Self::extract_env_model(provider, "GEMINI_MODEL")
+                .unwrap_or_else(|| config.gemini_model.clone()),
+        }
+    }
+
+    fn extract_env_model(provider: &Provider, key: &str) -> Option<String> {
+        provider
+            .settings_config
+            .get("env")
+            .and_then(|env| env.get(key))
+            .and_then(|value| value.as_str())
+            .map(|value| value.trim().to_string())
+            .filter(|value| !value.is_empty())
+    }
+
+    fn extract_codex_model(provider: &Provider) -> Option<String> {
+        let config_text = provider
+            .settings_config
+            .get("config")
+            .and_then(|value| value.as_str())?;
+        if config_text.trim().is_empty() {
+            return None;
+        }
+
+        let re = Regex::new(r#"^model\s*=\s*["']([^"']+)["']"#).ok()?;
+        re.captures(config_text)
+            .and_then(|caps| caps.get(1))
+            .map(|m| m.as_str().trim().to_string())
+            .filter(|value| !value.is_empty())
+    }
 }
 
 #[cfg(test)]

src-tauri/src/services/usage_stats.rs

@@ -4,7 +4,7 @@
 
 use crate::database::{lock_conn, Database};
 use crate::error::AppError;
-use chrono::{Duration, Utc};
+use chrono::{Local, TimeZone};
 use rusqlite::{params, Connection, OptionalExtension};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -181,13 +181,45 @@ impl Database {
         Ok(result)
     }
 
-    /// 获取每日趋势
+    /// 获取每日趋势（滑动窗口，<=24h 按小时，>24h 按天，窗口与汇总一致）
-    pub fn get_daily_trends(&self, days: u32) -> Result<Vec<DailyStats>, AppError> {
+    pub fn get_daily_trends(
+        &self,
+        start_date: Option<i64>,
+        end_date: Option<i64>,
+    ) -> Result<Vec<DailyStats>, AppError> {
         let conn = lock_conn!(self.conn);
 
-        if days <= 1 {
+        let end_ts = end_date.unwrap_or_else(|| Local::now().timestamp());
-            let sql = "SELECT 
+        let mut start_ts = start_date.unwrap_or_else(|| end_ts - 24 * 60 * 60);
-                    strftime('%Y-%m-%dT%H:00:00Z', datetime(created_at, 'unixepoch')) as bucket,
+
+        if start_ts >= end_ts {
+            start_ts = end_ts - 24 * 60 * 60;
+        }
+
+        let duration = end_ts - start_ts;
+        let bucket_seconds: i64 = if duration <= 24 * 60 * 60 {
+            60 * 60
+        } else {
+            24 * 60 * 60
+        };
+        let mut bucket_count: i64 = if duration <= 0 {
+            1
+        } else {
+            ((duration as f64) / bucket_seconds as f64).ceil() as i64
+        };
+
+        // 固定 24 小时窗口为 24 个小时桶，避免浮点误差
+        if bucket_seconds == 60 * 60 {
+            bucket_count = 24;
+        }
+
+        if bucket_count < 1 {
+            bucket_count = 1;
+        }
+
+        let sql = "
+            SELECT 
+                CAST((created_at - ?1) / ?3 AS INTEGER) as bucket_idx,
                 COUNT(*) as request_count,
                 COALESCE(SUM(CAST(total_cost_usd AS REAL)), 0) as total_cost,
                 COALESCE(SUM(input_tokens + output_tokens), 0) as total_tokens,
@@ -196,14 +228,16 @@ impl Database {
                 COALESCE(SUM(cache_creation_tokens), 0) as total_cache_creation_tokens,
                 COALESCE(SUM(cache_read_tokens), 0) as total_cache_read_tokens
             FROM proxy_request_logs
-                 WHERE created_at >= strftime('%s', 'now', '-1 day')
+            WHERE created_at >= ?1 AND created_at <= ?2
-                 GROUP BY bucket
+            GROUP BY bucket_idx
-                 ORDER BY bucket ASC";
+            ORDER BY bucket_idx ASC";
 
         let mut stmt = conn.prepare(sql)?;
-            let rows = stmt.query_map([], |row| {
+        let rows = stmt.query_map(params![start_ts, end_ts, bucket_seconds], |row| {
-                Ok(DailyStats {
+            Ok((
-                    date: row.get(0)?,
+                row.get::<_, i64>(0)?,
+                DailyStats {
+                    date: String::new(),
                     request_count: row.get::<_, i64>(1)? as u64,
                     total_cost: format!("{:.6}", row.get::<_, f64>(2)?),
                     total_tokens: row.get::<_, i64>(3)? as u64,
@@ -211,29 +245,38 @@ impl Database {
                     total_output_tokens: row.get::<_, i64>(5)? as u64,
                     total_cache_creation_tokens: row.get::<_, i64>(6)? as u64,
                     total_cache_read_tokens: row.get::<_, i64>(7)? as u64,
-                })
+                },
+            ))
         })?;
 
-            let mut buckets: HashMap<String, DailyStats> = HashMap::new();
+        let mut map: HashMap<i64, DailyStats> = HashMap::new();
         for row in rows {
-                let stat = row?;
+            let (mut bucket_idx, stat) = row?;
-                buckets.insert(stat.date.clone(), stat);
+            if bucket_idx < 0 {
+                continue;
+            }
+            if bucket_idx >= bucket_count {
+                bucket_idx = bucket_count - 1;
+            }
+            map.insert(bucket_idx, stat);
         }
 
-            let mut stats = Vec::new();
+        let mut stats = Vec::with_capacity(bucket_count as usize);
-            let today = Utc::now().date_naive();
+        for i in 0..bucket_count {
-            for hour in 0..24 {
+            let bucket_start_ts = start_ts + i * bucket_seconds;
-                let bucket = today
+            let bucket_start = Local
-                    .and_hms_opt(hour, 0, 0)
+                .timestamp_opt(bucket_start_ts, 0)
-                    .unwrap()
+                .single()
-                    .format("%Y-%m-%dT%H:00:00Z")
+                .unwrap_or_else(Local::now);
-                    .to_string();
 
-                if let Some(stat) = buckets.remove(&bucket) {
+            let date = bucket_start.format("%Y-%m-%dT%H:%M:%S").to_string();
+
+            if let Some(mut stat) = map.remove(&i) {
+                stat.date = date;
                 stats.push(stat);
             } else {
                 stats.push(DailyStats {
-                        date: bucket,
+                    date,
                     request_count: 0,
                     total_cost: "0.000000".to_string(),
                     total_tokens: 0,
@@ -244,66 +287,8 @@ impl Database {
                 });
             }
         }
+
         Ok(stats)
-        } else {
-            let sql = "SELECT 
-                    date(created_at, 'unixepoch') as bucket,
-                    COUNT(*) as request_count,
-                    COALESCE(SUM(CAST(total_cost_usd AS REAL)), 0) as total_cost,
-                    COALESCE(SUM(input_tokens + output_tokens), 0) as total_tokens,
-                    COALESCE(SUM(input_tokens), 0) as total_input_tokens,
-                    COALESCE(SUM(output_tokens), 0) as total_output_tokens,
-                    COALESCE(SUM(cache_creation_tokens), 0) as total_cache_creation_tokens,
-                    COALESCE(SUM(cache_read_tokens), 0) as total_cache_read_tokens
-                 FROM proxy_request_logs
-                 WHERE created_at >= strftime('%s', 'now', ?)
-                 GROUP BY bucket
-                 ORDER BY bucket ASC";
-
-            let mut stmt = conn.prepare(sql)?;
-            let rows = stmt.query_map([format!("-{days} days")], |row| {
-                Ok(DailyStats {
-                    date: row.get(0)?,
-                    request_count: row.get::<_, i64>(1)? as u64,
-                    total_cost: format!("{:.6}", row.get::<_, f64>(2)?),
-                    total_tokens: row.get::<_, i64>(3)? as u64,
-                    total_input_tokens: row.get::<_, i64>(4)? as u64,
-                    total_output_tokens: row.get::<_, i64>(5)? as u64,
-                    total_cache_creation_tokens: row.get::<_, i64>(6)? as u64,
-                    total_cache_read_tokens: row.get::<_, i64>(7)? as u64,
-                })
-            })?;
-
-            let mut map = HashMap::new();
-            for row in rows {
-                let stat = row?;
-                map.insert(stat.date.clone(), stat);
-            }
-
-            let mut stats = Vec::new();
-            let start_day =
-                Utc::now().date_naive() - Duration::days((days.saturating_sub(1)) as i64);
-
-            for i in 0..days {
-                let day = start_day + Duration::days(i as i64);
-                let key = day.format("%Y-%m-%d").to_string();
-                if let Some(stat) = map.remove(&key) {
-                    stats.push(stat);
-                } else {
-                    stats.push(DailyStats {
-                        date: key,
-                        request_count: 0,
-                        total_cost: "0.000000".to_string(),
-                        total_tokens: 0,
-                        total_input_tokens: 0,
-                        total_output_tokens: 0,
-                        total_cache_creation_tokens: 0,
-                        total_cache_read_tokens: 0,
-                    });
-                }
-            }
-            Ok(stats)
-        }
     }
 
     /// 获取 Provider 统计
@@ -617,7 +602,7 @@ impl Database {
                 "SELECT COALESCE(SUM(CAST(total_cost_usd AS REAL)), 0)
              FROM proxy_request_logs
              WHERE provider_id = ? AND app_type = ?
-               AND date(created_at, 'unixepoch') = date('now')",
+               AND date(datetime(created_at, 'unixepoch', 'localtime')) = date('now', 'localtime')",
                 params![provider_id, app_type],
                 |row| row.get(0),
             )
@@ -629,7 +614,7 @@ impl Database {
                 "SELECT COALESCE(SUM(CAST(total_cost_usd AS REAL)), 0)
              FROM proxy_request_logs
              WHERE provider_id = ? AND app_type = ?
-               AND strftime('%Y-%m', created_at, 'unixepoch') = strftime('%Y-%m', 'now')",
+               AND strftime('%Y-%m', datetime(created_at, 'unixepoch', 'localtime')) = strftime('%Y-%m', 'now', 'localtime')",
                 params![provider_id, app_type],
                 |row| row.get(0),
             )
@@ -813,36 +798,29 @@ impl Database {
     }
 }
 
-/// 标准化模型名称：去除供应商前缀并将点号替换为短横线
-/// 例如：anthropic/claude-haiku-4.5 → claude-haiku-4-5
-fn normalize_model_id(model_id: &str) -> String {
-    // 1. 去除供应商前缀（如 anthropic/、openai/）
-    let stripped = if let Some(pos) = model_id.find('/') {
-        &model_id[pos + 1..]
-    } else {
-        model_id
-    };
-    // 2. 将点号替换为短横线（如 claude-haiku-4.5 → claude-haiku-4-5）
-    stripped.replace('.', "-")
-}
-
 pub(crate) fn find_model_pricing_row(
     conn: &Connection,
     model_id: &str,
 ) -> Result<Option<(String, String, String, String)>, AppError> {
-    // 0. 标准化模型名称（去除前缀 + 点号转短横线）
+    // 1) 去除供应商前缀（/ 之前）与冒号后缀（: 之后），例如 moonshotai/kimi-k2-0905:exa → kimi-k2-0905
-    // 例如：anthropic/claude-haiku-4.5 → claude-haiku-4-5
+    let without_prefix = model_id
-    let normalized = normalize_model_id(model_id);
+        .rsplit_once('/')
+        .map(|(_, rest)| rest)
+        .unwrap_or(model_id);
+    let cleaned = without_prefix
+        .split(':')
+        .next()
+        .map(str::trim)
+        .unwrap_or(without_prefix);
 
-    // 1. 精确匹配（先尝试原始名称，再尝试标准化后的名称）
+    // 2) 精确匹配清洗后的名称
-    for id in [model_id, normalized.as_str()] {
     let exact = conn
         .query_row(
             "SELECT input_cost_per_million, output_cost_per_million,
                     cache_read_cost_per_million, cache_creation_cost_per_million
              FROM model_pricing
              WHERE model_id = ?1",
-                [id],
+            [cleaned],
             |row| {
                 Ok((
                     row.get::<_, String>(0)?,
@@ -855,47 +833,11 @@ pub(crate) fn find_model_pricing_row(
         .optional()
         .map_err(|e| AppError::Database(format!("查询模型定价失败: {e}")))?;
 
-        if exact.is_some() {
+    if exact.is_none() {
-            if id != model_id {
+        log::warn!("模型 {model_id}（清洗后: {cleaned}）未找到定价信息，成本将记录为 0");
-                log::info!("模型 {model_id} 标准化后精确匹配到: {id}");
-            }
-            return Ok(exact);
-        }
     }
 
-    // 2. 逐步删除后缀匹配（claude-haiku-4-5-20250929 → claude-haiku-4-5 → claude-haiku-4 → claude-haiku）
+    Ok(exact)
-    // 使用标准化后的名称进行后缀匹配
-    let mut current = normalized;
-    while let Some(pos) = current.rfind('-') {
-        current = current[..pos].to_string();
-
-        let result = conn
-            .query_row(
-                "SELECT input_cost_per_million, output_cost_per_million,
-                        cache_read_cost_per_million, cache_creation_cost_per_million
-                 FROM model_pricing
-                 WHERE model_id = ?1",
-                [&current],
-                |row| {
-                    Ok((
-                        row.get::<_, String>(0)?,
-                        row.get::<_, String>(1)?,
-                        row.get::<_, String>(2)?,
-                        row.get::<_, String>(3)?,
-                    ))
-                },
-            )
-            .optional()
-            .map_err(|e| AppError::Database(format!("查询模型定价失败: {e}")))?;
-
-        if result.is_some() {
-            log::info!("模型 {model_id} 通过删除后缀匹配到: {current}");
-            return Ok(result);
-        }
-    }
-
-    log::warn!("模型 {model_id} 未找到定价信息，成本将记录为 0");
-    Ok(None)
 }
 
 #[cfg(test)]
@@ -975,54 +917,39 @@ mod tests {
         let db = Database::memory()?;
         let conn = lock_conn!(db.conn);
 
-        // 测试精确匹配
+        // 准备额外定价数据，覆盖前缀/后缀清洗场景
-        let result = find_model_pricing_row(&conn, "claude-sonnet-4-5")?;
+        conn.execute(
-        assert!(result.is_some(), "应该能精确匹配 claude-sonnet-4-5");
+            "INSERT OR REPLACE INTO model_pricing (
+                model_id, display_name, input_cost_per_million, output_cost_per_million,
+                cache_read_cost_per_million, cache_creation_cost_per_million
+            ) VALUES (?, ?, ?, ?, ?, ?)",
+            params![
+                "claude-haiku-4.5",
+                "Claude Haiku 4.5",
+                "1.0",
+                "2.0",
+                "0.0",
+                "0.0"
+            ],
+        )?;
 
-        // 测试带供应商前缀的模型名称（anthropic/claude-haiku-4.5 → claude-haiku-4-5）
+        // 测试精确匹配（seed_model_pricing 已预置 claude-sonnet-4-5-20250929）
-        let result = find_model_pricing_row(&conn, "anthropic/claude-haiku-4.5")?;
-        assert!(
-            result.is_some(),
-            "应该能匹配带前缀的模型 anthropic/claude-haiku-4.5"
-        );
-
-        // 测试带供应商前缀 + 点号的模型名称
-        let result = find_model_pricing_row(&conn, "anthropic/claude-sonnet-4.5")?;
-        assert!(
-            result.is_some(),
-            "应该能匹配带前缀的模型 anthropic/claude-sonnet-4.5"
-        );
-
-        // 测试逐步删除后缀匹配 - 日期后缀
-        let result = find_model_pricing_row(&conn, "claude-sonnet-4-5-20241022")?;
-        assert!(
-            result.is_some(),
-            "应该能通过删除后缀匹配 claude-sonnet-4-5-20241022"
-        );
-
-        // 测试逐步删除后缀匹配 - 多个后缀
-        let result = find_model_pricing_row(&conn, "claude-haiku-4-5-20240229-preview")?;
-        assert!(
-            result.is_some(),
-            "应该能通过删除后缀匹配 claude-haiku-4-5-20240229-preview"
-        );
-
-        // 测试 GPT 模型
-        let result = find_model_pricing_row(&conn, "gpt-5-2024-11-20")?;
-        assert!(result.is_some(), "应该能通过删除后缀匹配 gpt-5-2024-11-20");
-
-        // 测试 Gemini 模型
-        let result = find_model_pricing_row(&conn, "gemini-2.5-flash-exp")?;
-        assert!(
-            result.is_some(),
-            "应该能通过删除后缀匹配 gemini-2.5-flash-exp"
-        );
-
-        // 测试 claude-sonnet-4-5 命名格式
         let result = find_model_pricing_row(&conn, "claude-sonnet-4-5-20250929")?;
         assert!(
             result.is_some(),
-            "应该能通过删除后缀匹配 claude-sonnet-4-5-20250929"
+            "应该能精确匹配 claude-sonnet-4-5-20250929"
+        );
+
+        // 清洗：去除前缀和冒号后缀
+        let result = find_model_pricing_row(&conn, "anthropic/claude-haiku-4.5")?;
+        assert!(
+            result.is_some(),
+            "带前缀的模型 anthropic/claude-haiku-4.5 应能匹配到 claude-haiku-4.5"
+        );
+        let result = find_model_pricing_row(&conn, "moonshotai/kimi-k2-0905:exa")?;
+        assert!(
+            result.is_some(),
+            "带前缀+冒号后缀的模型应清洗后匹配到 kimi-k2-0905"
         );
 
         // 测试不存在的模型

src-tauri/src/settings.rs

@@ -31,6 +31,9 @@ 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,
@@ -65,12 +68,17 @@ 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,

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "CC Switch",
-  "version": "3.9.0-1",
+  "version": "3.9.0-3",
   "identifier": "com.ccswitch.desktop",
   "build": {
     "frontendDist": "../dist",

src-tauri/tauri.windows.conf.json

@@ -4,7 +4,9 @@
     "windows": [
       {
         "label": "main",
-        "titleBarStyle": "Visible"
+        "titleBarStyle": "Visible",
+        "minWidth": 900,
+        "minHeight": 600
       }
     ]
   }

src-tauri/tests/import_export_sync.rs

@@ -76,19 +76,8 @@ fn sync_codex_provider_writes_auth_and_config() {
 
     let mut config = MultiAppConfig::default();
 
-    // 添加入测 MCP 启用项，确保 sync_enabled_to_codex 会写入 TOML
+    // 注意：v3.7.0 后 MCP 同步由 McpService 独立处理，不再通过 provider 切换触发
-    config.mcp.codex.servers.insert(
+    // 此测试仅验证 auth.json 和 config.toml 基础配置的写入
-        "echo-server".into(),
-        json!({
-            "id": "echo-server",
-            "enabled": true,
-            "server": {
-                "type": "stdio",
-                "command": "echo",
-                "args": ["hello"]
-            }
-        }),
-    );
 
     let provider_config = json!({
         "auth": {
@@ -133,9 +122,10 @@ 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("command = \"echo\""),
+        toml_text.contains("base_url"),
-        "config.toml should contain serialized enabled MCP server"
+        "config.toml should contain base_url from provider config"
     );
 
     // 当前供应商应同步最新 config 文本
@@ -1003,3 +993,76 @@ 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"
+    );
+}

src-tauri/tests/support.rs

@@ -49,6 +49,7 @@ pub fn test_mutex() -> &'static Mutex<()> {
 }
 
 /// 创建测试用的 AppState，包含一个空的数据库
+#[allow(dead_code)]
 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());
@@ -56,6 +57,7 @@ pub fn create_test_state() -> Result<AppState, Box<dyn std::error::Error>> {
 }
 
 /// 创建测试用的 AppState，并从 MultiAppConfig 迁移数据
+#[allow(dead_code)]
 pub fn create_test_state_with_config(
     config: &MultiAppConfig,
 ) -> Result<AppState, Box<dyn std::error::Error>> {

src/App.tsx

@@ -1,7 +1,9 @@
 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,
@@ -24,6 +26,7 @@ import {
 import { checkAllEnvConflicts, checkEnvConflicts } from "@/lib/api/env";
 import { useProviderActions } from "@/hooks/useProviderActions";
 import { useProxyStatus } from "@/hooks/useProxyStatus";
+import { useLastValidValue } from "@/hooks/useLastValidValue";
 import { extractErrorMessage } from "@/utils/errorUtils";
 import { cn } from "@/lib/utils";
 import { AppSwitcher } from "@/components/AppSwitcher";
@@ -41,12 +44,25 @@ import PromptPanel from "@/components/prompts/PromptPanel";
 import { SkillsPage } from "@/components/skills/SkillsPage";
 import { DeepLinkImportDialog } from "@/components/DeepLinkImportDialog";
 import { AgentsPanel } from "@/components/agents/AgentsPanel";
+import { UniversalProviderPanel } from "@/components/universal";
 import { Button } from "@/components/ui/button";
 
-type View = "providers" | "settings" | "prompts" | "skills" | "mcp" | "agents";
+type View =
+  | "providers"
+  | "settings"
+  | "prompts"
+  | "skills"
+  | "mcp"
+  | "agents"
+  | "universal";
+
+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");
@@ -58,6 +74,10 @@ function App() {
   const [envConflicts, setEnvConflicts] = useState<EnvConflict[]>([]);
   const [showEnvBanner, setShowEnvBanner] = useState(false);
 
+  // 使用 Hook 保存最后有效值，用于动画退出期间保持内容显示
+  const effectiveEditingProvider = useLastValidValue(editingProvider);
+  const effectiveUsageProvider = useLastValidValue(usageProvider);
+
   const promptPanelRef = useRef<any>(null);
   const mcpPanelRef = useRef<any>(null);
   const skillsPageRef = useRef<any>(null);
@@ -65,15 +85,20 @@ 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 } = useProxyStatus();
+  const {
+    isRunning: isProxyRunning,
+    takeoverStatus,
+    status: proxyStatus,
+  } = useProxyStatus();
   // 当前应用的代理是否开启
   const isCurrentAppTakeoverActive = takeoverStatus?.[activeApp] || false;
-  // 任意应用的代理是否开启
+  // 当前应用代理实际使用的供应商 ID（从 active_targets 中获取）
-  const isTakeoverActive =
+  const activeProviderId = useMemo(() => {
-    takeoverStatus?.claude ||
+    const target = proxyStatus?.active_targets?.find(
-    takeoverStatus?.codex ||
+      (t) => t.app_type === activeApp,
-    takeoverStatus?.gemini ||
+    );
-    false;
+    return target?.provider_id;
+  }, [proxyStatus?.active_targets, activeApp]);
 
   // 获取供应商列表，当代理服务运行时自动刷新
   const { data, isLoading, refetch } = useProvidersQuery(activeApp, {
@@ -117,6 +142,38 @@ function App() {
     };
   }, [activeApp, refetch]);
 
+  // 监听统一供应商同步事件，刷新所有应用的供应商列表
+  useEffect(() => {
+    let unsubscribe: (() => void) | undefined;
+
+    const setupListener = async () => {
+      try {
+        const { listen } = await import("@tauri-apps/api/event");
+        unsubscribe = await listen("universal-provider-synced", async () => {
+          // 统一供应商同步后刷新所有应用的供应商列表
+          // 使用 invalidateQueries 使所有 providers 查询失效
+          await queryClient.invalidateQueries({ queryKey: ["providers"] });
+          // 同时更新托盘菜单
+          try {
+            await providersApi.updateTrayMenu();
+          } catch (error) {
+            console.error("[App] Failed to update tray menu", error);
+          }
+        });
+      } catch (error) {
+        console.error(
+          "[App] Failed to subscribe universal-provider-synced event",
+          error,
+        );
+      }
+    };
+
+    setupListener();
+    return () => {
+      unsubscribe?.();
+    };
+  }, [queryClient]);
+
   // 应用启动时检测所有应用的环境变量冲突
   useEffect(() => {
     const checkEnvOnStartup = async () => {
@@ -194,6 +251,21 @@ function App() {
     checkEnvOnSwitch();
   }, [activeApp]);
 
+  useEffect(() => {
+    const handleGlobalShortcut = (event: KeyboardEvent) => {
+      if (event.key !== "," || !(event.metaKey || event.ctrlKey)) {
+        return;
+      }
+      event.preventDefault();
+      setCurrentView("settings");
+    };
+
+    window.addEventListener("keydown", handleGlobalShortcut);
+    return () => {
+      window.removeEventListener("keydown", handleGlobalShortcut);
+    };
+  }, []);
+
   // 打开网站链接
   const handleOpenWebsite = async (url: string) => {
     try {
@@ -276,7 +348,20 @@ 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();
+    }
     try {
       await providersApi.updateTrayMenu();
     } catch (error) {
@@ -285,6 +370,7 @@ function App() {
   };
 
   const renderContent = () => {
+    const content = (() => {
       switch (currentView) {
         case "settings":
           return (
@@ -319,20 +405,39 @@ function App() {
             />
           );
         case "agents":
-        return <AgentsPanel onOpenChange={() => setCurrentView("providers")} />;
+          return (
+            <AgentsPanel onOpenChange={() => setCurrentView("providers")} />
+          );
+        case "universal":
+          return (
+            <div className="mx-auto max-w-[56rem] px-5 pt-4">
+              <UniversalProviderPanel />
+            </div>
+          );
         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">
+                <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}
+                      isProxyTakeover={
+                        isProxyRunning && isCurrentAppTakeoverActive
+                      }
+                      activeProviderId={activeProviderId}
                       onSwitch={switchProvider}
                       onEdit={setEditingProvider}
                       onDelete={setConfirmDelete}
@@ -341,23 +446,39 @@ function App() {
                       onOpenWebsite={handleOpenWebsite}
                       onCreate={() => setIsAddOpen(true)}
                     />
-              </div>
+                  </motion.div>
+                </AnimatePresence>
               </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>
+    );
   };
 
   return (
     <div
-      className="flex min-h-screen flex-col bg-background text-foreground selection:bg-primary/30"
+      className="flex flex-col h-screen overflow-hidden bg-background text-foreground selection:bg-primary/30"
-      style={{ overflowX: "hidden" }}
+      style={{ overflowX: "hidden", paddingTop: CONTENT_TOP_OFFSET }}
     >
-      {/* 全局拖拽区域（顶部 4px），避免上边框无法拖动 */}
+      {/* 全局拖拽区域（顶部 28px），避免上边框无法拖动 */}
       <div
-        className="fixed top-0 left-0 right-0 h-4 z-[60]"
+        className="fixed top-0 left-0 right-0 z-[60]"
         data-tauri-drag-region
-        style={{ WebkitAppRegion: "drag" } as any}
+        style={{ WebkitAppRegion: "drag", height: DRAG_BAR_HEIGHT } as any}
       />
       {/* 环境变量警告横幅 */}
       {showEnvBanner && envConflicts.length > 0 && (
@@ -387,13 +508,18 @@ function App() {
       )}
 
       <header
-        className="fixed top-0 z-50 w-full py-3 bg-background/80 backdrop-blur-md transition-all duration-300"
+        className="fixed z-50 w-full transition-all duration-300 bg-background/80 backdrop-blur-md"
         data-tauri-drag-region
-        style={{ WebkitAppRegion: "drag" } as any}
+        style={
+          {
+            WebkitAppRegion: "drag",
+            top: DRAG_BAR_HEIGHT,
+            height: HEADER_HEIGHT,
+          } as any
+        }
       >
-        <div className="h-4 w-full" aria-hidden data-tauri-drag-region />
         <div
-          className="mx-auto max-w-[56rem] px-6 flex flex-wrap items-center justify-between gap-2"
+          className="mx-auto flex h-full max-w-[56rem] flex-wrap items-center justify-between gap-2 px-6"
           data-tauri-drag-region
           style={{ WebkitAppRegion: "drag" } as any}
         >
@@ -409,7 +535,7 @@ function App() {
                   onClick={() => setCurrentView("providers")}
                   className="mr-2 rounded-lg"
                 >
-                  <ArrowLeft className="h-4 w-4" />
+                  <ArrowLeft className="w-4 h-4" />
                 </Button>
                 <h1 className="text-lg font-semibold">
                   {currentView === "settings" && t("settings.title")}
@@ -418,6 +544,10 @@ function App() {
                   {currentView === "skills" && t("skills.title")}
                   {currentView === "mcp" && t("mcp.unifiedPanel.title")}
                   {currentView === "agents" && t("agents.title")}
+                  {currentView === "universal" &&
+                    t("universalProvider.title", {
+                      defaultValue: "统一供应商",
+                    })}
                 </h1>
               </div>
             ) : (
@@ -443,7 +573,7 @@ function App() {
                     title={t("common.settings")}
                     className="hover:bg-black/5 dark:hover:bg-white/5"
                   >
-                    <Settings className="h-4 w-4" />
+                    <Settings className="w-4 h-4" />
                   </Button>
                 </div>
                 <UpdateBadge onClick={() => setCurrentView("settings")} />
@@ -452,27 +582,27 @@ function App() {
           </div>
 
           <div
-            className="flex items-center gap-2"
+            className="flex items-center gap-2 h-[32px]"
             style={{ WebkitAppRegion: "no-drag" } as any}
           >
             {currentView === "prompts" && (
               <Button
                 size="icon"
                 onClick={() => promptPanelRef.current?.openAdd()}
-                className={addActionButtonClass}
+                className={`ml-auto ${addActionButtonClass}`}
                 title={t("prompts.add")}
               >
-                <Plus className="h-5 w-5" />
+                <Plus className="w-5 h-5" />
               </Button>
             )}
             {currentView === "mcp" && (
               <Button
                 size="icon"
                 onClick={() => mcpPanelRef.current?.openAdd()}
-                className={addActionButtonClass}
+                className={`ml-auto ${addActionButtonClass}`}
                 title={t("mcp.unifiedPanel.addServer")}
               >
-                <Plus className="h-5 w-5" />
+                <Plus className="w-5 h-5" />
               </Button>
             )}
             {currentView === "skills" && (
@@ -483,7 +613,7 @@ function App() {
                   onClick={() => skillsPageRef.current?.refresh()}
                   className="hover:bg-black/5 dark:hover:bg-white/5"
                 >
-                  <RefreshCw className="h-4 w-4 mr-2" />
+                  <RefreshCw className="w-4 h-4 mr-2" />
                   {t("skills.refresh")}
                 </Button>
                 <Button
@@ -492,7 +622,7 @@ function App() {
                   onClick={() => skillsPageRef.current?.openRepoManager()}
                   className="hover:bg-black/5 dark:hover:bg-white/5"
                 >
-                  <Settings className="h-4 w-4 mr-2" />
+                  <Settings className="w-4 h-4 mr-2" />
                   {t("skills.repoManager")}
                 </Button>
               </>
@@ -503,7 +633,7 @@ function App() {
 
                 <AppSwitcher activeApp={activeApp} onSwitch={setActiveApp} />
 
-                <div className="bg-muted p-1 rounded-xl flex items-center gap-1">
+                <div className="flex items-center gap-1 p-1 bg-muted rounded-xl">
                   <Button
                     variant="ghost"
                     size="sm"
@@ -517,7 +647,7 @@ function App() {
                     )}
                     title={t("skills.manage")}
                   >
-                    <Wrench className="h-4 w-4 flex-shrink-0" />
+                    <Wrench className="flex-shrink-0 w-4 h-4" />
                   </Button>
                   {/* TODO: Agents 功能开发中，暂时隐藏入口 */}
                   {/* {isClaudeApp && (
@@ -528,7 +658,7 @@ function App() {
                         className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
                         title="Agents"
                       >
-                      <Bot className="h-4 w-4" />
+                        <Bot className="w-4 h-4" />
                       </Button>
                     )} */}
                   <Button
@@ -538,7 +668,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="h-4 w-4" />
+                    <Book className="w-4 h-4" />
                   </Button>
                   <Button
                     variant="ghost"
@@ -547,7 +677,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="h-4 w-4" />
+                    <Server className="w-4 h-4" />
                   </Button>
                 </div>
 
@@ -556,7 +686,7 @@ function App() {
                   size="icon"
                   className={`ml-2 ${addActionButtonClass}`}
                 >
-                  <Plus className="h-5 w-5" />
+                  <Plus className="w-5 h-5" />
                 </Button>
               </>
             )}
@@ -564,13 +694,8 @@ function App() {
         </div>
       </header>
 
-      <main
+      <main className="flex-1 pb-12 animate-fade-in ">
-        className={`flex-1 overflow-y-auto pb-12 animate-fade-in scroll-overlay ${
+        <div className="pb-12">{renderContent()}</div>
-          currentView === "providers" ? "pt-24" : "pt-20"
-        }`}
-        style={{ overflowX: "hidden" }}
-      >
-        {renderContent()}
       </main>
 
       <AddProviderDialog
@@ -582,7 +707,7 @@ function App() {
 
       <EditProviderDialog
         open={Boolean(editingProvider)}
-        provider={editingProvider}
+        provider={effectiveEditingProvider}
         onOpenChange={(open) => {
           if (!open) {
             setEditingProvider(null);
@@ -590,17 +715,19 @@ function App() {
         }}
         onSubmit={handleEditProvider}
         appId={activeApp}
-        isProxyTakeover={isProxyRunning && isTakeoverActive}
+        isProxyTakeover={isProxyRunning && isCurrentAppTakeoverActive}
       />
 
-      {usageProvider && (
+      {effectiveUsageProvider && (
         <UsageScriptModal
-          provider={usageProvider}
+          provider={effectiveUsageProvider}
           appId={activeApp}
           isOpen={Boolean(usageProvider)}
           onClose={() => setUsageProvider(null)}
           onSave={(script) => {
+            if (usageProvider) {
               void saveUsageScript(usageProvider, script);
+            }
           }}
         />
       )}

src/components/AppSwitcher.tsx

@@ -24,11 +24,11 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
   };
 
   return (
-    <div className="inline-flex bg-muted rounded-lg p-1 gap-1">
+    <div className="inline-flex bg-muted rounded-xl p-1 gap-1">
       <button
         type="button"
         onClick={() => handleSwitch("claude")}
-        className={`group inline-flex items-center gap-2 px-3 py-2 rounded-md text-sm font-medium transition-all duration-200 ${
+        className={`group inline-flex items-center gap-2 px-3 h-8 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 py-2 rounded-md text-sm font-medium transition-all duration-200 ${
+        className={`group inline-flex items-center gap-2 px-3 h-8 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 py-2 rounded-md text-sm font-medium transition-all duration-200 ${
+        className={`group inline-flex items-center gap-2 px-3 h-8 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"

src/components/UpdateBadge.tsx

@@ -56,7 +56,7 @@ export function UpdateBadge({ className = "", onClick }: UpdateBadgeProps) {
         "
         aria-label={t("common.close")}
       >
-        <X className="w-3 h-3 text-gray-400 dark:text-gray-500" />
+        <X className="w-3 h-3 text-muted-foreground" />
       </button>
     </div>
   );

src/components/UsageFooter.tsx

@@ -114,7 +114,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
         {/* 第一行：更新时间和刷新按钮 */}
         <div className="flex items-center gap-2 justify-end">
           {/* 上次查询时间 */}
-          <span className="text-[10px] text-gray-400 dark:text-gray-500 flex items-center gap-1">
+          <span className="text-[10px] text-muted-foreground/70 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-gray-100 dark:hover:bg-gray-800 transition-colors disabled:opacity-50 flex-shrink-0 text-gray-400 dark:text-gray-500"
+            className="p-1 rounded hover:bg-muted transition-colors disabled:opacity-50 flex-shrink-0 text-muted-foreground"
             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-gray-400 dark:text-gray-500 flex items-center gap-1">
+            <span className="text-[10px] text-muted-foreground/70 flex items-center gap-1">
               <Clock size={10} />
               {formatRelativeTime(lastQueriedAt, now, t)}
             </span>

src/components/common/FullScreenPanel.tsx

@@ -1,5 +1,6 @@
 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";
 
@@ -32,10 +33,14 @@ export const FullScreenPanel: React.FC<FullScreenPanelProps> = ({
     };
   }, [isOpen]);
 
-  if (!isOpen) return null;
-
   return createPortal(
-    <div
+    <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"
           style={{ backgroundColor: "hsl(var(--background))" }}
         >
@@ -46,7 +51,12 @@ export const FullScreenPanel: React.FC<FullScreenPanelProps> = ({
           >
             <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}>
+              <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>
@@ -71,7 +81,9 @@ export const FullScreenPanel: React.FC<FullScreenPanelProps> = ({
               </div>
             </div>
           )}
-    </div>,
+        </motion.div>
+      )}
+    </AnimatePresence>,
     document.body,
   );
 };

src/components/env/EnvWarningBanner.tsx

@@ -191,14 +191,14 @@ export function EnvWarningBanner({
                           <div className="flex-1 min-w-0">
                             <label
                               htmlFor={key}
-                              className="block text-sm font-medium text-gray-900 dark:text-gray-100 cursor-pointer"
+                              className="block text-sm font-medium text-foreground cursor-pointer"
                             >
                               {conflict.varName}
                             </label>
-                            <p className="text-xs text-gray-600 dark:text-gray-400 mt-1 break-all">
+                            <p className="text-xs text-muted-foreground mt-1 break-all">
                               {t("env.field.value")}: {conflict.varValue}
                             </p>
-                            <p className="text-xs text-gray-500 dark:text-gray-500 mt-1">
+                            <p className="text-xs text-muted-foreground mt-1">
                               {t("env.field.source")}:{" "}
                               {getSourceDescription(conflict)}
                             </p>

src/components/mcp/McpWizardModal.tsx

@@ -239,7 +239,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
         <div className="flex-1 overflow-y-auto px-6 py-4 space-y-4">
           {/* Hint */}
           <div className="rounded-lg border border-border-default bg-gray-100/50 dark:bg-gray-800/50 p-3">
-            <p className="text-sm text-gray-500 dark:text-gray-400">
+            <p className="text-sm text-muted-foreground">
               {t("mcp.wizard.hint")}
             </p>
           </div>
@@ -248,7 +248,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
           <div className="space-y-4 min-h-[400px]">
             {/* Type */}
             <div>
-              <label className="mb-2 block text-sm font-medium text-gray-900 dark:text-gray-100">
+              <label className="mb-2 block text-sm font-medium text-foreground">
                 {t("mcp.wizard.type")} <span className="text-red-500">*</span>
               </label>
               <div className="flex gap-4">
@@ -262,7 +262,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                     }
                     className="w-4 h-4 accent-blue-500"
                   />
-                  <span className="text-sm text-gray-900 dark:text-gray-100">
+                  <span className="text-sm text-foreground">
                     {t("mcp.wizard.typeStdio")}
                   </span>
                 </label>
@@ -276,7 +276,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                     }
                     className="w-4 h-4 accent-blue-500"
                   />
-                  <span className="text-sm text-gray-900 dark:text-gray-100">
+                  <span className="text-sm text-foreground">
                     {t("mcp.wizard.typeHttp")}
                   </span>
                 </label>
@@ -290,7 +290,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                     }
                     className="w-4 h-4 accent-blue-500"
                   />
-                  <span className="text-sm text-gray-900 dark:text-gray-100">
+                  <span className="text-sm text-foreground">
                     {t("mcp.wizard.typeSse")}
                   </span>
                 </label>
@@ -299,7 +299,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
 
             {/* Title */}
             <div>
-              <label className="mb-1 block text-sm font-medium text-gray-900 dark:text-gray-100">
+              <label className="mb-1 block text-sm font-medium text-foreground">
                 {t("mcp.form.title")} <span className="text-red-500">*</span>
               </label>
               <Input
@@ -317,7 +317,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
               <>
                 {/* Command */}
                 <div>
-                  <label className="mb-1 block text-sm font-medium text-gray-900 dark:text-gray-100">
+                  <label className="mb-1 block text-sm font-medium text-foreground">
                     {t("mcp.wizard.command")}{" "}
                     <span className="text-red-500">*</span>
                   </label>
@@ -333,7 +333,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
 
                 {/* Args */}
                 <div>
-                  <label className="mb-1 block text-sm font-medium text-gray-900 dark:text-gray-100">
+                  <label className="mb-1 block text-sm font-medium text-foreground">
                     {t("mcp.wizard.args")}
                   </label>
                   <textarea
@@ -341,13 +341,13 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                     onChange={(e) => setWizardArgs(e.target.value)}
                     placeholder={t("mcp.wizard.argsPlaceholder")}
                     rows={3}
-                    className="w-full rounded-md border border-border-default bg-white dark:bg-gray-800 px-3 py-2 text-sm font-mono text-gray-900 dark:text-gray-100 placeholder:text-gray-400 dark:placeholder:text-gray-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 resize-y"
+                    className="w-full rounded-md border border-border-default bg-background px-3 py-2 text-sm font-mono text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-blue-500/20 resize-y"
                   />
                 </div>
 
                 {/* Env */}
                 <div>
-                  <label className="mb-1 block text-sm font-medium text-gray-900 dark:text-gray-100">
+                  <label className="mb-1 block text-sm font-medium text-foreground">
                     {t("mcp.wizard.env")}
                   </label>
                   <textarea
@@ -355,7 +355,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                     onChange={(e) => setWizardEnv(e.target.value)}
                     placeholder={t("mcp.wizard.envPlaceholder")}
                     rows={3}
-                    className="w-full rounded-md border border-border-default bg-white dark:bg-gray-800 px-3 py-2 text-sm font-mono text-gray-900 dark:text-gray-100 placeholder:text-gray-400 dark:placeholder:text-gray-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 resize-y"
+                    className="w-full rounded-md border border-border-default bg-background px-3 py-2 text-sm font-mono text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-blue-500/20 resize-y"
                   />
                 </div>
               </>
@@ -366,7 +366,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
               <>
                 {/* URL */}
                 <div>
-                  <label className="mb-1 block text-sm font-medium text-gray-900 dark:text-gray-100">
+                  <label className="mb-1 block text-sm font-medium text-foreground">
                     {t("mcp.wizard.url")}{" "}
                     <span className="text-red-500">*</span>
                   </label>
@@ -382,7 +382,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
 
                 {/* Headers */}
                 <div>
-                  <label className="mb-1 block text-sm font-medium text-gray-900 dark:text-gray-100">
+                  <label className="mb-1 block text-sm font-medium text-foreground">
                     {t("mcp.wizard.headers")}
                   </label>
                   <textarea
@@ -390,7 +390,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                     onChange={(e) => setWizardHeaders(e.target.value)}
                     placeholder={t("mcp.wizard.headersPlaceholder")}
                     rows={3}
-                    className="w-full rounded-md border border-border-default bg-white dark:bg-gray-800 px-3 py-2 text-sm font-mono text-gray-900 dark:text-gray-100 placeholder:text-gray-400 dark:placeholder:text-gray-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 resize-y"
+                    className="w-full rounded-md border border-border-default bg-background px-3 py-2 text-sm font-mono text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-blue-500/20 resize-y"
                   />
                 </div>
               </>
@@ -404,7 +404,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
             wizardUrl ||
             wizardHeaders) && (
             <div className="space-y-2 border-t border-border-default pt-4">
-              <h3 className="text-sm font-medium text-gray-900 dark:text-gray-100">
+              <h3 className="text-sm font-medium text-foreground">
                 {t("mcp.wizard.preview")}
               </h3>
               <pre className="overflow-x-auto rounded-lg bg-gray-100 dark:bg-gray-800 p-3 text-xs font-mono text-gray-700 dark:text-gray-300">

src/components/mcp/UnifiedMcpPanel.tsx

@@ -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-gray-500 dark:text-gray-400">
+          <div className="text-center py-12 text-muted-foreground">
             {t("mcp.loading")}
           </div>
         ) : serverEntries.length === 0 ? (
           <div className="text-center py-12">
-            <div className="w-16 h-16 mx-auto mb-4 bg-gray-100 dark:bg-gray-800 rounded-full flex items-center justify-center">
+            <div className="w-16 h-16 mx-auto mb-4 bg-muted rounded-full flex items-center justify-center">
-              <Server size={24} className="text-gray-400 dark:text-gray-500" />
+              <Server size={24} className="text-muted-foreground" />
             </div>
-            <h3 className="text-lg font-medium text-gray-900 dark:text-gray-100 mb-2">
+            <h3 className="text-lg font-medium text-foreground mb-2">
               {t("mcp.unifiedPanel.noServers")}
             </h3>
-            <p className="text-gray-500 dark:text-gray-400 text-sm">
+            <p className="text-muted-foreground text-sm">
               {t("mcp.emptyDescription")}
             </p>
           </div>
@@ -237,9 +237,7 @@ 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-gray-900 dark:text-gray-100">
+          <h3 className="font-medium text-foreground">{name}</h3>
-            {name}
-          </h3>
           {docsUrl && (
             <Button
               type="button"
@@ -253,12 +251,12 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
           )}
         </div>
         {description && (
-          <p className="text-sm text-gray-500 dark:text-gray-400 line-clamp-2">
+          <p className="text-sm text-muted-foreground line-clamp-2">
             {description}
           </p>
         )}
         {!description && tags && tags.length > 0 && (
-          <p className="text-xs text-gray-400 dark:text-gray-500 truncate">
+          <p className="text-xs text-muted-foreground/70 truncate">
             {tags.join(", ")}
           </p>
         )}
@@ -269,7 +267,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
         <div className="flex items-center justify-between gap-3">
           <label
             htmlFor={`${id}-claude`}
-            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
+            className="text-sm text-foreground/80 cursor-pointer"
           >
             {t("mcp.unifiedPanel.apps.claude")}
           </label>
@@ -285,7 +283,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
         <div className="flex items-center justify-between gap-3">
           <label
             htmlFor={`${id}-codex`}
-            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
+            className="text-sm text-foreground/80 cursor-pointer"
           >
             {t("mcp.unifiedPanel.apps.codex")}
           </label>
@@ -301,7 +299,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
         <div className="flex items-center justify-between gap-3">
           <label
             htmlFor={`${id}-gemini`}
-            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
+            className="text-sm text-foreground/80 cursor-pointer"
           >
             {t("mcp.unifiedPanel.apps.gemini")}
           </label>

src/components/prompts/PromptListItem.tsx

@@ -36,11 +36,9 @@ const PromptListItem: React.FC<PromptListItemProps> = ({
         </div>
 
         <div className="flex-1 min-w-0">
-          <h3 className="font-medium text-gray-900 dark:text-gray-100 mb-1">
+          <h3 className="font-medium text-foreground mb-1">{prompt.name}</h3>
-            {prompt.name}
-          </h3>
           {prompt.description && (
-            <p className="text-sm text-gray-500 dark:text-gray-400 truncate">
+            <p className="text-sm text-muted-foreground truncate">
               {prompt.description}
             </p>
           )}

src/components/prompts/PromptPanel.tsx

@@ -108,21 +108,18 @@ const PromptPanel = React.forwardRef<PromptPanelHandle, PromptPanelProps>(
 
         <div className="flex-1 overflow-y-auto pb-16">
           {loading ? (
-            <div className="text-center py-12 text-gray-500 dark:text-gray-400">
+            <div className="text-center py-12 text-muted-foreground">
               {t("prompts.loading")}
             </div>
           ) : promptEntries.length === 0 ? (
             <div className="text-center py-12">
-              <div className="w-16 h-16 mx-auto mb-4 bg-gray-100 dark:bg-gray-800 rounded-full flex items-center justify-center">
+              <div className="w-16 h-16 mx-auto mb-4 bg-muted rounded-full flex items-center justify-center">
-                <FileText
+                <FileText size={24} className="text-muted-foreground" />
-                  size={24}
-                  className="text-gray-400 dark:text-gray-500"
-                />
               </div>
-              <h3 className="text-lg font-medium text-gray-900 dark:text-gray-100 mb-2">
+              <h3 className="text-lg font-medium text-foreground mb-2">
                 {t("prompts.empty")}
               </h3>
-              <p className="text-gray-500 dark:text-gray-400 text-sm">
+              <p className="text-muted-foreground text-sm">
                 {t("prompts.emptyDescription")}
               </p>
             </div>

src/components/providers/AddProviderDialog.tsx

@@ -1,17 +1,23 @@
-import { useCallback } from "react";
+import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Plus } from "lucide-react";
+import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { FullScreenPanel } from "@/components/common/FullScreenPanel";
-import type { Provider, CustomEndpoint } from "@/types";
+import type { Provider, CustomEndpoint, UniversalProvider } from "@/types";
 import type { AppId } from "@/lib/api";
+import { universalProvidersApi } from "@/lib/api";
 import {
   ProviderForm,
   type ProviderFormValues,
 } from "@/components/providers/forms/ProviderForm";
+import { UniversalProviderFormModal } from "@/components/universal/UniversalProviderFormModal";
+import { UniversalProviderPanel } from "@/components/universal";
 import { providerPresets } from "@/config/claudeProviderPresets";
 import { codexProviderPresets } from "@/config/codexProviderPresets";
 import { geminiProviderPresets } from "@/config/geminiProviderPresets";
+import type { UniversalProviderPreset } from "@/config/universalProviderPresets";
 
 interface AddProviderDialogProps {
   open: boolean;
@@ -27,6 +33,46 @@ export function AddProviderDialog({
   onSubmit,
 }: AddProviderDialogProps) {
   const { t } = useTranslation();
+  const [activeTab, setActiveTab] = useState<"app-specific" | "universal">(
+    "app-specific",
+  );
+  const [universalFormOpen, setUniversalFormOpen] = useState(false);
+  const [selectedUniversalPreset, setSelectedUniversalPreset] =
+    useState<UniversalProviderPreset | null>(null);
+
+  // Handle universal provider save
+  const handleUniversalProviderSave = useCallback(
+    async (provider: UniversalProvider) => {
+      try {
+        await universalProvidersApi.upsert(provider);
+        toast.success(
+          t("universalProvider.addSuccess", {
+            defaultValue: "统一供应商添加成功",
+          }),
+        );
+        setUniversalFormOpen(false);
+        setSelectedUniversalPreset(null);
+        onOpenChange(false);
+      } catch (error) {
+        console.error(
+          "[AddProviderDialog] Failed to save universal provider",
+          error,
+        );
+        toast.error(
+          t("universalProvider.addFailed", {
+            defaultValue: "统一供应商添加失败",
+          }),
+        );
+      }
+    },
+    [t, onOpenChange],
+  );
+
+  // Close universal form and return to main dialog
+  const handleUniversalFormClose = useCallback(() => {
+    setUniversalFormOpen(false);
+    setSelectedUniversalPreset(null);
+  }, []);
 
   const handleSubmit = useCallback(
     async (values: ProviderFormValues) => {
@@ -156,14 +202,9 @@ export function AddProviderDialog({
     [appId, onSubmit, onOpenChange],
   );
 
-  const submitLabel =
+  // 动态 footer：根据当前 Tab 显示不同按钮
-    appId === "claude"
+  const footer =
-      ? t("provider.addClaudeProvider")
+    activeTab === "app-specific" ? (
-      : appId === "codex"
-        ? t("provider.addCodexProvider")
-        : t("provider.addGeminiProvider");
-
-  const footer = (
       <>
         <Button
           variant="outline"
@@ -181,15 +222,46 @@ export function AddProviderDialog({
           {t("common.add")}
         </Button>
       </>
+    ) : (
+      <>
+        <Button
+          variant="outline"
+          onClick={() => onOpenChange(false)}
+          className="border-border/20 hover:bg-accent hover:text-accent-foreground"
+        >
+          {t("common.cancel")}
+        </Button>
+        <Button
+          onClick={() => setUniversalFormOpen(true)}
+          className="bg-primary text-primary-foreground hover:bg-primary/90"
+        >
+          <Plus className="h-4 w-4 mr-2" />
+          {t("universalProvider.add")}
+        </Button>
+      </>
     );
 
   return (
     <FullScreenPanel
       isOpen={open}
-      title={submitLabel}
+      title={t("provider.addNewProvider")}
       onClose={() => onOpenChange(false)}
       footer={footer}
     >
+      <Tabs
+        value={activeTab}
+        onValueChange={(v) => setActiveTab(v as "app-specific" | "universal")}
+      >
+        <TabsList className="grid w-full grid-cols-2 mb-6">
+          <TabsTrigger value="app-specific">
+            {t(`apps.${appId}`)} {t("provider.tabProvider")}
+          </TabsTrigger>
+          <TabsTrigger value="universal">
+            {t("provider.tabUniversal")}
+          </TabsTrigger>
+        </TabsList>
+
+        <TabsContent value="app-specific" className="mt-0">
           <ProviderForm
             appId={appId}
             submitLabel={t("common.add")}
@@ -197,6 +269,20 @@ export function AddProviderDialog({
             onCancel={() => onOpenChange(false)}
             showButtons={false}
           />
+        </TabsContent>
+
+        <TabsContent value="universal" className="mt-0">
+          <UniversalProviderPanel />
+        </TabsContent>
+      </Tabs>
+
+      {/* Universal Provider Form Modal */}
+      <UniversalProviderFormModal
+        isOpen={universalFormOpen}
+        onClose={handleUniversalFormClose}
+        onSave={handleUniversalProviderSave}
+        initialPreset={selectedUniversalPreset}
+      />
     </FullScreenPanel>
   );
 }

src/components/providers/FailoverPriorityBadge.tsx

@@ -0,0 +1,34 @@
+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>
+  );
+}

src/components/providers/HealthStatusIndicator.tsx

@@ -1,6 +1,7 @@
 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;
@@ -11,17 +12,20 @@ interface HealthStatusIndicatorProps {
 const statusConfig = {
   operational: {
     color: "bg-emerald-500",
-    label: "正常",
+    labelKey: "health.operational",
+    labelFallback: "正常",
     textColor: "text-emerald-600 dark:text-emerald-400",
   },
   degraded: {
     color: "bg-yellow-500",
-    label: "降级",
+    labelKey: "health.degraded",
+    labelFallback: "降级",
     textColor: "text-yellow-600 dark:text-yellow-400",
   },
   failed: {
     color: "bg-red-500",
-    label: "失败",
+    labelKey: "health.failed",
+    labelFallback: "失败",
     textColor: "text-red-600 dark:text-red-400",
   },
 };
@@ -31,13 +35,15 @@ 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)}>
-        {config.label}
+        {label}
         {responseTimeMs !== undefined && ` (${responseTimeMs}ms)`}
       </span>
     </div>

src/components/providers/ProviderActions.tsx

@@ -5,6 +5,7 @@ import {
   Edit,
   Loader2,
   Play,
+  Plus,
   TestTube2,
   Trash2,
 } from "lucide-react";
@@ -22,6 +23,10 @@ interface ProviderActionsProps {
   onTest?: () => void;
   onConfigureUsage: () => void;
   onDelete: () => void;
+  // 故障转移相关
+  isAutoFailoverEnabled?: boolean;
+  isInFailoverQueue?: boolean;
+  onToggleFailover?: (enabled: boolean) => void;
 }
 
 export function ProviderActions({
@@ -34,38 +39,88 @@ export function ProviderActions({
   onTest,
   onConfigureUsage,
   onDelete,
+  // 故障转移相关
+  isAutoFailoverEnabled = false,
+  isInFailoverQueue = false,
+  onToggleFailover,
 }: 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={isCurrent ? "secondary" : "default"}
+        variant={buttonState.variant}
-        onClick={onSwitch}
+        onClick={handleMainButtonClick}
-        disabled={isCurrent}
+        disabled={buttonState.disabled}
-        className={cn(
+        className={cn("w-[4.5rem] px-2.5", buttonState.className)}
-          "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",
-        )}
       >
-        {isCurrent ? (
+        {buttonState.icon}
-          <>
+        {buttonState.text}
-            <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">

src/components/providers/ProviderCard.tsx

@@ -12,6 +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 { FailoverPriorityBadge } from "@/components/providers/FailoverPriorityBadge";
 import { useProviderHealth } from "@/lib/query/failover";
 import { useUsageQuery } from "@/lib/query/queries";
 
@@ -36,6 +37,12 @@ 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) => {
@@ -88,6 +95,12 @@ export function ProviderCard({
   isProxyRunning,
   isProxyTakeover = false,
   dragHandleProps,
+  // 故障转移相关
+  isAutoFailoverEnabled = false,
+  failoverPriority,
+  isInFailoverQueue = false,
+  onToggleFailover,
+  activeProviderId,
 }: ProviderCardProps) {
   const { t } = useTranslation();
 
@@ -148,21 +161,32 @@ 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 使用绿色边框，否则使用蓝色
+        // hover 时的边框效果
-        isProxyTakeover
+        isAutoFailoverEnabled || isProxyTakeover
           ? "hover:border-emerald-500/50"
           : "hover:border-border-active",
-        // 代理接管模式下当前供应商使用绿色边框
+        // 当前激活的供应商边框样式
-        isProxyTakeover && isCurrent
+        shouldUseGreen &&
-          ? "border-emerald-500/60 shadow-sm shadow-emerald-500/10"
+          "border-emerald-500/60 shadow-sm shadow-emerald-500/10",
-          : isCurrent
+        shouldUseBlue && "border-blue-500/60 shadow-sm shadow-blue-500/10",
-            ? "border-primary/50 shadow-sm"
+        !isActiveProvider && "hover:shadow-sm",
-            : "hover:shadow-sm",
         dragHandleProps?.isDragging &&
           "cursor-grabbing border-primary shadow-lg scale-105 z-10",
       )}
@@ -170,11 +194,11 @@ export function ProviderCard({
       <div
         className={cn(
           "absolute inset-0 bg-gradient-to-r to-transparent transition-opacity duration-500 pointer-events-none",
-          // 代理接管模式下使用绿色渐变，否则使用蓝色主色调
+          // 代理接管模式使用绿色渐变，普通模式使用蓝色渐变
-          isProxyTakeover && isCurrent
+          shouldUseGreen && "from-emerald-500/10",
-            ? "from-emerald-500/10"
+          shouldUseBlue && "from-blue-500/10",
-            : "from-primary/10",
+          !isActiveProvider && "from-primary/10",
-          isCurrent ? "opacity-100" : "opacity-0",
+          isActiveProvider ? "opacity-100" : "opacity-0",
         )}
       />
       <div className="relative flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
@@ -209,13 +233,20 @@ export function ProviderCard({
                 {provider.name}
               </h3>
 
-              {/* 健康状态徽章和优先级 */}
+              {/* 健康状态徽章 */}
-              {isProxyRunning && health && (
+              {isProxyRunning && isInFailoverQueue && health && (
                 <ProviderHealthBadge
                   consecutiveFailures={health.consecutive_failures}
                 />
               )}
 
+              {/* 故障转移优先级徽章 */}
+              {isAutoFailoverEnabled &&
+                isInFailoverQueue &&
+                failoverPriority && (
+                  <FailoverPriorityBadge priority={failoverPriority} />
+                )}
+
               {provider.category === "third_party" &&
                 provider.meta?.isPartner && (
                   <span
@@ -308,6 +339,10 @@ export function ProviderCard({
               onTest={onTest ? () => onTest(provider) : undefined}
               onConfigureUsage={() => onConfigureUsage(provider)}
               onDelete={() => onDelete(provider)}
+              // 故障转移相关
+              isAutoFailoverEnabled={isAutoFailoverEnabled}
+              isInFailoverQueue={isInFailoverQueue}
+              onToggleFailover={onToggleFailover}
             />
           </div>
         </div>

src/components/providers/ProviderHealthBadge.tsx

@@ -1,5 +1,6 @@
 import { cn } from "@/lib/utils";
 import { ProviderHealthStatus } from "@/types/proxy";
+import { useTranslation } from "react-i18next";
 
 interface ProviderHealthBadgeProps {
   consecutiveFailures: number;
@@ -14,11 +15,14 @@ export function ProviderHealthBadge({
   consecutiveFailures,
   className,
 }: ProviderHealthBadgeProps) {
+  const { t } = useTranslation();
+
   // 根据失败次数计算状态
   const getStatus = () => {
     if (consecutiveFailures === 0) {
       return {
-        label: "正常",
+        labelKey: "health.operational",
+        labelFallback: "正常",
         status: ProviderHealthStatus.Healthy,
         color: "bg-green-500",
         // 使用更深/柔和的背景色，去除可能的白色内容感
@@ -27,7 +31,8 @@ export function ProviderHealthBadge({
       };
     } else if (consecutiveFailures < 5) {
       return {
-        label: "降级",
+        labelKey: "health.degraded",
+        labelFallback: "降级",
         status: ProviderHealthStatus.Degraded,
         color: "bg-yellow-500",
         bgColor: "bg-yellow-500/10",
@@ -35,7 +40,8 @@ export function ProviderHealthBadge({
       };
     } else {
       return {
-        label: "熔断",
+        labelKey: "health.circuitOpen",
+        labelFallback: "熔断",
         status: ProviderHealthStatus.Failed,
         color: "bg-red-500",
         bgColor: "bg-red-500/10",
@@ -45,6 +51,9 @@ export function ProviderHealthBadge({
   };
 
   const statusConfig = getStatus();
+  const label = t(statusConfig.labelKey, {
+    defaultValue: statusConfig.labelFallback,
+  });
 
   return (
     <div
@@ -54,10 +63,13 @@ export function ProviderHealthBadge({
         statusConfig.textColor,
         className,
       )}
-      title={`连续失败 ${consecutiveFailures} 次`}
+      title={t("health.consecutiveFailures", {
+        count: consecutiveFailures,
+        defaultValue: `连续失败 ${consecutiveFailures} 次`,
+      })}
     >
       <div className={cn("w-2 h-2 rounded-full", statusConfig.color)} />
-      <span>{statusConfig.label}</span>
+      <span>{label}</span>
     </div>
   );
 }

src/components/providers/ProviderList.tsx

@@ -5,13 +5,31 @@ import {
   useSortable,
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
-import type { CSSProperties } from "react";
+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 { 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>;
@@ -27,6 +45,7 @@ interface ProviderListProps {
   isLoading?: boolean;
   isProxyRunning?: boolean; // 代理服务运行状态
   isProxyTakeover?: boolean; // 代理接管模式（Live配置已被接管）
+  activeProviderId?: string; // 代理当前实际使用的供应商 ID（用于故障转移模式下标注绿色边框）
 }
 
 export function ProviderList({
@@ -41,9 +60,11 @@ export function ProviderList({
   onOpenWebsite,
   onCreate,
   isLoading = false,
-  isProxyRunning = false, // 默认值为 false
+  isProxyRunning = false,
-  isProxyTakeover = false, // 默认值为 false
+  isProxyTakeover = false,
+  activeProviderId,
 }: ProviderListProps) {
+  const { t } = useTranslation();
   const { sortedProviders, sensors, handleDragEnd } = useDragSort(
     providers,
     appId,
@@ -52,17 +73,103 @@ 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="h-28 w-full rounded-lg border border-dashed border-muted-foreground/40 bg-muted/40"
+            className="w-full border border-dashed rounded-lg h-28 border-muted-foreground/40 bg-muted/40"
           />
         ))}
       </div>
@@ -73,21 +180,18 @@ export function ProviderList({
     return <ProviderEmptyState onCreate={onCreate} />;
   }
 
-  return (
+  const renderProviderList = () => (
     <DndContext
       sensors={sensors}
       collisionDetection={closestCenter}
       onDragEnd={handleDragEnd}
     >
       <SortableContext
-        items={sortedProviders.map((provider) => provider.id)}
+        items={filteredProviders.map((provider) => provider.id)}
         strategy={verticalListSortingStrategy}
       >
-        <div
+        <div className="space-y-3">
-          className="space-y-3 animate-slide-up"
+          {filteredProviders.map((provider) => (
-          style={{ animationDelay: "0.1s" }}
-        >
-          {sortedProviders.map((provider) => (
             <SortableProviderCard
               key={provider.id}
               provider={provider}
@@ -103,12 +207,98 @@ 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 {
@@ -125,6 +315,12 @@ interface SortableProviderCardProps {
   isTesting: boolean;
   isProxyRunning: boolean;
   isProxyTakeover: boolean;
+  // 故障转移相关
+  isAutoFailoverEnabled: boolean;
+  failoverPriority?: number;
+  isInFailoverQueue: boolean;
+  onToggleFailover: (enabled: boolean) => void;
+  activeProviderId?: string;
 }
 
 function SortableProviderCard({
@@ -141,6 +337,11 @@ function SortableProviderCard({
   isTesting,
   isProxyRunning,
   isProxyTakeover,
+  isAutoFailoverEnabled,
+  failoverPriority,
+  isInFailoverQueue,
+  onToggleFailover,
+  activeProviderId,
 }: SortableProviderCardProps) {
   const {
     setNodeRef,
@@ -179,6 +380,12 @@ function SortableProviderCard({
           listeners,
           isDragging,
         }}
+        // 故障转移相关
+        isAutoFailoverEnabled={isAutoFailoverEnabled}
+        failoverPriority={failoverPriority}
+        isInFailoverQueue={isInFailoverQueue}
+        onToggleFailover={onToggleFailover}
+        activeProviderId={activeProviderId}
       />
     </div>
   );

src/components/providers/forms/ApiKeyInput.tsx

@@ -30,16 +30,13 @@ const ApiKeyInput: React.FC<ApiKeyInputProps> = ({
 
   const inputClass = `w-full px-3 py-2 pr-10 border rounded-lg text-sm transition-colors ${
     disabled
-      ? "bg-gray-100 dark:bg-gray-800 border-border-default text-gray-400 dark:text-gray-500 cursor-not-allowed"
+      ? "bg-muted border-border-default text-muted-foreground 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"
+      : "border-border-default bg-background text-foreground focus:outline-none focus:ring-2 focus:ring-blue-500/20 dark:focus:ring-blue-400/20"
   }`;
 
   return (
     <div className="space-y-2">
-      <label
+      <label htmlFor={id} className="block text-sm font-medium text-foreground">
-        htmlFor={id}
-        className="block text-sm font-medium text-gray-900 dark:text-gray-100"
-      >
         {label} {required && "*"}
       </label>
       <div className="relative">
@@ -58,7 +55,7 @@ const ApiKeyInput: React.FC<ApiKeyInputProps> = ({
           <button
             type="button"
             onClick={toggleShowKey}
-            className="absolute inset-y-0 right-0 flex items-center pr-3 text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 transition-colors"
+            className="absolute inset-y-0 right-0 flex items-center pr-3 text-muted-foreground hover:text-foreground transition-colors"
             aria-label={showKey ? t("apiKeyInput.hide") : t("apiKeyInput.show")}
           >
             {showKey ? <EyeOff size={16} /> : <Eye size={16} />}

src/components/providers/forms/BasicFormFields.tsx

@@ -52,7 +52,15 @@ 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 ? "点击更换图标" : "点击选择图标"}
+              title={
+                currentIcon
+                  ? t("providerIcon.clickToChange", {
+                      defaultValue: "点击更换图标",
+                    })
+                  : t("providerIcon.clickToSelect", {
+                      defaultValue: "点击选择图标",
+                    })
+              }
             >
               <ProviderIcon
                 icon={currentIcon}
@@ -145,7 +153,10 @@ export function BasicFormFields({ form }: BasicFormFieldsProps) {
           <FormItem>
             <FormLabel>{t("provider.websiteUrl")}</FormLabel>
             <FormControl>
-              <Input {...field} placeholder="https://" />
+              <Input
+                {...field}
+                placeholder={t("providerForm.websiteUrlPlaceholder")}
+              />
             </FormControl>
             <FormMessage />
           </FormItem>

src/components/providers/forms/ClaudeFormFields.tsx

@@ -1,5 +1,6 @@
 import { useTranslation } from "react-i18next";
 import { FormLabel } from "@/components/ui/form";
+import { Switch } from "@/components/ui/switch";
 import { Input } from "@/components/ui/input";
 import EndpointSpeedTest from "./EndpointSpeedTest";
 import { ApiKeySection, EndpointField } from "./shared";
@@ -39,12 +40,14 @@ interface ClaudeFormFieldsProps {
   // Model Selector
   shouldShowModelSelector: boolean;
   claudeModel: string;
+  reasoningModel: string;
   defaultHaikuModel: string;
   defaultSonnetModel: string;
   defaultOpusModel: string;
   onModelChange: (
     field:
       | "ANTHROPIC_MODEL"
+      | "ANTHROPIC_REASONING_MODEL"
       | "ANTHROPIC_DEFAULT_HAIKU_MODEL"
       | "ANTHROPIC_DEFAULT_SONNET_MODEL"
       | "ANTHROPIC_DEFAULT_OPUS_MODEL",
@@ -53,6 +56,11 @@ interface ClaudeFormFieldsProps {
 
   // Speed Test Endpoints
   speedTestEndpoints: EndpointCandidate[];
+
+  // OpenRouter Compat
+  showOpenRouterCompatToggle: boolean;
+  openRouterCompatEnabled: boolean;
+  onOpenRouterCompatChange: (enabled: boolean) => void;
 }
 
 export function ClaudeFormFields({
@@ -77,11 +85,15 @@ export function ClaudeFormFields({
   onCustomEndpointsChange,
   shouldShowModelSelector,
   claudeModel,
+  reasoningModel,
   defaultHaikuModel,
   defaultSonnetModel,
   defaultOpusModel,
   onModelChange,
   speedTestEndpoints,
+  showOpenRouterCompatToggle,
+  openRouterCompatEnabled,
+  onOpenRouterCompatChange,
 }: ClaudeFormFieldsProps) {
   const { t } = useTranslation();
 
@@ -162,6 +174,28 @@ export function ClaudeFormFields({
         />
       )}
 
+      {showOpenRouterCompatToggle && (
+        <div className="flex items-center justify-between rounded-lg border border-white/10 bg-background/60 p-4">
+          <div className="space-y-1">
+            <FormLabel>
+              {t("providerForm.openrouterCompatMode", {
+                defaultValue: "OpenRouter 兼容模式",
+              })}
+            </FormLabel>
+            <p className="text-xs text-muted-foreground">
+              {t("providerForm.openrouterCompatModeHint", {
+                defaultValue:
+                  "使用 OpenAI Chat Completions 接口并转换为 Anthropic SSE。",
+              })}
+            </p>
+          </div>
+          <Switch
+            checked={openRouterCompatEnabled}
+            onCheckedChange={onOpenRouterCompatChange}
+          />
+        </div>
+      )}
+
       {/* 模型选择器 */}
       {shouldShowModelSelector && (
         <div className="space-y-3">
@@ -185,6 +219,27 @@ export function ClaudeFormFields({
               />
             </div>
 
+            {/* 推理模型 */}
+            <div className="space-y-2">
+              <FormLabel htmlFor="reasoningModel">
+                {t("providerForm.anthropicReasoningModel", {
+                  defaultValue: "推理模型 (Thinking)",
+                })}
+              </FormLabel>
+              <Input
+                id="reasoningModel"
+                type="text"
+                value={reasoningModel}
+                onChange={(e) =>
+                  onModelChange("ANTHROPIC_REASONING_MODEL", e.target.value)
+                }
+                placeholder={t("providerForm.reasoningModelPlaceholder", {
+                  defaultValue: "",
+                })}
+                autoComplete="off"
+              />
+            </div>
+
             {/* 默认 Haiku */}
             <div className="space-y-2">
               <FormLabel htmlFor="claudeDefaultHaikuModel">

src/components/providers/forms/CodexConfigSections.tsx

@@ -47,7 +47,7 @@ export const CodexAuthSection: React.FC<CodexAuthSectionProps> = ({
     <div className="space-y-2">
       <label
         htmlFor="codexAuth"
-        className="block text-sm font-medium text-gray-900 dark:text-gray-100"
+        className="block text-sm font-medium text-foreground"
       >
         {t("codexConfig.authJson")}
       </label>
@@ -67,7 +67,7 @@ export const CodexAuthSection: React.FC<CodexAuthSectionProps> = ({
       )}
 
       {!error && (
-        <p className="text-xs text-gray-500 dark:text-gray-400">
+        <p className="text-xs text-muted-foreground">
           {t("codexConfig.authJsonHint")}
         </p>
       )}
@@ -120,12 +120,12 @@ export const CodexConfigSection: React.FC<CodexConfigSectionProps> = ({
       <div className="flex items-center justify-between">
         <label
           htmlFor="codexConfig"
-          className="block text-sm font-medium text-gray-900 dark:text-gray-100"
+          className="block text-sm font-medium text-foreground"
         >
           {t("codexConfig.configToml")}
         </label>
 
-        <label className="inline-flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400 cursor-pointer">
+        <label className="inline-flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
           <input
             type="checkbox"
             checked={useCommonConfig}
@@ -167,7 +167,7 @@ export const CodexConfigSection: React.FC<CodexConfigSectionProps> = ({
       )}
 
       {!configError && (
-        <p className="text-xs text-gray-500 dark:text-gray-400">
+        <p className="text-xs text-muted-foreground">
           {t("codexConfig.configTomlHint")}
         </p>
       )}

src/components/providers/forms/CodexFormFields.tsx

@@ -98,7 +98,7 @@ export function CodexFormFields({
         <div className="space-y-2">
           <label
             htmlFor="codexModelName"
-            className="block text-sm font-medium text-gray-900 dark:text-gray-100"
+            className="block text-sm font-medium text-foreground"
           >
             {t("codexConfig.modelName", { defaultValue: "模型名称" })}
           </label>
@@ -110,9 +110,9 @@ export function CodexFormFields({
             placeholder={t("codexConfig.modelNamePlaceholder", {
               defaultValue: "例如: gpt-5-codex",
             })}
-            className="w-full px-3 py-2 border border-border-default dark:bg-gray-800 dark:text-gray-100 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500/20 dark:focus:ring-blue-400/20 transition-colors"
+            className="w-full px-3 py-2 border border-border-default bg-background text-foreground rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500/20 dark:focus:ring-blue-400/20 transition-colors"
           />
-          <p className="text-xs text-gray-500 dark:text-gray-400">
+          <p className="text-xs text-muted-foreground">
             {t("codexConfig.modelNameHint", {
               defaultValue: "指定使用的模型，将自动更新到 config.toml 中",
             })}

src/components/providers/forms/GeminiConfigSections.tsx

@@ -47,7 +47,7 @@ export const GeminiEnvSection: React.FC<GeminiEnvSectionProps> = ({
     <div className="space-y-2">
       <label
         htmlFor="geminiEnv"
-        className="block text-sm font-medium text-gray-900 dark:text-gray-100"
+        className="block text-sm font-medium text-foreground"
       >
         {t("geminiConfig.envFile", { defaultValue: "环境变量 (.env)" })}
       </label>
@@ -69,7 +69,7 @@ GEMINI_MODEL=gemini-3-pro-preview`}
       )}
 
       {!error && (
-        <p className="text-xs text-gray-500 dark:text-gray-400">
+        <p className="text-xs text-muted-foreground">
           {t("geminiConfig.envFileHint", {
             defaultValue: "使用 .env 格式配置 Gemini 环境变量",
           })}
@@ -124,14 +124,14 @@ export const GeminiConfigSection: React.FC<GeminiConfigSectionProps> = ({
       <div className="flex items-center justify-between">
         <label
           htmlFor="geminiConfig"
-          className="block text-sm font-medium text-gray-900 dark:text-gray-100"
+          className="block text-sm font-medium text-foreground"
         >
           {t("geminiConfig.configJson", {
             defaultValue: "配置文件 (config.json)",
           })}
         </label>
 
-        <label className="inline-flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400 cursor-pointer">
+        <label className="inline-flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
           <input
             type="checkbox"
             checked={useCommonConfig}
@@ -180,7 +180,7 @@ export const GeminiConfigSection: React.FC<GeminiConfigSectionProps> = ({
       )}
 
       {!configError && (
-        <p className="text-xs text-gray-500 dark:text-gray-400">
+        <p className="text-xs text-muted-foreground">
           {t("geminiConfig.configJsonHint", {
             defaultValue: "使用 JSON 格式配置 Gemini 扩展参数（可选）",
           })}

src/components/providers/forms/ProviderForm.tsx

@@ -20,6 +20,7 @@ import {
   geminiProviderPresets,
   type GeminiProviderPreset,
 } from "@/config/geminiProviderPresets";
+import type { UniversalProviderPreset } from "@/config/universalProviderPresets";
 import { applyTemplateValues } from "@/utils/providerConfigUtils";
 import { mergeProviderMeta } from "@/utils/providerMetaUtils";
 import { getCodexCustomTemplate } from "@/config/codexTemplates";
@@ -72,6 +73,8 @@ interface ProviderFormProps {
   submitLabel: string;
   onSubmit: (values: ProviderFormValues) => void;
   onCancel: () => void;
+  onUniversalPresetSelect?: (preset: UniversalProviderPreset) => void;
+  onManageUniversalProviders?: () => void;
   initialData?: {
     name?: string;
     websiteUrl?: string;
@@ -91,6 +94,8 @@ export function ProviderForm({
   submitLabel,
   onSubmit,
   onCancel,
+  onUniversalPresetSelect,
+  onManageUniversalProviders,
   initialData,
   showButtons = true,
 }: ProviderFormProps) {
@@ -162,6 +167,8 @@ export function ProviderForm({
     mode: "onSubmit",
   });
 
+  const settingsConfigValue = form.watch("settingsConfig");
+
   // 使用 API Key hook
   const {
     apiKey,
@@ -187,9 +194,10 @@ export function ProviderForm({
     },
   });
 
-  // 使用 Model hook（新：主模型 + Haiku/Sonnet/Opus 默认模型）
+  // 使用 Model hook（新：主模型 + 推理模型 + Haiku/Sonnet/Opus 默认模型）
   const {
     claudeModel,
+    reasoningModel,
     defaultHaikuModel,
     defaultSonnetModel,
     defaultOpusModel,
@@ -199,6 +207,53 @@ export function ProviderForm({
     onConfigChange: (config) => form.setValue("settingsConfig", config),
   });
 
+  const isOpenRouterProvider = useMemo(() => {
+    if (appId !== "claude") return false;
+    const normalized = baseUrl.trim().toLowerCase();
+    if (normalized.includes("openrouter.ai")) {
+      return true;
+    }
+    try {
+      const config = JSON.parse(settingsConfigValue || "{}");
+      const envUrl = config?.env?.ANTHROPIC_BASE_URL;
+      return typeof envUrl === "string" && envUrl.includes("openrouter.ai");
+    } catch {
+      return false;
+    }
+  }, [appId, baseUrl, settingsConfigValue]);
+
+  const openRouterCompatEnabled = useMemo(() => {
+    if (!isOpenRouterProvider) return false;
+    try {
+      const config = JSON.parse(settingsConfigValue || "{}");
+      const raw = config?.openrouter_compat_mode;
+      if (typeof raw === "boolean") return raw;
+      if (typeof raw === "number") return raw !== 0;
+      if (typeof raw === "string") {
+        const normalized = raw.trim().toLowerCase();
+        return normalized === "true" || normalized === "1";
+      }
+    } catch {
+      // ignore
+    }
+    return true;
+  }, [isOpenRouterProvider, settingsConfigValue]);
+
+  const handleOpenRouterCompatChange = useCallback(
+    (enabled: boolean) => {
+      try {
+        const currentConfig = JSON.parse(
+          form.getValues("settingsConfig") || "{}",
+        );
+        currentConfig.openrouter_compat_mode = enabled;
+        form.setValue("settingsConfig", JSON.stringify(currentConfig, null, 2));
+      } catch {
+        // ignore
+      }
+    },
+    [form],
+  );
+
   // 使用 Codex 配置 hook (仅 Codex 模式)
   const {
     codexAuth,
@@ -753,6 +808,8 @@ export function ProviderForm({
             categoryKeys={categoryKeys}
             presetCategoryLabels={presetCategoryLabels}
             onPresetChange={handlePresetChange}
+            onUniversalPresetSelect={onUniversalPresetSelect}
+            onManageUniversalProviders={onManageUniversalProviders}
             category={category}
           />
         )}
@@ -789,11 +846,15 @@ export function ProviderForm({
             }
             shouldShowModelSelector={category !== "official"}
             claudeModel={claudeModel}
+            reasoningModel={reasoningModel}
             defaultHaikuModel={defaultHaikuModel}
             defaultSonnetModel={defaultSonnetModel}
             defaultOpusModel={defaultOpusModel}
             onModelChange={handleModelChange}
             speedTestEndpoints={speedTestEndpoints}
+            showOpenRouterCompatToggle={isOpenRouterProvider}
+            openRouterCompatEnabled={openRouterCompatEnabled}
+            onOpenRouterCompatChange={handleOpenRouterCompatChange}
           />
         )}
 

src/components/providers/forms/ProviderPresetSelector.tsx

@@ -1,11 +1,16 @@
 import { useTranslation } from "react-i18next";
 import { FormLabel } from "@/components/ui/form";
 import { ClaudeIcon, CodexIcon, GeminiIcon } from "@/components/BrandIcons";
-import { Zap, Star } from "lucide-react";
+import { Zap, Star, Layers, Settings2 } from "lucide-react";
 import type { ProviderPreset } from "@/config/claudeProviderPresets";
 import type { CodexProviderPreset } from "@/config/codexProviderPresets";
 import type { GeminiProviderPreset } from "@/config/geminiProviderPresets";
 import type { ProviderCategory } from "@/types";
+import {
+  universalProviderPresets,
+  type UniversalProviderPreset,
+} from "@/config/universalProviderPresets";
+import { ProviderIcon } from "@/components/ProviderIcon";
 
 type PresetEntry = {
   id: string;
@@ -18,6 +23,8 @@ interface ProviderPresetSelectorProps {
   categoryKeys: string[];
   presetCategoryLabels: Record<string, string>;
   onPresetChange: (value: string) => void;
+  onUniversalPresetSelect?: (preset: UniversalProviderPreset) => void;
+  onManageUniversalProviders?: () => void;
   category?: ProviderCategory; // 当前选中的分类
 }
 
@@ -27,6 +34,8 @@ export function ProviderPresetSelector({
   categoryKeys,
   presetCategoryLabels,
   onPresetChange,
+  onUniversalPresetSelect,
+  onManageUniversalProviders,
   category,
 }: ProviderPresetSelectorProps) {
   const { t } = useTranslation();
@@ -149,10 +158,7 @@ export function ProviderPresetSelector({
                 className={`${getPresetButtonClass(isSelected, entry.preset)} relative`}
                 style={getPresetButtonStyle(isSelected, entry.preset)}
                 title={
-                  presetCategoryLabels[category] ??
+                  presetCategoryLabels[category] ?? t("providerPreset.other")
-                  t("providerPreset.categoryOther", {
-                    defaultValue: "其他",
-                  })
                 }
               >
                 {renderPresetIcon(entry.preset)}
@@ -167,6 +173,49 @@ export function ProviderPresetSelector({
           });
         })}
       </div>
+
+      {/* 统一供应商预设（新的一行） */}
+      {onUniversalPresetSelect && universalProviderPresets.length > 0 && (
+        <>
+          <div className="flex flex-wrap items-center gap-2">
+            {universalProviderPresets.map((preset) => (
+              <button
+                key={`universal-${preset.providerType}`}
+                type="button"
+                onClick={() => onUniversalPresetSelect(preset)}
+                className="inline-flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors bg-accent text-muted-foreground hover:bg-accent/80 relative"
+                title={t("universalProvider.hint", {
+                  defaultValue:
+                    "跨应用统一配置，自动同步到 Claude/Codex/Gemini",
+                })}
+              >
+                <ProviderIcon icon={preset.icon} name={preset.name} size={14} />
+                {preset.name}
+                <span className="absolute -top-1 -right-1 flex items-center gap-0.5 rounded-full bg-gradient-to-r from-indigo-500 to-purple-500 px-1.5 py-0.5 text-[10px] font-bold text-white shadow-md">
+                  <Layers className="h-2.5 w-2.5" />
+                </span>
+              </button>
+            ))}
+            {/* 管理统一供应商按钮 */}
+            {onManageUniversalProviders && (
+              <button
+                type="button"
+                onClick={onManageUniversalProviders}
+                className="inline-flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors bg-accent text-muted-foreground hover:bg-accent/80"
+                title={t("universalProvider.manage", {
+                  defaultValue: "管理统一供应商",
+                })}
+              >
+                <Settings2 className="h-4 w-4" />
+                {t("universalProvider.manage", {
+                  defaultValue: "管理",
+                })}
+              </button>
+            )}
+          </div>
+        </>
+      )}
+
       <p className="text-xs text-muted-foreground">{getCategoryHint()}</p>
     </div>
   );

src/components/providers/forms/hooks/useModelState.ts

@@ -7,13 +7,14 @@ interface UseModelStateProps {
 
 /**
  * 管理模型选择状态
- * 支持 ANTHROPIC_MODEL 和 ANTHROPIC_SMALL_FAST_MODEL
+ * 支持 ANTHROPIC_MODEL, ANTHROPIC_REASONING_MODEL 和各类型默认模型
  */
 export function useModelState({
   settingsConfig,
   onConfigChange,
 }: UseModelStateProps) {
   const [claudeModel, setClaudeModel] = useState("");
+  const [reasoningModel, setReasoningModel] = useState("");
   const [defaultHaikuModel, setDefaultHaikuModel] = useState("");
   const [defaultSonnetModel, setDefaultSonnetModel] = useState("");
   const [defaultOpusModel, setDefaultOpusModel] = useState("");
@@ -29,6 +30,10 @@ export function useModelState({
       const env = cfg?.env || {};
       const model =
         typeof env.ANTHROPIC_MODEL === "string" ? env.ANTHROPIC_MODEL : "";
+      const reasoning =
+        typeof env.ANTHROPIC_REASONING_MODEL === "string"
+          ? env.ANTHROPIC_REASONING_MODEL
+          : "";
       const small =
         typeof env.ANTHROPIC_SMALL_FAST_MODEL === "string"
           ? env.ANTHROPIC_SMALL_FAST_MODEL
@@ -47,6 +52,7 @@ export function useModelState({
           : model || small;
 
       setClaudeModel(model || "");
+      setReasoningModel(reasoning || "");
       setDefaultHaikuModel(haiku || "");
       setDefaultSonnetModel(sonnet || "");
       setDefaultOpusModel(opus || "");
@@ -59,12 +65,14 @@ export function useModelState({
     (
       field:
         | "ANTHROPIC_MODEL"
+        | "ANTHROPIC_REASONING_MODEL"
         | "ANTHROPIC_DEFAULT_HAIKU_MODEL"
         | "ANTHROPIC_DEFAULT_SONNET_MODEL"
         | "ANTHROPIC_DEFAULT_OPUS_MODEL",
       value: string,
     ) => {
       if (field === "ANTHROPIC_MODEL") setClaudeModel(value);
+      if (field === "ANTHROPIC_REASONING_MODEL") setReasoningModel(value);
       if (field === "ANTHROPIC_DEFAULT_HAIKU_MODEL")
         setDefaultHaikuModel(value);
       if (field === "ANTHROPIC_DEFAULT_SONNET_MODEL")
@@ -98,6 +106,8 @@ export function useModelState({
   return {
     claudeModel,
     setClaudeModel,
+    reasoningModel,
+    setReasoningModel,
     defaultHaikuModel,
     setDefaultHaikuModel,
     defaultSonnetModel,

src/components/providers/forms/shared/EndpointField.tsx

@@ -40,7 +40,7 @@ export function EndpointField({
           <button
             type="button"
             onClick={onManageClick}
-            className="flex items-center gap-1 text-xs text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 transition-colors"
+            className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors"
           >
             <Zap className="h-3.5 w-3.5" />
             {manageButtonLabel || defaultManageLabel}