feat(proxy): update failover timeout and circuit breaker defaults

- Double all timeout values (streaming/non-streaming) - Codex/Gemini: circuit_failure_threshold 5→4, error_rate 0.5→0.6 - Claude: circuit_error_rate_threshold 0.6→0.7
fix(i18n): remove hardcoded defaultValue and unused placeholder for reasoning model
2026-07-25 05:38:38 +08:00 · 2026-01-04 10:56:14 +08:00 · 2026-01-03 12:04:34 +08:00 · 2026-01-03 11:42:10 +08:00 · 2026-01-03 10:15:28 +08:00 · 2026-01-03 10:13:32 +08:00
372 changed files with 53808 additions and 8451 deletions
@@ -17,3 +17,4 @@ GEMINI.md
 /.idea
 /.vscode
 vitest-report.json
+nul
@@ -1 +1 @@
-v22.4.1
+22.12.0
@@ -5,6 +5,223 @@ 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
+
+This beta release introduces the **Local API Proxy** feature, along with Skills multi-app support, UI improvements, and numerous bug fixes.
+
+### Major Features
+
+#### Local Proxy Server
+- **Local HTTP Proxy** - High-performance proxy server built on Axum framework
+- **Multi-app Support** - Unified proxy for Claude Code, Codex, and Gemini CLI API requests
+- **Per-app Takeover** - Independent control over which apps route through the proxy
+- **Live Config Takeover** - Automatically backs up and redirects CLI configurations to local proxy
+
+#### Auto Failover
+- **Circuit Breaker** - Automatically detects provider failures and triggers protection
+- **Smart Failover** - Automatically switches to backup provider when current one is unavailable
+- **Health Tracking** - Real-time monitoring of provider availability
+- **Independent Failover Queues** - Each app maintains its own failover queue
+
+#### Monitoring
+- **Request Logging** - Detailed logging of all proxy requests
+- **Usage Statistics** - Token consumption, latency, success rate metrics
+- **Real-time Status** - Frontend displays proxy status and statistics
+
+#### Skills Multi-App Support
+- **Multi-app Support** - Skills now support both Claude and Codex (#365)
+- **Multi-app Migration** - Existing Skills auto-migrate to multi-app structure (#378)
+- **Installation Path Fix** - Use directory basename for skill installation path (#358)
+
+### Added
+- **Provider Icon Colors** - Customize provider icon colors (#385)
+- **Deeplink Usage Config** - Import usage query config via deeplink (#400)
+- **Error Request Logging** - Detailed logging for proxy requests (#401)
+- **Closable Toast** - Added close button to switch notification toast (#350)
+- **Icon Color Component** - ProviderIcon component supports color prop (#384)
+
+### Fixed
+
+#### Proxy Related
+- Takeover Codex base_url via model_provider
+- Harden crash recovery with fallback detection
+- Sync UI when active provider differs from current setting
+- Resolve circuit breaker race condition and error classification
+- Stabilize live takeover and provider editing
+- Reset health badges when proxy stops
+- Retry failover for all HTTP errors including 4xx
+- Fix HalfOpen counter underflow and config field inconsistencies
+- Resolve circuit breaker state persistence and HalfOpen deadlock
+- Auto-recover live config after abnormal exit
+- Update live backup when hot-switching provider in proxy mode
+- Wait for server shutdown before exiting app
+- Disable auto-start on app launch by resetting enabled flag on stop
+- Sync live config tokens to database before takeover
+- Resolve 404 error and auto-setup proxy targets
+
+#### MCP Related
+- Skip sync when target CLI app is not installed
+- Improve upsert and import robustness
+- Use browser-compatible platform detection for MCP presets
+
+#### UI Related
+- Restore fade transition for Skills button
+- Add close button to all success toasts
+- Prevent card jitter when health badge appears
+- Update SettingsPage tab styles (#342)
+
+#### Other
+- Fix Azure website link (#407)
+- Add fallback to provider config for usage credentials (#360)
+- Fix Windows black screen on startup (use system titlebar)
+- Add fallback for crypto.randomUUID() on older WebViews
+- Use correct npm package for Codex CLI version check
+- Security fixes for JavaScript executor and usage script (#151)
+
+### Improved
+- **Proxy Active Theme** - Apply emerald theme when proxy takeover is active
+- **Card Animation** - Improved provider card hover animation
+- **Remove Restart Prompt** - No longer prompts restart when switching providers
+
+### Technical
+- Implement per-app takeover mode
+- Proxy module contains 20+ Rust files with complete layered architecture
+- Add 5 new database tables for proxy functionality
+- Modularize handlers.rs to reduce code duplication
+- Remove is_proxy_target in favor of failover_queue
+
+### Stats
+- 55 commits since v3.8.2
+- 164 files changed
+- +22,164 / -570 lines
+
+---
+
+## [3.8.0] - 2025-11-28
+
+### Major Updates
+
+- **Persistence architecture upgrade** - Moved from single JSON storage to SQLite + JSON dual-layer; added schema versioning, transactions, and SQL import/export; first launch auto-migrates `config.json` to SQLite while keeping originals safe.
+- **Brand new UI** - Full layout redesign, unified component/ConfirmDialog styles, smoother animations, overscroll disabled; Tailwind CSS downgraded to v3.4 for compatibility.
+- **Japanese language support** - UI now localized in Chinese/English/Japanese.
+
+### Added
+
+- **Skills recursive scanning** - Discovers nested `SKILL.md` files across multi-level directories; same-name skills allowed by full-path dedup.
+- **Provider icons** - Presets ship with default icons; custom icon colors; icons retained when duplicating providers.
+- **Auto launch on startup** - One-click enable/disable using Registry/LaunchAgent/XDG autostart.
+- **Provider preset** - Added MiniMax partner preset.
+- **Form validation** - Required fields get real-time validation and unified toast messaging.
+
+### Fixed
+
+- **Custom endpoints loss** - Switched provider updates to `UPDATE` to avoid cascade deletes from `INSERT OR REPLACE`.
+- **Gemini config writing** - Correctly writes custom env vars to `.env` and keeps auth configs isolated.
+- **Provider validation** - Handles missing current provider IDs and preserves icon fields on duplicate.
+- **Linux rendering** - Fixed WebKitGTK DMA-BUF rendering and preserved user `.desktop` customizations.
+- **Misc** - Removed redundant usage queries; corrected DMXAPI auth token field; restored missing deeplink translations; fixed usage script template init.
+
+### Technical
+
+- **Database modules** - Added `schema`, `backup`, `migration`, and DAO layers for providers/MCP/prompts/skills/settings.
+- **Service modularization** - Split provider service into live/auth/endpoints/usage modules; deeplink parsing/import logic modularized.
+- **Code cleanup** - Removed legacy JSON-era import/export, unused MCP types; unified error handling; tests migrated to SQLite backend and MSW handlers updated.
+
+### Migration Notes
+
+- First launch auto-migrates data from `config.json` to SQLite and device settings to `settings.json`; originals kept; error dialog on failure; dry-run supported.
+
+### Stats
+
+- 51 commits since v3.7.1; 207 files changed; +17,297 / -6,870 lines. See [release-note-v3.8.0](docs/release-note-v3.8.0-en.md) for details.
+
+---
+
+## [3.7.1] - 2025-11-22
+
+### Fixed
+
+- **Skills third-party repository installation** (#268) - Fixed installation failure for skills repositories with custom subdirectories (e.g., `ComposioHQ/awesome-claude-skills`)
+- **Gemini configuration persistence** - Resolved issue where settings.json edits were lost when switching providers
+- **Dialog overlay click protection** - Prevented dialogs from closing when clicking outside, avoiding accidental form data loss (affects 11 dialog components)
+
+### Added
+
+- **Gemini configuration directory support** (#255) - Added custom configuration directory option for Gemini in settings
+- **ArchLinux installation support** (#259) - Added AUR installation via `paru -S cc-switch-bin`
+
+### Improved
+
+- **Skills error messages i18n** - Added 28+ detailed error messages (English & Chinese) with specific resolution suggestions
+- **Download timeout** - Extended from 15s to 60s to reduce network-related false positives
+- **Code formatting** - Applied unified Rust (`cargo fmt`) and TypeScript (`prettier`) formatting standards
+
+### Reverted
+
+- **Auto-launch on system startup** - Temporarily reverted feature pending further testing and optimization
+
+---
+
 ## [3.7.0] - 2025-11-19

 ### Major Features
@@ -2,37 +2,41 @@

 # All-in-One Assistant for Claude Code, Codex & Gemini CLI

-[![Version](https://img.shields.io/badge/version-3.7.0-blue.svg)](https://github.com/farion1231/cc-switch/releases)
-[![Trending](https://img.shields.io/badge/🔥_TypeScript_Trending-Daily%20%7C%20Weekly%20%7C%20Monthly-ff6b6b.svg)](https://github.com/trending/typescript)
+[![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)

 <a href="https://trendshift.io/repositories/15372" target="_blank"><img src="https://trendshift.io/api/badge/repositories/15372" alt="farion1231%2Fcc-switch | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>

-English | [中文](README_ZH.md) | [Changelog](CHANGELOG.md)
-
-A desktop application for managing and switching between different provider configurations & MCP for Claude Code and Codex.
+English | [中文](README_ZH.md) | [日本語](README_JA.md) | [Changelog](CHANGELOG.md)

 </div>

 ## ❤️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)!
+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)!

 ---

 <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"><a href="https://aigocode.com/invite/CC-SWITCH"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" 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>
+</tr>
+
+<tr>
+<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 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>
+</tr>
+
 </table>

 ## Screenshots
@@ -43,12 +47,82 @@ Get 10% OFF the GLM CODING PLAN with [this link](https://z.ai/subscribe?ic=8JVLJ

 ## Features

-### Current Version: v3.7.0 | [Full Changelog](CHANGELOG.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)**
+
+**Persistence Architecture Upgrade & Brand New UI**
+
+- **SQLite + JSON Dual-layer Architecture**
+  - Migrated from JSON file storage to SQLite + JSON dual-layer structure
+  - Syncable data (providers, MCP, Prompts, Skills) stored in SQLite
+  - Device-level data (window state, local paths) stored in JSON
+  - Lays the foundation for future cloud sync functionality
+  - Schema version management for database migrations
+
+- **Brand New User Interface**
+  - Completely redesigned interface layout
+  - Unified component styles and smoother animations
+  - Optimized visual hierarchy
+  - Tailwind CSS downgraded from v4 to v3.4 for better browser compatibility
+
+- **Japanese Language Support**
+  - Added Japanese interface support (now supports Chinese/English/Japanese)
+
+- **Auto Launch on Startup**
+  - One-click enable/disable in settings
+  - Platform-native APIs (Registry/LaunchAgent/XDG autostart)
+
+- **Skills Recursive Scanning**
+  - Support for multi-level directory structures
+  - Allow same-named skills from different repositories
+
+- **Critical Bug Fixes**
+  - Fixed custom endpoints lost when updating providers
+  - Fixed Gemini configuration write issues
+  - Fixed Linux WebKitGTK rendering issues
+
+**v3.7.0 Highlights**
+
+**Six Core Features, 18,000+ Lines of New Code**
+
+- **Gemini CLI Integration**
+  - Third supported AI CLI (Claude Code / Codex / Gemini)
+  - Dual-file configuration support (`.env` + `settings.json`)
+  - Complete MCP server management
+  - Presets: Google Official (OAuth) / PackyCode / Custom
+
+- **Claude Skills Management System**
+  - Auto-scan skills from GitHub repositories (3 pre-configured curated repos)
+  - One-click install/uninstall to `~/.claude/skills/`
+  - Custom repository support + subdirectory scanning
+  - Complete lifecycle management (discover/install/update)
+
+- **Prompts Management System**
+  - Multi-preset system prompt management (unlimited presets, quick switching)
+  - Cross-app support (Claude: `CLAUDE.md` / Codex: `AGENTS.md` / Gemini: `GEMINI.md`)
+  - Markdown editor (CodeMirror 6 + real-time preview)
+  - Smart backfill protection, preserves manual modifications
+
+- **MCP v3.7.0 Unified Architecture**
+  - Single panel manages MCP servers across three applications
+  - New SSE (Server-Sent Events) transport type
+  - Smart JSON parser + Codex TOML format auto-correction
+  - Unified import/export + bidirectional sync
+
+- **Deep Link Protocol**
+  - `ccswitch://` protocol registration (all platforms)
+  - One-click import provider configs via shared links
+  - Security validation + lifecycle integration
+
+- **Environment Variable Conflict Detection**
+  - Auto-detect cross-app configuration conflicts (Claude/Codex/Gemini/MCP)
+  - Visual conflict indicators + resolution suggestions
+  - Override warnings + backup before changes

 **Core Capabilities**

 - **Provider Management**: One-click switching between Claude Code, Codex, and Gemini API configurations
- **MCP Integration**: Centralized MCP server management with stdio/http support and real-time sync
 - **Speed Testing**: Measure API endpoint latency with visual quality indicators
 - **Import/Export**: Backup and restore configs with auto-rotation (keep 10 most recent)
 - **i18n Support**: Complete Chinese/English localization (UI, errors, tray)
@@ -61,7 +135,6 @@ Get 10% OFF the GLM CODING PLAN with [this link](https://z.ai/subscribe?ic=8JVLJ
 - Granular model configuration (4-tier: Haiku/Sonnet/Opus/Custom)
 - WSL environment support with auto-sync on directory change
 - 100% hooks test coverage & complete architecture refactoring
- New presets: DMXAPI, Azure Codex, AnyRouter, AiHubMix, MiniMax

 **System Features**

@@ -103,6 +176,14 @@ Download `CC-Switch-v{version}-macOS.zip` from the [Releases](../../releases) pa

 > **Note**: Since the author doesn't have an Apple Developer account, you may see an "unidentified developer" warning on first launch. Please close it first, then go to "System Settings" → "Privacy & Security" → click "Open Anyway", and you'll be able to open it normally afterwards.

+### ArchLinux 用户
+
+**Install via paru (Recommended)**
+
+```bash
+paru -S cc-switch-bin
+```
+
 ### Linux Users

 Download the latest `CC-Switch-v{version}-Linux.deb` package or `CC-Switch-v{version}-Linux.AppImage` from the [Releases](../../releases) page.
@@ -121,9 +202,36 @@ Download the latest `CC-Switch-v{version}-Linux.deb` package or `CC-Switch-v{ver
 ### MCP Management

 - **Location**: Click "MCP" button in top-right corner
- **Add Server**: Use built-in templates (mcp-fetch, mcp-filesystem) or custom config
+- **Add Server**:
+  - Use built-in templates (mcp-fetch, mcp-filesystem, etc.)
+  - Support stdio / http / sse transport types
+  - Configure independent MCP servers for different apps
 - **Enable/Disable**: Toggle switches to control which servers sync to live config
- **Sync**: Enabled servers auto-sync to `~/.claude.json` (Claude) or `~/.codex/config.toml` (Codex)
+- **Sync**: Enabled servers auto-sync to each app's live files
+- **Import/Export**: Import existing MCP servers from Claude/Codex/Gemini config files
+
+### Skills Management (v3.7.0 New)
+
+- **Location**: Click "Skills" button in top-right corner
+- **Discover Skills**:
+  - Auto-scan pre-configured GitHub repositories (Anthropic official, ComposioHQ, community, etc.)
+  - Add custom repositories (supports subdirectory scanning)
+- **Install Skills**: Click "Install" to one-click install to `~/.claude/skills/`
+- **Uninstall Skills**: Click "Uninstall" to safely remove and clean up state
+- **Manage Repositories**: Add/remove custom GitHub repositories
+
+### Prompts Management (v3.7.0 New)
+
+- **Location**: Click "Prompts" button in top-right corner
+- **Create Presets**:
+  - Create unlimited system prompt presets
+  - Use Markdown editor to write prompts (syntax highlighting + real-time preview)
+- **Switch Presets**: Select preset → Click "Activate" to apply immediately
+- **Sync Mechanism**:
+  - Claude: `~/.claude/CLAUDE.md`
+  - Codex: `~/.codex/AGENTS.md`
+  - Gemini: `~/.gemini/GEMINI.md`
+- **Protection Mechanism**: Auto-save current prompt content before switching, preserves manual modifications

 ### Configuration Files

@@ -141,14 +249,16 @@ Download the latest `CC-Switch-v{version}-Linux.deb` package or `CC-Switch-v{ver

 **Gemini**

- Live config: `~/.gemini/.env` (API key) + `~/.gemini/settings.json` (auth type for quick switching)
- API key field: `GEMINI_API_KEY` inside `.env`
- Tray quick switch: each provider switch rewrites `~/.gemini/.env` so the Gemini CLI picks up the new credentials immediately
+- Live config: `~/.gemini/.env` (API key) + `~/.gemini/settings.json` (auth mode)
+- API key field: `GEMINI_API_KEY` or `GOOGLE_GEMINI_API_KEY` in `.env`
+- Environment variables: Support `GOOGLE_GEMINI_BASE_URL`, `GEMINI_MODEL`, etc.
+- MCP servers: `~/.gemini/settings.json` → `mcpServers`
+- Tray quick switch: Each provider switch rewrites `~/.gemini/.env`, no need to restart Gemini CLI

-**CC Switch Storage**
+**CC Switch Storage (v3.8.0 New Architecture)**

- Main config (SSOT): `~/.cc-switch/config.json`
- Settings: `~/.cc-switch/settings.json`
+- Database (SSOT): `~/.cc-switch/cc-switch.db` (SQLite, stores providers, MCP, Prompts, Skills)
+- Local settings: `~/.cc-switch/settings.json` (device-level settings)
 - Backups: `~/.cc-switch/backups/` (auto-rotate, keep 10)

 ### Cloud Sync Setup
@@ -184,11 +294,12 @@ Download the latest `CC-Switch-v{version}-Linux.deb` package or `CC-Switch-v{ver

 **Core Design Patterns**

- **SSOT** (Single Source of Truth): All provider configs stored in `~/.cc-switch/config.json`
+- **SSOT** (Single Source of Truth): All data stored in `~/.cc-switch/cc-switch.db` (SQLite)
+- **Dual-layer Storage**: SQLite for syncable data, JSON for device-level settings
 - **Dual-way Sync**: Write to live files on switch, backfill from live when editing active provider
 - **Atomic Writes**: Temp file + rename pattern prevents config corruption
- **Concurrency Safe**: RwLock with scoped guards avoids deadlocks
- **Layered Architecture**: Clear separation (Commands → Services → Models)
+- **Concurrency Safe**: Mutex-protected database connection avoids race conditions
+- **Layered Architecture**: Clear separation (Commands → Services → DAO → Database)

 **Key Components**

@@ -0,0 +1,472 @@
+<div align="center">
+
+# Claude Code / Codex / Gemini CLI オールインワン・アシスタント
+
+[![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)
+
+<a href="https://trendshift.io/repositories/15372" target="_blank"><img src="https://trendshift.io/api/badge/repositories/15372" alt="farion1231%2Fcc-switch | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+
+[English](README.md) | [中文](README_ZH.md) | 日本語 | [Changelog](CHANGELOG.md) | [v3.8.0 リリースノート](docs/release-note-v3.8.0-en.md)
+
+</div>
+
+## ❤️スポンサー
+
+[![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% オフになります！
+
+---
+
+<table>
+<tr>
+<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"><a href="https://aigocode.com/invite/CC-SWITCH"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" 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>
+</tr>
+
+<tr>
+<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>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>
+</tr>
+
+</table>
+
+## スクリーンショット
+
+|                  メイン画面                   |                  プロバイダ追加                  |
+| :-------------------------------------------: | :----------------------------------------------: |
+| ![メイン画面](assets/screenshots/main-ja.png) | ![プロバイダ追加](assets/screenshots/add-ja.png) |
+
+## 特長
+
+### 現在のバージョン：v3.8.3 | [完全な更新履歴](CHANGELOG.md) | [リリースノート](docs/release-note-v3.8.0-en.md)
+
+**v3.8.0 メジャーアップデート (2025-11-28)**
+
+**永続化アーキテクチャ刷新 & 新 UI**
+
+- **SQLite + JSON 二層構造**
+  - JSON 単独保存から SQLite + JSON の二層構造へ移行
+  - 同期対象データ（プロバイダ、MCP、Prompts、Skills）は SQLite に保存
+  - デバイス固有データ（ウィンドウ状態、ローカルパス）は JSON に保存
+  - 将来のクラウド同期の土台を用意
+  - DB マイグレーション用にスキーマバージョンを管理
+
+- **新しいユーザーインターフェース**
+  - レイアウトを全面再設計
+  - コンポーネントスタイルとアニメーションを統一
+  - 視覚的な階層を最適化
+  - ブラウザ互換性向上のため Tailwind CSS を v4 から v3.4 にダウングレード
+
+- **日本語対応**
+  - UI が中国語/英語/日本語の 3 言語対応に
+
+- **自動起動**
+  - 設定画面でワンクリック ON/OFF
+  - プラットフォームネイティブ API（Registry/LaunchAgent/XDG autostart）を使用
+
+- **Skills 再帰スキャン**
+  - 多階層ディレクトリをサポート
+  - リポジトリが異なる同名スキルを許可
+
+- **重要なバグ修正**
+  - プロバイダ更新時にカスタムエンドポイントが失われる問題を修正
+  - Gemini 設定の書き込み問題を修正
+  - Linux WebKitGTK の描画問題を修正
+
+**v3.7.0 ハイライト**
+
+**6 つのコア機能、18,000 行超の新コード**
+
+- **Gemini CLI 統合**
+  - Claude Code / Codex / Gemini の 3 番目のサポート AI CLI
+  - 2 つの設定ファイル（`.env` + `settings.json`）に対応
+  - MCP サーバー管理を完備
+  - プリセット：Google 公式（OAuth）/ PackyCode / カスタム
+
+- **Claude Skills 管理システム**
+  - GitHub リポジトリを自動スキャン（3 つのキュレーション済みリポジトリを同梱）
+  - `~/.claude/skills/` へワンクリックでインストール/アンインストール
+  - カスタムリポジトリ + サブディレクトリスキャンをサポート
+  - ライフサイクル管理（検出/インストール/更新）を完備
+
+- **Prompts 管理システム**
+  - 無制限のシステムプロンプトプリセットを作成
+  - Markdown エディタ（CodeMirror 6 + リアルタイムプレビュー）付き
+  - スマートなバックフィル保護で手動変更を保持
+  - 複数アプリに同時対応（Claude: `CLAUDE.md` / Codex: `AGENTS.md` / Gemini: `GEMINI.md`）
+
+- **MCP v3.7.0 統合アーキテクチャ**
+  - 1 つのパネルで 3 アプリの MCP を管理
+  - 新たに SSE（Server-Sent Events）トランスポートを追加
+  - スマート JSON パーサー + Codex TOML 自動修正
+  - 双方向のインポート/エクスポート + 双方向同期
+
+- **ディープリンクプロトコル**
+  - `ccswitch://` を全プラットフォームで登録
+  - 共有リンクからプロバイダ設定をワンクリックでインポート
+  - セキュリティ検証 + ライフサイクル統合
+
+- **環境変数の競合検知**
+  - Claude/Codex/Gemini/MCP 間の設定競合を自動検出
+  - 競合表示 + 解決ガイド
+  - 上書き前の警告 + バックアップ
+
+**コア機能**
+
+- **プロバイダ管理**：Claude Code、Codex、Gemini の API 設定をワンクリックで切り替え
+- **速度テスト**：エンドポイント遅延を計測し、品質を可視化
+- **インポート/エクスポート**：設定をバックアップ・復元（最新 10 件を自動ローテーション）
+- **多言語対応**：UI/エラー/トレイを含む中国語・英語・日本語ローカライズ
+- **Claude プラグイン同期**：Claude プラグイン設定をワンクリックで適用/復元
+
+**v3.6 ハイライト**
+
+- プロバイダの複製とドラッグ＆ドロップ並び替え
+- 複数エンドポイント管理とカスタム設定ディレクトリ（クラウド同期準備済み）
+- 4 階層のモデル設定（Haiku/Sonnet/Opus/Custom）
+- WSL 環境をサポートし、ディレクトリ変更時に自動同期
+- Hooks テスト 100% カバレッジ + アーキテクチャ全面リファクタ
+
+**システム機能**
+
+- クイックスイッチ付きシステムトレイ
+- シングルインスタンス常駐
+- ビルトイン自動アップデータ
+- ロールバック保護付きのアトミック書き込み
+
+## ダウンロード & インストール
+
+### システム要件
+
+- **Windows**: Windows 10 以上
+- **macOS**: macOS 10.15 (Catalina) 以上
+- **Linux**: Ubuntu 22.04+ / Debian 11+ / Fedora 34+ など主要ディストリビューション
+
+### Windows ユーザー
+
+[Releases](../../releases) ページから最新版の `CC-Switch-v{version}-Windows.msi` インストーラー、またはポータブル版 `CC-Switch-v{version}-Windows-Portable.zip` をダウンロード。
+
+### macOS ユーザー
+
+**方法 1: Homebrew でインストール（推奨）**
+
+```bash
+brew tap farion1231/ccswitch
+brew install --cask cc-switch
+```
+
+アップデート:
+
+```bash
+brew upgrade --cask cc-switch
+```
+
+**方法 2: 手動ダウンロード**
+
+[Releases](../../releases) から `CC-Switch-v{version}-macOS.zip` をダウンロードして展開。
+
+> **注意**: 開発者アカウント未登録のため、初回起動時に「開発元を確認できません」と表示される場合があります。一度閉じてから「システム設定」→「プライバシーとセキュリティ」→「このまま開く」をクリックしてください。以降は通常通り起動できます。
+
+### ArchLinux ユーザー
+
+**paru でインストール（推奨）**
+
+```bash
+paru -S cc-switch-bin
+```
+
+### Linux ユーザー
+
+[Releases](../../releases) から最新版の `CC-Switch-v{version}-Linux.deb` または `CC-Switch-v{version}-Linux.AppImage` をダウンロード。
+
+## クイックスタート
+
+### 基本的な使い方
+
+1. **プロバイダ追加**：「Add Provider」をクリック → プリセットを選ぶかカスタム設定を作成
+2. **プロバイダ切り替え**:
+   - メイン UI: プロバイダを選択 → 「Enable」をクリック
+   - システムトレイ: プロバイダ名をクリック（即時反映）
+3. **反映**: ターミナルや Claude Code / Codex / Gemini クライアントを再起動して適用
+4. **公式設定に戻す**: 「Official Login」プリセット（Claude/Codex）または「Google Official」プリセット（Gemini）を選び、対応クライアントを再起動してログイン/OAuth を実行
+
+### MCP 管理
+
+- **入口**: 右上の「MCP」ボタンをクリック
+- **サーバー追加**:
+  - 組み込みテンプレート（mcp-fetch、mcp-filesystem など）を使用
+  - stdio / http / sse の各トランスポートをサポート
+  - アプリごとに独立した MCP を設定可能
+- **有効/無効**: トグルでライブ設定への同期を切り替え
+- **同期**: 有効なサーバーは各アプリのライブファイルへ自動同期
+- **インポート/エクスポート**: Claude/Codex/Gemini の設定ファイルから既存 MCP を取り込み
+
+### Skills 管理 (v3.7.0 新機能)
+
+- **入口**: 右上の「Skills」ボタンをクリック
+- **スキル探索**:
+  - 事前設定済みの GitHub リポジトリを自動スキャン（Anthropic 公式、ComposioHQ、コミュニティなど）
+  - カスタムリポジトリを追加（サブディレクトリスキャン対応）
+- **インストール**: 「Install」を押すだけで `~/.claude/skills/` に配置
+- **アンインストール**: 「Uninstall」で安全に削除と状態クリーンアップ
+- **リポジトリ管理**: カスタム GitHub リポジトリを追加/削除
+
+### Prompts 管理 (v3.7.0 新機能)
+
+- **入口**: 右上の「Prompts」ボタンをクリック
+- **プリセット作成**:
+  - 無制限のシステムプロンプトプリセットを作成
+  - Markdown エディタで記述（シンタックスハイライト + リアルタイムプレビュー）
+- **プリセット切り替え**: プリセットを選択 → 「Activate」で即適用
+- **同期先**:
+  - Claude: `~/.claude/CLAUDE.md`
+  - Codex: `~/.codex/AGENTS.md`
+  - Gemini: `~/.gemini/GEMINI.md`
+- **保護機構**: 切り替え前に現在の内容を自動保存し、手動変更を保持
+
+### 設定ファイルパス
+
+**Claude Code**
+
+- ライブ設定: `~/.claude/settings.json`（または `claude.json`）
+- API キーフィールド: `env.ANTHROPIC_AUTH_TOKEN` または `env.ANTHROPIC_API_KEY`
+- MCP サーバー: `~/.claude.json` → `mcpServers`
+
+**Codex**
+
+- ライブ設定: `~/.codex/auth.json`（必須）+ `config.toml`（任意）
+- API キーフィールド: `auth.json` 内の `OPENAI_API_KEY`
+- MCP サーバー: `~/.codex/config.toml` → `[mcp_servers]` テーブル
+
+**Gemini**
+
+- ライブ設定: `~/.gemini/.env`（API キー）+ `~/.gemini/settings.json`（認証モード）
+- API キーフィールド: `.env` 内の `GEMINI_API_KEY` または `GOOGLE_GEMINI_API_KEY`
+- 環境変数: `GOOGLE_GEMINI_BASE_URL`、`GEMINI_MODEL` などをサポート
+- MCP サーバー: `~/.gemini/settings.json` → `mcpServers`
+- トレイでのクイックスイッチ: プロバイダ切り替えごとに `~/.gemini/.env` を書き換えるため Gemini CLI の再起動は不要
+
+**CC Switch 保存先 (v3.8.0 新アーキテクチャ)**
+
+- データベース (SSOT): `~/.cc-switch/cc-switch.db`（SQLite。プロバイダ、MCP、Prompts、Skills を保存）
+- ローカル設定: `~/.cc-switch/settings.json`（デバイスレベル設定）
+- バックアップ: `~/.cc-switch/backups/`（自動ローテーション、最新 10 件を保持）
+
+### クラウド同期の設定
+
+1. 設定 → 「Custom Configuration Directory」へ進む
+2. クラウド同期フォルダ（Dropbox、OneDrive、iCloud など）を選択
+3. アプリを再起動して反映
+4. 他のデバイスでも同じフォルダを指定すればクロスデバイス同期が有効に
+
+> **補足**: 初回起動時に既存の Claude/Codex 設定をデフォルトプロバイダとして自動インポートします。
+
+## アーキテクチャ概要
+
+### 設計原則
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│                    Frontend (React + TS)                    │
+│  ┌─────────────┐  ┌──────────────┐  ┌──────────────────┐    │
+│  │ Components  │  │    Hooks     │  │  TanStack Query  │    │
+│  │   (UI)      │──│ (Bus. Logic) │──│   (Cache/Sync)   │    │
+│  └─────────────┘  └──────────────┘  └──────────────────┘    │
+└────────────────────────┬────────────────────────────────────┘
+                         │ Tauri IPC
+┌────────────────────────▼────────────────────────────────────┐
+│                  Backend (Tauri + Rust)                     │
+│  ┌─────────────┐  ┌──────────────┐  ┌──────────────────┐    │
+│  │  Commands   │  │   Services   │  │  Models/Config   │    │
+│  │ (API Layer) │──│ (Bus. Layer) │──│     (Data)       │    │
+│  └─────────────┘  └──────────────┘  └──────────────────┘    │
+└─────────────────────────────────────────────────────────────┘
+```
+
+**コア設計パターン**
+
+- **SSOT** (Single Source of Truth): すべてのデータを `~/.cc-switch/cc-switch.db`（SQLite）に集約
+- **二層ストレージ**: 同期データは SQLite、デバイスデータは JSON
+- **双方向同期**: 切り替え時はライブファイルへ書き込み、編集時はアクティブプロバイダから逆同期
+- **アトミック書き込み**: 一時ファイル + rename パターンで設定破損を防止
+- **並行安全**: Mutex で保護された DB 接続でレースを防ぐ
+- **レイヤードアーキテクチャ**: Commands → Services → DAO → Database を明確に分離
+
+**主要コンポーネント**
+
+- **ProviderService**: プロバイダの CRUD、切り替え、バックフィル、ソート
+- **McpService**: MCP サーバー管理、インポート/エクスポート、ライブファイル同期
+- **ConfigService**: 設定のインポート/エクスポート、バックアップローテーション
+- **SpeedtestService**: API エンドポイントの遅延計測
+
+**v3.6 リファクタリング**
+
+- バックエンド: エラーハンドリング → コマンド分割 → テスト → サービス層 → 並行性の 5 フェーズ
+- フロントエンド: テスト基盤 → hooks → コンポーネント → クリーンアップの 4 ステージ
+- テスト: hooks 100% カバレッジ + 統合テスト（vitest + MSW）
+
+## 開発
+
+### 開発環境
+
+- Node.js 18+
+- pnpm 8+
+- Rust 1.85+
+- Tauri CLI 2.8+
+
+### 開発コマンド
+
+```bash
+# 依存関係をインストール
+pnpm install
+
+# ホットリロード付き開発モード
+pnpm dev
+
+# 型チェック
+pnpm typecheck
+
+# コード整形
+pnpm format
+
+# フォーマット検証
+pnpm format:check
+
+# フロントエンド単体テスト
+pnpm test:unit
+
+# ウォッチモード（開発に推奨）
+pnpm test:unit:watch
+
+# アプリをビルド
+pnpm build
+
+# デバッグビルド
+pnpm tauri build --debug
+```
+
+### Rust バックエンド開発
+
+```bash
+cd src-tauri
+
+# Rust コード整形
+cargo fmt
+
+# clippy チェック
+cargo clippy
+
+# バックエンドテスト
+cargo test
+
+# 特定テストのみ実行
+cargo test test_name
+
+# test-hooks フィーチャー付きでテスト
+cargo test --features test-hooks
+```
+
+### テストガイド (v3.6)
+
+**フロントエンドテスト**:
+
+- テストフレームワークに **vitest** を使用
+- **MSW (Mock Service Worker)** で Tauri API 呼び出しをモック
+- コンポーネントテストに **@testing-library/react** を採用
+
+**テストカバレッジ**:
+
+- Hooks の単体テスト（100% カバレッジ）
+  - `useProviderActions` - プロバイダ操作
+  - `useMcpActions` - MCP 管理
+  - `useSettings` 系 - 設定管理
+  - `useImportExport` - インポート/エクスポート
+- 統合テスト
+  - アプリのメインフロー
+  - SettingsDialog の一連操作
+  - MCP パネルの機能
+
+**テスト実行**:
+
+```bash
+# 全テストを実行
+pnpm test:unit
+
+# ウォッチモード（自動再実行）
+pnpm test:unit:watch
+
+# カバレッジレポート付き
+pnpm test:unit --coverage
+```
+
+## 技術スタック
+
+**フロントエンド**: React 18 · TypeScript · Vite · TailwindCSS 4 · TanStack Query v5 · react-i18next · react-hook-form · zod · shadcn/ui · @dnd-kit
+
+**バックエンド**: Tauri 2.8 · Rust · serde · tokio · thiserror · tauri-plugin-updater/process/dialog/store/log
+
+**テスト**: vitest · MSW · @testing-library/react
+
+## プロジェクト構成
+
+```
+├── src/                      # フロントエンド (React + TypeScript)
+│   ├── components/           # UI コンポーネント (providers/settings/mcp/ui)
+│   ├── hooks/                # ビジネスロジック用カスタムフック
+│   ├── lib/
+│   │   ├── api/              # Tauri API ラッパー (型安全)
+│   │   └── query/            # TanStack Query 設定
+│   ├── i18n/locales/         # 翻訳 (zh/en)
+│   ├── config/               # プリセット (providers/mcp)
+│   └── types/                # TypeScript 型定義
+├── src-tauri/                # バックエンド (Rust)
+│   └── src/
+│       ├── commands/         # Tauri コマンド層 (ドメイン別)
+│       ├── services/         # ビジネスロジック層
+│       ├── app_config.rs     # 設定モデル
+│       ├── provider.rs       # プロバイダドメインモデル
+│       ├── mcp.rs            # MCP 同期 & 検証
+│       └── lib.rs            # アプリエントリ & トレイメニュー
+├── tests/                    # フロントエンドテスト
+│   ├── hooks/                # 単体テスト
+│   └── components/           # 統合テスト
+└── assets/                   # スクリーンショット & スポンサーリソース
+```
+
+## 更新履歴
+
+詳細は [CHANGELOG.md](CHANGELOG.md) をご覧ください。
+
+## 旧 Electron 版
+
+[Releases](../../releases) に v2.0.3 の Electron 旧版を残しています。
+
+旧版コードが必要な場合は `electron-legacy` ブランチを取得してください。
+
+## 貢献
+
+Issue や提案を歓迎します！
+
+PR を送る前に以下をご確認ください:
+
+- 型チェック: `pnpm typecheck`
+- フォーマットチェック: `pnpm format:check`
+- 単体テスト: `pnpm test:unit`
+- 💡 新機能の場合は、事前に Issue でディスカッションしていただけると助かります
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=farion1231/cc-switch&type=Date)](https://www.star-history.com/#farion1231/cc-switch&Date)
+
+## ライセンス
+
+MIT © Jason Young
@@ -2,36 +2,40 @@

 # Claude Code / Codex / Gemini CLI 全方位辅助工具

-[![Version](https://img.shields.io/badge/version-3.7.0-blue.svg)](https://github.com/farion1231/cc-switch/releases)
-[![Trending](https://img.shields.io/badge/🔥_TypeScript_Trending-Daily%20%7C%20Weekly%20%7C%20Monthly-ff6b6b.svg)](https://github.com/trending/typescript)
+[![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)

 <a href="https://trendshift.io/repositories/15372" target="_blank"><img src="https://trendshift.io/api/badge/repositories/15372" alt="farion1231%2Fcc-switch | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>

-[English](README.md) | 中文 | [更新日志](CHANGELOG.md)
-
-一个用于管理和切换 Claude Code 与 Codex 不同供应商配置、MCP的桌面应用。
+[English](README.md) | 中文 | [日本語](README_JA.md) | [更新日志](CHANGELOG.md) | [v3.8.0 发布说明](docs/release-note-v3.8.0-zh.md)

 </div>

 ## ❤️赞助商

-![智谱 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)购买可以享受九折优惠。
+感谢智谱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)购买可以享受九折优惠。

 ---

 <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"><a href="https://aigocode.com/invite/CC-SWITCH"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></a></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>

@@ -43,12 +47,82 @@ CC Switch 已经预设了智谱GLM，只需要填写 key 即可一键导入编

 ## 功能特性

-### 当前版本：v3.7.0 | [完整更新日志](CHANGELOG.md)
+### 当前版本：v3.8.3 | [完整更新日志](CHANGELOG.md)
+
+**v3.8.0 重大更新（2025-11-28）**
+
+**持久化架构升级 & 全新用户界面**
+
+- **SQLite + JSON 双层架构**
+  - 从 JSON 文件存储迁移到 SQLite + JSON 双层结构
+  - 可同步数据（供应商、MCP、Prompts、Skills）存入 SQLite
+  - 设备级数据（窗口状态、本地路径）保留在 JSON
+  - 为未来云同步功能奠定基础
+  - Schema 版本管理支持数据库迁移
+
+- **全新用户界面**
+  - 完全重新设计的界面布局
+  - 统一的组件样式和更流畅的动画
+  - 优化的视觉层次
+  - Tailwind CSS 从 v4 降级到 v3.4 以提升浏览器兼容性
+
+- **日语支持**
+  - 新增日语界面支持（现支持中文/英文/日语）
+
+- **开机自启**
+  - 在设置中一键开启/关闭
+  - 使用平台原生 API（注册表/LaunchAgent/XDG autostart）
+
+- **Skills 递归扫描**
+  - 支持多层目录结构
+  - 允许不同仓库的同名技能
+
+- **关键 Bug 修复**
+  - 修复更新供应商时自定义端点丢失问题
+  - 修复 Gemini 配置写入问题
+  - 修复 Linux WebKitGTK 渲染问题
+
+**v3.7.0 亮点**
+
+**六大核心功能，18,000+ 行新增代码**
+
+- **Gemini CLI 集成**
+  - 第三个支持的 AI CLI（Claude Code / Codex / Gemini）
+  - 双文件配置支持（`.env` + `settings.json`）
+  - 完整 MCP 服务器管理
+  - 预设：Google Official (OAuth) / PackyCode / 自定义
+
+- **Claude Skills 管理系统**
+  - 从 GitHub 仓库自动扫描技能（预配置 3 个精选仓库）
+  - 一键安装/卸载到 `~/.claude/skills/`
+  - 自定义仓库支持 + 子目录扫描
+  - 完整生命周期管理（发现/安装/更新）
+
+- **Prompts 管理系统**
+  - 多预设系统提示词管理（无限数量，快速切换）
+  - 跨应用支持（Claude: `CLAUDE.md` / Codex: `AGENTS.md` / Gemini: `GEMINI.md`）
+  - Markdown 编辑器（CodeMirror 6 + 实时预览）
+  - 智能回填保护，保留手动修改
+
+- **MCP v3.7.0 统一架构**
+  - 单一面板管理三个应用的 MCP 服务器
+  - 新增 SSE (Server-Sent Events) 传输类型
+  - 智能 JSON 解析器 + Codex TOML 格式自动修正
+  - 统一导入/导出 + 双向同步
+
+- **深度链接协议**
+  - `ccswitch://` 协议注册（全平台）
+  - 通过共享链接一键导入供应商配置
+  - 安全验证 + 生命周期集成
+
+- **环境变量冲突检测**
+  - 自动检测跨应用配置冲突（Claude/Codex/Gemini/MCP）
+  - 可视化冲突指示器 + 解决建议
+  - 覆盖警告 + 更改前备份

 **核心功能**

 - **供应商管理**：一键切换 Claude Code、Codex 与 Gemini 的 API 配置
- **MCP 集成**：集中管理 MCP 服务器，支持 stdio/http 类型和实时同步
 - **速度测试**：测量 API 端点延迟，可视化连接质量指示器
 - **导入导出**：备份和恢复配置，自动轮换（保留最近 10 个）
 - **国际化支持**：完整的中英文本地化（UI、错误、托盘）
@@ -61,7 +135,6 @@ CC Switch 已经预设了智谱GLM，只需要填写 key 即可一键导入编
 - 细粒度模型配置（四层：Haiku/Sonnet/Opus/自定义）
 - WSL 环境支持，配置目录切换自动同步
 - 100% hooks 测试覆盖 & 完整架构重构
- 新增预设：DMXAPI、Azure Codex、AnyRouter、AiHubMix、MiniMax

 **系统功能**

@@ -103,6 +176,14 @@ brew upgrade --cask cc-switch

 > **注意**：由于作者没有苹果开发者账号，首次打开可能出现"未知开发者"警告，请先关闭，然后前往"系统设置" → "隐私与安全性" → 点击"仍要打开"，之后便可以正常打开

+### ArchLinux 用户
+
+**通过 paru 安装（推荐）**
+
+```bash
+paru -S cc-switch-bin
+```
+
 ### Linux 用户

 从 [Releases](../../releases) 页面下载最新版本的 `CC-Switch-v{版本号}-Linux.deb` 包或者 `CC-Switch-v{版本号}-Linux.AppImage` 安装包。
@@ -121,9 +202,36 @@ brew upgrade --cask cc-switch
 ### MCP 管理

 - **位置**：点击右上角"MCP"按钮
- **添加服务器**：使用内置模板（mcp-fetch、mcp-filesystem）或自定义配置
+- **添加服务器**：
+  - 使用内置模板（mcp-fetch、mcp-filesystem 等）
+  - 支持 stdio / http / sse 三种传输类型
+  - 为不同应用配置独立的 MCP 服务器
 - **启用/禁用**：切换开关以控制哪些服务器同步到 live 配置
- **同步**：启用的服务器自动同步到 `~/.claude.json`（Claude）或 `~/.codex/config.toml`（Codex）
+- **同步**：启用的服务器自动同步到各应用的 live 文件
+- **导入/导出**：支持从 Claude/Codex/Gemini 配置文件导入现有 MCP 服务器
+
+### Skills 管理（v3.7.0 新增）
+
+- **位置**：点击右上角"Skills"按钮
+- **发现技能**：
+  - 自动扫描预配置的 GitHub 仓库（Anthropic 官方、ComposioHQ、社区等）
+  - 添加自定义仓库（支持子目录扫描）
+- **安装技能**：点击"安装"一键安装到 `~/.claude/skills/`
+- **卸载技能**：点击"卸载"安全移除并清理状态
+- **管理仓库**：添加/删除自定义 GitHub 仓库
+
+### Prompts 管理（v3.7.0 新增）
+
+- **位置**：点击右上角"Prompts"按钮
+- **创建预设**：
+  - 创建无限数量的系统提示词预设
+  - 使用 Markdown 编辑器编写提示词（语法高亮 + 实时预览）
+- **切换预设**：选择预设 → 点击"激活"立即应用
+- **同步机制**：
+  - Claude: `~/.claude/CLAUDE.md`
+  - Codex: `~/.codex/AGENTS.md`
+  - Gemini: `~/.gemini/GEMINI.md`
+- **保护机制**：切换前自动保存当前提示词内容，保留手动修改

 ### 配置文件

@@ -141,14 +249,16 @@ brew upgrade --cask cc-switch

 **Gemini**

- Live 配置：`~/.gemini/.env`（API Key）+ `~/.gemini/settings.json`（保存认证模式，支持托盘快速切换）
- API key 字段：`.env` 文件中的 `GEMINI_API_KEY`
- 托盘快速切换：每次切换供应商都会重写 `~/.gemini/.env`，Gemini CLI 无需额外操作即可使用新配置
+- Live 配置：`~/.gemini/.env`（API Key）+ `~/.gemini/settings.json`（保存认证模式）
+- API key 字段：`.env` 文件中的 `GEMINI_API_KEY` 或 `GOOGLE_GEMINI_API_KEY`
+- 环境变量：支持 `GOOGLE_GEMINI_BASE_URL`、`GEMINI_MODEL` 等自定义变量
+- MCP 服务器：`~/.gemini/settings.json` → `mcpServers`
+- 托盘快速切换：每次切换供应商都会重写 `~/.gemini/.env`，无需重启 Gemini CLI 即可生效

-**CC Switch 存储**
+**CC Switch 存储（v3.8.0 新架构）**

- 主配置（SSOT）：`~/.cc-switch/config.json`
- 设置：`~/.cc-switch/settings.json`
+- 数据库（SSOT）：`~/.cc-switch/cc-switch.db`（SQLite，存储供应商、MCP、Prompts、Skills）
+- 本地设置：`~/.cc-switch/settings.json`（设备级设置）
 - 备份：`~/.cc-switch/backups/`（自动轮换，保留 10 个）

 ### 云同步设置
@@ -184,11 +294,12 @@ brew upgrade --cask cc-switch

 **核心设计模式**

- **SSOT**（单一事实源）：所有供应商配置存储在 `~/.cc-switch/config.json`
+- **SSOT**（单一事实源）：所有数据存储在 `~/.cc-switch/cc-switch.db`（SQLite）
+- **双层存储**：SQLite 存储可同步数据，JSON 存储设备级设置
 - **双向同步**：切换时写入 live 文件，编辑当前供应商时从 live 回填
 - **原子写入**：临时文件 + 重命名模式防止配置损坏
- **并发安全**：RwLock 与作用域守卫避免死锁
- **分层架构**：清晰分离（Commands → Services → Models）
+- **并发安全**：Mutex 保护的数据库连接避免竞态条件
+- **分层架构**：清晰分离（Commands → Services → DAO → Database）

 **核心组件**

@@ -1,76 +0,0 @@
-# CC Switch 国际化功能说明
-
-## 已完成的工作
-
-1. **安装依赖**：添加了 `react-i18next` 和 `i18next` 包
-2. **配置国际化**：在 `src/i18n/` 目录下创建了配置文件
-3. **翻译文件**：创建了英文和中文翻译文件
-4. **组件更新**：替换了主要组件中的硬编码文案
-5. **语言切换器**：添加了语言切换按钮
-
-## 文件结构
-
-```
-src/
-├── i18n/
-│   ├── index.ts          # 国际化配置文件
-│   └── locales/
-│       ├── en.json       # 英文翻译
-│       └── zh.json       # 中文翻译
-├── components/
-│   └── LanguageSwitcher.tsx  # 语言切换组件
-└── main.tsx              # 导入国际化配置
-```
-
-## 默认语言设置
-
- **默认语言**：英文 (en)
- **回退语言**：英文 (en)
-
-## 使用方式
-
-1. 在组件中导入 `useTranslation`：
-   ```tsx
-   import { useTranslation } from 'react-i18next';
-
-   function MyComponent() {
-     const { t } = useTranslation();
-     return <div>{t('common.save')}</div>;
-   }
-   ```
-
-2. 切换语言：
-   ```tsx
-   const { i18n } = useTranslation();
-   i18n.changeLanguage('zh'); // 切换到中文
-   ```
-
-## 翻译键结构
-
- `common.*` - 通用文案（保存、取消、设置等）
- `header.*` - 头部相关文案
- `provider.*` - 供应商相关文案
- `notifications.*` - 通知消息
- `settings.*` - 设置页面文案
- `apps.*` - 应用名称
- `console.*` - 控制台日志信息
-
-## 测试功能
-
-应用已添加了语言切换按钮（地球图标），点击可以在中英文之间切换，验证国际化功能是否正常工作。
-
-## 已更新的组件
-
- ✅ App.tsx - 主应用组件
- ✅ ConfirmDialog.tsx - 确认对话框
- ✅ AddProviderModal.tsx - 添加供应商弹窗
- ✅ EditProviderModal.tsx - 编辑供应商弹窗
- ✅ ProviderList.tsx - 供应商列表
- ✅ LanguageSwitcher.tsx - 语言切换器
- ✅ settings/SettingsDialog.tsx - 设置对话框
-
-## 注意事项
-
-1. 所有新的文案都应该添加到翻译文件中，而不是硬编码
-2. 翻译键名应该有意义且结构化
-3. 可以通过修改 `src/i18n/index.ts` 中的 `lng` 配置来更改默认语言
@@ -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,
@@ -0,0 +1,165 @@
+# CC Switch 代理功能使用指南
+
+## 功能介绍
+
+CC Switch 的代理功能是一个本地 HTTP 代理服务器，可以统一管理 Claude Code、Codex 和 Gemini CLI 的 API 请求。主要特性包括：
+
+- **统一代理入口** - 所有 CLI 应用的请求通过本地代理转发
+- **自动故障转移** - 当前供应商故障时自动切换到备用供应商
+- **按应用控制** - 可独立控制每个应用是否启用代理
+- **配置保护** - 自动备份原始配置，停止代理时安全恢复
+
+## 快速开始
+
+### 1. 启动代理
+
+在 CC Switch 主界面，点击右上角的 **Proxy** 按钮，可以看到代理控制面板。
+
+点击 **启动代理** 按钮启动本地代理服务器。代理默认监听 `127.0.0.1:15721`。
+
+### 2. 启用应用接管
+
+代理启动后，你可以选择让哪些应用的请求通过代理：
+
+- **Claude** - 接管 Claude Code 的 API 请求
+- **Codex** - 接管 Codex CLI 的 API 请求
+- **Gemini** - 接管 Gemini CLI 的 API 请求
+
+点击对应应用的开关即可启用/禁用接管。
+
+> **注意**：启用接管后，CC Switch 会自动修改对应应用的配置文件，将 API 端点指向本地代理。原始配置会被安全备份。
+
+### 3. 正常使用 CLI
+
+启用接管后，你可以正常使用各个 CLI 工具。所有请求都会经过 CC Switch 代理转发到配置的供应商。
+
+### 4. 停止代理
+
+当你不再需要代理时，点击 **停止代理** 按钮。CC Switch 会：
+
+1. 安全关闭代理服务器
+2. 自动恢复所有应用的原始配置
+3. 清除代理状态
+
+## 自动故障转移
+
+### 工作原理
+
+代理功能内置了智能故障转移机制：
+
+1. **健康监控** - 实时监控每个供应商的响应状态
+2. **熔断器** - 连续失败 5 次后触发熔断，暂停使用该供应商
+3. **自动切换** - 熔断后自动切换到列表中的下一个供应商
+4. **自动恢复** - 30 秒后尝试恢复熔断的供应商
+
+### 配置故障转移
+
+要使用故障转移功能，你需要：
+
+1. 在对应应用下添加多个供应商（至少 2 个）
+2. 启动代理并启用接管
+3. 当主供应商故障时，代理会自动切换到备用供应商
+
+### 健康状态指示
+
+在供应商卡片上可以看到健康状态指示：
+
+- **绿色** - 供应商正常
+- **红色** - 供应商故障/熔断中
+- **灰色** - 未使用代理或未检测
+
+## 按应用接管
+
+v3.9.0 新增了按应用分粒度控制功能：
+
+- 你可以只接管 Claude，而让 Codex 使用原始配置
+- 每个应用的接管状态独立管理
+- 启用/禁用不会影响其他应用
+
+### 接管状态检测
+
+CC Switch 通过检测配置备份来判断接管状态：
+
+- 存在备份 = 已接管
+- 无备份 = 未接管
+
+这确保了即使 CC Switch 异常退出，重新启动后也能正确识别状态。
+
+## 代理配置
+
+在代理面板中，你可以配置以下参数：
+
+| 参数 | 默认值 | 说明 |
+|------|--------|------|
+| 监听地址 | 127.0.0.1 | 代理服务器绑定地址 |
+| 监听端口 | 15721 | 代理服务器端口 |
+| 最大重试 | 3 | 请求失败时的最大重试次数 |
+| 请求超时 | 120 秒 | 单个请求的超时时间 |
+| 启用日志 | 是 | 是否记录请求日志 |
+
+## 常见问题
+
+### Q: 代理启动失败，提示端口被占用？
+
+A: 默认端口 15721 可能被其他程序占用。你可以：
+- 关闭占用该端口的程序
+- 在代理配置中修改端口号
+
+### Q: 启用接管后 CLI 无法使用？
+
+A: 请检查：
+1. 代理服务器是否正常运行（查看代理面板状态）
+2. 供应商配置是否正确（API Key 等）
+3. 网络连接是否正常
+
+### Q: 如何恢复原始配置？
+
+A: 点击 **停止代理** 按钮，CC Switch 会自动恢复所有应用的原始配置。
+
+如果 CC Switch 异常退出，重新启动后会检测到之前的备份，你可以：
+- 点击停止代理来恢复配置
+- 或继续使用代理功能
+
+### Q: 故障转移没有生效？
+
+A: 请确保：
+1. 配置了至少 2 个供应商
+2. 代理已启动且接管已启用
+3. 故障转移只在代理模式下工作
+
+### Q: 代理会影响性能吗？
+
+A: 本地代理的延迟开销非常小（通常 < 1ms）。但如果启用了请求日志，在高频请求场景下可能会有少量性能影响。
+
+## 技术细节
+
+### 配置文件位置
+
+启用接管后，CC Switch 会修改以下配置文件：
+
+| 应用 | 配置文件 | 修改内容 |
+|------|----------|----------|
+| Claude | `~/.claude/settings.json` | `apiBaseUrl` 指向代理 |
+| Codex | `~/.codex/config.toml` | `[api] baseUrl` 指向代理 |
+| Gemini | `~/.gemini/.env` | `GEMINI_BASE_URL` 指向代理 |
+
+原始配置备份在 CC Switch 数据库中，停止代理时自动恢复。
+
+### 代理模式
+
+代理服务器运行在接管模式下，会：
+
+1. 接收来自 CLI 的 HTTPS 请求
+2. 根据当前供应商配置转发到真实 API 端点
+3. 返回响应给 CLI
+4. 记录请求日志和健康状态
+
+### 数据库表
+
+代理功能使用以下数据库表：
+
+- `proxy_config` - 代理配置
+- `provider_health` - 供应商健康状态
+- `proxy_request_logs` - 请求日志
+- `circuit_breaker_config` - 熔断器配置
+- `proxy_live_backup` - Live 配置备份
@@ -0,0 +1,481 @@
+# CC Switch v3.7.1
+
+> Stability Enhancements and User Experience Improvements
+
+**[中文更新说明 Chinese Documentation →](release-note-v3.7.1-zh.md)**
+
+---
+
+## v3.7.1 Updates
+
+**Release Date**: 2025-11-22
+**Code Changes**: 17 files, +524 / -81 lines
+
+### Bug Fixes
+
+- **Fix Third-Party Skills Installation Failure** (#268)
+  Fixed installation issues for skills repositories with custom subdirectories, now supports repos like `ComposioHQ/awesome-claude-skills` with subdirectories
+
+- **Fix Gemini Configuration Persistence Issue**
+  Resolved the issue where settings.json edits in Gemini form were lost when switching providers
+
+- **Prevent Dialogs from Closing on Overlay Click**
+  Added protection against clicking overlay/backdrop, preventing accidental form data loss across all 11 dialog components
+
+### New Features
+
+- **Gemini Configuration Directory Support** (#255)
+  Added Gemini configuration directory option in settings, supports customizing `~/.gemini/` path
+
+- **ArchLinux Installation Support** (#259)
+  Added AUR installation method: `paru -S cc-switch-bin`
+
+### Improvements
+
+- **Skills Error Message i18n Enhancement**
+  Added 28+ detailed error messages (English & Chinese) with specific resolution suggestions, extended download timeout from 15s to 60s
+
+- **Code Formatting**
+  Applied unified Rust and TypeScript code formatting standards
+
+### Download
+
+Visit [Releases](https://github.com/farion1231/cc-switch/releases/latest) to download the latest version
+
+---
+
+## v3.7.0 Complete Release Notes
+
+> From Provider Switcher to All-in-One AI CLI Management Platform
+
+**Release Date**: 2025-11-19
+**Commits**: 85 from v3.6.0
+**Code Changes**: 152 files, +18,104 / -3,732 lines
+
+---
+
+## New Features
+
+### Gemini CLI Integration
+
+Complete support for Google Gemini CLI, becoming the third supported application (Claude Code, Codex, Gemini).
+
+**Core Capabilities**:
+
+- **Dual-file configuration** - Support for both `.env` and `settings.json` formats
+- **Auto-detection** - Automatically detect `GOOGLE_GEMINI_BASE_URL`, `GEMINI_MODEL`, etc.
+- **Full MCP support** - Complete MCP server management for Gemini
+- **Deep link integration** - Import via `ccswitch://` protocol
+- **System tray** - Quick-switch from tray menu
+
+**Provider Presets**:
+
+- **Google Official** - OAuth authentication support
+- **PackyCode** - Partner integration
+- **Custom** - Full customization support
+
+**Technical Implementation**:
+
+- New backend modules: `gemini_config.rs` (20KB), `gemini_mcp.rs`
+- Form synchronization with environment editor
+- Dual-file atomic writes
+
+---
+
+### MCP v3.7.0 Unified Architecture
+
+Complete refactoring of MCP management system for cross-application unification.
+
+**Architecture Improvements**:
+
+- **Unified panel** - Single interface for Claude/Codex/Gemini MCP servers
+- **SSE transport** - New Server-Sent Events support
+- **Smart parser** - Fault-tolerant JSON parsing
+- **Format correction** - Auto-fix Codex `[mcp_servers]` format
+- **Extended fields** - Preserve custom TOML fields
+
+**User Experience**:
+
+- Default app selection in forms
+- JSON formatter for validation
+- Improved visual hierarchy
+- Better error messages
+
+**Import/Export**:
+
+- Unified import from all three apps
+- Bidirectional synchronization
+- State preservation
+
+---
+
+### Claude Skills Management System
+
+**Approximately 2,000 lines of code** - A complete skill ecosystem platform.
+
+**GitHub Integration**:
+
+- Auto-scan skills from GitHub repositories
+- Pre-configured repos:
+  - `ComposioHQ/awesome-claude-skills` - Curated collection
+  - `anthropics/skills` - Official Anthropic skills
+  - `cexll/myclaude` - Community contributions
+- Add custom repositories
+- Subdirectory scanning support (`skillsPath`)
+
+**Lifecycle Management**:
+
+- **Discover** - Auto-detect `SKILL.md` files
+- **Install** - One-click to `~/.claude/skills/`
+- **Uninstall** - Safe removal with tracking
+- **Update** - Check for updates (infrastructure ready)
+
+**Technical Architecture**:
+
+- **Backend**: `SkillService` (526 lines) with GitHub API integration
+- **Frontend**: SkillsPage, SkillCard, RepoManager
+- **UI Components**: Badge, Card, Table (shadcn/ui)
+- **State**: Persistent storage in `config.json`
+- **i18n**: 47+ translation keys
+
+---
+
+### Prompts Management System
+
+**Approximately 1,300 lines of code** - Complete system prompt management.
+
+**Multi-Preset Management**:
+
+- Create unlimited prompt presets
+- Quick switch between presets
+- One active prompt at a time
+- Delete protection for active prompts
+
+**Cross-App Support**:
+
+- **Claude**: `~/.claude/CLAUDE.md`
+- **Codex**: `~/.codex/AGENTS.md`
+- **Gemini**: `~/.gemini/GEMINI.md`
+
+**Markdown Editor**:
+
+- Full-featured CodeMirror 6 integration
+- Syntax highlighting
+- Dark theme (One Dark)
+- Real-time preview
+
+**Smart Synchronization**:
+
+- **Auto-write** - Immediately write to live files
+- **Backfill protection** - Save current content before switching
+- **Auto-import** - Import from live files on first launch
+- **Modification protection** - Preserve manual modifications
+
+**Technical Implementation**:
+
+- **Backend**: `PromptService` (213 lines)
+- **Frontend**: PromptPanel (177), PromptFormModal (160), MarkdownEditor (159)
+- **Hooks**: usePromptActions (152 lines)
+- **i18n**: 41+ translation keys
+
+---
+
+### Deep Link Protocol (ccswitch://)
+
+One-click provider configuration import via URL scheme.
+
+**Features**:
+
+- Protocol registration on all platforms
+- Import from shared links
+- Lifecycle integration
+- Security validation
+
+---
+
+### Environment Variable Conflict Detection
+
+Intelligent detection and management of configuration conflicts.
+
+**Detection Scope**:
+
+- **Claude & Codex** - Cross-app conflicts
+- **Gemini** - Auto-discovery
+- **MCP** - Server configuration conflicts
+
+**Management Features**:
+
+- Visual conflict indicators
+- Resolution suggestions
+- Override warnings
+- Backup before changes
+
+---
+
+## Improvements
+
+### Provider Management
+
+**New Presets**:
+
+- **DouBaoSeed** - ByteDance's DouBao
+- **Kimi For Coding** - Moonshot AI
+- **BaiLing** - BaiLing AI
+- **Removed AnyRouter** - To avoid confusion
+
+**Enhancements**:
+
+- Model name configuration for Codex and Gemini
+- Provider notes field for organization
+- Enhanced preset metadata
+
+### Configuration Management
+
+- **Common config migration** - From localStorage to `config.json`
+- **Unified persistence** - Shared across all apps
+- **Auto-import** - First launch configuration import
+- **Backfill priority** - Correct handling of live files
+
+### UI/UX Improvements
+
+**Design System**:
+
+- **macOS native** - System-aligned color scheme
+- **Window centering** - Default centered position
+- **Visual polish** - Improved spacing and hierarchy
+
+**Interactions**:
+
+- **Password input** - Fixed Edge/IE reveal buttons
+- **URL overflow** - Fixed card overflow
+- **Error copying** - Copy-to-clipboard errors
+- **Tray sync** - Real-time drag-and-drop sync
+
+---
+
+## Bug Fixes
+
+### Critical Fixes
+
+- **Usage script validation** - Boundary checks
+- **Gemini validation** - Relaxed constraints
+- **TOML parsing** - CJK quote handling
+- **MCP fields** - Custom field preservation
+- **White screen** - FormLabel crash fix
+
+### Stability
+
+- **Tray safety** - Pattern matching instead of unwrap
+- **Error isolation** - Tray failures don't block operations
+- **Import classification** - Correct category assignment
+
+### UI Fixes
+
+- **Model placeholders** - Removed misleading hints
+- **Base URL** - Auto-fill for third-party providers
+- **Drag sort** - Tray menu synchronization
+
+---
+
+## Technical Improvements
+
+### Architecture
+
+**MCP v3.7.0**:
+
+- Removed legacy code (~1,000 lines)
+- Unified initialization structure
+- Backward compatibility maintained
+- Comprehensive code formatting
+
+**Platform Compatibility**:
+
+- Windows winreg API fix (v0.52)
+- Safe pattern matching (no `unwrap()`)
+- Cross-platform tray handling
+
+### Configuration
+
+**Synchronization**:
+
+- MCP sync across all apps
+- Gemini form-editor sync
+- Dual-file reading (.env + settings.json)
+
+**Validation**:
+
+- Input boundary checks
+- TOML quote normalization (CJK)
+- Custom field preservation
+- Enhanced error messages
+
+### Code Quality
+
+**Type Safety**:
+
+- Complete TypeScript coverage
+- Rust type refinements
+- API contract validation
+
+**Testing**:
+
+- Simplified assertions
+- Better test coverage
+- Integration test updates
+
+**Dependencies**:
+
+- Tauri 2.8.x
+- Rust: `anyhow`, `zip`, `serde_yaml`, `tempfile`
+- Frontend: CodeMirror 6 packages
+- winreg 0.52 (Windows)
+
+---
+
+## Technical Statistics
+
+```
+Total Changes:
+- Commits: 85
+- Files: 152 changed
+- Additions: +18,104 lines
+- Deletions: -3,732 lines
+
+New Modules:
+- Skills Management: 2,034 lines (21 files)
+- Prompts Management: 1,302 lines (20 files)
+- Gemini Integration: ~1,000 lines
+- MCP Refactor: ~3,000 lines refactored
+
+Code Distribution:
+- Backend (Rust): ~4,500 lines new
+- Frontend (React): ~3,000 lines new
+- Configuration: ~1,500 lines refactored
+- Tests: ~500 lines
+```
+
+---
+
+## Strategic Positioning
+
+### From Tool to Platform
+
+v3.7.0 represents a shift in CC Switch's positioning:
+
+| Aspect            | v3.6                     | v3.7.0                       |
+| ----------------- | ------------------------ | ---------------------------- |
+| **Identity**      | Provider Switcher        | AI CLI Management Platform   |
+| **Scope**         | Configuration Management | Ecosystem Management         |
+| **Applications**  | Claude + Codex           | Claude + Codex + Gemini      |
+| **Capabilities**  | Switch configs           | Extend capabilities (Skills) |
+| **Customization** | Manual editing           | Visual management (Prompts)  |
+| **Integration**   | Isolated apps            | Unified management (MCP)     |
+
+### Six Pillars of AI CLI Management
+
+1. **Configuration Management** - Provider switching and management
+2. **Capability Extension** - Skills installation and lifecycle
+3. **Behavior Customization** - System prompt presets
+4. **Ecosystem Integration** - Deep links and sharing
+5. **Multi-AI Support** - Claude/Codex/Gemini
+6. **Intelligent Detection** - Conflict prevention
+
+---
+
+## Download & Installation
+
+### System Requirements
+
+- **Windows**: Windows 10+
+- **macOS**: macOS 10.15 (Catalina)+
+- **Linux**: Ubuntu 22.04+ / Debian 11+ / Fedora 34+ / ArchLinux
+
+### Download Links
+
+Visit [Releases](https://github.com/farion1231/cc-switch/releases/latest) to download:
+
+- **Windows**: `CC-Switch-Windows.msi` or `-Portable.zip`
+- **macOS**: `CC-Switch-macOS.tar.gz` or `.zip`
+- **Linux**: `CC-Switch-Linux.AppImage` or `.deb`
+- **ArchLinux**: `paru -S cc-switch-bin`
+
+### Homebrew (macOS)
+
+```bash
+brew tap farion1231/ccswitch
+brew install --cask cc-switch
+```
+
+Update:
+
+```bash
+brew upgrade --cask cc-switch
+```
+
+---
+
+## Migration Notes
+
+### From v3.6.x
+
+**Automatic migration** - No action required, configs are fully compatible
+
+### From v3.1.x or Earlier
+
+**Two-step migration required**:
+
+1. First upgrade to v3.2.x (performs one-time migration)
+2. Then upgrade to v3.7.0
+
+### New Features
+
+- **Skills**: No migration needed, start fresh
+- **Prompts**: Auto-import from live files on first launch
+- **Gemini**: Install Gemini CLI separately if needed
+- **MCP v3.7.0**: Backward compatible with previous configs
+
+---
+
+## Acknowledgments
+
+### Contributors
+
+Thanks to all contributors who made this release possible:
+
+- [@YoVinchen](https://github.com/YoVinchen) - Skills & Prompts & Gemini integration implementation
+- [@farion1231](https://github.com/farion1231) - From developer to issue responder
+- Community members for testing and feedback
+
+### Sponsors
+
+**Z.ai** - GLM CODING PLAN sponsor
+[Get 10% OFF with this link](https://z.ai/subscribe?ic=8JVLJQFSKB)
+
+**PackyCode** - API relay service partner
+[Register with "cc-switch" code for 10% discount](https://www.packyapi.com/register?aff=cc-switch)
+
+**ShanDianShuo** - Local-first AI voice input
+[Free download](https://shandianshuo.cn) for Mac/Win
+
+---
+
+## Feedback & Support
+
+- **Issues**: [GitHub Issues](https://github.com/farion1231/cc-switch/issues)
+- **Discussions**: [GitHub Discussions](https://github.com/farion1231/cc-switch/discussions)
+- **Documentation**: [README](../README.md)
+- **Changelog**: [CHANGELOG.md](../CHANGELOG.md)
+
+---
+
+## What's Next
+
+**v3.8.0 Preview** (Tentative):
+
+- Local proxy functionality
+
+Stay tuned for more updates!
+
+---
+
+**Happy Coding!**
@@ -0,0 +1,481 @@
+# CC Switch v3.7.1
+
+> 稳定性增强与用户体验改进
+
+**[English Version →](release-note-v3.7.1-en.md)**
+
+---
+
+## v3.7.1 更新内容
+
+**发布日期**：2025-11-22
+**代码变更**：17 个文件，+524 / -81 行
+
+### Bug 修复
+
+- **修复 Skills 第三方仓库安装失败** (#268)
+  修复使用自定义子目录的 skills 仓库无法安装的问题，支持类似 `ComposioHQ/awesome-claude-skills` 这样带子目录的仓库
+
+- **修复 Gemini 配置持久化问题**
+  解决在 Gemini 表单中编辑 settings.json 后，切换供应商时修改丢失的问题
+
+- **防止对话框意外关闭**
+  添加点击遮罩时的保护，避免误操作导致表单数据丢失，影响所有 11 个对话框组件
+
+### 新增功能
+
+- **Gemini 配置目录支持** (#255)
+  在设置中添加 Gemini 配置目录选项，支持自定义 `~/.gemini/` 路径
+
+- **ArchLinux 安装支持** (#259)
+  添加 AUR 安装方式：`paru -S cc-switch-bin`
+
+### 改进
+
+- **Skills 错误消息国际化增强**
+  新增 28+ 条详细错误消息（中英文），提供具体的解决建议，下载超时从 15 秒延长到 60 秒
+
+- **代码格式化**
+  应用统一的 Rust 和 TypeScript 代码格式化标准
+
+### 下载
+
+访问 [Releases](https://github.com/farion1231/cc-switch/releases/latest) 下载最新版本
+
+---
+
+## v3.7.0 完整更新说明
+
+> 从供应商切换器到 AI CLI 一体化管理平台
+
+**发布日期**：2025-11-19
+**提交数量**：从 v3.6.0 开始 85 个提交
+**代码变更**：152 个文件，+18,104 / -3,732 行
+
+---
+
+## 新增功能
+
+### Gemini CLI 集成
+
+完整支持 Google Gemini CLI，成为第三个支持的应用（Claude Code、Codex、Gemini）。
+
+**核心能力**：
+
+- **双文件配置** - 同时支持 `.env` 和 `settings.json` 格式
+- **自动检测** - 自动检测 `GOOGLE_GEMINI_BASE_URL`、`GEMINI_MODEL` 等环境变量
+- **完整 MCP 支持** - 为 Gemini 提供完整的 MCP 服务器管理
+- **深度链接集成** - 通过 `ccswitch://` 协议导入配置
+- **系统托盘** - 从托盘菜单快速切换
+
+**供应商预设**：
+
+- **Google Official** - 支持 OAuth 认证
+- **PackyCode** - 合作伙伴集成
+- **自定义** - 完全自定义支持
+
+**技术实现**：
+
+- 新增后端模块：`gemini_config.rs`（20KB）、`gemini_mcp.rs`
+- 表单与环境编辑器同步
+- 双文件原子写入
+
+---
+
+### MCP v3.7.0 统一架构
+
+MCP 管理系统完整重构，实现跨应用统一管理。
+
+**架构改进**：
+
+- **统一管理面板** - 单一界面管理 Claude/Codex/Gemini MCP 服务器
+- **SSE 传输类型** - 新增 Server-Sent Events 支持
+- **智能解析器** - 容错性 JSON 解析
+- **格式修正** - 自动修复 Codex `[mcp_servers]` 格式
+- **扩展字段** - 保留自定义 TOML 字段
+
+**用户体验**：
+
+- 表单中的默认应用选择
+- JSON 格式化器用于验证
+- 改进的视觉层次
+- 更好的错误消息
+
+**导入/导出**：
+
+- 统一从三个应用导入
+- 双向同步
+- 状态保持
+
+---
+
+### Claude Skills 管理系统
+
+**约 2,000 行代码** - 完整的技能生态平台。
+
+**GitHub 集成**：
+
+- 从 GitHub 仓库自动扫描技能
+- 预配置仓库：
+  - `ComposioHQ/awesome-claude-skills` - 精选集合
+  - `anthropics/skills` - Anthropic 官方技能
+  - `cexll/myclaude` - 社区贡献
+- 添加自定义仓库
+- 子目录扫描支持（`skillsPath`）
+
+**生命周期管理**：
+
+- **发现** - 自动检测 `SKILL.md` 文件
+- **安装** - 一键安装到 `~/.claude/skills/`
+- **卸载** - 安全移除并跟踪状态
+- **更新** - 检查更新（基础设施已就绪）
+
+**技术架构**：
+
+- **后端**：`SkillService`（526 行）集成 GitHub API
+- **前端**：SkillsPage、SkillCard、RepoManager
+- **UI 组件**：Badge、Card、Table（shadcn/ui）
+- **状态**：持久化存储在 `config.json`
+- **国际化**：47+ 个翻译键
+
+---
+
+### Prompts 管理系统
+
+**约 1,300 行代码** - 完整的系统提示词管理。
+
+**多预设管理**：
+
+- 创建无限数量的提示词预设
+- 快速在预设间切换
+- 同时只能激活一个提示词
+- 活动提示词删除保护
+
+**跨应用支持**：
+
+- **Claude**：`~/.claude/CLAUDE.md`
+- **Codex**：`~/.codex/AGENTS.md`
+- **Gemini**：`~/.gemini/GEMINI.md`
+
+**Markdown 编辑器**：
+
+- 完整的 CodeMirror 6 集成
+- 语法高亮
+- 暗色主题（One Dark）
+- 实时预览
+
+**智能同步**：
+
+- **自动写入** - 立即写入 live 文件
+- **回填保护** - 切换前保存当前内容
+- **自动导入** - 首次启动从 live 文件导入
+- **修改保护** - 保留手动修改
+
+**技术实现**：
+
+- **后端**：`PromptService`（213 行）
+- **前端**：PromptPanel（177）、PromptFormModal（160）、MarkdownEditor（159）
+- **Hooks**：usePromptActions（152 行）
+- **国际化**：41+ 个翻译键
+
+---
+
+### 深度链接协议（ccswitch://）
+
+通过 URL 方案一键导入供应商配置。
+
+**功能特性**：
+
+- 所有平台的协议注册
+- 从共享链接导入
+- 生命周期集成
+- 安全验证
+
+---
+
+### 环境变量冲突检测
+
+智能检测和管理配置冲突。
+
+**检测范围**：
+
+- **Claude & Codex** - 跨应用冲突
+- **Gemini** - 自动发现
+- **MCP** - 服务器配置冲突
+
+**管理功能**：
+
+- 可视化冲突指示器
+- 解决建议
+- 覆盖警告
+- 更改前备份
+
+---
+
+## 改进优化
+
+### 供应商管理
+
+**新增预设**：
+
+- **DouBaoSeed** - 字节跳动的豆包
+- **Kimi For Coding** - 月之暗面
+- **BaiLing** - 百灵 AI
+- **移除 AnyRouter** - 避免误导
+
+**增强功能**：
+
+- Codex 和 Gemini 的模型名称配置
+- 供应商备注字段用于组织
+- 增强的预设元数据
+
+### 配置管理
+
+- **通用配置迁移** - 从 localStorage 迁移到 `config.json`
+- **统一持久化** - 跨所有应用共享
+- **自动导入** - 首次启动配置导入
+- **回填优先级** - 正确处理 live 文件
+
+### UI/UX 改进
+
+**设计系统**：
+
+- **macOS 原生** - 与系统对齐的配色方案
+- **窗口居中** - 默认居中位置
+- **视觉优化** - 改进的间距和层次
+
+**交互优化**：
+
+- **密码输入** - 修复 Edge/IE 显示按钮
+- **URL 溢出** - 修复卡片溢出
+- **错误复制** - 可复制到剪贴板的错误
+- **托盘同步** - 实时拖放同步
+
+---
+
+## Bug 修复
+
+### 关键修复
+
+- **用量脚本验证** - 边界检查
+- **Gemini 验证** - 放宽约束
+- **TOML 解析** - CJK 引号处理
+- **MCP 字段** - 自定义字段保留
+- **白屏** - FormLabel 崩溃修复
+
+### 稳定性
+
+- **托盘安全** - 模式匹配替代 unwrap
+- **错误隔离** - 托盘失败不阻塞操作
+- **导入分类** - 正确的类别分配
+
+### UI 修复
+
+- **模型占位符** - 移除误导性提示
+- **Base URL** - 第三方供应商自动填充
+- **拖拽排序** - 托盘菜单同步
+
+---
+
+## 技术改进
+
+### 架构
+
+**MCP v3.7.0**：
+
+- 移除遗留代码（约 1,000 行）
+- 统一初始化结构
+- 保持向后兼容性
+- 全面的代码格式化
+
+**平台兼容性**：
+
+- Windows winreg API 修复（v0.52）
+- 安全模式匹配（无 `unwrap()`）
+- 跨平台托盘处理
+
+### 配置
+
+**同步机制**：
+
+- 跨所有应用的 MCP 同步
+- Gemini 表单-编辑器同步
+- 双文件读取（.env + settings.json）
+
+**验证增强**：
+
+- 输入边界检查
+- TOML 引号规范化（CJK）
+- 自定义字段保留
+- 增强的错误消息
+
+### 代码质量
+
+**类型安全**：
+
+- 完整的 TypeScript 覆盖
+- Rust 类型改进
+- API 契约验证
+
+**测试**：
+
+- 简化的断言
+- 更好的测试覆盖
+- 集成测试更新
+
+**依赖项**：
+
+- Tauri 2.8.x
+- Rust：`anyhow`、`zip`、`serde_yaml`、`tempfile`
+- 前端：CodeMirror 6 包
+- winreg 0.52（Windows）
+
+---
+
+## 技术统计
+
+```
+总体变更：
+- 提交数：85
+- 文件数：152 个文件变更
+- 新增：+18,104 行
+- 删除：-3,732 行
+
+新增模块：
+- Skills 管理：2,034 行（21 个文件）
+- Prompts 管理：1,302 行（20 个文件）
+- Gemini 集成：约 1,000 行
+- MCP 重构：约 3,000 行重构
+
+代码分布：
+- 后端（Rust）：约 4,500 行新增
+- 前端（React）：约 3,000 行新增
+- 配置：约 1,500 行重构
+- 测试：约 500 行
+```
+
+---
+
+## 战略定位
+
+### 从工具到平台
+
+v3.7.0 代表了 CC Switch 定位的转变：
+
+| 方面     | v3.6           | v3.7.0                  |
+| -------- | -------------- | ----------------------- |
+| **身份** | 供应商切换器   | AI CLI 管理平台         |
+| **范围** | 配置管理       | 生态系统管理            |
+| **应用** | Claude + Codex | Claude + Codex + Gemini |
+| **能力** | 切换配置       | 扩展能力（Skills）      |
+| **定制** | 手动编辑       | 可视化管理（Prompts）   |
+| **集成** | 孤立应用       | 统一管理（MCP）         |
+
+### AI CLI 管理六大支柱
+
+1. **配置管理** - 供应商切换和管理
+2. **能力扩展** - Skills 安装和生命周期
+3. **行为定制** - 系统提示词预设
+4. **生态集成** - 深度链接和共享
+5. **多 AI 支持** - Claude/Codex/Gemini
+6. **智能检测** - 冲突预防
+
+---
+
+## 下载与安装
+
+### 系统要求
+
+- **Windows**：Windows 10+
+- **macOS**：macOS 10.15（Catalina）+
+- **Linux**：Ubuntu 22.04+ / Debian 11+ / Fedora 34+ / ArchLinux
+
+### 下载链接
+
+访问 [Releases](https://github.com/farion1231/cc-switch/releases/latest) 下载：
+
+- **Windows**：`CC-Switch-Windows.msi` 或 `-Portable.zip`
+- **macOS**：`CC-Switch-macOS.tar.gz` 或 `.zip`
+- **Linux**：`CC-Switch-Linux.AppImage` 或 `.deb`
+- **ArchLinux**：`paru -S cc-switch-bin`
+
+### Homebrew（macOS）
+
+```bash
+brew tap farion1231/ccswitch
+brew install --cask cc-switch
+```
+
+更新：
+
+```bash
+brew upgrade --cask cc-switch
+```
+
+---
+
+## 迁移说明
+
+### 从 v3.6.x 升级
+
+**自动迁移** - 无需任何操作，配置完全兼容
+
+### 从 v3.1.x 或更早版本升级
+
+**需要两步迁移**：
+
+1. 首先升级到 v3.2.x（执行一次性迁移）
+2. 然后升级到 v3.7.0
+
+### 新功能
+
+- **Skills**：无需迁移，全新开始
+- **Prompts**：首次启动时从 live 文件自动导入
+- **Gemini**：需要单独安装 Gemini CLI
+- **MCP v3.7.0**：与之前的配置向后兼容
+
+---
+
+## 致谢
+
+### 贡献者
+
+感谢所有让这个版本成为可能的贡献者：
+
+- [@YoVinchen](https://github.com/YoVinchen) - Skills & Prompts & Gemini 集成实现
+- [@farion1231](https://github.com/farion1231) - 从开发沦为 issue 回复机
+- 社区成员的测试和反馈
+
+### 赞助商
+
+**智谱AI** - GLM CODING PLAN 赞助商
+[使用此链接购买可享九折优惠](https://www.bigmodel.cn/claude-code?ic=RRVJPB5SII)
+
+**PackyCode** - API 中转服务合作伙伴
+[使用 "cc-switch" 优惠码注册享 9 折优惠](https://www.packyapi.com/register?aff=cc-switch)
+
+**闪电说** - 本地优先的 AI 语音输入法
+[免费下载](https://shandianshuo.cn) Mac/Win 双平台
+
+---
+
+## 反馈与支持
+
+- **问题反馈**：[GitHub Issues](https://github.com/farion1231/cc-switch/issues)
+- **讨论**：[GitHub Discussions](https://github.com/farion1231/cc-switch/discussions)
+- **文档**：[README](../README_ZH.md)
+- **更新日志**：[CHANGELOG.md](../CHANGELOG.md)
+
+---
+
+## 未来展望
+
+**v3.8.0 预览**（暂定）：
+
+- 本地代理功能
+
+敬请期待更多更新！
+
+---
+
+**Happy Coding!**
@@ -0,0 +1,369 @@
+# CC Switch v3.8.0
+
+> Persistence Architecture Upgrade, Laying the Foundation for Cloud Sync
+
+**[中文版 →](release-note-v3.8.0-zh.md) | [日本語版 →](release-note-v3.8.0-ja.md)**
+
+---
+
+## Overview
+
+CC Switch v3.8.0 is a major architectural upgrade that restructures the data persistence layer and user interface, laying the foundation for future cloud sync and local proxy features.
+
+**Release Date**: 2025-11-28
+**Commits**: 51 commits since v3.7.1
+**Code Changes**: 207 files, +17,297 / -6,870 lines
+
+---
+
+## Major Updates
+
+### Persistence Architecture Upgrade
+
+Migrated from single JSON file storage to SQLite + JSON dual-layer architecture for hierarchical data management.
+
+**Architecture Changes**:
+
+```
+v3.7.x (Old)                     v3.8.0 (New)
+┌─────────────────┐              ┌─────────────────────────────────┐
+│  config.json    │              │  SQLite (Syncable Data)         │
+│  ┌───────────┐  │              │  ├─ providers     Provider cfg  │
+│  │ providers │  │              │  ├─ mcp_servers   MCP servers   │
+│  │ mcp       │  │     ──>      │  ├─ prompts       Prompts       │
+│  │ prompts   │  │              │  ├─ skills        Skills        │
+│  │ settings  │  │              │  └─ settings      General cfg   │
+│  └───────────┘  │              ├─────────────────────────────────┤
+└─────────────────┘              │  JSON (Device-level Data)       │
+                                 │  └─ settings.json Local settings│
+                                 │     ├─ Window position          │
+                                 │     ├─ Path overrides           │
+                                 │     └─ Current provider ID      │
+                                 └─────────────────────────────────┘
+```
+
+**Dual-layer Structure Design**:
+
+| Layer      | Storage | Data Types                      | Sync Strategy   |
+| ---------- | ------- | ------------------------------- | --------------- |
+| Cloud Sync | SQLite  | Providers, MCP, Prompts, Skills | Future syncable |
+| Device     | JSON    | Window state, local paths       | Stays local     |
+
+**Technical Implementation**:
+
+- **Schema Version Management** - Supports database structure upgrade migrations
+- **SQL Import/Export** - `backup.rs` supports SQL dump for cloud storage
+- **Transaction Support** - SQLite native transactions ensure data consistency
+- **Auto Migration** - Automatically migrates from `config.json` on first launch
+
+**Modular Refactoring**:
+
+```
+database/
+├── mod.rs              Core Database struct and initialization
+├── schema.rs           Table definitions, schema version migrations
+├── backup.rs           SQL import/export, binary snapshot backup
+├── migration.rs        JSON → SQLite data migration engine
+└── dao/                Data Access Object layer
+    ├── providers.rs    Provider CRUD
+    ├── mcp.rs          MCP server CRUD
+    ├── prompts.rs      Prompts CRUD
+    ├── skills.rs       Skills CRUD
+    └── settings.rs     Key-value settings storage
+```
+
+---
+
+### Brand New User Interface
+
+Completely redesigned UI providing a more modern visual experience.
+
+**Visual Improvements**:
+
+- Redesigned interface layout
+- Unified component styles
+- Smoother transition animations
+- Optimized visual hierarchy
+
+**Interaction Enhancements**:
+
+- Redesigned header toolbar
+- Unified ConfirmDialog styling
+- Disabled overscroll bounce effect on main view
+- Improved form validation feedback
+
+**Compatibility Adjustments**:
+
+- Downgraded Tailwind CSS from v4 to v3.4 for better browser compatibility
+
+---
+
+### Japanese Language Support
+
+Added Japanese interface support, expanding internationalization to three languages.
+
+**Supported Languages**:
+
+- Simplified Chinese
+- English
+- Japanese (New)
+
+---
+
+## New Features
+
+### Skills Recursive Scanning
+
+Skills management system now supports recursive scanning of repository directories, automatically discovering nested skill files.
+
+**Improvements**:
+
+- Support for multi-level directory structures
+- Automatic discovery of all `SKILL.md` files
+- Allow same-named skills from different repositories (using full path for deduplication)
+
+---
+
+### Provider Icon Configuration
+
+Provider presets now support custom icon configuration.
+
+**Features**:
+
+- Preset providers include default icons
+- Icon settings preserved when duplicating providers
+- Custom icon colors
+
+---
+
+### Enhanced Form Validation
+
+Provider forms now include required field validation with friendlier error messages.
+
+**Improvements**:
+
+- Real-time validation for required fields
+- Unified Toast notifications for validation errors
+- Clearer error messages
+
+---
+
+### Auto Launch on Startup
+
+Added auto-launch functionality supporting Windows, macOS, and Linux platforms.
+
+**Features**:
+
+- One-click enable/disable in settings
+- Implemented using platform-native APIs
+- Windows uses Registry, macOS uses LaunchAgent, Linux uses XDG autostart
+
+---
+
+### New Provider Presets
+
+- **MiniMax** - Official partner
+
+---
+
+## Bug Fixes
+
+### Critical Fixes
+
+**Custom Endpoints Lost Issue**
+
+Fixed an issue where custom request URLs were unexpectedly lost when updating providers.
+
+- Root Cause: `INSERT OR REPLACE` executes `DELETE + INSERT` under the hood in SQLite, triggering foreign key cascade deletion
+- Fix: Changed to use `UPDATE` statement for existing providers
+
+**Gemini Configuration Issues**
+
+- Fixed custom provider environment variables not correctly written to `.env` file
+- Fixed security auth config incorrectly written to other config files
+
+**Provider Validation Issues**
+
+- Fixed validation error when current provider ID doesn't exist
+- Fixed icon fields lost when duplicating providers
+
+### Platform Compatibility
+
+**Linux**
+
+- Resolved WebKitGTK DMA-BUF rendering issue
+- Preserve user `.desktop` file customizations
+
+### Other Fixes
+
+- Fixed redundant usage queries when switching apps
+- Fixed DMXAPI preset using wrong auth token field
+- Fixed missing translation keys in deeplink components
+- Fixed usage script template initialization logic
+
+---
+
+## Technical Improvements
+
+### Architecture Refactoring
+
+**Provider Service Modularization**:
+
+```
+services/provider/
+├── mod.rs          Core service - add/update/delete/switch/validate
+├── live.rs         Live config file operations
+├── gemini_auth.rs  Gemini auth type detection
+├── endpoints.rs    Custom endpoint management
+└── usage.rs        Usage script execution
+```
+
+**Deeplink Modularization**:
+
+```
+deeplink/
+├── mod.rs       Module exports
+├── parser.rs    URL parsing
+├── provider.rs  Provider import logic
+├── mcp.rs       MCP import logic
+├── prompt.rs    Prompt import
+├── skill.rs     Skills import
+└── utils.rs     Utility functions
+```
+
+### Code Quality
+
+**Cleanup**:
+
+- Removed legacy JSON-era import/export dead code
+- Removed unused MCP type exports
+- Unified error handling approach
+
+**Test Updates**:
+
+- Migrated tests to SQLite database architecture
+- Updated component tests to match current implementation
+- Fixed MSW handlers to adapt to new API
+
+---
+
+## Technical Statistics
+
+```
+Overall Changes:
+- Commits: 51
+- Files: 207 files changed
+- Additions: +17,297 lines
+- Deletions: -6,870 lines
+- Net: +10,427 lines
+
+Commit Type Distribution:
+- fix: 25 (Bug fixes)
+- refactor: 11 (Code refactoring)
+- feat: 9 (New features)
+- test: 1 (Testing)
+- other: 5
+
+Change Area Distribution:
+- Frontend source: 112 files
+- Rust backend: 63 files
+- Test files: 20 files
+- i18n files: 3 files
+```
+
+---
+
+## Migration Guide
+
+### Upgrading from v3.7.x
+
+**Auto Migration** - Executes automatically on first launch:
+
+1. Detects if `config.json` exists
+2. Migrates all data to SQLite within a transaction
+3. Migrates device-level settings to `settings.json`
+4. Shows migration success notification
+
+**Data Safety**:
+
+- Original `config.json` file is preserved (not deleted)
+- Error dialog displayed on migration failure, `config.json` preserved
+- Supports Dry-run mode to verify migration logic
+
+---
+
+## Download & Installation
+
+### System Requirements
+
+- **Windows**: Windows 10+
+- **macOS**: macOS 10.15 (Catalina)+
+- **Linux**: Ubuntu 22.04+ / Debian 11+ / Fedora 34+
+
+### Download Links
+
+Visit [Releases](https://github.com/farion1231/cc-switch/releases/latest) to download:
+
+- **Windows**: `CC-Switch-v3.8.0-Windows.msi` or `-Portable.zip`
+- **macOS**: `CC-Switch-v3.8.0-macOS.tar.gz` or `.zip`
+- **Linux**: `CC-Switch-v3.8.0-Linux.AppImage` or `.deb`
+
+### Homebrew (macOS)
+
+```bash
+brew tap farion1231/ccswitch
+brew install --cask cc-switch
+```
+
+Update:
+
+```bash
+brew upgrade --cask cc-switch
+```
+
+## Acknowledgments
+
+### Contributors
+
+Thanks to all contributors who made this release possible:
+
+- [@YoVinchen](https://github.com/YoVinchen) - UI and database refactoring
+- [@farion1231](https://github.com/farion1231) - Bug fixes and feature enhancements
+- Community members for testing and feedback
+
+### Sponsors
+
+**Zhipu AI** - GLM CODING PLAN Sponsor
+[Get 10% off with this link](https://z.ai/subscribe?ic=8JVLJQFSKB)
+
+**PackyCode** - API Relay Service Partner
+[Use code "cc-switch" for 10% off registration](https://www.packyapi.com/register?aff=cc-switch)
+
+**ShandianShuo** - Local-first AI Voice Input
+[Free download](https://shandianshuo.cn) for Mac/Windows
+
+**MiniMax** - MiniMax M2 CODING PLAN Sponsor
+[Black Friday sale, plans starting at $2](https://platform.minimax.io/subscribe/coding-plan)
+
+---
+
+## Feedback & Support
+
+- **Issue Reports**: [GitHub Issues](https://github.com/farion1231/cc-switch/issues)
+- **Discussions**: [GitHub Discussions](https://github.com/farion1231/cc-switch/discussions)
+- **Documentation**: [README](../README.md)
+- **Changelog**: [CHANGELOG.md](../CHANGELOG.md)
+
+---
+
+## Future Roadmap
+
+**v3.9.0 Preview** (Tentative):
+
+- Local proxy feature
+
+Stay tuned for more updates!
+
+---
+
+**Happy Coding!**
@@ -0,0 +1,315 @@
+# CC Switch v3.8.0
+
+> 永続化アーキテクチャを刷新し、クラウド同期の土台を構築
+
+**[English →](release-note-v3.8.0-en.md) | [中文版 →](release-note-v3.8.0-zh.md)**
+
+---
+
+## 概要
+
+CC Switch v3.8.0 はデータ永続化レイヤーと UI を大幅に作り替え、今後のクラウド同期やローカルプロキシ機能に向けた基盤を整えたメジャーアップデートです。
+
+**リリース日**: 2025-11-28  
+**コミット数**: v3.7.1 以降 51 commits  
+**変更量**: 207 files, +17,297 / -6,870 lines
+
+---
+
+## 主要アップデート
+
+### 永続化アーキテクチャの刷新
+
+単一の JSON 保存から、階層化された SQLite + JSON の二層構造へ移行。
+
+**アーキテクチャ変更**:
+
+```
+v3.7.x (旧)                       v3.8.0 (新)
+┌─────────────────┐              ┌─────────────────────────────────┐
+│  config.json    │              │  SQLite (同期対象データ)         │
+│  ┌───────────┐  │              │  ├─ providers     プロバイダ設定 │
+│  │ providers │  │              │  ├─ mcp_servers   MCP サーバー   │
+│  │ mcp       │  │     ──>      │  ├─ prompts       プロンプト     │
+│  │ prompts   │  │              │  ├─ skills        Skills         │
+│  │ settings  │  │              │  └─ settings      汎用設定       │
+│  └───────────┘  │              ├─────────────────────────────────┤
+└─────────────────┘              │  JSON (デバイス固有データ)        │
+                                 │  └─ settings.json ローカル設定    │
+                                 │     ├─ ウィンドウ位置            │
+                                 │     ├─ パスの上書き              │
+                                 │     └─ 現在のプロバイダ ID        │
+                                 └─────────────────────────────────┘
+```
+
+**二層構造の設計**:
+
+| レイヤー | ストレージ | データ種別                          | 同期戦略         |
+| -------- | ---------- | ----------------------------------- | ---------------- |
+| クラウド | SQLite     | Providers, MCP, Prompts, Skills     | 将来同期対象     |
+| デバイス | JSON       | ウィンドウ状態、ローカルパス         | ローカル保持     |
+
+**実装ポイント**:
+
+- **スキーマバージョン管理**: DB 構造のマイグレーションに対応
+- **SQL インポート/エクスポート**: `backup.rs` が SQL ダンプをサポート
+- **トランザクション対応**: SQLite ネイティブで整合性を確保
+- **自動マイグレーション**: 初回起動で `config.json` から自動移行
+
+**モジュール分割**:
+
+```
+database/
+├── mod.rs              Database 構造体と初期化
+├── schema.rs           テーブル定義とスキーマ移行
+├── backup.rs           SQL インポート/エクスポートとスナップショット
+├── migration.rs        JSON → SQLite 変換エンジン
+└── dao/                DAO レイヤー
+    ├── providers.rs    プロバイダ CRUD
+    ├── mcp.rs          MCP CRUD
+    ├── prompts.rs      プロンプト CRUD
+    ├── skills.rs       Skills CRUD
+    └── settings.rs     設定 Key-Value 保存
+```
+
+---
+
+### 新しいユーザーインターフェース
+
+よりモダンな見た目と操作感に再設計。
+
+- レイアウト全面刷新、コンポーネントスタイルを統一
+- トランジションを滑らかにし、視覚的階層を最適化
+- メインビューのオーバースクロールバウンスを無効化
+- ブラウザ互換性向上のため Tailwind CSS を v4→v3.4 にダウングレード
+
+---
+
+### 日語化
+
+UI が日本語に対応し、国際化が 3 言語（中/英/日）へ拡大。
+
+---
+
+## 新機能
+
+### Skills 递帰スキャン
+
+Skills 管理がリポジトリを再帰的に走査し、ネストされた `SKILL.md` を自動検出。
+
+- 複数階層のディレクトリに対応
+- すべての `SKILL.md` を自動発見
+- パスをキーにした重複排除で同名スキルを許容
+
+### プロバイダアイコン設定
+
+プリセットがデフォルトアイコンを持ち、複製してもアイコンを保持。カスタム色も設定可能。
+
+### フォームバリデーション強化
+
+必須項目にリアルタイム検証と分かりやすいエラーメッセージを追加し、トースト通知を統一。
+
+### 自動起動
+
+Windows/macOS/Linux で自動起動をサポート。
+
+- 設定画面からワンクリックで ON/OFF
+- Registry / LaunchAgent / XDG autostart を使用
+
+### 新プロバイダプリセット
+
+- **MiniMax** - 公式パートナー
+
+---
+
+## バグ修正
+
+### 重要修正
+
+**カスタムエンドポイント消失**
+
+- 原因: SQLite の `INSERT OR REPLACE` が内部で `DELETE + INSERT` を実行し、外部キーのカスケード削除が発生
+- 対応: 既存プロバイダ更新を `UPDATE` に変更
+
+**Gemini 設定**
+
+- カスタム環境変数が `.env` に正しく書き込まれない問題を修正
+- 認証設定が他ファイルに誤って書き込まれる問題を修正
+
+**プロバイダ検証**
+
+- 現在プロバイダ ID が欠落している場合のバリデーションエラーを修正
+- 複製時にアイコンフィールドが失われる問題を修正
+
+### プラットフォーム互換性
+
+**Linux**
+
+- WebKitGTK の DMA-BUF 描画問題を解消
+- ユーザーの `.desktop` カスタマイズを保持
+
+### その他修正
+
+- アプリ切り替え時の不要な使用量クエリを削減
+- DMXAPI プリセットの誤ったトークンフィールドを修正
+- Deeplink コンポーネントの欠損翻訳キーを補完
+- 使用量スクリプトテンプレート初期化を修正
+
+---
+
+## 技術的改善
+
+### アーキテクチャ再編
+
+**Provider Service のモジュール化**:
+
+```
+services/provider/
+├── mod.rs          追加/更新/削除/切替/検証の中核
+├── live.rs         ライブ設定ファイル操作
+├── gemini_auth.rs  Gemini 認証タイプ検出
+├── endpoints.rs    カスタムエンドポイント管理
+└── usage.rs        使用量スクリプト実行
+```
+
+**Deeplink のモジュール化**:
+
+```
+deeplink/
+├── mod.rs       エクスポート
+├── parser.rs    URL パース
+├── provider.rs  プロバイダ取り込み
+├── mcp.rs       MCP 取り込み
+├── prompt.rs    プロンプト取り込み
+├── skill.rs     Skills 取り込み
+└── utils.rs     ユーティリティ
+```
+
+### コード品質
+
+- レガシーな JSON 時代のインポート/エクスポート死蔵コードを削除
+- 使われていない MCP 型を削除し、エラーハンドリングを統一
+- テストを SQLite バックエンドに移行し、MSW ハンドラを最新 API に合わせて更新
+
+---
+
+## 技術統計
+
+```
+全体変更:
+- コミット: 51
+- 変更ファイル: 207
+- 追加: +17,297 行
+- 削除: -6,870 行
+- 純増: +10,427 行
+
+コミット種別:
+- fix: 25
+- refactor: 11
+- feat: 9
+- test: 1
+- other: 5
+
+変更箇所:
+- フロントエンド: 112 files
+- Rust バックエンド: 63 files
+- テスト: 20 files
+- i18n: 3 files
+```
+
+---
+
+## マイグレーションガイド
+
+### v3.7.x からのアップグレード
+
+**自動マイグレーション**（初回起動時）:
+
+1. `config.json` の存在を検出
+2. 全データをトランザクションで SQLite に移行
+3. デバイス設定を `settings.json` へ移行
+4. 移行成功の通知を表示
+
+**データ保護**:
+
+- 元の `config.json` は保持（削除しない）
+- 失敗時はエラーダイアログを表示し、`config.json` を温存
+- Dry-run モードで検証可能
+
+---
+
+## ダウンロード & インストール
+
+### システム要件
+
+- **Windows**: Windows 10+
+- **macOS**: macOS 10.15 (Catalina)+
+- **Linux**: Ubuntu 22.04+ / Debian 11+ / Fedora 34+
+
+### ダウンロード
+
+[Releases](https://github.com/farion1231/cc-switch/releases/latest) から入手:
+
+- **Windows**: `CC-Switch-v3.8.0-Windows.msi` または `-Portable.zip`
+- **macOS**: `CC-Switch-v3.8.0-macOS.tar.gz` または `.zip`
+- **Linux**: `CC-Switch-v3.8.0-Linux.AppImage` または `.deb`
+
+### Homebrew (macOS)
+
+```bash
+brew tap farion1231/ccswitch
+brew install --cask cc-switch
+```
+
+アップデート:
+
+```bash
+brew upgrade --cask cc-switch
+```
+
+---
+
+## 謝辞
+
+### コントリビューター
+
+- [@YoVinchen](https://github.com/YoVinchen) - UI とデータベースリファクタ
+- [@farion1231](https://github.com/farion1231) - バグ修正と機能拡張
+- コミュニティの皆さん - テストとフィードバック
+
+### スポンサー
+
+**Zhipu AI** - GLM CODING PLAN スポンサー  
+[10% オフリンク](https://z.ai/subscribe?ic=8JVLJQFSKB)
+
+**PackyCode** - API リレーサービスパートナー  
+[登録時に「cc-switch」で 10% オフ](https://www.packyapi.com/register?aff=cc-switch)
+
+**ShandianShuo** - ローカルファースト音声入力  
+[Mac/Windows 無料ダウンロード](https://shandianshuo.cn)
+
+**MiniMax** - MiniMax M2 CODING PLAN スポンサー  
+[ブラックフライデーセール中、$2 から](https://platform.minimax.io/subscribe/coding-plan)
+
+---
+
+## フィードバック & サポート
+
+- **Issue**: [GitHub Issues](https://github.com/farion1231/cc-switch/issues)
+- **Discussions**: [GitHub Discussions](https://github.com/farion1231/cc-switch/discussions)
+- **ドキュメント**: [README](../README.md)
+- **更新履歴**: [CHANGELOG.md](../CHANGELOG.md)
+
+---
+
+## 今後のロードマップ
+
+**v3.9.0 予告（予定）**:
+
+- ローカルプロキシ機能
+
+続報にご期待ください！
+
+---
+
+**Happy Coding!**
@@ -0,0 +1,369 @@
+# CC Switch v3.8.0
+
+> 持久化架构升级，为云同步奠定基础
+
+**[English Version →](release-note-v3.8.0-en.md)**
+
+---
+
+## 概览
+
+CC Switch v3.8.0 是一次重大的架构升级版本，重构了数据持久化层和用户界面，为未来的云同步和本地代理功能奠定基础。
+
+**发布日期**：2025-11-28
+**提交数量**：从 v3.7.1 开始 51 个提交
+**代码变更**：207 个文件，+17,297 / -6,870 行
+
+---
+
+## 重大更新
+
+### 持久化架构升级
+
+从单一 JSON 文件存储迁移到 SQLite + JSON 双层架构，实现数据分层管理。
+
+**架构变更**：
+
+```
+v3.7.x (旧)                      v3.8.0 (新)
+┌─────────────────┐              ┌─────────────────────────────────┐
+│  config.json    │              │  SQLite (可同步数据)             │
+│  ┌───────────┐  │              │  ├─ providers     供应商配置     │
+│  │ providers │  │              │  ├─ mcp_servers   MCP 服务器     │
+│  │ mcp       │  │     ──>      │  ├─ prompts       提示词         │
+│  │ prompts   │  │              │  ├─ skills        技能           │
+│  │ settings  │  │              │  └─ settings      通用设置       │
+│  └───────────┘  │              ├─────────────────────────────────┤
+└─────────────────┘              │  JSON (设备级数据)               │
+                                 │  └─ settings.json 本地设置       │
+                                 │     ├─ 窗口位置                  │
+                                 │     ├─ 路径覆盖                  │
+                                 │     └─ 当前选中供应商 ID          │
+                                 └─────────────────────────────────┘
+```
+
+**双层结构设计**：
+
+| 层级     | 存储方式 | 数据类型                     | 同步策略   |
+| -------- | -------- | ---------------------------- | ---------- |
+| 云同步层 | SQLite   | 供应商、MCP、Prompts、Skills | 未来可同步 |
+| 设备层   | JSON     | 窗口状态、本地路径、当前选择 | 保持本地   |
+
+**技术实现**：
+
+- **Schema 版本管理** - 支持数据库结构升级迁移
+- **SQL 导入导出** - `backup.rs` 支持 SQL dump，便于云端存储
+- **事务支持** - SQLite 原生事务保证数据一致性
+- **自动迁移** - 首次启动自动从 `config.json` 迁移数据
+
+**模块化重构**：
+
+```
+database/
+├── mod.rs              核心 Database 结构体和初始化
+├── schema.rs           表结构定义、Schema 版本迁移
+├── backup.rs           SQL 导入导出、二进制快照备份
+├── migration.rs        JSON → SQLite 数据迁移引擎
+└── dao/                数据访问对象层
+    ├── providers.rs    供应商 CRUD
+    ├── mcp.rs          MCP 服务器 CRUD
+    ├── prompts.rs      提示词 CRUD
+    ├── skills.rs       Skills CRUD
+    └── settings.rs     键值对设置存储
+```
+
+---
+
+### 全新用户界面
+
+完整重构的 UI 设计，提供更现代化的视觉体验。
+
+**视觉改进**：
+
+- 重新设计的界面布局
+- 统一的组件样式
+- 更流畅的过渡动画
+- 优化的视觉层次
+
+**交互优化**：
+
+- Header toolbar 重新设计
+- ConfirmDialog 样式统一
+- 禁用主视图 overscroll 弹跳效果
+- 改进的表单验证反馈
+
+**兼容性调整**：
+
+- Tailwind CSS 从 v4 降级到 v3.4，提升浏览器兼容性
+
+---
+
+### 日语支持
+
+新增日语（日本語）界面支持，国际化语言扩展到三种。
+
+**支持语言**：
+
+- 简体中文
+- English
+- 日本語（新增）
+
+---
+
+## 新增功能
+
+### Skills 递归扫描
+
+Skills 管理系统支持递归扫描仓库目录，自动发现嵌套的技能文件。
+
+**改进内容**：
+
+- 支持多层目录结构
+- 自动发现所有 `SKILL.md` 文件
+- 允许不同仓库的同名技能（使用完整路径去重）
+
+---
+
+### 供应商图标配置
+
+供应商预设支持自定义图标配置。
+
+**功能特性**：
+
+- 预设供应商包含默认图标
+- 复制供应商时保留图标设置
+- 图标颜色自定义
+
+---
+
+### 表单验证增强
+
+供应商表单新增必填字段验证，提供更友好的错误提示。
+
+**改进内容**：
+
+- 必填字段实时校验
+- 统一使用 Toast 通知显示验证错误
+- 更清晰的错误信息
+
+---
+
+### 开机自启
+
+新增开机自动启动功能，支持 Windows、macOS 和 Linux 三个平台。
+
+**功能特性**：
+
+- 在设置中一键开启/关闭
+- 使用平台原生 API 实现
+- Windows 使用注册表、macOS 使用 LaunchAgent、Linux 使用 XDG autostart
+
+---
+
+### 新增供应商预设
+
+- **MiniMax** - 官方合作伙伴
+
+---
+
+## Bug 修复
+
+### 关键修复
+
+**自定义端点丢失问题**
+
+修复更新供应商时自定义请求地址意外丢失的问题。
+
+- 根因：`INSERT OR REPLACE` 在 SQLite 底层执行 `DELETE + INSERT`，触发外键级联删除
+- 修复：改用 `UPDATE` 语句更新已存在的供应商
+
+**Gemini 配置问题**
+
+- 修复自定义供应商环境变量未正确写入 `.env` 文件
+- 修复安全认证配置错误写入到其他配置文件
+
+**供应商验证问题**
+
+- 修复当前供应商 ID 不存在时的验证错误
+- 修复供应商复制时图标字段丢失
+
+### 平台兼容性
+
+**Linux**
+
+- 解决 WebKitGTK DMA-BUF 渲染问题
+- 保留用户 `.desktop` 文件自定义
+
+### 其他修复
+
+- 修复切换应用时的冗余用量查询
+- 修复 DMXAPI 预设使用错误的认证令牌字段
+- 修复深链接组件缺少翻译键
+- 修复用量脚本模板初始化逻辑
+
+---
+
+## 技术改进
+
+### 架构重构
+
+**供应商服务模块化**：
+
+```
+services/provider/
+├── mod.rs          核心服务 - add/update/delete/switch/validate
+├── live.rs         Live 配置文件操作
+├── gemini_auth.rs  Gemini 认证类型检测
+├── endpoints.rs    自定义端点管理
+└── usage.rs        用量脚本执行
+```
+
+**深链接模块化**：
+
+```
+deeplink/
+├── mod.rs       模块导出
+├── parser.rs    URL 解析
+├── provider.rs  供应商导入逻辑
+├── mcp.rs       MCP 导入逻辑
+├── prompt.rs    提示词导入
+├── skill.rs     Skills 导入
+└── utils.rs     工具函数
+```
+
+### 代码质量
+
+**清理工作**：
+
+- 移除 JSON 时代遗留的导入导出死代码
+- 移除未使用的 MCP 类型导出
+- 统一错误处理方式
+
+**测试更新**：
+
+- 迁移测试到 SQLite 数据库架构
+- 更新组件测试匹配当前实现
+- 修复 MSW handlers 适配新 API
+
+---
+
+## 技术统计
+
+```
+总体变更：
+- 提交数：51
+- 文件数：207 个文件变更
+- 新增：+17,297 行
+- 删除：-6,870 行
+- 净增：+10,427 行
+
+提交类型分布：
+- fix：25 个（Bug 修复）
+- refactor：11 个（代码重构）
+- feat：9 个（新功能）
+- test：1 个（测试）
+- 其他：5 个
+
+改动区域分布：
+- 前端源码：112 个文件
+- Rust 后端：63 个文件
+- 测试文件：20 个文件
+- 国际化文件：3 个文件
+```
+
+---
+
+## 迁移说明
+
+### 从 v3.7.x 升级
+
+**自动迁移** - 首次启动时自动执行：
+
+1. 检测 `config.json` 是否存在
+2. 在事务中迁移所有数据到 SQLite
+3. 设备级设置迁移到 `settings.json`
+4. 显示迁移成功通知
+
+**数据安全**：
+
+- 原 `config.json` 文件保留不删除
+- 迁移失败时显示错误对话框，保留`config.json`
+- 支持 Dry-run 模式验证迁移逻辑
+
+---
+
+## 下载与安装
+
+### 系统要求
+
+- **Windows**：Windows 10+
+- **macOS**：macOS 10.15（Catalina）+
+- **Linux**：Ubuntu 22.04+ / Debian 11+ / Fedora 34+
+
+### 下载链接
+
+访问 [Releases](https://github.com/farion1231/cc-switch/releases/latest) 下载：
+
+- **Windows**：`CC-Switch-v3.8.0-Windows.msi` 或 `-Portable.zip`
+- **macOS**：`CC-Switch-v3.8.0-macOS.tar.gz` 或 `.zip`
+- **Linux**：`CC-Switch-v3.8.0-Linux.AppImage` 或 `.deb`
+
+### Homebrew（macOS）
+
+```bash
+brew tap farion1231/ccswitch
+brew install --cask cc-switch
+```
+
+更新：
+
+```bash
+brew upgrade --cask cc-switch
+```
+
+## 致谢
+
+### 贡献者
+
+感谢所有让这个版本成为可能的贡献者：
+
+- [@YoVinchen](https://github.com/YoVinchen) - UI 和数据库重构
+- [@farion1231](https://github.com/farion1231) - BUG 修复和功能增强
+- 社区成员的测试和反馈
+
+### 赞助商
+
+**智谱AI** - GLM CODING PLAN 赞助商
+[使用此链接购买可享九折优惠](https://www.bigmodel.cn/claude-code?ic=RRVJPB5SII)
+
+**PackyCode** - API 中转服务合作伙伴
+[使用 "cc-switch" 优惠码注册享 9 折优惠](https://www.packyapi.com/register?aff=cc-switch)
+
+**闪电说** - 本地优先的 AI 语音输入法
+[免费下载](https://shandianshuo.cn) Mac/Win 双平台
+
+**MiniMax** - MiniMax M2 CODING PLAN 赞助商
+[黑五优惠进行中，套餐9.9元起](https://platform.minimaxi.com/subscribe/coding-plan)
+
+---
+
+## 反馈与支持
+
+- **问题反馈**：[GitHub Issues](https://github.com/farion1231/cc-switch/issues)
+- **讨论**：[GitHub Discussions](https://github.com/farion1231/cc-switch/discussions)
+- **文档**：[README](../README_ZH.md)
+- **更新日志**：[CHANGELOG.md](../CHANGELOG.md)
+
+---
+
+## 未来展望
+
+**v3.9.0 预览**（暂定）：
+
+- 本地代理功能
+
+敬请期待更多更新！
+
+---
+
+**Happy Coding!**
@@ -1,7 +1,8 @@
 {
  "name": "cc-switch",
-  "version": "3.7.0",
+  "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",
@@ -26,12 +27,16 @@
    "@types/react": "^18.2.0",
    "@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",
+    "postcss": "^8.4.49",
    "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": {
@@ -46,6 +51,8 @@
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
    "@hookform/resolvers": "^5.2.2",
+    "@lobehub/icons-static-svg": "^1.73.0",
+    "@radix-ui/react-accordion": "^1.2.12",
    "@radix-ui/react-checkbox": "^1.3.3",
    "@radix-ui/react-dialog": "^1.1.15",
    "@radix-ui/react-dropdown-menu": "^2.1.16",
@@ -55,7 +62,6 @@
    "@radix-ui/react-switch": "^1.2.6",
    "@radix-ui/react-tabs": "^1.1.13",
    "@radix-ui/react-visually-hidden": "^1.2.4",
-    "@tailwindcss/vite": "^4.1.13",
    "@tanstack/react-query": "^5.90.3",
    "@tauri-apps/api": "^2.8.0",
    "@tauri-apps/plugin-dialog": "^2.4.0",
@@ -64,7 +70,9 @@
    "@tauri-apps/plugin-updater": "^2.0.0",
    "class-variance-authority": "^0.7.1",
    "clsx": "^2.1.1",
+    "cmdk": "^1.1.1",
    "codemirror": "^6.0.2",
+    "framer-motion": "^12.23.25",
    "i18next": "^25.5.2",
    "jsonc-parser": "^3.2.1",
    "lucide-react": "^0.542.0",
@@ -72,11 +80,11 @@
    "react-dom": "^18.2.0",
    "react-hook-form": "^7.65.0",
    "react-i18next": "^16.0.0",
+    "recharts": "^3.5.1",
    "smol-toml": "^1.4.2",
    "sonner": "^2.0.7",
    "tailwind-merge": "^3.3.1",
-    "tailwindcss": "^4.1.13",
    "zod": "^4.1.12"
  },
  "packageManager": "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39"
-}
+}
@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};
@@ -0,0 +1,208 @@
+const fs = require('fs');
+const path = require('path');
+
+// 要提取的图标列表（按分类组织）
+const ICONS_TO_EXTRACT = {
+  // AI 服务商（必需）
+  aiProviders: [
+    'openai', 'anthropic', 'claude', 'google', 'gemini',
+    'deepseek', 'kimi', 'moonshot', 'zhipu', 'minimax',
+    'baidu', 'alibaba', 'tencent', 'meta', 'microsoft',
+    'cohere', 'perplexity', 'mistral', 'huggingface'
+  ],
+
+  // 云平台
+  cloudPlatforms: [
+    'aws', 'azure', 'huawei', 'cloudflare'
+  ],
+
+  // 开发工具
+  devTools: [
+    'github', 'gitlab', 'docker', 'kubernetes', 'vscode'
+  ],
+
+  // 其他
+  others: [
+    'settings', 'folder', 'file', 'link'
+  ]
+};
+
+// 合并所有图标
+const ALL_ICONS = [
+  ...ICONS_TO_EXTRACT.aiProviders,
+  ...ICONS_TO_EXTRACT.cloudPlatforms,
+  ...ICONS_TO_EXTRACT.devTools,
+  ...ICONS_TO_EXTRACT.others
+];
+
+// 提取逻辑
+const OUTPUT_DIR = path.join(__dirname, '../src/icons/extracted');
+const SOURCE_DIR = path.join(__dirname, '../node_modules/@lobehub/icons-static-svg/icons');
+
+// 确保输出目录存在
+if (!fs.existsSync(OUTPUT_DIR)) {
+  fs.mkdirSync(OUTPUT_DIR, { recursive: true });
+}
+
+console.log('🎨 CC-Switch Icon Extractor\n');
+console.log('========================================');
+console.log('📦 Extracting icons...\n');
+
+let extracted = 0;
+let notFound = [];
+
+// 提取图标
+ALL_ICONS.forEach(iconName => {
+  const sourceFile = path.join(SOURCE_DIR, `${iconName}.svg`);
+  const targetFile = path.join(OUTPUT_DIR, `${iconName}.svg`);
+
+  if (fs.existsSync(sourceFile)) {
+    fs.copyFileSync(sourceFile, targetFile);
+    console.log(`  ✓ ${iconName}.svg`);
+    extracted++;
+  } else {
+    console.log(`  ✗ ${iconName}.svg (not found)`);
+    notFound.push(iconName);
+  }
+});
+
+// 生成索引文件
+console.log('\n📝 Generating index file...\n');
+
+const indexContent = `// Auto-generated icon index
+// Do not edit manually
+
+export const icons: Record<string, string> = {
+${ALL_ICONS.filter(name => !notFound.includes(name))
+  .map(name => {
+    const svg = fs.readFileSync(path.join(OUTPUT_DIR, `${name}.svg`), 'utf-8');
+    const escaped = svg.replace(/`/g, '\\`').replace(/\$/g, '\\$');
+    return `  '${name}': \`${escaped}\`,`;
+  })
+  .join('\n')}
+};
+
+export const iconList = Object.keys(icons);
+
+export function getIcon(name: string): string {
+  return icons[name.toLowerCase()] || '';
+}
+
+export function hasIcon(name: string): boolean {
+  return name.toLowerCase() in icons;
+}
+`;
+
+fs.writeFileSync(path.join(OUTPUT_DIR, 'index.ts'), indexContent);
+console.log('✓ Generated: src/icons/extracted/index.ts');
+
+// 生成图标元数据
+const metadataContent = `// Icon metadata for search and categorization
+import { IconMetadata } from '@/types/icon';
+
+export const iconMetadata: Record<string, IconMetadata> = {
+  // AI Providers
+  openai: { name: 'openai', displayName: 'OpenAI', category: 'ai-provider', keywords: ['gpt', 'chatgpt'], defaultColor: '#00A67E' },
+  anthropic: { name: 'anthropic', displayName: 'Anthropic', category: 'ai-provider', keywords: ['claude'], defaultColor: '#D4915D' },
+  claude: { name: 'claude', displayName: 'Claude', category: 'ai-provider', keywords: ['anthropic'], defaultColor: '#D4915D' },
+  google: { name: 'google', displayName: 'Google', category: 'ai-provider', keywords: ['gemini', 'bard'], defaultColor: '#4285F4' },
+  gemini: { name: 'gemini', displayName: 'Gemini', category: 'ai-provider', keywords: ['google'], defaultColor: '#4285F4' },
+  deepseek: { name: 'deepseek', displayName: 'DeepSeek', category: 'ai-provider', keywords: ['deep', 'seek'], defaultColor: '#1E88E5' },
+  moonshot: { name: 'moonshot', displayName: 'Moonshot', category: 'ai-provider', keywords: ['kimi', 'moonshot'], defaultColor: '#6366F1' },
+  kimi: { name: 'kimi', displayName: 'Kimi', category: 'ai-provider', keywords: ['moonshot'], defaultColor: '#6366F1' },
+  zhipu: { name: 'zhipu', displayName: 'Zhipu AI', category: 'ai-provider', keywords: ['chatglm', 'glm'], defaultColor: '#0F62FE' },
+  minimax: { name: 'minimax', displayName: 'MiniMax', category: 'ai-provider', keywords: ['minimax'], defaultColor: '#FF6B6B' },
+  baidu: { name: 'baidu', displayName: 'Baidu', category: 'ai-provider', keywords: ['ernie', 'wenxin'], defaultColor: '#2932E1' },
+  alibaba: { name: 'alibaba', displayName: 'Alibaba', category: 'ai-provider', keywords: ['qwen', 'tongyi'], defaultColor: '#FF6A00' },
+  tencent: { name: 'tencent', displayName: 'Tencent', category: 'ai-provider', keywords: ['hunyuan'], defaultColor: '#00A4FF' },
+  meta: { name: 'meta', displayName: 'Meta', category: 'ai-provider', keywords: ['facebook', 'llama'], defaultColor: '#0081FB' },
+  microsoft: { name: 'microsoft', displayName: 'Microsoft', category: 'ai-provider', keywords: ['copilot', 'azure'], defaultColor: '#00A4EF' },
+  cohere: { name: 'cohere', displayName: 'Cohere', category: 'ai-provider', keywords: ['cohere'], defaultColor: '#39594D' },
+  perplexity: { name: 'perplexity', displayName: 'Perplexity', category: 'ai-provider', keywords: ['perplexity'], defaultColor: '#20808D' },
+  mistral: { name: 'mistral', displayName: 'Mistral', category: 'ai-provider', keywords: ['mistral'], defaultColor: '#FF7000' },
+  huggingface: { name: 'huggingface', displayName: 'Hugging Face', category: 'ai-provider', keywords: ['huggingface', 'hf'], defaultColor: '#FFD21E' },
+
+  // Cloud Platforms
+  aws: { name: 'aws', displayName: 'AWS', category: 'cloud', keywords: ['amazon', 'cloud'], defaultColor: '#FF9900' },
+  azure: { name: 'azure', displayName: 'Azure', category: 'cloud', keywords: ['microsoft', 'cloud'], defaultColor: '#0078D4' },
+  huawei: { name: 'huawei', displayName: 'Huawei', category: 'cloud', keywords: ['huawei', 'cloud'], defaultColor: '#FF0000' },
+  cloudflare: { name: 'cloudflare', displayName: 'Cloudflare', category: 'cloud', keywords: ['cloudflare', 'cdn'], defaultColor: '#F38020' },
+
+  // Dev Tools
+  github: { name: 'github', displayName: 'GitHub', category: 'tool', keywords: ['git', 'version control'], defaultColor: '#181717' },
+  gitlab: { name: 'gitlab', displayName: 'GitLab', category: 'tool', keywords: ['git', 'version control'], defaultColor: '#FC6D26' },
+  docker: { name: 'docker', displayName: 'Docker', category: 'tool', keywords: ['container'], defaultColor: '#2496ED' },
+  kubernetes: { name: 'kubernetes', displayName: 'Kubernetes', category: 'tool', keywords: ['k8s', 'container'], defaultColor: '#326CE5' },
+  vscode: { name: 'vscode', displayName: 'VS Code', category: 'tool', keywords: ['editor', 'ide'], defaultColor: '#007ACC' },
+
+  // Others
+  settings: { name: 'settings', displayName: 'Settings', category: 'other', keywords: ['config', 'preferences'], defaultColor: '#6B7280' },
+  folder: { name: 'folder', displayName: 'Folder', category: 'other', keywords: ['directory'], defaultColor: '#6B7280' },
+  file: { name: 'file', displayName: 'File', category: 'other', keywords: ['document'], defaultColor: '#6B7280' },
+  link: { name: 'link', displayName: 'Link', category: 'other', keywords: ['url', 'hyperlink'], defaultColor: '#6B7280' },
+};
+
+export function getIconMetadata(name: string): IconMetadata | undefined {
+  return iconMetadata[name.toLowerCase()];
+}
+
+export function searchIcons(query: string): string[] {
+  const lowerQuery = query.toLowerCase();
+  return Object.values(iconMetadata)
+    .filter(meta =>
+      meta.name.includes(lowerQuery) ||
+      meta.displayName.toLowerCase().includes(lowerQuery) ||
+      meta.keywords.some(k => k.includes(lowerQuery))
+    )
+    .map(meta => meta.name);
+}
+`;
+
+fs.writeFileSync(path.join(OUTPUT_DIR, 'metadata.ts'), metadataContent);
+console.log('✓ Generated: src/icons/extracted/metadata.ts');
+
+// 生成 README
+const readmeContent = `# Extracted Icons
+
+This directory contains extracted icons from @lobehub/icons-static-svg.
+
+## Statistics
+- Total extracted: ${extracted} icons
+- Not found: ${notFound.length} icons
+
+## Extracted Icons
+${ALL_ICONS.filter(name => !notFound.includes(name)).map(name => `- ${name}`).join('\n')}
+
+${notFound.length > 0 ? `\n## Not Found\n${notFound.map(name => `- ${name}`).join('\n')}` : ''}
+
+## Usage
+
+\`\`\`typescript
+import { getIcon, hasIcon, iconList } from './extracted';
+
+// Get icon SVG
+const svg = getIcon('openai');
+
+// Check if icon exists
+if (hasIcon('openai')) {
+  // ...
+}
+
+// Get all available icons
+console.log(iconList);
+\`\`\`
+
+---
+Last updated: ${new Date().toISOString()}
+Generated by: scripts/extract-icons.js
+`;
+
+fs.writeFileSync(path.join(OUTPUT_DIR, 'README.md'), readmeContent);
+console.log('✓ Generated: src/icons/extracted/README.md');
+
+console.log('\n========================================');
+console.log('✅ Extraction complete!\n');
+console.log(`   ✓ Extracted: ${extracted} icons`);
+console.log(`   ✗ Not found: ${notFound.length} icons`);
+console.log(`   📉 Bundle size reduction: ~${Math.round((1 - extracted / 723) * 100)}%`);
+console.log('========================================\n');
@@ -0,0 +1,96 @@
+const fs = require('fs');
+const path = require('path');
+
+const ICONS_DIR = path.join(__dirname, '../src/icons/extracted');
+
+// List of "Famous" icons to keep
+// Based on common AI providers and tools
+const KEEP_LIST = [
+    // AI Providers
+    'openai', 'anthropic', 'claude', 'google', 'gemini', 'gemma', 'palm',
+    'microsoft', 'azure', 'copilot', 'meta', 'llama',
+    'alibaba', 'qwen', 'tencent', 'hunyuan', 'baidu', 'wenxin',
+    'bytedance', 'doubao', 'deepseek', 'moonshot', 'kimi',
+    'zhipu', 'chatglm', 'glm', 'minimax', 'mistral', 'cohere',
+    'perplexity', 'huggingface', 'midjourney', 'stability',
+    'xai', 'grok', 'yi', 'zeroone', 'ollama',
+    'packycode',
+
+    // Cloud/Tools
+    'aws', 'googlecloud', 'huawei', 'cloudflare',
+    'github', 'githubcopilot', 'vercel', 'notion', 'discord',
+    'gitlab', 'docker', 'kubernetes', 'vscode', 'settings', 'folder', 'file', 'link'
+];
+
+// Get all SVG files
+const files = fs.readdirSync(ICONS_DIR).filter(file => file.endsWith('.svg'));
+
+console.log(`Scanning ${files.length} files...`);
+
+let keptCount = 0;
+let deletedCount = 0;
+let renamedCount = 0;
+
+// First pass: Identify files to keep and prefer color versions
+const fileMap = {}; // name -> { hasColor: bool, hasMono: bool }
+
+files.forEach(file => {
+    const isColor = file.endsWith('-color.svg');
+    const baseName = isColor ? file.replace('-color.svg', '') : file.replace('.svg', '');
+
+    if (!fileMap[baseName]) {
+        fileMap[baseName] = { hasColor: false, hasMono: false };
+    }
+
+    if (isColor) {
+        fileMap[baseName].hasColor = true;
+    } else {
+        fileMap[baseName].hasMono = true;
+    }
+});
+
+// Second pass: Process files
+Object.keys(fileMap).forEach(baseName => {
+    const info = fileMap[baseName];
+    const shouldKeep = KEEP_LIST.includes(baseName);
+
+    if (!shouldKeep) {
+        // Delete both versions if not in keep list
+        if (info.hasColor) {
+            fs.unlinkSync(path.join(ICONS_DIR, `${baseName}-color.svg`));
+            deletedCount++;
+        }
+        if (info.hasMono) {
+            fs.unlinkSync(path.join(ICONS_DIR, `${baseName}.svg`));
+            deletedCount++;
+        }
+        return;
+    }
+
+    // If keeping, prefer color
+    if (info.hasColor) {
+        // Rename color version to base version (overwrite mono if exists)
+        const colorPath = path.join(ICONS_DIR, `${baseName}-color.svg`);
+        const targetPath = path.join(ICONS_DIR, `${baseName}.svg`);
+
+        try {
+            // If mono exists, it will be overwritten/replaced
+            fs.renameSync(colorPath, targetPath);
+            renamedCount++;
+            keptCount++;
+        } catch (e) {
+            console.error(`Error renaming ${baseName}:`, e);
+        }
+    } else if (info.hasMono) {
+        // Keep mono if no color version
+        keptCount++;
+    }
+});
+
+console.log(`\nCleanup complete:`);
+console.log(`- Kept: ${keptCount}`);
+console.log(`- Deleted: ${deletedCount}`);
+console.log(`- Renamed (Color -> Standard): ${renamedCount}`);
+
+// Regenerate index and metadata
+require('./generate-icon-index.js');
@@ -0,0 +1,114 @@
+const fs = require('fs');
+const path = require('path');
+
+const ICONS_DIR = path.join(__dirname, '../src/icons/extracted');
+const INDEX_FILE = path.join(ICONS_DIR, 'index.ts');
+const METADATA_FILE = path.join(ICONS_DIR, 'metadata.ts');
+
+// Known metadata from previous configuration
+const KNOWN_METADATA = {
+  openai: { name: 'openai', displayName: 'OpenAI', category: 'ai-provider', keywords: ['gpt', 'chatgpt'], defaultColor: '#00A67E' },
+  anthropic: { name: 'anthropic', displayName: 'Anthropic', category: 'ai-provider', keywords: ['claude'], defaultColor: '#D4915D' },
+  claude: { name: 'claude', displayName: 'Claude', category: 'ai-provider', keywords: ['anthropic'], defaultColor: '#D4915D' },
+  google: { name: 'google', displayName: 'Google', category: 'ai-provider', keywords: ['gemini', 'bard'], defaultColor: '#4285F4' },
+  gemini: { name: 'gemini', displayName: 'Gemini', category: 'ai-provider', keywords: ['google'], defaultColor: '#4285F4' },
+  deepseek: { name: 'deepseek', displayName: 'DeepSeek', category: 'ai-provider', keywords: ['deep', 'seek'], defaultColor: '#1E88E5' },
+  moonshot: { name: 'moonshot', displayName: 'Moonshot', category: 'ai-provider', keywords: ['kimi', 'moonshot'], defaultColor: '#6366F1' },
+  kimi: { name: 'kimi', displayName: 'Kimi', category: 'ai-provider', keywords: ['moonshot'], defaultColor: '#6366F1' },
+  zhipu: { name: 'zhipu', displayName: 'Zhipu AI', category: 'ai-provider', keywords: ['chatglm', 'glm'], defaultColor: '#0F62FE' },
+  minimax: { name: 'minimax', displayName: 'MiniMax', category: 'ai-provider', keywords: ['minimax'], defaultColor: '#FF6B6B' },
+  baidu: { name: 'baidu', displayName: 'Baidu', category: 'ai-provider', keywords: ['ernie', 'wenxin'], defaultColor: '#2932E1' },
+  alibaba: { name: 'alibaba', displayName: 'Alibaba', category: 'ai-provider', keywords: ['qwen', 'tongyi'], defaultColor: '#FF6A00' },
+  tencent: { name: 'tencent', displayName: 'Tencent', category: 'ai-provider', keywords: ['hunyuan'], defaultColor: '#00A4FF' },
+  meta: { name: 'meta', displayName: 'Meta', category: 'ai-provider', keywords: ['facebook', 'llama'], defaultColor: '#0081FB' },
+  microsoft: { name: 'microsoft', displayName: 'Microsoft', category: 'ai-provider', keywords: ['copilot', 'azure'], defaultColor: '#00A4EF' },
+  cohere: { name: 'cohere', displayName: 'Cohere', category: 'ai-provider', keywords: ['cohere'], defaultColor: '#39594D' },
+  perplexity: { name: 'perplexity', displayName: 'Perplexity', category: 'ai-provider', keywords: ['perplexity'], defaultColor: '#20808D' },
+  packycode: { name: 'packycode', displayName: 'PackyCode', category: 'ai-provider', keywords: ['packycode', 'packy', 'packyapi'], defaultColor: 'currentColor' },
+  mistral: { name: 'mistral', displayName: 'Mistral', category: 'ai-provider', keywords: ['mistral'], defaultColor: '#FF7000' },
+  huggingface: { name: 'huggingface', displayName: 'Hugging Face', category: 'ai-provider', keywords: ['huggingface', 'hf'], defaultColor: '#FFD21E' },
+  aws: { name: 'aws', displayName: 'AWS', category: 'cloud', keywords: ['amazon', 'cloud'], defaultColor: '#FF9900' },
+  azure: { name: 'azure', displayName: 'Azure', category: 'cloud', keywords: ['microsoft', 'cloud'], defaultColor: '#0078D4' },
+  huawei: { name: 'huawei', displayName: 'Huawei', category: 'cloud', keywords: ['huawei', 'cloud'], defaultColor: '#FF0000' },
+  cloudflare: { name: 'cloudflare', displayName: 'Cloudflare', category: 'cloud', keywords: ['cloudflare', 'cdn'], defaultColor: '#F38020' },
+  github: { name: 'github', displayName: 'GitHub', category: 'tool', keywords: ['git', 'version control'], defaultColor: '#181717' },
+  gitlab: { name: 'gitlab', displayName: 'GitLab', category: 'tool', keywords: ['git', 'version control'], defaultColor: '#FC6D26' },
+  docker: { name: 'docker', displayName: 'Docker', category: 'tool', keywords: ['container'], defaultColor: '#2496ED' },
+  kubernetes: { name: 'kubernetes', displayName: 'Kubernetes', category: 'tool', keywords: ['k8s', 'container'], defaultColor: '#326CE5' },
+  vscode: { name: 'vscode', displayName: 'VS Code', category: 'tool', keywords: ['editor', 'ide'], defaultColor: '#007ACC' },
+  settings: { name: 'settings', displayName: 'Settings', category: 'other', keywords: ['config', 'preferences'], defaultColor: '#6B7280' },
+  folder: { name: 'folder', displayName: 'Folder', category: 'other', keywords: ['directory'], defaultColor: '#6B7280' },
+  file: { name: 'file', displayName: 'File', category: 'other', keywords: ['document'], defaultColor: '#6B7280' },
+  link: { name: 'link', displayName: 'Link', category: 'other', keywords: ['url', 'hyperlink'], defaultColor: '#6B7280' },
+};
+
+// Get all SVG files
+const files = fs.readdirSync(ICONS_DIR).filter(file => file.endsWith('.svg'));
+
+console.log(`Found ${files.length} SVG files.`);
+
+// Generate index.ts
+const indexContent = `// Auto-generated icon index
+// Do not edit manually
+
+export const icons: Record<string, string> = {
+${files.map(file => {
+  const name = path.basename(file, '.svg');
+  const svg = fs.readFileSync(path.join(ICONS_DIR, file), 'utf-8');
+  const escaped = svg.replace(/`/g, '\\`').replace(/\$/g, '\\$');
+  return `  '${name}': \`${escaped}\`,`;
+}).join('\n')}
+};
+
+export const iconList = Object.keys(icons);
+
+export function getIcon(name: string): string {
+  return icons[name.toLowerCase()] || '';
+}
+
+export function hasIcon(name: string): boolean {
+  return name.toLowerCase() in icons;
+}
+`;
+
+fs.writeFileSync(INDEX_FILE, indexContent);
+console.log(`Generated ${INDEX_FILE}`);
+
+// Generate metadata.ts
+const metadataEntries = files.map(file => {
+  const name = path.basename(file, '.svg').toLowerCase();
+  const known = KNOWN_METADATA[name];
+  
+  if (known) {
+    return `  ${name}: ${JSON.stringify(known)},`;
+  }
+  
+  // Default metadata for unknown icons
+  return `  '${name}': { name: '${name}', displayName: '${name}', category: 'other', keywords: [], defaultColor: 'currentColor' },`;
+});
+
+const metadataContent = `// Icon metadata for search and categorization
+import { IconMetadata } from '@/types/icon';
+
+export const iconMetadata: Record<string, IconMetadata> = {
+${metadataEntries.join('\n')}
+};
+
+export function getIconMetadata(name: string): IconMetadata | undefined {
+  return iconMetadata[name.toLowerCase()];
+}
+
+export function searchIcons(query: string): string[] {
+  const lowerQuery = query.toLowerCase();
+  return Object.values(iconMetadata)
+    .filter(meta =>
+      meta.name.includes(lowerQuery) ||
+      meta.displayName.toLowerCase().includes(lowerQuery) ||
+      meta.keywords.some(k => k.includes(lowerQuery))
+    )
+    .map(meta => meta.name);
+}
+`;
+
+fs.writeFileSync(METADATA_FILE, metadataContent);
+console.log(`Generated ${METADATA_FILE}`);
@@ -39,6 +39,18 @@ dependencies = [
 "version_check",
 ]

+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -245,6 +257,28 @@ dependencies = [
 "windows-sys 0.61.1",
 ]

+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "async-task"
 version = "4.7.1"
@@ -291,12 +325,78 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"

+[[package]]
+name = "auto-launch"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471"
+dependencies = [
+ "dirs 4.0.0",
+ "thiserror 1.0.69",
+ "winreg 0.10.1",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

+[[package]]
+name = "axum"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower 0.5.2",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.76"
@@ -486,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"
@@ -595,18 +701,28 @@ dependencies = [

 [[package]]
 name = "cc-switch"
-version = "3.7.0"
+version = "3.9.0-3"
 dependencies = [
 "anyhow",
+ "async-stream",
+ "auto-launch",
+ "axum",
+ "base64 0.22.1",
+ "bytes",
 "chrono",
 "dirs 5.0.1",
 "futures",
+ "hyper",
+ "indexmap 2.11.4",
 "log",
 "objc2 0.5.2",
 "objc2-app-kit 0.2.2",
+ "once_cell",
 "regex",
 "reqwest",
 "rquickjs",
+ "rusqlite",
+ "rust_decimal",
 "serde",
 "serde_json",
 "serde_yaml",
@@ -622,11 +738,14 @@ dependencies = [
 "tauri-plugin-store",
 "tauri-plugin-updater",
 "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.17",
 "tokio",
 "toml 0.8.2",
 "toml_edit 0.22.27",
+ "tower 0.4.13",
+ "tower-http 0.5.2",
 "url",
+ "uuid",
 "winreg 0.52.0",
 "zip 2.4.2",
 ]
@@ -755,6 +874,16 @@ dependencies = [
 "version_check",
 ]

+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.10.1"
@@ -778,9 +907,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
 "bitflags 2.9.4",
- "core-foundation",
+ "core-foundation 0.10.1",
 "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
 "libc",
 ]

@@ -791,7 +920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
 "bitflags 2.9.4",
- "core-foundation",
+ "core-foundation 0.10.1",
 "libc",
 ]

@@ -982,6 +1111,15 @@ dependencies = [
 "subtle",
 ]

+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys 0.3.7",
+]
+
 [[package]]
 name = "dirs"
 version = "5.0.1"
@@ -1000,6 +1138,17 @@ dependencies = [
 "dirs-sys 0.5.0",
 ]

+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users 0.4.6",
+ "winapi",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.4.1"
@@ -1156,6 +1305,15 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"

+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "endi"
 version = "1.1.0"
@@ -1241,6 +1399,18 @@ dependencies = [
 "pin-project-lite",
 ]

+[[package]]
+name = "fallible-iterator"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
+
+[[package]]
+name = "fallible-streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
+
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -1309,6 +1479,15 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1316,7 +1495,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
 "foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
 ]

 [[package]]
@@ -1330,6 +1509,12 @@ dependencies = [
 "syn 2.0.106",
 ]

+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -1773,13 +1958,32 @@ dependencies = [
 "syn 2.0.106",
 ]

+[[package]]
+name = "h2"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap 2.11.4",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash",
+ "ahash 0.7.8",
 ]

 [[package]]
@@ -1787,6 +1991,9 @@ name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash 0.8.12",
+]

 [[package]]
 name = "hashbrown"
@@ -1794,6 +2001,15 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"

+[[package]]
+name = "hashlink"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
+dependencies = [
+ "hashbrown 0.14.5",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -1885,6 +2101,12 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"

+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
 [[package]]
 name = "hyper"
 version = "1.7.0"
@@ -1895,9 +2117,11 @@ dependencies = [
 "bytes",
 "futures-channel",
 "futures-core",
+ "h2",
 "http",
 "http-body",
 "httparse",
+ "httpdate",
 "itoa",
 "pin-project-lite",
 "pin-utils",
@@ -1923,6 +2147,22 @@ dependencies = [
 "webpki-roots",
 ]

+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.17"
@@ -1942,9 +2182,11 @@ dependencies = [
 "percent-encoding",
 "pin-project-lite",
 "socket2",
+ "system-configuration",
 "tokio",
 "tower-service",
 "tracing",
+ "windows-registry",
 ]

 [[package]]
@@ -1978,7 +2220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98"
 dependencies = [
 "byteorder",
- "png",
+ "png 0.17.16",
 ]

 [[package]]
@@ -2094,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"
@@ -2364,6 +2619,17 @@ dependencies = [
 "redox_syscall",
 ]

+[[package]]
+name = "libsqlite3-sys"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.11.0"
@@ -2458,6 +2724,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"

+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
 [[package]]
 name = "memchr"
 version = "2.7.6"
@@ -2506,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"
@@ -2521,12 +2803,29 @@ 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",
 ]

+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "ndk"
 version = "0.9.0"
@@ -2944,6 +3243,50 @@ dependencies = [
 "pathdiff",
 ]

+[[package]]
+name = "openssl"
+version = "0.10.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
+dependencies = [
+ "bitflags 2.9.4",
+ "cfg-if",
+ "foreign-types 0.3.2",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.111"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -3249,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"
@@ -3380,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"
@@ -3687,16 +4052,21 @@ checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
 dependencies = [
 "base64 0.22.1",
 "bytes",
+ "encoding_rs",
 "futures-core",
 "futures-util",
+ "h2",
 "http",
 "http-body",
 "http-body-util",
 "hyper",
 "hyper-rustls",
+ "hyper-tls",
 "hyper-util",
 "js-sys",
 "log",
+ "mime",
+ "native-tls",
 "percent-encoding",
 "pin-project-lite",
 "quinn",
@@ -3707,10 +4077,11 @@ dependencies = [
 "serde_urlencoded",
 "sync_wrapper",
 "tokio",
+ "tokio-native-tls",
 "tokio-rustls",
 "tokio-util",
- "tower",
- "tower-http",
+ "tower 0.5.2",
+ "tower-http 0.6.6",
 "tower-service",
 "url",
 "wasm-bindgen",
@@ -3815,6 +4186,20 @@ dependencies = [
 "cc",
 ]

+[[package]]
+name = "rusqlite"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
+dependencies = [
+ "bitflags 2.9.4",
+ "fallible-iterator",
+ "fallible-streaming-iterator",
+ "hashlink",
+ "libsqlite3-sys",
+ "smallvec",
+]
+
 [[package]]
 name = "rust-ini"
 version = "0.21.3"
@@ -3940,6 +4325,15 @@ dependencies = [
 "sdd",
 ]

+[[package]]
+name = "schannel"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+dependencies = [
+ "windows-sys 0.61.1",
+]
+
 [[package]]
 name = "schemars"
 version = "0.8.22"
@@ -4015,6 +4409,29 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"

+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.9.4",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "selectors"
 version = "0.24.0"
@@ -4109,6 +4526,17 @@ dependencies = [
 "serde_core",
 ]

+[[package]]
+name = "serde_path_to_error"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
+dependencies = [
+ "itoa",
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "serde_repr"
 version = "0.1.20"
@@ -4343,7 +4771,7 @@ dependencies = [
 "bytemuck",
 "cfg_aliases",
 "core-graphics",
- "foreign-types",
+ "foreign-types 0.5.0",
 "js-sys",
 "log",
 "objc2 0.5.2",
@@ -4484,6 +4912,27 @@ dependencies = [
 "syn 2.0.106",
 ]

+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags 2.9.4",
+ "core-foundation 0.9.4",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "system-deps"
 version = "6.2.2"
@@ -4505,7 +4954,7 @@ checksum = "959469667dbcea91e5485fc48ba7dd6023face91bb0f1a14681a70f99847c3f7"
 dependencies = [
 "bitflags 2.9.4",
 "block2 0.6.1",
- "core-foundation",
+ "core-foundation 0.10.1",
 "core-graphics",
 "crossbeam-channel",
 "dispatch",
@@ -4589,6 +5038,7 @@ dependencies = [
 "heck 0.5.0",
 "http",
 "http-range",
+ "image",
 "jni",
 "libc",
 "log",
@@ -4657,7 +5107,7 @@ dependencies = [
 "ico",
 "json-patch",
 "plist",
- "png",
+ "png 0.17.16",
 "proc-macro2",
 "quote",
 "semver",
@@ -5144,6 +5594,16 @@ dependencies = [
 "syn 2.0.106",
 ]

+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.26.4"
@@ -5281,6 +5741,17 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109"

+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -5294,6 +5765,23 @@ dependencies = [
 "tokio",
 "tower-layer",
 "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
+dependencies = [
+ "bitflags 2.9.4",
+ "bytes",
+ "http",
+ "http-body",
+ "http-body-util",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
 ]

 [[package]]
@@ -5309,7 +5797,7 @@ dependencies = [
 "http-body",
 "iri-string",
 "pin-project-lite",
- "tower",
+ "tower 0.5.2",
 "tower-layer",
 "tower-service",
 ]
@@ -5332,6 +5820,7 @@ version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
+ "log",
 "pin-project-lite",
 "tracing-attributes",
 "tracing-core",
@@ -5373,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",
@@ -5533,6 +6022,12 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"

+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version-compare"
 version = "0.2.0"
@@ -6397,6 +6892,15 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winreg"
 version = "0.52.0"
@@ -1,6 +1,6 @@
 [package]
 name = "cc-switch"
-version = "3.7.0"
+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"
@@ -37,17 +37,30 @@ tauri-plugin-deep-link = "2"
 dirs = "5.0"
 toml = "0.8"
 toml_edit = "0.22"
-reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json"] }
-tokio = { version = "1", features = ["macros", "rt-multi-thread", "time"] }
+reqwest = { version = "0.12", features = ["rustls-tls", "json", "stream"] }
+tokio = { version = "1", features = ["macros", "rt-multi-thread", "time", "sync"] }
 futures = "0.3"
+async-stream = "0.3"
+bytes = "1.5"
+axum = "0.7"
+tower = "0.4"
+tower-http = { version = "0.5", features = ["cors"] }
+hyper = { version = "1.0", features = ["full"] }
 regex = "1.10"
 rquickjs = { version = "0.8", features = ["array-buffer", "classes"] }
-thiserror = "1.0"
+thiserror = "2.0"
 anyhow = "1.0"
 zip = "2.2"
 serde_yaml = "0.9"
 tempfile = "3"
 url = "2.5"
+auto-launch = "0.5"
+once_cell = "1.21.3"
+base64 = "0.22"
+rusqlite = { version = "0.31", features = ["bundled", "backup"] }
+indexmap = { version = "2", features = ["serde"] }
+rust_decimal = "1.33"
+uuid = { version = "1.11", features = ["v4"] }

 [target.'cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))'.dependencies]
 tauri-plugin-single-instance = "2"
@@ -10,7 +10,8 @@
    "opener:default",
    "updater:default",
    "core:window:allow-set-skip-taskbar",
+    "core:window:allow-start-dragging",
    "process:allow-restart",
    "dialog:default"
  ]
-}
+}
@@ -55,6 +55,110 @@ impl McpApps {
    }
 }

+/// Skill 应用启用状态（标记 Skill 应用到哪些客户端）
+#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
+pub struct SkillApps {
+    #[serde(default)]
+    pub claude: bool,
+    #[serde(default)]
+    pub codex: bool,
+    #[serde(default)]
+    pub gemini: bool,
+}
+
+impl SkillApps {
+    /// 检查指定应用是否启用
+    pub fn is_enabled_for(&self, app: &AppType) -> bool {
+        match app {
+            AppType::Claude => self.claude,
+            AppType::Codex => self.codex,
+            AppType::Gemini => self.gemini,
+        }
+    }
+
+    /// 设置指定应用的启用状态
+    pub fn set_enabled_for(&mut self, app: &AppType, enabled: bool) {
+        match app {
+            AppType::Claude => self.claude = enabled,
+            AppType::Codex => self.codex = enabled,
+            AppType::Gemini => self.gemini = enabled,
+        }
+    }
+
+    /// 获取所有启用的应用列表
+    pub fn enabled_apps(&self) -> Vec<AppType> {
+        let mut apps = Vec::new();
+        if self.claude {
+            apps.push(AppType::Claude);
+        }
+        if self.codex {
+            apps.push(AppType::Codex);
+        }
+        if self.gemini {
+            apps.push(AppType::Gemini);
+        }
+        apps
+    }
+
+    /// 检查是否所有应用都未启用
+    pub fn is_empty(&self) -> bool {
+        !self.claude && !self.codex && !self.gemini
+    }
+
+    /// 仅启用指定应用（其他应用设为禁用）
+    pub fn only(app: &AppType) -> Self {
+        let mut apps = Self::default();
+        apps.set_enabled_for(app, true);
+        apps
+    }
+}
+
+/// 已安装的 Skill（v3.10.0+ 统一结构）
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct InstalledSkill {
+    /// 唯一标识符（格式："owner/repo:directory" 或 "local:directory"）
+    pub id: String,
+    /// 显示名称
+    pub name: String,
+    /// 描述
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// 安装目录名（在 SSOT 目录中的子目录名）
+    pub directory: String,
+    /// 仓库所有者（GitHub 用户/组织）
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_owner: Option<String>,
+    /// 仓库名称
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_name: Option<String>,
+    /// 仓库分支
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_branch: Option<String>,
+    /// README URL
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub readme_url: Option<String>,
+    /// 应用启用状态
+    pub apps: SkillApps,
+    /// 安装时间（Unix 时间戳）
+    pub installed_at: i64,
+}
+
+/// 未管理的 Skill（在应用目录中发现但未被 CC Switch 管理）
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UnmanagedSkill {
+    /// 目录名
+    pub directory: String,
+    /// 显示名称（从 SKILL.md 解析）
+    pub name: String,
+    /// 描述
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// 在哪些应用目录中发现（如 ["claude", "codex"]）
+    pub found_in: Vec<String>,
+}
+
 /// MCP 服务器定义（v3.7.0 统一结构）
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct McpServer {
@@ -494,8 +598,11 @@ impl MultiAppConfig {
        // 创建提示词对象
        let timestamp = std::time::SystemTime::now()
            .duration_since(std::time::UNIX_EPOCH)
-            .unwrap()
-            .as_secs() as i64;
+            .map(|d| d.as_secs() as i64)
+            .unwrap_or_else(|_| {
+                log::warn!("Failed to get system time, using 0 as timestamp");
+                0
+            });

        let id = format!("auto-imported-{timestamp}");
        let prompt = crate::prompt::Prompt {
@@ -0,0 +1,116 @@
+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 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 消除平台差异
+    // macOS: 使用 AppleScript 方式（默认），需要 .app bundle 路径
+    // Windows/Linux: 使用注册表/XDG autostart
+    let auto_launch = AutoLaunchBuilder::new()
+        .set_app_name(app_name)
+        .set_app_path(&app_path.to_string_lossy())
+        .build()
+        .map_err(|e| AppError::Message(format!("创建 AutoLaunch 失败: {e}")))?;
+
+    Ok(auto_launch)
+}
+
+/// 启用开机自启
+pub fn enable_auto_launch() -> Result<(), AppError> {
+    let auto_launch = get_auto_launch()?;
+    auto_launch
+        .enable()
+        .map_err(|e| AppError::Message(format!("启用开机自启失败: {e}")))?;
+    log::info!("已启用开机自启");
+    Ok(())
+}
+
+/// 禁用开机自启
+pub fn disable_auto_launch() -> Result<(), AppError> {
+    let auto_launch = get_auto_launch()?;
+    auto_launch
+        .disable()
+        .map_err(|e| AppError::Message(format!("禁用开机自启失败: {e}")))?;
+    log::info!("已禁用开机自启");
+    Ok(())
+}
+
+/// 检查是否已启用开机自启
+pub fn is_auto_launch_enabled() -> Result<bool, AppError> {
+    let auto_launch = get_auto_launch()?;
+    auto_launch
+        .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);
+    }
+}
@@ -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"]));
+        }
+    }
+}
@@ -29,6 +29,7 @@ pub fn get_codex_config_path() -> PathBuf {
 }

 /// 获取 Codex 供应商配置文件路径
+#[allow(dead_code)]
 pub fn get_codex_provider_paths(
    provider_id: &str,
    provider_name: Option<&str>,
@@ -44,6 +45,7 @@ pub fn get_codex_provider_paths(
 }

 /// 删除 Codex 供应商配置文件
+#[allow(dead_code)]
 pub fn delete_codex_provider_config(
    provider_id: &str,
    provider_name: &str,
@@ -141,11 +141,10 @@ pub async fn open_app_config_folder(handle: AppHandle) -> Result<bool, String> {
 pub async fn get_claude_common_config_snippet(
    state: tauri::State<'_, crate::store::AppState>,
 ) -> Result<Option<String>, String> {
-    let guard = state
-        .config
-        .read()
-        .map_err(|e| format!("读取配置锁失败: {e}"))?;
-    Ok(guard.common_config_snippets.claude.clone())
+    state
+        .db
+        .get_config_snippet("claude")
+        .map_err(|e| e.to_string())
 }

 /// 设置 Claude 通用配置片段（已废弃，使用 set_common_config_snippet）
@@ -154,24 +153,22 @@ pub async fn set_claude_common_config_snippet(
    snippet: String,
    state: tauri::State<'_, crate::store::AppState>,
 ) -> Result<(), String> {
-    let mut guard = state
-        .config
-        .write()
-        .map_err(|e| format!("写入配置锁失败: {e}"))?;
-
    // 验证是否为有效的 JSON（如果不为空）
    if !snippet.trim().is_empty() {
        serde_json::from_str::<serde_json::Value>(&snippet)
            .map_err(|e| format!("无效的 JSON 格式: {e}"))?;
    }

-    guard.common_config_snippets.claude = if snippet.trim().is_empty() {
+    let value = if snippet.trim().is_empty() {
        None
    } else {
        Some(snippet)
    };

-    guard.save().map_err(|e| e.to_string())?;
+    state
+        .db
+        .set_config_snippet("claude", value)
+        .map_err(|e| e.to_string())?;
    Ok(())
 }

@@ -181,17 +178,10 @@ pub async fn get_common_config_snippet(
    app_type: String,
    state: tauri::State<'_, crate::store::AppState>,
 ) -> Result<Option<String>, String> {
-    use crate::app_config::AppType;
-    use std::str::FromStr;
-
-    let app = AppType::from_str(&app_type).map_err(|e| format!("无效的应用类型: {e}"))?;
-
-    let guard = state
-        .config
-        .read()
-        .map_err(|e| format!("读取配置锁失败: {e}"))?;
-
-    Ok(guard.common_config_snippets.get(&app).cloned())
+    state
+        .db
+        .get_config_snippet(&app_type)
+        .map_err(|e| e.to_string())
 }

 /// 设置通用配置片段（统一接口）
@@ -201,40 +191,31 @@ pub async fn set_common_config_snippet(
    snippet: String,
    state: tauri::State<'_, crate::store::AppState>,
 ) -> Result<(), String> {
-    use crate::app_config::AppType;
-    use std::str::FromStr;
-
-    let app = AppType::from_str(&app_type).map_err(|e| format!("无效的应用类型: {e}"))?;
-
-    let mut guard = state
-        .config
-        .write()
-        .map_err(|e| format!("写入配置锁失败: {e}"))?;
-
    // 验证格式（根据应用类型）
    if !snippet.trim().is_empty() {
-        match app {
-            AppType::Claude | AppType::Gemini => {
+        match app_type.as_str() {
+            "claude" | "gemini" => {
                // 验证 JSON 格式
                serde_json::from_str::<serde_json::Value>(&snippet)
                    .map_err(|e| format!("无效的 JSON 格式: {e}"))?;
            }
-            AppType::Codex => {
+            "codex" => {
                // TOML 格式暂不验证（或可使用 toml crate）
                // 注意：TOML 验证较为复杂，暂时跳过
            }
+            _ => {}
        }
    }

-    guard.common_config_snippets.set(
-        &app,
-        if snippet.trim().is_empty() {
-            None
-        } else {
-            Some(snippet)
-        },
-    );
+    let value = if snippet.trim().is_empty() {
+        None
+    } else {
+        Some(snippet)
+    };

-    guard.save().map_err(|e| e.to_string())?;
+    state
+        .db
+        .set_config_snippet(&app_type, value)
+        .map_err(|e| e.to_string())?;
    Ok(())
 }
@@ -1,4 +1,7 @@
-use crate::deeplink::{import_provider_from_deeplink, parse_deeplink_url, DeepLinkImportRequest};
+use crate::deeplink::{
+    import_mcp_from_deeplink, import_prompt_from_deeplink, import_provider_from_deeplink,
+    import_skill_from_deeplink, parse_deeplink_url, DeepLinkImportRequest,
+};
 use crate::store::AppState;
 use tauri::State;

@@ -9,14 +12,24 @@ pub fn parse_deeplink(url: String) -> Result<DeepLinkImportRequest, String> {
    parse_deeplink_url(&url).map_err(|e| e.to_string())
 }

-/// Import a provider from a deep link request (after user confirmation)
+/// Merge configuration from Base64/URL into a deep link request
+/// This is used by the frontend to show the complete configuration in the confirmation dialog
+#[tauri::command]
+pub fn merge_deeplink_config(
+    request: DeepLinkImportRequest,
+) -> Result<DeepLinkImportRequest, String> {
+    log::info!("Merging config for deep link request: {:?}", request.name);
+    crate::deeplink::parse_and_merge_config(&request).map_err(|e| e.to_string())
+}
+
+/// Import a provider from a deep link request (legacy, kept for compatibility)
 #[tauri::command]
 pub fn import_from_deeplink(
    state: State<AppState>,
    request: DeepLinkImportRequest,
 ) -> Result<String, String> {
    log::info!(
-        "Importing provider from deep link: {} for app {}",
+        "Importing provider from deep link: {:?} for app {:?}",
        request.name,
        request.app
    );
@@ -27,3 +40,50 @@ pub fn import_from_deeplink(

    Ok(provider_id)
 }
+
+/// Import resource from a deep link request (unified handler)
+#[tauri::command]
+pub async fn import_from_deeplink_unified(
+    state: State<'_, AppState>,
+    request: DeepLinkImportRequest,
+) -> Result<serde_json::Value, String> {
+    log::info!("Importing {} resource from deep link", request.resource);
+
+    match request.resource.as_str() {
+        "provider" => {
+            let provider_id =
+                import_provider_from_deeplink(&state, request).map_err(|e| e.to_string())?;
+            Ok(serde_json::json!({
+                "type": "provider",
+                "id": provider_id
+            }))
+        }
+        "prompt" => {
+            let prompt_id =
+                import_prompt_from_deeplink(&state, request).map_err(|e| e.to_string())?;
+            Ok(serde_json::json!({
+                "type": "prompt",
+                "id": prompt_id
+            }))
+        }
+        "mcp" => {
+            let result = import_mcp_from_deeplink(&state, request).map_err(|e| e.to_string())?;
+            // Add type field to the result
+            Ok(serde_json::json!({
+                "type": "mcp",
+                "importedCount": result.imported_count,
+                "importedIds": result.imported_ids,
+                "failed": result.failed
+            }))
+        }
+        "skill" => {
+            let skill_key =
+                import_skill_from_deeplink(&state, request).map_err(|e| e.to_string())?;
+            Ok(serde_json::json!({
+                "type": "skill",
+                "key": skill_key
+            }))
+        }
+        _ => Err(format!("Unsupported resource type: {}", request.resource)),
+    }
+}
@@ -0,0 +1,102 @@
+//! 故障转移队列命令
+//!
+//! 管理代理模式下的故障转移队列（基于 providers 表的 in_failover_queue 字段）
+
+use crate::database::FailoverQueueItem;
+use crate::provider::Provider;
+use crate::store::AppState;
+
+/// 获取故障转移队列
+#[tauri::command]
+pub async fn get_failover_queue(
+    state: tauri::State<'_, AppState>,
+    app_type: String,
+) -> Result<Vec<FailoverQueueItem>, String> {
+    state
+        .db
+        .get_failover_queue(&app_type)
+        .map_err(|e| e.to_string())
+}
+
+/// 获取可添加到故障转移队列的供应商（不在队列中的）
+#[tauri::command]
+pub async fn get_available_providers_for_failover(
+    state: tauri::State<'_, AppState>,
+    app_type: String,
+) -> Result<Vec<Provider>, String> {
+    state
+        .db
+        .get_available_providers_for_failover(&app_type)
+        .map_err(|e| e.to_string())
+}
+
+/// 添加供应商到故障转移队列
+#[tauri::command]
+pub async fn add_to_failover_queue(
+    state: tauri::State<'_, AppState>,
+    app_type: String,
+    provider_id: String,
+) -> Result<(), String> {
+    state
+        .db
+        .add_to_failover_queue(&app_type, &provider_id)
+        .map_err(|e| e.to_string())
+}
+
+/// 从故障转移队列移除供应商
+#[tauri::command]
+pub async fn remove_from_failover_queue(
+    state: tauri::State<'_, AppState>,
+    app_type: String,
+    provider_id: String,
+) -> Result<(), String> {
+    state
+        .db
+        .remove_from_failover_queue(&app_type, &provider_id)
+        .map_err(|e| e.to_string())
+}
+
+/// 获取指定应用的自动故障转移开关状态（从 proxy_config 表读取）
+#[tauri::command]
+pub async fn get_auto_failover_enabled(
+    state: tauri::State<'_, AppState>,
+    app_type: String,
+) -> Result<bool, String> {
+    state
+        .db
+        .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_auto_failover_enabled(
+    state: tauri::State<'_, AppState>,
+    app_type: 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
+        .update_proxy_config_for_app(config)
+        .await
+        .map_err(|e| e.to_string())
+}
@@ -6,20 +6,22 @@ use tauri::State;
 use tauri_plugin_dialog::DialogExt;

 use crate::error::AppError;
-use crate::services::ConfigService;
+use crate::services::provider::ProviderService;
 use crate::store::AppState;

-/// 导出配置文件
+/// 导出数据库为 SQL 备份
 #[tauri::command]
 pub async fn export_config_to_file(
    #[allow(non_snake_case)] filePath: String,
+    state: State<'_, AppState>,
 ) -> Result<Value, String> {
+    let db = state.db.clone();
    tauri::async_runtime::spawn_blocking(move || {
        let target_path = PathBuf::from(&filePath);
-        ConfigService::export_config_to_path(&target_path)?;
+        db.export_sql(&target_path)?;
        Ok::<_, AppError>(json!({
            "success": true,
-            "message": "Configuration exported successfully",
+            "message": "SQL exported successfully",
            "filePath": filePath
        }))
    })
@@ -28,51 +30,54 @@ pub async fn export_config_to_file(
    .map_err(|e: AppError| e.to_string())
 }

-/// 从文件导入配置
+/// 从 SQL 备份导入数据库
 #[tauri::command]
 pub async fn import_config_from_file(
    #[allow(non_snake_case)] filePath: String,
    state: State<'_, AppState>,
 ) -> Result<Value, String> {
-    let (new_config, backup_id) = tauri::async_runtime::spawn_blocking(move || {
+    let db = state.db.clone();
+    let db_for_state = db.clone();
+    tauri::async_runtime::spawn_blocking(move || {
        let path_buf = PathBuf::from(&filePath);
-        ConfigService::load_config_for_import(&path_buf)
+        let backup_id = db.import_sql(&path_buf)?;
+
+        // 导入后同步当前供应商到各自的 live 配置
+        let app_state = AppState::new(db_for_state);
+        if let Err(err) = ProviderService::sync_current_to_live(&app_state) {
+            log::warn!("导入后同步 live 配置失败: {err}");
+        }
+
+        // 重新加载设置到内存缓存，确保导入的设置生效
+        if let Err(err) = crate::settings::reload_settings() {
+            log::warn!("导入后重载设置失败: {err}");
+        }
+
+        Ok::<_, AppError>(json!({
+            "success": true,
+            "message": "SQL imported successfully",
+            "backupId": backup_id
+        }))
    })
    .await
    .map_err(|e| format!("导入配置失败: {e}"))?
-    .map_err(|e: AppError| e.to_string())?;
-
-    {
-        let mut guard = state
-            .config
-            .write()
-            .map_err(|e| AppError::from(e).to_string())?;
-        *guard = new_config;
-    }
-
-    Ok(json!({
-        "success": true,
-        "message": "Configuration imported successfully",
-        "backupId": backup_id
-    }))
+    .map_err(|e: AppError| e.to_string())
 }

-/// 同步当前供应商配置到对应的 live 文件
 #[tauri::command]
 pub async fn sync_current_providers_live(state: State<'_, AppState>) -> Result<Value, String> {
-    {
-        let mut config_state = state
-            .config
-            .write()
-            .map_err(|e| AppError::from(e).to_string())?;
-        ConfigService::sync_current_providers_to_live(&mut config_state)
-            .map_err(|e| e.to_string())?;
-    }
-
-    Ok(json!({
-        "success": true,
-        "message": "Live configuration synchronized"
-    }))
+    let db = state.db.clone();
+    tauri::async_runtime::spawn_blocking(move || {
+        let app_state = AppState::new(db);
+        ProviderService::sync_current_to_live(&app_state)?;
+        Ok::<_, AppError>(json!({
+            "success": true,
+            "message": "Live configuration synchronized"
+        }))
+    })
+    .await
+    .map_err(|e| format!("同步当前供应商失败: {e}"))?
+    .map_err(|e: AppError| e.to_string())
 }

 /// 保存文件对话框
@@ -84,7 +89,7 @@ pub async fn save_file_dialog<R: tauri::Runtime>(
    let dialog = app.dialog();
    let result = dialog
        .file()
-        .add_filter("JSON", &["json"])
+        .add_filter("SQL", &["sql"])
        .set_file_name(&defaultName)
        .blocking_save_file();

@@ -99,7 +104,7 @@ pub async fn open_file_dialog<R: tauri::Runtime>(
    let dialog = app.dialog();
    let result = dialog
        .file()
-        .add_filter("JSON", &["json"])
+        .add_filter("SQL", &["sql"])
        .blocking_pick_file();

    Ok(result.map(|p| p.to_string()))
@@ -1,5 +1,6 @@
 #![allow(non_snake_case)]

+use indexmap::IndexMap;
 use std::collections::HashMap;

 use serde::Serialize;
@@ -82,12 +83,8 @@ pub async fn upsert_mcp_server_in_config(

    // 读取现有的服务器（如果存在）
    let existing_server = {
-        let cfg = state.config.read().map_err(|e| e.to_string())?;
-        if let Some(servers) = &cfg.mcp.servers {
-            servers.get(&id).cloned()
-        } else {
-            None
-        }
+        let servers = state.db.get_all_mcp_servers().map_err(|e| e.to_string())?;
+        servers.get(&id).cloned()
    };

    // 构建新的统一服务器结构
@@ -165,7 +162,7 @@ use crate::app_config::McpServer;
 #[tauri::command]
 pub async fn get_mcp_servers(
    state: State<'_, AppState>,
-) -> Result<HashMap<String, McpServer>, String> {
+) -> Result<IndexMap<String, McpServer>, String> {
    McpService::get_all_servers(&state).map_err(|e| e.to_string())
 }

@@ -195,3 +192,13 @@ pub async fn toggle_mcp_app(
    let app_ty = AppType::from_str(&app).map_err(|e| e.to_string())?;
    McpService::toggle_app(&state, &server_id, app_ty, enabled).map_err(|e| e.to_string())
 }
+
+/// 从所有应用导入 MCP 服务器（复用已有的导入逻辑）
+#[tauri::command]
+pub async fn import_mcp_from_apps(state: State<'_, AppState>) -> Result<usize, String> {
+    let mut total = 0;
+    total += McpService::import_from_claude(&state).unwrap_or(0);
+    total += McpService::import_from_codex(&state).unwrap_or(0);
+    total += McpService::import_from_gemini(&state).unwrap_or(0);
+    Ok(total)
+}
@@ -1,9 +1,15 @@
 #![allow(non_snake_case)]

-use crate::init_status::InitErrorPayload;
+use crate::init_status::{InitErrorPayload, SkillsMigrationPayload};
 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> {
@@ -51,3 +57,241 @@ pub async fn is_portable_mode() -> Result<bool, String> {
 pub async fn get_init_error() -> Result<Option<InitErrorPayload>, String> {
    Ok(crate::init_status::get_init_error())
 }
+
+/// 获取 JSON→SQLite 迁移结果（若有）。
+/// 只返回一次 true，之后返回 false，用于前端显示一次性 Toast 通知。
+#[tauri::command]
+pub async fn get_migration_result() -> Result<bool, String> {
+    Ok(crate::init_status::take_migration_success())
+}
+
+/// 获取 Skills 自动导入（SSOT）迁移结果（若有）。
+/// 只返回一次 Some({count})，之后返回 None，用于前端显示一次性 Toast 通知。
+#[tauri::command]
+pub async fn get_skills_migration_result() -> Result<Option<SkillsMigrationPayload>, String> {
+    Ok(crate::init_status::take_skills_migration_result())
+}
+
+#[derive(serde::Serialize)]
+pub struct ToolVersion {
+    name: String,
+    version: Option<String>,
+    latest_version: Option<String>, // 新增字段：最新版本
+    error: Option<String>,
+}
+
+#[tauri::command]
+pub async fn get_tool_versions() -> Result<Vec<ToolVersion>, String> {
+    let tools = vec!["claude", "codex", "gemini"];
+    let mut results = Vec::new();
+
+    // 用于获取远程版本的 client
+    let client = reqwest::Client::builder()
+        .user_agent("cc-switch/1.0")
+        .build()
+        .map_err(|e| e.to_string())?;
+
+    for tool in tools {
+        // 1. 获取本地版本 - 先尝试直接执行，失败则扫描常见路径
+        let (local_version, local_error) = {
+            // 先尝试直接执行
+            let direct_result = try_get_version(tool);
+
+            if direct_result.0.is_some() {
+                direct_result
+            } else {
+                // 扫描常见的 npm 全局安装路径
+                scan_cli_version(tool)
+            }
+        };
+
+        // 2. 获取远程最新版本
+        let latest_version = match tool {
+            "claude" => fetch_npm_latest_version(&client, "@anthropic-ai/claude-code").await,
+            "codex" => fetch_npm_latest_version(&client, "@openai/codex").await,
+            "gemini" => fetch_npm_latest_version(&client, "@google/gemini-cli").await,
+            _ => None,
+        };
+
+        results.push(ToolVersion {
+            name: tool.to_string(),
+            version: local_version,
+            latest_version,
+            error: local_error,
+        });
+    }
+
+    Ok(results)
+}
+
+/// Helper function to fetch latest version from npm registry
+async fn fetch_npm_latest_version(client: &reqwest::Client, package: &str) -> Option<String> {
+    let url = format!("https://registry.npmjs.org/{package}");
+    match client.get(&url).send().await {
+        Ok(resp) => {
+            if let Ok(json) = resp.json::<serde_json::Value>().await {
+                json.get("dist-tags")
+                    .and_then(|tags| tags.get("latest"))
+                    .and_then(|v| v.as_str())
+                    .map(|s| s.to_string())
+            } else {
+                None
+            }
+        }
+        Err(_) => None,
+    }
+}
+
+/// 从版本输出中提取纯版本号
+fn extract_version(raw: &str) -> String {
+    // 匹配 semver 格式: x.y.z 或 x.y.z-xxx
+    let re = regex::Regex::new(r"\d+\.\d+\.\d+(-[\w.]+)?").unwrap();
+    re.find(raw)
+        .map(|m| m.as_str().to_string())
+        .unwrap_or_else(|| raw.to_string())
+}
+
+/// 尝试直接执行命令获取版本
+fn try_get_version(tool: &str) -> (Option<String>, Option<String>) {
+    use std::process::Command;
+
+    #[cfg(target_os = "windows")]
+    let output = {
+        Command::new("cmd")
+            .args(["/C", &format!("{tool} --version")])
+            .creation_flags(CREATE_NO_WINDOW)
+            .output()
+    };
+
+    #[cfg(not(target_os = "windows"))]
+    let output = {
+        Command::new("sh")
+            .arg("-c")
+            .arg(format!("{tool} --version"))
+            .output()
+    };
+
+    match output {
+        Ok(out) => {
+            let stdout = String::from_utf8_lossy(&out.stdout).trim().to_string();
+            let stderr = String::from_utf8_lossy(&out.stderr).trim().to_string();
+            if out.status.success() {
+                let raw = if stdout.is_empty() { &stderr } else { &stdout };
+                if raw.is_empty() {
+                    (None, Some("未安装或无法执行".to_string()))
+                } else {
+                    (Some(extract_version(raw)), None)
+                }
+            } else {
+                let err = if stderr.is_empty() { stdout } else { stderr };
+                (
+                    None,
+                    Some(if err.is_empty() {
+                        "未安装或无法执行".to_string()
+                    } else {
+                        err
+                    }),
+                )
+            }
+        }
+        Err(e) => (None, Some(e.to_string())),
+    }
+}
+
+/// 扫描常见路径查找 CLI
+fn scan_cli_version(tool: &str) -> (Option<String>, Option<String>) {
+    use std::process::Command;
+
+    let home = dirs::home_dir().unwrap_or_default();
+
+    // 常见的 npm 全局安装路径
+    let mut search_paths: Vec<std::path::PathBuf> = vec![
+        home.join(".npm-global/bin"),
+        home.join(".local/bin"),
+        home.join("n/bin"), // n version manager
+    ];
+
+    #[cfg(target_os = "macos")]
+    {
+        search_paths.push(std::path::PathBuf::from("/opt/homebrew/bin"));
+        search_paths.push(std::path::PathBuf::from("/usr/local/bin"));
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+        search_paths.push(std::path::PathBuf::from("/usr/local/bin"));
+        search_paths.push(std::path::PathBuf::from("/usr/bin"));
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+        if let Some(appdata) = dirs::data_dir() {
+            search_paths.push(appdata.join("npm"));
+        }
+        search_paths.push(std::path::PathBuf::from("C:\\Program Files\\nodejs"));
+    }
+
+    // 扫描 nvm 目录下的所有 node 版本
+    let nvm_base = home.join(".nvm/versions/node");
+    if nvm_base.exists() {
+        if let Ok(entries) = std::fs::read_dir(&nvm_base) {
+            for entry in entries.flatten() {
+                let bin_path = entry.path().join("bin");
+                if bin_path.exists() {
+                    search_paths.push(bin_path);
+                }
+            }
+        }
+    }
+
+    // 在每个路径中查找工具
+    for path in &search_paths {
+        let tool_path = if cfg!(target_os = "windows") {
+            path.join(format!("{tool}.cmd"))
+        } else {
+            path.join(tool)
+        };
+
+        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);
+
+            #[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()
+            };
+
+            if let Ok(out) = output {
+                let stdout = String::from_utf8_lossy(&out.stdout).trim().to_string();
+                let stderr = String::from_utf8_lossy(&out.stderr).trim().to_string();
+                if out.status.success() {
+                    let raw = if stdout.is_empty() { &stderr } else { &stdout };
+                    if !raw.is_empty() {
+                        return (Some(extract_version(raw)), None);
+                    }
+                }
+            }
+        }
+    }
+
+    (None, Some("未安装或无法执行".to_string()))
+}
@@ -3,23 +3,31 @@
 mod config;
 mod deeplink;
 mod env;
+mod failover;
 mod import_export;
 mod mcp;
 mod misc;
 mod plugin;
 mod prompt;
 mod provider;
+mod proxy;
 mod settings;
 pub mod skill;
+mod stream_check;
+mod usage;

 pub use config::*;
 pub use deeplink::*;
 pub use env::*;
+pub use failover::*;
 pub use import_export::*;
 pub use mcp::*;
 pub use misc::*;
 pub use plugin::*;
 pub use prompt::*;
 pub use provider::*;
+pub use proxy::*;
 pub use settings::*;
 pub use skill::*;
+pub use stream_check::*;
+pub use usage::*;
@@ -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())
+}
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use indexmap::IndexMap;
 use std::str::FromStr;

 use tauri::State;
@@ -12,7 +12,7 @@ use crate::store::AppState;
 pub async fn get_prompts(
    app: String,
    state: State<'_, AppState>,
-) -> Result<HashMap<String, Prompt>, String> {
+) -> Result<IndexMap<String, Prompt>, String> {
    let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
    PromptService::get_prompts(&state, app_type).map_err(|e| e.to_string())
 }
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use indexmap::IndexMap;
 use tauri::State;

 use crate::app_config::AppType;
@@ -13,7 +13,7 @@ use std::str::FromStr;
 pub fn get_providers(
    state: State<'_, AppState>,
    app: String,
-) -> Result<HashMap<String, Provider>, String> {
+) -> Result<IndexMap<String, Provider>, String> {
    let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
    ProviderService::list(state.inner(), app_type).map_err(|e| e.to_string())
 }
@@ -86,7 +86,7 @@ pub fn switch_provider(
        .map_err(|e| e.to_string())
 }

-fn import_default_config_internal(state: &AppState, app_type: AppType) -> Result<(), AppError> {
+fn import_default_config_internal(state: &AppState, app_type: AppType) -> Result<bool, AppError> {
    ProviderService::import_default_config(state, app_type)
 }

@@ -94,7 +94,7 @@ fn import_default_config_internal(state: &AppState, app_type: AppType) -> Result
 pub fn import_default_config_test_hook(
    state: &AppState,
    app_type: AppType,
-) -> Result<(), AppError> {
+) -> Result<bool, AppError> {
    import_default_config_internal(state, app_type)
 }

@@ -102,9 +102,7 @@ pub fn import_default_config_test_hook(
 #[tauri::command]
 pub fn import_default_config(state: State<'_, AppState>, app: String) -> Result<bool, String> {
    let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
-    import_default_config_internal(&state, app_type)
-        .map(|_| true)
-        .map_err(Into::into)
+    import_default_config_internal(&state, app_type).map_err(Into::into)
 }

 /// 查询供应商用量
@@ -231,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)
+}
@@ -0,0 +1,294 @@
+//! 代理服务相关的 Tauri 命令
+//!
+//! 提供前端调用的 API 接口
+
+use crate::proxy::types::*;
+use crate::proxy::{CircuitBreakerConfig, CircuitBreakerStats};
+use crate::store::AppState;
+
+/// 启动代理服务器（仅启动服务，不接管 Live 配置）
+#[tauri::command]
+pub async fn start_proxy_server(
+    state: tauri::State<'_, AppState>,
+) -> Result<ProxyServerInfo, String> {
+    state.proxy_service.start().await
+}
+
+/// 停止代理服务器（恢复 Live 配置）
+#[tauri::command]
+pub async fn stop_proxy_with_restore(state: tauri::State<'_, AppState>) -> Result<(), String> {
+    state.proxy_service.stop_with_restore().await
+}
+
+/// 获取各应用接管状态
+#[tauri::command]
+pub async fn get_proxy_takeover_status(
+    state: tauri::State<'_, AppState>,
+) -> Result<ProxyTakeoverStatus, String> {
+    state.proxy_service.get_takeover_status().await
+}
+
+/// 为指定应用开启/关闭接管
+#[tauri::command]
+pub async fn set_proxy_takeover_for_app(
+    state: tauri::State<'_, AppState>,
+    app_type: String,
+    enabled: bool,
+) -> Result<(), String> {
+    state
+        .proxy_service
+        .set_takeover_for_app(&app_type, enabled)
+        .await
+}
+
+/// 获取代理服务器状态
+#[tauri::command]
+pub async fn get_proxy_status(state: tauri::State<'_, AppState>) -> Result<ProxyStatus, String> {
+    state.proxy_service.get_status().await
+}
+
+/// 获取代理配置
+#[tauri::command]
+pub async fn get_proxy_config(state: tauri::State<'_, AppState>) -> Result<ProxyConfig, String> {
+    state.proxy_service.get_config().await
+}
+
+/// 更新代理配置
+#[tauri::command]
+pub async fn update_proxy_config(
+    state: tauri::State<'_, AppState>,
+    config: ProxyConfig,
+) -> Result<(), String> {
+    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> {
+    Ok(state.proxy_service.is_running().await)
+}
+
+/// 检查是否处于 Live 接管模式
+#[tauri::command]
+pub async fn is_live_takeover_active(state: tauri::State<'_, AppState>) -> Result<bool, String> {
+    state.proxy_service.is_takeover_active().await
+}
+
+/// 代理模式下切换供应商（热切换）
+#[tauri::command]
+pub async fn switch_proxy_provider(
+    state: tauri::State<'_, AppState>,
+    app_type: String,
+    provider_id: String,
+) -> Result<(), String> {
+    state
+        .proxy_service
+        .switch_proxy_target(&app_type, &provider_id)
+        .await
+}
+
+// ==================== 故障转移相关命令 ====================
+
+/// 获取供应商健康状态
+#[tauri::command]
+pub async fn get_provider_health(
+    state: tauri::State<'_, AppState>,
+    provider_id: String,
+    app_type: String,
+) -> Result<ProviderHealth, String> {
+    let db = &state.db;
+    db.get_provider_health(&provider_id, &app_type)
+        .await
+        .map_err(|e| e.to_string())
+}
+
+/// 重置熔断器
+///
+/// 重置后会检查是否应该切回队列中优先级更高的供应商：
+/// 1. 检查自动故障转移是否开启
+/// 2. 如果恢复的供应商在队列中优先级更高（queue_order 更小），则自动切换
+#[tauri::command]
+pub async fn reset_circuit_breaker(
+    app_handle: tauri::AppHandle,
+    state: tauri::State<'_, AppState>,
+    provider_id: String,
+    app_type: String,
+) -> Result<(), String> {
+    // 1. 重置数据库健康状态
+    let db = &state.db;
+    db.update_provider_health(&provider_id, &app_type, true, None)
+        .await
+        .map_err(|e| e.to_string())?;
+
+    // 2. 如果代理正在运行，重置内存中的熔断器状态
+    state
+        .proxy_service
+        .reset_provider_circuit_breaker(&provider_id, &app_type)
+        .await?;
+
+    // 3. 检查是否应该切回优先级更高的供应商（从 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(())
+}
+
+/// 获取熔断器配置
+#[tauri::command]
+pub async fn get_circuit_breaker_config(
+    state: tauri::State<'_, AppState>,
+) -> Result<CircuitBreakerConfig, String> {
+    let db = &state.db;
+    db.get_circuit_breaker_config()
+        .await
+        .map_err(|e| e.to_string())
+}
+
+/// 更新熔断器配置
+#[tauri::command]
+pub async fn update_circuit_breaker_config(
+    state: tauri::State<'_, AppState>,
+    config: CircuitBreakerConfig,
+) -> Result<(), String> {
+    let db = &state.db;
+
+    // 1. 更新数据库配置
+    db.update_circuit_breaker_config(&config)
+        .await
+        .map_err(|e| e.to_string())?;
+
+    // 2. 如果代理正在运行，热更新内存中的熔断器配置
+    state
+        .proxy_service
+        .update_circuit_breaker_configs(config)
+        .await?;
+
+    Ok(())
+}
+
+/// 获取熔断器统计信息（仅当代理服务器运行时）
+#[tauri::command]
+pub async fn get_circuit_breaker_stats(
+    state: tauri::State<'_, AppState>,
+    provider_id: String,
+    app_type: String,
+) -> Result<Option<CircuitBreakerStats>, String> {
+    // 这个功能需要访问运行中的代理服务器的内存状态
+    // 目前先返回 None，后续可以通过 ProxyService 暴露接口来实现
+    let _ = (state, provider_id, app_type);
+    Ok(None)
+}
@@ -18,7 +18,12 @@ pub async fn save_settings(settings: crate::settings::AppSettings) -> Result<boo
 /// 重启应用程序（当 app_config_dir 变更后使用）
 #[tauri::command]
 pub async fn restart_app(app: AppHandle) -> Result<bool, String> {
-    app.restart();
+    // 在后台延迟重启，让函数有时间返回响应
+    tauri::async_runtime::spawn(async move {
+        tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
+        app.restart();
+    });
+    Ok(true)
 }

 /// 获取 app_config_dir 覆盖配置 (从 Store)
@@ -37,3 +42,20 @@ pub async fn set_app_config_dir_override(
    crate::app_store::set_app_config_dir_to_store(&app, path.as_deref())?;
    Ok(true)
 }
+
+/// 设置开机自启
+#[tauri::command]
+pub async fn set_auto_launch(enabled: bool) -> Result<bool, String> {
+    if enabled {
+        crate::auto_launch::enable_auto_launch().map_err(|e| format!("启用开机自启失败: {e}"))?;
+    } else {
+        crate::auto_launch::disable_auto_launch().map_err(|e| format!("禁用开机自启失败: {e}"))?;
+    }
+    Ok(true)
+}
+
+/// 获取开机自启状态
+#[tauri::command]
+pub async fn get_auto_launch_status() -> Result<bool, String> {
+    crate::auto_launch::is_auto_launch_enabled().map_err(|e| format!("获取开机自启状态失败: {e}"))
+}
@@ -1,163 +1,250 @@
-use crate::services::skill::SkillState;
-use crate::services::{Skill, SkillRepo, SkillService};
+//! Skills 命令层
+//!
+//! v3.10.0+ 统一管理架构：
+//! - 支持三应用开关（Claude/Codex/Gemini）
+//! - SSOT 存储在 ~/.cc-switch/skills/
+
+use crate::app_config::{AppType, InstalledSkill, UnmanagedSkill};
+use crate::error::format_skill_error;
+use crate::services::skill::{DiscoverableSkill, Skill, SkillRepo, SkillService};
 use crate::store::AppState;
-use chrono::Utc;
 use std::sync::Arc;
 use tauri::State;

+/// SkillService 状态包装
 pub struct SkillServiceState(pub Arc<SkillService>);

+/// 解析 app 参数为 AppType
+fn parse_app_type(app: &str) -> Result<AppType, String> {
+    match app.to_lowercase().as_str() {
+        "claude" => Ok(AppType::Claude),
+        "codex" => Ok(AppType::Codex),
+        "gemini" => Ok(AppType::Gemini),
+        _ => Err(format!("不支持的 app 类型: {app}")),
+    }
+}
+
+// ========== 统一管理命令 ==========
+
+/// 获取所有已安装的 Skills
+#[tauri::command]
+pub fn get_installed_skills(app_state: State<'_, AppState>) -> Result<Vec<InstalledSkill>, String> {
+    SkillService::get_all_installed(&app_state.db).map_err(|e| e.to_string())
+}
+
+/// 安装 Skill（新版统一安装）
+///
+/// 参数：
+/// - skill: 从发现列表获取的技能信息
+/// - current_app: 当前选中的应用，安装后默认启用该应用
+#[tauri::command]
+pub async fn install_skill_unified(
+    skill: DiscoverableSkill,
+    current_app: String,
+    service: State<'_, SkillServiceState>,
+    app_state: State<'_, AppState>,
+) -> Result<InstalledSkill, String> {
+    let app_type = parse_app_type(&current_app)?;
+
+    service
+        .0
+        .install(&app_state.db, &skill, &app_type)
+        .await
+        .map_err(|e| e.to_string())
+}
+
+/// 卸载 Skill（新版统一卸载）
+#[tauri::command]
+pub fn uninstall_skill_unified(id: String, app_state: State<'_, AppState>) -> Result<bool, String> {
+    SkillService::uninstall(&app_state.db, &id).map_err(|e| e.to_string())?;
+    Ok(true)
+}
+
+/// 切换 Skill 的应用启用状态
+#[tauri::command]
+pub fn toggle_skill_app(
+    id: String,
+    app: String,
+    enabled: bool,
+    app_state: State<'_, AppState>,
+) -> Result<bool, String> {
+    let app_type = parse_app_type(&app)?;
+    SkillService::toggle_app(&app_state.db, &id, &app_type, enabled).map_err(|e| e.to_string())?;
+    Ok(true)
+}
+
+/// 扫描未管理的 Skills
+#[tauri::command]
+pub fn scan_unmanaged_skills(
+    app_state: State<'_, AppState>,
+) -> Result<Vec<UnmanagedSkill>, String> {
+    SkillService::scan_unmanaged(&app_state.db).map_err(|e| e.to_string())
+}
+
+/// 从应用目录导入 Skills
+#[tauri::command]
+pub fn import_skills_from_apps(
+    directories: Vec<String>,
+    app_state: State<'_, AppState>,
+) -> Result<Vec<InstalledSkill>, String> {
+    SkillService::import_from_apps(&app_state.db, directories).map_err(|e| e.to_string())
+}
+
+// ========== 发现功能命令 ==========
+
+/// 发现可安装的 Skills（从仓库获取）
+#[tauri::command]
+pub async fn discover_available_skills(
+    service: State<'_, SkillServiceState>,
+    app_state: State<'_, AppState>,
+) -> Result<Vec<DiscoverableSkill>, String> {
+    let repos = app_state.db.get_skill_repos().map_err(|e| e.to_string())?;
+    service
+        .0
+        .discover_available(repos)
+        .await
+        .map_err(|e| e.to_string())
+}
+
+// ========== 兼容旧 API 的命令 ==========
+
+/// 获取技能列表（兼容旧 API）
 #[tauri::command]
 pub async fn get_skills(
    service: State<'_, SkillServiceState>,
    app_state: State<'_, AppState>,
 ) -> Result<Vec<Skill>, String> {
-    let repos = {
-        let config = app_state.config.read().map_err(|e| e.to_string())?;
-        config.skills.repos.clone()
-    };
-
+    let repos = app_state.db.get_skill_repos().map_err(|e| e.to_string())?;
    service
        .0
-        .list_skills(repos)
+        .list_skills(repos, &app_state.db)
        .await
        .map_err(|e| e.to_string())
 }

+/// 获取指定应用的技能列表（兼容旧 API）
+#[tauri::command]
+pub async fn get_skills_for_app(
+    app: String,
+    service: State<'_, SkillServiceState>,
+    app_state: State<'_, AppState>,
+) -> Result<Vec<Skill>, String> {
+    // 新版本不再区分应用，统一返回所有技能
+    let _ = parse_app_type(&app)?; // 验证 app 参数有效
+    get_skills(service, app_state).await
+}
+
+/// 安装技能（兼容旧 API）
 #[tauri::command]
 pub async fn install_skill(
    directory: String,
    service: State<'_, SkillServiceState>,
    app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
-    // 先在不持有写锁的情况下收集仓库与技能信息
-    let repos = {
-        let config = app_state.config.read().map_err(|e| e.to_string())?;
-        config.skills.repos.clone()
-    };
-
-    let skills = service
-        .0
-        .list_skills(repos)
-        .await
-        .map_err(|e| e.to_string())?;
-
-    let skill = skills
-        .iter()
-        .find(|s| s.directory.eq_ignore_ascii_case(&directory))
-        .ok_or_else(|| "技能不存在".to_string())?;
-
-    if !skill.installed {
-        let repo = SkillRepo {
-            owner: skill
-                .repo_owner
-                .clone()
-                .ok_or_else(|| "缺少仓库信息".to_string())?,
-            name: skill
-                .repo_name
-                .clone()
-                .ok_or_else(|| "缺少仓库信息".to_string())?,
-            branch: skill
-                .repo_branch
-                .clone()
-                .unwrap_or_else(|| "main".to_string()),
-            enabled: true,
-            skills_path: None, // 安装时使用默认路径
-        };
-
-        service
-            .0
-            .install_skill(directory.clone(), repo)
-            .await
-            .map_err(|e| e.to_string())?;
-    }
-
-    {
-        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
-
-        config.skills.skills.insert(
-            directory.clone(),
-            SkillState {
-                installed: true,
-                installed_at: Utc::now(),
-            },
-        );
-    }
-
-    app_state.save().map_err(|e| e.to_string())?;
-
-    Ok(true)
+    install_skill_for_app("claude".to_string(), directory, service, app_state).await
 }

+/// 安装指定应用的技能（兼容旧 API）
 #[tauri::command]
-pub fn uninstall_skill(
+pub async fn install_skill_for_app(
+    app: String,
    directory: String,
    service: State<'_, SkillServiceState>,
    app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
-    service
+    let app_type = parse_app_type(&app)?;
+
+    // 先获取技能信息
+    let repos = app_state.db.get_skill_repos().map_err(|e| e.to_string())?;
+    let skills = service
        .0
-        .uninstall_skill(directory.clone())
+        .discover_available(repos)
+        .await
        .map_err(|e| e.to_string())?;

-    {
-        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
+    let skill = skills
+        .into_iter()
+        .find(|s| {
+            let install_name = std::path::Path::new(&s.directory)
+                .file_name()
+                .map(|n| n.to_string_lossy().to_string())
+                .unwrap_or_else(|| s.directory.clone());
+            install_name.eq_ignore_ascii_case(&directory)
+                || s.directory.eq_ignore_ascii_case(&directory)
+        })
+        .ok_or_else(|| {
+            format_skill_error(
+                "SKILL_NOT_FOUND",
+                &[("directory", &directory)],
+                Some("checkRepoUrl"),
+            )
+        })?;

-        config.skills.skills.remove(&directory);
-    }
-
-    app_state.save().map_err(|e| e.to_string())?;
+    service
+        .0
+        .install(&app_state.db, &skill, &app_type)
+        .await
+        .map_err(|e| e.to_string())?;

    Ok(true)
 }

+/// 卸载技能（兼容旧 API）
 #[tauri::command]
-pub fn get_skill_repos(
-    _service: State<'_, SkillServiceState>,
-    app_state: State<'_, AppState>,
-) -> Result<Vec<SkillRepo>, String> {
-    let config = app_state.config.read().map_err(|e| e.to_string())?;
-
-    Ok(config.skills.repos.clone())
+pub fn uninstall_skill(directory: String, app_state: State<'_, AppState>) -> Result<bool, String> {
+    uninstall_skill_for_app("claude".to_string(), directory, app_state)
 }

+/// 卸载指定应用的技能（兼容旧 API）
 #[tauri::command]
-pub fn add_skill_repo(
-    repo: SkillRepo,
-    service: State<'_, SkillServiceState>,
+pub fn uninstall_skill_for_app(
+    app: String,
+    directory: String,
    app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
-    {
-        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
+    let _ = parse_app_type(&app)?; // 验证参数

-        service
-            .0
-            .add_repo(&mut config.skills, repo)
-            .map_err(|e| e.to_string())?;
-    }
+    // 通过 directory 找到对应的 skill id
+    let skills = SkillService::get_all_installed(&app_state.db).map_err(|e| e.to_string())?;

-    app_state.save().map_err(|e| e.to_string())?;
+    let skill = skills
+        .into_iter()
+        .find(|s| s.directory.eq_ignore_ascii_case(&directory))
+        .ok_or_else(|| format!("未找到已安装的 Skill: {directory}"))?;
+
+    SkillService::uninstall(&app_state.db, &skill.id).map_err(|e| e.to_string())?;

    Ok(true)
 }

+// ========== 仓库管理命令 ==========
+
+/// 获取技能仓库列表
+#[tauri::command]
+pub fn get_skill_repos(app_state: State<'_, AppState>) -> Result<Vec<SkillRepo>, String> {
+    app_state.db.get_skill_repos().map_err(|e| e.to_string())
+}
+
+/// 添加技能仓库
+#[tauri::command]
+pub fn add_skill_repo(repo: SkillRepo, app_state: State<'_, AppState>) -> Result<bool, String> {
+    app_state
+        .db
+        .save_skill_repo(&repo)
+        .map_err(|e| e.to_string())?;
+    Ok(true)
+}
+
+/// 删除技能仓库
 #[tauri::command]
 pub fn remove_skill_repo(
    owner: String,
    name: String,
-    service: State<'_, SkillServiceState>,
    app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
-    {
-        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
-
-        service
-            .0
-            .remove_repo(&mut config.skills, owner, name)
-            .map_err(|e| e.to_string())?;
-    }
-
-    app_state.save().map_err(|e| e.to_string())?;
-
+    app_state
+        .db
+        .delete_skill_repo(&owner, &name)
+        .map_err(|e| e.to_string())?;
    Ok(true)
 }
@@ -0,0 +1,106 @@
+//! 流式健康检查命令
+
+use crate::app_config::AppType;
+use crate::error::AppError;
+use crate::services::stream_check::{
+    HealthStatus, StreamCheckConfig, StreamCheckResult, StreamCheckService,
+};
+use crate::store::AppState;
+use std::collections::HashSet;
+use tauri::State;
+
+/// 流式健康检查（单个供应商）
+#[tauri::command]
+pub async fn stream_check_provider(
+    state: State<'_, AppState>,
+    app_type: AppType,
+    provider_id: String,
+) -> Result<StreamCheckResult, AppError> {
+    let config = state.db.get_stream_check_config()?;
+
+    let providers = state.db.get_all_providers(app_type.as_str())?;
+    let provider = providers
+        .get(&provider_id)
+        .ok_or_else(|| AppError::Message(format!("供应商 {provider_id} 不存在")))?;
+
+    let result = StreamCheckService::check_with_retry(&app_type, provider, &config).await?;
+
+    // 记录日志
+    let _ =
+        state
+            .db
+            .save_stream_check_log(&provider_id, &provider.name, app_type.as_str(), &result);
+
+    Ok(result)
+}
+
+/// 批量流式健康检查
+#[tauri::command]
+pub async fn stream_check_all_providers(
+    state: State<'_, AppState>,
+    app_type: AppType,
+    proxy_targets_only: bool,
+) -> Result<Vec<(String, StreamCheckResult)>, AppError> {
+    let config = state.db.get_stream_check_config()?;
+    let providers = state.db.get_all_providers(app_type.as_str())?;
+
+    let mut results = Vec::new();
+    let allowed_ids: Option<HashSet<String>> = if proxy_targets_only {
+        let mut ids = HashSet::new();
+        if let Ok(Some(current_id)) = state.db.get_current_provider(app_type.as_str()) {
+            ids.insert(current_id);
+        }
+        if let Ok(queue) = state.db.get_failover_queue(app_type.as_str()) {
+            for item in queue {
+                ids.insert(item.provider_id);
+            }
+        }
+        Some(ids)
+    } else {
+        None
+    };
+
+    for (id, provider) in providers {
+        if let Some(ids) = &allowed_ids {
+            if !ids.contains(&id) {
+                continue;
+            }
+        }
+
+        let result = StreamCheckService::check_with_retry(&app_type, &provider, &config)
+            .await
+            .unwrap_or_else(|e| StreamCheckResult {
+                status: HealthStatus::Failed,
+                success: false,
+                message: e.to_string(),
+                response_time_ms: None,
+                http_status: None,
+                model_used: String::new(),
+                tested_at: chrono::Utc::now().timestamp(),
+                retry_count: 0,
+            });
+
+        let _ = state
+            .db
+            .save_stream_check_log(&id, &provider.name, app_type.as_str(), &result);
+
+        results.push((id, result));
+    }
+
+    Ok(results)
+}
+
+/// 获取流式检查配置
+#[tauri::command]
+pub fn get_stream_check_config(state: State<'_, AppState>) -> Result<StreamCheckConfig, AppError> {
+    state.db.get_stream_check_config()
+}
+
+/// 保存流式检查配置
+#[tauri::command]
+pub fn save_stream_check_config(
+    state: State<'_, AppState>,
+    config: StreamCheckConfig,
+) -> Result<(), AppError> {
+    state.db.save_stream_check_config(&config)
+}
@@ -0,0 +1,179 @@
+//! 使用统计相关命令
+
+use crate::error::AppError;
+use crate::services::usage_stats::*;
+use crate::store::AppState;
+use tauri::State;
+
+/// 获取使用量汇总
+#[tauri::command]
+pub fn get_usage_summary(
+    state: State<'_, AppState>,
+    start_date: Option<i64>,
+    end_date: Option<i64>,
+) -> Result<UsageSummary, AppError> {
+    state.db.get_usage_summary(start_date, end_date)
+}
+
+/// 获取每日趋势
+#[tauri::command]
+pub fn get_usage_trends(
+    state: State<'_, AppState>,
+    start_date: Option<i64>,
+    end_date: Option<i64>,
+) -> Result<Vec<DailyStats>, AppError> {
+    state.db.get_daily_trends(start_date, end_date)
+}
+
+/// 获取 Provider 统计
+#[tauri::command]
+pub fn get_provider_stats(state: State<'_, AppState>) -> Result<Vec<ProviderStats>, AppError> {
+    state.db.get_provider_stats()
+}
+
+/// 获取模型统计
+#[tauri::command]
+pub fn get_model_stats(state: State<'_, AppState>) -> Result<Vec<ModelStats>, AppError> {
+    state.db.get_model_stats()
+}
+
+/// 获取请求日志列表
+#[tauri::command]
+pub fn get_request_logs(
+    state: State<'_, AppState>,
+    filters: LogFilters,
+    page: u32,
+    page_size: u32,
+) -> Result<PaginatedLogs, AppError> {
+    state.db.get_request_logs(&filters, page, page_size)
+}
+
+/// 获取单个请求详情
+#[tauri::command]
+pub fn get_request_detail(
+    state: State<'_, AppState>,
+    request_id: String,
+) -> Result<Option<RequestLogDetail>, AppError> {
+    state.db.get_request_detail(&request_id)
+}
+
+/// 获取模型定价列表
+#[tauri::command]
+pub fn get_model_pricing(state: State<'_, AppState>) -> Result<Vec<ModelPricingInfo>, AppError> {
+    log::info!("获取模型定价列表");
+    state.db.ensure_model_pricing_seeded()?;
+
+    let db = state.db.clone();
+    let conn = crate::database::lock_conn!(db.conn);
+
+    // 检查表是否存在
+    let table_exists: bool = conn
+        .query_row(
+            "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='model_pricing'",
+            [],
+            |row| row.get::<_, i64>(0).map(|count| count > 0),
+        )
+        .unwrap_or(false);
+
+    if !table_exists {
+        log::error!("model_pricing 表不存在,可能需要重启应用以触发数据库迁移");
+        return Ok(Vec::new());
+    }
+
+    let mut stmt = conn.prepare(
+        "SELECT model_id, display_name, input_cost_per_million, output_cost_per_million,
+                cache_read_cost_per_million, cache_creation_cost_per_million
+         FROM model_pricing
+         ORDER BY display_name",
+    )?;
+
+    let rows = stmt.query_map([], |row| {
+        Ok(ModelPricingInfo {
+            model_id: row.get(0)?,
+            display_name: row.get(1)?,
+            input_cost_per_million: row.get(2)?,
+            output_cost_per_million: row.get(3)?,
+            cache_read_cost_per_million: row.get(4)?,
+            cache_creation_cost_per_million: row.get(5)?,
+        })
+    })?;
+
+    let mut pricing = Vec::new();
+    for row in rows {
+        pricing.push(row?);
+    }
+
+    log::info!("成功获取 {} 条模型定价数据", pricing.len());
+    Ok(pricing)
+}
+
+/// 更新模型定价
+#[tauri::command]
+pub fn update_model_pricing(
+    state: State<'_, AppState>,
+    model_id: String,
+    display_name: String,
+    input_cost: String,
+    output_cost: String,
+    cache_read_cost: String,
+    cache_creation_cost: String,
+) -> Result<(), AppError> {
+    let db = state.db.clone();
+    let conn = crate::database::lock_conn!(db.conn);
+
+    conn.execute(
+        "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 (?1, ?2, ?3, ?4, ?5, ?6)",
+        rusqlite::params![
+            model_id,
+            display_name,
+            input_cost,
+            output_cost,
+            cache_read_cost,
+            cache_creation_cost
+        ],
+    )
+    .map_err(|e| AppError::Database(format!("更新模型定价失败: {e}")))?;
+
+    Ok(())
+}
+
+/// 检查 Provider 使用限额
+#[tauri::command]
+pub fn check_provider_limits(
+    state: State<'_, AppState>,
+    provider_id: String,
+    app_type: String,
+) -> Result<crate::services::usage_stats::ProviderLimitStatus, AppError> {
+    state.db.check_provider_limits(&provider_id, &app_type)
+}
+
+/// 删除模型定价
+#[tauri::command]
+pub fn delete_model_pricing(state: State<'_, AppState>, model_id: String) -> Result<(), AppError> {
+    let db = state.db.clone();
+    let conn = crate::database::lock_conn!(db.conn);
+
+    conn.execute(
+        "DELETE FROM model_pricing WHERE model_id = ?1",
+        rusqlite::params![model_id],
+    )
+    .map_err(|e| AppError::Database(format!("删除模型定价失败: {e}")))?;
+
+    log::info!("已删除模型定价: {model_id}");
+    Ok(())
+}
+
+/// 模型定价信息
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelPricingInfo {
+    pub model_id: String,
+    pub display_name: String,
+    pub input_cost_per_million: String,
+    pub output_cost_per_million: String,
+    pub cache_read_cost_per_million: String,
+    pub cache_creation_cost_per_million: String,
+}
@@ -79,6 +79,7 @@ pub fn get_app_config_path() -> PathBuf {
 }

 /// 清理供应商名称，确保文件名安全
+#[allow(dead_code)]
 pub fn sanitize_provider_name(name: &str) -> String {
    name.chars()
        .map(|c| match c {
@@ -90,6 +91,7 @@ pub fn sanitize_provider_name(name: &str) -> String {
 }

 /// 获取供应商配置文件路径
+#[allow(dead_code)]
 pub fn get_provider_config_path(provider_id: &str, provider_name: Option<&str>) -> PathBuf {
    let base_name = provider_name
        .map(sanitize_provider_name)
@@ -0,0 +1,325 @@
+//! 数据库备份和恢复
+//!
+//! 提供 SQL 导出/导入和二进制快照备份功能。
+
+use super::{lock_conn, Database, DB_BACKUP_RETAIN};
+use crate::config::get_app_config_dir;
+use crate::error::AppError;
+use chrono::Utc;
+use rusqlite::backup::Backup;
+use rusqlite::types::ValueRef;
+use rusqlite::Connection;
+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> {
+        let snapshot = self.snapshot_to_memory()?;
+        let dump = Self::dump_sql(&snapshot)?;
+
+        if let Some(parent) = target_path.parent() {
+            fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
+        }
+
+        crate::config::atomic_write(target_path, dump.as_bytes())
+    }
+
+    /// 从 SQL 文件导入，返回生成的备份 ID（若无备份则为空字符串）
+    pub fn import_sql(&self, source_path: &Path) -> Result<String, AppError> {
+        if !source_path.exists() {
+            return Err(AppError::InvalidInput(format!(
+                "SQL 文件不存在: {}",
+                source_path.display()
+            )));
+        }
+
+        let sql_raw = fs::read_to_string(source_path).map_err(|e| AppError::io(source_path, e))?;
+        let sql_content = sql_raw.trim_start_matches('\u{feff}');
+        Self::validate_cc_switch_sql_export(sql_content)?;
+
+        // 导入前备份现有数据库
+        let backup_path = self.backup_database_file()?;
+
+        // 在临时数据库执行导入，确保失败不会污染主库
+        let temp_file = NamedTempFile::new().map_err(|e| AppError::IoContext {
+            context: "创建临时数据库文件失败".to_string(),
+            source: e,
+        })?;
+        let temp_path = temp_file.path().to_path_buf();
+        let temp_conn =
+            Connection::open(&temp_path).map_err(|e| AppError::Database(e.to_string()))?;
+
+        temp_conn
+            .execute_batch(sql_content)
+            .map_err(|e| AppError::Database(format!("执行 SQL 导入失败: {e}")))?;
+
+        // 补齐缺失表/索引并进行基础校验
+        Self::create_tables_on_conn(&temp_conn)?;
+        Self::apply_schema_migrations_on_conn(&temp_conn)?;
+        Self::validate_basic_state(&temp_conn)?;
+
+        // 使用 Backup 将临时库原子写回主库
+        {
+            let mut main_conn = lock_conn!(self.conn);
+            let backup = Backup::new(&temp_conn, &mut main_conn)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+            backup
+                .step(-1)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+        }
+
+        let backup_id = backup_path
+            .and_then(|p| p.file_stem().map(|s| s.to_string_lossy().to_string()))
+            .unwrap_or_default();
+
+        Ok(backup_id)
+    }
+
+    /// 创建内存快照以避免长时间持有数据库锁
+    pub(crate) fn snapshot_to_memory(&self) -> Result<Connection, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut snapshot =
+            Connection::open_in_memory().map_err(|e| AppError::Database(e.to_string()))?;
+
+        {
+            let backup =
+                Backup::new(&conn, &mut snapshot).map_err(|e| AppError::Database(e.to_string()))?;
+            backup
+                .step(-1)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+        }
+
+        Ok(snapshot)
+    }
+
+    fn validate_cc_switch_sql_export(sql: &str) -> Result<(), AppError> {
+        let trimmed = sql.trim_start();
+        if trimmed.starts_with(CC_SWITCH_SQL_EXPORT_HEADER) {
+            return Ok(());
+        }
+
+        Err(AppError::localized(
+            "backup.sql.invalid_format",
+            "仅支持导入由 CC Switch 导出的 SQL 备份文件。",
+            "Only SQL backups exported by CC Switch are supported.",
+        ))
+    }
+
+    /// 生成一致性快照备份，返回备份文件路径（不存在主库时返回 None）
+    fn backup_database_file(&self) -> Result<Option<PathBuf>, AppError> {
+        let db_path = get_app_config_dir().join("cc-switch.db");
+        if !db_path.exists() {
+            return Ok(None);
+        }
+
+        let backup_dir = db_path
+            .parent()
+            .ok_or_else(|| AppError::Config("无效的数据库路径".to_string()))?
+            .join("backups");
+
+        fs::create_dir_all(&backup_dir).map_err(|e| AppError::io(&backup_dir, e))?;
+
+        let base_id = format!("db_backup_{}", Utc::now().format("%Y%m%d_%H%M%S"));
+        let mut backup_id = base_id.clone();
+        let mut backup_path = backup_dir.join(format!("{backup_id}.db"));
+        let mut counter = 1;
+        while backup_path.exists() {
+            backup_id = format!("{base_id}_{counter}");
+            backup_path = backup_dir.join(format!("{backup_id}.db"));
+            counter += 1;
+        }
+
+        {
+            let conn = lock_conn!(self.conn);
+            let mut dest_conn =
+                Connection::open(&backup_path).map_err(|e| AppError::Database(e.to_string()))?;
+            let backup = Backup::new(&conn, &mut dest_conn)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+            backup
+                .step(-1)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+        }
+
+        Self::cleanup_db_backups(&backup_dir)?;
+        Ok(Some(backup_path))
+    }
+
+    /// 清理旧的数据库备份，保留最新的 N 个
+    fn cleanup_db_backups(dir: &Path) -> Result<(), AppError> {
+        let entries = match fs::read_dir(dir) {
+            Ok(iter) => iter
+                .filter_map(|entry| entry.ok())
+                .filter(|entry| {
+                    entry
+                        .path()
+                        .extension()
+                        .map(|ext| ext == "db")
+                        .unwrap_or(false)
+                })
+                .collect::<Vec<_>>(),
+            Err(_) => return Ok(()),
+        };
+
+        if entries.len() <= DB_BACKUP_RETAIN {
+            return Ok(());
+        }
+
+        let remove_count = entries.len().saturating_sub(DB_BACKUP_RETAIN);
+        let mut sorted = entries;
+        sorted.sort_by_key(|entry| entry.metadata().and_then(|m| m.modified()).ok());
+
+        for entry in sorted.into_iter().take(remove_count) {
+            if let Err(err) = fs::remove_file(entry.path()) {
+                log::warn!("删除旧数据库备份失败 {}: {}", entry.path().display(), err);
+            }
+        }
+        Ok(())
+    }
+
+    /// 基础状态校验
+    fn validate_basic_state(conn: &Connection) -> Result<(), AppError> {
+        let provider_count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM providers", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        let mcp_count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM mcp_servers", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        if provider_count == 0 && mcp_count == 0 {
+            return Err(AppError::Config(
+                "导入的 SQL 未包含有效的供应商或 MCP 数据".to_string(),
+            ));
+        }
+        Ok(())
+    }
+
+    /// 导出数据库为 SQL 文本
+    fn dump_sql(conn: &Connection) -> Result<String, AppError> {
+        let mut output = String::new();
+        let timestamp = Utc::now().format("%Y-%m-%d %H:%M:%S").to_string();
+        let user_version: i64 = conn
+            .query_row("PRAGMA user_version;", [], |row| row.get(0))
+            .unwrap_or(0);
+
+        output.push_str(&format!(
+            "-- CC Switch SQLite 导出\n-- 生成时间: {timestamp}\n-- user_version: {user_version}\n"
+        ));
+        output.push_str("PRAGMA foreign_keys=OFF;\n");
+        output.push_str(&format!("PRAGMA user_version={user_version};\n"));
+        output.push_str("BEGIN TRANSACTION;\n");
+
+        // 导出 schema
+        let mut stmt = conn
+            .prepare(
+                "SELECT type, name, tbl_name, sql
+                 FROM sqlite_master
+                 WHERE sql NOT NULL AND type IN ('table','index','trigger','view')
+                 ORDER BY type='table' DESC, name",
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut tables = Vec::new();
+        let mut rows = stmt
+            .query([])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        while let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
+            let obj_type: String = row.get(0).map_err(|e| AppError::Database(e.to_string()))?;
+            let name: String = row.get(1).map_err(|e| AppError::Database(e.to_string()))?;
+            let sql: String = row.get(3).map_err(|e| AppError::Database(e.to_string()))?;
+
+            // 跳过 SQLite 内部对象（如 sqlite_sequence）
+            if name.starts_with("sqlite_") {
+                continue;
+            }
+
+            output.push_str(&sql);
+            output.push_str(";\n");
+
+            if obj_type == "table" && !name.starts_with("sqlite_") {
+                tables.push(name);
+            }
+        }
+
+        // 导出数据
+        for table in tables {
+            let columns = Self::get_table_columns(conn, &table)?;
+            if columns.is_empty() {
+                continue;
+            }
+
+            let mut stmt = conn
+                .prepare(&format!("SELECT * FROM \"{table}\""))
+                .map_err(|e| AppError::Database(e.to_string()))?;
+            let mut rows = stmt
+                .query([])
+                .map_err(|e| AppError::Database(e.to_string()))?;
+
+            while let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
+                let mut values = Vec::with_capacity(columns.len());
+                for idx in 0..columns.len() {
+                    let value = row
+                        .get_ref(idx)
+                        .map_err(|e| AppError::Database(e.to_string()))?;
+                    values.push(Self::format_sql_value(value)?);
+                }
+
+                let cols = columns
+                    .iter()
+                    .map(|c| format!("\"{c}\""))
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                output.push_str(&format!(
+                    "INSERT INTO \"{table}\" ({cols}) VALUES ({});\n",
+                    values.join(", ")
+                ));
+            }
+        }
+
+        output.push_str("COMMIT;\nPRAGMA foreign_keys=ON;\n");
+        Ok(output)
+    }
+
+    /// 获取表的列名列表
+    fn get_table_columns(conn: &Connection, table: &str) -> Result<Vec<String>, AppError> {
+        let mut stmt = conn
+            .prepare(&format!("PRAGMA table_info(\"{table}\")"))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        let iter = stmt
+            .query_map([], |row| row.get::<_, String>(1))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut columns = Vec::new();
+        for col in iter {
+            columns.push(col.map_err(|e| AppError::Database(e.to_string()))?);
+        }
+        Ok(columns)
+    }
+
+    /// 格式化 SQL 值
+    fn format_sql_value(value: ValueRef<'_>) -> Result<String, AppError> {
+        match value {
+            ValueRef::Null => Ok("NULL".to_string()),
+            ValueRef::Integer(i) => Ok(i.to_string()),
+            ValueRef::Real(f) => Ok(f.to_string()),
+            ValueRef::Text(t) => {
+                let text = std::str::from_utf8(t)
+                    .map_err(|e| AppError::Database(format!("文本字段不是有效的 UTF-8: {e}")))?;
+                let escaped = text.replace('\'', "''");
+                Ok(format!("'{escaped}'"))
+            }
+            ValueRef::Blob(bytes) => {
+                let mut s = String::from("X'");
+                for b in bytes {
+                    use std::fmt::Write;
+                    let _ = write!(&mut s, "{b:02X}");
+                }
+                s.push('\'');
+                Ok(s)
+            }
+        }
+    }
+}
@@ -0,0 +1,146 @@
+//! 故障转移队列 DAO
+//!
+//! 管理代理模式下的故障转移队列（基于 providers 表的 in_failover_queue 字段）
+
+use crate::database::{lock_conn, Database};
+use crate::error::AppError;
+use crate::provider::Provider;
+use serde::{Deserialize, Serialize};
+
+/// 故障转移队列条目（简化版，用于前端展示）
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FailoverQueueItem {
+    pub provider_id: String,
+    pub provider_name: String,
+    pub sort_index: Option<usize>,
+}
+
+impl Database {
+    /// 获取故障转移队列（按 sort_index 排序）
+    pub fn get_failover_queue(&self, app_type: &str) -> Result<Vec<FailoverQueueItem>, AppError> {
+        let conn = lock_conn!(self.conn);
+
+        let mut stmt = conn
+            .prepare(
+                "SELECT id, name, sort_index
+                 FROM providers
+                 WHERE app_type = ?1 AND in_failover_queue = 1
+                 ORDER BY COALESCE(sort_index, 999999), id ASC",
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let items = stmt
+            .query_map([app_type], |row| {
+                Ok(FailoverQueueItem {
+                    provider_id: row.get(0)?,
+                    provider_name: row.get(1)?,
+                    sort_index: row.get(2)?,
+                })
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(items)
+    }
+
+    /// 获取故障转移队列中的供应商（完整 Provider 信息，按顺序）
+    pub fn get_failover_providers(&self, app_type: &str) -> Result<Vec<Provider>, AppError> {
+        let all_providers = self.get_all_providers(app_type)?;
+
+        let result: Vec<Provider> = all_providers
+            .into_values()
+            .filter(|p| p.in_failover_queue)
+            .collect();
+
+        Ok(result)
+    }
+
+    /// 添加供应商到故障转移队列
+    pub fn add_to_failover_queue(&self, app_type: &str, provider_id: &str) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        conn.execute(
+            "UPDATE providers SET in_failover_queue = 1 WHERE id = ?1 AND app_type = ?2",
+            rusqlite::params![provider_id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// 从故障转移队列中移除供应商
+    pub fn remove_from_failover_queue(
+        &self,
+        app_type: &str,
+        provider_id: &str,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        // 1. 从队列中移除
+        conn.execute(
+            "UPDATE providers SET in_failover_queue = 0 WHERE id = ?1 AND app_type = ?2",
+            rusqlite::params![provider_id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 2. 清除该供应商的健康状态（退出队列后不再需要健康监控）
+        conn.execute(
+            "DELETE FROM provider_health WHERE provider_id = ?1 AND app_type = ?2",
+            rusqlite::params![provider_id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        log::info!("已从故障转移队列移除供应商 {provider_id} ({app_type}), 并清除其健康状态");
+
+        Ok(())
+    }
+
+    /// 清空故障转移队列
+    pub fn clear_failover_queue(&self, app_type: &str) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        conn.execute(
+            "UPDATE providers SET in_failover_queue = 0 WHERE app_type = ?1",
+            [app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// 检查供应商是否在故障转移队列中
+    pub fn is_in_failover_queue(
+        &self,
+        app_type: &str,
+        provider_id: &str,
+    ) -> Result<bool, AppError> {
+        let conn = lock_conn!(self.conn);
+
+        let in_queue: bool = conn
+            .query_row(
+                "SELECT in_failover_queue FROM providers WHERE id = ?1 AND app_type = ?2",
+                rusqlite::params![provider_id, app_type],
+                |row| row.get(0),
+            )
+            .unwrap_or(false);
+
+        Ok(in_queue)
+    }
+
+    /// 获取可添加到故障转移队列的供应商（不在队列中的）
+    pub fn get_available_providers_for_failover(
+        &self,
+        app_type: &str,
+    ) -> Result<Vec<Provider>, AppError> {
+        let all_providers = self.get_all_providers(app_type)?;
+
+        let available: Vec<Provider> = all_providers
+            .into_values()
+            .filter(|p| !p.in_failover_queue)
+            .collect();
+
+        Ok(available)
+    }
+}
@@ -0,0 +1,97 @@
+//! MCP 服务器数据访问对象
+//!
+//! 提供 MCP 服务器的 CRUD 操作。
+
+use crate::app_config::{McpApps, McpServer};
+use crate::database::{lock_conn, Database};
+use crate::error::AppError;
+use indexmap::IndexMap;
+use rusqlite::params;
+
+impl Database {
+    /// 获取所有 MCP 服务器
+    pub fn get_all_mcp_servers(&self) -> Result<IndexMap<String, McpServer>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn.prepare(
+            "SELECT id, name, server_config, description, homepage, docs, tags, enabled_claude, enabled_codex, enabled_gemini
+             FROM mcp_servers
+             ORDER BY name ASC, id ASC"
+        ).map_err(|e| AppError::Database(e.to_string()))?;
+
+        let server_iter = stmt
+            .query_map([], |row| {
+                let id: String = row.get(0)?;
+                let name: String = row.get(1)?;
+                let server_config_str: String = row.get(2)?;
+                let description: Option<String> = row.get(3)?;
+                let homepage: Option<String> = row.get(4)?;
+                let docs: Option<String> = row.get(5)?;
+                let tags_str: String = row.get(6)?;
+                let enabled_claude: bool = row.get(7)?;
+                let enabled_codex: bool = row.get(8)?;
+                let enabled_gemini: bool = row.get(9)?;
+
+                let server = serde_json::from_str(&server_config_str).unwrap_or_default();
+                let tags = serde_json::from_str(&tags_str).unwrap_or_default();
+
+                Ok((
+                    id.clone(),
+                    McpServer {
+                        id,
+                        name,
+                        server,
+                        apps: McpApps {
+                            claude: enabled_claude,
+                            codex: enabled_codex,
+                            gemini: enabled_gemini,
+                        },
+                        description,
+                        homepage,
+                        docs,
+                        tags,
+                    },
+                ))
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut servers = IndexMap::new();
+        for server_res in server_iter {
+            let (id, server) = server_res.map_err(|e| AppError::Database(e.to_string()))?;
+            servers.insert(id, server);
+        }
+        Ok(servers)
+    }
+
+    /// 保存 MCP 服务器
+    pub fn save_mcp_server(&self, server: &McpServer) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "INSERT OR REPLACE INTO mcp_servers (
+                id, name, server_config, description, homepage, docs, tags,
+                enabled_claude, enabled_codex, enabled_gemini
+            ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)",
+            params![
+                server.id,
+                server.name,
+                serde_json::to_string(&server.server).unwrap(),
+                server.description,
+                server.homepage,
+                server.docs,
+                serde_json::to_string(&server.tags).unwrap(),
+                server.apps.claude,
+                server.apps.codex,
+                server.apps.gemini,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 删除 MCP 服务器
+    pub fn delete_mcp_server(&self, id: &str) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute("DELETE FROM mcp_servers WHERE id = ?1", params![id])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+}
@@ -0,0 +1,17 @@
+//! Data Access Object layer
+//!
+//! Database access operations for each domain
+
+pub mod failover;
+pub mod mcp;
+pub mod prompts;
+pub mod providers;
+pub mod proxy;
+pub mod settings;
+pub mod skills;
+pub mod stream_check;
+pub mod universal_providers;
+
+// 所有 DAO 方法都通过 Database impl 提供，无需单独导出
+// 导出 FailoverQueueItem 供外部使用
+pub use failover::FailoverQueueItem;
@@ -0,0 +1,88 @@
+//! 提示词数据访问对象
+//!
+//! 提供提示词（Prompt）的 CRUD 操作。
+
+use crate::database::{lock_conn, Database};
+use crate::error::AppError;
+use crate::prompt::Prompt;
+use indexmap::IndexMap;
+use rusqlite::params;
+
+impl Database {
+    /// 获取指定应用类型的所有提示词
+    pub fn get_prompts(&self, app_type: &str) -> Result<IndexMap<String, Prompt>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn
+            .prepare(
+                "SELECT id, name, content, description, enabled, created_at, updated_at
+             FROM prompts WHERE app_type = ?1
+             ORDER BY created_at ASC, id ASC",
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let prompt_iter = stmt
+            .query_map(params![app_type], |row| {
+                let id: String = row.get(0)?;
+                let name: String = row.get(1)?;
+                let content: String = row.get(2)?;
+                let description: Option<String> = row.get(3)?;
+                let enabled: bool = row.get(4)?;
+                let created_at: Option<i64> = row.get(5)?;
+                let updated_at: Option<i64> = row.get(6)?;
+
+                Ok((
+                    id.clone(),
+                    Prompt {
+                        id,
+                        name,
+                        content,
+                        description,
+                        enabled,
+                        created_at,
+                        updated_at,
+                    },
+                ))
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut prompts = IndexMap::new();
+        for prompt_res in prompt_iter {
+            let (id, prompt) = prompt_res.map_err(|e| AppError::Database(e.to_string()))?;
+            prompts.insert(id, prompt);
+        }
+        Ok(prompts)
+    }
+
+    /// 保存提示词
+    pub fn save_prompt(&self, app_type: &str, prompt: &Prompt) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "INSERT OR REPLACE INTO prompts (
+                id, app_type, name, content, description, enabled, created_at, updated_at
+            ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)",
+            params![
+                prompt.id,
+                app_type,
+                prompt.name,
+                prompt.content,
+                prompt.description,
+                prompt.enabled,
+                prompt.created_at,
+                prompt.updated_at,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 删除提示词
+    pub fn delete_prompt(&self, app_type: &str, id: &str) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "DELETE FROM prompts WHERE id = ?1 AND app_type = ?2",
+            params![id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+}
@@ -0,0 +1,367 @@
+//! 供应商数据访问对象
+//!
+//! 提供供应商（Provider）的 CRUD 操作。
+
+use crate::database::{lock_conn, Database};
+use crate::error::AppError;
+use crate::provider::{Provider, ProviderMeta};
+use indexmap::IndexMap;
+use rusqlite::params;
+use std::collections::HashMap;
+
+impl Database {
+    /// 获取指定应用类型的所有供应商
+    pub fn get_all_providers(
+        &self,
+        app_type: &str,
+    ) -> Result<IndexMap<String, Provider>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn.prepare(
+            "SELECT id, name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta, 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()))?;
+
+        let provider_iter = stmt
+            .query_map(params![app_type], |row| {
+                let id: String = row.get(0)?;
+                let name: String = row.get(1)?;
+                let settings_config_str: String = row.get(2)?;
+                let website_url: Option<String> = row.get(3)?;
+                let category: Option<String> = row.get(4)?;
+                let created_at: Option<i64> = row.get(5)?;
+                let sort_index: Option<usize> = row.get(6)?;
+                let notes: Option<String> = row.get(7)?;
+                let icon: Option<String> = row.get(8)?;
+                let icon_color: Option<String> = row.get(9)?;
+                let meta_str: String = row.get(10)?;
+                let in_failover_queue: bool = row.get(11)?;
+
+                let settings_config =
+                    serde_json::from_str(&settings_config_str).unwrap_or(serde_json::Value::Null);
+                let meta: ProviderMeta = serde_json::from_str(&meta_str).unwrap_or_default();
+
+                Ok((
+                    id,
+                    Provider {
+                        id: "".to_string(), // Placeholder, set below
+                        name,
+                        settings_config,
+                        website_url,
+                        category,
+                        created_at,
+                        sort_index,
+                        notes,
+                        meta: Some(meta),
+                        icon,
+                        icon_color,
+                        in_failover_queue,
+                    },
+                ))
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut providers = IndexMap::new();
+        for provider_res in provider_iter {
+            let (id, mut provider) = provider_res.map_err(|e| AppError::Database(e.to_string()))?;
+            provider.id = id.clone();
+
+            // 加载 endpoints
+            let mut stmt_endpoints = conn.prepare(
+                "SELECT url, added_at FROM provider_endpoints WHERE provider_id = ?1 AND app_type = ?2 ORDER BY added_at ASC, url ASC"
+            ).map_err(|e| AppError::Database(e.to_string()))?;
+
+            let endpoints_iter = stmt_endpoints
+                .query_map(params![id, app_type], |row| {
+                    let url: String = row.get(0)?;
+                    let added_at: Option<i64> = row.get(1)?;
+                    Ok((
+                        url,
+                        crate::settings::CustomEndpoint {
+                            url: "".to_string(),
+                            added_at: added_at.unwrap_or(0),
+                            last_used: None,
+                        },
+                    ))
+                })
+                .map_err(|e| AppError::Database(e.to_string()))?;
+
+            let mut custom_endpoints = HashMap::new();
+            for ep_res in endpoints_iter {
+                let (url, mut ep) = ep_res.map_err(|e| AppError::Database(e.to_string()))?;
+                ep.url = url.clone();
+                custom_endpoints.insert(url, ep);
+            }
+
+            if let Some(meta) = &mut provider.meta {
+                meta.custom_endpoints = custom_endpoints;
+            }
+
+            providers.insert(id, provider);
+        }
+
+        Ok(providers)
+    }
+
+    /// 获取当前激活的供应商 ID
+    pub fn get_current_provider(&self, app_type: &str) -> Result<Option<String>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn
+            .prepare("SELECT id FROM providers WHERE app_type = ?1 AND is_current = 1 LIMIT 1")
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut rows = stmt
+            .query(params![app_type])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        if let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
+            Ok(Some(
+                row.get(0).map_err(|e| AppError::Database(e.to_string()))?,
+            ))
+        } else {
+            Ok(None)
+        }
+    }
+
+    /// 根据 ID 获取单个供应商
+    pub fn get_provider_by_id(
+        &self,
+        id: &str,
+        app_type: &str,
+    ) -> Result<Option<Provider>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let result = conn.query_row(
+            "SELECT name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta, in_failover_queue
+             FROM providers WHERE id = ?1 AND app_type = ?2",
+            params![id, app_type],
+            |row| {
+                let name: String = row.get(0)?;
+                let settings_config_str: String = row.get(1)?;
+                let website_url: Option<String> = row.get(2)?;
+                let category: Option<String> = row.get(3)?;
+                let created_at: Option<i64> = row.get(4)?;
+                let sort_index: Option<usize> = row.get(5)?;
+                let notes: Option<String> = row.get(6)?;
+                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();
+
+                Ok(Provider {
+                    id: id.to_string(),
+                    name,
+                    settings_config,
+                    website_url,
+                    category,
+                    created_at,
+                    sort_index,
+                    notes,
+                    meta: Some(meta),
+                    icon,
+                    icon_color,
+                    in_failover_queue,
+                })
+            },
+        );
+
+        match result {
+            Ok(provider) => Ok(Some(provider)),
+            Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None),
+            Err(e) => Err(AppError::Database(e.to_string())),
+        }
+    }
+
+    /// 保存供应商（新增或更新）
+    ///
+    /// 注意：更新模式下不同步 endpoints，因为编辑模式下端点通过单独的 API 管理
+    /// （add_custom_endpoint / remove_custom_endpoint），避免覆盖用户的修改。
+    pub fn save_provider(&self, app_type: &str, provider: &Provider) -> Result<(), AppError> {
+        let mut conn = lock_conn!(self.conn);
+        let tx = conn
+            .transaction()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 处理 meta：取出 endpoints 以便单独处理
+        let mut meta_clone = provider.meta.clone().unwrap_or_default();
+        let endpoints = std::mem::take(&mut meta_clone.custom_endpoints);
+
+        // 检查是否存在（用于判断新增/更新，以及保留 is_current 和 in_failover_queue）
+        let existing: Option<(bool, bool)> = tx
+            .query_row(
+                "SELECT is_current, in_failover_queue FROM providers WHERE id = ?1 AND app_type = ?2",
+                params![provider.id, app_type],
+                |row| Ok((row.get(0)?, row.get(1)?)),
+            )
+            .ok();
+
+        let is_update = existing.is_some();
+        let (is_current, in_failover_queue) =
+            existing.unwrap_or((false, provider.in_failover_queue));
+
+        if is_update {
+            // 更新模式：使用 UPDATE 避免触发 ON DELETE CASCADE
+            tx.execute(
+                "UPDATE providers SET
+                    name = ?1,
+                    settings_config = ?2,
+                    website_url = ?3,
+                    category = ?4,
+                    created_at = ?5,
+                    sort_index = ?6,
+                    notes = ?7,
+                    icon = ?8,
+                    icon_color = ?9,
+                    meta = ?10,
+                    is_current = ?11,
+                    in_failover_queue = ?12
+                WHERE id = ?13 AND app_type = ?14",
+                params![
+                    provider.name,
+                    serde_json::to_string(&provider.settings_config).unwrap(),
+                    provider.website_url,
+                    provider.category,
+                    provider.created_at,
+                    provider.sort_index,
+                    provider.notes,
+                    provider.icon,
+                    provider.icon_color,
+                    serde_json::to_string(&meta_clone).unwrap(),
+                    is_current,
+                    in_failover_queue,
+                    provider.id,
+                    app_type,
+                ],
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        } else {
+            // 新增模式：使用 INSERT
+            tx.execute(
+                "INSERT INTO providers (
+                    id, app_type, name, settings_config, website_url, category,
+                    created_at, sort_index, notes, icon, icon_color, meta, is_current, in_failover_queue
+                ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14)",
+                params![
+                    provider.id,
+                    app_type,
+                    provider.name,
+                    serde_json::to_string(&provider.settings_config).unwrap(),
+                    provider.website_url,
+                    provider.category,
+                    provider.created_at,
+                    provider.sort_index,
+                    provider.notes,
+                    provider.icon,
+                    provider.icon_color,
+                    serde_json::to_string(&meta_clone).unwrap(),
+                    is_current,
+                    in_failover_queue,
+                ],
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+            // 只有新增时才同步 endpoints
+            for (url, endpoint) in endpoints {
+                tx.execute(
+                    "INSERT INTO provider_endpoints (provider_id, app_type, url, added_at)
+                     VALUES (?1, ?2, ?3, ?4)",
+                    params![provider.id, app_type, url, endpoint.added_at],
+                )
+                .map_err(|e| AppError::Database(e.to_string()))?;
+            }
+        }
+
+        tx.commit().map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 删除供应商
+    pub fn delete_provider(&self, app_type: &str, id: &str) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "DELETE FROM providers WHERE id = ?1 AND app_type = ?2",
+            params![id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 设置当前供应商
+    pub fn set_current_provider(&self, app_type: &str, id: &str) -> Result<(), AppError> {
+        let mut conn = lock_conn!(self.conn);
+        let tx = conn
+            .transaction()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 重置所有为 0
+        tx.execute(
+            "UPDATE providers SET is_current = 0 WHERE app_type = ?1",
+            params![app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 设置新的当前供应商
+        tx.execute(
+            "UPDATE providers SET is_current = 1 WHERE id = ?1 AND app_type = ?2",
+            params![id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        tx.commit().map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 更新供应商的 settings_config（仅更新配置，不改变其他字段）
+    pub fn update_provider_settings_config(
+        &self,
+        app_type: &str,
+        provider_id: &str,
+        settings_config: &serde_json::Value,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "UPDATE providers SET settings_config = ?1 WHERE id = ?2 AND app_type = ?3",
+            params![
+                serde_json::to_string(settings_config).unwrap(),
+                provider_id,
+                app_type
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 添加自定义端点
+    pub fn add_custom_endpoint(
+        &self,
+        app_type: &str,
+        provider_id: &str,
+        url: &str,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        let added_at = chrono::Utc::now().timestamp_millis();
+        conn.execute(
+            "INSERT INTO provider_endpoints (provider_id, app_type, url, added_at) VALUES (?1, ?2, ?3, ?4)",
+            params![provider_id, app_type, url, added_at],
+        ).map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 移除自定义端点
+    pub fn remove_custom_endpoint(
+        &self,
+        app_type: &str,
+        provider_id: &str,
+        url: &str,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "DELETE FROM provider_endpoints WHERE provider_id = ?1 AND app_type = ?2 AND url = ?3",
+            params![provider_id, app_type, url],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+}
@@ -0,0 +1,617 @@
+//! 代理功能数据访问层
+//!
+//! 处理代理配置、Provider健康状态和使用统计的数据库操作
+
+use crate::error::AppError;
+use crate::proxy::types::*;
+
+use super::super::{lock_conn, Database};
+
+impl Database {
+    // ==================== Global Proxy Config ====================
+
+    /// 获取全局代理配置（统一字段）
+    ///
+    /// 从 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 proxy_enabled, listen_address, listen_port, enable_logging
+                 FROM proxy_config WHERE app_type = 'claude'",
+                [],
+                |row| {
+                    Ok(GlobalProxyConfig {
+                        proxy_enabled: row.get::<_, i32>(0)? != 0,
+                        listen_address: row.get(1)?,
+                        listen_port: row.get::<_, i32>(2)? as u16,
+                        enable_logging: row.get::<_, i32>(3)? != 0,
+                    })
+                },
+            )
+        };
+        // conn 已在 block 结束时释放
+
+        match result {
+            Ok(config) => Ok(config),
+            Err(rusqlite::Error::QueryReturnedNoRows) => {
+                // 如果不存在，创建默认配置
+                self.init_proxy_config_rows().await?;
+                Ok(GlobalProxyConfig {
+                    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_global_proxy_config(
+        &self,
+        config: GlobalProxyConfig,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        conn.execute(
+            "UPDATE proxy_config SET
+                proxy_enabled = ?1,
+                listen_address = ?2,
+                listen_port = ?3,
+                enable_logging = ?4,
+                updated_at = datetime('now')",
+            rusqlite::params![
+                if config.proxy_enabled { 1 } else { 0 },
+                config.listen_address,
+                config.listen_port as i32,
+                if config.enable_logging { 1 } else { 0 },
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// 获取应用级代理配置
+    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: 60,
+                    streaming_idle_timeout: 120,
+                    non_streaming_timeout: 600,
+                    circuit_failure_threshold: 4,
+                    circuit_success_threshold: 2,
+                    circuit_timeout_seconds: 60,
+                    circuit_error_rate_threshold: 0.6,
+                    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
+                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: 600, // 废弃字段，返回默认值
+                        enable_logging: row.get::<_, i32>(3)? != 0,
+                        live_takeover_active: false, // 废弃字段
+                        streaming_first_byte_timeout: row.get::<_, i32>(4).unwrap_or(60) as u64,
+                        streaming_idle_timeout: row.get::<_, i32>(5).unwrap_or(120) as u64,
+                        non_streaming_timeout: row.get::<_, i32>(6).unwrap_or(600) 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> {
+        let conn = lock_conn!(self.conn);
+        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 ====================
+
+    /// 获取Provider健康状态
+    pub async fn get_provider_health(
+        &self,
+        provider_id: &str,
+        app_type: &str,
+    ) -> Result<ProviderHealth, AppError> {
+        let result = {
+            let conn = lock_conn!(self.conn);
+
+            conn.query_row(
+                "SELECT provider_id, app_type, is_healthy, consecutive_failures,
+                        last_success_at, last_failure_at, last_error, updated_at
+                 FROM provider_health
+                 WHERE provider_id = ?1 AND app_type = ?2",
+                rusqlite::params![provider_id, app_type],
+                |row| {
+                    Ok(ProviderHealth {
+                        provider_id: row.get(0)?,
+                        app_type: row.get(1)?,
+                        is_healthy: row.get::<_, i64>(2)? != 0,
+                        consecutive_failures: row.get::<_, i64>(3)? as u32,
+                        last_success_at: row.get(4)?,
+                        last_failure_at: row.get(5)?,
+                        last_error: row.get(6)?,
+                        updated_at: row.get(7)?,
+                    })
+                },
+            )
+        };
+
+        match result {
+            Ok(health) => Ok(health),
+            // 缺少记录时视为健康（关闭后清空状态，再次打开时默认正常）
+            Err(rusqlite::Error::QueryReturnedNoRows) => Ok(ProviderHealth {
+                provider_id: provider_id.to_string(),
+                app_type: app_type.to_string(),
+                is_healthy: true,
+                consecutive_failures: 0,
+                last_success_at: None,
+                last_failure_at: None,
+                last_error: None,
+                updated_at: chrono::Utc::now().to_rfc3339(),
+            }),
+            Err(e) => Err(AppError::Database(e.to_string())),
+        }
+    }
+
+    /// 更新Provider健康状态
+    ///
+    /// 使用默认阈值（5）判断是否健康，建议使用 `update_provider_health_with_threshold` 传入配置的阈值
+    pub async fn update_provider_health(
+        &self,
+        provider_id: &str,
+        app_type: &str,
+        success: bool,
+        error_msg: Option<String>,
+    ) -> Result<(), AppError> {
+        // 默认阈值与 CircuitBreakerConfig::default() 保持一致
+        self.update_provider_health_with_threshold(provider_id, app_type, success, error_msg, 5)
+            .await
+    }
+
+    /// 更新Provider健康状态（带阈值参数）
+    ///
+    /// # Arguments
+    /// * `failure_threshold` - 连续失败多少次后标记为不健康
+    pub async fn update_provider_health_with_threshold(
+        &self,
+        provider_id: &str,
+        app_type: &str,
+        success: bool,
+        error_msg: Option<String>,
+        failure_threshold: u32,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        let now = chrono::Utc::now().to_rfc3339();
+
+        // 先查询当前状态
+        let current = conn.query_row(
+            "SELECT consecutive_failures FROM provider_health
+             WHERE provider_id = ?1 AND app_type = ?2",
+            rusqlite::params![provider_id, app_type],
+            |row| Ok(row.get::<_, i64>(0)? as u32),
+        );
+
+        let (is_healthy, consecutive_failures) = if success {
+            // 成功：重置失败计数
+            (1, 0)
+        } else {
+            // 失败：增加失败计数
+            let failures = current.unwrap_or(0) + 1;
+            // 使用传入的阈值而非硬编码
+            let healthy = if failures >= failure_threshold { 0 } else { 1 };
+            (healthy, failures)
+        };
+
+        let (last_success_at, last_failure_at) = if success {
+            (Some(now.clone()), None)
+        } else {
+            (None, Some(now.clone()))
+        };
+
+        // UPSERT
+        conn.execute(
+            "INSERT OR REPLACE INTO provider_health
+             (provider_id, app_type, is_healthy, consecutive_failures,
+              last_success_at, last_failure_at, last_error, updated_at)
+             VALUES (?1, ?2, ?3, ?4,
+                     COALESCE(?5, (SELECT last_success_at FROM provider_health
+                                   WHERE provider_id = ?1 AND app_type = ?2)),
+                     COALESCE(?6, (SELECT last_failure_at FROM provider_health
+                                   WHERE provider_id = ?1 AND app_type = ?2)),
+                     ?7, ?8)",
+            rusqlite::params![
+                provider_id,
+                app_type,
+                is_healthy,
+                consecutive_failures as i64,
+                last_success_at,
+                last_failure_at,
+                error_msg,
+                &now,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// 重置Provider健康状态
+    pub async fn reset_provider_health(
+        &self,
+        provider_id: &str,
+        app_type: &str,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        conn.execute(
+            "DELETE FROM provider_health WHERE provider_id = ?1 AND app_type = ?2",
+            rusqlite::params![provider_id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        log::debug!("Reset health status for provider {provider_id} (app: {app_type})");
+
+        Ok(())
+    }
+
+    /// 清空指定应用的健康状态（关闭单个代理时使用）
+    pub async fn clear_provider_health_for_app(&self, app_type: &str) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        conn.execute(
+            "DELETE FROM provider_health WHERE app_type = ?1",
+            [app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        log::debug!("Cleared provider health records for app {app_type}");
+        Ok(())
+    }
+
+    /// 清空所有Provider健康状态（代理停止时调用）
+    pub async fn clear_all_provider_health(&self) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        conn.execute("DELETE FROM provider_health", [])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        log::debug!("Cleared all provider health records");
+        Ok(())
+    }
+
+    // ==================== Circuit Breaker Config (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(
+                "SELECT circuit_failure_threshold, circuit_success_threshold, circuit_timeout_seconds,
+                        circuit_error_rate_threshold, circuit_min_requests
+                 FROM proxy_config WHERE app_type = 'claude'",
+                [],
+                |row| {
+                    Ok(crate::proxy::circuit_breaker::CircuitBreakerConfig {
+                        failure_threshold: row.get::<_, i32>(0)? as u32,
+                        success_threshold: row.get::<_, i32>(1)? as u32,
+                        timeout_seconds: row.get::<_, i64>(2)? as u64,
+                        error_rate_threshold: row.get(3)?,
+                        min_requests: row.get::<_, i32>(4)? as u32,
+                    })
+                },
+            )
+        };
+        // conn 已在 block 结束时释放
+
+        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 proxy_config SET
+                circuit_failure_threshold = ?1,
+                circuit_success_threshold = ?2,
+                circuit_timeout_seconds = ?3,
+                circuit_error_rate_threshold = ?4,
+                circuit_min_requests = ?5,
+                updated_at = datetime('now')",
+            rusqlite::params![
+                config.failure_threshold as i32,
+                config.success_threshold as i32,
+                config.timeout_seconds as i64,
+                config.error_rate_threshold,
+                config.min_requests as i32,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
+    // ==================== Live Backup ====================
+
+    /// 保存 Live 配置备份
+    pub async fn save_live_backup(
+        &self,
+        app_type: &str,
+        config_json: &str,
+    ) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        let now = chrono::Utc::now().to_rfc3339();
+
+        conn.execute(
+            "INSERT OR REPLACE INTO proxy_live_backup (app_type, original_config, backed_up_at)
+             VALUES (?1, ?2, ?3)",
+            rusqlite::params![app_type, config_json, now],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        log::info!("已备份 {app_type} Live 配置");
+        Ok(())
+    }
+
+    /// 检查是否存在任意 Live 配置备份
+    pub async fn has_any_live_backup(&self) -> Result<bool, AppError> {
+        let conn = lock_conn!(self.conn);
+        let count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM proxy_live_backup", [], |row| {
+                row.get(0)
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(count > 0)
+    }
+
+    /// 获取 Live 配置备份
+    pub async fn get_live_backup(&self, app_type: &str) -> Result<Option<LiveBackup>, AppError> {
+        let conn = lock_conn!(self.conn);
+
+        let result = conn.query_row(
+            "SELECT app_type, original_config, backed_up_at FROM proxy_live_backup WHERE app_type = ?1",
+            rusqlite::params![app_type],
+            |row| {
+                Ok(LiveBackup {
+                    app_type: row.get(0)?,
+                    original_config: row.get(1)?,
+                    backed_up_at: row.get(2)?,
+                })
+            },
+        );
+
+        match result {
+            Ok(backup) => Ok(Some(backup)),
+            Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None),
+            Err(e) => Err(AppError::Database(e.to_string())),
+        }
+    }
+
+    /// 删除 Live 配置备份
+    pub async fn delete_live_backup(&self, app_type: &str) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        conn.execute(
+            "DELETE FROM proxy_live_backup WHERE app_type = ?1",
+            rusqlite::params![app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        log::info!("已删除 {app_type} Live 配置备份");
+        Ok(())
+    }
+
+    /// 删除所有 Live 配置备份
+    pub async fn delete_all_live_backups(&self) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+
+        conn.execute("DELETE FROM proxy_live_backup", [])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        log::info!("已删除所有 Live 配置备份");
+        Ok(())
+    }
+}
@@ -0,0 +1,131 @@
+//! 通用设置数据访问对象
+//!
+//! 提供键值对形式的通用设置存储。
+
+use crate::database::{lock_conn, Database};
+use crate::error::AppError;
+use rusqlite::params;
+
+impl Database {
+    /// 获取设置值
+    pub fn get_setting(&self, key: &str) -> Result<Option<String>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn
+            .prepare("SELECT value FROM settings WHERE key = ?1")
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut rows = stmt
+            .query(params![key])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        if let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
+            Ok(Some(
+                row.get(0).map_err(|e| AppError::Database(e.to_string()))?,
+            ))
+        } else {
+            Ok(None)
+        }
+    }
+
+    /// 设置值
+    pub fn set_setting(&self, key: &str, value: &str) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "INSERT OR REPLACE INTO settings (key, value) VALUES (?1, ?2)",
+            params![key, value],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    // --- Config Snippets 辅助方法 ---
+
+    /// 获取通用配置片段
+    pub fn get_config_snippet(&self, app_type: &str) -> Result<Option<String>, AppError> {
+        self.get_setting(&format!("common_config_{app_type}"))
+    }
+
+    /// 设置通用配置片段
+    pub fn set_config_snippet(
+        &self,
+        app_type: &str,
+        snippet: Option<String>,
+    ) -> Result<(), AppError> {
+        let key = format!("common_config_{app_type}");
+        if let Some(value) = snippet {
+            self.set_setting(&key, &value)
+        } else {
+            // 如果为 None 则删除
+            let conn = lock_conn!(self.conn);
+            conn.execute("DELETE FROM settings WHERE key = ?1", params![key])
+                .map_err(|e| AppError::Database(e.to_string()))?;
+            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(())
+    }
+}
@@ -0,0 +1,223 @@
+//! Skills 数据访问对象
+//!
+//! 提供 Skills 和 Skill Repos 的 CRUD 操作。
+//!
+//! v3.10.0+ 统一管理架构：
+//! - Skills 使用统一的 id 主键，支持三应用启用标志
+//! - 实际文件存储在 ~/.cc-switch/skills/，同步到各应用目录
+
+use crate::app_config::{InstalledSkill, SkillApps};
+use crate::database::{lock_conn, Database};
+use crate::error::AppError;
+use crate::services::skill::SkillRepo;
+use indexmap::IndexMap;
+use rusqlite::params;
+
+impl Database {
+    // ========== InstalledSkill CRUD ==========
+
+    /// 获取所有已安装的 Skills
+    pub fn get_all_installed_skills(&self) -> Result<IndexMap<String, InstalledSkill>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn
+            .prepare(
+                "SELECT id, name, description, directory, repo_owner, repo_name, repo_branch,
+                        readme_url, enabled_claude, enabled_codex, enabled_gemini, installed_at
+                 FROM skills ORDER BY name ASC",
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let skill_iter = stmt
+            .query_map([], |row| {
+                Ok(InstalledSkill {
+                    id: row.get(0)?,
+                    name: row.get(1)?,
+                    description: row.get(2)?,
+                    directory: row.get(3)?,
+                    repo_owner: row.get(4)?,
+                    repo_name: row.get(5)?,
+                    repo_branch: row.get(6)?,
+                    readme_url: row.get(7)?,
+                    apps: SkillApps {
+                        claude: row.get(8)?,
+                        codex: row.get(9)?,
+                        gemini: row.get(10)?,
+                    },
+                    installed_at: row.get(11)?,
+                })
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut skills = IndexMap::new();
+        for skill_res in skill_iter {
+            let skill = skill_res.map_err(|e| AppError::Database(e.to_string()))?;
+            skills.insert(skill.id.clone(), skill);
+        }
+        Ok(skills)
+    }
+
+    /// 获取单个已安装的 Skill
+    pub fn get_installed_skill(&self, id: &str) -> Result<Option<InstalledSkill>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn
+            .prepare(
+                "SELECT id, name, description, directory, repo_owner, repo_name, repo_branch,
+                        readme_url, enabled_claude, enabled_codex, enabled_gemini, installed_at
+                 FROM skills WHERE id = ?1",
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let result = stmt.query_row([id], |row| {
+            Ok(InstalledSkill {
+                id: row.get(0)?,
+                name: row.get(1)?,
+                description: row.get(2)?,
+                directory: row.get(3)?,
+                repo_owner: row.get(4)?,
+                repo_name: row.get(5)?,
+                repo_branch: row.get(6)?,
+                readme_url: row.get(7)?,
+                apps: SkillApps {
+                    claude: row.get(8)?,
+                    codex: row.get(9)?,
+                    gemini: row.get(10)?,
+                },
+                installed_at: row.get(11)?,
+            })
+        });
+
+        match result {
+            Ok(skill) => Ok(Some(skill)),
+            Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None),
+            Err(e) => Err(AppError::Database(e.to_string())),
+        }
+    }
+
+    /// 保存 Skill（添加或更新）
+    pub fn save_skill(&self, skill: &InstalledSkill) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "INSERT OR REPLACE INTO skills
+             (id, name, description, directory, repo_owner, repo_name, repo_branch,
+              readme_url, enabled_claude, enabled_codex, enabled_gemini, installed_at)
+             VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)",
+            params![
+                skill.id,
+                skill.name,
+                skill.description,
+                skill.directory,
+                skill.repo_owner,
+                skill.repo_name,
+                skill.repo_branch,
+                skill.readme_url,
+                skill.apps.claude,
+                skill.apps.codex,
+                skill.apps.gemini,
+                skill.installed_at,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 删除 Skill
+    pub fn delete_skill(&self, id: &str) -> Result<bool, AppError> {
+        let conn = lock_conn!(self.conn);
+        let affected = conn
+            .execute("DELETE FROM skills WHERE id = ?1", params![id])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(affected > 0)
+    }
+
+    /// 清空所有 Skills（用于迁移）
+    pub fn clear_skills(&self) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute("DELETE FROM skills", [])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 更新 Skill 的应用启用状态
+    pub fn update_skill_apps(&self, id: &str, apps: &SkillApps) -> Result<bool, AppError> {
+        let conn = lock_conn!(self.conn);
+        let affected = conn
+            .execute(
+                "UPDATE skills SET enabled_claude = ?1, enabled_codex = ?2, enabled_gemini = ?3 WHERE id = ?4",
+                params![apps.claude, apps.codex, apps.gemini, id],
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(affected > 0)
+    }
+
+    // ========== SkillRepo CRUD（保持原有） ==========
+
+    /// 获取所有 Skill 仓库
+    pub fn get_skill_repos(&self) -> Result<Vec<SkillRepo>, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut stmt = conn
+            .prepare(
+                "SELECT owner, name, branch, enabled FROM skill_repos ORDER BY owner ASC, name ASC",
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let repo_iter = stmt
+            .query_map([], |row| {
+                Ok(SkillRepo {
+                    owner: row.get(0)?,
+                    name: row.get(1)?,
+                    branch: row.get(2)?,
+                    enabled: row.get(3)?,
+                })
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut repos = Vec::new();
+        for repo_res in repo_iter {
+            repos.push(repo_res.map_err(|e| AppError::Database(e.to_string()))?);
+        }
+        Ok(repos)
+    }
+
+    /// 保存 Skill 仓库
+    pub fn save_skill_repo(&self, repo: &SkillRepo) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "INSERT OR REPLACE INTO skill_repos (owner, name, branch, enabled) VALUES (?1, ?2, ?3, ?4)",
+            params![repo.owner, repo.name, repo.branch, repo.enabled],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 删除 Skill 仓库
+    pub fn delete_skill_repo(&self, owner: &str, name: &str) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "DELETE FROM skill_repos WHERE owner = ?1 AND name = ?2",
+            params![owner, name],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    /// 初始化默认的 Skill 仓库（首次启动时调用）
+    pub fn init_default_skill_repos(&self) -> Result<usize, AppError> {
+        // 检查是否已有仓库
+        let existing = self.get_skill_repos()?;
+        if !existing.is_empty() {
+            return Ok(0);
+        }
+
+        // 获取默认仓库列表
+        let default_store = crate::services::skill::SkillStore::default();
+        let mut count = 0;
+
+        for repo in &default_store.repos {
+            self.save_skill_repo(repo)?;
+            count += 1;
+        }
+
+        log::info!("初始化默认 Skill 仓库完成，共 {count} 个");
+        Ok(count)
+    }
+}
@@ -0,0 +1,57 @@
+//! 流式健康检查日志 DAO
+
+use crate::database::{lock_conn, Database};
+use crate::error::AppError;
+use crate::services::stream_check::{StreamCheckConfig, StreamCheckResult};
+
+impl Database {
+    /// 保存流式检查日志
+    pub fn save_stream_check_log(
+        &self,
+        provider_id: &str,
+        provider_name: &str,
+        app_type: &str,
+        result: &StreamCheckResult,
+    ) -> Result<i64, AppError> {
+        let conn = lock_conn!(self.conn);
+
+        conn.execute(
+            "INSERT INTO stream_check_logs 
+             (provider_id, provider_name, app_type, status, success, message, 
+              response_time_ms, http_status, model_used, retry_count, tested_at)
+             VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11)",
+            rusqlite::params![
+                provider_id,
+                provider_name,
+                app_type,
+                format!("{:?}", result.status).to_lowercase(),
+                result.success,
+                result.message,
+                result.response_time_ms.map(|t| t as i64),
+                result.http_status.map(|s| s as i64),
+                result.model_used,
+                result.retry_count as i64,
+                result.tested_at,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(conn.last_insert_rowid())
+    }
+
+    /// 获取流式检查配置
+    pub fn get_stream_check_config(&self) -> Result<StreamCheckConfig, AppError> {
+        match self.get_setting("stream_check_config")? {
+            Some(json) => serde_json::from_str(&json)
+                .map_err(|e| AppError::Message(format!("解析配置失败: {e}"))),
+            None => Ok(StreamCheckConfig::default()),
+        }
+    }
+
+    /// 保存流式检查配置
+    pub fn save_stream_check_config(&self, config: &StreamCheckConfig) -> Result<(), AppError> {
+        let json = serde_json::to_string(config)
+            .map_err(|e| AppError::Message(format!("序列化配置失败: {e}")))?;
+        self.set_setting("stream_check_config", &json)
+    }
+}
@@ -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(())
+    }
+}
@@ -0,0 +1,245 @@
+//! JSON → SQLite 数据迁移
+//!
+//! 将旧版 config.json (MultiAppConfig) 数据迁移到 SQLite 数据库。
+
+use super::{lock_conn, to_json_string, Database};
+use crate::app_config::MultiAppConfig;
+use crate::error::AppError;
+use rusqlite::{params, Connection};
+
+impl Database {
+    /// 从 MultiAppConfig 迁移数据到数据库
+    pub fn migrate_from_json(&self, config: &MultiAppConfig) -> Result<(), AppError> {
+        let mut conn = lock_conn!(self.conn);
+        let tx = conn
+            .transaction()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Self::migrate_from_json_tx(&tx, config)?;
+
+        tx.commit()
+            .map_err(|e| AppError::Database(format!("Commit migration failed: {e}")))?;
+        Ok(())
+    }
+
+    /// 运行迁移的 dry-run 模式（在内存数据库中验证，不写入磁盘）
+    ///
+    /// 用于部署前验证迁移逻辑是否正确。
+    pub fn migrate_from_json_dry_run(config: &MultiAppConfig) -> Result<(), AppError> {
+        let mut conn =
+            Connection::open_in_memory().map_err(|e| AppError::Database(e.to_string()))?;
+        Self::create_tables_on_conn(&conn)?;
+        Self::apply_schema_migrations_on_conn(&conn)?;
+
+        let tx = conn
+            .transaction()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Self::migrate_from_json_tx(&tx, config)?;
+
+        // 显式 drop transaction 而不提交（内存数据库会被丢弃）
+        drop(tx);
+        Ok(())
+    }
+
+    /// 在事务中执行迁移
+    fn migrate_from_json_tx(
+        tx: &rusqlite::Transaction<'_>,
+        config: &MultiAppConfig,
+    ) -> Result<(), AppError> {
+        // 1. 迁移 Providers
+        Self::migrate_providers(tx, config)?;
+
+        // 2. 迁移 MCP Servers
+        Self::migrate_mcp_servers(tx, config)?;
+
+        // 3. 迁移 Prompts
+        Self::migrate_prompts(tx, config)?;
+
+        // 4. 迁移 Skills
+        Self::migrate_skills(tx, config)?;
+
+        // 5. 迁移 Common Config
+        Self::migrate_common_config(tx, config)?;
+
+        Ok(())
+    }
+
+    /// 迁移供应商数据
+    fn migrate_providers(
+        tx: &rusqlite::Transaction<'_>,
+        config: &MultiAppConfig,
+    ) -> Result<(), AppError> {
+        for (app_key, manager) in &config.apps {
+            let app_type = app_key;
+            let current_id = &manager.current;
+
+            for (id, provider) in &manager.providers {
+                let is_current = if id == current_id { 1 } else { 0 };
+
+                // 处理 meta 和 endpoints
+                let mut meta_clone = provider.meta.clone().unwrap_or_default();
+                let endpoints = std::mem::take(&mut meta_clone.custom_endpoints);
+
+                tx.execute(
+                    "INSERT OR REPLACE INTO providers (
+                        id, app_type, name, settings_config, website_url, category,
+                        created_at, sort_index, notes, icon, icon_color, meta, is_current
+                    ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)",
+                    params![
+                        id,
+                        app_type,
+                        provider.name,
+                        to_json_string(&provider.settings_config)?,
+                        provider.website_url,
+                        provider.category,
+                        provider.created_at,
+                        provider.sort_index,
+                        provider.notes,
+                        provider.icon,
+                        provider.icon_color,
+                        to_json_string(&meta_clone)?,
+                        is_current,
+                    ],
+                )
+                .map_err(|e| AppError::Database(format!("Migrate provider failed: {e}")))?;
+
+                // 迁移 Endpoints
+                for (url, endpoint) in endpoints {
+                    tx.execute(
+                        "INSERT INTO provider_endpoints (provider_id, app_type, url, added_at)
+                         VALUES (?1, ?2, ?3, ?4)",
+                        params![id, app_type, url, endpoint.added_at],
+                    )
+                    .map_err(|e| AppError::Database(format!("Migrate endpoint failed: {e}")))?;
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// 迁移 MCP 服务器数据
+    fn migrate_mcp_servers(
+        tx: &rusqlite::Transaction<'_>,
+        config: &MultiAppConfig,
+    ) -> Result<(), AppError> {
+        if let Some(servers) = &config.mcp.servers {
+            for (id, server) in servers {
+                tx.execute(
+                    "INSERT OR REPLACE INTO mcp_servers (
+                        id, name, server_config, description, homepage, docs, tags,
+                        enabled_claude, enabled_codex, enabled_gemini
+                    ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)",
+                    params![
+                        id,
+                        server.name,
+                        to_json_string(&server.server)?,
+                        server.description,
+                        server.homepage,
+                        server.docs,
+                        to_json_string(&server.tags)?,
+                        server.apps.claude,
+                        server.apps.codex,
+                        server.apps.gemini,
+                    ],
+                )
+                .map_err(|e| AppError::Database(format!("Migrate mcp server failed: {e}")))?;
+            }
+        }
+        Ok(())
+    }
+
+    /// 迁移提示词数据
+    fn migrate_prompts(
+        tx: &rusqlite::Transaction<'_>,
+        config: &MultiAppConfig,
+    ) -> Result<(), AppError> {
+        let migrate_app_prompts = |prompts_map: &std::collections::HashMap<
+            String,
+            crate::prompt::Prompt,
+        >,
+                                   app_type: &str|
+         -> Result<(), AppError> {
+            for (id, prompt) in prompts_map {
+                tx.execute(
+                        "INSERT OR REPLACE INTO prompts (
+                            id, app_type, name, content, description, enabled, created_at, updated_at
+                        ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)",
+                        params![
+                            id,
+                            app_type,
+                            prompt.name,
+                            prompt.content,
+                            prompt.description,
+                            prompt.enabled,
+                            prompt.created_at,
+                            prompt.updated_at,
+                        ],
+                    )
+                    .map_err(|e| AppError::Database(format!("Migrate prompt failed: {e}")))?;
+            }
+            Ok(())
+        };
+
+        migrate_app_prompts(&config.prompts.claude.prompts, "claude")?;
+        migrate_app_prompts(&config.prompts.codex.prompts, "codex")?;
+        migrate_app_prompts(&config.prompts.gemini.prompts, "gemini")?;
+
+        Ok(())
+    }
+
+    /// 迁移 Skills 数据
+    fn migrate_skills(
+        tx: &rusqlite::Transaction<'_>,
+        config: &MultiAppConfig,
+    ) -> Result<(), AppError> {
+        // v3.10.0+：Skills 的 SSOT 已迁移到文件系统（~/.cc-switch/skills/）+ 数据库统一结构。
+        //
+        // 旧版 config.json 里的 `skills.skills` 仅记录“安装状态”，但不包含完整元数据，
+        // 且无法保证 SSOT 目录中一定存在对应的 skill 文件。
+        //
+        // 因此这里不再直接把旧的安装状态写入新 skills 表，避免产生“数据库显示已安装但文件缺失”的不一致。
+        // 迁移后可通过：
+        // - 前端「导入已有」(扫描各应用的 skills 目录并复制到 SSOT)
+        // - 或后续启动时的自动扫描逻辑
+        // 来重建已安装技能记录。
+
+        for repo in &config.skills.repos {
+            tx.execute(
+                "INSERT OR REPLACE INTO skill_repos (owner, name, branch, enabled) VALUES (?1, ?2, ?3, ?4)",
+                params![repo.owner, repo.name, repo.branch, repo.enabled],
+            ).map_err(|e| AppError::Database(format!("Migrate skill repo failed: {e}")))?;
+        }
+
+        Ok(())
+    }
+
+    /// 迁移通用配置片段
+    fn migrate_common_config(
+        tx: &rusqlite::Transaction<'_>,
+        config: &MultiAppConfig,
+    ) -> Result<(), AppError> {
+        if let Some(snippet) = &config.common_config_snippets.claude {
+            tx.execute(
+                "INSERT OR REPLACE INTO settings (key, value) VALUES (?1, ?2)",
+                params!["common_config_claude", snippet],
+            )
+            .map_err(|e| AppError::Database(format!("Migrate settings failed: {e}")))?;
+        }
+        if let Some(snippet) = &config.common_config_snippets.codex {
+            tx.execute(
+                "INSERT OR REPLACE INTO settings (key, value) VALUES (?1, ?2)",
+                params!["common_config_codex", snippet],
+            )
+            .map_err(|e| AppError::Database(format!("Migrate settings failed: {e}")))?;
+        }
+        if let Some(snippet) = &config.common_config_snippets.gemini {
+            tx.execute(
+                "INSERT OR REPLACE INTO settings (key, value) VALUES (?1, ?2)",
+                params!["common_config_gemini", snippet],
+            )
+            .map_err(|e| AppError::Database(format!("Migrate settings failed: {e}")))?;
+        }
+
+        Ok(())
+    }
+}
@@ -0,0 +1,140 @@
+//! 数据库模块 - SQLite 数据持久化
+//!
+//! 此模块提供应用的核心数据存储功能，包括：
+//! - 供应商配置管理
+//! - MCP 服务器配置
+//! - 提示词管理
+//! - Skills 管理
+//! - 通用设置存储
+//!
+//! ## 架构设计
+//!
+//! ```text
+//! database/
+//! ├── mod.rs        - Database 结构体 + 初始化
+//! ├── schema.rs     - 表结构定义 + Schema 迁移
+//! ├── backup.rs     - SQL 导入导出 + 快照备份
+//! ├── migration.rs  - JSON → SQLite 数据迁移
+//! └── dao/          - 数据访问对象
+//!     ├── providers.rs
+//!     ├── mcp.rs
+//!     ├── prompts.rs
+//!     ├── skills.rs
+//!     └── settings.rs
+//! ```
+
+mod backup;
+mod dao;
+mod migration;
+mod schema;
+
+#[cfg(test)]
+mod tests;
+
+// DAO 类型导出供外部使用
+pub use dao::FailoverQueueItem;
+
+use crate::config::get_app_config_dir;
+use crate::error::AppError;
+use rusqlite::Connection;
+use serde::Serialize;
+use std::sync::Mutex;
+
+// DAO 方法通过 impl Database 提供，无需额外导出
+
+/// 数据库备份保留数量
+const DB_BACKUP_RETAIN: usize = 10;
+
+/// 当前 Schema 版本号
+/// 每次修改表结构时递增，并在 schema.rs 中添加相应的迁移逻辑
+pub(crate) const SCHEMA_VERSION: i32 = 3;
+
+/// 安全地序列化 JSON，避免 unwrap panic
+pub(crate) fn to_json_string<T: Serialize>(value: &T) -> Result<String, AppError> {
+    serde_json::to_string(value)
+        .map_err(|e| AppError::Config(format!("JSON serialization failed: {e}")))
+}
+
+/// 安全地获取 Mutex 锁，避免 unwrap panic
+macro_rules! lock_conn {
+    ($mutex:expr) => {
+        $mutex
+            .lock()
+            .map_err(|e| AppError::Database(format!("Mutex lock failed: {}", e)))?
+    };
+}
+
+// 导出宏供子模块使用
+pub(crate) use lock_conn;
+
+/// 数据库连接封装
+///
+/// 使用 Mutex 包装 Connection 以支持在多线程环境（如 Tauri State）中共享。
+/// rusqlite::Connection 本身不是 Sync 的，因此需要这层包装。
+pub struct Database {
+    pub(crate) conn: Mutex<Connection>,
+}
+
+impl Database {
+    /// 初始化数据库连接并创建表
+    ///
+    /// 数据库文件位于 `~/.cc-switch/cc-switch.db`
+    pub fn init() -> Result<Self, AppError> {
+        let db_path = get_app_config_dir().join("cc-switch.db");
+
+        // 确保父目录存在
+        if let Some(parent) = db_path.parent() {
+            std::fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
+        }
+
+        let conn = Connection::open(&db_path).map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 启用外键约束
+        conn.execute("PRAGMA foreign_keys = ON;", [])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let db = Self {
+            conn: Mutex::new(conn),
+        };
+        db.create_tables()?;
+        db.apply_schema_migrations()?;
+        db.ensure_model_pricing_seeded()?;
+
+        Ok(db)
+    }
+
+    /// 创建内存数据库（用于测试）
+    pub fn memory() -> Result<Self, AppError> {
+        let conn = Connection::open_in_memory().map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 启用外键约束
+        conn.execute("PRAGMA foreign_keys = ON;", [])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let db = Self {
+            conn: Mutex::new(conn),
+        };
+        db.create_tables()?;
+        db.ensure_model_pricing_seeded()?;
+
+        Ok(db)
+    }
+
+    /// 检查 MCP 服务器表是否为空
+    pub fn is_mcp_table_empty(&self) -> Result<bool, AppError> {
+        let conn = lock_conn!(self.conn);
+        let count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM mcp_servers", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(count == 0)
+    }
+
+    /// 检查提示词表是否为空
+    pub fn is_prompts_table_empty(&self) -> Result<bool, AppError> {
+        let conn = lock_conn!(self.conn);
+        let count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM prompts", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(count == 0)
+    }
+}
@@ -0,0 +1,380 @@
+//! 数据库模块测试
+//!
+//! 包含 Schema 迁移和基本功能的测试。
+
+use super::*;
+use crate::app_config::MultiAppConfig;
+use crate::provider::{Provider, ProviderManager};
+use indexmap::IndexMap;
+use rusqlite::Connection;
+use serde_json::json;
+use std::collections::HashMap;
+
+const LEGACY_SCHEMA_SQL: &str = r#"
+    CREATE TABLE providers (
+        id TEXT NOT NULL,
+        app_type TEXT NOT NULL,
+        name TEXT NOT NULL,
+        settings_config TEXT NOT NULL,
+        PRIMARY KEY (id, app_type)
+    );
+    CREATE TABLE provider_endpoints (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        provider_id TEXT NOT NULL,
+        app_type TEXT NOT NULL,
+        url TEXT NOT NULL
+    );
+    CREATE TABLE mcp_servers (
+        id TEXT PRIMARY KEY,
+        name TEXT NOT NULL,
+        server_config TEXT NOT NULL
+    );
+    CREATE TABLE prompts (
+        id TEXT NOT NULL,
+        app_type TEXT NOT NULL,
+        name TEXT NOT NULL,
+        content TEXT NOT NULL,
+        PRIMARY KEY (id, app_type)
+    );
+    CREATE TABLE skills (
+        key TEXT PRIMARY KEY,
+        installed BOOLEAN NOT NULL DEFAULT 0
+    );
+    CREATE TABLE skill_repos (
+        owner TEXT NOT NULL,
+        name TEXT NOT NULL,
+        PRIMARY KEY (owner, name)
+    );
+    CREATE TABLE settings (
+        key TEXT PRIMARY KEY,
+        value TEXT
+    );
+"#;
+
+#[derive(Debug)]
+struct ColumnInfo {
+    r#type: String,
+    notnull: i64,
+    default: Option<String>,
+}
+
+fn get_column_info(conn: &Connection, table: &str, column: &str) -> ColumnInfo {
+    let mut stmt = conn
+        .prepare(&format!("PRAGMA table_info(\"{table}\");"))
+        .expect("prepare pragma");
+    let mut rows = stmt.query([]).expect("query pragma");
+    while let Some(row) = rows.next().expect("read row") {
+        let column_name: String = row.get(1).expect("name");
+        if column_name.eq_ignore_ascii_case(column) {
+            return ColumnInfo {
+                r#type: row.get::<_, String>(2).expect("type"),
+                notnull: row.get::<_, i64>(3).expect("notnull"),
+                default: row.get::<_, Option<String>>(4).ok().flatten(),
+            };
+        }
+    }
+    panic!("column {table}.{column} not found");
+}
+
+fn normalize_default(default: &Option<String>) -> Option<String> {
+    default
+        .as_ref()
+        .map(|s| s.trim_matches('\'').trim_matches('"').to_string())
+}
+
+#[test]
+fn migration_sets_user_version_when_missing() {
+    let conn = Connection::open_in_memory().expect("open memory db");
+
+    Database::create_tables_on_conn(&conn).expect("create tables");
+    assert_eq!(
+        Database::get_user_version(&conn).expect("read version before"),
+        0
+    );
+
+    Database::apply_schema_migrations_on_conn(&conn).expect("apply migration");
+
+    assert_eq!(
+        Database::get_user_version(&conn).expect("read version after"),
+        SCHEMA_VERSION
+    );
+}
+
+#[test]
+fn migration_rejects_future_version() {
+    let conn = Connection::open_in_memory().expect("open memory db");
+    Database::create_tables_on_conn(&conn).expect("create tables");
+    Database::set_user_version(&conn, SCHEMA_VERSION + 1).expect("set future version");
+
+    let err =
+        Database::apply_schema_migrations_on_conn(&conn).expect_err("should reject higher version");
+    assert!(
+        err.to_string().contains("数据库版本过新"),
+        "unexpected error: {err}"
+    );
+}
+
+#[test]
+fn migration_adds_missing_columns_for_providers() {
+    let conn = Connection::open_in_memory().expect("open memory db");
+
+    // 创建旧版 providers 表，缺少新增列
+    conn.execute_batch(LEGACY_SCHEMA_SQL)
+        .expect("seed old schema");
+
+    Database::apply_schema_migrations_on_conn(&conn).expect("apply migrations");
+
+    // 验证关键新增列已补齐
+    for (table, column) in [
+        ("providers", "meta"),
+        ("providers", "is_current"),
+        ("provider_endpoints", "added_at"),
+        ("mcp_servers", "enabled_gemini"),
+        ("prompts", "updated_at"),
+        ("skills", "installed_at"),
+        ("skill_repos", "enabled"),
+    ] {
+        assert!(
+            Database::has_column(&conn, table, column).expect("check column"),
+            "{table}.{column} should exist after migration"
+        );
+    }
+
+    // 验证 meta 列约束保持一致
+    let meta = get_column_info(&conn, "providers", "meta");
+    assert_eq!(meta.notnull, 1, "meta should be NOT NULL");
+    assert_eq!(
+        normalize_default(&meta.default).as_deref(),
+        Some("{}"),
+        "meta default should be '{{}}'"
+    );
+
+    assert_eq!(
+        Database::get_user_version(&conn).expect("version after migration"),
+        SCHEMA_VERSION
+    );
+}
+
+#[test]
+fn migration_aligns_column_defaults_and_types() {
+    let conn = Connection::open_in_memory().expect("open memory db");
+    conn.execute_batch(LEGACY_SCHEMA_SQL)
+        .expect("seed old schema");
+
+    Database::apply_schema_migrations_on_conn(&conn).expect("apply migrations");
+
+    let is_current = get_column_info(&conn, "providers", "is_current");
+    assert_eq!(is_current.r#type, "BOOLEAN");
+    assert_eq!(is_current.notnull, 1);
+    assert_eq!(normalize_default(&is_current.default).as_deref(), Some("0"));
+
+    let tags = get_column_info(&conn, "mcp_servers", "tags");
+    assert_eq!(tags.r#type, "TEXT");
+    assert_eq!(tags.notnull, 1);
+    assert_eq!(normalize_default(&tags.default).as_deref(), Some("[]"));
+
+    let enabled = get_column_info(&conn, "prompts", "enabled");
+    assert_eq!(enabled.r#type, "BOOLEAN");
+    assert_eq!(enabled.notnull, 1);
+    assert_eq!(normalize_default(&enabled.default).as_deref(), Some("1"));
+
+    let installed_at = get_column_info(&conn, "skills", "installed_at");
+    assert_eq!(installed_at.r#type, "INTEGER");
+    assert_eq!(installed_at.notnull, 1);
+    assert_eq!(
+        normalize_default(&installed_at.default).as_deref(),
+        Some("0")
+    );
+
+    let branch = get_column_info(&conn, "skill_repos", "branch");
+    assert_eq!(branch.r#type, "TEXT");
+    assert_eq!(normalize_default(&branch.default).as_deref(), Some("main"));
+
+    let skill_repo_enabled = get_column_info(&conn, "skill_repos", "enabled");
+    assert_eq!(skill_repo_enabled.r#type, "BOOLEAN");
+    assert_eq!(skill_repo_enabled.notnull, 1);
+    assert_eq!(
+        normalize_default(&skill_repo_enabled.default).as_deref(),
+        Some("1")
+    );
+}
+
+#[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
+    let mut apps = HashMap::new();
+    apps.insert("claude".to_string(), ProviderManager::default());
+
+    let config = MultiAppConfig {
+        version: 2,
+        apps,
+        mcp: Default::default(),
+        prompts: Default::default(),
+        skills: Default::default(),
+        common_config_snippets: Default::default(),
+        claude_common_config_snippet: None,
+    };
+
+    // Dry-run should succeed without any file I/O errors
+    let result = Database::migrate_from_json_dry_run(&config);
+    assert!(
+        result.is_ok(),
+        "Dry-run should succeed with valid config: {result:?}"
+    );
+}
+
+#[test]
+fn dry_run_validates_schema_compatibility() {
+    // Create config with actual provider data
+    let mut providers = IndexMap::new();
+    providers.insert(
+        "test-provider".to_string(),
+        Provider {
+            id: "test-provider".to_string(),
+            name: "Test Provider".to_string(),
+            settings_config: json!({
+                "anthropicApiKey": "sk-test-123",
+            }),
+            website_url: None,
+            category: None,
+            created_at: Some(1234567890),
+            sort_index: None,
+            notes: None,
+            meta: None,
+            icon: None,
+            icon_color: None,
+            in_failover_queue: false,
+        },
+    );
+
+    let manager = ProviderManager {
+        providers,
+        current: "test-provider".to_string(),
+    };
+
+    let mut apps = HashMap::new();
+    apps.insert("claude".to_string(), manager);
+
+    let config = MultiAppConfig {
+        version: 2,
+        apps,
+        mcp: Default::default(),
+        prompts: Default::default(),
+        skills: Default::default(),
+        common_config_snippets: Default::default(),
+        claude_common_config_snippet: None,
+    };
+
+    // Dry-run should validate the full migration path
+    let result = Database::migrate_from_json_dry_run(&config);
+    assert!(
+        result.is_ok(),
+        "Dry-run should succeed with provider data: {result:?}"
+    );
+}
+
+#[test]
+fn model_pricing_is_seeded_on_init() {
+    let db = Database::memory().expect("create memory db");
+
+    let conn = db.conn.lock().expect("lock conn");
+
+    let count: i64 = conn
+        .query_row("SELECT COUNT(*) FROM model_pricing", [], |row| row.get(0))
+        .expect("count pricing");
+
+    assert!(
+        count > 0,
+        "模型定价数据应该在初始化时自动填充，实际数量: {}",
+        count
+    );
+
+    // 验证包含 Claude 模型
+    let claude_count: i64 = conn
+        .query_row(
+            "SELECT COUNT(*) FROM model_pricing WHERE model_id LIKE 'claude-%'",
+            [],
+            |row| row.get(0),
+        )
+        .expect("check claude");
+    assert!(
+        claude_count > 0,
+        "应该包含 Claude 模型定价，实际数量: {}",
+        claude_count
+    );
+
+    // 验证包含 GPT 模型
+    let gpt_count: i64 = conn
+        .query_row(
+            "SELECT COUNT(*) FROM model_pricing WHERE model_id LIKE 'gpt-%'",
+            [],
+            |row| row.get(0),
+        )
+        .expect("check gpt");
+    assert!(
+        gpt_count > 0,
+        "应该包含 GPT 模型定价，实际数量: {}",
+        gpt_count
+    );
+
+    // 验证包含 Gemini 模型
+    let gemini_count: i64 = conn
+        .query_row(
+            "SELECT COUNT(*) FROM model_pricing WHERE model_id LIKE 'gemini-%'",
+            [],
+            |row| row.get(0),
+        )
+        .expect("check gemini");
+    assert!(
+        gemini_count > 0,
+        "应该包含 Gemini 模型定价，实际数量: {}",
+        gemini_count
+    );
+}
@@ -1,457 +0,0 @@
-/// Deep link import functionality for CC Switch
-///
-/// This module implements the ccswitch:// protocol for importing provider configurations
-/// via deep links. See docs/ccswitch-deeplink-design.md for detailed design.
-use crate::error::AppError;
-use crate::provider::Provider;
-use crate::services::ProviderService;
-use crate::store::AppState;
-use crate::AppType;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::str::FromStr;
-use url::Url;
-
-/// Deep link import request model
-/// Represents a parsed ccswitch:// URL ready for processing
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct DeepLinkImportRequest {
-    /// Protocol version (e.g., "v1")
-    pub version: String,
-    /// Resource type to import (e.g., "provider")
-    pub resource: String,
-    /// Target application (claude/codex/gemini)
-    pub app: String,
-    /// Provider name
-    pub name: String,
-    /// Provider homepage URL
-    pub homepage: String,
-    /// API endpoint/base URL
-    pub endpoint: String,
-    /// API key
-    pub api_key: String,
-    /// Optional model name
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<String>,
-    /// Optional notes/description
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub notes: Option<String>,
-}
-
-/// Parse a ccswitch:// URL into a DeepLinkImportRequest
-///
-/// Expected format:
-/// ccswitch://v1/import?resource=provider&app=claude&name=...&homepage=...&endpoint=...&apiKey=...
-pub fn parse_deeplink_url(url_str: &str) -> Result<DeepLinkImportRequest, AppError> {
-    // Parse URL
-    let url = Url::parse(url_str)
-        .map_err(|e| AppError::InvalidInput(format!("Invalid deep link URL: {e}")))?;
-
-    // Validate scheme
-    let scheme = url.scheme();
-    if scheme != "ccswitch" {
-        return Err(AppError::InvalidInput(format!(
-            "Invalid scheme: expected 'ccswitch', got '{scheme}'"
-        )));
-    }
-
-    // Extract version from host
-    let version = url
-        .host_str()
-        .ok_or_else(|| AppError::InvalidInput("Missing version in URL host".to_string()))?
-        .to_string();
-
-    // Validate version
-    if version != "v1" {
-        return Err(AppError::InvalidInput(format!(
-            "Unsupported protocol version: {version}"
-        )));
-    }
-
-    // Extract path (should be "/import")
-    let path = url.path();
-    if path != "/import" {
-        return Err(AppError::InvalidInput(format!(
-            "Invalid path: expected '/import', got '{path}'"
-        )));
-    }
-
-    // Parse query parameters
-    let params: HashMap<String, String> = url.query_pairs().into_owned().collect();
-
-    // Extract and validate resource type
-    let resource = params
-        .get("resource")
-        .ok_or_else(|| AppError::InvalidInput("Missing 'resource' parameter".to_string()))?
-        .clone();
-
-    if resource != "provider" {
-        return Err(AppError::InvalidInput(format!(
-            "Unsupported resource type: {resource}"
-        )));
-    }
-
-    // Extract required fields
-    let app = params
-        .get("app")
-        .ok_or_else(|| AppError::InvalidInput("Missing 'app' parameter".to_string()))?
-        .clone();
-
-    // Validate app type
-    if app != "claude" && app != "codex" && app != "gemini" {
-        return Err(AppError::InvalidInput(format!(
-            "Invalid app type: must be 'claude', 'codex', or 'gemini', got '{app}'"
-        )));
-    }
-
-    let name = params
-        .get("name")
-        .ok_or_else(|| AppError::InvalidInput("Missing 'name' parameter".to_string()))?
-        .clone();
-
-    let homepage = params
-        .get("homepage")
-        .ok_or_else(|| AppError::InvalidInput("Missing 'homepage' parameter".to_string()))?
-        .clone();
-
-    let endpoint = params
-        .get("endpoint")
-        .ok_or_else(|| AppError::InvalidInput("Missing 'endpoint' parameter".to_string()))?
-        .clone();
-
-    let api_key = params
-        .get("apiKey")
-        .ok_or_else(|| AppError::InvalidInput("Missing 'apiKey' parameter".to_string()))?
-        .clone();
-
-    // Validate URLs
-    validate_url(&homepage, "homepage")?;
-    validate_url(&endpoint, "endpoint")?;
-
-    // Extract optional fields
-    let model = params.get("model").cloned();
-    let notes = params.get("notes").cloned();
-
-    Ok(DeepLinkImportRequest {
-        version,
-        resource,
-        app,
-        name,
-        homepage,
-        endpoint,
-        api_key,
-        model,
-        notes,
-    })
-}
-
-/// Validate that a string is a valid HTTP(S) URL
-fn validate_url(url_str: &str, field_name: &str) -> Result<(), AppError> {
-    let url = Url::parse(url_str)
-        .map_err(|e| AppError::InvalidInput(format!("Invalid URL for '{field_name}': {e}")))?;
-
-    let scheme = url.scheme();
-    if scheme != "http" && scheme != "https" {
-        return Err(AppError::InvalidInput(format!(
-            "Invalid URL scheme for '{field_name}': must be http or https, got '{scheme}'"
-        )));
-    }
-
-    Ok(())
-}
-
-/// Import a provider from a deep link request
-///
-/// This function:
-/// 1. Validates the request
-/// 2. Converts it to a Provider structure
-/// 3. Delegates to ProviderService for actual import
-pub fn import_provider_from_deeplink(
-    state: &AppState,
-    request: DeepLinkImportRequest,
-) -> Result<String, AppError> {
-    // Parse app type
-    let app_type = AppType::from_str(&request.app)
-        .map_err(|_| AppError::InvalidInput(format!("Invalid app type: {}", request.app)))?;
-
-    // Build provider configuration based on app type
-    let mut provider = build_provider_from_request(&app_type, &request)?;
-
-    // Generate a unique ID for the provider using timestamp + sanitized name
-    // This is similar to how frontend generates IDs
-    let timestamp = chrono::Utc::now().timestamp_millis();
-    let sanitized_name = request
-        .name
-        .chars()
-        .filter(|c| c.is_alphanumeric() || *c == '-' || *c == '_')
-        .collect::<String>()
-        .to_lowercase();
-    provider.id = format!("{sanitized_name}-{timestamp}");
-
-    let provider_id = provider.id.clone();
-
-    // Use ProviderService to add the provider
-    ProviderService::add(state, app_type, provider)?;
-
-    Ok(provider_id)
-}
-
-/// Build a Provider structure from a deep link request
-fn build_provider_from_request(
-    app_type: &AppType,
-    request: &DeepLinkImportRequest,
-) -> Result<Provider, AppError> {
-    use serde_json::json;
-
-    let settings_config = match app_type {
-        AppType::Claude => {
-            // Claude configuration structure
-            let mut env = serde_json::Map::new();
-            env.insert("ANTHROPIC_AUTH_TOKEN".to_string(), json!(request.api_key));
-            env.insert("ANTHROPIC_BASE_URL".to_string(), json!(request.endpoint));
-
-            // Add model if provided (use as default model)
-            if let Some(model) = &request.model {
-                env.insert("ANTHROPIC_MODEL".to_string(), json!(model));
-            }
-
-            json!({ "env": env })
-        }
-        AppType::Codex => {
-            // Codex configuration structure
-            // For Codex, we store auth.json (JSON) and config.toml (TOML string) in settings_config。
-            //
-            // 这里尽量与前端 `getCodexCustomTemplate` 的默认模板保持一致，
-            // 再根据深链接参数注入 base_url / model，避免出现“只有 base_url 行”的极简配置，
-            // 让通过 UI 新建和通过深链接导入的 Codex 自定义供应商行为一致。
-
-            // 1. 生成一个适合作为 model_provider 名的安全标识
-            //    规则尽量与前端 codexProviderPresets.generateThirdPartyConfig 保持一致：
-            //    - 转小写
-            //    - 非 [a-z0-9_] 统一替换为下划线
-            //    - 去掉首尾下划线
-            //    - 若结果为空，则使用 "custom"
-            let clean_provider_name = {
-                let raw: String = request.name.chars().filter(|c| !c.is_control()).collect();
-                let lower = raw.to_lowercase();
-                let mut key: String = lower
-                    .chars()
-                    .map(|c| match c {
-                        'a'..='z' | '0'..='9' | '_' => c,
-                        _ => '_',
-                    })
-                    .collect();
-
-                // 去掉首尾下划线
-                while key.starts_with('_') {
-                    key.remove(0);
-                }
-                while key.ends_with('_') {
-                    key.pop();
-                }
-
-                if key.is_empty() {
-                    "custom".to_string()
-                } else {
-                    key
-                }
-            };
-
-            // 2. 模型名称：优先使用 deeplink 中的 model，否则退回到 Codex 默认模型
-            let model_name = request
-                .model
-                .as_deref()
-                .unwrap_or("gpt-5-codex")
-                .to_string();
-
-            // 3. 端点：与 UI 中 Base URL 处理方式保持一致，去掉结尾多余的斜杠
-            let endpoint = request.endpoint.trim().trim_end_matches('/').to_string();
-
-            // 4. 组装 config.toml 内容
-            // 使用 Rust 1.58+ 的内联格式化语法，避免 clippy::uninlined_format_args 警告
-            let config_toml = format!(
-                r#"model_provider = "{clean_provider_name}"
-model = "{model_name}"
-model_reasoning_effort = "high"
-disable_response_storage = true
-
-[model_providers.{clean_provider_name}]
-name = "{clean_provider_name}"
-base_url = "{endpoint}"
-wire_api = "responses"
-requires_openai_auth = true
-"#
-            );
-
-            json!({
-                "auth": {
-                    "OPENAI_API_KEY": request.api_key,
-                },
-                "config": config_toml
-            })
-        }
-        AppType::Gemini => {
-            // Gemini configuration structure (.env format)
-            let mut env = serde_json::Map::new();
-            env.insert("GEMINI_API_KEY".to_string(), json!(request.api_key));
-            env.insert(
-                "GOOGLE_GEMINI_BASE_URL".to_string(),
-                json!(request.endpoint),
-            );
-
-            // Add model if provided
-            if let Some(model) = &request.model {
-                env.insert("GEMINI_MODEL".to_string(), json!(model));
-            }
-
-            json!({ "env": env })
-        }
-    };
-
-    let provider = Provider {
-        id: String::new(), // Will be generated by ProviderService
-        name: request.name.clone(),
-        settings_config,
-        website_url: Some(request.homepage.clone()),
-        category: None,
-        created_at: None,
-        sort_index: None,
-        notes: request.notes.clone(),
-        meta: None,
-    };
-
-    Ok(provider)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse_valid_claude_deeplink() {
-        let url = "ccswitch://v1/import?resource=provider&app=claude&name=Test%20Provider&homepage=https%3A%2F%2Fexample.com&endpoint=https%3A%2F%2Fapi.example.com&apiKey=sk-test-123";
-
-        let request = parse_deeplink_url(url).unwrap();
-
-        assert_eq!(request.version, "v1");
-        assert_eq!(request.resource, "provider");
-        assert_eq!(request.app, "claude");
-        assert_eq!(request.name, "Test Provider");
-        assert_eq!(request.homepage, "https://example.com");
-        assert_eq!(request.endpoint, "https://api.example.com");
-        assert_eq!(request.api_key, "sk-test-123");
-    }
-
-    #[test]
-    fn test_parse_deeplink_with_notes() {
-        let url = "ccswitch://v1/import?resource=provider&app=codex&name=Codex&homepage=https%3A%2F%2Fcodex.com&endpoint=https%3A%2F%2Fapi.codex.com&apiKey=key123&notes=Test%20notes";
-
-        let request = parse_deeplink_url(url).unwrap();
-
-        assert_eq!(request.notes, Some("Test notes".to_string()));
-    }
-
-    #[test]
-    fn test_parse_invalid_scheme() {
-        let url = "https://v1/import?resource=provider&app=claude&name=Test";
-
-        let result = parse_deeplink_url(url);
-        assert!(result.is_err());
-        assert!(result.unwrap_err().to_string().contains("Invalid scheme"));
-    }
-
-    #[test]
-    fn test_parse_unsupported_version() {
-        let url = "ccswitch://v2/import?resource=provider&app=claude&name=Test";
-
-        let result = parse_deeplink_url(url);
-        assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("Unsupported protocol version"));
-    }
-
-    #[test]
-    fn test_parse_missing_required_field() {
-        let url = "ccswitch://v1/import?resource=provider&app=claude&name=Test";
-
-        let result = parse_deeplink_url(url);
-        assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("Missing 'homepage' parameter"));
-    }
-
-    #[test]
-    fn test_validate_invalid_url() {
-        let result = validate_url("not-a-url", "test");
-        assert!(result.is_err());
-    }
-
-    #[test]
-    fn test_validate_invalid_scheme() {
-        let result = validate_url("ftp://example.com", "test");
-        assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("must be http or https"));
-    }
-
-    #[test]
-    fn test_build_gemini_provider_with_model() {
-        let request = DeepLinkImportRequest {
-            version: "v1".to_string(),
-            resource: "provider".to_string(),
-            app: "gemini".to_string(),
-            name: "Test Gemini".to_string(),
-            homepage: "https://example.com".to_string(),
-            endpoint: "https://api.example.com".to_string(),
-            api_key: "test-api-key".to_string(),
-            model: Some("gemini-2.0-flash".to_string()),
-            notes: None,
-        };
-
-        let provider = build_provider_from_request(&AppType::Gemini, &request).unwrap();
-
-        // Verify provider basic info
-        assert_eq!(provider.name, "Test Gemini");
-        assert_eq!(
-            provider.website_url,
-            Some("https://example.com".to_string())
-        );
-
-        // Verify settings_config structure
-        let env = provider.settings_config["env"].as_object().unwrap();
-        assert_eq!(env["GEMINI_API_KEY"], "test-api-key");
-        assert_eq!(env["GOOGLE_GEMINI_BASE_URL"], "https://api.example.com");
-        assert_eq!(env["GEMINI_MODEL"], "gemini-2.0-flash");
-    }
-
-    #[test]
-    fn test_build_gemini_provider_without_model() {
-        let request = DeepLinkImportRequest {
-            version: "v1".to_string(),
-            resource: "provider".to_string(),
-            app: "gemini".to_string(),
-            name: "Test Gemini".to_string(),
-            homepage: "https://example.com".to_string(),
-            endpoint: "https://api.example.com".to_string(),
-            api_key: "test-api-key".to_string(),
-            model: None,
-            notes: None,
-        };
-
-        let provider = build_provider_from_request(&AppType::Gemini, &request).unwrap();
-
-        // Verify settings_config structure
-        let env = provider.settings_config["env"].as_object().unwrap();
-        assert_eq!(env["GEMINI_API_KEY"], "test-api-key");
-        assert_eq!(env["GOOGLE_GEMINI_BASE_URL"], "https://api.example.com");
-        // Model should not be present
-        assert!(env.get("GEMINI_MODEL").is_none());
-    }
-}
@@ -0,0 +1,191 @@
+//! MCP server import from deep link
+//!
+//! Handles batch import of MCP server configurations via ccswitch:// URLs.
+
+use super::utils::decode_base64_param;
+use super::DeepLinkImportRequest;
+use crate::app_config::{McpApps, McpServer};
+use crate::error::AppError;
+use crate::services::McpService;
+use crate::store::AppState;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+/// MCP import result
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpImportResult {
+    /// Number of successfully imported MCP servers
+    pub imported_count: usize,
+    /// IDs of successfully imported MCP servers
+    pub imported_ids: Vec<String>,
+    /// Failed imports with error messages
+    pub failed: Vec<McpImportError>,
+}
+
+/// MCP import error
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpImportError {
+    /// MCP server ID
+    pub id: String,
+    /// Error message
+    pub error: String,
+}
+
+/// Import MCP servers from deep link request
+///
+/// This function handles batch import of MCP servers from standard MCP JSON format.
+/// If a server already exists, only the apps flags are merged (existing config preserved).
+pub fn import_mcp_from_deeplink(
+    state: &AppState,
+    request: DeepLinkImportRequest,
+) -> Result<McpImportResult, AppError> {
+    // Verify this is an MCP request
+    if request.resource != "mcp" {
+        return Err(AppError::InvalidInput(format!(
+            "Expected mcp resource, got '{}'",
+            request.resource
+        )));
+    }
+
+    // Extract and validate apps parameter
+    let apps_str = request
+        .apps
+        .as_ref()
+        .ok_or_else(|| AppError::InvalidInput("Missing 'apps' parameter for MCP".to_string()))?;
+
+    // Parse apps into McpApps struct
+    let target_apps = parse_mcp_apps(apps_str)?;
+
+    // Extract config
+    let config_b64 = request
+        .config
+        .as_ref()
+        .ok_or_else(|| AppError::InvalidInput("Missing 'config' parameter for MCP".to_string()))?;
+
+    // Decode Base64 config
+    let decoded = decode_base64_param("config", config_b64)?;
+
+    let config_str = String::from_utf8(decoded)
+        .map_err(|e| AppError::InvalidInput(format!("Invalid UTF-8 in config: {e}")))?;
+
+    // Parse JSON
+    let config_json: Value = serde_json::from_str(&config_str)
+        .map_err(|e| AppError::InvalidInput(format!("Invalid JSON in MCP config: {e}")))?;
+
+    // Extract mcpServers object
+    let mcp_servers = config_json
+        .get("mcpServers")
+        .and_then(|v| v.as_object())
+        .ok_or_else(|| {
+            AppError::InvalidInput("MCP config must contain 'mcpServers' object".to_string())
+        })?;
+
+    if mcp_servers.is_empty() {
+        return Err(AppError::InvalidInput(
+            "No MCP servers found in config".to_string(),
+        ));
+    }
+
+    // Get existing servers to check for duplicates
+    let existing_servers = state.db.get_all_mcp_servers()?;
+
+    // Import each MCP server
+    let mut imported_ids = Vec::new();
+    let mut failed = Vec::new();
+
+    for (id, server_spec) in mcp_servers.iter() {
+        // Check if server already exists
+        let server = if let Some(existing) = existing_servers.get(id) {
+            // Server exists - merge apps only, keep other fields unchanged
+            log::info!("MCP server '{id}' already exists, merging apps only");
+
+            let mut merged_apps = existing.apps.clone();
+            // Merge new apps into existing apps
+            if target_apps.claude {
+                merged_apps.claude = true;
+            }
+            if target_apps.codex {
+                merged_apps.codex = true;
+            }
+            if target_apps.gemini {
+                merged_apps.gemini = true;
+            }
+
+            McpServer {
+                id: existing.id.clone(),
+                name: existing.name.clone(),
+                server: existing.server.clone(), // Keep existing server config
+                apps: merged_apps,               // Merged apps
+                description: existing.description.clone(),
+                homepage: existing.homepage.clone(),
+                docs: existing.docs.clone(),
+                tags: existing.tags.clone(),
+            }
+        } else {
+            // New server - create with provided config
+            log::info!("Creating new MCP server: {id}");
+            McpServer {
+                id: id.clone(),
+                name: id.clone(),
+                server: server_spec.clone(),
+                apps: target_apps.clone(),
+                description: None,
+                homepage: None,
+                docs: None,
+                tags: vec!["imported".to_string()],
+            }
+        };
+
+        match McpService::upsert_server(state, server) {
+            Ok(_) => {
+                imported_ids.push(id.clone());
+                log::info!("Successfully imported/updated MCP server: {id}");
+            }
+            Err(e) => {
+                failed.push(McpImportError {
+                    id: id.clone(),
+                    error: format!("{e}"),
+                });
+                log::warn!("Failed to import MCP server '{id}': {e}");
+            }
+        }
+    }
+
+    Ok(McpImportResult {
+        imported_count: imported_ids.len(),
+        imported_ids,
+        failed,
+    })
+}
+
+/// Parse apps string into McpApps struct
+pub(crate) fn parse_mcp_apps(apps_str: &str) -> Result<McpApps, AppError> {
+    let mut apps = McpApps {
+        claude: false,
+        codex: false,
+        gemini: false,
+    };
+
+    for app in apps_str.split(',') {
+        match app.trim() {
+            "claude" => apps.claude = true,
+            "codex" => apps.codex = true,
+            "gemini" => apps.gemini = true,
+            other => {
+                return Err(AppError::InvalidInput(format!(
+                    "Invalid app in 'apps': {other}"
+                )))
+            }
+        }
+    }
+
+    if apps.is_empty() {
+        return Err(AppError::InvalidInput(
+            "At least one app must be specified in 'apps'".to_string(),
+        ));
+    }
+
+    Ok(apps)
+}
@@ -0,0 +1,139 @@
+//! Deep link import functionality for CC Switch
+//!
+//! This module implements the ccswitch:// protocol for importing configurations
+//! via deep links. Supports importing:
+//! - Provider configurations (Claude/Codex/Gemini)
+//! - MCP server configurations
+//! - Prompts
+//! - Skills
+//!
+//! See docs/ccswitch-deeplink-design.md for detailed design.
+
+mod mcp;
+mod parser;
+mod prompt;
+mod provider;
+mod skill;
+mod utils;
+
+#[cfg(test)]
+mod tests;
+
+use serde::{Deserialize, Serialize};
+
+// Re-export public API
+pub use mcp::import_mcp_from_deeplink;
+pub use parser::parse_deeplink_url;
+pub use prompt::import_prompt_from_deeplink;
+pub use provider::{import_provider_from_deeplink, parse_and_merge_config};
+pub use skill::import_skill_from_deeplink;
+
+/// Deep link import request model
+///
+/// Represents a parsed ccswitch:// URL ready for processing.
+/// This struct contains all possible fields for all resource types.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct DeepLinkImportRequest {
+    /// Protocol version (e.g., "v1")
+    pub version: String,
+    /// Resource type to import: "provider" | "prompt" | "mcp" | "skill"
+    pub resource: String,
+
+    // ============ Common fields ============
+    /// Target application (claude/codex/gemini) - for provider, prompt, skill
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub app: Option<String>,
+    /// Resource name
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Whether to enable after import (default: false)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enabled: Option<bool>,
+
+    // ============ Provider-specific fields ============
+    /// Provider homepage URL
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub homepage: Option<String>,
+    /// API endpoint/base URL
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub endpoint: Option<String>,
+    /// API key
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub api_key: Option<String>,
+    /// Optional provider icon name (maps to built-in SVG)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub icon: Option<String>,
+    /// Optional model name
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    /// Optional notes/description
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub notes: Option<String>,
+    /// Optional Haiku model (Claude only, v3.7.1+)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub haiku_model: Option<String>,
+    /// Optional Sonnet model (Claude only, v3.7.1+)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sonnet_model: Option<String>,
+    /// Optional Opus model (Claude only, v3.7.1+)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub opus_model: Option<String>,
+
+    // ============ Prompt-specific fields ============
+    /// Base64 encoded Markdown content
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub content: Option<String>,
+    /// Prompt description
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+
+    // ============ MCP-specific fields ============
+    /// Target applications for MCP (comma-separated: "claude,codex,gemini")
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub apps: Option<String>,
+
+    // ============ Skill-specific fields ============
+    /// GitHub repository (format: "owner/name")
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo: Option<String>,
+    /// Skill directory name
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub directory: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub branch: Option<String>,
+
+    // ============ Config file fields (v3.8+) ============
+    /// Base64 encoded config content
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config: Option<String>,
+    /// Config format (json/toml)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_format: Option<String>,
+    /// Remote config URL
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_url: Option<String>,
+
+    // ============ Usage script fields (v3.9+) ============
+    /// Whether to enable usage query (default: true if usage_script is provided)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub usage_enabled: Option<bool>,
+    /// Base64 encoded usage query script code
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub usage_script: Option<String>,
+    /// Usage query API key (if different from provider API key)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub usage_api_key: Option<String>,
+    /// Usage query base URL (if different from provider endpoint)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub usage_base_url: Option<String>,
+    /// Usage query access token (for NewAPI template)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub usage_access_token: Option<String>,
+    /// Usage query user ID (for NewAPI template)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub usage_user_id: Option<String>,
+    /// Auto query interval in minutes (0 to disable)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub usage_auto_interval: Option<u64>,
+}
@@ -0,0 +1,354 @@
+//! Deep link URL parser
+//!
+//! Parses ccswitch:// URLs into DeepLinkImportRequest structures.
+
+use super::utils::validate_url;
+use super::DeepLinkImportRequest;
+use crate::error::AppError;
+use std::collections::HashMap;
+use url::Url;
+
+/// Parse a ccswitch:// URL into a DeepLinkImportRequest
+///
+/// Expected format:
+/// ccswitch://v1/import?resource={type}&...
+pub fn parse_deeplink_url(url_str: &str) -> Result<DeepLinkImportRequest, AppError> {
+    // Parse URL
+    let url = Url::parse(url_str)
+        .map_err(|e| AppError::InvalidInput(format!("Invalid deep link URL: {e}")))?;
+
+    // Validate scheme
+    let scheme = url.scheme();
+    if scheme != "ccswitch" {
+        return Err(AppError::InvalidInput(format!(
+            "Invalid scheme: expected 'ccswitch', got '{scheme}'"
+        )));
+    }
+
+    // Extract version from host
+    let version = url
+        .host_str()
+        .ok_or_else(|| AppError::InvalidInput("Missing version in URL host".to_string()))?
+        .to_string();
+
+    // Validate version
+    if version != "v1" {
+        return Err(AppError::InvalidInput(format!(
+            "Unsupported protocol version: {version}"
+        )));
+    }
+
+    // Extract path (should be "/import")
+    let path = url.path();
+    if path != "/import" {
+        return Err(AppError::InvalidInput(format!(
+            "Invalid path: expected '/import', got '{path}'"
+        )));
+    }
+
+    // Parse query parameters
+    let params: HashMap<String, String> = url.query_pairs().into_owned().collect();
+
+    // Extract and validate resource type
+    let resource = params
+        .get("resource")
+        .ok_or_else(|| AppError::InvalidInput("Missing 'resource' parameter".to_string()))?
+        .clone();
+
+    // Dispatch to appropriate parser based on resource type
+    match resource.as_str() {
+        "provider" => parse_provider_deeplink(&params, version, resource),
+        "prompt" => parse_prompt_deeplink(&params, version, resource),
+        "mcp" => parse_mcp_deeplink(&params, version, resource),
+        "skill" => parse_skill_deeplink(&params, version, resource),
+        _ => Err(AppError::InvalidInput(format!(
+            "Unsupported resource type: {resource}"
+        ))),
+    }
+}
+
+/// Parse provider deep link parameters
+fn parse_provider_deeplink(
+    params: &HashMap<String, String>,
+    version: String,
+    resource: String,
+) -> Result<DeepLinkImportRequest, AppError> {
+    let app = params
+        .get("app")
+        .ok_or_else(|| AppError::InvalidInput("Missing 'app' parameter".to_string()))?
+        .clone();
+
+    // Validate app type
+    if app != "claude" && app != "codex" && app != "gemini" {
+        return Err(AppError::InvalidInput(format!(
+            "Invalid app type: must be 'claude', 'codex', or 'gemini', got '{app}'"
+        )));
+    }
+
+    let name = params
+        .get("name")
+        .ok_or_else(|| AppError::InvalidInput("Missing 'name' parameter".to_string()))?
+        .clone();
+
+    // Make these optional for config file auto-fill (v3.8+)
+    let homepage = params.get("homepage").cloned();
+    let endpoint = params.get("endpoint").cloned();
+    let api_key = params.get("apiKey").cloned();
+
+    // Validate URLs only if provided
+    if let Some(ref hp) = homepage {
+        if !hp.is_empty() {
+            validate_url(hp, "homepage")?;
+        }
+    }
+    if let Some(ref ep) = endpoint {
+        if !ep.is_empty() {
+            validate_url(ep, "endpoint")?;
+        }
+    }
+
+    // Extract optional fields
+    let model = params.get("model").cloned();
+    let notes = params.get("notes").cloned();
+    let haiku_model = params.get("haikuModel").cloned();
+    let sonnet_model = params.get("sonnetModel").cloned();
+    let opus_model = params.get("opusModel").cloned();
+    let icon = params
+        .get("icon")
+        .map(|v| v.trim().to_lowercase())
+        .filter(|v| !v.is_empty());
+    let config = params.get("config").cloned();
+    let config_format = params.get("configFormat").cloned();
+    let config_url = params.get("configUrl").cloned();
+    let enabled = params.get("enabled").and_then(|v| v.parse::<bool>().ok());
+
+    // Extract usage script fields (v3.9+)
+    let usage_enabled = params
+        .get("usageEnabled")
+        .and_then(|v| v.parse::<bool>().ok());
+    let usage_script = params.get("usageScript").cloned();
+    let usage_api_key = params.get("usageApiKey").cloned();
+    let usage_base_url = params.get("usageBaseUrl").cloned();
+    let usage_access_token = params.get("usageAccessToken").cloned();
+    let usage_user_id = params.get("usageUserId").cloned();
+    let usage_auto_interval = params
+        .get("usageAutoInterval")
+        .and_then(|v| v.parse::<u64>().ok());
+
+    Ok(DeepLinkImportRequest {
+        version,
+        resource,
+        app: Some(app),
+        name: Some(name),
+        enabled,
+        homepage,
+        endpoint,
+        api_key,
+        icon,
+        model,
+        notes,
+        haiku_model,
+        sonnet_model,
+        opus_model,
+        content: None,
+        description: None,
+        apps: None,
+        repo: None,
+        directory: None,
+        branch: None,
+        config,
+        config_format,
+        config_url,
+        usage_enabled,
+        usage_script,
+        usage_api_key,
+        usage_base_url,
+        usage_access_token,
+        usage_user_id,
+        usage_auto_interval,
+    })
+}
+
+/// Parse prompt deep link parameters
+fn parse_prompt_deeplink(
+    params: &HashMap<String, String>,
+    version: String,
+    resource: String,
+) -> Result<DeepLinkImportRequest, AppError> {
+    let app = params
+        .get("app")
+        .ok_or_else(|| AppError::InvalidInput("Missing 'app' parameter for prompt".to_string()))?
+        .clone();
+
+    // Validate app type
+    if app != "claude" && app != "codex" && app != "gemini" {
+        return Err(AppError::InvalidInput(format!(
+            "Invalid app type: must be 'claude', 'codex', or 'gemini', got '{app}'"
+        )));
+    }
+
+    let name = params
+        .get("name")
+        .ok_or_else(|| AppError::InvalidInput("Missing 'name' parameter for prompt".to_string()))?
+        .clone();
+
+    let content = params
+        .get("content")
+        .ok_or_else(|| {
+            AppError::InvalidInput("Missing 'content' parameter for prompt".to_string())
+        })?
+        .clone();
+
+    let description = params.get("description").cloned();
+    let enabled = params.get("enabled").and_then(|v| v.parse::<bool>().ok());
+
+    Ok(DeepLinkImportRequest {
+        version,
+        resource,
+        app: Some(app),
+        name: Some(name),
+        enabled,
+        content: Some(content),
+        description,
+        icon: None,
+        homepage: None,
+        endpoint: None,
+        api_key: None,
+        model: None,
+        notes: None,
+        haiku_model: None,
+        sonnet_model: None,
+        opus_model: None,
+        apps: None,
+        repo: None,
+        directory: None,
+        branch: None,
+        config: None,
+        config_format: None,
+        config_url: None,
+        usage_enabled: None,
+        usage_script: None,
+        usage_api_key: None,
+        usage_base_url: None,
+        usage_access_token: None,
+        usage_user_id: None,
+        usage_auto_interval: None,
+    })
+}
+
+/// Parse MCP deep link parameters
+fn parse_mcp_deeplink(
+    params: &HashMap<String, String>,
+    version: String,
+    resource: String,
+) -> Result<DeepLinkImportRequest, AppError> {
+    let apps = params
+        .get("apps")
+        .ok_or_else(|| AppError::InvalidInput("Missing 'apps' parameter for MCP".to_string()))?
+        .clone();
+
+    // Validate apps format
+    for app in apps.split(',') {
+        let trimmed = app.trim();
+        if trimmed != "claude" && trimmed != "codex" && trimmed != "gemini" {
+            return Err(AppError::InvalidInput(format!(
+                "Invalid app in 'apps': must be 'claude', 'codex', or 'gemini', got '{trimmed}'"
+            )));
+        }
+    }
+
+    let config = params
+        .get("config")
+        .ok_or_else(|| AppError::InvalidInput("Missing 'config' parameter for MCP".to_string()))?
+        .clone();
+
+    let enabled = params.get("enabled").and_then(|v| v.parse::<bool>().ok());
+
+    Ok(DeepLinkImportRequest {
+        version,
+        resource,
+        apps: Some(apps),
+        enabled,
+        config: Some(config),
+        config_format: Some("json".to_string()), // MCP config is always JSON
+        app: None,
+        name: None,
+        icon: None,
+        homepage: None,
+        endpoint: None,
+        api_key: None,
+        model: None,
+        notes: None,
+        haiku_model: None,
+        sonnet_model: None,
+        opus_model: None,
+        content: None,
+        description: None,
+        repo: None,
+        directory: None,
+        branch: None,
+        config_url: None,
+        usage_enabled: None,
+        usage_script: None,
+        usage_api_key: None,
+        usage_base_url: None,
+        usage_access_token: None,
+        usage_user_id: None,
+        usage_auto_interval: None,
+    })
+}
+
+/// Parse skill deep link parameters
+fn parse_skill_deeplink(
+    params: &HashMap<String, String>,
+    version: String,
+    resource: String,
+) -> Result<DeepLinkImportRequest, AppError> {
+    let repo = params
+        .get("repo")
+        .ok_or_else(|| AppError::InvalidInput("Missing 'repo' parameter for skill".to_string()))?
+        .clone();
+
+    // Validate repo format (should be "owner/name")
+    if !repo.contains('/') || repo.split('/').count() != 2 {
+        return Err(AppError::InvalidInput(format!(
+            "Invalid repo format: expected 'owner/name', got '{repo}'"
+        )));
+    }
+
+    let directory = params.get("directory").cloned();
+    let branch = params.get("branch").cloned();
+
+    Ok(DeepLinkImportRequest {
+        version,
+        resource,
+        repo: Some(repo),
+        directory,
+        branch,
+        icon: None,
+        app: Some("claude".to_string()), // Skills are Claude-only
+        name: None,
+        enabled: None,
+        homepage: None,
+        endpoint: None,
+        api_key: None,
+        model: None,
+        notes: None,
+        haiku_model: None,
+        sonnet_model: None,
+        opus_model: None,
+        content: None,
+        description: None,
+        apps: None,
+        config: None,
+        config_format: None,
+        config_url: None,
+        usage_enabled: None,
+        usage_script: None,
+        usage_api_key: None,
+        usage_base_url: None,
+        usage_access_token: None,
+        usage_user_id: None,
+        usage_auto_interval: None,
+    })
+}
@@ -0,0 +1,86 @@
+//! Prompt import from deep link
+//!
+//! Handles importing prompt configurations via ccswitch:// URLs.
+
+use super::utils::decode_base64_param;
+use super::DeepLinkImportRequest;
+use crate::error::AppError;
+use crate::prompt::Prompt;
+use crate::services::PromptService;
+use crate::store::AppState;
+use crate::AppType;
+use std::str::FromStr;
+
+/// Import a prompt from deep link request
+pub fn import_prompt_from_deeplink(
+    state: &AppState,
+    request: DeepLinkImportRequest,
+) -> Result<String, AppError> {
+    // Verify this is a prompt request
+    if request.resource != "prompt" {
+        return Err(AppError::InvalidInput(format!(
+            "Expected prompt resource, got '{}'",
+            request.resource
+        )));
+    }
+
+    // Extract required fields
+    let app_str = request
+        .app
+        .as_ref()
+        .ok_or_else(|| AppError::InvalidInput("Missing 'app' field for prompt".to_string()))?;
+
+    let name = request
+        .name
+        .ok_or_else(|| AppError::InvalidInput("Missing 'name' field for prompt".to_string()))?;
+
+    // Parse app type
+    let app_type = AppType::from_str(app_str)
+        .map_err(|_| AppError::InvalidInput(format!("Invalid app type: {app_str}")))?;
+
+    // Decode content
+    let content_b64 = request
+        .content
+        .as_ref()
+        .ok_or_else(|| AppError::InvalidInput("Missing 'content' field for prompt".to_string()))?;
+
+    let content = decode_base64_param("content", content_b64)?;
+    let content = String::from_utf8(content)
+        .map_err(|e| AppError::InvalidInput(format!("Invalid UTF-8 in content: {e}")))?;
+
+    // Generate ID
+    let timestamp = chrono::Utc::now().timestamp_millis();
+    let sanitized_name = name
+        .chars()
+        .filter(|c| c.is_alphanumeric() || *c == '-' || *c == '_')
+        .collect::<String>()
+        .to_lowercase();
+    let id = format!("{sanitized_name}-{timestamp}");
+
+    // Check if we should enable this prompt
+    let should_enable = request.enabled.unwrap_or(false);
+
+    // Create Prompt (initially disabled)
+    let prompt = Prompt {
+        id: id.clone(),
+        name: name.clone(),
+        content,
+        description: request.description,
+        enabled: false, // Always start as disabled, will be enabled later if needed
+        created_at: Some(timestamp),
+        updated_at: Some(timestamp),
+    };
+
+    // Save using PromptService
+    PromptService::upsert_prompt(state, app_type.clone(), &id, prompt)?;
+
+    // If enabled flag is set, enable this prompt (which will disable others)
+    if should_enable {
+        PromptService::enable_prompt(state, app_type, &id)?;
+        log::info!("Successfully imported and enabled prompt '{name}' for {app_str}");
+    } else {
+        log::info!("Successfully imported prompt '{name}' for {app_str} (disabled)");
+    }
+
+    Ok(id)
+}
@@ -0,0 +1,565 @@
+//! Provider import from deep link
+//!
+//! Handles importing provider configurations via ccswitch:// URLs.
+
+use super::utils::{decode_base64_param, infer_homepage_from_endpoint};
+use super::DeepLinkImportRequest;
+use crate::error::AppError;
+use crate::provider::{Provider, ProviderMeta, UsageScript};
+use crate::services::ProviderService;
+use crate::store::AppState;
+use crate::AppType;
+use serde_json::json;
+use std::str::FromStr;
+
+/// Import a provider from a deep link request
+///
+/// This function:
+/// 1. Validates the request
+/// 2. Merges config file if provided (v3.8+)
+/// 3. Converts it to a Provider structure
+/// 4. Delegates to ProviderService for actual import
+/// 5. Optionally sets as current provider if enabled=true
+pub fn import_provider_from_deeplink(
+    state: &AppState,
+    request: DeepLinkImportRequest,
+) -> Result<String, AppError> {
+    // Verify this is a provider request
+    if request.resource != "provider" {
+        return Err(AppError::InvalidInput(format!(
+            "Expected provider resource, got '{}'",
+            request.resource
+        )));
+    }
+
+    // Step 1: Merge config file if provided (v3.8+)
+    let merged_request = parse_and_merge_config(&request)?;
+
+    // Extract required fields (now as Option)
+    let app_str = merged_request
+        .app
+        .as_ref()
+        .ok_or_else(|| AppError::InvalidInput("Missing 'app' field for provider".to_string()))?;
+
+    let api_key = merged_request.api_key.as_ref().ok_or_else(|| {
+        AppError::InvalidInput("API key is required (either in URL or config file)".to_string())
+    })?;
+
+    if api_key.is_empty() {
+        return Err(AppError::InvalidInput(
+            "API key cannot be empty".to_string(),
+        ));
+    }
+
+    let endpoint = merged_request.endpoint.as_ref().ok_or_else(|| {
+        AppError::InvalidInput("Endpoint is required (either in URL or config file)".to_string())
+    })?;
+
+    if endpoint.is_empty() {
+        return Err(AppError::InvalidInput(
+            "Endpoint cannot be empty".to_string(),
+        ));
+    }
+
+    let homepage = merged_request.homepage.as_ref().ok_or_else(|| {
+        AppError::InvalidInput("Homepage is required (either in URL or config file)".to_string())
+    })?;
+
+    if homepage.is_empty() {
+        return Err(AppError::InvalidInput(
+            "Homepage cannot be empty".to_string(),
+        ));
+    }
+
+    let name = merged_request
+        .name
+        .as_ref()
+        .ok_or_else(|| AppError::InvalidInput("Missing 'name' field for provider".to_string()))?;
+
+    // Parse app type
+    let app_type = AppType::from_str(app_str)
+        .map_err(|_| AppError::InvalidInput(format!("Invalid app type: {app_str}")))?;
+
+    // Build provider configuration based on app type
+    let mut provider = build_provider_from_request(&app_type, &merged_request)?;
+
+    // Generate a unique ID for the provider using timestamp + sanitized name
+    let timestamp = chrono::Utc::now().timestamp_millis();
+    let sanitized_name = name
+        .chars()
+        .filter(|c| c.is_alphanumeric() || *c == '-' || *c == '_')
+        .collect::<String>()
+        .to_lowercase();
+    provider.id = format!("{sanitized_name}-{timestamp}");
+
+    let provider_id = provider.id.clone();
+
+    // Use ProviderService to add the provider
+    ProviderService::add(state, app_type.clone(), provider)?;
+
+    // If enabled=true, set as current provider
+    if merged_request.enabled.unwrap_or(false) {
+        ProviderService::switch(state, app_type.clone(), &provider_id)?;
+        log::info!("Provider '{provider_id}' set as current for {app_type:?}");
+    }
+
+    Ok(provider_id)
+}
+
+/// Build a Provider structure from a deep link request
+pub(crate) fn build_provider_from_request(
+    app_type: &AppType,
+    request: &DeepLinkImportRequest,
+) -> Result<Provider, AppError> {
+    let settings_config = match app_type {
+        AppType::Claude => build_claude_settings(request),
+        AppType::Codex => build_codex_settings(request),
+        AppType::Gemini => build_gemini_settings(request),
+    };
+
+    // Build usage script configuration if provided
+    let meta = build_provider_meta(request)?;
+
+    let provider = Provider {
+        id: String::new(), // Will be generated by caller
+        name: request.name.clone().unwrap_or_default(),
+        settings_config,
+        website_url: request.homepage.clone(),
+        category: None,
+        created_at: None,
+        sort_index: None,
+        notes: request.notes.clone(),
+        meta,
+        icon: request.icon.clone(),
+        icon_color: None,
+        in_failover_queue: false,
+    };
+
+    Ok(provider)
+}
+
+/// Build provider meta with usage script configuration
+fn build_provider_meta(request: &DeepLinkImportRequest) -> Result<Option<ProviderMeta>, AppError> {
+    // Check if any usage script fields are provided
+    if request.usage_script.is_none()
+        && request.usage_enabled.is_none()
+        && request.usage_api_key.is_none()
+        && request.usage_base_url.is_none()
+        && request.usage_access_token.is_none()
+        && request.usage_user_id.is_none()
+        && request.usage_auto_interval.is_none()
+    {
+        return Ok(None);
+    }
+
+    // Decode usage script code if provided
+    let code = if let Some(script_b64) = &request.usage_script {
+        let decoded = decode_base64_param("usage_script", script_b64)?;
+        String::from_utf8(decoded)
+            .map_err(|e| AppError::InvalidInput(format!("Invalid UTF-8 in usage_script: {e}")))?
+    } else {
+        String::new()
+    };
+
+    // Determine enabled state: explicit param > has code > false
+    let enabled = request.usage_enabled.unwrap_or(!code.is_empty());
+
+    // Build UsageScript - use provider's API key and endpoint as defaults
+    let usage_script = UsageScript {
+        enabled,
+        language: "javascript".to_string(),
+        code,
+        timeout: Some(10),
+        api_key: request
+            .usage_api_key
+            .clone()
+            .or_else(|| request.api_key.clone()),
+        base_url: request
+            .usage_base_url
+            .clone()
+            .or_else(|| request.endpoint.clone()),
+        access_token: request.usage_access_token.clone(),
+        user_id: request.usage_user_id.clone(),
+        auto_query_interval: request.usage_auto_interval,
+    };
+
+    Ok(Some(ProviderMeta {
+        usage_script: Some(usage_script),
+        ..Default::default()
+    }))
+}
+
+/// Build Claude settings configuration
+fn build_claude_settings(request: &DeepLinkImportRequest) -> serde_json::Value {
+    let mut env = serde_json::Map::new();
+    env.insert(
+        "ANTHROPIC_AUTH_TOKEN".to_string(),
+        json!(request.api_key.clone().unwrap_or_default()),
+    );
+    env.insert(
+        "ANTHROPIC_BASE_URL".to_string(),
+        json!(request.endpoint.clone().unwrap_or_default()),
+    );
+
+    // Add default model if provided
+    if let Some(model) = &request.model {
+        env.insert("ANTHROPIC_MODEL".to_string(), json!(model));
+    }
+
+    // Add Claude-specific model fields (v3.7.1+)
+    if let Some(haiku_model) = &request.haiku_model {
+        env.insert(
+            "ANTHROPIC_DEFAULT_HAIKU_MODEL".to_string(),
+            json!(haiku_model),
+        );
+    }
+    if let Some(sonnet_model) = &request.sonnet_model {
+        env.insert(
+            "ANTHROPIC_DEFAULT_SONNET_MODEL".to_string(),
+            json!(sonnet_model),
+        );
+    }
+    if let Some(opus_model) = &request.opus_model {
+        env.insert(
+            "ANTHROPIC_DEFAULT_OPUS_MODEL".to_string(),
+            json!(opus_model),
+        );
+    }
+
+    json!({ "env": env })
+}
+
+/// Build Codex settings configuration
+fn build_codex_settings(request: &DeepLinkImportRequest) -> serde_json::Value {
+    // Generate a safe provider name identifier
+    let clean_provider_name = {
+        let raw: String = request
+            .name
+            .clone()
+            .unwrap_or_else(|| "custom".to_string())
+            .chars()
+            .filter(|c| !c.is_control())
+            .collect();
+        let lower = raw.to_lowercase();
+        let mut key: String = lower
+            .chars()
+            .map(|c| match c {
+                'a'..='z' | '0'..='9' | '_' => c,
+                _ => '_',
+            })
+            .collect();
+
+        // Remove leading/trailing underscores
+        while key.starts_with('_') {
+            key.remove(0);
+        }
+        while key.ends_with('_') {
+            key.pop();
+        }
+
+        if key.is_empty() {
+            "custom".to_string()
+        } else {
+            key
+        }
+    };
+
+    // Model name: use deeplink model or default
+    let model_name = request
+        .model
+        .as_deref()
+        .unwrap_or("gpt-5-codex")
+        .to_string();
+
+    // Endpoint: normalize trailing slashes
+    let endpoint = request
+        .endpoint
+        .as_deref()
+        .unwrap_or("")
+        .trim()
+        .trim_end_matches('/')
+        .to_string();
+
+    // Build config.toml content
+    let config_toml = format!(
+        r#"model_provider = "{clean_provider_name}"
+model = "{model_name}"
+model_reasoning_effort = "high"
+disable_response_storage = true
+
+[model_providers.{clean_provider_name}]
+name = "{clean_provider_name}"
+base_url = "{endpoint}"
+wire_api = "responses"
+requires_openai_auth = true
+"#
+    );
+
+    json!({
+        "auth": {
+            "OPENAI_API_KEY": request.api_key,
+        },
+        "config": config_toml
+    })
+}
+
+/// Build Gemini settings configuration
+fn build_gemini_settings(request: &DeepLinkImportRequest) -> serde_json::Value {
+    let mut env = serde_json::Map::new();
+    env.insert("GEMINI_API_KEY".to_string(), json!(request.api_key));
+    env.insert(
+        "GOOGLE_GEMINI_BASE_URL".to_string(),
+        json!(request.endpoint),
+    );
+
+    // Add model if provided
+    if let Some(model) = &request.model {
+        env.insert("GEMINI_MODEL".to_string(), json!(model));
+    }
+
+    json!({ "env": env })
+}
+
+// =============================================================================
+// Config Merge Logic
+// =============================================================================
+
+/// Parse and merge configuration from Base64 encoded config or remote URL
+///
+/// Priority: URL params > inline config > remote config
+pub fn parse_and_merge_config(
+    request: &DeepLinkImportRequest,
+) -> Result<DeepLinkImportRequest, AppError> {
+    // If no config provided, return original request
+    if request.config.is_none() && request.config_url.is_none() {
+        return Ok(request.clone());
+    }
+
+    // Step 1: Get config content
+    let config_content = if let Some(config_b64) = &request.config {
+        // Decode Base64 inline config
+        let decoded = decode_base64_param("config", config_b64)?;
+        String::from_utf8(decoded)
+            .map_err(|e| AppError::InvalidInput(format!("Invalid UTF-8 in config: {e}")))?
+    } else if let Some(_config_url) = &request.config_url {
+        // Fetch remote config (TODO: implement remote fetching in next phase)
+        return Err(AppError::InvalidInput(
+            "Remote config URL is not yet supported. Use inline config instead.".to_string(),
+        ));
+    } else {
+        return Ok(request.clone());
+    };
+
+    // Step 2: Parse config based on format
+    let format = request.config_format.as_deref().unwrap_or("json");
+    let config_value: serde_json::Value = match format {
+        "json" => serde_json::from_str(&config_content)
+            .map_err(|e| AppError::InvalidInput(format!("Invalid JSON config: {e}")))?,
+        "toml" => {
+            let toml_value: toml::Value = toml::from_str(&config_content)
+                .map_err(|e| AppError::InvalidInput(format!("Invalid TOML config: {e}")))?;
+            // Convert TOML to JSON for uniform processing
+            serde_json::to_value(toml_value)
+                .map_err(|e| AppError::Message(format!("Failed to convert TOML to JSON: {e}")))?
+        }
+        _ => {
+            return Err(AppError::InvalidInput(format!(
+                "Unsupported config format: {format}"
+            )))
+        }
+    };
+
+    // Step 3: Extract values from config based on app type and merge with URL params
+    let mut merged = request.clone();
+
+    // MCP, Skill and other resource types don't need config merging
+    if request.resource != "provider" {
+        return Ok(merged);
+    }
+
+    match request.app.as_deref().unwrap_or("") {
+        "claude" => merge_claude_config(&mut merged, &config_value)?,
+        "codex" => merge_codex_config(&mut merged, &config_value)?,
+        "gemini" => merge_gemini_config(&mut merged, &config_value)?,
+        "" => {
+            // No app specified, skip merging
+            return Ok(merged);
+        }
+        _ => {
+            return Err(AppError::InvalidInput(format!(
+                "Invalid app type: {:?}",
+                request.app
+            )))
+        }
+    }
+
+    Ok(merged)
+}
+
+/// Merge Claude configuration from config file
+fn merge_claude_config(
+    request: &mut DeepLinkImportRequest,
+    config: &serde_json::Value,
+) -> Result<(), AppError> {
+    let env = config
+        .get("env")
+        .and_then(|v| v.as_object())
+        .ok_or_else(|| {
+            AppError::InvalidInput("Claude config must have 'env' object".to_string())
+        })?;
+
+    // Auto-fill API key if not provided in URL
+    if request.api_key.is_none() || request.api_key.as_ref().unwrap().is_empty() {
+        if let Some(token) = env.get("ANTHROPIC_AUTH_TOKEN").and_then(|v| v.as_str()) {
+            request.api_key = Some(token.to_string());
+        }
+    }
+
+    // Auto-fill endpoint if not provided in URL
+    if request.endpoint.is_none() || request.endpoint.as_ref().unwrap().is_empty() {
+        if let Some(base_url) = env.get("ANTHROPIC_BASE_URL").and_then(|v| v.as_str()) {
+            request.endpoint = Some(base_url.to_string());
+        }
+    }
+
+    // Auto-fill homepage from endpoint if not provided
+    if (request.homepage.is_none() || request.homepage.as_ref().unwrap().is_empty())
+        && request.endpoint.is_some()
+        && !request.endpoint.as_ref().unwrap().is_empty()
+    {
+        request.homepage = infer_homepage_from_endpoint(request.endpoint.as_ref().unwrap());
+        if request.homepage.is_none() {
+            request.homepage = Some("https://anthropic.com".to_string());
+        }
+    }
+
+    // Auto-fill model fields (URL params take priority)
+    if request.model.is_none() {
+        request.model = env
+            .get("ANTHROPIC_MODEL")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string());
+    }
+    if request.haiku_model.is_none() {
+        request.haiku_model = env
+            .get("ANTHROPIC_DEFAULT_HAIKU_MODEL")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string());
+    }
+    if request.sonnet_model.is_none() {
+        request.sonnet_model = env
+            .get("ANTHROPIC_DEFAULT_SONNET_MODEL")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string());
+    }
+    if request.opus_model.is_none() {
+        request.opus_model = env
+            .get("ANTHROPIC_DEFAULT_OPUS_MODEL")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string());
+    }
+
+    Ok(())
+}
+
+/// Merge Codex configuration from config file
+fn merge_codex_config(
+    request: &mut DeepLinkImportRequest,
+    config: &serde_json::Value,
+) -> Result<(), AppError> {
+    // Auto-fill API key from auth.OPENAI_API_KEY
+    if request.api_key.is_none() || request.api_key.as_ref().unwrap().is_empty() {
+        if let Some(api_key) = config
+            .get("auth")
+            .and_then(|v| v.get("OPENAI_API_KEY"))
+            .and_then(|v| v.as_str())
+        {
+            request.api_key = Some(api_key.to_string());
+        }
+    }
+
+    // Auto-fill endpoint and model from config string
+    if let Some(config_str) = config.get("config").and_then(|v| v.as_str()) {
+        // Parse TOML config string to extract base_url and model
+        if let Ok(toml_value) = toml::from_str::<toml::Value>(config_str) {
+            // Extract base_url from model_providers section
+            if request.endpoint.is_none() || request.endpoint.as_ref().unwrap().is_empty() {
+                if let Some(base_url) = extract_codex_base_url(&toml_value) {
+                    request.endpoint = Some(base_url);
+                }
+            }
+
+            // Extract model
+            if request.model.is_none() {
+                if let Some(model) = toml_value.get("model").and_then(|v| v.as_str()) {
+                    request.model = Some(model.to_string());
+                }
+            }
+        }
+    }
+
+    // Auto-fill homepage from endpoint
+    if (request.homepage.is_none() || request.homepage.as_ref().unwrap().is_empty())
+        && request.endpoint.is_some()
+        && !request.endpoint.as_ref().unwrap().is_empty()
+    {
+        request.homepage = infer_homepage_from_endpoint(request.endpoint.as_ref().unwrap());
+        if request.homepage.is_none() {
+            request.homepage = Some("https://openai.com".to_string());
+        }
+    }
+
+    Ok(())
+}
+
+/// Merge Gemini configuration from config file
+fn merge_gemini_config(
+    request: &mut DeepLinkImportRequest,
+    config: &serde_json::Value,
+) -> Result<(), AppError> {
+    // Gemini uses flat env structure
+    if request.api_key.is_none() || request.api_key.as_ref().unwrap().is_empty() {
+        if let Some(api_key) = config.get("GEMINI_API_KEY").and_then(|v| v.as_str()) {
+            request.api_key = Some(api_key.to_string());
+        }
+    }
+
+    if request.endpoint.is_none() || request.endpoint.as_ref().unwrap().is_empty() {
+        if let Some(base_url) = config.get("GEMINI_BASE_URL").and_then(|v| v.as_str()) {
+            request.endpoint = Some(base_url.to_string());
+        }
+    }
+
+    if request.model.is_none() {
+        request.model = config
+            .get("GEMINI_MODEL")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string());
+    }
+
+    // Auto-fill homepage from endpoint
+    if (request.homepage.is_none() || request.homepage.as_ref().unwrap().is_empty())
+        && request.endpoint.is_some()
+        && !request.endpoint.as_ref().unwrap().is_empty()
+    {
+        request.homepage = infer_homepage_from_endpoint(request.endpoint.as_ref().unwrap());
+        if request.homepage.is_none() {
+            request.homepage = Some("https://ai.google.dev".to_string());
+        }
+    }
+
+    Ok(())
+}
+
+/// Extract base_url from Codex TOML config
+fn extract_codex_base_url(toml_value: &toml::Value) -> Option<String> {
+    // Try to find base_url in model_providers section
+    if let Some(providers) = toml_value.get("model_providers").and_then(|v| v.as_table()) {
+        for (_key, provider) in providers.iter() {
+            if let Some(base_url) = provider.get("base_url").and_then(|v| v.as_str()) {
+                return Some(base_url.to_string());
+            }
+        }
+    }
+    None
+}
@@ -0,0 +1,51 @@
+//! Skill import from deep link
+//!
+//! Handles importing skill repository configurations via ccswitch:// URLs.
+
+use super::DeepLinkImportRequest;
+use crate::error::AppError;
+use crate::services::skill::SkillRepo;
+use crate::store::AppState;
+
+/// Import a skill from deep link request
+pub fn import_skill_from_deeplink(
+    state: &AppState,
+    request: DeepLinkImportRequest,
+) -> Result<String, AppError> {
+    // Verify this is a skill request
+    if request.resource != "skill" {
+        return Err(AppError::InvalidInput(format!(
+            "Expected skill resource, got '{}'",
+            request.resource
+        )));
+    }
+
+    // Parse repo
+    let repo_str = request
+        .repo
+        .ok_or_else(|| AppError::InvalidInput("Missing 'repo' field for skill".to_string()))?;
+
+    let parts: Vec<&str> = repo_str.split('/').collect();
+    if parts.len() != 2 {
+        return Err(AppError::InvalidInput(format!(
+            "Invalid repo format: expected 'owner/name', got '{repo_str}'"
+        )));
+    }
+    let owner = parts[0].to_string();
+    let name = parts[1].to_string();
+
+    // Create SkillRepo
+    let repo = SkillRepo {
+        owner: owner.clone(),
+        name: name.clone(),
+        branch: request.branch.unwrap_or_else(|| "main".to_string()),
+        enabled: request.enabled.unwrap_or(true),
+    };
+
+    // Save using Database
+    state.db.save_skill_repo(&repo)?;
+
+    log::info!("Successfully added skill repo '{owner}/{name}'");
+
+    Ok(format!("{owner}/{name}"))
+}
@@ -0,0 +1,406 @@
+//! Deep link module tests
+
+use super::mcp::parse_mcp_apps;
+use super::parser::parse_deeplink_url;
+use super::prompt::import_prompt_from_deeplink;
+use super::provider::parse_and_merge_config;
+use super::utils::{infer_homepage_from_endpoint, validate_url};
+use super::DeepLinkImportRequest;
+use crate::AppType;
+use crate::{store::AppState, Database};
+use base64::prelude::*;
+use std::sync::Arc;
+
+// =============================================================================
+// Parser Tests
+// =============================================================================
+
+#[test]
+fn test_parse_valid_claude_deeplink() {
+    let url = "ccswitch://v1/import?resource=provider&app=claude&name=Test%20Provider&homepage=https%3A%2F%2Fexample.com&endpoint=https%3A%2F%2Fapi.example.com&apiKey=sk-test-123&icon=claude";
+
+    let request = parse_deeplink_url(url).unwrap();
+
+    assert_eq!(request.version, "v1");
+    assert_eq!(request.resource, "provider");
+    assert_eq!(request.app, Some("claude".to_string()));
+    assert_eq!(request.name, Some("Test Provider".to_string()));
+    assert_eq!(request.homepage, Some("https://example.com".to_string()));
+    assert_eq!(
+        request.endpoint,
+        Some("https://api.example.com".to_string())
+    );
+    assert_eq!(request.api_key, Some("sk-test-123".to_string()));
+    assert_eq!(request.icon, Some("claude".to_string()));
+}
+
+#[test]
+fn test_parse_deeplink_with_notes() {
+    let url = "ccswitch://v1/import?resource=provider&app=codex&name=Codex&homepage=https%3A%2F%2Fcodex.com&endpoint=https%3A%2F%2Fapi.codex.com&apiKey=key123&notes=Test%20notes";
+
+    let request = parse_deeplink_url(url).unwrap();
+
+    assert_eq!(request.notes, Some("Test notes".to_string()));
+}
+
+#[test]
+fn test_parse_invalid_scheme() {
+    let url = "https://v1/import?resource=provider&app=claude&name=Test";
+
+    let result = parse_deeplink_url(url);
+    assert!(result.is_err());
+    assert!(result.unwrap_err().to_string().contains("Invalid scheme"));
+}
+
+#[test]
+fn test_parse_unsupported_version() {
+    let url = "ccswitch://v2/import?resource=provider&app=claude&name=Test";
+
+    let result = parse_deeplink_url(url);
+    assert!(result.is_err());
+    assert!(result
+        .unwrap_err()
+        .to_string()
+        .contains("Unsupported protocol version"));
+}
+
+#[test]
+fn test_parse_missing_required_field() {
+    // Name is still required even in v3.8+ (only homepage/endpoint/apiKey are optional)
+    let url = "ccswitch://v1/import?resource=provider&app=claude";
+
+    let result = parse_deeplink_url(url);
+    assert!(result.is_err());
+    assert!(result
+        .unwrap_err()
+        .to_string()
+        .contains("Missing 'name' parameter"));
+}
+
+// =============================================================================
+// Utils Tests
+// =============================================================================
+
+#[test]
+fn test_validate_invalid_url() {
+    let result = validate_url("not-a-url", "test");
+    assert!(result.is_err());
+}
+
+#[test]
+fn test_validate_invalid_scheme() {
+    let result = validate_url("ftp://example.com", "test");
+    assert!(result.is_err());
+    assert!(result
+        .unwrap_err()
+        .to_string()
+        .contains("must be http or https"));
+}
+
+#[test]
+fn test_infer_homepage() {
+    assert_eq!(
+        infer_homepage_from_endpoint("https://api.anthropic.com/v1"),
+        Some("https://anthropic.com".to_string())
+    );
+    assert_eq!(
+        infer_homepage_from_endpoint("https://api-test.company.com/v1"),
+        Some("https://test.company.com".to_string())
+    );
+    assert_eq!(
+        infer_homepage_from_endpoint("https://example.com"),
+        Some("https://example.com".to_string())
+    );
+}
+
+// =============================================================================
+// Provider Tests
+// =============================================================================
+
+#[test]
+fn test_build_gemini_provider_with_model() {
+    use super::provider::build_provider_from_request;
+
+    let request = DeepLinkImportRequest {
+        version: "v1".to_string(),
+        resource: "provider".to_string(),
+        app: Some("gemini".to_string()),
+        name: Some("Test Gemini".to_string()),
+        homepage: Some("https://example.com".to_string()),
+        endpoint: Some("https://api.example.com".to_string()),
+        api_key: Some("test-api-key".to_string()),
+        icon: None,
+        model: Some("gemini-2.0-flash".to_string()),
+        notes: None,
+        haiku_model: None,
+        sonnet_model: None,
+        opus_model: None,
+        config: None,
+        config_format: None,
+        config_url: None,
+        apps: None,
+        repo: None,
+        directory: None,
+        branch: None,
+        content: None,
+        description: None,
+        enabled: None,
+        usage_enabled: None,
+        usage_script: None,
+        usage_api_key: None,
+        usage_base_url: None,
+        usage_access_token: None,
+        usage_user_id: None,
+        usage_auto_interval: None,
+    };
+
+    let provider = build_provider_from_request(&AppType::Gemini, &request).unwrap();
+
+    // Verify provider basic info
+    assert_eq!(provider.name, "Test Gemini");
+    assert_eq!(
+        provider.website_url,
+        Some("https://example.com".to_string())
+    );
+
+    // Verify settings_config structure
+    let env = provider.settings_config["env"].as_object().unwrap();
+    assert_eq!(env["GEMINI_API_KEY"], "test-api-key");
+    assert_eq!(env["GOOGLE_GEMINI_BASE_URL"], "https://api.example.com");
+    assert_eq!(env["GEMINI_MODEL"], "gemini-2.0-flash");
+}
+
+#[test]
+fn test_build_gemini_provider_without_model() {
+    use super::provider::build_provider_from_request;
+
+    let request = DeepLinkImportRequest {
+        version: "v1".to_string(),
+        resource: "provider".to_string(),
+        app: Some("gemini".to_string()),
+        name: Some("Test Gemini".to_string()),
+        homepage: Some("https://example.com".to_string()),
+        endpoint: Some("https://api.example.com".to_string()),
+        api_key: Some("test-api-key".to_string()),
+        icon: None,
+        model: None,
+        notes: None,
+        haiku_model: None,
+        sonnet_model: None,
+        opus_model: None,
+        config: None,
+        config_format: None,
+        config_url: None,
+        apps: None,
+        repo: None,
+        directory: None,
+        branch: None,
+        content: None,
+        description: None,
+        enabled: None,
+        usage_enabled: None,
+        usage_script: None,
+        usage_api_key: None,
+        usage_base_url: None,
+        usage_access_token: None,
+        usage_user_id: None,
+        usage_auto_interval: None,
+    };
+
+    let provider = build_provider_from_request(&AppType::Gemini, &request).unwrap();
+
+    let env = provider.settings_config["env"].as_object().unwrap();
+    assert_eq!(env["GEMINI_API_KEY"], "test-api-key");
+    assert_eq!(env["GOOGLE_GEMINI_BASE_URL"], "https://api.example.com");
+    // Model should not be present
+    assert!(env.get("GEMINI_MODEL").is_none());
+}
+
+#[test]
+fn test_parse_and_merge_config_claude() {
+    // Prepare Base64 encoded Claude config
+    let config_json = r#"{"env":{"ANTHROPIC_AUTH_TOKEN":"sk-ant-xxx","ANTHROPIC_BASE_URL":"https://api.anthropic.com/v1","ANTHROPIC_MODEL":"claude-sonnet-4.5"}}"#;
+    let config_b64 = BASE64_STANDARD.encode(config_json.as_bytes());
+
+    let request = DeepLinkImportRequest {
+        version: "v1".to_string(),
+        resource: "provider".to_string(),
+        app: Some("claude".to_string()),
+        name: Some("Test".to_string()),
+        homepage: None,
+        endpoint: None,
+        api_key: None,
+        icon: None,
+        model: None,
+        notes: None,
+        haiku_model: None,
+        sonnet_model: None,
+        opus_model: None,
+        config: Some(config_b64),
+        config_format: Some("json".to_string()),
+        config_url: None,
+        apps: None,
+        repo: None,
+        directory: None,
+        branch: None,
+        content: None,
+        description: None,
+        enabled: None,
+        usage_enabled: None,
+        usage_script: None,
+        usage_api_key: None,
+        usage_base_url: None,
+        usage_access_token: None,
+        usage_user_id: None,
+        usage_auto_interval: None,
+    };
+
+    let merged = parse_and_merge_config(&request).unwrap();
+
+    // Should auto-fill from config
+    assert_eq!(merged.api_key, Some("sk-ant-xxx".to_string()));
+    assert_eq!(
+        merged.endpoint,
+        Some("https://api.anthropic.com/v1".to_string())
+    );
+    assert_eq!(merged.homepage, Some("https://anthropic.com".to_string()));
+    assert_eq!(merged.model, Some("claude-sonnet-4.5".to_string()));
+}
+
+#[test]
+fn test_parse_and_merge_config_url_override() {
+    let config_json = r#"{"env":{"ANTHROPIC_AUTH_TOKEN":"sk-old","ANTHROPIC_BASE_URL":"https://api.anthropic.com/v1"}}"#;
+    let config_b64 = BASE64_STANDARD.encode(config_json.as_bytes());
+
+    let request = DeepLinkImportRequest {
+        version: "v1".to_string(),
+        resource: "provider".to_string(),
+        app: Some("claude".to_string()),
+        name: Some("Test".to_string()),
+        homepage: None,
+        endpoint: None,
+        api_key: Some("sk-new".to_string()), // URL param should override
+        icon: None,
+        model: None,
+        notes: None,
+        haiku_model: None,
+        sonnet_model: None,
+        opus_model: None,
+        config: Some(config_b64),
+        config_format: Some("json".to_string()),
+        config_url: None,
+        apps: None,
+        repo: None,
+        directory: None,
+        branch: None,
+        content: None,
+        description: None,
+        enabled: None,
+        usage_enabled: None,
+        usage_script: None,
+        usage_api_key: None,
+        usage_base_url: None,
+        usage_access_token: None,
+        usage_user_id: None,
+        usage_auto_interval: None,
+    };
+
+    let merged = parse_and_merge_config(&request).unwrap();
+
+    // URL param should take priority
+    assert_eq!(merged.api_key, Some("sk-new".to_string()));
+    // Config file value should be used
+    assert_eq!(
+        merged.endpoint,
+        Some("https://api.anthropic.com/v1".to_string())
+    );
+}
+
+// =============================================================================
+// Prompt Tests
+// =============================================================================
+
+#[test]
+fn test_import_prompt_allows_space_in_base64_content() {
+    let url = "ccswitch://v1/import?resource=prompt&app=codex&name=PromptPlus&content=Pj4+";
+    let request = parse_deeplink_url(url).unwrap();
+
+    // URL decoded content may have "+" become space
+    assert_eq!(request.content.as_deref(), Some("Pj4 "));
+
+    let db = Arc::new(Database::memory().expect("create memory db"));
+    let state = AppState::new(db.clone());
+
+    let prompt_id = import_prompt_from_deeplink(&state, request.clone()).expect("import prompt");
+
+    let prompts = state.db.get_prompts("codex").expect("get prompts");
+    let prompt = prompts.get(&prompt_id).expect("prompt saved");
+
+    assert_eq!(prompt.content, ">>>");
+    assert_eq!(prompt.name, request.name.unwrap());
+}
+
+// =============================================================================
+// MCP Tests
+// =============================================================================
+
+#[test]
+fn test_parse_mcp_apps() {
+    let apps = parse_mcp_apps("claude,codex").unwrap();
+    assert!(apps.claude);
+    assert!(apps.codex);
+    assert!(!apps.gemini);
+
+    let apps = parse_mcp_apps("gemini").unwrap();
+    assert!(!apps.claude);
+    assert!(!apps.codex);
+    assert!(apps.gemini);
+
+    let err = parse_mcp_apps("invalid").unwrap_err();
+    assert!(err.to_string().contains("Invalid app"));
+}
+
+#[test]
+fn test_parse_prompt_deeplink() {
+    let content = "Hello World";
+    let content_b64 = BASE64_STANDARD.encode(content);
+    let url = format!(
+        "ccswitch://v1/import?resource=prompt&app=claude&name=test&content={}&description=desc&enabled=true",
+        content_b64
+    );
+
+    let request = parse_deeplink_url(&url).unwrap();
+    assert_eq!(request.resource, "prompt");
+    assert_eq!(request.app.unwrap(), "claude");
+    assert_eq!(request.name.unwrap(), "test");
+    assert_eq!(request.content.unwrap(), content_b64);
+    assert_eq!(request.description.unwrap(), "desc");
+    assert!(request.enabled.unwrap());
+}
+
+#[test]
+fn test_parse_mcp_deeplink() {
+    let config = r#"{"mcpServers":{"test":{"command":"echo"}}}"#;
+    let config_b64 = BASE64_STANDARD.encode(config);
+    let url = format!(
+        "ccswitch://v1/import?resource=mcp&apps=claude,codex&config={}&enabled=true",
+        config_b64
+    );
+
+    let request = parse_deeplink_url(&url).unwrap();
+    assert_eq!(request.resource, "mcp");
+    assert_eq!(request.apps.unwrap(), "claude,codex");
+    assert_eq!(request.config.unwrap(), config_b64);
+    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();
+
+    assert_eq!(request.resource, "skill");
+    assert_eq!(request.repo.unwrap(), "owner/repo");
+    assert_eq!(request.directory.unwrap(), "skills");
+    assert_eq!(request.branch.unwrap(), "dev");
+}
@@ -0,0 +1,99 @@
+//! Deep link utility functions
+//!
+//! Common helpers for URL validation, Base64 decoding, etc.
+
+use crate::error::AppError;
+use base64::prelude::*;
+use url::Url;
+
+/// Validate that a string is a valid HTTP(S) URL
+pub fn validate_url(url_str: &str, field_name: &str) -> Result<(), AppError> {
+    let url = Url::parse(url_str)
+        .map_err(|e| AppError::InvalidInput(format!("Invalid URL for '{field_name}': {e}")))?;
+
+    let scheme = url.scheme();
+    if scheme != "http" && scheme != "https" {
+        return Err(AppError::InvalidInput(format!(
+            "Invalid URL scheme for '{field_name}': must be http or https, got '{scheme}'"
+        )));
+    }
+
+    Ok(())
+}
+
+/// Decode a Base64 parameter from deep link URL
+///
+/// This function handles common issues with Base64 in URLs:
+/// - `+` being decoded as space
+/// - Missing padding `=`
+/// - Both standard and URL-safe Base64 variants
+pub fn decode_base64_param(field: &str, raw: &str) -> Result<Vec<u8>, AppError> {
+    let mut candidates: Vec<String> = Vec::new();
+    // Keep spaces (to restore `+`), but remove newlines
+    let trimmed = raw.trim_matches(|c| c == '\r' || c == '\n');
+
+    // First try restoring spaces to "+"
+    if trimmed.contains(' ') {
+        let replaced = trimmed.replace(' ', "+");
+        if !replaced.is_empty() && !candidates.contains(&replaced) {
+            candidates.push(replaced);
+        }
+    }
+
+    // Original value
+    if !trimmed.is_empty() && !candidates.contains(&trimmed.to_string()) {
+        candidates.push(trimmed.to_string());
+    }
+
+    // Add padding variants
+    let existing = candidates.clone();
+    for candidate in existing {
+        let mut padded = candidate.clone();
+        let remainder = padded.len() % 4;
+        if remainder != 0 {
+            padded.extend(std::iter::repeat_n('=', 4 - remainder));
+        }
+        if !candidates.contains(&padded) {
+            candidates.push(padded);
+        }
+    }
+
+    let mut last_error: Option<String> = None;
+    for candidate in candidates {
+        for engine in [
+            &BASE64_STANDARD,
+            &BASE64_STANDARD_NO_PAD,
+            &BASE64_URL_SAFE,
+            &BASE64_URL_SAFE_NO_PAD,
+        ] {
+            match engine.decode(&candidate) {
+                Ok(bytes) => return Ok(bytes),
+                Err(err) => last_error = Some(err.to_string()),
+            }
+        }
+    }
+
+    Err(AppError::InvalidInput(format!(
+        "{field} 参数 Base64 解码失败：{}。请确认链接参数已用 Base64 编码并经过 URL 转义（尤其是将 '+' 编码为 %2B，或使用 URL-safe Base64）。",
+        last_error.unwrap_or_else(|| "未知错误".to_string())
+    )))
+}
+
+/// Infer homepage URL from API endpoint
+///
+/// Examples:
+/// - https://api.anthropic.com/v1 → https://anthropic.com
+/// - https://api.openai.com/v1 → https://openai.com
+/// - https://api-test.company.com/v1 → https://company.com
+pub fn infer_homepage_from_endpoint(endpoint: &str) -> Option<String> {
+    let url = Url::parse(endpoint).ok()?;
+    let host = url.host_str()?;
+
+    // Remove common API prefixes
+    let clean_host = host
+        .strip_prefix("api.")
+        .or_else(|| host.strip_prefix("api-"))
+        .unwrap_or(host);
+
+    Some(format!("https://{clean_host}"))
+}
@@ -50,6 +50,12 @@ pub enum AppError {
        zh: String,
        en: String,
    },
+    #[error("数据库错误: {0}")]
+    Database(String),
+    #[error("所有供应商已熔断，无可用渠道")]
+    AllProvidersCircuitOpen,
+    #[error("未配置供应商")]
+    NoProvidersConfigured,
 }

 impl AppError {
@@ -89,8 +95,48 @@ impl<T> From<PoisonError<T>> for AppError {
    }
 }

+impl From<rusqlite::Error> for AppError {
+    fn from(err: rusqlite::Error) -> Self {
+        Self::Database(err.to_string())
+    }
+}
+
 impl From<AppError> for String {
    fn from(err: AppError) -> Self {
        err.to_string()
    }
 }
+
+impl serde::Serialize for AppError {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(&self.to_string())
+    }
+}
+
+/// 格式化为 JSON 错误字符串，前端可解析为结构化错误
+pub fn format_skill_error(
+    code: &str,
+    context: &[(&str, &str)],
+    suggestion: Option<&str>,
+) -> String {
+    use serde_json::json;
+
+    let mut ctx_map = serde_json::Map::new();
+    for (key, value) in context {
+        ctx_map.insert(key.to_string(), json!(value));
+    }
+
+    let error_obj = json!({
+        "code": code,
+        "context": ctx_map,
+        "suggestion": suggestion,
+    });
+
+    serde_json::to_string(&error_obj).unwrap_or_else(|_| {
+        // 如果 JSON 序列化失败，返回简单格式
+        format!("ERROR:{code}")
+    })
+}
@@ -236,6 +236,17 @@ pub fn validate_gemini_settings(settings: &Value) -> Result<(), AppError> {
        }
    }

+    // 如果有 config 字段，验证它是对象或 null
+    if let Some(config) = settings.get("config") {
+        if !(config.is_object() || config.is_null()) {
+            return Err(AppError::localized(
+                "gemini.validation.invalid_config",
+                "Gemini 配置格式错误: config 必须是对象",
+                "Gemini config invalid: config must be an object",
+            ));
+        }
+    }
+
    Ok(())
 }

@@ -244,6 +255,9 @@ pub fn validate_gemini_settings(settings: &Value) -> Result<(), AppError> {
 /// 此函数在切换供应商时使用，确保配置包含所有必需的字段。
 /// 对于需要 API Key 的供应商（如 PackyCode），会验证 GEMINI_API_KEY 字段。
 pub fn validate_gemini_settings_strict(settings: &Value) -> Result<(), AppError> {
+    // 先做基础格式验证（包含 env/config 类型）
+    validate_gemini_settings(settings)?;
+
    let env_map = json_to_env(settings)?;

    // 如果 env 为空，表示使用 OAuth（如 Google 官方），跳过验证
@@ -38,17 +38,12 @@ fn write_json_value(path: &Path, value: &Value) -> Result<(), AppError> {
    atomic_write(path, json.as_bytes())
 }

-/// 读取 Gemini MCP 配置文件的完整 JSON 文本
-pub fn read_mcp_json() -> Result<Option<String>, AppError> {
-    let path = user_config_path();
-    if !path.exists() {
-        return Ok(None);
-    }
-    let content = fs::read_to_string(&path).map_err(|e| AppError::io(&path, e))?;
-    Ok(Some(content))
-}
-
 /// 读取 Gemini settings.json 中的 mcpServers 映射
+///
+/// 执行反向格式转换以保持与统一 MCP 结构的兼容性：
+/// - httpUrl → url + type: "http"
+/// - 仅有 url 字段 → 补齐 type: "sse"（Gemini 以字段名推断传输类型）
+/// - 仅有 command 字段 → 补齐 type: "stdio"
 pub fn read_mcp_servers_map() -> Result<std::collections::HashMap<String, Value>, AppError> {
    let path = user_config_path();
    if !path.exists() {
@@ -56,12 +51,32 @@ pub fn read_mcp_servers_map() -> Result<std::collections::HashMap<String, Value>
    }

    let root = read_json_value(&path)?;
-    let servers = root
+    let mut servers: std::collections::HashMap<String, Value> = root
        .get("mcpServers")
        .and_then(|v| v.as_object())
        .map(|obj| obj.iter().map(|(k, v)| (k.clone(), v.clone())).collect())
        .unwrap_or_default();

+    // 反向格式转换：Gemini 特有格式 → 统一 MCP 格式
+    for (_, spec) in servers.iter_mut() {
+        if let Some(obj) = spec.as_object_mut() {
+            // httpUrl → url + type: "http"
+            if let Some(http_url) = obj.remove("httpUrl") {
+                obj.insert("url".to_string(), http_url);
+                obj.insert("type".to_string(), Value::String("http".to_string()));
+            }
+
+            // Gemini CLI 不使用 type 字段：这里补齐成统一结构，便于校验与导入
+            if obj.get("type").is_none() {
+                if obj.contains_key("command") {
+                    obj.insert("type".to_string(), Value::String("stdio".to_string()));
+                } else if obj.contains_key("url") {
+                    obj.insert("type".to_string(), Value::String("sse".to_string()));
+                }
+            }
+        }
+    }
+
    Ok(servers)
 }

@@ -96,7 +111,20 @@ pub fn set_mcp_servers_map(
            obj = server_obj;
        }

-        // 移除 UI 辅助字段
+        // Gemini CLI 格式转换：
+        // - Gemini 不使用 "type" 字段（从字段名推断传输类型）
+        // - HTTP 使用 "httpUrl" 字段，SSE 使用 "url" 字段
+        let transport_type = obj.get("type").and_then(|v| v.as_str());
+        if transport_type == Some("http") {
+            // HTTP streaming: 将 "url" 重命名为 "httpUrl"
+            if let Some(url_value) = obj.remove("url") {
+                obj.insert("httpUrl".to_string(), url_value);
+            }
+        }
+        // SSE 保持 "url" 字段不变
+
+        // 移除 UI 辅助字段和 type 字段（Gemini 不需要）
+        obj.remove("type");
        obj.remove("enabled");
        obj.remove("source");
        obj.remove("id");
@@ -13,7 +13,9 @@ fn cell() -> &'static RwLock<Option<InitErrorPayload>> {
    INIT_ERROR.get_or_init(|| RwLock::new(None))
 }

+#[allow(dead_code)]
 pub fn set_init_error(payload: InitErrorPayload) {
+    #[allow(clippy::unwrap_used)]
    if let Ok(mut guard) = cell().write() {
        *guard = Some(payload);
    }
@@ -23,6 +25,74 @@ pub fn get_init_error() -> Option<InitErrorPayload> {
    cell().read().ok()?.clone()
 }

+// ============================================================
+// 迁移结果状态
+// ============================================================
+
+static MIGRATION_SUCCESS: OnceLock<RwLock<bool>> = OnceLock::new();
+
+fn migration_cell() -> &'static RwLock<bool> {
+    MIGRATION_SUCCESS.get_or_init(|| RwLock::new(false))
+}
+
+pub fn set_migration_success() {
+    if let Ok(mut guard) = migration_cell().write() {
+        *guard = true;
+    }
+}
+
+/// 获取并消费迁移成功状态（只返回一次 true，之后返回 false）
+pub fn take_migration_success() -> bool {
+    if let Ok(mut guard) = migration_cell().write() {
+        let val = *guard;
+        *guard = false;
+        val
+    } else {
+        false
+    }
+}
+
+// ============================================================
+// Skills SSOT 迁移结果状态
+// ============================================================
+
+#[derive(Debug, Clone, Serialize)]
+pub struct SkillsMigrationPayload {
+    pub count: usize,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+}
+
+static SKILLS_MIGRATION_RESULT: OnceLock<RwLock<Option<SkillsMigrationPayload>>> = OnceLock::new();
+
+fn skills_migration_cell() -> &'static RwLock<Option<SkillsMigrationPayload>> {
+    SKILLS_MIGRATION_RESULT.get_or_init(|| RwLock::new(None))
+}
+
+pub fn set_skills_migration_result(count: usize) {
+    if let Ok(mut guard) = skills_migration_cell().write() {
+        *guard = Some(SkillsMigrationPayload { count, error: None });
+    }
+}
+
+pub fn set_skills_migration_error(error: String) {
+    if let Ok(mut guard) = skills_migration_cell().write() {
+        *guard = Some(SkillsMigrationPayload {
+            count: 0,
+            error: Some(error),
+        });
+    }
+}
+
+/// 获取并消费 Skills 迁移结果（只返回一次 Some，之后返回 None）
+pub fn take_skills_migration_result() -> Option<SkillsMigrationPayload> {
+    if let Ok(mut guard) = skills_migration_cell().write() {
+        guard.take()
+    } else {
+        None
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -2,5 +2,15 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]

 fn main() {
+    // 在 Linux 上设置 WebKit 环境变量以解决 DMA-BUF 渲染问题
+    // 某些 Linux 系统（如 Debian 13.2、Nvidia GPU）上 WebKitGTK 的 DMA-BUF 渲染器可能导致白屏/黑屏
+    // 参考: https://github.com/tauri-apps/tauri/issues/9394
+    #[cfg(target_os = "linux")]
+    {
+        if std::env::var("WEBKIT_DISABLE_DMABUF_RENDERER").is_err() {
+            std::env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
+        }
+    }
+
    cc_switch_lib::run();
 }
@@ -0,0 +1,146 @@
+//! Claude MCP 同步和导入模块
+
+use serde_json::Value;
+use std::collections::HashMap;
+
+use crate::app_config::{McpApps, McpConfig, McpServer, MultiAppConfig};
+use crate::error::AppError;
+
+use super::validation::{extract_server_spec, validate_server_spec};
+
+fn should_sync_claude_mcp() -> bool {
+    // Claude 未安装/未初始化时：通常 ~/.claude 目录与 ~/.claude.json 都不存在。
+    // 按用户偏好：此时跳过写入/删除，不创建任何文件或目录。
+    crate::config::get_claude_config_dir().exists() || crate::config::get_claude_mcp_path().exists()
+}
+
+/// 返回已启用的 MCP 服务器（过滤 enabled==true）
+fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {
+    let mut out = HashMap::new();
+    for (id, entry) in cfg.servers.iter() {
+        let enabled = entry
+            .get("enabled")
+            .and_then(|v| v.as_bool())
+            .unwrap_or(false);
+        if !enabled {
+            continue;
+        }
+        match extract_server_spec(entry) {
+            Ok(spec) => {
+                out.insert(id.clone(), spec);
+            }
+            Err(err) => {
+                log::warn!("跳过无效的 MCP 条目 '{id}': {err}");
+            }
+        }
+    }
+    out
+}
+
+/// 将 config.json 中 enabled==true 的项投影写入 ~/.claude.json
+pub fn sync_enabled_to_claude(config: &MultiAppConfig) -> Result<(), AppError> {
+    if !should_sync_claude_mcp() {
+        return Ok(());
+    }
+    let enabled = collect_enabled_servers(&config.mcp.claude);
+    crate::claude_mcp::set_mcp_servers_map(&enabled)
+}
+
+/// 从 ~/.claude.json 导入 mcpServers 到统一结构（v3.7.0+）
+/// 已存在的服务器将启用 Claude 应用，不覆盖其他字段和应用状态
+pub fn import_from_claude(config: &mut MultiAppConfig) -> Result<usize, AppError> {
+    let text_opt = crate::claude_mcp::read_mcp_json()?;
+    let Some(text) = text_opt else { return Ok(0) };
+
+    let v: Value = serde_json::from_str(&text)
+        .map_err(|e| AppError::McpValidation(format!("解析 ~/.claude.json 失败: {e}")))?;
+    let Some(map) = v.get("mcpServers").and_then(|x| x.as_object()) else {
+        return Ok(0);
+    };
+
+    // 确保新结构存在
+    let servers = config.mcp.servers.get_or_insert_with(HashMap::new);
+
+    let mut changed = 0;
+    let mut errors = Vec::new();
+
+    for (id, spec) in map.iter() {
+        // 校验：单项失败不中止，收集错误继续处理
+        if let Err(e) = validate_server_spec(spec) {
+            log::warn!("跳过无效 MCP 服务器 '{id}': {e}");
+            errors.push(format!("{id}: {e}"));
+            continue;
+        }
+
+        if let Some(existing) = servers.get_mut(id) {
+            // 已存在：仅启用 Claude 应用
+            if !existing.apps.claude {
+                existing.apps.claude = true;
+                changed += 1;
+                log::info!("MCP 服务器 '{id}' 已启用 Claude 应用");
+            }
+        } else {
+            // 新建服务器：默认仅启用 Claude
+            servers.insert(
+                id.clone(),
+                McpServer {
+                    id: id.clone(),
+                    name: id.clone(),
+                    server: spec.clone(),
+                    apps: McpApps {
+                        claude: true,
+                        codex: false,
+                        gemini: false,
+                    },
+                    description: None,
+                    homepage: None,
+                    docs: None,
+                    tags: Vec::new(),
+                },
+            );
+            changed += 1;
+            log::info!("导入新 MCP 服务器 '{id}'");
+        }
+    }
+
+    if !errors.is_empty() {
+        log::warn!("导入完成，但有 {} 项失败: {:?}", errors.len(), errors);
+    }
+
+    Ok(changed)
+}
+
+/// 将单个 MCP 服务器同步到 Claude live 配置
+pub fn sync_single_server_to_claude(
+    _config: &MultiAppConfig,
+    id: &str,
+    server_spec: &Value,
+) -> Result<(), AppError> {
+    if !should_sync_claude_mcp() {
+        return Ok(());
+    }
+    // 读取现有的 MCP 配置
+    let current = crate::claude_mcp::read_mcp_servers_map()?;
+
+    // 创建新的 HashMap，包含现有的所有服务器 + 当前要同步的服务器
+    let mut updated = current;
+    updated.insert(id.to_string(), server_spec.clone());
+
+    // 写回
+    crate::claude_mcp::set_mcp_servers_map(&updated)
+}
+
+/// 从 Claude live 配置中移除单个 MCP 服务器
+pub fn remove_server_from_claude(id: &str) -> Result<(), AppError> {
+    if !should_sync_claude_mcp() {
+        return Ok(());
+    }
+    // 读取现有的 MCP 配置
+    let mut current = crate::claude_mcp::read_mcp_servers_map()?;
+
+    // 移除指定服务器
+    current.remove(id);
+
+    // 写回
+    crate::claude_mcp::set_mcp_servers_map(&current)
+}
@@ -1,200 +1,22 @@
+//! Codex MCP 同步和导入模块
+//!
+//! 包含 Codex 的 MCP 配置管理：
+//! - 从 ~/.codex/config.toml 导入
+//! - 同步到 ~/.codex/config.toml
+//! - JSON 到 TOML 的转换逻辑
+
 use serde_json::{json, Value};
 use std::collections::HashMap;

-use crate::app_config::{AppType, McpConfig, MultiAppConfig};
+use crate::app_config::{McpApps, McpConfig, McpServer, MultiAppConfig};
 use crate::error::AppError;

-/// 基础校验：允许 stdio/http/sse；或省略 type（视为 stdio）。对应必填字段存在
-fn validate_server_spec(spec: &Value) -> Result<(), AppError> {
-    if !spec.is_object() {
-        return Err(AppError::McpValidation(
-            "MCP 服务器连接定义必须为 JSON 对象".into(),
-        ));
-    }
-    let t_opt = spec.get("type").and_then(|x| x.as_str());
-    // 支持三种：stdio/http/sse；若缺省 type 则按 stdio 处理（与社区常见 .mcp.json 一致）
-    let is_stdio = t_opt.map(|t| t == "stdio").unwrap_or(true);
-    let is_http = t_opt.map(|t| t == "http").unwrap_or(false);
-    let is_sse = t_opt.map(|t| t == "sse").unwrap_or(false);
+use super::validation::{extract_server_spec, validate_server_spec};

-    if !(is_stdio || is_http || is_sse) {
-        return Err(AppError::McpValidation(
-            "MCP 服务器 type 必须是 'stdio'、'http' 或 'sse'（或省略表示 stdio）".into(),
-        ));
-    }
-
-    if is_stdio {
-        let cmd = spec.get("command").and_then(|x| x.as_str()).unwrap_or("");
-        if cmd.trim().is_empty() {
-            return Err(AppError::McpValidation(
-                "stdio 类型的 MCP 服务器缺少 command 字段".into(),
-            ));
-        }
-    }
-    if is_http {
-        let url = spec.get("url").and_then(|x| x.as_str()).unwrap_or("");
-        if url.trim().is_empty() {
-            return Err(AppError::McpValidation(
-                "http 类型的 MCP 服务器缺少 url 字段".into(),
-            ));
-        }
-    }
-    if is_sse {
-        let url = spec.get("url").and_then(|x| x.as_str()).unwrap_or("");
-        if url.trim().is_empty() {
-            return Err(AppError::McpValidation(
-                "sse 类型的 MCP 服务器缺少 url 字段".into(),
-            ));
-        }
-    }
-    Ok(())
-}
-
-#[allow(dead_code)] // v3.7.0: 旧的验证逻辑，保留用于未来可能的迁移
-fn validate_mcp_entry(entry: &Value) -> Result<(), AppError> {
-    let obj = entry
-        .as_object()
-        .ok_or_else(|| AppError::McpValidation("MCP 服务器条目必须为 JSON 对象".into()))?;
-
-    let server = obj
-        .get("server")
-        .ok_or_else(|| AppError::McpValidation("MCP 服务器条目缺少 server 字段".into()))?;
-    validate_server_spec(server)?;
-
-    for key in ["name", "description", "homepage", "docs"] {
-        if let Some(val) = obj.get(key) {
-            if !val.is_string() {
-                return Err(AppError::McpValidation(format!(
-                    "MCP 服务器 {key} 必须为字符串"
-                )));
-            }
-        }
-    }
-
-    if let Some(tags) = obj.get("tags") {
-        let arr = tags
-            .as_array()
-            .ok_or_else(|| AppError::McpValidation("MCP 服务器 tags 必须为字符串数组".into()))?;
-        if !arr.iter().all(|item| item.is_string()) {
-            return Err(AppError::McpValidation(
-                "MCP 服务器 tags 必须为字符串数组".into(),
-            ));
-        }
-    }
-
-    if let Some(enabled) = obj.get("enabled") {
-        if !enabled.is_boolean() {
-            return Err(AppError::McpValidation(
-                "MCP 服务器 enabled 必须为布尔值".into(),
-            ));
-        }
-    }
-
-    Ok(())
-}
-
-fn normalize_server_keys(map: &mut HashMap<String, Value>) -> usize {
-    let mut change_count = 0usize;
-    let mut renames: Vec<(String, String)> = Vec::new();
-
-    for (key_ref, value) in map.iter_mut() {
-        let key = key_ref.clone();
-        let Some(obj) = value.as_object_mut() else {
-            continue;
-        };
-
-        let id_value = obj.get("id").cloned();
-
-        let target_id: String;
-
-        match id_value {
-            Some(id_val) => match id_val.as_str() {
-                Some(id_str) => {
-                    let trimmed = id_str.trim();
-                    if trimmed.is_empty() {
-                        obj.insert("id".into(), json!(key.clone()));
-                        change_count += 1;
-                        target_id = key.clone();
-                    } else {
-                        if trimmed != id_str {
-                            obj.insert("id".into(), json!(trimmed));
-                            change_count += 1;
-                        }
-                        target_id = trimmed.to_string();
-                    }
-                }
-                None => {
-                    obj.insert("id".into(), json!(key.clone()));
-                    change_count += 1;
-                    target_id = key.clone();
-                }
-            },
-            None => {
-                obj.insert("id".into(), json!(key.clone()));
-                change_count += 1;
-                target_id = key.clone();
-            }
-        }
-
-        if target_id != key {
-            renames.push((key, target_id));
-        }
-    }
-
-    for (old_key, new_key) in renames {
-        if old_key == new_key {
-            continue;
-        }
-        if map.contains_key(&new_key) {
-            log::warn!("MCP 条目 '{old_key}' 的内部 id '{new_key}' 与现有键冲突，回退为原键");
-            if let Some(value) = map.get_mut(&old_key) {
-                if let Some(obj) = value.as_object_mut() {
-                    if obj
-                        .get("id")
-                        .and_then(|v| v.as_str())
-                        .map(|s| s != old_key)
-                        .unwrap_or(true)
-                    {
-                        obj.insert("id".into(), json!(old_key.clone()));
-                        change_count += 1;
-                    }
-                }
-            }
-            continue;
-        }
-        if let Some(mut value) = map.remove(&old_key) {
-            if let Some(obj) = value.as_object_mut() {
-                obj.insert("id".into(), json!(new_key.clone()));
-            }
-            log::info!("MCP 条目键名已自动修复: '{old_key}' -> '{new_key}'");
-            map.insert(new_key, value);
-            change_count += 1;
-        }
-    }
-
-    change_count
-}
-
-pub fn normalize_servers_for(config: &mut MultiAppConfig, app: &AppType) -> usize {
-    let servers = &mut config.mcp_for_mut(app).servers;
-    normalize_server_keys(servers)
-}
-
-fn extract_server_spec(entry: &Value) -> Result<Value, AppError> {
-    let obj = entry
-        .as_object()
-        .ok_or_else(|| AppError::McpValidation("MCP 服务器条目必须为 JSON 对象".into()))?;
-    let server = obj
-        .get("server")
-        .ok_or_else(|| AppError::McpValidation("MCP 服务器条目缺少 server 字段".into()))?;
-
-    if !server.is_object() {
-        return Err(AppError::McpValidation(
-            "MCP 服务器 server 字段必须为 JSON 对象".into(),
-        ));
-    }
-
-    Ok(server.clone())
+fn should_sync_codex_mcp() -> bool {
+    // Codex 未安装/未初始化时：~/.codex 目录不存在。
+    // 按用户偏好：目录缺失时跳过写入/删除，不创建任何文件或目录。
+    crate::codex_config::get_codex_config_dir().exists()
 }

 /// 返回已启用的 MCP 服务器（过滤 enabled==true）
@@ -220,188 +42,6 @@ fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {
    out
 }

-#[allow(dead_code)] // v3.7.0: 旧的分应用 API，保留用于未来可能的迁移
-pub fn get_servers_snapshot_for(
-    config: &mut MultiAppConfig,
-    app: &AppType,
-) -> (HashMap<String, Value>, usize) {
-    let normalized = normalize_servers_for(config, app);
-    let mut snapshot = config.mcp_for(app).servers.clone();
-    snapshot.retain(|id, value| {
-        let Some(obj) = value.as_object_mut() else {
-            log::warn!("跳过无效的 MCP 条目 '{id}': 必须为 JSON 对象");
-            return false;
-        };
-
-        obj.entry(String::from("id")).or_insert(json!(id));
-
-        match validate_mcp_entry(value) {
-            Ok(()) => true,
-            Err(err) => {
-                log::error!("config.json 中存在无效的 MCP 条目 '{id}': {err}");
-                false
-            }
-        }
-    });
-    (snapshot, normalized)
-}
-
-#[allow(dead_code)] // v3.7.0: 旧的分应用 API，保留用于未来可能的迁移
-pub fn upsert_in_config_for(
-    config: &mut MultiAppConfig,
-    app: &AppType,
-    id: &str,
-    spec: Value,
-) -> Result<bool, AppError> {
-    if id.trim().is_empty() {
-        return Err(AppError::InvalidInput("MCP 服务器 ID 不能为空".into()));
-    }
-    normalize_servers_for(config, app);
-    validate_mcp_entry(&spec)?;
-
-    let mut entry_obj = spec
-        .as_object()
-        .cloned()
-        .ok_or_else(|| AppError::McpValidation("MCP 服务器条目必须为 JSON 对象".into()))?;
-    if let Some(existing_id) = entry_obj.get("id") {
-        let Some(existing_id_str) = existing_id.as_str() else {
-            return Err(AppError::McpValidation("MCP 服务器 id 必须为字符串".into()));
-        };
-        if existing_id_str != id {
-            return Err(AppError::McpValidation(format!(
-                "MCP 服务器条目中的 id '{existing_id_str}' 与参数 id '{id}' 不一致"
-            )));
-        }
-    } else {
-        entry_obj.insert(String::from("id"), json!(id));
-    }
-
-    let value = Value::Object(entry_obj);
-
-    let servers = &mut config.mcp_for_mut(app).servers;
-    let before = servers.get(id).cloned();
-    servers.insert(id.to_string(), value);
-
-    Ok(before.is_none())
-}
-
-#[allow(dead_code)] // v3.7.0: 旧的分应用 API，保留用于未来可能的迁移
-pub fn delete_in_config_for(
-    config: &mut MultiAppConfig,
-    app: &AppType,
-    id: &str,
-) -> Result<bool, AppError> {
-    if id.trim().is_empty() {
-        return Err(AppError::InvalidInput("MCP 服务器 ID 不能为空".into()));
-    }
-    normalize_servers_for(config, app);
-    let existed = config.mcp_for_mut(app).servers.remove(id).is_some();
-    Ok(existed)
-}
-
-#[allow(dead_code)] // v3.7.0: 旧的分应用 API，保留用于未来可能的迁移
-/// 设置启用状态（不执行落盘或文件同步）
-pub fn set_enabled_flag_for(
-    config: &mut MultiAppConfig,
-    app: &AppType,
-    id: &str,
-    enabled: bool,
-) -> Result<bool, AppError> {
-    if id.trim().is_empty() {
-        return Err(AppError::InvalidInput("MCP 服务器 ID 不能为空".into()));
-    }
-    normalize_servers_for(config, app);
-    if let Some(spec) = config.mcp_for_mut(app).servers.get_mut(id) {
-        // 写入 enabled 字段
-        let mut obj = spec
-            .as_object()
-            .cloned()
-            .ok_or_else(|| AppError::McpValidation("MCP 服务器定义必须为 JSON 对象".into()))?;
-        obj.insert("enabled".into(), json!(enabled));
-        *spec = Value::Object(obj);
-    } else {
-        // 若不存在则直接返回 false
-        return Ok(false);
-    }
-
-    Ok(true)
-}
-
-/// 将 config.json 中 enabled==true 的项投影写入 ~/.claude.json
-pub fn sync_enabled_to_claude(config: &MultiAppConfig) -> Result<(), AppError> {
-    let enabled = collect_enabled_servers(&config.mcp.claude);
-    crate::claude_mcp::set_mcp_servers_map(&enabled)
-}
-
-/// 从 ~/.claude.json 导入 mcpServers 到统一结构（v3.7.0+）
-/// 已存在的服务器将启用 Claude 应用，不覆盖其他字段和应用状态
-pub fn import_from_claude(config: &mut MultiAppConfig) -> Result<usize, AppError> {
-    use crate::app_config::{McpApps, McpServer};
-
-    let text_opt = crate::claude_mcp::read_mcp_json()?;
-    let Some(text) = text_opt else { return Ok(0) };
-
-    let v: Value = serde_json::from_str(&text)
-        .map_err(|e| AppError::McpValidation(format!("解析 ~/.claude.json 失败: {e}")))?;
-    let Some(map) = v.get("mcpServers").and_then(|x| x.as_object()) else {
-        return Ok(0);
-    };
-
-    // 确保新结构存在
-    if config.mcp.servers.is_none() {
-        config.mcp.servers = Some(HashMap::new());
-    }
-    let servers = config.mcp.servers.as_mut().unwrap();
-
-    let mut changed = 0;
-    let mut errors = Vec::new();
-
-    for (id, spec) in map.iter() {
-        // 校验：单项失败不中止，收集错误继续处理
-        if let Err(e) = validate_server_spec(spec) {
-            log::warn!("跳过无效 MCP 服务器 '{id}': {e}");
-            errors.push(format!("{id}: {e}"));
-            continue;
-        }
-
-        if let Some(existing) = servers.get_mut(id) {
-            // 已存在：仅启用 Claude 应用
-            if !existing.apps.claude {
-                existing.apps.claude = true;
-                changed += 1;
-                log::info!("MCP 服务器 '{id}' 已启用 Claude 应用");
-            }
-        } else {
-            // 新建服务器：默认仅启用 Claude
-            servers.insert(
-                id.clone(),
-                McpServer {
-                    id: id.clone(),
-                    name: id.clone(),
-                    server: spec.clone(),
-                    apps: McpApps {
-                        claude: true,
-                        codex: false,
-                        gemini: false,
-                    },
-                    description: None,
-                    homepage: None,
-                    docs: None,
-                    tags: Vec::new(),
-                },
-            );
-            changed += 1;
-            log::info!("导入新 MCP 服务器 '{id}'");
-        }
-    }
-
-    if !errors.is_empty() {
-        log::warn!("导入完成，但有 {} 项失败: {:?}", errors.len(), errors);
-    }
-
-    Ok(changed)
-}
-
 /// 从 ~/.codex/config.toml 导入 MCP 到统一结构（v3.7.0+）
 ///
 /// 格式支持：
@@ -410,8 +50,6 @@ pub fn import_from_claude(config: &mut MultiAppConfig) -> Result<usize, AppError
 ///
 /// 已存在的服务器将启用 Codex 应用，不覆盖其他字段和应用状态
 pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError> {
-    use crate::app_config::{McpApps, McpServer};
-
    let text = crate::codex_config::read_and_validate_codex_config_text()?;
    if text.trim().is_empty() {
        return Ok(0);
@@ -421,10 +59,7 @@ pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError>
        .map_err(|e| AppError::McpValidation(format!("解析 ~/.codex/config.toml 失败: {e}")))?;

    // 确保新结构存在
-    if config.mcp.servers.is_none() {
-        config.mcp.servers = Some(HashMap::new());
-    }
-    let servers = config.mcp.servers.as_mut().unwrap();
+    let servers = config.mcp.servers.get_or_insert_with(HashMap::new);

    let mut changed_total = 0usize;

@@ -449,7 +84,7 @@ pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError>
            // 核心字段（需要手动处理的字段）
            let core_fields = match typ {
                "stdio" => vec!["type", "command", "args", "env", "cwd"],
-                "http" | "sse" => vec!["type", "url", "headers"],
+                "http" | "sse" => vec!["type", "url", "http_headers"],
                _ => vec!["type"],
            };

@@ -490,7 +125,13 @@ pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError>
                    if let Some(url) = entry_tbl.get("url").and_then(|v| v.as_str()) {
                        spec.insert("url".into(), json!(url));
                    }
-                    if let Some(headers_tbl) = entry_tbl.get("headers").and_then(|v| v.as_table()) {
+                    // Read from http_headers (correct Codex format) or headers (legacy) with priority to http_headers
+                    let headers_tbl = entry_tbl
+                        .get("http_headers")
+                        .and_then(|v| v.as_table())
+                        .or_else(|| entry_tbl.get("headers").and_then(|v| v.as_table()));
+
+                    if let Some(headers_tbl) = headers_tbl {
                        let mut headers_json = serde_json::Map::new();
                        for (k, v) in headers_tbl.iter() {
                            if let Some(sv) = v.as_str() {
@@ -638,6 +279,9 @@ pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError>
 /// - 仅更新 `mcp_servers` 表，保留其它键
 /// - 仅写入启用项；无启用项时清理 mcp_servers 表
 pub fn sync_enabled_to_codex(config: &MultiAppConfig) -> Result<(), AppError> {
+    if !should_sync_codex_mcp() {
+        return Ok(());
+    }
    use toml_edit::{Item, Table};

    // 1) 收集启用项（Codex 维度）
@@ -697,114 +341,113 @@ pub fn sync_enabled_to_codex(config: &MultiAppConfig) -> Result<(), AppError> {
    Ok(())
 }

-/// 将 config.json 中 enabled==true 的项投影写入 ~/.gemini/settings.json
-pub fn sync_enabled_to_gemini(config: &MultiAppConfig) -> Result<(), AppError> {
-    let enabled = collect_enabled_servers(&config.mcp.gemini);
-    crate::gemini_mcp::set_mcp_servers_map(&enabled)
-}
-
-/// 从 ~/.gemini/settings.json 导入 mcpServers 到统一结构（v3.7.0+）
-/// 已存在的服务器将启用 Gemini 应用，不覆盖其他字段和应用状态
-pub fn import_from_gemini(config: &mut MultiAppConfig) -> Result<usize, AppError> {
-    use crate::app_config::{McpApps, McpServer};
-
-    let text_opt = crate::gemini_mcp::read_mcp_json()?;
-    let Some(text) = text_opt else { return Ok(0) };
-
-    let v: Value = serde_json::from_str(&text)
-        .map_err(|e| AppError::McpValidation(format!("解析 ~/.gemini/settings.json 失败: {e}")))?;
-    let Some(map) = v.get("mcpServers").and_then(|x| x.as_object()) else {
-        return Ok(0);
-    };
-
-    // 确保新结构存在
-    if config.mcp.servers.is_none() {
-        config.mcp.servers = Some(HashMap::new());
-    }
-    let servers = config.mcp.servers.as_mut().unwrap();
-
-    let mut changed = 0;
-    let mut errors = Vec::new();
-
-    for (id, spec) in map.iter() {
-        // 校验：单项失败不中止，收集错误继续处理
-        if let Err(e) = validate_server_spec(spec) {
-            log::warn!("跳过无效 MCP 服务器 '{id}': {e}");
-            errors.push(format!("{id}: {e}"));
-            continue;
-        }
-
-        if let Some(existing) = servers.get_mut(id) {
-            // 已存在：仅启用 Gemini 应用
-            if !existing.apps.gemini {
-                existing.apps.gemini = true;
-                changed += 1;
-                log::info!("MCP 服务器 '{id}' 已启用 Gemini 应用");
-            }
-        } else {
-            // 新建服务器：默认仅启用 Gemini
-            servers.insert(
-                id.clone(),
-                McpServer {
-                    id: id.clone(),
-                    name: id.clone(),
-                    server: spec.clone(),
-                    apps: McpApps {
-                        claude: false,
-                        codex: false,
-                        gemini: true,
-                    },
-                    description: None,
-                    homepage: None,
-                    docs: None,
-                    tags: Vec::new(),
-                },
-            );
-            changed += 1;
-            log::info!("导入新 MCP 服务器 '{id}'");
-        }
-    }
-
-    if !errors.is_empty() {
-        log::warn!("导入完成，但有 {} 项失败: {:?}", errors.len(), errors);
-    }
-
-    Ok(changed)
-}
-
-// ============================================================================
-// v3.7.0 新增：单个服务器同步和删除函数
-// ============================================================================
-
-/// 将单个 MCP 服务器同步到 Claude live 配置
-pub fn sync_single_server_to_claude(
+/// 将单个 MCP 服务器同步到 Codex live 配置
+/// 始终使用 Codex 官方格式 [mcp_servers]，并清理可能存在的错误格式 [mcp.servers]
+pub fn sync_single_server_to_codex(
    _config: &MultiAppConfig,
    id: &str,
    server_spec: &Value,
 ) -> Result<(), AppError> {
-    // 读取现有的 MCP 配置
-    let current = crate::claude_mcp::read_mcp_servers_map()?;
+    if !should_sync_codex_mcp() {
+        return Ok(());
+    }
+    use toml_edit::Item;

-    // 创建新的 HashMap，包含现有的所有服务器 + 当前要同步的服务器
-    let mut updated = current;
-    updated.insert(id.to_string(), server_spec.clone());
+    // 读取现有的 config.toml
+    let config_path = crate::codex_config::get_codex_config_path();

-    // 写回
-    crate::claude_mcp::set_mcp_servers_map(&updated)
+    let mut doc = if config_path.exists() {
+        let content =
+            std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
+        // 尝试解析现有配置，如果失败则创建新文档（容错处理）
+        match content.parse::<toml_edit::DocumentMut>() {
+            Ok(doc) => doc,
+            Err(e) => {
+                log::warn!("解析 Codex config.toml 失败: {e}，将创建新配置");
+                toml_edit::DocumentMut::new()
+            }
+        }
+    } else {
+        toml_edit::DocumentMut::new()
+    };
+
+    // 清理可能存在的错误格式 [mcp.servers]
+    if let Some(mcp_item) = doc.get_mut("mcp") {
+        if let Some(tbl) = mcp_item.as_table_like_mut() {
+            if tbl.contains_key("servers") {
+                log::warn!("检测到错误的 MCP 格式 [mcp.servers]，正在清理并迁移到 [mcp_servers]");
+                tbl.remove("servers");
+            }
+        }
+    }
+
+    // 确保 [mcp_servers] 表存在
+    if !doc.contains_key("mcp_servers") {
+        doc["mcp_servers"] = toml_edit::table();
+    }
+
+    // 将 JSON 服务器规范转换为 TOML 表
+    let toml_table = json_server_to_toml_table(server_spec)?;
+
+    // 使用唯一正确的格式：[mcp_servers]
+    doc["mcp_servers"][id] = Item::Table(toml_table);
+
+    // 写回文件
+    let new_text = doc.to_string();
+    crate::config::write_text_file(&config_path, &new_text)?;
+
+    Ok(())
 }

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

-    // 移除指定服务器
-    current.remove(id);
+    if !config_path.exists() {
+        return Ok(()); // 文件不存在，无需删除
+    }

-    // 写回
-    crate::claude_mcp::set_mcp_servers_map(&current)
+    let content =
+        std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
+
+    // 尝试解析现有配置，如果失败则直接返回（无法删除不存在的内容）
+    let mut doc = match content.parse::<toml_edit::DocumentMut>() {
+        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()) {
+        mcp_servers.remove(id);
+    }
+
+    // 同时清理可能存在于错误位置的数据：[mcp.servers]（如果存在）
+    if let Some(mcp_table) = doc.get_mut("mcp").and_then(|t| t.as_table_mut()) {
+        if let Some(servers) = mcp_table.get_mut("servers").and_then(|s| s.as_table_mut()) {
+            if servers.remove(id).is_some() {
+                log::warn!("从错误的 MCP 格式 [mcp.servers] 中清理了服务器 '{id}'");
+            }
+        }
+    }
+
+    // 写回文件
+    let new_text = doc.to_string();
+    crate::config::write_text_file(&config_path, &new_text)?;
+
+    Ok(())
 }

+// ============================================================================
+// TOML 转换辅助函数
+// ============================================================================
+
 /// 通用 JSON 值到 TOML 值转换器（支持简单类型和浅层嵌套）
 ///
 /// 支持的类型转换：
@@ -846,8 +489,22 @@ fn json_value_to_toml_item(value: &Value, field_name: &str) -> Option<toml_edit:
            for item in arr {
                match item {
                    Value::String(s) => toml_arr.push(s.as_str()),
-                    Value::Number(n) if n.is_i64() => toml_arr.push(n.as_i64().unwrap()),
-                    Value::Number(n) if n.is_f64() => toml_arr.push(n.as_f64().unwrap()),
+                    Value::Number(n) if n.is_i64() => {
+                        if let Some(i) = n.as_i64() {
+                            toml_arr.push(i);
+                        } else {
+                            all_same_type = false;
+                            break;
+                        }
+                    }
+                    Value::Number(n) if n.is_f64() => {
+                        if let Some(f) = n.as_f64() {
+                            toml_arr.push(f);
+                        } else {
+                            all_same_type = false;
+                            break;
+                        }
+                    }
                    Value::Bool(b) => toml_arr.push(*b),
                    _ => {
                        all_same_type = false;
@@ -910,7 +567,7 @@ fn json_server_to_toml_table(spec: &Value) -> Result<toml_edit::Table, AppError>
    // 定义核心字段（已在下方处理，跳过通用转换）
    let core_fields = match typ {
        "stdio" => vec!["type", "command", "args", "env", "cwd"],
-        "http" | "sse" => vec!["type", "url", "headers"],
+        "http" | "sse" => vec!["type", "url", "http_headers"],
        _ => vec!["type"],
    };

@@ -988,7 +645,7 @@ fn json_server_to_toml_table(spec: &Value) -> Result<toml_edit::Table, AppError>
                    }
                }
                if !h_tbl.is_empty() {
-                    t["headers"] = Item::Table(h_tbl);
+                    t["http_headers"] = Item::Table(h_tbl);
                }
            }
        }
@@ -1019,117 +676,3 @@ fn json_server_to_toml_table(spec: &Value) -> Result<toml_edit::Table, AppError>

    Ok(t)
 }
-
-/// 将单个 MCP 服务器同步到 Codex live 配置
-/// 始终使用 Codex 官方格式 [mcp_servers]，并清理可能存在的错误格式 [mcp.servers]
-pub fn sync_single_server_to_codex(
-    _config: &MultiAppConfig,
-    id: &str,
-    server_spec: &Value,
-) -> Result<(), AppError> {
-    use toml_edit::Item;
-
-    // 读取现有的 config.toml
-    let config_path = crate::codex_config::get_codex_config_path();
-
-    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>()
-            .map_err(|e| AppError::McpValidation(format!("解析 Codex config.toml 失败: {e}")))?
-    } else {
-        toml_edit::DocumentMut::new()
-    };
-
-    // 清理可能存在的错误格式 [mcp.servers]
-    if let Some(mcp_item) = doc.get_mut("mcp") {
-        if let Some(tbl) = mcp_item.as_table_like_mut() {
-            if tbl.contains_key("servers") {
-                log::warn!("检测到错误的 MCP 格式 [mcp.servers]，正在清理并迁移到 [mcp_servers]");
-                tbl.remove("servers");
-            }
-        }
-    }
-
-    // 确保 [mcp_servers] 表存在
-    if !doc.contains_key("mcp_servers") {
-        doc["mcp_servers"] = toml_edit::table();
-    }
-
-    // 将 JSON 服务器规范转换为 TOML 表
-    let toml_table = json_server_to_toml_table(server_spec)?;
-
-    // 使用唯一正确的格式：[mcp_servers]
-    doc["mcp_servers"][id] = Item::Table(toml_table);
-
-    // 写回文件
-    std::fs::write(&config_path, doc.to_string()).map_err(|e| AppError::io(&config_path, e))?;
-
-    Ok(())
-}
-
-/// 从 Codex live 配置中移除单个 MCP 服务器
-/// 从正确的 [mcp_servers] 表中删除，同时清理可能存在于错误位置 [mcp.servers] 的数据
-pub fn remove_server_from_codex(id: &str) -> Result<(), AppError> {
-    let config_path = crate::codex_config::get_codex_config_path();
-
-    if !config_path.exists() {
-        return Ok(()); // 文件不存在，无需删除
-    }
-
-    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>()
-        .map_err(|e| AppError::McpValidation(format!("解析 Codex config.toml 失败: {e}")))?;
-
-    // 从正确的位置删除：[mcp_servers]
-    if let Some(mcp_servers) = doc.get_mut("mcp_servers").and_then(|s| s.as_table_mut()) {
-        mcp_servers.remove(id);
-    }
-
-    // 同时清理可能存在于错误位置的数据：[mcp.servers]（如果存在）
-    if let Some(mcp_table) = doc.get_mut("mcp").and_then(|t| t.as_table_mut()) {
-        if let Some(servers) = mcp_table.get_mut("servers").and_then(|s| s.as_table_mut()) {
-            if servers.remove(id).is_some() {
-                log::warn!("从错误的 MCP 格式 [mcp.servers] 中清理了服务器 '{id}'");
-            }
-        }
-    }
-
-    // 写回文件
-    std::fs::write(&config_path, doc.to_string()).map_err(|e| AppError::io(&config_path, e))?;
-
-    Ok(())
-}
-
-/// 将单个 MCP 服务器同步到 Gemini live 配置
-pub fn sync_single_server_to_gemini(
-    _config: &MultiAppConfig,
-    id: &str,
-    server_spec: &Value,
-) -> Result<(), AppError> {
-    // 读取现有的 MCP 配置
-    let current = crate::gemini_mcp::read_mcp_servers_map()?;
-
-    // 创建新的 HashMap，包含现有的所有服务器 + 当前要同步的服务器
-    let mut updated = current;
-    updated.insert(id.to_string(), server_spec.clone());
-
-    // 写回
-    crate::gemini_mcp::set_mcp_servers_map(&updated)
-}
-
-/// 从 Gemini live 配置中移除单个 MCP 服务器
-pub fn remove_server_from_gemini(id: &str) -> Result<(), AppError> {
-    // 读取现有的 MCP 配置
-    let mut current = crate::gemini_mcp::read_mcp_servers_map()?;
-
-    // 移除指定服务器
-    current.remove(id);
-
-    // 写回
-    crate::gemini_mcp::set_mcp_servers_map(&current)
-}
@@ -0,0 +1,141 @@
+//! Gemini MCP 同步和导入模块
+
+use serde_json::Value;
+use std::collections::HashMap;
+
+use crate::app_config::{McpApps, McpConfig, McpServer, MultiAppConfig};
+use crate::error::AppError;
+
+use super::validation::{extract_server_spec, validate_server_spec};
+
+fn should_sync_gemini_mcp() -> bool {
+    // Gemini 未安装/未初始化时：~/.gemini 目录不存在。
+    // 按用户偏好：目录缺失时跳过写入/删除，不创建任何文件或目录。
+    crate::gemini_config::get_gemini_dir().exists()
+}
+
+/// 返回已启用的 MCP 服务器（过滤 enabled==true）
+fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {
+    let mut out = HashMap::new();
+    for (id, entry) in cfg.servers.iter() {
+        let enabled = entry
+            .get("enabled")
+            .and_then(|v| v.as_bool())
+            .unwrap_or(false);
+        if !enabled {
+            continue;
+        }
+        match extract_server_spec(entry) {
+            Ok(spec) => {
+                out.insert(id.clone(), spec);
+            }
+            Err(err) => {
+                log::warn!("跳过无效的 MCP 条目 '{id}': {err}");
+            }
+        }
+    }
+    out
+}
+
+/// 将 config.json 中 Gemini 的 enabled==true 项写入 Gemini MCP 配置
+pub fn sync_enabled_to_gemini(config: &MultiAppConfig) -> Result<(), AppError> {
+    if !should_sync_gemini_mcp() {
+        return Ok(());
+    }
+    let enabled = collect_enabled_servers(&config.mcp.gemini);
+    crate::gemini_mcp::set_mcp_servers_map(&enabled)
+}
+
+/// 从 Gemini MCP 配置导入到统一结构（v3.7.0+）
+/// 已存在的服务器将启用 Gemini 应用，不覆盖其他字段和应用状态
+pub fn import_from_gemini(config: &mut MultiAppConfig) -> Result<usize, AppError> {
+    let map = crate::gemini_mcp::read_mcp_servers_map()?;
+    if map.is_empty() {
+        return Ok(0);
+    }
+
+    // 确保新结构存在
+    let servers = config.mcp.servers.get_or_insert_with(HashMap::new);
+
+    let mut changed = 0;
+    let mut errors = Vec::new();
+
+    for (id, spec) in map.iter() {
+        // 校验：单项失败不中止，收集错误继续处理
+        if let Err(e) = validate_server_spec(spec) {
+            log::warn!("跳过无效 MCP 服务器 '{id}': {e}");
+            errors.push(format!("{id}: {e}"));
+            continue;
+        }
+
+        if let Some(existing) = servers.get_mut(id) {
+            // 已存在：仅启用 Gemini 应用
+            if !existing.apps.gemini {
+                existing.apps.gemini = true;
+                changed += 1;
+                log::info!("MCP 服务器 '{id}' 已启用 Gemini 应用");
+            }
+        } else {
+            // 新建服务器：默认仅启用 Gemini
+            servers.insert(
+                id.clone(),
+                McpServer {
+                    id: id.clone(),
+                    name: id.clone(),
+                    server: spec.clone(),
+                    apps: McpApps {
+                        claude: false,
+                        codex: false,
+                        gemini: true,
+                    },
+                    description: None,
+                    homepage: None,
+                    docs: None,
+                    tags: Vec::new(),
+                },
+            );
+            changed += 1;
+            log::info!("导入新 MCP 服务器 '{id}'");
+        }
+    }
+
+    if !errors.is_empty() {
+        log::warn!("导入完成，但有 {} 项失败: {:?}", errors.len(), errors);
+    }
+
+    Ok(changed)
+}
+
+/// 将单个 MCP 服务器同步到 Gemini live 配置
+pub fn sync_single_server_to_gemini(
+    _config: &MultiAppConfig,
+    id: &str,
+    server_spec: &Value,
+) -> Result<(), AppError> {
+    if !should_sync_gemini_mcp() {
+        return Ok(());
+    }
+    // 读取现有的 MCP 配置
+    let mut current = crate::gemini_mcp::read_mcp_servers_map()?;
+
+    // 添加/更新当前服务器
+    current.insert(id.to_string(), server_spec.clone());
+
+    // 写回
+    crate::gemini_mcp::set_mcp_servers_map(&current)
+}
+
+/// 从 Gemini live 配置中移除单个 MCP 服务器
+pub fn remove_server_from_gemini(id: &str) -> Result<(), AppError> {
+    if !should_sync_gemini_mcp() {
+        return Ok(());
+    }
+    // 读取现有的 MCP 配置
+    let mut current = crate::gemini_mcp::read_mcp_servers_map()?;
+
+    // 移除指定服务器
+    current.remove(id);
+
+    // 写回
+    crate::gemini_mcp::set_mcp_servers_map(&current)
+}
@@ -0,0 +1,28 @@
+//! MCP (Model Context Protocol) 服务器管理模块
+//!
+//! 本模块负责 MCP 服务器配置的验证、同步和导入导出。
+//!
+//! ## 模块结构
+//!
+//! - `validation` - 服务器配置验证
+//! - `claude` - Claude MCP 同步和导入
+//! - `codex` - Codex MCP 同步和导入（含 TOML 转换）
+//! - `gemini` - Gemini MCP 同步和导入
+
+mod claude;
+mod codex;
+mod gemini;
+mod validation;
+
+// 重新导出公共 API
+pub use claude::{
+    import_from_claude, remove_server_from_claude, sync_enabled_to_claude,
+    sync_single_server_to_claude,
+};
+pub use codex::{
+    import_from_codex, remove_server_from_codex, sync_enabled_to_codex, sync_single_server_to_codex,
+};
+pub use gemini::{
+    import_from_gemini, remove_server_from_gemini, sync_enabled_to_gemini,
+    sync_single_server_to_gemini,
+};
@@ -0,0 +1,69 @@
+//! MCP 服务器配置验证模块
+
+use serde_json::Value;
+
+use crate::error::AppError;
+
+/// 基础校验：允许 stdio/http/sse；或省略 type（视为 stdio）。对应必填字段存在
+pub fn validate_server_spec(spec: &Value) -> Result<(), AppError> {
+    if !spec.is_object() {
+        return Err(AppError::McpValidation(
+            "MCP 服务器连接定义必须为 JSON 对象".into(),
+        ));
+    }
+    let t_opt = spec.get("type").and_then(|x| x.as_str());
+    // 支持三种：stdio/http/sse；若缺省 type 则按 stdio 处理（与社区常见 .mcp.json 一致）
+    let is_stdio = t_opt.map(|t| t == "stdio").unwrap_or(true);
+    let is_http = t_opt.map(|t| t == "http").unwrap_or(false);
+    let is_sse = t_opt.map(|t| t == "sse").unwrap_or(false);
+
+    if !(is_stdio || is_http || is_sse) {
+        return Err(AppError::McpValidation(
+            "MCP 服务器 type 必须是 'stdio'、'http' 或 'sse'（或省略表示 stdio）".into(),
+        ));
+    }
+
+    if is_stdio {
+        let cmd = spec.get("command").and_then(|x| x.as_str()).unwrap_or("");
+        if cmd.trim().is_empty() {
+            return Err(AppError::McpValidation(
+                "stdio 类型的 MCP 服务器缺少 command 字段".into(),
+            ));
+        }
+    }
+    if is_http {
+        let url = spec.get("url").and_then(|x| x.as_str()).unwrap_or("");
+        if url.trim().is_empty() {
+            return Err(AppError::McpValidation(
+                "http 类型的 MCP 服务器缺少 url 字段".into(),
+            ));
+        }
+    }
+    if is_sse {
+        let url = spec.get("url").and_then(|x| x.as_str()).unwrap_or("");
+        if url.trim().is_empty() {
+            return Err(AppError::McpValidation(
+                "sse 类型的 MCP 服务器缺少 url 字段".into(),
+            ));
+        }
+    }
+    Ok(())
+}
+
+/// 从 MCP 条目中提取服务器规范
+pub fn extract_server_spec(entry: &Value) -> Result<Value, AppError> {
+    let obj = entry
+        .as_object()
+        .ok_or_else(|| AppError::McpValidation("MCP 服务器条目必须为 JSON 对象".into()))?;
+    let server = obj
+        .get("server")
+        .ok_or_else(|| AppError::McpValidation("MCP 服务器条目缺少 server 字段".into()))?;
+
+    if !server.is_object() {
+        return Err(AppError::McpValidation(
+            "MCP 服务器 server 字段必须为 JSON 对象".into(),
+        ));
+    }
+
+    Ok(server.clone())
+}
@@ -1,3 +1,4 @@
+use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
@@ -28,6 +29,17 @@ pub struct Provider {
    /// 供应商元数据（不写入 live 配置，仅存于 ~/.cc-switch/config.json）
    #[serde(skip_serializing_if = "Option::is_none")]
    pub meta: Option<ProviderMeta>,
+    /// 图标名称（如 "openai", "anthropic"）
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub icon: Option<String>,
+    /// 图标颜色（Hex 格式，如 "#00A67E"）
+    #[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 {
@@ -48,6 +60,9 @@ impl Provider {
            sort_index: None,
            notes: None,
            meta: None,
+            icon: None,
+            icon_color: None,
+            in_failover_queue: false,
        }
    }
 }
@@ -55,7 +70,7 @@ impl Provider {
 /// 供应商管理器
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct ProviderManager {
-    pub providers: HashMap<String, Provider>,
+    pub providers: IndexMap<String, Provider>,
    pub current: String,
 }

@@ -141,11 +156,302 @@ pub struct ProviderMeta {
        skip_serializing_if = "Option::is_none"
    )]
    pub partner_promotion_key: Option<String>,
+    /// 成本倍数（用于计算实际成本）
+    #[serde(rename = "costMultiplier", skip_serializing_if = "Option::is_none")]
+    pub cost_multiplier: Option<String>,
+    /// 每日消费限额（USD）
+    #[serde(rename = "limitDailyUsd", skip_serializing_if = "Option::is_none")]
+    pub limit_daily_usd: Option<String>,
+    /// 每月消费限额（USD）
+    #[serde(rename = "limitMonthlyUsd", skip_serializing_if = "Option::is_none")]
+    pub limit_monthly_usd: Option<String>,
 }

 impl ProviderManager {
    /// 获取所有供应商
-    pub fn get_all_providers(&self) -> &HashMap<String, Provider> {
+    pub fn get_all_providers(&self) -> &IndexMap<String, Provider> {
        &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,
+        })
+    }
+}
@@ -0,0 +1,238 @@
+use once_cell::sync::Lazy;
+use std::collections::HashMap;
+
+/// 供应商图标信息
+#[derive(Debug, Clone)]
+#[allow(dead_code)]
+pub struct ProviderIcon {
+    pub name: &'static str,
+    pub color: &'static str,
+}
+
+/// 供应商名称到图标的默认映射
+#[allow(dead_code)]
+pub static DEFAULT_PROVIDER_ICONS: Lazy<HashMap<&'static str, ProviderIcon>> = Lazy::new(|| {
+    let mut m = HashMap::new();
+
+    // AI 服务商
+    m.insert(
+        "openai",
+        ProviderIcon {
+            name: "openai",
+            color: "#00A67E",
+        },
+    );
+    m.insert(
+        "anthropic",
+        ProviderIcon {
+            name: "anthropic",
+            color: "#D4915D",
+        },
+    );
+    m.insert(
+        "claude",
+        ProviderIcon {
+            name: "claude",
+            color: "#D4915D",
+        },
+    );
+    m.insert(
+        "google",
+        ProviderIcon {
+            name: "google",
+            color: "#4285F4",
+        },
+    );
+    m.insert(
+        "gemini",
+        ProviderIcon {
+            name: "gemini",
+            color: "#4285F4",
+        },
+    );
+    m.insert(
+        "deepseek",
+        ProviderIcon {
+            name: "deepseek",
+            color: "#1E88E5",
+        },
+    );
+    m.insert(
+        "kimi",
+        ProviderIcon {
+            name: "kimi",
+            color: "#6366F1",
+        },
+    );
+    m.insert(
+        "moonshot",
+        ProviderIcon {
+            name: "moonshot",
+            color: "#6366F1",
+        },
+    );
+    m.insert(
+        "zhipu",
+        ProviderIcon {
+            name: "zhipu",
+            color: "#0F62FE",
+        },
+    );
+    m.insert(
+        "minimax",
+        ProviderIcon {
+            name: "minimax",
+            color: "#FF6B6B",
+        },
+    );
+    m.insert(
+        "baidu",
+        ProviderIcon {
+            name: "baidu",
+            color: "#2932E1",
+        },
+    );
+    m.insert(
+        "alibaba",
+        ProviderIcon {
+            name: "alibaba",
+            color: "#FF6A00",
+        },
+    );
+    m.insert(
+        "tencent",
+        ProviderIcon {
+            name: "tencent",
+            color: "#00A4FF",
+        },
+    );
+    m.insert(
+        "meta",
+        ProviderIcon {
+            name: "meta",
+            color: "#0081FB",
+        },
+    );
+    m.insert(
+        "microsoft",
+        ProviderIcon {
+            name: "microsoft",
+            color: "#00A4EF",
+        },
+    );
+    m.insert(
+        "cohere",
+        ProviderIcon {
+            name: "cohere",
+            color: "#39594D",
+        },
+    );
+    m.insert(
+        "perplexity",
+        ProviderIcon {
+            name: "perplexity",
+            color: "#20808D",
+        },
+    );
+    m.insert(
+        "mistral",
+        ProviderIcon {
+            name: "mistral",
+            color: "#FF7000",
+        },
+    );
+    m.insert(
+        "huggingface",
+        ProviderIcon {
+            name: "huggingface",
+            color: "#FFD21E",
+        },
+    );
+
+    // 云平台
+    m.insert(
+        "aws",
+        ProviderIcon {
+            name: "aws",
+            color: "#FF9900",
+        },
+    );
+    m.insert(
+        "azure",
+        ProviderIcon {
+            name: "azure",
+            color: "#0078D4",
+        },
+    );
+    m.insert(
+        "huawei",
+        ProviderIcon {
+            name: "huawei",
+            color: "#FF0000",
+        },
+    );
+    m.insert(
+        "cloudflare",
+        ProviderIcon {
+            name: "cloudflare",
+            color: "#F38020",
+        },
+    );
+
+    m
+});
+
+/// 根据供应商名称智能推断图标
+#[allow(dead_code)]
+pub fn infer_provider_icon(provider_name: &str) -> Option<ProviderIcon> {
+    let name_lower = provider_name.to_lowercase();
+
+    // 精确匹配
+    if let Some(icon) = DEFAULT_PROVIDER_ICONS.get(name_lower.as_str()) {
+        return Some(icon.clone());
+    }
+
+    // 模糊匹配（包含关键词）
+    for (key, icon) in DEFAULT_PROVIDER_ICONS.iter() {
+        if name_lower.contains(key) {
+            return Some(icon.clone());
+        }
+    }
+
+    None
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_exact_match() {
+        let icon = infer_provider_icon("openai");
+        assert!(icon.is_some());
+        let icon = icon.unwrap();
+        assert_eq!(icon.name, "openai");
+        assert_eq!(icon.color, "#00A67E");
+    }
+
+    #[test]
+    fn test_fuzzy_match() {
+        let icon = infer_provider_icon("OpenAI Official");
+        assert!(icon.is_some());
+        let icon = icon.unwrap();
+        assert_eq!(icon.name, "openai");
+    }
+
+    #[test]
+    fn test_case_insensitive() {
+        let icon = infer_provider_icon("ANTHROPIC");
+        assert!(icon.is_some());
+        assert_eq!(icon.unwrap().name, "anthropic");
+    }
+
+    #[test]
+    fn test_no_match() {
+        let icon = infer_provider_icon("unknown provider");
+        assert!(icon.is_none());
+    }
+}
@@ -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);
+    }
+}
@@ -0,0 +1,506 @@
+//! 熔断器模块
+//!
+//! 实现熔断器模式，用于防止向不健康的供应商发送请求
+
+use serde::{Deserialize, Serialize};
+use std::sync::atomic::{AtomicU32, Ordering};
+use std::sync::Arc;
+use std::time::Instant;
+use tokio::sync::RwLock;
+
+/// 熔断器状态
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum CircuitState {
+    /// 关闭状态 - 正常工作
+    Closed,
+    /// 打开状态 - 熔断激活，拒绝请求
+    Open,
+    /// 半开状态 - 尝试恢复，允许部分请求通过
+    HalfOpen,
+}
+
+impl std::fmt::Display for CircuitState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            CircuitState::Closed => write!(f, "closed"),
+            CircuitState::Open => write!(f, "open"),
+            CircuitState::HalfOpen => write!(f, "half_open"),
+        }
+    }
+}
+
+/// 熔断器配置
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CircuitBreakerConfig {
+    /// 失败阈值 - 连续失败多少次后打开熔断器
+    pub failure_threshold: u32,
+    /// 成功阈值 - 半开状态下成功多少次后关闭熔断器
+    pub success_threshold: u32,
+    /// 超时时间 - 熔断器打开后多久尝试半开（秒）
+    pub timeout_seconds: u64,
+    /// 错误率阈值 - 错误率超过此值时打开熔断器 (0.0-1.0)
+    pub error_rate_threshold: f64,
+    /// 最小请求数 - 计算错误率前的最小请求数
+    pub min_requests: u32,
+}
+
+impl Default for CircuitBreakerConfig {
+    fn default() -> Self {
+        Self {
+            failure_threshold: 4,
+            success_threshold: 2,
+            timeout_seconds: 60,
+            error_rate_threshold: 0.6,
+            min_requests: 10,
+        }
+    }
+}
+
+/// 熔断器实例
+pub struct CircuitBreaker {
+    /// 当前状态
+    state: Arc<RwLock<CircuitState>>,
+    /// 连续失败计数
+    consecutive_failures: Arc<AtomicU32>,
+    /// 连续成功计数（半开状态）
+    consecutive_successes: Arc<AtomicU32>,
+    /// 总请求计数
+    total_requests: Arc<AtomicU32>,
+    /// 失败请求计数
+    failed_requests: Arc<AtomicU32>,
+    /// 上次打开时间
+    last_opened_at: Arc<RwLock<Option<Instant>>>,
+    /// 配置（支持热更新）
+    config: Arc<RwLock<CircuitBreakerConfig>>,
+    /// 半开状态已放行的请求数（用于限流）
+    half_open_requests: Arc<AtomicU32>,
+}
+
+/// 熔断器放行结果
+///
+/// `used_half_open_permit` 表示本次放行是否占用了 HalfOpen 探测名额。
+/// 调用方应在请求结束后把该值传回 `record_success` / `record_failure` 用于正确释放名额。
+#[derive(Debug, Clone, Copy)]
+pub struct AllowResult {
+    pub allowed: bool,
+    pub used_half_open_permit: bool,
+}
+
+impl CircuitBreaker {
+    /// 创建新的熔断器
+    pub fn new(config: CircuitBreakerConfig) -> Self {
+        Self {
+            state: Arc::new(RwLock::new(CircuitState::Closed)),
+            consecutive_failures: Arc::new(AtomicU32::new(0)),
+            consecutive_successes: Arc::new(AtomicU32::new(0)),
+            total_requests: Arc::new(AtomicU32::new(0)),
+            failed_requests: Arc::new(AtomicU32::new(0)),
+            last_opened_at: Arc::new(RwLock::new(None)),
+            config: Arc::new(RwLock::new(config)),
+            half_open_requests: Arc::new(AtomicU32::new(0)),
+        }
+    }
+
+    /// 更新熔断器配置（热更新，不重置状态）
+    pub async fn update_config(&self, new_config: CircuitBreakerConfig) {
+        *self.config.write().await = new_config;
+        log::debug!("Circuit breaker config updated");
+    }
+
+    /// 判断当前 Provider 是否“可被纳入候选链路”
+    ///
+    /// 这个方法不会占用 HalfOpen 探测名额，仅用于路由选择阶段的“可用性判断”：
+    /// - Closed / HalfOpen：可用（返回 true）
+    /// - Open：若超时到达则切到 HalfOpen 并返回 true，否则返回 false
+    ///
+    /// 注意：真正发起请求前仍需调用 `allow_request()` 来获取 HalfOpen 探测名额，
+    /// 并在请求结束后通过 `record_success()` / `record_failure()` 释放。
+    pub async fn is_available(&self) -> bool {
+        let state = *self.state.read().await;
+        let config = self.config.read().await;
+
+        match state {
+            CircuitState::Closed | CircuitState::HalfOpen => true,
+            CircuitState::Open => {
+                if let Some(opened_at) = *self.last_opened_at.read().await {
+                    if opened_at.elapsed().as_secs() >= config.timeout_seconds {
+                        drop(config); // 释放读锁再转换状态
+                        log::info!(
+                            "Circuit breaker transitioning from Open to HalfOpen (timeout reached)"
+                        );
+                        self.transition_to_half_open().await;
+                        return true;
+                    }
+                }
+                false
+            }
+        }
+    }
+
+    /// 检查是否允许请求通过
+    pub async fn allow_request(&self) -> AllowResult {
+        let state = *self.state.read().await;
+
+        match state {
+            CircuitState::Closed => AllowResult {
+                allowed: true,
+                used_half_open_permit: false,
+            },
+            CircuitState::Open => {
+                let config = self.config.read().await;
+                // 检查是否应该尝试半开
+                if let Some(opened_at) = *self.last_opened_at.read().await {
+                    if opened_at.elapsed().as_secs() >= config.timeout_seconds {
+                        drop(config); // 释放读锁再转换状态
+                        log::info!(
+                            "Circuit breaker transitioning from Open to HalfOpen (timeout reached)"
+                        );
+                        self.transition_to_half_open().await;
+
+                        // 转换后按当前状态决定是否需要获取 HalfOpen 探测名额
+                        let current_state = *self.state.read().await;
+                        return match current_state {
+                            CircuitState::Closed => AllowResult {
+                                allowed: true,
+                                used_half_open_permit: false,
+                            },
+                            CircuitState::HalfOpen => self.allow_half_open_probe(),
+                            CircuitState::Open => AllowResult {
+                                allowed: false,
+                                used_half_open_permit: false,
+                            },
+                        };
+                    }
+                }
+
+                AllowResult {
+                    allowed: false,
+                    used_half_open_permit: false,
+                }
+            }
+            CircuitState::HalfOpen => self.allow_half_open_probe(),
+        }
+    }
+
+    /// 记录成功
+    pub async fn record_success(&self, used_half_open_permit: bool) {
+        let state = *self.state.read().await;
+        let config = self.config.read().await;
+
+        if used_half_open_permit {
+            self.release_half_open_permit();
+        }
+
+        // 重置失败计数
+        self.consecutive_failures.store(0, Ordering::SeqCst);
+        self.total_requests.fetch_add(1, Ordering::SeqCst);
+
+        match state {
+            CircuitState::HalfOpen => {
+                let successes = self.consecutive_successes.fetch_add(1, Ordering::SeqCst) + 1;
+                log::debug!(
+                    "Circuit breaker HalfOpen: {} consecutive successes (threshold: {})",
+                    successes,
+                    config.success_threshold
+                );
+
+                if successes >= config.success_threshold {
+                    drop(config); // 释放读锁再转换状态
+                    log::info!("Circuit breaker transitioning from HalfOpen to Closed (success threshold reached)");
+                    self.transition_to_closed().await;
+                }
+            }
+            CircuitState::Closed => {
+                log::debug!("Circuit breaker Closed: request succeeded");
+            }
+            _ => {}
+        }
+    }
+
+    /// 记录失败
+    pub async fn record_failure(&self, used_half_open_permit: bool) {
+        let state = *self.state.read().await;
+        let config = self.config.read().await;
+
+        if used_half_open_permit {
+            self.release_half_open_permit();
+        }
+
+        // 更新计数器
+        let failures = self.consecutive_failures.fetch_add(1, Ordering::SeqCst) + 1;
+        self.total_requests.fetch_add(1, Ordering::SeqCst);
+        self.failed_requests.fetch_add(1, Ordering::SeqCst);
+
+        // 重置成功计数
+        self.consecutive_successes.store(0, Ordering::SeqCst);
+
+        log::debug!(
+            "Circuit breaker {:?}: {} consecutive failures (threshold: {})",
+            state,
+            failures,
+            config.failure_threshold
+        );
+
+        // 检查是否应该打开熔断器
+        match state {
+            CircuitState::HalfOpen => {
+                // HalfOpen 状态下失败，立即转为 Open
+                log::warn!("Circuit breaker HalfOpen probe failed, transitioning to Open");
+                drop(config);
+                self.transition_to_open().await;
+            }
+            CircuitState::Closed => {
+                // 检查连续失败次数
+                if failures >= config.failure_threshold {
+                    log::warn!(
+                        "Circuit breaker opening due to {} consecutive failures (threshold: {})",
+                        failures,
+                        config.failure_threshold
+                    );
+                    drop(config); // 释放读锁再转换状态
+                    self.transition_to_open().await;
+                } else {
+                    // 检查错误率
+                    let total = self.total_requests.load(Ordering::SeqCst);
+                    let failed = self.failed_requests.load(Ordering::SeqCst);
+
+                    if total >= config.min_requests {
+                        let error_rate = failed as f64 / total as f64;
+                        log::debug!(
+                            "Circuit breaker error rate: {:.2}% ({}/{} requests)",
+                            error_rate * 100.0,
+                            failed,
+                            total
+                        );
+
+                        if error_rate >= config.error_rate_threshold {
+                            log::warn!(
+                                "Circuit breaker opening due to high error rate: {:.2}% (threshold: {:.2}%)",
+                                error_rate * 100.0,
+                                config.error_rate_threshold * 100.0
+                            );
+                            drop(config); // 释放读锁再转换状态
+                            self.transition_to_open().await;
+                        }
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+
+    /// 获取当前状态
+    #[allow(dead_code)]
+    pub async fn get_state(&self) -> CircuitState {
+        *self.state.read().await
+    }
+
+    /// 获取统计信息
+    #[allow(dead_code)]
+    pub async fn get_stats(&self) -> CircuitBreakerStats {
+        CircuitBreakerStats {
+            state: *self.state.read().await,
+            consecutive_failures: self.consecutive_failures.load(Ordering::SeqCst),
+            consecutive_successes: self.consecutive_successes.load(Ordering::SeqCst),
+            total_requests: self.total_requests.load(Ordering::SeqCst),
+            failed_requests: self.failed_requests.load(Ordering::SeqCst),
+        }
+    }
+
+    /// 重置熔断器（手动恢复）
+    #[allow(dead_code)]
+    pub async fn reset(&self) {
+        log::info!("Circuit breaker manually reset to Closed state");
+        self.transition_to_closed().await;
+    }
+
+    fn allow_half_open_probe(&self) -> AllowResult {
+        // 半开状态限流：只允许有限请求通过进行探测
+        // 默认最多允许 1 个请求（可在配置中扩展）
+        let max_half_open_requests = 1u32;
+        let current = self.half_open_requests.fetch_add(1, Ordering::SeqCst);
+
+        if current < max_half_open_requests {
+            log::debug!(
+                "Circuit breaker HalfOpen: allowing probe request ({}/{})",
+                current + 1,
+                max_half_open_requests
+            );
+            AllowResult {
+                allowed: true,
+                used_half_open_permit: true,
+            }
+        } else {
+            // 超过限额，回退计数，拒绝请求
+            self.half_open_requests.fetch_sub(1, Ordering::SeqCst);
+            log::debug!(
+                "Circuit breaker HalfOpen: rejecting request (limit reached: {max_half_open_requests})"
+            );
+            AllowResult {
+                allowed: false,
+                used_half_open_permit: false,
+            }
+        }
+    }
+
+    fn release_half_open_permit(&self) {
+        let mut current = self.half_open_requests.load(Ordering::SeqCst);
+        loop {
+            if current == 0 {
+                // 理论上不应该发生：说明调用方传入的 used_half_open_permit 与实际占用不一致
+                log::debug!("Circuit breaker HalfOpen permit already released (counter=0)");
+                return;
+            }
+
+            match self.half_open_requests.compare_exchange(
+                current,
+                current - 1,
+                Ordering::SeqCst,
+                Ordering::SeqCst,
+            ) {
+                Ok(_) => return,
+                Err(actual) => current = actual,
+            }
+        }
+    }
+
+    /// 转换到打开状态
+    async fn transition_to_open(&self) {
+        *self.state.write().await = CircuitState::Open;
+        *self.last_opened_at.write().await = Some(Instant::now());
+        self.consecutive_failures.store(0, Ordering::SeqCst);
+        self.consecutive_successes.store(0, Ordering::SeqCst);
+    }
+
+    /// 转换到半开状态
+    async fn transition_to_half_open(&self) {
+        let mut state = self.state.write().await;
+        if *state != CircuitState::Open {
+            return;
+        }
+
+        *state = CircuitState::HalfOpen;
+        self.consecutive_successes.store(0, Ordering::SeqCst);
+        // 重置半开状态的请求限流计数
+        self.half_open_requests.store(0, Ordering::SeqCst);
+    }
+
+    /// 转换到关闭状态
+    async fn transition_to_closed(&self) {
+        *self.state.write().await = CircuitState::Closed;
+        self.consecutive_failures.store(0, Ordering::SeqCst);
+        self.consecutive_successes.store(0, Ordering::SeqCst);
+        // 重置计数器
+        self.total_requests.store(0, Ordering::SeqCst);
+        self.failed_requests.store(0, Ordering::SeqCst);
+    }
+}
+
+/// 熔断器统计信息
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CircuitBreakerStats {
+    pub state: CircuitState,
+    pub consecutive_failures: u32,
+    pub consecutive_successes: u32,
+    pub total_requests: u32,
+    pub failed_requests: u32,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_circuit_breaker_closed_to_open() {
+        let config = CircuitBreakerConfig {
+            failure_threshold: 3,
+            ..Default::default()
+        };
+        let breaker = CircuitBreaker::new(config);
+
+        // 初始状态应该是关闭
+        assert_eq!(breaker.get_state().await, CircuitState::Closed);
+        assert!(breaker.allow_request().await.allowed);
+
+        // 记录 3 次失败
+        for _ in 0..3 {
+            breaker.record_failure(false).await;
+        }
+
+        // 应该转换到打开状态
+        assert_eq!(breaker.get_state().await, CircuitState::Open);
+        assert!(!breaker.allow_request().await.allowed);
+    }
+
+    #[tokio::test]
+    async fn test_circuit_breaker_half_open_to_closed() {
+        let config = CircuitBreakerConfig {
+            failure_threshold: 2,
+            success_threshold: 2,
+            ..Default::default()
+        };
+        let breaker = CircuitBreaker::new(config);
+
+        // 打开熔断器
+        breaker.record_failure(false).await;
+        breaker.record_failure(false).await;
+        assert_eq!(breaker.get_state().await, CircuitState::Open);
+
+        // 手动转换到半开状态
+        breaker.transition_to_half_open().await;
+        assert_eq!(breaker.get_state().await, CircuitState::HalfOpen);
+
+        // 记录 2 次成功
+        breaker.record_success(false).await;
+        breaker.record_success(false).await;
+
+        // 应该转换到关闭状态
+        assert_eq!(breaker.get_state().await, CircuitState::Closed);
+    }
+
+    #[tokio::test]
+    async fn test_half_open_transition_does_not_reset_inflight_permit() {
+        let config = CircuitBreakerConfig {
+            timeout_seconds: 0,
+            ..Default::default()
+        };
+        let breaker = CircuitBreaker::new(config);
+
+        // 进入 Open，然后由于 timeout_seconds=0，allow_request 会立即切换到 HalfOpen 并占用探测名额
+        breaker.transition_to_open().await;
+        let first = breaker.allow_request().await;
+        assert!(first.allowed);
+        assert!(first.used_half_open_permit);
+        assert_eq!(breaker.get_state().await, CircuitState::HalfOpen);
+
+        // 模拟并发下的“重复 HalfOpen 转换调用”，不应重置 in-flight 计数
+        breaker.transition_to_half_open().await;
+
+        // 由于名额仍被占用，第二次请求应被拒绝
+        let second = breaker.allow_request().await;
+        assert!(!second.allowed);
+        assert!(!second.used_half_open_permit);
+    }
+
+    #[tokio::test]
+    async fn test_circuit_breaker_reset() {
+        let config = CircuitBreakerConfig {
+            failure_threshold: 2,
+            ..Default::default()
+        };
+        let breaker = CircuitBreaker::new(config);
+
+        // 打开熔断器
+        breaker.record_failure(false).await;
+        breaker.record_failure(false).await;
+        assert_eq!(breaker.get_state().await, CircuitState::Open);
+
+        // 重置
+        breaker.reset().await;
+        assert_eq!(breaker.get_state().await, CircuitState::Closed);
+        assert!(breaker.allow_request().await.allowed);
+    }
+}
@@ -0,0 +1,195 @@
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    Json,
+};
+use serde_json::json;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum ProxyError {
+    #[error("服务器已在运行")]
+    AlreadyRunning,
+
+    #[error("服务器未运行")]
+    NotRunning,
+
+    #[error("地址绑定失败: {0}")]
+    BindFailed(String),
+
+    #[error("请求转发失败: {0}")]
+    ForwardFailed(String),
+
+    #[error("无可用的Provider")]
+    NoAvailableProvider,
+
+    #[error("所有供应商已熔断，无可用渠道")]
+    AllProvidersCircuitOpen,
+
+    #[error("未配置供应商")]
+    NoProvidersConfigured,
+
+    #[allow(dead_code)]
+    #[error("Provider不健康: {0}")]
+    ProviderUnhealthy(String),
+
+    #[error("上游错误 (状态码 {status}): {body:?}")]
+    UpstreamError { status: u16, body: Option<String> },
+
+    #[error("超过最大重试次数")]
+    MaxRetriesExceeded,
+
+    #[error("数据库错误: {0}")]
+    DatabaseError(String),
+
+    #[error("配置错误: {0}")]
+    ConfigError(String),
+
+    #[allow(dead_code)]
+    #[error("格式转换错误: {0}")]
+    TransformError(String),
+
+    #[allow(dead_code)]
+    #[error("无效的请求: {0}")]
+    InvalidRequest(String),
+
+    #[error("超时: {0}")]
+    Timeout(String),
+
+    /// 流式响应空闲超时
+    #[allow(dead_code)]
+    #[error("流式响应空闲超时: {0}秒无数据")]
+    StreamIdleTimeout(u64),
+
+    /// 认证错误
+    #[allow(dead_code)]
+    #[error("认证失败: {0}")]
+    AuthError(String),
+
+    #[allow(dead_code)]
+    #[error("内部错误: {0}")]
+    Internal(String),
+}
+
+impl IntoResponse for ProxyError {
+    fn into_response(self) -> Response {
+        let (status, body) = match &self {
+            ProxyError::UpstreamError {
+                status: upstream_status,
+                body: upstream_body,
+            } => {
+                let http_status =
+                    StatusCode::from_u16(*upstream_status).unwrap_or(StatusCode::BAD_GATEWAY);
+
+                // 尝试解析上游响应体为 JSON，如果失败则包装为字符串
+                let error_body = if let Some(body_str) = upstream_body {
+                    if let Ok(json_body) = serde_json::from_str::<serde_json::Value>(body_str) {
+                        // 上游返回的是 JSON，直接透传
+                        json_body
+                    } else {
+                        // 上游返回的不是 JSON，包装为错误消息
+                        json!({
+                            "error": {
+                                "message": body_str,
+                                "type": "upstream_error",
+                            }
+                        })
+                    }
+                } else {
+                    json!({
+                        "error": {
+                            "message": format!("Upstream error (status {})", upstream_status),
+                            "type": "upstream_error",
+                        }
+                    })
+                };
+
+                (http_status, error_body)
+            }
+            _ => {
+                let (http_status, message) = match &self {
+                    ProxyError::AlreadyRunning => (StatusCode::CONFLICT, self.to_string()),
+                    ProxyError::NotRunning => (StatusCode::SERVICE_UNAVAILABLE, self.to_string()),
+                    ProxyError::BindFailed(_) => {
+                        (StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
+                    }
+                    ProxyError::ForwardFailed(_) => (StatusCode::BAD_GATEWAY, self.to_string()),
+                    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())
+                    }
+                    ProxyError::MaxRetriesExceeded => {
+                        (StatusCode::SERVICE_UNAVAILABLE, self.to_string())
+                    }
+                    ProxyError::DatabaseError(_) => {
+                        (StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
+                    }
+                    ProxyError::ConfigError(_) => (StatusCode::BAD_REQUEST, self.to_string()),
+                    ProxyError::TransformError(_) => {
+                        (StatusCode::UNPROCESSABLE_ENTITY, self.to_string())
+                    }
+                    ProxyError::InvalidRequest(_) => (StatusCode::BAD_REQUEST, self.to_string()),
+                    ProxyError::Timeout(_) => (StatusCode::GATEWAY_TIMEOUT, self.to_string()),
+                    ProxyError::StreamIdleTimeout(_) => {
+                        (StatusCode::GATEWAY_TIMEOUT, self.to_string())
+                    }
+                    ProxyError::AuthError(_) => (StatusCode::UNAUTHORIZED, self.to_string()),
+                    ProxyError::Internal(_) => {
+                        (StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
+                    }
+                    ProxyError::UpstreamError { .. } => unreachable!(),
+                };
+
+                let error_body = json!({
+                    "error": {
+                        "message": message,
+                        "type": "proxy_error",
+                    }
+                });
+
+                (http_status, error_body)
+            }
+        };
+
+        (status, Json(body)).into_response()
+    }
+}
+
+/// 错误分类
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ErrorCategory {
+    /// 可重试错误（网络问题、5xx）
+    Retryable, // 网络超时、5xx 错误
+    /// 不可重试错误（4xx、认证失败）
+    NonRetryable, // 认证失败、参数错误、4xx 错误
+    #[allow(dead_code)]
+    ClientAbort, // 客户端主动中断
+}
+
+/// 判断错误是否可重试
+#[allow(dead_code)]
+pub fn categorize_error(error: &reqwest::Error) -> ErrorCategory {
+    if error.is_timeout() || error.is_connect() {
+        return ErrorCategory::Retryable;
+    }
+
+    if let Some(status) = error.status() {
+        if status.is_server_error() {
+            ErrorCategory::Retryable
+        } else if status.is_client_error() {
+            ErrorCategory::NonRetryable
+        } else {
+            ErrorCategory::Retryable
+        }
+    } else {
+        ErrorCategory::Retryable
+    }
+}
@@ -0,0 +1,118 @@
+//! 错误类型到 HTTP 状态码的映射
+//!
+//! 将 ProxyError 映射到合适的 HTTP 状态码，用于日志记录
+
+use super::ProxyError;
+
+/// 将 ProxyError 映射到 HTTP 状态码
+///
+/// 映射规则：
+/// - 上游错误：直接使用上游返回的状态码
+/// - 超时：504 Gateway Timeout
+/// - 连接失败：502 Bad Gateway
+/// - 无可用 Provider：503 Service Unavailable
+/// - 重试耗尽：503 Service Unavailable
+/// - 其他错误：500 Internal Server Error
+pub fn map_proxy_error_to_status(error: &ProxyError) -> u16 {
+    match error {
+        // 上游错误：使用实际状态码
+        ProxyError::UpstreamError { status, .. } => *status,
+
+        // 超时错误：504 Gateway Timeout
+        ProxyError::Timeout(_) => 504,
+
+        // 转发失败/连接失败：502 Bad Gateway
+        ProxyError::ForwardFailed(_) => 502,
+
+        // 无可用 Provider：503 Service Unavailable
+        ProxyError::NoAvailableProvider => 503,
+
+        // 所有供应商已熔断：503 Service Unavailable
+        ProxyError::AllProvidersCircuitOpen => 503,
+
+        // 未配置供应商：503 Service Unavailable
+        ProxyError::NoProvidersConfigured => 503,
+
+        // 重试耗尽：503 Service Unavailable
+        ProxyError::MaxRetriesExceeded => 503,
+
+        // Provider 不健康：503 Service Unavailable
+        ProxyError::ProviderUnhealthy(_) => 503,
+
+        // 数据库错误：500 Internal Server Error
+        ProxyError::DatabaseError(_) => 500,
+
+        // 转换错误：500 Internal Server Error
+        ProxyError::TransformError(_) => 500,
+
+        // 其他未知错误：500 Internal Server Error
+        _ => 500,
+    }
+}
+
+/// 将 ProxyError 转换为用户友好的错误消息
+pub fn get_error_message(error: &ProxyError) -> String {
+    match error {
+        ProxyError::UpstreamError { status, body } => {
+            if let Some(body) = body {
+                format!("上游错误 ({status}): {body}")
+            } else {
+                format!("上游错误 ({status})")
+            }
+        }
+        ProxyError::Timeout(msg) => format!("请求超时: {msg}"),
+        ProxyError::ForwardFailed(msg) => format!("转发失败: {msg}"),
+        ProxyError::NoAvailableProvider => "无可用 Provider".to_string(),
+        ProxyError::AllProvidersCircuitOpen => "所有供应商已熔断，无可用渠道".to_string(),
+        ProxyError::NoProvidersConfigured => "未配置供应商".to_string(),
+        ProxyError::MaxRetriesExceeded => "所有 Provider 都失败，重试耗尽".to_string(),
+        ProxyError::ProviderUnhealthy(msg) => format!("Provider 不健康: {msg}"),
+        ProxyError::DatabaseError(msg) => format!("数据库错误: {msg}"),
+        ProxyError::TransformError(msg) => format!("请求/响应转换错误: {msg}"),
+        _ => error.to_string(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_map_upstream_error() {
+        let error = ProxyError::UpstreamError {
+            status: 401,
+            body: Some("Unauthorized".to_string()),
+        };
+        assert_eq!(map_proxy_error_to_status(&error), 401);
+    }
+
+    #[test]
+    fn test_map_timeout_error() {
+        let error = ProxyError::Timeout("Request timeout".to_string());
+        assert_eq!(map_proxy_error_to_status(&error), 504);
+    }
+
+    #[test]
+    fn test_map_connection_error() {
+        let error = ProxyError::ForwardFailed("Connection refused".to_string());
+        assert_eq!(map_proxy_error_to_status(&error), 502);
+    }
+
+    #[test]
+    fn test_map_no_provider_error() {
+        let error = ProxyError::NoAvailableProvider;
+        assert_eq!(map_proxy_error_to_status(&error), 503);
+    }
+
+    #[test]
+    fn test_get_error_message() {
+        let error = ProxyError::UpstreamError {
+            status: 500,
+            body: Some("Internal Server Error".to_string()),
+        };
+        let msg = get_error_message(&error);
+        assert!(msg.contains("上游错误"));
+        assert!(msg.contains("500"));
+        assert!(msg.contains("Internal Server Error"));
+    }
+}
@@ -0,0 +1,149 @@
+//! 故障转移切换模块
+//!
+//! 处理故障转移成功后的供应商切换逻辑，包括：
+//! - 去重控制（避免多个请求同时触发）
+//! - 数据库更新
+//! - 托盘菜单更新
+//! - 前端事件发射
+//! - Live 备份更新
+
+use crate::database::Database;
+use crate::error::AppError;
+use std::collections::HashSet;
+use std::str::FromStr;
+use std::sync::Arc;
+use tauri::{Emitter, Manager};
+use tokio::sync::RwLock;
+
+/// 故障转移切换管理器
+///
+/// 负责处理故障转移成功后的供应商切换，确保 UI 能够直观反映当前使用的供应商。
+#[derive(Clone)]
+pub struct FailoverSwitchManager {
+    /// 正在处理中的切换（key = "app_type:provider_id"）
+    pending_switches: Arc<RwLock<HashSet<String>>>,
+    db: Arc<Database>,
+}
+
+impl FailoverSwitchManager {
+    pub fn new(db: Arc<Database>) -> Self {
+        Self {
+            pending_switches: Arc::new(RwLock::new(HashSet::new())),
+            db,
+        }
+    }
+
+    /// 尝试执行故障转移切换
+    ///
+    /// 如果相同的切换已在进行中，则跳过；否则执行切换逻辑。
+    ///
+    /// # Returns
+    /// - `Ok(true)` - 切换成功执行
+    /// - `Ok(false)` - 切换已在进行中，跳过
+    /// - `Err(e)` - 切换过程中发生错误
+    pub async fn try_switch(
+        &self,
+        app_handle: Option<&tauri::AppHandle>,
+        app_type: &str,
+        provider_id: &str,
+        provider_name: &str,
+    ) -> Result<bool, AppError> {
+        let switch_key = format!("{app_type}:{provider_id}");
+
+        // 去重检查：如果相同切换已在进行中，跳过
+        {
+            let mut pending = self.pending_switches.write().await;
+            if pending.contains(&switch_key) {
+                log::debug!("[Failover] 切换已在进行中，跳过: {app_type} -> {provider_id}");
+                return Ok(false);
+            }
+            pending.insert(switch_key.clone());
+        }
+
+        // 执行切换（确保最后清理 pending 标记）
+        let result = self
+            .do_switch(app_handle, app_type, provider_id, provider_name)
+            .await;
+
+        // 清理 pending 标记
+        {
+            let mut pending = self.pending_switches.write().await;
+            pending.remove(&switch_key);
+        }
+
+        result
+    }
+
+    async fn do_switch(
+        &self,
+        app_handle: Option<&tauri::AppHandle>,
+        app_type: &str,
+        provider_id: &str,
+        provider_name: &str,
+    ) -> Result<bool, AppError> {
+        // 检查该应用是否已被代理接管（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
+        self.db.set_current_provider(app_type, provider_id)?;
+
+        // 2. 更新本地 settings（设备级）
+        let app_type_enum = crate::app_config::AppType::from_str(app_type)
+            .map_err(|_| AppError::Message(format!("无效的应用类型: {app_type}")))?;
+        crate::settings::set_current_provider(&app_type_enum, Some(provider_id))?;
+
+        // 3. 更新托盘菜单和发射事件
+        if let Some(app) = app_handle {
+            // 更新托盘菜单
+            if let Some(app_state) = app.try_state::<crate::store::AppState>() {
+                // 更新 Live 备份（确保代理停止时恢复正确配置）
+                if let Ok(Some(provider)) = self.db.get_provider_by_id(provider_id, app_type) {
+                    if let Err(e) = app_state
+                        .proxy_service
+                        .update_live_backup_from_provider(app_type, &provider)
+                        .await
+                    {
+                        log::warn!("[Failover] 更新 Live 备份失败: {e}");
+                    }
+                }
+
+                // 重建托盘菜单
+                if let Ok(new_menu) = crate::tray::create_tray_menu(app, app_state.inner()) {
+                    if let Some(tray) = app.tray_by_id("main") {
+                        if let Err(e) = tray.set_menu(Some(new_menu)) {
+                            log::error!("[Failover] 更新托盘菜单失败: {e}");
+                        }
+                    }
+                }
+            }
+
+            // 发射事件到前端
+            let event_data = serde_json::json!({
+                "appType": app_type,
+                "providerId": provider_id,
+                "source": "failover"  // 标识来源是故障转移
+            });
+            if let Err(e) = app.emit("provider-switched", event_data) {
+                log::error!("[Failover] 发射供应商切换事件失败: {e}");
+            }
+        }
+
+        log::info!("[Failover] 供应商切换完成: {app_type} -> {provider_name} ({provider_id})");
+
+        Ok(true)
+    }
+}
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 v22.4.1
 .12.0