Merge branch 'main' into refactor/ui

# Conflicts: # src/components/skills/SkillsPage.tsx
refactor(usage): improve footer layout with two-row design
2026-07-24 21:30:17 +08:00 · 2025-11-22 18:46:32 +08:00 · 2025-11-22 18:44:35 +08:00 · 2025-11-22 18:09:52 +08:00 · 2025-11-22 18:06:25 +08:00 · 2025-11-22 18:05:52 +08:00
164 changed files with 5924 additions and 14235 deletions
@@ -5,74 +5,6 @@ All notable changes to CC Switch will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [3.8.3] - 2025-12-24
-
-### Added
-
- **macOS tray template icon** - Use system template icon for better dark/light mode adaptation
- **AiGoCode partner** - Added AiGoCode icon and partner promotion
- **Skip first-run confirmation** - New setting to skip Claude Code first-run confirmation dialog
- **DMXAPI partner** - Added DMXAPI as official partner
- **Provider icons** - Added icons for OpenRouter, LongCat, ModelScope, AiHubMix
-
-### Fixed
-
- **UI header layout** - Fixed content being covered by fixed header (added padding-top)
- **Dark mode visibility** - Improved text visibility in dark mode
- **Azure link** - Corrected Azure website link (#407)
- **Skill installation** - Use directory basename for skill installation path (#358)
- **SQL import refresh** - Refresh all providers immediately after SQL import
- **MCP sync safety** - Skip sync when target CLI app is not installed
-
-### Changed
-
- **Model versions** - Updated model versions for provider presets
- **Provider switch notification** - Removed restart prompt from notification
- **SQL import restriction** - Restrict SQL import to CC Switch exported backups only
- **GLM partner images** - Updated partner banner images
-
---
-
-## [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
@@ -2,14 +2,19 @@

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

-[![Version](https://img.shields.io/badge/version-3.8.2-blue.svg)](https://github.com/farion1231/cc-switch/releases)
+[![Version](https://img.shields.io/badge/version-3.7.1-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)
 [![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) | [日本語](README_JA.md) | [Changelog](CHANGELOG.md)
+English | [中文](README_ZH.md) | [Changelog](CHANGELOG.md)
+
+**From Provider Switcher to All-in-One AI CLI Management Platform**
+
+Unified management for Claude Code, Codex & Gemini CLI provider configurations, MCP servers, Skills extensions, and system prompts.

 </div>

@@ -17,7 +22,11 @@ English | [中文](README_ZH.md) | [日本語](README_JA.md) | [Changelog](CHANG

 ![Zhipu GLM](assets/partners/banners/glm-en.jpg)

-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)!

 ---

@@ -29,13 +38,7 @@ This project is sponsored by Z.ai, supporting us with their GLM CODING PLAN.GLM

 <tr>
 <td width="180"><img src="assets/partners/logos/sds-en.png" alt="ShanDianShuo" width="150"></td>
-<td>Thanks to ShanDianShuo for sponsoring this project! ShanDianShuo is a local-first AI voice input: Millisecond latency, data stays on device, 4x faster than typing, AI-powered correction, Privacy-first, completely free. Doubles your coding efficiency with Claude Code! <a href="https://www.shandianshuo.cn">Free download</a> for Mac/Win</td>
-</tr>
-
-<tr>
-<td width="180"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></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>
+<td>Thanks to ShanDianShuo for sponsoring this project! ShanDianShuo is a local-first AI voice input: Millisecond latency, data stays on device, 4x faster than typing, AI-powered correction, Privacy-first, completely free. Doubles your coding efficiency with Claude Code! <a href="shandianshuo.cn">Free download</a> for Mac/Win</td>
 </tr>

 </table>
@@ -48,42 +51,9 @@ This project is sponsored by Z.ai, supporting us with their GLM CODING PLAN.GLM

 ## Features

-### Current Version: v3.8.2 | [Full Changelog](CHANGELOG.md) | [Release Notes](docs/release-note-v3.8.0-en.md)
+### Current Version: v3.7.0 | [Full Changelog](CHANGELOG.md) | [📋 Release Notes](docs/release-note-v3.7.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**
+**v3.7.0 Major Update (2025-11-19)**

 **Six Core Features, 18,000+ Lines of New Code**

@@ -256,10 +226,10 @@ Download the latest `CC-Switch-v{version}-Linux.deb` package or `CC-Switch-v{ver
 - MCP servers: `~/.gemini/settings.json` → `mcpServers`
 - Tray quick switch: Each provider switch rewrites `~/.gemini/.env`, no need to restart Gemini CLI

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

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

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

 **Core Design Patterns**

- **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
+- **SSOT** (Single Source of Truth): All provider configs stored in `~/.cc-switch/config.json`
 - **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**: Mutex-protected database connection avoids race conditions
- **Layered Architecture**: Clear separation (Commands → Services → DAO → Database)
+- **Concurrency Safe**: RwLock with scoped guards avoids deadlocks
+- **Layered Architecture**: Clear separation (Commands → Services → Models)

 **Key Components**

@@ -1,474 +0,0 @@
-<div align="center">
-
-# Claude Code / Codex / Gemini CLI オールインワン・アシスタント
-
-[![Version](https://img.shields.io/badge/version-3.8.2-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)
-
-本プロジェクトは 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"><img src="assets/partners/logos/packycode.png" alt="PackyCode" width="150"></td>
-<td>PackyCode のご支援に感謝します！PackyCode は Claude Code、Codex、Gemini などのリレーサービスを提供する信頼性の高い API 中継プラットフォームです。本ソフト利用者向けに特別割引があります：<a href="https://www.packyapi.com/register?aff=cc-switch">このリンク</a>で登録し、チャージ時に「cc-switch」クーポンを入力すると 10% オフになります。</td>
-</tr>
-
-<tr>
-<td width="180"><img src="assets/partners/logos/sds-en.png" alt="ShanDianShuo" width="150"></td>
-<td>ShanDianShuo のご支援に感謝します！ShanDianShuo はローカルファーストの音声入力ツールで、ミリ秒遅延・データは端末から外に出ず・キーボード入力の 4 倍の速度・AI 自動補正・プライバシー優先で完全無料。Claude Code と組み合わせればコーディング効率が倍増します。<a href="https://www.shandianshuo.cn">Mac/Win 版を無料ダウンロード</a></td>
-</tr>
-
-<tr>
-<td width="180"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></td>
-<td>本プロジェクトは AIGoCode のスポンサー提供でお届けしています。AIGoCode は、Claude Code・Codex・最新の Gemini モデルを統合したオールインワンのAIコーディングプラットフォームで、安定性・高速性・コストパフォーマンスに優れた開発サービスを提供します。柔軟なサブスクリプションプランを備え、レスポンスも非常に高速です。さらに、CC Switch ユーザー向けの特典として、<a href="https://aigocode.com/invite/CC-SWITCH">このリンク</a>から登録すると、初回チャージ時に10％分のボーナスクレジットが付与されます！
-
-</td>
-</tr>
-
-</table>
-
-## スクリーンショット
-
-|                  メイン画面                   |                  プロバイダ追加                  |
-| :-------------------------------------------: | :----------------------------------------------: |
-| ![メイン画面](assets/screenshots/main-ja.png) | ![プロバイダ追加](assets/screenshots/add-ja.png) |
-
-## 特長
-
-### 現在のバージョン：v3.8.2 | [完全な更新履歴](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,14 +2,19 @@

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

-[![Version](https://img.shields.io/badge/version-3.8.2-blue.svg)](https://github.com/farion1231/cc-switch/releases)
+[![Version](https://img.shields.io/badge/version-3.7.1-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)
 [![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_JA.md) | [更新日志](CHANGELOG.md) | [v3.8.0 发布说明](docs/release-note-v3.8.0-zh.md)
+[English](README.md) | 中文 | [更新日志](CHANGELOG.md) | [📋 v3.7.0 发布说明](docs/release-note-v3.7.0-zh.md)
+
+**从供应商切换器到 AI CLI 一体化管理平台**
+
+统一管理 Claude Code、Codex 与 Gemini CLI 的供应商配置、MCP 服务器、Skills 扩展和系统提示词。

 </div>

@@ -17,7 +22,11 @@

 ![智谱 GLM](assets/partners/banners/glm-zh.jpg)

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

 ---

@@ -29,12 +38,7 @@

 <tr>
 <td width="180"><img src="assets/partners/logos/sds-zh.png" alt="ShanDianShuo" width="150"></td>
-<td>感谢闪电说赞助了本项目！闪电说是本地优先的 AI 语音输入法：毫秒级响应，数据不离设备；打字速度提升 4 倍，AI 智能纠错；绝对隐私安全，完全免费，配合 Claude Code 写代码效率翻倍！支持 Mac/Win 双平台，<a href="https://www.shandianshuo.cn">免费下载</a></td>
-</tr>
-
-<tr>
-<td width="180"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></td>
-<td>感谢 AIGoCode 赞助了本项目！AIGoCode 是一个集成了 Claude Code、Codex 以及 Gemini 最新模型的一站式平台，为你提供稳定、高效且高性价比的AI编程服务。本站提供灵活的订阅计划，零封号风险，国内直连，无需魔法，极速响应。AIGoCode 为 CC Switch 的用户提供了特别福利，通过<a href="https://aigocode.com/invite/CC-SWITCH">此链接</a>注册的用户首次充值可以获得额外10%奖励额度！</td>
+<td>感谢闪电说赞助了本项目！闪电说是本地优先的 AI 语音输入法：毫秒级响应，数据不离设备；打字速度提升 4 倍，AI 智能纠错；绝对隐私安全，完全免费，配合 Claude Code 写代码效率翻倍！支持 Mac/Win 双平台，<a href="shandianshuo.cn">免费下载</a></td>
 </tr>

 </table>
@@ -47,42 +51,9 @@

 ## 功能特性

-### 当前版本：v3.8.2 | [完整更新日志](CHANGELOG.md)
+### 当前版本：v3.7.0 | [完整更新日志](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 亮点**
+**v3.7.0 重大更新（2025-11-19）**

 **六大核心功能，18,000+ 行新增代码**

@@ -255,10 +226,10 @@ paru -S cc-switch-bin
 - MCP 服务器：`~/.gemini/settings.json` → `mcpServers`
 - 托盘快速切换：每次切换供应商都会重写 `~/.gemini/.env`，无需重启 Gemini CLI 即可生效

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

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

 ### 云同步设置
@@ -294,12 +265,11 @@ paru -S cc-switch-bin

 **核心设计模式**

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

 **核心组件**

@@ -0,0 +1,76 @@
+# 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` 配置来更改默认语言
@@ -1,369 +0,0 @@
-# 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!**
@@ -1,315 +0,0 @@
-# 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!**
@@ -1,369 +0,0 @@
-# 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,6 +1,6 @@
 {
  "name": "cc-switch",
-  "version": "3.8.3",
+  "version": "3.7.1",
  "description": "All-in-One Assistant for Claude Code, Codex & Gemini CLI",
  "scripts": {
    "dev": "pnpm tauri dev",
@@ -32,10 +32,7 @@
    "prettier": "^3.6.2",
    "typescript": "^5.3.0",
    "vite": "^5.0.0",
-    "vitest": "^2.0.5",
-    "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.49",
-    "tailwindcss": "^3.4.17"
+    "vitest": "^2.0.5"
  },
  "dependencies": {
    "@codemirror/lang-javascript": "^6.2.4",
@@ -59,6 +56,7 @@
    "@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",
@@ -78,6 +76,7 @@
    "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"
@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};
@@ -14,7 +14,6 @@ const KEEP_LIST = [
    'zhipu', 'chatglm', 'glm', 'minimax', 'mistral', 'cohere',
    'perplexity', 'huggingface', 'midjourney', 'stability',
    'xai', 'grok', 'yi', 'zeroone', 'ollama',
-    'packycode',

    // Cloud/Tools
    'aws', 'googlecloud', 'huawei', 'cloudflare',
@@ -24,7 +24,6 @@ const KNOWN_METADATA = {
  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' },
@@ -39,18 +39,6 @@ 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"
@@ -509,12 +497,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

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

 [[package]]
 name = "cc-switch"
-version = "3.8.3"
+version = "3.7.1"
 dependencies = [
 "anyhow",
 "auto-launch",
@@ -632,7 +614,6 @@ dependencies = [
 "chrono",
 "dirs 5.0.1",
 "futures",
- "indexmap 2.11.4",
 "log",
 "objc2 0.5.2",
 "objc2-app-kit 0.2.2",
@@ -640,7 +621,6 @@ dependencies = [
 "regex",
 "reqwest",
 "rquickjs",
- "rusqlite",
 "serde",
 "serde_json",
 "serde_yaml",
@@ -1295,18 +1275,6 @@ 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"
@@ -1845,7 +1813,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.8",
+ "ahash",
 ]

 [[package]]
@@ -1853,9 +1821,6 @@ 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"
@@ -1863,15 +1828,6 @@ 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"
@@ -2056,7 +2012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98"
 dependencies = [
 "byteorder",
- "png 0.17.16",
+ "png",
 ]

 [[package]]
@@ -2172,19 +2128,6 @@ dependencies = [
 "icu_properties",
 ]

-[[package]]
-name = "image"
-version = "0.25.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7"
-dependencies = [
- "bytemuck",
- "byteorder-lite",
- "moxcms",
- "num-traits",
- "png 0.18.0",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -2455,17 +2398,6 @@ 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"
@@ -2608,16 +2540,6 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

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

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

-[[package]]
-name = "pxfm"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3cbdf373972bf78df4d3b518d07003938e2c7d1fb5891e55f9cb6df57009d84"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "quick-xml"
 version = "0.37.5"
@@ -3949,20 +3849,6 @@ 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"
@@ -4737,7 +4623,6 @@ dependencies = [
 "heck 0.5.0",
 "http",
 "http-range",
- "image",
 "jni",
 "libc",
 "log",
@@ -4806,7 +4691,7 @@ dependencies = [
 "ico",
 "json-patch",
 "plist",
- "png 0.17.16",
+ "png",
 "proc-macro2",
 "quote",
 "semver",
@@ -5522,7 +5407,7 @@ dependencies = [
 "objc2-core-graphics",
 "objc2-foundation 0.3.1",
 "once_cell",
- "png 0.17.16",
+ "png",
 "serde",
 "thiserror 2.0.17",
 "windows-sys 0.59.0",
@@ -5682,12 +5567,6 @@ 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"
@@ -1,6 +1,6 @@
 [package]
 name = "cc-switch"
-version = "3.8.3"
+version = "3.7.1"
 description = "All-in-One Assistant for Claude Code, Codex & Gemini CLI"
 authors = ["Jason Young"]
 license = "MIT"
@@ -26,7 +26,7 @@ serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
 chrono = { version = "0.4", features = ["serde"] }
-tauri = { version = "2.8.2", features = ["tray-icon", "protocol-asset", "image-png"] }
+tauri = { version = "2.8.2", features = ["tray-icon", "protocol-asset"] }
 tauri-plugin-log = "2"
 tauri-plugin-opener = "2"
 tauri-plugin-process = "2"
@@ -51,8 +51,6 @@ 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"] }

 [target.'cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))'.dependencies]
 tauri-plugin-single-instance = "2"
@@ -494,11 +494,8 @@ impl MultiAppConfig {
        // 创建提示词对象
        let timestamp = std::time::SystemTime::now()
            .duration_since(std::time::UNIX_EPOCH)
-            .map(|d| d.as_secs() as i64)
-            .unwrap_or_else(|_| {
-                log::warn!("Failed to get system time, using 0 as timestamp");
-                0
-            });
+            .unwrap()
+            .as_secs() as i64;

        let id = format!("auto-imported-{timestamp}");
        let prompt = crate::prompt::Prompt {
@@ -1,5 +1,5 @@
 use crate::error::AppError;
-use auto_launch::{AutoLaunch, AutoLaunchBuilder};
+use auto_launch::AutoLaunch;

 /// 初始化 AutoLaunch 实例
 fn get_auto_launch() -> Result<AutoLaunch, AppError> {
@@ -7,16 +7,7 @@ fn get_auto_launch() -> Result<AutoLaunch, AppError> {
    let app_path =
        std::env::current_exe().map_err(|e| AppError::Message(format!("无法获取应用路径: {e}")))?;

-    // 使用 AutoLaunchBuilder 消除平台差异
-    // Windows/Linux: new() 接受 3 参数
-    // macOS: new() 接受 4 参数（含 hidden 参数）
-    // Builder 模式自动处理这些差异
-    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}")))?;
-
+    let auto_launch = AutoLaunch::new(app_name, &app_path.to_string_lossy(), false, &[] as &[&str]);
    Ok(auto_launch)
 }

@@ -105,55 +105,6 @@ pub fn read_mcp_json() -> Result<Option<String>, AppError> {
    Ok(Some(content))
 }

-/// 在 ~/.claude.json 根对象写入 hasCompletedOnboarding=true（用于跳过 Claude Code 初次安装确认）
-/// 仅增量写入该字段，其他字段保持不变
-pub fn set_has_completed_onboarding() -> Result<bool, AppError> {
-    let path = user_config_path();
-    let mut root = if path.exists() {
-        read_json_value(&path)?
-    } else {
-        serde_json::json!({})
-    };
-
-    let obj = root
-        .as_object_mut()
-        .ok_or_else(|| AppError::Config("~/.claude.json 根必须是对象".into()))?;
-
-    let already = obj
-        .get("hasCompletedOnboarding")
-        .and_then(|v| v.as_bool())
-        .unwrap_or(false);
-    if already {
-        return Ok(false);
-    }
-
-    obj.insert("hasCompletedOnboarding".into(), Value::Bool(true));
-    write_json_value(&path, &root)?;
-    Ok(true)
-}
-
-/// 删除 ~/.claude.json 根对象的 hasCompletedOnboarding 字段（恢复 Claude Code 初次安装确认）
-/// 仅增量删除该字段，其他字段保持不变
-pub fn clear_has_completed_onboarding() -> Result<bool, AppError> {
-    let path = user_config_path();
-    if !path.exists() {
-        return Ok(false);
-    }
-
-    let mut root = read_json_value(&path)?;
-    let obj = root
-        .as_object_mut()
-        .ok_or_else(|| AppError::Config("~/.claude.json 根必须是对象".into()))?;
-
-    let existed = obj.remove("hasCompletedOnboarding").is_some();
-    if !existed {
-        return Ok(false);
-    }
-
-    write_json_value(&path, &root)?;
-    Ok(true)
-}
-
 pub fn upsert_mcp_server(id: &str, spec: Value) -> Result<bool, AppError> {
    if id.trim().is_empty() {
        return Err(AppError::InvalidInput("MCP 服务器 ID 不能为空".into()));
@@ -29,7 +29,6 @@ pub fn get_codex_config_path() -> PathBuf {
 }

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

 /// 删除 Codex 供应商配置文件
-#[allow(dead_code)]
 pub fn delete_codex_provider_config(
    provider_id: &str,
    provider_name: &str,
@@ -141,10 +141,11 @@ 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> {
-    state
-        .db
-        .get_config_snippet("claude")
-        .map_err(|e| e.to_string())
+    let guard = state
+        .config
+        .read()
+        .map_err(|e| format!("读取配置锁失败: {e}"))?;
+    Ok(guard.common_config_snippets.claude.clone())
 }

 /// 设置 Claude 通用配置片段（已废弃，使用 set_common_config_snippet）
@@ -153,22 +154,24 @@ 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}"))?;
    }

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

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

@@ -178,10 +181,17 @@ pub async fn get_common_config_snippet(
    app_type: String,
    state: tauri::State<'_, crate::store::AppState>,
 ) -> Result<Option<String>, String> {
-    state
-        .db
-        .get_config_snippet(&app_type)
-        .map_err(|e| e.to_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())
 }

 /// 设置通用配置片段（统一接口）
@@ -191,31 +201,40 @@ 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_type.as_str() {
-            "claude" | "gemini" => {
+        match app {
+            AppType::Claude | AppType::Gemini => {
                // 验证 JSON 格式
                serde_json::from_str::<serde_json::Value>(&snippet)
                    .map_err(|e| format!("无效的 JSON 格式: {e}"))?;
            }
-            "codex" => {
+            AppType::Codex => {
                // TOML 格式暂不验证（或可使用 toml crate）
                // 注意：TOML 验证较为复杂，暂时跳过
            }
-            _ => {}
        }
    }

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

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

@@ -18,18 +15,18 @@ pub fn parse_deeplink(url: String) -> Result<DeepLinkImportRequest, String> {
 pub fn merge_deeplink_config(
    request: DeepLinkImportRequest,
 ) -> Result<DeepLinkImportRequest, String> {
-    log::info!("Merging config for deep link request: {:?}", request.name);
+    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)
+/// Import a provider from a deep link request (after user confirmation)
 #[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
    );
@@ -40,50 +37,3 @@ 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)),
-    }
-}
@@ -6,22 +6,20 @@ use tauri::State;
 use tauri_plugin_dialog::DialogExt;

 use crate::error::AppError;
-use crate::services::provider::ProviderService;
+use crate::services::ConfigService;
 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);
-        db.export_sql(&target_path)?;
+        ConfigService::export_config_to_path(&target_path)?;
        Ok::<_, AppError>(json!({
            "success": true,
-            "message": "SQL exported successfully",
+            "message": "Configuration exported successfully",
            "filePath": filePath
        }))
    })
@@ -30,54 +28,51 @@ 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 db = state.db.clone();
-    let db_for_state = db.clone();
-    tauri::async_runtime::spawn_blocking(move || {
+    let (new_config, backup_id) = tauri::async_runtime::spawn_blocking(move || {
        let path_buf = PathBuf::from(&filePath);
-        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
-        }))
+        ConfigService::load_config_for_import(&path_buf)
    })
    .await
    .map_err(|e| format!("导入配置失败: {e}"))?
-    .map_err(|e: AppError| e.to_string())
+    .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
+    }))
 }

+/// 同步当前供应商配置到对应的 live 文件
 #[tauri::command]
 pub async fn sync_current_providers_live(state: State<'_, AppState>) -> Result<Value, String> {
-    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())
+    {
+        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"
+    }))
 }

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

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

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

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

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

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

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

@@ -51,10 +51,3 @@ 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())
-}
@@ -34,15 +34,3 @@ pub async fn apply_claude_plugin_config(official: bool) -> Result<bool, String>
 pub async fn is_claude_plugin_applied() -> Result<bool, String> {
    crate::claude_plugin::is_claude_config_applied().map_err(|e| e.to_string())
 }
-
-/// Claude Code：跳过初次安装确认（写入 ~/.claude.json 的 hasCompletedOnboarding=true）
-#[tauri::command]
-pub async fn apply_claude_onboarding_skip() -> Result<bool, String> {
-    crate::claude_mcp::set_has_completed_onboarding().map_err(|e| e.to_string())
-}
-
-/// Claude Code：恢复初次安装确认（删除 ~/.claude.json 的 hasCompletedOnboarding 字段）
-#[tauri::command]
-pub async fn clear_claude_onboarding_skip() -> Result<bool, String> {
-    crate::claude_mcp::clear_has_completed_onboarding().map_err(|e| e.to_string())
-}
@@ -1,4 +1,4 @@
-use indexmap::IndexMap;
+use std::collections::HashMap;
 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<IndexMap<String, Prompt>, String> {
+) -> Result<HashMap<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 indexmap::IndexMap;
+use std::collections::HashMap;
 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<IndexMap<String, Provider>, String> {
+) -> Result<HashMap<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<bool, AppError> {
+fn import_default_config_internal(state: &AppState, app_type: AppType) -> Result<(), 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<bool, AppError> {
+) -> Result<(), AppError> {
    import_default_config_internal(state, app_type)
 }

@@ -102,7 +102,9 @@ 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_err(Into::into)
+    import_default_config_internal(&state, app_type)
+        .map(|_| true)
+        .map_err(Into::into)
 }

 /// 查询供应商用量
@@ -18,12 +18,7 @@ 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> {
-    // 在后台延迟重启，让函数有时间返回响应
-    tauri::async_runtime::spawn(async move {
-        tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
-        app.restart();
-    });
-    Ok(true)
+    app.restart();
 }

 /// 获取 app_config_dir 覆盖配置 (从 Store)
@@ -13,34 +13,16 @@ pub async fn get_skills(
    service: State<'_, SkillServiceState>,
    app_state: State<'_, AppState>,
 ) -> Result<Vec<Skill>, String> {
-    let repos = app_state.db.get_skill_repos().map_err(|e| e.to_string())?;
+    let repos = {
+        let config = app_state.config.read().map_err(|e| e.to_string())?;
+        config.skills.repos.clone()
+    };

-    let skills = service
+    service
        .0
        .list_skills(repos)
        .await
-        .map_err(|e| e.to_string())?;
-
-    // 自动同步本地已安装的 skills 到数据库
-    // 这样用户在首次运行时，已有的 skills 会被自动记录
-    let existing_states = app_state.db.get_skills().unwrap_or_default();
-
-    for skill in &skills {
-        if skill.installed && !existing_states.contains_key(&skill.directory) {
-            // 本地有该 skill，但数据库中没有记录，自动添加
-            if let Err(e) = app_state.db.update_skill_state(
-                &skill.directory,
-                &SkillState {
-                    installed: true,
-                    installed_at: Utc::now(),
-                },
-            ) {
-                log::warn!("同步本地 skill {} 状态到数据库失败: {}", skill.directory, e);
-            }
-        }
-    }
-
-    Ok(skills)
+        .map_err(|e| e.to_string())
 }

 #[tauri::command]
@@ -50,7 +32,10 @@ pub async fn install_skill(
    app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
    // 先在不持有写锁的情况下收集仓库与技能信息
-    let repos = app_state.db.get_skill_repos().map_err(|e| e.to_string())?;
+    let repos = {
+        let config = app_state.config.read().map_err(|e| e.to_string())?;
+        config.skills.repos.clone()
+    };

    let skills = service
        .0
@@ -90,6 +75,7 @@ pub async fn install_skill(
                .clone()
                .unwrap_or_else(|| "main".to_string()),
            enabled: true,
+            skills_path: skill.skills_path.clone(), // 使用技能记录的 skills_path
        };

        service
@@ -99,16 +85,19 @@ pub async fn install_skill(
            .map_err(|e| e.to_string())?;
    }

-    app_state
-        .db
-        .update_skill_state(
-            &directory,
-            &SkillState {
+    {
+        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(),
            },
-        )
-        .map_err(|e| e.to_string())?;
+        );
+    }
+
+    app_state.save().map_err(|e| e.to_string())?;

    Ok(true)
 }
@@ -124,17 +113,13 @@ pub fn uninstall_skill(
        .uninstall_skill(directory.clone())
        .map_err(|e| e.to_string())?;

-    // Remove from database by setting installed = false
-    app_state
-        .db
-        .update_skill_state(
-            &directory,
-            &SkillState {
-                installed: false,
-                installed_at: Utc::now(),
-            },
-        )
-        .map_err(|e| e.to_string())?;
+    {
+        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
+
+        config.skills.skills.remove(&directory);
+    }
+
+    app_state.save().map_err(|e| e.to_string())?;

    Ok(true)
 }
@@ -144,19 +129,28 @@ pub fn get_skill_repos(
    _service: State<'_, SkillServiceState>,
    app_state: State<'_, AppState>,
 ) -> Result<Vec<SkillRepo>, String> {
-    app_state.db.get_skill_repos().map_err(|e| e.to_string())
+    let config = app_state.config.read().map_err(|e| e.to_string())?;
+
+    Ok(config.skills.repos.clone())
 }

 #[tauri::command]
 pub fn add_skill_repo(
    repo: SkillRepo,
-    _service: State<'_, SkillServiceState>,
+    service: State<'_, SkillServiceState>,
    app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
-    app_state
-        .db
-        .save_skill_repo(&repo)
-        .map_err(|e| e.to_string())?;
+    {
+        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
+
+        service
+            .0
+            .add_repo(&mut config.skills, repo)
+            .map_err(|e| e.to_string())?;
+    }
+
+    app_state.save().map_err(|e| e.to_string())?;
+
    Ok(true)
 }

@@ -164,12 +158,19 @@ pub fn add_skill_repo(
 pub fn remove_skill_repo(
    owner: String,
    name: String,
-    _service: State<'_, SkillServiceState>,
+    service: State<'_, SkillServiceState>,
    app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
-    app_state
-        .db
-        .delete_skill_repo(&owner, &name)
-        .map_err(|e| e.to_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())?;
+
    Ok(true)
 }
@@ -79,7 +79,6 @@ pub fn get_app_config_path() -> PathBuf {
 }

 /// 清理供应商名称，确保文件名安全
-#[allow(dead_code)]
 pub fn sanitize_provider_name(name: &str) -> String {
    name.chars()
        .map(|c| match c {
@@ -91,7 +90,6 @@ 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)
@@ -1,325 +0,0 @@
-//! 数据库备份和恢复
-//!
-//! 提供 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)
-            }
-        }
-    }
-}
@@ -1,97 +0,0 @@
-//! 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(())
-    }
-}
@@ -1,11 +0,0 @@
-//! 数据访问对象 (DAO) 模块
-//!
-//! 提供各类数据的 CRUD 操作。
-
-mod mcp;
-mod prompts;
-mod providers;
-mod settings;
-mod skills;
-
-// 所有 DAO 方法都通过 Database impl 提供，无需单独导出
@@ -1,88 +0,0 @@
-//! 提示词数据访问对象
-//!
-//! 提供提示词（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(())
-    }
-}
@@ -1,290 +0,0 @@
-//! 供应商数据访问对象
-//!
-//! 提供供应商（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
-             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 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,
-                    },
-                ))
-            })
-            .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)
-        }
-    }
-
-    /// 保存供应商（新增或更新）
-    ///
-    /// 注意：更新模式下不同步 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）
-        let existing: Option<bool> = tx
-            .query_row(
-                "SELECT is_current FROM providers WHERE id = ?1 AND app_type = ?2",
-                params![provider.id, app_type],
-                |row| row.get(0),
-            )
-            .ok();
-
-        let is_update = existing.is_some();
-        let is_current = existing.unwrap_or(false);
-
-        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
-                WHERE id = ?12 AND app_type = ?13",
-                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,
-                    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
-                ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)",
-                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,
-                ],
-            )
-            .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(())
-    }
-
-    /// 添加自定义端点
-    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(())
-    }
-}
@@ -1,65 +0,0 @@
-//! 通用设置数据访问对象
-//!
-//! 提供键值对形式的通用设置存储。
-
-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(())
-        }
-    }
-}
@@ -1,125 +0,0 @@
-//! Skills 数据访问对象
-//!
-//! 提供 Skills 和 Skill Repos 的 CRUD 操作。
-
-use crate::database::{lock_conn, Database};
-use crate::error::AppError;
-use crate::services::skill::{SkillRepo, SkillState};
-use indexmap::IndexMap;
-use rusqlite::params;
-
-impl Database {
-    /// 获取所有 Skills 状态
-    pub fn get_skills(&self) -> Result<IndexMap<String, SkillState>, AppError> {
-        let conn = lock_conn!(self.conn);
-        let mut stmt = conn
-            .prepare("SELECT key, installed, installed_at FROM skills ORDER BY key ASC")
-            .map_err(|e| AppError::Database(e.to_string()))?;
-
-        let skill_iter = stmt
-            .query_map([], |row| {
-                let key: String = row.get(0)?;
-                let installed: bool = row.get(1)?;
-                let installed_at_ts: i64 = row.get(2)?;
-
-                let installed_at =
-                    chrono::DateTime::from_timestamp(installed_at_ts, 0).unwrap_or_default();
-
-                Ok((
-                    key,
-                    SkillState {
-                        installed,
-                        installed_at,
-                    },
-                ))
-            })
-            .map_err(|e| AppError::Database(e.to_string()))?;
-
-        let mut skills = IndexMap::new();
-        for skill_res in skill_iter {
-            let (key, skill) = skill_res.map_err(|e| AppError::Database(e.to_string()))?;
-            skills.insert(key, skill);
-        }
-        Ok(skills)
-    }
-
-    /// 更新 Skill 状态
-    pub fn update_skill_state(&self, key: &str, state: &SkillState) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-        conn.execute(
-            "INSERT OR REPLACE INTO skills (key, installed, installed_at) VALUES (?1, ?2, ?3)",
-            params![key, state.installed, state.installed_at.timestamp()],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-        Ok(())
-    }
-
-    /// 获取所有 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)
-    }
-}
@@ -1,242 +0,0 @@
-//! 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> {
-        for (key, state) in &config.skills.skills {
-            tx.execute(
-                "INSERT OR REPLACE INTO skills (key, installed, installed_at) VALUES (?1, ?2, ?3)",
-                params![key, state.installed, state.installed_at.timestamp()],
-            )
-            .map_err(|e| AppError::Database(format!("Migrate skill failed: {e}")))?;
-        }
-
-        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(())
-    }
-}
@@ -1,135 +0,0 @@
-//! 数据库模块 - 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;
-
-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 = 1;
-
-/// 安全地序列化 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()?;
-
-        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()?;
-
-        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)
-    }
-}
@@ -1,339 +0,0 @@
-//! Schema 定义和迁移
-//!
-//! 负责数据库表结构的创建和版本迁移。
-
-use super::{lock_conn, Database, SCHEMA_VERSION};
-use crate::error::AppError;
-use rusqlite::Connection;
-
-impl Database {
-    /// 创建所有数据库表
-    pub(crate) fn create_tables(&self) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-        Self::create_tables_on_conn(&conn)
-    }
-
-    /// 在指定连接上创建表（供迁移和测试使用）
-    pub(crate) fn create_tables_on_conn(conn: &Connection) -> Result<(), AppError> {
-        // 1. Providers 表
-        conn.execute(
-            "CREATE TABLE IF NOT EXISTS providers (
-                id TEXT NOT NULL,
-                app_type TEXT NOT NULL,
-                name TEXT NOT NULL,
-                settings_config TEXT NOT NULL,
-                website_url TEXT,
-                category TEXT,
-                created_at INTEGER,
-                sort_index INTEGER,
-                notes TEXT,
-                icon TEXT,
-                icon_color TEXT,
-                meta TEXT NOT NULL DEFAULT '{}',
-                is_current BOOLEAN NOT NULL DEFAULT 0,
-                PRIMARY KEY (id, app_type)
-            )",
-            [],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        // 2. Provider Endpoints 表
-        conn.execute(
-            "CREATE TABLE IF NOT EXISTS provider_endpoints (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                provider_id TEXT NOT NULL,
-                app_type TEXT NOT NULL,
-                url TEXT NOT NULL,
-                added_at INTEGER,
-                FOREIGN KEY (provider_id, app_type) REFERENCES providers(id, app_type) ON DELETE CASCADE
-            )",
-            [],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        // 3. MCP Servers 表
-        conn.execute(
-            "CREATE TABLE IF NOT EXISTS mcp_servers (
-                id TEXT PRIMARY KEY,
-                name TEXT NOT NULL,
-                server_config TEXT NOT NULL,
-                description TEXT,
-                homepage TEXT,
-                docs TEXT,
-                tags TEXT NOT NULL DEFAULT '[]',
-                enabled_claude BOOLEAN NOT NULL DEFAULT 0,
-                enabled_codex BOOLEAN NOT NULL DEFAULT 0,
-                enabled_gemini BOOLEAN NOT NULL DEFAULT 0
-            )",
-            [],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        // 4. Prompts 表
-        conn.execute(
-            "CREATE TABLE IF NOT EXISTS prompts (
-                id TEXT NOT NULL,
-                app_type TEXT NOT NULL,
-                name TEXT NOT NULL,
-                content TEXT NOT NULL,
-                description TEXT,
-                enabled BOOLEAN NOT NULL DEFAULT 1,
-                created_at INTEGER,
-                updated_at INTEGER,
-                PRIMARY KEY (id, app_type)
-            )",
-            [],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        // 5. Skills 表
-        conn.execute(
-            "CREATE TABLE IF NOT EXISTS skills (
-                key TEXT PRIMARY KEY,
-                installed BOOLEAN NOT NULL DEFAULT 0,
-                installed_at INTEGER NOT NULL DEFAULT 0
-            )",
-            [],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        // 6. Skill Repos 表
-        conn.execute(
-            "CREATE TABLE IF NOT EXISTS skill_repos (
-                owner TEXT NOT NULL,
-                name TEXT NOT NULL,
-                branch TEXT NOT NULL DEFAULT 'main',
-                enabled BOOLEAN NOT NULL DEFAULT 1,
-                PRIMARY KEY (owner, name)
-            )",
-            [],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        // 7. Settings 表 (通用配置)
-        conn.execute(
-            "CREATE TABLE IF NOT EXISTS settings (
-                key TEXT PRIMARY KEY,
-                value TEXT
-            )",
-            [],
-        )
-        .map_err(|e| AppError::Database(e.to_string()))?;
-
-        Ok(())
-    }
-
-    /// 应用 Schema 迁移
-    pub(crate) fn apply_schema_migrations(&self) -> Result<(), AppError> {
-        let conn = lock_conn!(self.conn);
-        Self::apply_schema_migrations_on_conn(&conn)
-    }
-
-    /// 在指定连接上应用 Schema 迁移
-    pub(crate) fn apply_schema_migrations_on_conn(conn: &Connection) -> Result<(), AppError> {
-        conn.execute("SAVEPOINT schema_migration;", [])
-            .map_err(|e| AppError::Database(format!("开启迁移 savepoint 失败: {e}")))?;
-
-        let mut version = Self::get_user_version(conn)?;
-
-        if version > SCHEMA_VERSION {
-            conn.execute("ROLLBACK TO schema_migration;", []).ok();
-            conn.execute("RELEASE schema_migration;", []).ok();
-            return Err(AppError::Database(format!(
-                "数据库版本过新（{version}），当前应用仅支持 {SCHEMA_VERSION}，请升级应用后再尝试。"
-            )));
-        }
-
-        let result = (|| {
-            while version < SCHEMA_VERSION {
-                match version {
-                    0 => {
-                        log::info!("检测到 user_version=0，迁移到 1（补齐缺失列并设置版本）");
-                        Self::migrate_v0_to_v1(conn)?;
-                        Self::set_user_version(conn, SCHEMA_VERSION)?;
-                    }
-                    _ => {
-                        return Err(AppError::Database(format!(
-                            "未知的数据库版本 {version}，无法迁移到 {SCHEMA_VERSION}"
-                        )));
-                    }
-                }
-                version = Self::get_user_version(conn)?;
-            }
-            Ok(())
-        })();
-
-        match result {
-            Ok(_) => {
-                conn.execute("RELEASE schema_migration;", [])
-                    .map_err(|e| AppError::Database(format!("提交迁移 savepoint 失败: {e}")))?;
-                Ok(())
-            }
-            Err(e) => {
-                conn.execute("ROLLBACK TO schema_migration;", []).ok();
-                conn.execute("RELEASE schema_migration;", []).ok();
-                Err(e)
-            }
-        }
-    }
-
-    /// v0 -> v1 迁移：补齐所有缺失列
-    fn migrate_v0_to_v1(conn: &Connection) -> Result<(), AppError> {
-        // providers 表
-        Self::add_column_if_missing(conn, "providers", "category", "TEXT")?;
-        Self::add_column_if_missing(conn, "providers", "created_at", "INTEGER")?;
-        Self::add_column_if_missing(conn, "providers", "sort_index", "INTEGER")?;
-        Self::add_column_if_missing(conn, "providers", "notes", "TEXT")?;
-        Self::add_column_if_missing(conn, "providers", "icon", "TEXT")?;
-        Self::add_column_if_missing(conn, "providers", "icon_color", "TEXT")?;
-        Self::add_column_if_missing(conn, "providers", "meta", "TEXT NOT NULL DEFAULT '{}'")?;
-        Self::add_column_if_missing(
-            conn,
-            "providers",
-            "is_current",
-            "BOOLEAN NOT NULL DEFAULT 0",
-        )?;
-
-        // provider_endpoints 表
-        Self::add_column_if_missing(conn, "provider_endpoints", "added_at", "INTEGER")?;
-
-        // mcp_servers 表
-        Self::add_column_if_missing(conn, "mcp_servers", "description", "TEXT")?;
-        Self::add_column_if_missing(conn, "mcp_servers", "homepage", "TEXT")?;
-        Self::add_column_if_missing(conn, "mcp_servers", "docs", "TEXT")?;
-        Self::add_column_if_missing(conn, "mcp_servers", "tags", "TEXT NOT NULL DEFAULT '[]'")?;
-        Self::add_column_if_missing(
-            conn,
-            "mcp_servers",
-            "enabled_codex",
-            "BOOLEAN NOT NULL DEFAULT 0",
-        )?;
-        Self::add_column_if_missing(
-            conn,
-            "mcp_servers",
-            "enabled_gemini",
-            "BOOLEAN NOT NULL DEFAULT 0",
-        )?;
-
-        // prompts 表
-        Self::add_column_if_missing(conn, "prompts", "description", "TEXT")?;
-        Self::add_column_if_missing(conn, "prompts", "enabled", "BOOLEAN NOT NULL DEFAULT 1")?;
-        Self::add_column_if_missing(conn, "prompts", "created_at", "INTEGER")?;
-        Self::add_column_if_missing(conn, "prompts", "updated_at", "INTEGER")?;
-
-        // skills 表
-        Self::add_column_if_missing(conn, "skills", "installed_at", "INTEGER NOT NULL DEFAULT 0")?;
-
-        // skill_repos 表
-        Self::add_column_if_missing(
-            conn,
-            "skill_repos",
-            "branch",
-            "TEXT NOT NULL DEFAULT 'main'",
-        )?;
-        Self::add_column_if_missing(conn, "skill_repos", "enabled", "BOOLEAN NOT NULL DEFAULT 1")?;
-        // 注意: skills_path 字段已被移除，因为现在支持全仓库递归扫描
-
-        Ok(())
-    }
-
-    // --- 辅助方法 ---
-
-    pub(crate) fn get_user_version(conn: &Connection) -> Result<i32, AppError> {
-        conn.query_row("PRAGMA user_version;", [], |row| row.get(0))
-            .map_err(|e| AppError::Database(format!("读取 user_version 失败: {e}")))
-    }
-
-    pub(crate) fn set_user_version(conn: &Connection, version: i32) -> Result<(), AppError> {
-        if version < 0 {
-            return Err(AppError::Database("user_version 不能为负数".to_string()));
-        }
-        let sql = format!("PRAGMA user_version = {version};");
-        conn.execute(&sql, [])
-            .map_err(|e| AppError::Database(format!("写入 user_version 失败: {e}")))?;
-        Ok(())
-    }
-
-    fn validate_identifier(s: &str, kind: &str) -> Result<(), AppError> {
-        if s.is_empty() {
-            return Err(AppError::Database(format!("{kind} 不能为空")));
-        }
-        if !s.chars().all(|c| c.is_ascii_alphanumeric() || c == '_') {
-            return Err(AppError::Database(format!(
-                "非法{kind}: {s}，仅允许字母、数字和下划线"
-            )));
-        }
-        Ok(())
-    }
-
-    pub(crate) fn table_exists(conn: &Connection, table: &str) -> Result<bool, AppError> {
-        Self::validate_identifier(table, "表名")?;
-
-        let mut stmt = conn
-            .prepare("SELECT name FROM sqlite_master WHERE type='table'")
-            .map_err(|e| AppError::Database(format!("读取表名失败: {e}")))?;
-        let mut rows = stmt
-            .query([])
-            .map_err(|e| AppError::Database(format!("查询表名失败: {e}")))?;
-        while let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
-            let name: String = row
-                .get(0)
-                .map_err(|e| AppError::Database(format!("解析表名失败: {e}")))?;
-            if name.eq_ignore_ascii_case(table) {
-                return Ok(true);
-            }
-        }
-        Ok(false)
-    }
-
-    pub(crate) fn has_column(
-        conn: &Connection,
-        table: &str,
-        column: &str,
-    ) -> Result<bool, AppError> {
-        Self::validate_identifier(table, "表名")?;
-        Self::validate_identifier(column, "列名")?;
-
-        let sql = format!("PRAGMA table_info(\"{table}\");");
-        let mut stmt = conn
-            .prepare(&sql)
-            .map_err(|e| AppError::Database(format!("读取表结构失败: {e}")))?;
-        let mut rows = stmt
-            .query([])
-            .map_err(|e| AppError::Database(format!("查询表结构失败: {e}")))?;
-        while let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
-            let name: String = row
-                .get(1)
-                .map_err(|e| AppError::Database(format!("读取列名失败: {e}")))?;
-            if name.eq_ignore_ascii_case(column) {
-                return Ok(true);
-            }
-        }
-        Ok(false)
-    }
-
-    fn add_column_if_missing(
-        conn: &Connection,
-        table: &str,
-        column: &str,
-        definition: &str,
-    ) -> Result<bool, AppError> {
-        Self::validate_identifier(table, "表名")?;
-        Self::validate_identifier(column, "列名")?;
-
-        if !Self::table_exists(conn, table)? {
-            return Err(AppError::Database(format!(
-                "表 {table} 不存在，无法添加列 {column}"
-            )));
-        }
-        if Self::has_column(conn, table, column)? {
-            return Ok(false);
-        }
-
-        let sql = format!("ALTER TABLE \"{table}\" ADD COLUMN \"{column}\" {definition};");
-        conn.execute(&sql, [])
-            .map_err(|e| AppError::Database(format!("为表 {table} 添加列 {column} 失败: {e}")))?;
-        log::info!("已为表 {table} 添加缺失列 {column}");
-        Ok(true)
-    }
-}
@@ -1,274 +0,0 @@
-//! 数据库模块测试
-//!
-//! 包含 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 {
-    name: String,
-    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 name: String = row.get(1).expect("name");
-        if name.eq_ignore_ascii_case(column) {
-            return ColumnInfo {
-                name,
-                r#type: row.get::<_, String>(2).expect("type"),
-                notnull: row.get::<_, i64>(3).expect("notnull"),
-                default: row.get::<_, Option<String>>(4).ok().flatten(),
-            };
-        }
-    }
-    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 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,
-        },
-    );
-
-    let mut manager = ProviderManager::default();
-    manager.providers = providers;
-    manager.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:?}"
-    );
-}
@@ -0,0 +1,866 @@
+/// 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>,
+    /// 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>,
+    /// Optional Base64 encoded config content (v3.8+)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config: Option<String>,
+    /// Optional config format (json/toml, v3.8+)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_format: Option<String>,
+    /// Optional remote config URL (v3.8+)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_url: 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();
+
+    // Make these optional for config file auto-fill (v3.8+)
+    let homepage = params.get("homepage").cloned().unwrap_or_default();
+    let endpoint = params.get("endpoint").cloned().unwrap_or_default();
+    let api_key = params.get("apiKey").cloned().unwrap_or_default();
+
+    // Validate URLs only if provided
+    if !homepage.is_empty() {
+        validate_url(&homepage, "homepage")?;
+    }
+    if !endpoint.is_empty() {
+        validate_url(&endpoint, "endpoint")?;
+    }
+
+    // Extract optional fields
+    let model = params.get("model").cloned();
+    let notes = params.get("notes").cloned();
+
+    // Extract Claude-specific optional model fields (v3.7.1+)
+    let haiku_model = params.get("haikuModel").cloned();
+    let sonnet_model = params.get("sonnetModel").cloned();
+    let opus_model = params.get("opusModel").cloned();
+
+    // Extract optional config fields (v3.8+)
+    let config = params.get("config").cloned();
+    let config_format = params.get("configFormat").cloned();
+    let config_url = params.get("configUrl").cloned();
+
+    Ok(DeepLinkImportRequest {
+        version,
+        resource,
+        app,
+        name,
+        homepage,
+        endpoint,
+        api_key,
+        model,
+        notes,
+        haiku_model,
+        sonnet_model,
+        opus_model,
+        config,
+        config_format,
+        config_url,
+    })
+}
+
+/// 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. Merges config file if provided (v3.8+)
+/// 3. Converts it to a Provider structure
+/// 4. Delegates to ProviderService for actual import
+pub fn import_provider_from_deeplink(
+    state: &AppState,
+    request: DeepLinkImportRequest,
+) -> Result<String, AppError> {
+    // Step 1: Merge config file if provided (v3.8+)
+    let merged_request = parse_and_merge_config(&request)?;
+
+    // Step 2: Validate required fields after merge
+    if merged_request.api_key.is_empty() {
+        return Err(AppError::InvalidInput(
+            "API key is required (either in URL or config file)".to_string(),
+        ));
+    }
+    if merged_request.endpoint.is_empty() {
+        return Err(AppError::InvalidInput(
+            "Endpoint is required (either in URL or config file)".to_string(),
+        ));
+    }
+    if merged_request.homepage.is_empty() {
+        return Err(AppError::InvalidInput(
+            "Homepage is required (either in URL or config file)".to_string(),
+        ));
+    }
+
+    // Parse app type
+    let app_type = AppType::from_str(&merged_request.app)
+        .map_err(|_| AppError::InvalidInput(format!("Invalid app type: {}", merged_request.app)))?;
+
+    // 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
+    // This is similar to how frontend generates IDs
+    let timestamp = chrono::Utc::now().timestamp_millis();
+    let sanitized_name = merged_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 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 })
+        }
+        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,
+        icon: None,
+        icon_color: None,
+    };
+
+    Ok(provider)
+}
+
+/// 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> {
+    use base64::prelude::*;
+
+    // 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 = BASE64_STANDARD
+            .decode(config_b64)
+            .map_err(|e| AppError::InvalidInput(format!("Invalid Base64 encoding: {e}")))?;
+        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();
+
+    match request.app.as_str() {
+        "claude" => merge_claude_config(&mut merged, &config_value)?,
+        "codex" => merge_codex_config(&mut merged, &config_value)?,
+        "gemini" => merge_gemini_config(&mut merged, &config_value)?,
+        _ => {
+            return Err(AppError::InvalidInput(format!(
+                "Invalid app type: {}",
+                request.app
+            )))
+        }
+    }
+
+    Ok(merged)
+}
+
+/// Merge Claude configuration from config file
+///
+/// Priority: URL params override config file values
+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_empty() {
+        if let Some(token) = env.get("ANTHROPIC_AUTH_TOKEN").and_then(|v| v.as_str()) {
+            request.api_key = token.to_string();
+        }
+    }
+
+    // Auto-fill endpoint if not provided in URL
+    if request.endpoint.is_empty() {
+        if let Some(base_url) = env.get("ANTHROPIC_BASE_URL").and_then(|v| v.as_str()) {
+            request.endpoint = base_url.to_string();
+        }
+    }
+
+    // Auto-fill homepage from endpoint if not provided
+    if request.homepage.is_empty() && !request.endpoint.is_empty() {
+        request.homepage = infer_homepage_from_endpoint(&request.endpoint)
+            .unwrap_or_else(|| "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_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 = 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_empty() {
+                if let Some(base_url) = extract_codex_base_url(&toml_value) {
+                    request.endpoint = 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_empty() && !request.endpoint.is_empty() {
+        request.homepage = infer_homepage_from_endpoint(&request.endpoint)
+            .unwrap_or_else(|| "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_empty() {
+        if let Some(api_key) = config.get("GEMINI_API_KEY").and_then(|v| v.as_str()) {
+            request.api_key = api_key.to_string();
+        }
+    }
+
+    if request.endpoint.is_empty() {
+        if let Some(base_url) = config.get("GEMINI_BASE_URL").and_then(|v| v.as_str()) {
+            request.endpoint = 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_empty() && !request.endpoint.is_empty() {
+        request.homepage = infer_homepage_from_endpoint(&request.endpoint)
+            .unwrap_or_else(|| "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
+}
+
+/// 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
+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}"))
+}
+
+#[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() {
+        // 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"));
+    }
+
+    #[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,
+            haiku_model: None,
+            sonnet_model: None,
+            opus_model: None,
+            config: None,
+            config_format: None,
+            config_url: 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,
+            haiku_model: None,
+            sonnet_model: None,
+            opus_model: None,
+            config: None,
+            config_format: None,
+            config_url: 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());
+    }
+
+    #[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())
+        );
+    }
+
+    #[test]
+    fn test_parse_and_merge_config_claude() {
+        use base64::prelude::*;
+
+        // 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: "claude".to_string(),
+            name: "Test".to_string(),
+            homepage: String::new(),
+            endpoint: String::new(),
+            api_key: String::new(),
+            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,
+        };
+
+        let merged = parse_and_merge_config(&request).unwrap();
+
+        // Should auto-fill from config
+        assert_eq!(merged.api_key, "sk-ant-xxx");
+        assert_eq!(merged.endpoint, "https://api.anthropic.com/v1");
+        assert_eq!(merged.homepage, "https://anthropic.com");
+        assert_eq!(merged.model, Some("claude-sonnet-4.5".to_string()));
+    }
+
+    #[test]
+    fn test_parse_and_merge_config_url_override() {
+        use base64::prelude::*;
+
+        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: "claude".to_string(),
+            name: "Test".to_string(),
+            homepage: String::new(),
+            endpoint: String::new(),
+            api_key: "sk-new".to_string(), // URL param should override
+            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,
+        };
+
+        let merged = parse_and_merge_config(&request).unwrap();
+
+        // URL param should take priority
+        assert_eq!(merged.api_key, "sk-new");
+        // Config file value should be used
+        assert_eq!(merged.endpoint, "https://api.anthropic.com/v1");
+    }
+}
@@ -1,191 +0,0 @@
-//! 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)
-}
@@ -1,116 +0,0 @@
-//! 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>,
-}
@@ -1,313 +0,0 @@
-//! 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());
-
-    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,
-    })
-}
-
-/// 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,
-    })
-}
-
-/// 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,
-    })
-}
-
-/// 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,
-    })
-}
@@ -1,86 +0,0 @@
-//! 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)
-}
@@ -1,510 +0,0 @@
-//! 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;
-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),
-    };
-
-    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: None,
-        icon: request.icon.clone(),
-        icon_color: None,
-    };
-
-    Ok(provider)
-}
-
-/// 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
-}
@@ -1,51 +0,0 @@
-//! 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}"))
-}
@@ -1,378 +0,0 @@
-//! 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,
-    };
-
-    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,
-    };
-
-    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,
-    };
-
-    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,
-    };
-
-    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_eq!(request.enabled.unwrap(), true);
-}
-
-#[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_eq!(request.enabled.unwrap(), true);
-}
-
-#[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");
-}
@@ -1,99 +0,0 @@
-//! 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,8 +50,6 @@ pub enum AppError {
        zh: String,
        en: String,
    },
-    #[error("数据库错误: {0}")]
-    Database(String),
 }

 impl AppError {
@@ -38,12 +38,17 @@ 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 字段 → 保持不变（SSE 类型）
-/// - 仅有 command 字段 → 保持不变（stdio 类型）
 pub fn read_mcp_servers_map() -> Result<std::collections::HashMap<String, Value>, AppError> {
    let path = user_config_path();
    if !path.exists() {
@@ -51,25 +56,12 @@ pub fn read_mcp_servers_map() -> Result<std::collections::HashMap<String, Value>
    }

    let root = read_json_value(&path)?;
-    let mut servers: std::collections::HashMap<String, Value> = root
+    let servers = 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()));
-            }
-            // 如果有 url 但没有 type，不添加 type（默认为 SSE）
-            // 如果有 command 但没有 type，不添加 type（默认为 stdio）
-        }
-    }
-
    Ok(servers)
 }

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

-        // 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");
+        // 移除 UI 辅助字段
        obj.remove("enabled");
        obj.remove("source");
        obj.remove("id");
@@ -13,9 +13,7 @@ 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);
    }
@@ -25,33 +23,6 @@ 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
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -6,10 +6,9 @@ mod claude_plugin;
 mod codex_config;
 mod commands;
 mod config;
-mod database;
 mod deeplink;
 mod error;
-mod gemini_config;
+mod gemini_config; // 新增
 mod gemini_mcp;
 mod init_status;
 mod mcp;
@@ -20,14 +19,12 @@ mod provider_defaults;
 mod services;
 mod settings;
 mod store;
-mod tray;
 mod usage_script;

 pub use app_config::{AppType, McpApps, McpServer, MultiAppConfig};
 pub use codex_config::{get_codex_auth_path, get_codex_config_path, write_codex_live_atomic};
 pub use commands::*;
 pub use config::{get_claude_mcp_path, get_claude_settings_path, read_json_file};
-pub use database::Database;
 pub use deeplink::{import_provider_from_deeplink, parse_deeplink_url, DeepLinkImportRequest};
 pub use error::AppError;
 pub use mcp::{
@@ -44,16 +41,253 @@ pub use services::{
 pub use settings::{update_settings, AppSettings};
 pub use store::AppState;
 use tauri_plugin_deep_link::DeepLinkExt;
-use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogKind};

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

+#[derive(Clone, Copy)]
+struct TrayTexts {
+    show_main: &'static str,
+    no_provider_hint: &'static str,
+    quit: &'static str,
+}
+
+impl TrayTexts {
+    fn from_language(language: &str) -> Self {
+        match language {
+            "en" => Self {
+                show_main: "Open main window",
+                no_provider_hint: "  (No providers yet, please add them from the main window)",
+                quit: "Quit",
+            },
+            _ => Self {
+                show_main: "打开主界面",
+                no_provider_hint: "  (无供应商，请在主界面添加)",
+                quit: "退出",
+            },
+        }
+    }
+}
+
+struct TrayAppSection {
+    app_type: AppType,
+    prefix: &'static str,
+    header_id: &'static str,
+    empty_id: &'static str,
+    header_label: &'static str,
+    log_name: &'static str,
+}
+
+const TRAY_SECTIONS: [TrayAppSection; 3] = [
+    TrayAppSection {
+        app_type: AppType::Claude,
+        prefix: "claude_",
+        header_id: "claude_header",
+        empty_id: "claude_empty",
+        header_label: "─── Claude ───",
+        log_name: "Claude",
+    },
+    TrayAppSection {
+        app_type: AppType::Codex,
+        prefix: "codex_",
+        header_id: "codex_header",
+        empty_id: "codex_empty",
+        header_label: "─── Codex ───",
+        log_name: "Codex",
+    },
+    TrayAppSection {
+        app_type: AppType::Gemini,
+        prefix: "gemini_",
+        header_id: "gemini_header",
+        empty_id: "gemini_empty",
+        header_label: "─── Gemini ───",
+        log_name: "Gemini",
+    },
+];
+
+fn append_provider_section<'a>(
+    app: &'a tauri::AppHandle,
+    mut menu_builder: MenuBuilder<'a, tauri::Wry, tauri::AppHandle<tauri::Wry>>,
+    manager: Option<&crate::provider::ProviderManager>,
+    section: &TrayAppSection,
+    tray_texts: &TrayTexts,
+) -> Result<MenuBuilder<'a, tauri::Wry, tauri::AppHandle<tauri::Wry>>, AppError> {
+    let Some(manager) = manager else {
+        return Ok(menu_builder);
+    };
+
+    let header = MenuItem::with_id(
+        app,
+        section.header_id,
+        section.header_label,
+        false,
+        None::<&str>,
+    )
+    .map_err(|e| AppError::Message(format!("创建{}标题失败: {e}", section.log_name)))?;
+    menu_builder = menu_builder.item(&header);
+
+    if manager.providers.is_empty() {
+        let empty_hint = MenuItem::with_id(
+            app,
+            section.empty_id,
+            tray_texts.no_provider_hint,
+            false,
+            None::<&str>,
+        )
+        .map_err(|e| AppError::Message(format!("创建{}空提示失败: {e}", section.log_name)))?;
+        return Ok(menu_builder.item(&empty_hint));
+    }
+
+    let mut sorted_providers: Vec<_> = manager.providers.iter().collect();
+    sorted_providers.sort_by(|(_, a), (_, b)| {
+        match (a.sort_index, b.sort_index) {
+            (Some(idx_a), Some(idx_b)) => return idx_a.cmp(&idx_b),
+            (Some(_), None) => return std::cmp::Ordering::Less,
+            (None, Some(_)) => return std::cmp::Ordering::Greater,
+            _ => {}
+        }
+
+        match (a.created_at, b.created_at) {
+            (Some(time_a), Some(time_b)) => return time_a.cmp(&time_b),
+            (Some(_), None) => return std::cmp::Ordering::Greater,
+            (None, Some(_)) => return std::cmp::Ordering::Less,
+            _ => {}
+        }
+
+        a.name.cmp(&b.name)
+    });
+
+    for (id, provider) in sorted_providers {
+        let is_current = manager.current == *id;
+        let item = CheckMenuItem::with_id(
+            app,
+            format!("{}{}", section.prefix, id),
+            &provider.name,
+            true,
+            is_current,
+            None::<&str>,
+        )
+        .map_err(|e| AppError::Message(format!("创建{}菜单项失败: {e}", section.log_name)))?;
+        menu_builder = menu_builder.item(&item);
+    }
+
+    Ok(menu_builder)
+}
+
+fn handle_provider_tray_event(app: &tauri::AppHandle, event_id: &str) -> bool {
+    for section in TRAY_SECTIONS.iter() {
+        if let Some(provider_id) = event_id.strip_prefix(section.prefix) {
+            log::info!("切换到{}供应商: {provider_id}", section.log_name);
+            let app_handle = app.clone();
+            let provider_id = provider_id.to_string();
+            let app_type = section.app_type.clone();
+            tauri::async_runtime::spawn_blocking(move || {
+                if let Err(e) = switch_provider_internal(&app_handle, app_type, provider_id) {
+                    log::error!("切换{}供应商失败: {e}", section.log_name);
+                }
+            });
+            return true;
+        }
+    }
+    false
+}
+
+/// 创建动态托盘菜单
+fn create_tray_menu(
+    app: &tauri::AppHandle,
+    app_state: &AppState,
+) -> Result<Menu<tauri::Wry>, AppError> {
+    let app_settings = crate::settings::get_settings();
+    let tray_texts = TrayTexts::from_language(app_settings.language.as_deref().unwrap_or("zh"));
+
+    let config = app_state.config.read().map_err(AppError::from)?;
+
+    let mut menu_builder = MenuBuilder::new(app);
+
+    // 顶部：打开主界面
+    let show_main_item =
+        MenuItem::with_id(app, "show_main", tray_texts.show_main, true, None::<&str>)
+            .map_err(|e| AppError::Message(format!("创建打开主界面菜单失败: {e}")))?;
+    menu_builder = menu_builder.item(&show_main_item).separator();
+
+    // 直接添加所有供应商到主菜单（扁平化结构，更简单可靠）
+    for section in TRAY_SECTIONS.iter() {
+        menu_builder = append_provider_section(
+            app,
+            menu_builder,
+            config.get_manager(&section.app_type),
+            section,
+            &tray_texts,
+        )?;
+    }
+
+    // 分隔符和退出菜单
+    let quit_item = MenuItem::with_id(app, "quit", tray_texts.quit, true, None::<&str>)
+        .map_err(|e| AppError::Message(format!("创建退出菜单失败: {e}")))?;
+
+    menu_builder = menu_builder.separator().item(&quit_item);
+
+    menu_builder
+        .build()
+        .map_err(|e| AppError::Message(format!("构建菜单失败: {e}")))
+}
+
+#[cfg(target_os = "macos")]
+fn apply_tray_policy(app: &tauri::AppHandle, dock_visible: bool) {
+    let desired_policy = if dock_visible {
+        ActivationPolicy::Regular
+    } else {
+        ActivationPolicy::Accessory
+    };
+
+    if let Err(err) = app.set_dock_visibility(dock_visible) {
+        log::warn!("设置 Dock 显示状态失败: {err}");
+    }
+
+    if let Err(err) = app.set_activation_policy(desired_policy) {
+        log::warn!("设置激活策略失败: {err}");
+    }
+}
+
+/// 处理托盘菜单事件
+fn handle_tray_menu_event(app: &tauri::AppHandle, event_id: &str) {
+    log::info!("处理托盘菜单事件: {event_id}");
+
+    match event_id {
+        "show_main" => {
+            if let Some(window) = app.get_webview_window("main") {
+                #[cfg(target_os = "windows")]
+                {
+                    let _ = window.set_skip_taskbar(false);
+                }
+                let _ = window.unminimize();
+                let _ = window.show();
+                let _ = window.set_focus();
+                #[cfg(target_os = "macos")]
+                {
+                    apply_tray_policy(app, true);
+                }
+            }
+        }
+        "quit" => {
+            log::info!("退出应用");
+            app.exit(0);
+        }
+        _ => {
+            if handle_provider_tray_event(app, event_id) {
+                return;
+            }
+            log::warn!("未处理的菜单事件: {event_id}");
+        }
+    }
+}
+
 /// 统一处理 ccswitch:// 深链接 URL
 ///
 /// - 解析 URL
@@ -74,7 +308,7 @@ fn handle_deeplink_url(
    match crate::deeplink::parse_deeplink_url(url_str) {
        Ok(request) => {
            log::info!(
-                "✓ Successfully parsed deep link: resource={}, app={:?}, name={:?}",
+                "✓ Successfully parsed deep link: resource={}, app={}, name={}",
                request.resource,
                request.app,
                request.name
@@ -113,13 +347,50 @@ fn handle_deeplink_url(
    true
 }

+//
+
+/// 内部切换供应商函数
+fn switch_provider_internal(
+    app: &tauri::AppHandle,
+    app_type: crate::app_config::AppType,
+    provider_id: String,
+) -> Result<(), AppError> {
+    if let Some(app_state) = app.try_state::<AppState>() {
+        // 在使用前先保存需要的值
+        let app_type_str = app_type.as_str().to_string();
+        let provider_id_clone = provider_id.clone();
+
+        crate::commands::switch_provider(app_state.clone(), app_type_str.clone(), provider_id)
+            .map_err(AppError::Message)?;
+
+        // 切换成功后重新创建托盘菜单
+        if let Ok(new_menu) = 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!("更新托盘菜单失败: {e}");
+                }
+            }
+        }
+
+        // 发射事件到前端，通知供应商已切换
+        let event_data = serde_json::json!({
+            "appType": app_type_str,
+            "providerId": provider_id_clone
+        });
+        if let Err(e) = app.emit("provider-switched", event_data) {
+            log::error!("发射供应商切换事件失败: {e}");
+        }
+    }
+    Ok(())
+}
+
 /// 更新托盘菜单的Tauri命令
 #[tauri::command]
 async fn update_tray_menu(
    app: tauri::AppHandle,
    state: tauri::State<'_, AppState>,
 ) -> Result<bool, String> {
-    match tray::create_tray_menu(&app, state.inner()) {
+    match create_tray_menu(&app, state.inner()) {
        Ok(new_menu) => {
            if let Some(tray) = app.tray_by_id("main") {
                tray.set_menu(Some(new_menu))
@@ -135,19 +406,6 @@ async fn update_tray_menu(
    }
 }

-#[cfg(target_os = "macos")]
-fn macos_tray_icon() -> Option<Image<'static>> {
-    const ICON_BYTES: &[u8] = include_bytes!("../icons/tray/macos/statusbar_template_3x.png");
-
-    match Image::from_bytes(ICON_BYTES) {
-        Ok(icon) => Some(icon),
-        Err(err) => {
-            log::warn!("Failed to load macOS tray icon: {err}");
-            None
-        }
-    }
-}
-
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
    let mut builder = tauri::Builder::default();
@@ -200,7 +458,7 @@ pub fn run() {
                    }
                    #[cfg(target_os = "macos")]
                    {
-                        tray::apply_tray_policy(window.app_handle(), false);
+                        apply_tray_policy(window.app_handle(), false);
                    }
                } else {
                    window.app_handle().exit(0);
@@ -231,32 +489,24 @@ pub fn run() {
                    use objc2::runtime::AnyObject;
                    use objc2_app_kit::NSColor;

-                    match window.ns_window() {
-                        Ok(ns_window_ptr) => {
-                            if let Some(ns_window) =
-                                unsafe { Retained::retain(ns_window_ptr as *mut AnyObject) }
-                            {
-                                // 使用与主界面 banner 相同的蓝色 #3498db
-                                // #3498db = RGB(52, 152, 219)
-                                let bg_color = unsafe {
-                                    NSColor::colorWithRed_green_blue_alpha(
-                                        52.0 / 255.0,  // R: 52
-                                        152.0 / 255.0, // G: 152
-                                        219.0 / 255.0, // B: 219
-                                        1.0,           // Alpha: 1.0
-                                    )
-                                };
+                    let ns_window_ptr = window.ns_window().unwrap();
+                    let ns_window: Retained<AnyObject> =
+                        unsafe { Retained::retain(ns_window_ptr as *mut AnyObject).unwrap() };

-                                unsafe {
-                                    use objc2::msg_send;
-                                    let _: () =
-                                        msg_send![&*ns_window, setBackgroundColor: &*bg_color];
-                                }
-                            } else {
-                                log::warn!("Failed to retain NSWindow reference");
-                            }
-                        }
-                        Err(e) => log::warn!("Failed to get NSWindow pointer: {e}"),
+                    // 使用与主界面 banner 相同的蓝色 #3498db
+                    // #3498db = RGB(52, 152, 219)
+                    let bg_color = unsafe {
+                        NSColor::colorWithRed_green_blue_alpha(
+                            52.0 / 255.0,  // R: 52
+                            152.0 / 255.0, // G: 152
+                            219.0 / 255.0, // B: 219
+                            1.0,           // Alpha: 1.0
+                        )
+                    };
+
+                    unsafe {
+                        use objc2::msg_send;
+                        let _: () = msg_send![&*ns_window, setBackgroundColor: &*bg_color];
                    }
                }
            }
@@ -273,172 +523,42 @@ pub fn run() {
            // 预先刷新 Store 覆盖配置，确保 AppState 初始化时可读取到最新路径
            app_store::refresh_app_config_dir_override(app.handle());

-            // 初始化数据库
-            let app_config_dir = crate::config::get_app_config_dir();
-            let db_path = app_config_dir.join("cc-switch.db");
-            let json_path = app_config_dir.join("config.json");
-
-            // 检查是否需要从 config.json 迁移到 SQLite
-            let has_json = json_path.exists();
-            let has_db = db_path.exists();
-
-            // 如果需要迁移，先验证 config.json 是否可以加载（在创建数据库之前）
-            // 这样如果加载失败用户选择退出，数据库文件还没被创建，下次可以正常重试
-            let migration_config = if !has_db && has_json {
-                log::info!("检测到旧版配置文件，验证配置文件...");
-
-                // 循环：支持用户重试加载配置文件
-                loop {
-                    match crate::app_config::MultiAppConfig::load() {
-                        Ok(config) => {
-                            log::info!("✓ 配置文件加载成功");
-                            break Some(config);
-                        }
-                        Err(e) => {
-                            log::error!("加载旧配置文件失败: {e}");
-                            // 弹出系统对话框让用户选择
-                            if !show_migration_error_dialog(app.handle(), &e.to_string()) {
-                                // 用户选择退出（此时数据库还没创建，下次启动可以重试）
-                                log::info!("用户选择退出程序");
-                                std::process::exit(1);
-                            }
-                            // 用户选择重试，继续循环
-                            log::info!("用户选择重试加载配置文件");
-                        }
+            // 初始化应用状态（仅创建一次，并在本函数末尾注入 manage）
+            // 如果配置解析失败，则向前端发送错误事件并提前结束 setup（不落盘、不覆盖配置）。
+            let app_state = match AppState::try_new() {
+                Ok(state) => state,
+                Err(err) => {
+                    let path = crate::config::get_app_config_path();
+                    let payload_json = serde_json::json!({
+                        "path": path.display().to_string(),
+                        "error": err.to_string(),
+                    });
+                    // 事件通知（可能早于前端订阅，不保证送达）
+                    if let Err(e) = app.emit("configLoadError", payload_json) {
+                        log::error!("发射配置加载错误事件失败: {e}");
                    }
-                }
-            } else {
-                None
-            };
-
-            // 现在创建数据库
-            let db = match crate::database::Database::init() {
-                Ok(db) => Arc::new(db),
-                Err(e) => {
-                    log::error!("Failed to init database: {e}");
-                    return Err(Box::new(e));
+                    // 同时缓存错误，供前端启动阶段主动拉取
+                    crate::init_status::set_init_error(crate::init_status::InitErrorPayload {
+                        path: path.display().to_string(),
+                        error: err.to_string(),
+                    });
+                    // 不再继续构建托盘/命令依赖的状态，交由前端提示后退出。
+                    return Ok(());
                }
            };

-            // 如果有预加载的配置，执行迁移
-            if let Some(config) = migration_config {
-                log::info!("开始执行数据迁移...");
-
-                match db.migrate_from_json(&config) {
-                    Ok(_) => {
-                        log::info!("✓ 配置迁移成功");
-                        // 标记迁移成功，供前端显示 Toast
-                        crate::init_status::set_migration_success();
-                        // 归档旧配置文件（重命名而非删除，便于用户恢复）
-                        let archive_path = json_path.with_extension("json.migrated");
-                        if let Err(e) = std::fs::rename(&json_path, &archive_path) {
-                            log::warn!("归档旧配置文件失败: {e}");
-                        } else {
-                            log::info!("✓ 旧配置已归档为 config.json.migrated");
-                        }
-                    }
-                    Err(e) => {
-                        // 配置加载成功但迁移失败的情况极少（磁盘满等），仅记录日志
-                        log::error!("配置迁移失败: {e}，将从现有配置导入");
-                    }
-                }
-            }
-
-            let app_state = AppState::new(db);
-
-            // ============================================================
-            // 按表独立判断的导入逻辑（各类数据独立检查，互不影响）
-            // ============================================================
-
-            // 1. 初始化默认 Skills 仓库（已有内置检查：表非空则跳过）
-            match app_state.db.init_default_skill_repos() {
-                Ok(count) if count > 0 => {
-                    log::info!("✓ Initialized {count} default skill repositories");
-                }
-                Ok(_) => {} // 表非空，静默跳过
-                Err(e) => log::warn!("✗ Failed to initialize default skill repos: {e}"),
-            }
-
-            // 2. 导入供应商配置（已有内置检查：该应用已有供应商则跳过）
-            for app in [
-                crate::app_config::AppType::Claude,
-                crate::app_config::AppType::Codex,
-                crate::app_config::AppType::Gemini,
-            ] {
-                match crate::services::provider::ProviderService::import_default_config(
-                    &app_state,
-                    app.clone(),
-                ) {
-                    Ok(true) => {
-                        log::info!("✓ Imported default provider for {}", app.as_str());
-                    }
-                    Ok(false) => {} // 已有供应商，静默跳过
-                    Err(e) => {
-                        log::debug!(
-                            "○ No default provider to import for {}: {}",
-                            app.as_str(),
-                            e
-                        );
-                    }
-                }
-            }
-
-            // 3. 导入 MCP 服务器配置（表空时触发）
-            if app_state.db.is_mcp_table_empty().unwrap_or(false) {
-                log::info!("MCP table empty, importing from live configurations...");
-
-                match crate::services::mcp::McpService::import_from_claude(&app_state) {
-                    Ok(count) if count > 0 => {
-                        log::info!("✓ Imported {count} MCP server(s) from Claude");
-                    }
-                    Ok(_) => log::debug!("○ No Claude MCP servers found to import"),
-                    Err(e) => log::warn!("✗ Failed to import Claude MCP: {e}"),
-                }
-
-                match crate::services::mcp::McpService::import_from_codex(&app_state) {
-                    Ok(count) if count > 0 => {
-                        log::info!("✓ Imported {count} MCP server(s) from Codex");
-                    }
-                    Ok(_) => log::debug!("○ No Codex MCP servers found to import"),
-                    Err(e) => log::warn!("✗ Failed to import Codex MCP: {e}"),
-                }
-
-                match crate::services::mcp::McpService::import_from_gemini(&app_state) {
-                    Ok(count) if count > 0 => {
-                        log::info!("✓ Imported {count} MCP server(s) from Gemini");
-                    }
-                    Ok(_) => log::debug!("○ No Gemini MCP servers found to import"),
-                    Err(e) => log::warn!("✗ Failed to import Gemini MCP: {e}"),
-                }
-            }
-
-            // 4. 导入提示词文件（表空时触发）
-            if app_state.db.is_prompts_table_empty().unwrap_or(false) {
-                log::info!("Prompts table empty, importing from live configurations...");
-
-                for app in [
-                    crate::app_config::AppType::Claude,
-                    crate::app_config::AppType::Codex,
-                    crate::app_config::AppType::Gemini,
-                ] {
-                    match crate::services::prompt::PromptService::import_from_file_on_first_launch(
-                        &app_state,
-                        app.clone(),
-                    ) {
-                        Ok(count) if count > 0 => {
-                            log::info!("✓ Imported {count} prompt(s) for {}", app.as_str());
-                        }
-                        Ok(_) => log::debug!("○ No prompt file found for {}", app.as_str()),
-                        Err(e) => log::warn!("✗ Failed to import prompt for {}: {e}", app.as_str()),
-                    }
-                }
-            }
-
            // 迁移旧的 app_config_dir 配置到 Store
            if let Err(e) = app_store::migrate_app_config_dir_from_settings(app.handle()) {
                log::warn!("迁移 app_config_dir 失败: {e}");
            }

+            // 确保配置结构就绪（已移除旧版本的副本迁移逻辑）
+            {
+                let mut config_guard = app_state.config.write().unwrap();
+                config_guard.ensure_app(&app_config::AppType::Claude);
+                config_guard.ensure_app(&app_config::AppType::Codex);
+            }
+
            // 启动阶段不再无条件保存,避免意外覆盖用户配置。

            // 注册 deep-link URL 处理器（使用正确的 DeepLinkExt API）
@@ -447,35 +567,10 @@ pub fn run() {
            // Linux 和 Windows 调试模式需要显式注册
            #[cfg(any(target_os = "linux", all(debug_assertions, windows)))]
            {
-                #[cfg(target_os = "linux")]
-                {
-                    // Use Tauri's path API to get correct path (includes app identifier)
-                    // tauri-plugin-deep-link writes to: ~/.local/share/com.ccswitch.desktop/applications/cc-switch-handler.desktop
-                    // Only register if .desktop file doesn't exist to avoid overwriting user customizations
-                    let should_register = app
-                        .path()
-                        .data_dir()
-                        .map(|d| !d.join("applications/cc-switch-handler.desktop").exists())
-                        .unwrap_or(true);
-
-                    if should_register {
-                        if let Err(e) = app.deep_link().register_all() {
-                            log::error!("✗ Failed to register deep link schemes: {}", e);
-                        } else {
-                            log::info!("✓ Deep link schemes registered (Linux)");
-                        }
-                    } else {
-                        log::info!("⊘ Deep link handler already exists, skipping registration");
-                    }
-                }
-
-                #[cfg(all(debug_assertions, windows))]
-                {
-                    if let Err(e) = app.deep_link().register_all() {
-                        log::error!("✗ Failed to register deep link schemes: {}", e);
-                    } else {
-                        log::info!("✓ Deep link schemes registered (Windows debug)");
-                    }
+                if let Err(e) = app.deep_link().register_all() {
+                    log::error!("✗ Failed to register deep link schemes: {}", e);
+                } else {
+                    log::info!("✓ Deep link schemes registered (Linux/Windows)");
                }
            }

@@ -500,7 +595,7 @@ pub fn run() {
            log::info!("✓ Deep-link URL handler registered");

            // 创建动态托盘菜单
-            let menu = tray::create_tray_menu(app.handle(), &app_state)?;
+            let menu = create_tray_menu(app.handle(), &app_state)?;

            // 构建托盘
            let mut tray_builder = TrayIconBuilder::with_id("main")
@@ -511,31 +606,12 @@ pub fn run() {
                })
                .menu(&menu)
                .on_menu_event(|app, event| {
-                    tray::handle_tray_menu_event(app, &event.id.0);
+                    handle_tray_menu_event(app, &event.id.0);
                })
                .show_menu_on_left_click(true);

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

            let _tray = tray_builder.build(app)?;
            // 将同一个实例注入到全局状态，避免重复创建导致的不一致
@@ -569,7 +645,6 @@ pub fn run() {
            commands::pick_directory,
            commands::open_external,
            commands::get_init_error,
-            commands::get_migration_result,
            commands::get_app_config_path,
            commands::open_app_config_folder,
            commands::get_claude_common_config_snippet,
@@ -586,8 +661,6 @@ pub fn run() {
            commands::read_claude_plugin_config,
            commands::apply_claude_plugin_config,
            commands::is_claude_plugin_applied,
-            commands::apply_claude_onboarding_skip,
-            commands::clear_claude_onboarding_skip,
            // Claude MCP management
            commands::get_claude_mcp_status,
            commands::read_claude_mcp_config,
@@ -635,7 +708,6 @@ pub fn run() {
            commands::parse_deeplink,
            commands::merge_deeplink_config,
            commands::import_from_deeplink,
-            commands::import_from_deeplink_unified,
            update_tray_menu,
            // Environment variable management
            commands::check_env_conflicts,
@@ -671,7 +743,7 @@ pub fn run() {
                        let _ = window.unminimize();
                        let _ = window.show();
                        let _ = window.set_focus();
-                        tray::apply_tray_policy(app_handle, true);
+                        apply_tray_policy(app_handle, true);
                    }
                }
                // 处理通过自定义 URL 协议触发的打开事件（例如 ccswitch://...）
@@ -685,7 +757,7 @@ pub fn run() {
                            match crate::deeplink::parse_deeplink_url(&url_str) {
                                Ok(request) => {
                                    log::info!(
-                                        "Successfully parsed deep link from RunEvent::Opened: resource={}, app={:?}",
+                                        "Successfully parsed deep link from RunEvent::Opened: resource={}, app={}",
                                        request.resource,
                                        request.app
                                    );
@@ -736,67 +808,3 @@ pub fn run() {
        }
    });
 }
-
-// ============================================================
-// 迁移错误对话框辅助函数
-// ============================================================
-
-/// 检测是否为中文环境
-fn is_chinese_locale() -> bool {
-    std::env::var("LANG")
-        .or_else(|_| std::env::var("LC_ALL"))
-        .or_else(|_| std::env::var("LC_MESSAGES"))
-        .map(|lang| lang.starts_with("zh"))
-        .unwrap_or(false)
-}
-
-/// 显示迁移错误对话框
-/// 返回 true 表示用户选择重试，false 表示用户选择退出
-fn show_migration_error_dialog(app: &tauri::AppHandle, error: &str) -> bool {
-    let title = if is_chinese_locale() {
-        "配置迁移失败"
-    } else {
-        "Migration Failed"
-    };
-
-    let message = if is_chinese_locale() {
-        format!(
-            "从旧版本迁移配置时发生错误：\n\n{error}\n\n\
-            您的数据尚未丢失，旧配置文件仍然保留。\n\
-            建议回退到旧版本 CC Switch 以保护数据。\n\n\
-            点击「重试」重新尝试迁移\n\
-            点击「退出」关闭程序（可回退版本后重新打开）"
-        )
-    } else {
-        format!(
-            "An error occurred while migrating configuration:\n\n{error}\n\n\
-            Your data is NOT lost - the old config file is still preserved.\n\
-            Consider rolling back to an older CC Switch version.\n\n\
-            Click 'Retry' to attempt migration again\n\
-            Click 'Exit' to close the program"
-        )
-    };
-
-    let retry_text = if is_chinese_locale() {
-        "重试"
-    } else {
-        "Retry"
-    };
-    let exit_text = if is_chinese_locale() {
-        "退出"
-    } else {
-        "Exit"
-    };
-
-    // 使用 blocking_show 同步等待用户响应
-    // OkCancelCustom: 第一个按钮（重试）返回 true，第二个按钮（退出）返回 false
-    app.dialog()
-        .message(&message)
-        .title(title)
-        .kind(MessageDialogKind::Error)
-        .buttons(MessageDialogButtons::OkCancelCustom(
-            retry_text.to_string(),
-            exit_text.to_string(),
-        ))
-        .blocking_show()
-}
@@ -2,15 +2,5 @@
 #![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();
 }
@@ -1,22 +1,200 @@
-//! 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::{McpApps, McpConfig, McpServer, MultiAppConfig};
+use crate::app_config::{AppType, McpConfig, MultiAppConfig};
 use crate::error::AppError;

-use super::validation::{extract_server_spec, validate_server_spec};
+/// 基础校验：允许 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);

-fn should_sync_codex_mcp() -> bool {
-    // Codex 未安装/未初始化时：~/.codex 目录不存在。
-    // 按用户偏好：目录缺失时跳过写入/删除，不创建任何文件或目录。
-    crate::codex_config::get_codex_config_dir().exists()
+    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())
 }

 /// 返回已启用的 MCP 服务器（过滤 enabled==true）
@@ -42,6 +220,188 @@ 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+）
 ///
 /// 格式支持：
@@ -50,6 +410,8 @@ fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {
 ///
 /// 已存在的服务器将启用 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);
@@ -59,7 +421,10 @@ pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError>
        .map_err(|e| AppError::McpValidation(format!("解析 ~/.codex/config.toml 失败: {e}")))?;

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

    let mut changed_total = 0usize;

@@ -84,7 +449,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", "http_headers"],
+                "http" | "sse" => vec!["type", "url", "headers"],
                _ => vec!["type"],
            };

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

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

-/// 将单个 MCP 服务器同步到 Codex live 配置
-/// 始终使用 Codex 官方格式 [mcp_servers]，并清理可能存在的错误格式 [mcp.servers]
-pub fn sync_single_server_to_codex(
+/// 将 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(
    _config: &MultiAppConfig,
    id: &str,
    server_spec: &Value,
 ) -> Result<(), AppError> {
-    if !should_sync_codex_mcp() {
-        return Ok(());
-    }
-    use toml_edit::Item;
+    // 读取现有的 MCP 配置
+    let current = crate::claude_mcp::read_mcp_servers_map()?;

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

-    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(())
+    // 写回
+    crate::claude_mcp::set_mcp_servers_map(&updated)
 }

-/// 从 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();
+/// 从 Claude live 配置中移除单个 MCP 服务器
+pub fn remove_server_from_claude(id: &str) -> Result<(), AppError> {
+    // 读取现有的 MCP 配置
+    let mut current = crate::claude_mcp::read_mcp_servers_map()?;

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

-    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(())
+    // 写回
+    crate::claude_mcp::set_mcp_servers_map(&current)
 }

-// ============================================================================
-// TOML 转换辅助函数
-// ============================================================================
-
 /// 通用 JSON 值到 TOML 值转换器（支持简单类型和浅层嵌套）
 ///
 /// 支持的类型转换：
@@ -477,22 +846,8 @@ 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() => {
-                        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::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::Bool(b) => toml_arr.push(*b),
                    _ => {
                        all_same_type = false;
@@ -555,7 +910,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", "http_headers"],
+        "http" | "sse" => vec!["type", "url", "headers"],
        _ => vec!["type"],
    };

@@ -633,7 +988,7 @@ fn json_server_to_toml_table(spec: &Value) -> Result<toml_edit::Table, AppError>
                    }
                }
                if !h_tbl.is_empty() {
-                    t["http_headers"] = Item::Table(h_tbl);
+                    t["headers"] = Item::Table(h_tbl);
                }
            }
        }
@@ -664,3 +1019,117 @@ 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)
+}
@@ -1,146 +0,0 @@
-//! 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,141 +0,0 @@
-//! 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)
-}
@@ -1,28 +0,0 @@
-//! 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,
-};
@@ -1,69 +0,0 @@
-//! 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,4 +1,3 @@
-use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
@@ -65,7 +64,7 @@ impl Provider {
 /// 供应商管理器
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct ProviderManager {
-    pub providers: IndexMap<String, Provider>,
+    pub providers: HashMap<String, Provider>,
    pub current: String,
 }

@@ -155,7 +154,7 @@ pub struct ProviderMeta {

 impl ProviderManager {
    /// 获取所有供应商
-    pub fn get_all_providers(&self) -> &IndexMap<String, Provider> {
+    pub fn get_all_providers(&self) -> &HashMap<String, Provider> {
        &self.providers
    }
 }
@@ -2,6 +2,7 @@ use super::provider::ProviderService;
 use crate::app_config::{AppType, MultiAppConfig};
 use crate::error::AppError;
 use crate::provider::Provider;
+use crate::store::AppState;
 use chrono::Utc;
 use serde_json::Value;
 use std::fs;
@@ -83,6 +84,42 @@ impl ConfigService {
        Ok(())
    }

+    /// 将当前 config.json 拷贝到目标路径。
+    pub fn export_config_to_path(target_path: &Path) -> Result<(), AppError> {
+        let config_path = crate::config::get_app_config_path();
+        let config_content =
+            fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
+        fs::write(target_path, config_content).map_err(|e| AppError::io(target_path, e))
+    }
+
+    /// 从磁盘文件加载配置并写回 config.json，返回备份 ID 及新配置。
+    pub fn load_config_for_import(file_path: &Path) -> Result<(MultiAppConfig, String), AppError> {
+        let import_content =
+            fs::read_to_string(file_path).map_err(|e| AppError::io(file_path, e))?;
+
+        let new_config: MultiAppConfig =
+            serde_json::from_str(&import_content).map_err(|e| AppError::json(file_path, e))?;
+
+        let config_path = crate::config::get_app_config_path();
+        let backup_id = Self::create_backup(&config_path)?;
+
+        fs::write(&config_path, &import_content).map_err(|e| AppError::io(&config_path, e))?;
+
+        Ok((new_config, backup_id))
+    }
+
+    /// 将外部配置文件内容加载并写入应用状态。
+    pub fn import_config_from_path(file_path: &Path, state: &AppState) -> Result<String, AppError> {
+        let (new_config, backup_id) = Self::load_config_for_import(file_path)?;
+
+        {
+            let mut guard = state.config.write().map_err(AppError::from)?;
+            *guard = new_config;
+        }
+
+        Ok(backup_id)
+    }
+
    /// 同步当前供应商到对应的 live 配置。
    pub fn sync_current_providers_to_live(config: &mut MultiAppConfig) -> Result<(), AppError> {
        Self::sync_current_provider_for_app(config, &AppType::Claude)?;
@@ -1,7 +1,6 @@
-use indexmap::IndexMap;
 use std::collections::HashMap;

-use crate::app_config::{AppType, McpServer};
+use crate::app_config::{AppType, McpServer, MultiAppConfig};
 use crate::error::AppError;
 use crate::mcp;
 use crate::store::AppState;
@@ -11,13 +10,40 @@ pub struct McpService;

 impl McpService {
    /// 获取所有 MCP 服务器（统一结构）
-    pub fn get_all_servers(state: &AppState) -> Result<IndexMap<String, McpServer>, AppError> {
-        state.db.get_all_mcp_servers()
+    pub fn get_all_servers(state: &AppState) -> Result<HashMap<String, McpServer>, AppError> {
+        let cfg = state.config.read()?;
+
+        // 如果是新结构，直接返回
+        if let Some(servers) = &cfg.mcp.servers {
+            return Ok(servers.clone());
+        }
+
+        // 理论上不应该走到这里，因为 load 时会自动迁移
+        Err(AppError::localized(
+            "mcp.old_structure",
+            "检测到旧版 MCP 结构，请重启应用完成迁移",
+            "Old MCP structure detected, please restart app to complete migration",
+        ))
    }

    /// 添加或更新 MCP 服务器
    pub fn upsert_server(state: &AppState, server: McpServer) -> Result<(), AppError> {
-        state.db.save_mcp_server(&server)?;
+        {
+            let mut cfg = state.config.write()?;
+
+            // 确保 servers 字段存在
+            if cfg.mcp.servers.is_none() {
+                cfg.mcp.servers = Some(HashMap::new());
+            }
+
+            let servers = cfg.mcp.servers.as_mut().unwrap();
+            let id = server.id.clone();
+
+            // 插入或更新
+            servers.insert(id, server.clone());
+        }
+
+        state.save()?;

        // 同步到各个启用的应用
        Self::sync_server_to_apps(state, &server)?;
@@ -27,10 +53,18 @@ impl McpService {

    /// 删除 MCP 服务器
    pub fn delete_server(state: &AppState, id: &str) -> Result<bool, AppError> {
-        let server = state.db.get_all_mcp_servers()?.shift_remove(id);
+        let server = {
+            let mut cfg = state.config.write()?;
+
+            if let Some(servers) = &mut cfg.mcp.servers {
+                servers.remove(id)
+            } else {
+                None
+            }
+        };

        if let Some(server) = server {
-            state.db.delete_mcp_server(id)?;
+            state.save()?;

            // 从所有应用的 live 配置中移除
            Self::remove_server_from_all_apps(state, id, &server)?;
@@ -47,15 +81,27 @@ impl McpService {
        app: AppType,
        enabled: bool,
    ) -> Result<(), AppError> {
-        let mut servers = state.db.get_all_mcp_servers()?;
+        let server = {
+            let mut cfg = state.config.write()?;

-        if let Some(server) = servers.get_mut(server_id) {
-            server.apps.set_enabled_for(&app, enabled);
-            state.db.save_mcp_server(server)?;
+            if let Some(servers) = &mut cfg.mcp.servers {
+                if let Some(server) = servers.get_mut(server_id) {
+                    server.apps.set_enabled_for(&app, enabled);
+                    Some(server.clone())
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        };
+
+        if let Some(server) = server {
+            state.save()?;

            // 同步到对应应用
            if enabled {
-                Self::sync_server_to_app(state, server, &app)?;
+                Self::sync_server_to_app(state, &server, &app)?;
            } else {
                Self::remove_server_from_app(state, server_id, &app)?;
            }
@@ -65,9 +111,11 @@ impl McpService {
    }

    /// 将 MCP 服务器同步到所有启用的应用
-    fn sync_server_to_apps(_state: &AppState, server: &McpServer) -> Result<(), AppError> {
+    fn sync_server_to_apps(state: &AppState, server: &McpServer) -> Result<(), AppError> {
+        let cfg = state.config.read()?;
+
        for app in server.apps.enabled_apps() {
-            Self::sync_server_to_app_no_config(server, &app)?;
+            Self::sync_server_to_app_internal(&cfg, server, &app)?;
        }

        Ok(())
@@ -75,24 +123,28 @@ impl McpService {

    /// 将 MCP 服务器同步到指定应用
    fn sync_server_to_app(
-        _state: &AppState,
+        state: &AppState,
        server: &McpServer,
        app: &AppType,
    ) -> Result<(), AppError> {
-        Self::sync_server_to_app_no_config(server, app)
+        let cfg = state.config.read()?;
+        Self::sync_server_to_app_internal(&cfg, server, app)
    }

-    fn sync_server_to_app_no_config(server: &McpServer, app: &AppType) -> Result<(), AppError> {
+    fn sync_server_to_app_internal(
+        cfg: &MultiAppConfig,
+        server: &McpServer,
+        app: &AppType,
+    ) -> Result<(), AppError> {
        match app {
            AppType::Claude => {
-                mcp::sync_single_server_to_claude(&Default::default(), &server.id, &server.server)?;
+                mcp::sync_single_server_to_claude(cfg, &server.id, &server.server)?;
            }
            AppType::Codex => {
-                // Codex uses TOML format, must use the correct function
-                mcp::sync_single_server_to_codex(&Default::default(), &server.id, &server.server)?;
+                mcp::sync_single_server_to_codex(cfg, &server.id, &server.server)?;
            }
            AppType::Gemini => {
-                mcp::sync_single_server_to_gemini(&Default::default(), &server.id, &server.server)?;
+                mcp::sync_single_server_to_gemini(cfg, &server.id, &server.server)?;
            }
        }
        Ok(())
@@ -181,67 +233,28 @@ impl McpService {

    /// 从 Claude 导入 MCP（v3.7.0 已更新为统一结构）
    pub fn import_from_claude(state: &AppState) -> Result<usize, AppError> {
-        // 创建临时 MultiAppConfig 用于导入
-        let mut temp_config = crate::app_config::MultiAppConfig::default();
-
-        // 调用原有的导入逻辑（从 mcp.rs）
-        let count = crate::mcp::import_from_claude(&mut temp_config)?;
-
-        // 如果有导入的服务器，保存到数据库
-        if count > 0 {
-            if let Some(servers) = &temp_config.mcp.servers {
-                for server in servers.values() {
-                    state.db.save_mcp_server(server)?;
-                    // 同步到 Claude live 配置
-                    Self::sync_server_to_apps(state, server)?;
-                }
-            }
-        }
-
+        let mut cfg = state.config.write()?;
+        let count = mcp::import_from_claude(&mut cfg)?;
+        drop(cfg);
+        state.save()?;
        Ok(count)
    }

    /// 从 Codex 导入 MCP（v3.7.0 已更新为统一结构）
    pub fn import_from_codex(state: &AppState) -> Result<usize, AppError> {
-        // 创建临时 MultiAppConfig 用于导入
-        let mut temp_config = crate::app_config::MultiAppConfig::default();
-
-        // 调用原有的导入逻辑（从 mcp.rs）
-        let count = crate::mcp::import_from_codex(&mut temp_config)?;
-
-        // 如果有导入的服务器，保存到数据库
-        if count > 0 {
-            if let Some(servers) = &temp_config.mcp.servers {
-                for server in servers.values() {
-                    state.db.save_mcp_server(server)?;
-                    // 同步到 Codex live 配置
-                    Self::sync_server_to_apps(state, server)?;
-                }
-            }
-        }
-
+        let mut cfg = state.config.write()?;
+        let count = mcp::import_from_codex(&mut cfg)?;
+        drop(cfg);
+        state.save()?;
        Ok(count)
    }

    /// 从 Gemini 导入 MCP（v3.7.0 已更新为统一结构）
    pub fn import_from_gemini(state: &AppState) -> Result<usize, AppError> {
-        // 创建临时 MultiAppConfig 用于导入
-        let mut temp_config = crate::app_config::MultiAppConfig::default();
-
-        // 调用原有的导入逻辑（从 mcp.rs）
-        let count = crate::mcp::import_from_gemini(&mut temp_config)?;
-
-        // 如果有导入的服务器，保存到数据库
-        if count > 0 {
-            if let Some(servers) = &temp_config.mcp.servers {
-                for server in servers.values() {
-                    state.db.save_mcp_server(server)?;
-                    // 同步到 Gemini live 配置
-                    Self::sync_server_to_apps(state, server)?;
-                }
-            }
-        }
-
+        let mut cfg = state.config.write()?;
+        let count = mcp::import_from_gemini(&mut cfg)?;
+        drop(cfg);
+        state.save()?;
        Ok(count)
    }
 }
@@ -1,4 +1,4 @@
-use indexmap::IndexMap;
+use std::collections::HashMap;

 use crate::app_config::AppType;
 use crate::config::write_text_file;
@@ -7,34 +7,40 @@ use crate::prompt::Prompt;
 use crate::prompt_files::prompt_file_path;
 use crate::store::AppState;

-/// 安全地获取当前 Unix 时间戳
-fn get_unix_timestamp() -> Result<i64, AppError> {
-    std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .map(|d| d.as_secs() as i64)
-        .map_err(|e| AppError::Message(format!("Failed to get system time: {e}")))
-}
-
 pub struct PromptService;

 impl PromptService {
    pub fn get_prompts(
        state: &AppState,
        app: AppType,
-    ) -> Result<IndexMap<String, Prompt>, AppError> {
-        state.db.get_prompts(app.as_str())
+    ) -> Result<HashMap<String, Prompt>, AppError> {
+        let cfg = state.config.read()?;
+        let prompts = match app {
+            AppType::Claude => &cfg.prompts.claude.prompts,
+            AppType::Codex => &cfg.prompts.codex.prompts,
+            AppType::Gemini => &cfg.prompts.gemini.prompts,
+        };
+        Ok(prompts.clone())
    }

    pub fn upsert_prompt(
        state: &AppState,
        app: AppType,
-        _id: &str,
+        id: &str,
        prompt: Prompt,
    ) -> Result<(), AppError> {
        // 检查是否为已启用的提示词
        let is_enabled = prompt.enabled;

-        state.db.save_prompt(app.as_str(), &prompt)?;
+        let mut cfg = state.config.write()?;
+        let prompts = match app {
+            AppType::Claude => &mut cfg.prompts.claude.prompts,
+            AppType::Codex => &mut cfg.prompts.codex.prompts,
+            AppType::Gemini => &mut cfg.prompts.gemini.prompts,
+        };
+        prompts.insert(id.to_string(), prompt.clone());
+        drop(cfg);
+        state.save()?;

        // 如果是已启用的提示词，同步更新到对应的文件
        if is_enabled {
@@ -46,7 +52,12 @@ impl PromptService {
    }

    pub fn delete_prompt(state: &AppState, app: AppType, id: &str) -> Result<(), AppError> {
-        let prompts = state.db.get_prompts(app.as_str())?;
+        let mut cfg = state.config.write()?;
+        let prompts = match app {
+            AppType::Claude => &mut cfg.prompts.claude.prompts,
+            AppType::Codex => &mut cfg.prompts.codex.prompts,
+            AppType::Gemini => &mut cfg.prompts.gemini.prompts,
+        };

        if let Some(prompt) = prompts.get(id) {
            if prompt.enabled {
@@ -54,7 +65,9 @@ impl PromptService {
            }
        }

-        state.db.delete_prompt(app.as_str(), id)?;
+        prompts.remove(id);
+        drop(cfg);
+        state.save()?;
        Ok(())
    }

@@ -64,7 +77,12 @@ impl PromptService {
        if target_path.exists() {
            if let Ok(live_content) = std::fs::read_to_string(&target_path) {
                if !live_content.trim().is_empty() {
-                    let mut prompts = state.db.get_prompts(app.as_str())?;
+                    let mut cfg = state.config.write()?;
+                    let prompts = match app {
+                        AppType::Claude => &mut cfg.prompts.claude.prompts,
+                        AppType::Codex => &mut cfg.prompts.codex.prompts,
+                        AppType::Gemini => &mut cfg.prompts.gemini.prompts,
+                    };

                    // 尝试回填到当前已启用的提示词
                    if let Some((enabled_id, enabled_prompt)) = prompts
@@ -72,11 +90,15 @@ impl PromptService {
                        .find(|(_, p)| p.enabled)
                        .map(|(id, p)| (id.clone(), p))
                    {
-                        let timestamp = get_unix_timestamp()?;
+                        let timestamp = std::time::SystemTime::now()
+                            .duration_since(std::time::UNIX_EPOCH)
+                            .unwrap()
+                            .as_secs() as i64;
                        enabled_prompt.content = live_content.clone();
                        enabled_prompt.updated_at = Some(timestamp);
                        log::info!("回填 live 提示词内容到已启用项: {enabled_id}");
-                        state.db.save_prompt(app.as_str(), enabled_prompt)?;
+                        drop(cfg); // 释放锁后保存，避免死锁
+                        state.save()?; // 第一次保存：回填后立即持久化
                    } else {
                        // 没有已启用的提示词，则创建一次备份（避免重复备份）
                        let content_exists = prompts
@@ -100,8 +122,13 @@ impl PromptService {
                                created_at: Some(timestamp),
                                updated_at: Some(timestamp),
                            };
+                            prompts.insert(backup_id.clone(), backup_prompt);
                            log::info!("回填 live 提示词内容，创建备份: {backup_id}");
-                            state.db.save_prompt(app.as_str(), &backup_prompt)?;
+                            drop(cfg); // 释放锁后保存
+                            state.save()?; // 第一次保存：回填后立即持久化
+                        } else {
+                            // 即使内容已存在，也无需重复备份；但不需要保存任何更改
+                            drop(cfg);
                        }
                    }
                }
@@ -109,7 +136,12 @@ impl PromptService {
        }

        // 启用目标提示词并写入文件
-        let mut prompts = state.db.get_prompts(app.as_str())?;
+        let mut cfg = state.config.write()?;
+        let prompts = match app {
+            AppType::Claude => &mut cfg.prompts.claude.prompts,
+            AppType::Codex => &mut cfg.prompts.codex.prompts,
+            AppType::Gemini => &mut cfg.prompts.gemini.prompts,
+        };

        for prompt in prompts.values_mut() {
            prompt.enabled = false;
@@ -118,16 +150,12 @@ impl PromptService {
        if let Some(prompt) = prompts.get_mut(id) {
            prompt.enabled = true;
            write_text_file(&target_path, &prompt.content)?; // 原子写入
-            state.db.save_prompt(app.as_str(), prompt)?;
        } else {
            return Err(AppError::InvalidInput(format!("提示词 {id} 不存在")));
        }

-        // Save all prompts to disable others
-        for (_, prompt) in prompts.iter() {
-            state.db.save_prompt(app.as_str(), prompt)?;
-        }
-
+        drop(cfg);
+        state.save()?; // 第二次保存：启用目标提示词并写入文件后
        Ok(())
    }

@@ -140,7 +168,10 @@ impl PromptService {

        let content =
            std::fs::read_to_string(&file_path).map_err(|e| AppError::io(&file_path, e))?;
-        let timestamp = get_unix_timestamp()?;
+        let timestamp = std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)
+            .unwrap()
+            .as_secs() as i64;

        let id = format!("imported-{timestamp}");
        let prompt = Prompt {
@@ -169,62 +200,4 @@ impl PromptService {
            std::fs::read_to_string(&file_path).map_err(|e| AppError::io(&file_path, e))?;
        Ok(Some(content))
    }
-
-    /// 首次启动时从现有提示词文件自动导入（如果存在）
-    /// 返回导入的数量
-    pub fn import_from_file_on_first_launch(
-        state: &AppState,
-        app: AppType,
-    ) -> Result<usize, AppError> {
-        // 幂等性保护：该应用已有提示词则跳过
-        let existing = state.db.get_prompts(app.as_str())?;
-        if !existing.is_empty() {
-            return Ok(0);
-        }
-
-        let file_path = prompt_file_path(&app)?;
-
-        // 检查文件是否存在
-        if !file_path.exists() {
-            return Ok(0);
-        }
-
-        // 读取文件内容
-        let content = match std::fs::read_to_string(&file_path) {
-            Ok(c) => c,
-            Err(e) => {
-                log::warn!("读取提示词文件失败: {file_path:?}, 错误: {e}");
-                return Ok(0);
-            }
-        };
-
-        // 检查内容是否为空
-        if content.trim().is_empty() {
-            return Ok(0);
-        }
-
-        log::info!("发现提示词文件，自动导入: {file_path:?}");
-
-        // 创建提示词对象
-        let timestamp = get_unix_timestamp()?;
-        let id = format!("auto-imported-{timestamp}");
-        let prompt = Prompt {
-            id: id.clone(),
-            name: format!(
-                "Auto-imported Prompt {}",
-                chrono::Local::now().format("%Y-%m-%d %H:%M")
-            ),
-            content,
-            description: Some("Automatically imported on first launch".to_string()),
-            enabled: true, // 首次导入时自动启用
-            created_at: Some(timestamp),
-            updated_at: Some(timestamp),
-        };
-
-        // 保存到数据库
-        state.db.save_prompt(app.as_str(), &prompt)?;
-
-        log::info!("自动导入完成: {}", app.as_str());
-        Ok(1)
-    }
 }
@@ -1,98 +0,0 @@
-//! Custom endpoints management
-//!
-//! Handles CRUD operations for provider custom endpoints.
-
-use std::time::{SystemTime, UNIX_EPOCH};
-
-use crate::app_config::AppType;
-use crate::error::AppError;
-use crate::settings::CustomEndpoint;
-use crate::store::AppState;
-
-/// Get custom endpoints list for a provider
-pub fn get_custom_endpoints(
-    state: &AppState,
-    app_type: AppType,
-    provider_id: &str,
-) -> Result<Vec<CustomEndpoint>, AppError> {
-    let providers = state.db.get_all_providers(app_type.as_str())?;
-    let Some(provider) = providers.get(provider_id) else {
-        return Ok(vec![]);
-    };
-    let Some(meta) = provider.meta.as_ref() else {
-        return Ok(vec![]);
-    };
-    if meta.custom_endpoints.is_empty() {
-        return Ok(vec![]);
-    }
-
-    let mut result: Vec<_> = meta.custom_endpoints.values().cloned().collect();
-    result.sort_by(|a, b| b.added_at.cmp(&a.added_at));
-    Ok(result)
-}
-
-/// Add a custom endpoint to a provider
-pub fn add_custom_endpoint(
-    state: &AppState,
-    app_type: AppType,
-    provider_id: &str,
-    url: String,
-) -> Result<(), AppError> {
-    let normalized = url.trim().trim_end_matches('/').to_string();
-    if normalized.is_empty() {
-        return Err(AppError::localized(
-            "provider.endpoint.url_required",
-            "URL 不能为空",
-            "URL cannot be empty",
-        ));
-    }
-
-    state
-        .db
-        .add_custom_endpoint(app_type.as_str(), provider_id, &normalized)?;
-    Ok(())
-}
-
-/// Remove a custom endpoint from a provider
-pub fn remove_custom_endpoint(
-    state: &AppState,
-    app_type: AppType,
-    provider_id: &str,
-    url: String,
-) -> Result<(), AppError> {
-    let normalized = url.trim().trim_end_matches('/').to_string();
-    state
-        .db
-        .remove_custom_endpoint(app_type.as_str(), provider_id, &normalized)?;
-    Ok(())
-}
-
-/// Update endpoint last used timestamp
-pub fn update_endpoint_last_used(
-    state: &AppState,
-    app_type: AppType,
-    provider_id: &str,
-    url: String,
-) -> Result<(), AppError> {
-    let normalized = url.trim().trim_end_matches('/').to_string();
-
-    // Get provider, update last_used, save back
-    let mut providers = state.db.get_all_providers(app_type.as_str())?;
-    if let Some(provider) = providers.get_mut(provider_id) {
-        if let Some(meta) = provider.meta.as_mut() {
-            if let Some(endpoint) = meta.custom_endpoints.get_mut(&normalized) {
-                endpoint.last_used = Some(now_millis());
-                state.db.save_provider(app_type.as_str(), provider)?;
-            }
-        }
-    }
-    Ok(())
-}
-
-/// Get current timestamp in milliseconds
-fn now_millis() -> i64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .unwrap_or_default()
-        .as_millis() as i64
-}
@@ -1,142 +0,0 @@
-//! Gemini authentication type detection
-//!
-//! Detects whether a Gemini provider uses PackyCode API Key, Google OAuth, or generic API Key.
-
-use crate::error::AppError;
-use crate::provider::Provider;
-
-/// Gemini authentication type enumeration
-///
-/// Used to optimize performance by avoiding repeated provider type detection.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum GeminiAuthType {
-    /// PackyCode provider (uses API Key)
-    Packycode,
-    /// Google Official (uses OAuth)
-    GoogleOfficial,
-    /// Generic Gemini provider (uses API Key)
-    Generic,
-}
-
-// Partner Promotion Key constants
-const PACKYCODE_PARTNER_KEY: &str = "packycode";
-const GOOGLE_OFFICIAL_PARTNER_KEY: &str = "google-official";
-
-// PackyCode keyword constants
-const PACKYCODE_KEYWORDS: [&str; 3] = ["packycode", "packyapi", "packy"];
-
-/// Detect Gemini provider authentication type
-///
-/// One-time detection to avoid repeated calls to `is_packycode_gemini` and `is_google_official_gemini`.
-///
-/// # Returns
-///
-/// - `GeminiAuthType::GoogleOfficial`: Google official, uses OAuth
-/// - `GeminiAuthType::Packycode`: PackyCode provider, uses API Key
-/// - `GeminiAuthType::Generic`: Other generic providers, uses API Key
-pub(crate) fn detect_gemini_auth_type(provider: &Provider) -> GeminiAuthType {
-    // Priority 1: Check partner_promotion_key (most reliable)
-    if let Some(key) = provider
-        .meta
-        .as_ref()
-        .and_then(|meta| meta.partner_promotion_key.as_deref())
-    {
-        if key.eq_ignore_ascii_case(GOOGLE_OFFICIAL_PARTNER_KEY) {
-            return GeminiAuthType::GoogleOfficial;
-        }
-        if key.eq_ignore_ascii_case(PACKYCODE_PARTNER_KEY) {
-            return GeminiAuthType::Packycode;
-        }
-    }
-
-    // Priority 2: Check Google Official (name matching)
-    let name_lower = provider.name.to_ascii_lowercase();
-    if name_lower == "google" || name_lower.starts_with("google ") {
-        return GeminiAuthType::GoogleOfficial;
-    }
-
-    // Priority 3: Check PackyCode keywords
-    if contains_packycode_keyword(&provider.name) {
-        return GeminiAuthType::Packycode;
-    }
-
-    if let Some(site) = provider.website_url.as_deref() {
-        if contains_packycode_keyword(site) {
-            return GeminiAuthType::Packycode;
-        }
-    }
-
-    if let Some(base_url) = provider
-        .settings_config
-        .pointer("/env/GOOGLE_GEMINI_BASE_URL")
-        .and_then(|v| v.as_str())
-    {
-        if contains_packycode_keyword(base_url) {
-            return GeminiAuthType::Packycode;
-        }
-    }
-
-    GeminiAuthType::Generic
-}
-
-/// Check if string contains PackyCode related keywords (case-insensitive)
-///
-/// Keyword list: ["packycode", "packyapi", "packy"]
-fn contains_packycode_keyword(value: &str) -> bool {
-    let lower = value.to_ascii_lowercase();
-    PACKYCODE_KEYWORDS
-        .iter()
-        .any(|keyword| lower.contains(keyword))
-}
-
-/// Detect if provider is Google Official Gemini (uses OAuth authentication)
-///
-/// Google Official Gemini uses OAuth personal authentication, no API Key needed.
-///
-/// This is a convenience wrapper around `detect_gemini_auth_type`.
-pub(crate) fn is_google_official_gemini(provider: &Provider) -> bool {
-    detect_gemini_auth_type(provider) == GeminiAuthType::GoogleOfficial
-}
-
-/// Ensure Google Official Gemini provider security flag is correctly set (OAuth mode)
-///
-/// Google Official Gemini uses OAuth personal authentication, no API Key needed.
-///
-/// # What it does
-///
-/// Writes to **`~/.gemini/settings.json`** (Gemini client config).
-///
-/// # Value set
-///
-/// ```json
-/// {
-///   "security": {
-///     "auth": {
-///       "selectedType": "oauth-personal"
-///     }
-///   }
-/// }
-/// ```
-///
-/// # OAuth authentication flow
-///
-/// 1. User switches to Google Official provider
-/// 2. CC-Switch sets `selectedType = "oauth-personal"`
-/// 3. User's first use of Gemini CLI will auto-open browser for OAuth login
-/// 4. After successful login, credentials saved in Gemini credential store
-/// 5. Subsequent requests auto-use saved credentials
-///
-/// # Error handling
-///
-/// If provider is not Google Official, function returns `Ok(())` immediately without any operation.
-pub(crate) fn ensure_google_oauth_security_flag(provider: &Provider) -> Result<(), AppError> {
-    if !is_google_official_gemini(provider) {
-        return Ok(());
-    }
-
-    // Write to Gemini directory settings.json (~/.gemini/settings.json)
-    use crate::gemini_config::write_google_oauth_settings;
-    write_google_oauth_settings()?;
-
-    Ok(())
-}
@@ -1,392 +0,0 @@
-//! Live configuration operations
-//!
-//! Handles reading and writing live configuration files for Claude, Codex, and Gemini.
-
-use std::collections::HashMap;
-
-use serde_json::{json, Value};
-
-use crate::app_config::AppType;
-use crate::codex_config::{get_codex_auth_path, get_codex_config_path};
-use crate::config::{delete_file, get_claude_settings_path, read_json_file, write_json_file};
-use crate::error::AppError;
-use crate::provider::Provider;
-use crate::services::mcp::McpService;
-use crate::store::AppState;
-
-use super::gemini_auth::{
-    detect_gemini_auth_type, ensure_google_oauth_security_flag, GeminiAuthType,
-};
-use super::normalize_claude_models_in_value;
-
-/// Live configuration snapshot for backup/restore
-#[derive(Clone)]
-#[allow(dead_code)]
-pub(crate) enum LiveSnapshot {
-    Claude {
-        settings: Option<Value>,
-    },
-    Codex {
-        auth: Option<Value>,
-        config: Option<String>,
-    },
-    Gemini {
-        env: Option<HashMap<String, String>>,
-        config: Option<Value>,
-    },
-}
-
-impl LiveSnapshot {
-    #[allow(dead_code)]
-    pub(crate) fn restore(&self) -> Result<(), AppError> {
-        match self {
-            LiveSnapshot::Claude { settings } => {
-                let path = get_claude_settings_path();
-                if let Some(value) = settings {
-                    write_json_file(&path, value)?;
-                } else if path.exists() {
-                    delete_file(&path)?;
-                }
-            }
-            LiveSnapshot::Codex { auth, config } => {
-                let auth_path = get_codex_auth_path();
-                let config_path = get_codex_config_path();
-                if let Some(value) = auth {
-                    write_json_file(&auth_path, value)?;
-                } else if auth_path.exists() {
-                    delete_file(&auth_path)?;
-                }
-
-                if let Some(text) = config {
-                    crate::config::write_text_file(&config_path, text)?;
-                } else if config_path.exists() {
-                    delete_file(&config_path)?;
-                }
-            }
-            LiveSnapshot::Gemini { env, .. } => {
-                use crate::gemini_config::{
-                    get_gemini_env_path, get_gemini_settings_path, write_gemini_env_atomic,
-                };
-                let path = get_gemini_env_path();
-                if let Some(env_map) = env {
-                    write_gemini_env_atomic(env_map)?;
-                } else if path.exists() {
-                    delete_file(&path)?;
-                }
-
-                let settings_path = get_gemini_settings_path();
-                match self {
-                    LiveSnapshot::Gemini {
-                        config: Some(cfg), ..
-                    } => {
-                        write_json_file(&settings_path, cfg)?;
-                    }
-                    LiveSnapshot::Gemini { config: None, .. } if settings_path.exists() => {
-                        delete_file(&settings_path)?;
-                    }
-                    _ => {}
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-/// Write live configuration snapshot for a provider
-pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Result<(), AppError> {
-    match app_type {
-        AppType::Claude => {
-            let path = get_claude_settings_path();
-            write_json_file(&path, &provider.settings_config)?;
-        }
-        AppType::Codex => {
-            let obj = provider
-                .settings_config
-                .as_object()
-                .ok_or_else(|| AppError::Config("Codex 供应商配置必须是 JSON 对象".to_string()))?;
-            let auth = obj
-                .get("auth")
-                .ok_or_else(|| AppError::Config("Codex 供应商配置缺少 'auth' 字段".to_string()))?;
-            let config_str = obj.get("config").and_then(|v| v.as_str()).ok_or_else(|| {
-                AppError::Config("Codex 供应商配置缺少 'config' 字段或不是字符串".to_string())
-            })?;
-
-            let auth_path = get_codex_auth_path();
-            write_json_file(&auth_path, auth)?;
-            let config_path = get_codex_config_path();
-            std::fs::write(&config_path, config_str).map_err(|e| AppError::io(&config_path, e))?;
-        }
-        AppType::Gemini => {
-            // Delegate to write_gemini_live which handles env file writing correctly
-            write_gemini_live(provider)?;
-        }
-    }
-    Ok(())
-}
-
-/// Sync current provider to live configuration
-///
-/// 使用有效的当前供应商 ID（验证过存在性）。
-/// 优先从本地 settings 读取，验证后 fallback 到数据库的 is_current 字段。
-/// 这确保了配置导入后无效 ID 会自动 fallback 到数据库。
-pub fn sync_current_to_live(state: &AppState) -> Result<(), AppError> {
-    for app_type in [AppType::Claude, AppType::Codex, AppType::Gemini] {
-        // Use validated effective current provider
-        let current_id =
-            match crate::settings::get_effective_current_provider(&state.db, &app_type)? {
-                Some(id) => id,
-                None => continue,
-            };
-
-        let providers = state.db.get_all_providers(app_type.as_str())?;
-        if let Some(provider) = providers.get(&current_id) {
-            write_live_snapshot(&app_type, provider)?;
-        }
-        // Note: get_effective_current_provider already validates existence,
-        // so providers.get() should always succeed here
-    }
-
-    // MCP sync
-    McpService::sync_all_enabled(state)?;
-    Ok(())
-}
-
-/// Read current live settings for an app type
-pub fn read_live_settings(app_type: AppType) -> Result<Value, AppError> {
-    match app_type {
-        AppType::Codex => {
-            let auth_path = get_codex_auth_path();
-            if !auth_path.exists() {
-                return Err(AppError::localized(
-                    "codex.auth.missing",
-                    "Codex 配置文件不存在：缺少 auth.json",
-                    "Codex configuration missing: auth.json not found",
-                ));
-            }
-            let auth: Value = read_json_file(&auth_path)?;
-            let cfg_text = crate::codex_config::read_and_validate_codex_config_text()?;
-            Ok(json!({ "auth": auth, "config": cfg_text }))
-        }
-        AppType::Claude => {
-            let path = get_claude_settings_path();
-            if !path.exists() {
-                return Err(AppError::localized(
-                    "claude.live.missing",
-                    "Claude Code 配置文件不存在",
-                    "Claude settings file is missing",
-                ));
-            }
-            read_json_file(&path)
-        }
-        AppType::Gemini => {
-            use crate::gemini_config::{
-                env_to_json, get_gemini_env_path, get_gemini_settings_path, read_gemini_env,
-            };
-
-            // Read .env file (environment variables)
-            let env_path = get_gemini_env_path();
-            if !env_path.exists() {
-                return Err(AppError::localized(
-                    "gemini.env.missing",
-                    "Gemini .env 文件不存在",
-                    "Gemini .env file not found",
-                ));
-            }
-
-            let env_map = read_gemini_env()?;
-            let env_json = env_to_json(&env_map);
-            let env_obj = env_json.get("env").cloned().unwrap_or_else(|| json!({}));
-
-            // Read settings.json file (MCP config etc.)
-            let settings_path = get_gemini_settings_path();
-            let config_obj = if settings_path.exists() {
-                read_json_file(&settings_path)?
-            } else {
-                json!({})
-            };
-
-            // Return complete structure: { "env": {...}, "config": {...} }
-            Ok(json!({
-                "env": env_obj,
-                "config": config_obj
-            }))
-        }
-    }
-}
-
-/// Import default configuration from live files
-///
-/// Returns `Ok(true)` if a provider was actually imported,
-/// `Ok(false)` if skipped (providers already exist for this app).
-pub fn import_default_config(state: &AppState, app_type: AppType) -> Result<bool, AppError> {
-    {
-        let providers = state.db.get_all_providers(app_type.as_str())?;
-        if !providers.is_empty() {
-            return Ok(false); // 已有供应商，跳过
-        }
-    }
-
-    let settings_config = match app_type {
-        AppType::Codex => {
-            let auth_path = get_codex_auth_path();
-            if !auth_path.exists() {
-                return Err(AppError::localized(
-                    "codex.live.missing",
-                    "Codex 配置文件不存在",
-                    "Codex configuration file is missing",
-                ));
-            }
-            let auth: Value = read_json_file(&auth_path)?;
-            let config_str = crate::codex_config::read_and_validate_codex_config_text()?;
-            json!({ "auth": auth, "config": config_str })
-        }
-        AppType::Claude => {
-            let settings_path = get_claude_settings_path();
-            if !settings_path.exists() {
-                return Err(AppError::localized(
-                    "claude.live.missing",
-                    "Claude Code 配置文件不存在",
-                    "Claude settings file is missing",
-                ));
-            }
-            let mut v = read_json_file::<Value>(&settings_path)?;
-            let _ = normalize_claude_models_in_value(&mut v);
-            v
-        }
-        AppType::Gemini => {
-            use crate::gemini_config::{
-                env_to_json, get_gemini_env_path, get_gemini_settings_path, read_gemini_env,
-            };
-
-            // Read .env file (environment variables)
-            let env_path = get_gemini_env_path();
-            if !env_path.exists() {
-                return Err(AppError::localized(
-                    "gemini.live.missing",
-                    "Gemini 配置文件不存在",
-                    "Gemini configuration file is missing",
-                ));
-            }
-
-            let env_map = read_gemini_env()?;
-            let env_json = env_to_json(&env_map);
-            let env_obj = env_json.get("env").cloned().unwrap_or_else(|| json!({}));
-
-            // Read settings.json file (MCP config etc.)
-            let settings_path = get_gemini_settings_path();
-            let config_obj = if settings_path.exists() {
-                read_json_file(&settings_path)?
-            } else {
-                json!({})
-            };
-
-            // Return complete structure: { "env": {...}, "config": {...} }
-            json!({
-                "env": env_obj,
-                "config": config_obj
-            })
-        }
-    };
-
-    let mut provider = Provider::with_id(
-        "default".to_string(),
-        "default".to_string(),
-        settings_config,
-        None,
-    );
-    provider.category = Some("custom".to_string());
-
-    state.db.save_provider(app_type.as_str(), &provider)?;
-    state
-        .db
-        .set_current_provider(app_type.as_str(), &provider.id)?;
-
-    Ok(true) // 真正导入了
-}
-
-/// Write Gemini live configuration with authentication handling
-pub(crate) fn write_gemini_live(provider: &Provider) -> Result<(), AppError> {
-    use crate::gemini_config::{
-        get_gemini_settings_path, json_to_env, validate_gemini_settings_strict,
-        write_gemini_env_atomic,
-    };
-
-    // One-time auth type detection to avoid repeated detection
-    let auth_type = detect_gemini_auth_type(provider);
-
-    let mut env_map = json_to_env(&provider.settings_config)?;
-
-    // Prepare config to write to ~/.gemini/settings.json
-    // Behavior:
-    // - config is object: use it (merge with existing to preserve mcpServers etc.)
-    // - config is null or absent: preserve existing file content
-    let settings_path = get_gemini_settings_path();
-    let mut config_to_write: Option<Value> = None;
-
-    if let Some(config_value) = provider.settings_config.get("config") {
-        if config_value.is_object() {
-            // Merge with existing settings to preserve mcpServers and other fields
-            let mut merged = if settings_path.exists() {
-                read_json_file::<Value>(&settings_path).unwrap_or_else(|_| json!({}))
-            } else {
-                json!({})
-            };
-
-            // Merge provider config into existing settings
-            if let (Some(merged_obj), Some(config_obj)) =
-                (merged.as_object_mut(), config_value.as_object())
-            {
-                for (k, v) in config_obj {
-                    merged_obj.insert(k.clone(), v.clone());
-                }
-            }
-            config_to_write = Some(merged);
-        } else if !config_value.is_null() {
-            return Err(AppError::localized(
-                "gemini.validation.invalid_config",
-                "Gemini 配置格式错误: config 必须是对象或 null",
-                "Gemini config invalid: config must be an object or null",
-            ));
-        }
-        // config is null: don't modify existing settings.json (preserve mcpServers etc.)
-    }
-
-    // If no config specified or config is null, preserve existing file
-    if config_to_write.is_none() && settings_path.exists() {
-        config_to_write = Some(read_json_file(&settings_path)?);
-    }
-
-    match auth_type {
-        GeminiAuthType::GoogleOfficial => {
-            // Google official uses OAuth, clear env
-            env_map.clear();
-            write_gemini_env_atomic(&env_map)?;
-        }
-        GeminiAuthType::Packycode => {
-            // PackyCode provider, uses API Key (strict validation on switch)
-            validate_gemini_settings_strict(&provider.settings_config)?;
-            write_gemini_env_atomic(&env_map)?;
-        }
-        GeminiAuthType::Generic => {
-            // Generic provider, uses API Key (strict validation on switch)
-            validate_gemini_settings_strict(&provider.settings_config)?;
-            write_gemini_env_atomic(&env_map)?;
-        }
-    }
-
-    if let Some(config_value) = config_to_write {
-        write_json_file(&settings_path, &config_value)?;
-    }
-
-    // Set security.auth.selectedType based on auth type
-    // - Google Official: OAuth mode
-    // - All others: API Key mode
-    match auth_type {
-        GeminiAuthType::GoogleOfficial => ensure_google_oauth_security_flag(provider)?,
-        GeminiAuthType::Packycode | GeminiAuthType::Generic => {
-            crate::gemini_config::write_packycode_settings()?;
-        }
-    }
-
-    Ok(())
-}
@@ -1,609 +0,0 @@
-//! Provider service module
-//!
-//! Handles provider CRUD operations, switching, and configuration management.
-
-mod endpoints;
-mod gemini_auth;
-mod live;
-mod usage;
-
-use indexmap::IndexMap;
-use regex::Regex;
-use serde::Deserialize;
-use serde_json::Value;
-
-use crate::app_config::AppType;
-use crate::error::AppError;
-use crate::provider::{Provider, UsageResult};
-use crate::services::mcp::McpService;
-use crate::settings::CustomEndpoint;
-use crate::store::AppState;
-
-// Re-export sub-module functions for external access
-pub use live::{import_default_config, read_live_settings, sync_current_to_live};
-
-// Internal re-exports (pub(crate))
-pub(crate) use live::write_live_snapshot;
-
-// Internal re-exports
-use live::write_gemini_live;
-use usage::validate_usage_script;
-
-/// Provider business logic service
-pub struct ProviderService;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn validate_provider_settings_rejects_missing_auth() {
-        let provider = Provider::with_id(
-            "codex".into(),
-            "Codex".into(),
-            json!({ "config": "base_url = \"https://example.com\"" }),
-            None,
-        );
-        let err = ProviderService::validate_provider_settings(&AppType::Codex, &provider)
-            .expect_err("missing auth should be rejected");
-        assert!(
-            err.to_string().contains("auth"),
-            "expected auth error, got {err:?}"
-        );
-    }
-
-    #[test]
-    fn extract_credentials_returns_expected_values() {
-        let provider = Provider::with_id(
-            "claude".into(),
-            "Claude".into(),
-            json!({
-                "env": {
-                    "ANTHROPIC_AUTH_TOKEN": "token",
-                    "ANTHROPIC_BASE_URL": "https://claude.example"
-                }
-            }),
-            None,
-        );
-        let (api_key, base_url) =
-            ProviderService::extract_credentials(&provider, &AppType::Claude).unwrap();
-        assert_eq!(api_key, "token");
-        assert_eq!(base_url, "https://claude.example");
-    }
-}
-
-impl ProviderService {
-    fn normalize_provider_if_claude(app_type: &AppType, provider: &mut Provider) {
-        if matches!(app_type, AppType::Claude) {
-            let mut v = provider.settings_config.clone();
-            if normalize_claude_models_in_value(&mut v) {
-                provider.settings_config = v;
-            }
-        }
-    }
-
-    /// List all providers for an app type
-    pub fn list(
-        state: &AppState,
-        app_type: AppType,
-    ) -> Result<IndexMap<String, Provider>, AppError> {
-        state.db.get_all_providers(app_type.as_str())
-    }
-
-    /// Get current provider ID
-    ///
-    /// 使用有效的当前供应商 ID（验证过存在性）。
-    /// 优先从本地 settings 读取，验证后 fallback 到数据库的 is_current 字段。
-    /// 这确保了云同步场景下多设备可以独立选择供应商，且返回的 ID 一定有效。
-    pub fn current(state: &AppState, app_type: AppType) -> Result<String, AppError> {
-        crate::settings::get_effective_current_provider(&state.db, &app_type)
-            .map(|opt| opt.unwrap_or_default())
-    }
-
-    /// Add a new provider
-    pub fn add(state: &AppState, app_type: AppType, provider: Provider) -> Result<bool, AppError> {
-        let mut provider = provider;
-        // Normalize Claude model keys
-        Self::normalize_provider_if_claude(&app_type, &mut provider);
-        Self::validate_provider_settings(&app_type, &provider)?;
-
-        // Save to database
-        state.db.save_provider(app_type.as_str(), &provider)?;
-
-        // Check if sync is needed (if this is current provider, or no current provider)
-        let current = state.db.get_current_provider(app_type.as_str())?;
-        if current.is_none() {
-            // No current provider, set as current and sync
-            state
-                .db
-                .set_current_provider(app_type.as_str(), &provider.id)?;
-            write_live_snapshot(&app_type, &provider)?;
-        }
-
-        Ok(true)
-    }
-
-    /// Update a provider
-    pub fn update(
-        state: &AppState,
-        app_type: AppType,
-        provider: Provider,
-    ) -> Result<bool, AppError> {
-        let mut provider = provider;
-        // Normalize Claude model keys
-        Self::normalize_provider_if_claude(&app_type, &mut provider);
-        Self::validate_provider_settings(&app_type, &provider)?;
-
-        // Check if this is current provider (use effective current, not just DB)
-        let effective_current =
-            crate::settings::get_effective_current_provider(&state.db, &app_type)?;
-        let is_current = effective_current.as_deref() == Some(provider.id.as_str());
-
-        // Save to database
-        state.db.save_provider(app_type.as_str(), &provider)?;
-
-        if is_current {
-            write_live_snapshot(&app_type, &provider)?;
-            // Sync MCP
-            McpService::sync_all_enabled(state)?;
-        }
-
-        Ok(true)
-    }
-
-    /// Delete a provider
-    ///
-    /// 同时检查本地 settings 和数据库的当前供应商，防止删除任一端正在使用的供应商。
-    pub fn delete(state: &AppState, app_type: AppType, id: &str) -> Result<(), AppError> {
-        // Check both local settings and database
-        let local_current = crate::settings::get_current_provider(&app_type);
-        let db_current = state.db.get_current_provider(app_type.as_str())?;
-
-        if local_current.as_deref() == Some(id) || db_current.as_deref() == Some(id) {
-            return Err(AppError::Message(
-                "无法删除当前正在使用的供应商".to_string(),
-            ));
-        }
-
-        state.db.delete_provider(app_type.as_str(), id)
-    }
-
-    /// Switch to a provider
-    ///
-    /// Switch flow:
-    /// 1. Validate target provider exists
-    /// 2. **Backfill mechanism**: Backfill current live config to current provider, protect user manual modifications
-    /// 3. Update local settings current_provider_xxx (device-level)
-    /// 4. Update database is_current (as default for new devices)
-    /// 5. Write target provider config to live files
-    /// 6. Sync MCP configuration
-    pub fn switch(state: &AppState, app_type: AppType, id: &str) -> Result<(), AppError> {
-        // Check if provider exists
-        let providers = state.db.get_all_providers(app_type.as_str())?;
-        let provider = providers
-            .get(id)
-            .ok_or_else(|| AppError::Message(format!("供应商 {id} 不存在")))?;
-
-        // Backfill: Backfill current live config to current provider
-        // Use effective current provider (validated existence) to ensure backfill targets valid provider
-        let current_id = crate::settings::get_effective_current_provider(&state.db, &app_type)?;
-
-        if let Some(current_id) = current_id {
-            if current_id != id {
-                // Only backfill when switching to a different provider
-                if let Ok(live_config) = read_live_settings(app_type.clone()) {
-                    if let Some(mut current_provider) = providers.get(&current_id).cloned() {
-                        current_provider.settings_config = live_config;
-                        // Ignore backfill failure, don't affect switch flow
-                        let _ = state.db.save_provider(app_type.as_str(), &current_provider);
-                    }
-                }
-            }
-        }
-
-        // Update local settings (device-level, takes priority)
-        crate::settings::set_current_provider(&app_type, Some(id))?;
-
-        // Update database is_current (as default for new devices)
-        state.db.set_current_provider(app_type.as_str(), id)?;
-
-        // Sync to live (write_gemini_live handles security flag internally for Gemini)
-        write_live_snapshot(&app_type, provider)?;
-
-        // Sync MCP
-        McpService::sync_all_enabled(state)?;
-
-        Ok(())
-    }
-
-    /// Sync current provider to live configuration (re-export)
-    pub fn sync_current_to_live(state: &AppState) -> Result<(), AppError> {
-        sync_current_to_live(state)
-    }
-
-    /// Import default configuration from live files (re-export)
-    ///
-    /// Returns `Ok(true)` if imported, `Ok(false)` if skipped.
-    pub fn import_default_config(state: &AppState, app_type: AppType) -> Result<bool, AppError> {
-        import_default_config(state, app_type)
-    }
-
-    /// Read current live settings (re-export)
-    pub fn read_live_settings(app_type: AppType) -> Result<Value, AppError> {
-        read_live_settings(app_type)
-    }
-
-    /// Get custom endpoints list (re-export)
-    pub fn get_custom_endpoints(
-        state: &AppState,
-        app_type: AppType,
-        provider_id: &str,
-    ) -> Result<Vec<CustomEndpoint>, AppError> {
-        endpoints::get_custom_endpoints(state, app_type, provider_id)
-    }
-
-    /// Add custom endpoint (re-export)
-    pub fn add_custom_endpoint(
-        state: &AppState,
-        app_type: AppType,
-        provider_id: &str,
-        url: String,
-    ) -> Result<(), AppError> {
-        endpoints::add_custom_endpoint(state, app_type, provider_id, url)
-    }
-
-    /// Remove custom endpoint (re-export)
-    pub fn remove_custom_endpoint(
-        state: &AppState,
-        app_type: AppType,
-        provider_id: &str,
-        url: String,
-    ) -> Result<(), AppError> {
-        endpoints::remove_custom_endpoint(state, app_type, provider_id, url)
-    }
-
-    /// Update endpoint last used timestamp (re-export)
-    pub fn update_endpoint_last_used(
-        state: &AppState,
-        app_type: AppType,
-        provider_id: &str,
-        url: String,
-    ) -> Result<(), AppError> {
-        endpoints::update_endpoint_last_used(state, app_type, provider_id, url)
-    }
-
-    /// Update provider sort order
-    pub fn update_sort_order(
-        state: &AppState,
-        app_type: AppType,
-        updates: Vec<ProviderSortUpdate>,
-    ) -> Result<bool, AppError> {
-        let mut providers = state.db.get_all_providers(app_type.as_str())?;
-
-        for update in updates {
-            if let Some(provider) = providers.get_mut(&update.id) {
-                provider.sort_index = Some(update.sort_index);
-                state.db.save_provider(app_type.as_str(), provider)?;
-            }
-        }
-
-        Ok(true)
-    }
-
-    /// Query provider usage (re-export)
-    pub async fn query_usage(
-        state: &AppState,
-        app_type: AppType,
-        provider_id: &str,
-    ) -> Result<UsageResult, AppError> {
-        usage::query_usage(state, app_type, provider_id).await
-    }
-
-    /// Test usage script (re-export)
-    #[allow(clippy::too_many_arguments)]
-    pub async fn test_usage_script(
-        state: &AppState,
-        app_type: AppType,
-        provider_id: &str,
-        script_code: &str,
-        timeout: u64,
-        api_key: Option<&str>,
-        base_url: Option<&str>,
-        access_token: Option<&str>,
-        user_id: Option<&str>,
-    ) -> Result<UsageResult, AppError> {
-        usage::test_usage_script(
-            state,
-            app_type,
-            provider_id,
-            script_code,
-            timeout,
-            api_key,
-            base_url,
-            access_token,
-            user_id,
-        )
-        .await
-    }
-
-    pub(crate) fn write_gemini_live(provider: &Provider) -> Result<(), AppError> {
-        write_gemini_live(provider)
-    }
-
-    fn validate_provider_settings(app_type: &AppType, provider: &Provider) -> Result<(), AppError> {
-        match app_type {
-            AppType::Claude => {
-                if !provider.settings_config.is_object() {
-                    return Err(AppError::localized(
-                        "provider.claude.settings.not_object",
-                        "Claude 配置必须是 JSON 对象",
-                        "Claude configuration must be a JSON object",
-                    ));
-                }
-            }
-            AppType::Codex => {
-                let settings = provider.settings_config.as_object().ok_or_else(|| {
-                    AppError::localized(
-                        "provider.codex.settings.not_object",
-                        "Codex 配置必须是 JSON 对象",
-                        "Codex configuration must be a JSON object",
-                    )
-                })?;
-
-                let auth = settings.get("auth").ok_or_else(|| {
-                    AppError::localized(
-                        "provider.codex.auth.missing",
-                        format!("供应商 {} 缺少 auth 配置", provider.id),
-                        format!("Provider {} is missing auth configuration", provider.id),
-                    )
-                })?;
-                if !auth.is_object() {
-                    return Err(AppError::localized(
-                        "provider.codex.auth.not_object",
-                        format!("供应商 {} 的 auth 配置必须是 JSON 对象", provider.id),
-                        format!(
-                            "Provider {} auth configuration must be a JSON object",
-                            provider.id
-                        ),
-                    ));
-                }
-
-                if let Some(config_value) = settings.get("config") {
-                    if !(config_value.is_string() || config_value.is_null()) {
-                        return Err(AppError::localized(
-                            "provider.codex.config.invalid_type",
-                            "Codex config 字段必须是字符串",
-                            "Codex config field must be a string",
-                        ));
-                    }
-                    if let Some(cfg_text) = config_value.as_str() {
-                        crate::codex_config::validate_config_toml(cfg_text)?;
-                    }
-                }
-            }
-            AppType::Gemini => {
-                use crate::gemini_config::validate_gemini_settings;
-                validate_gemini_settings(&provider.settings_config)?
-            }
-        }
-
-        // Validate and clean UsageScript configuration (common for all app types)
-        if let Some(meta) = &provider.meta {
-            if let Some(usage_script) = &meta.usage_script {
-                validate_usage_script(usage_script)?;
-            }
-        }
-
-        Ok(())
-    }
-
-    #[allow(dead_code)]
-    fn extract_credentials(
-        provider: &Provider,
-        app_type: &AppType,
-    ) -> Result<(String, String), AppError> {
-        match app_type {
-            AppType::Claude => {
-                let env = provider
-                    .settings_config
-                    .get("env")
-                    .and_then(|v| v.as_object())
-                    .ok_or_else(|| {
-                        AppError::localized(
-                            "provider.claude.env.missing",
-                            "配置格式错误: 缺少 env",
-                            "Invalid configuration: missing env section",
-                        )
-                    })?;
-
-                let api_key = env
-                    .get("ANTHROPIC_AUTH_TOKEN")
-                    .or_else(|| env.get("ANTHROPIC_API_KEY"))
-                    .and_then(|v| v.as_str())
-                    .ok_or_else(|| {
-                        AppError::localized(
-                            "provider.claude.api_key.missing",
-                            "缺少 API Key",
-                            "API key is missing",
-                        )
-                    })?
-                    .to_string();
-
-                let base_url = env
-                    .get("ANTHROPIC_BASE_URL")
-                    .and_then(|v| v.as_str())
-                    .ok_or_else(|| {
-                        AppError::localized(
-                            "provider.claude.base_url.missing",
-                            "缺少 ANTHROPIC_BASE_URL 配置",
-                            "Missing ANTHROPIC_BASE_URL configuration",
-                        )
-                    })?
-                    .to_string();
-
-                Ok((api_key, base_url))
-            }
-            AppType::Codex => {
-                let auth = provider
-                    .settings_config
-                    .get("auth")
-                    .and_then(|v| v.as_object())
-                    .ok_or_else(|| {
-                        AppError::localized(
-                            "provider.codex.auth.missing",
-                            "配置格式错误: 缺少 auth",
-                            "Invalid configuration: missing auth section",
-                        )
-                    })?;
-
-                let api_key = auth
-                    .get("OPENAI_API_KEY")
-                    .and_then(|v| v.as_str())
-                    .ok_or_else(|| {
-                        AppError::localized(
-                            "provider.codex.api_key.missing",
-                            "缺少 API Key",
-                            "API key is missing",
-                        )
-                    })?
-                    .to_string();
-
-                let config_toml = provider
-                    .settings_config
-                    .get("config")
-                    .and_then(|v| v.as_str())
-                    .unwrap_or("");
-
-                let base_url = if config_toml.contains("base_url") {
-                    let re = Regex::new(r#"base_url\s*=\s*["']([^"']+)["']"#).map_err(|e| {
-                        AppError::localized(
-                            "provider.regex_init_failed",
-                            format!("正则初始化失败: {e}"),
-                            format!("Failed to initialize regex: {e}"),
-                        )
-                    })?;
-                    re.captures(config_toml)
-                        .and_then(|caps| caps.get(1))
-                        .map(|m| m.as_str().to_string())
-                        .ok_or_else(|| {
-                            AppError::localized(
-                                "provider.codex.base_url.invalid",
-                                "config.toml 中 base_url 格式错误",
-                                "base_url in config.toml has invalid format",
-                            )
-                        })?
-                } else {
-                    return Err(AppError::localized(
-                        "provider.codex.base_url.missing",
-                        "config.toml 中缺少 base_url 配置",
-                        "base_url is missing from config.toml",
-                    ));
-                };
-
-                Ok((api_key, base_url))
-            }
-            AppType::Gemini => {
-                use crate::gemini_config::json_to_env;
-
-                let env_map = json_to_env(&provider.settings_config)?;
-
-                let api_key = env_map.get("GEMINI_API_KEY").cloned().ok_or_else(|| {
-                    AppError::localized(
-                        "gemini.missing_api_key",
-                        "缺少 GEMINI_API_KEY",
-                        "Missing GEMINI_API_KEY",
-                    )
-                })?;
-
-                let base_url = env_map
-                    .get("GOOGLE_GEMINI_BASE_URL")
-                    .cloned()
-                    .unwrap_or_else(|| "https://generativelanguage.googleapis.com".to_string());
-
-                Ok((api_key, base_url))
-            }
-        }
-    }
-}
-
-/// Normalize Claude model keys in a JSON value
-///
-/// Reads old key (ANTHROPIC_SMALL_FAST_MODEL), writes new keys (DEFAULT_*), and deletes old key.
-pub(crate) fn normalize_claude_models_in_value(settings: &mut Value) -> bool {
-    let mut changed = false;
-    let env = match settings.get_mut("env").and_then(|v| v.as_object_mut()) {
-        Some(obj) => obj,
-        None => return changed,
-    };
-
-    let model = env
-        .get("ANTHROPIC_MODEL")
-        .and_then(|v| v.as_str())
-        .map(|s| s.to_string());
-    let small_fast = env
-        .get("ANTHROPIC_SMALL_FAST_MODEL")
-        .and_then(|v| v.as_str())
-        .map(|s| s.to_string());
-
-    let current_haiku = env
-        .get("ANTHROPIC_DEFAULT_HAIKU_MODEL")
-        .and_then(|v| v.as_str())
-        .map(|s| s.to_string());
-    let current_sonnet = env
-        .get("ANTHROPIC_DEFAULT_SONNET_MODEL")
-        .and_then(|v| v.as_str())
-        .map(|s| s.to_string());
-    let current_opus = env
-        .get("ANTHROPIC_DEFAULT_OPUS_MODEL")
-        .and_then(|v| v.as_str())
-        .map(|s| s.to_string());
-
-    let target_haiku = current_haiku
-        .or_else(|| small_fast.clone())
-        .or_else(|| model.clone());
-    let target_sonnet = current_sonnet
-        .or_else(|| model.clone())
-        .or_else(|| small_fast.clone());
-    let target_opus = current_opus
-        .or_else(|| model.clone())
-        .or_else(|| small_fast.clone());
-
-    if env.get("ANTHROPIC_DEFAULT_HAIKU_MODEL").is_none() {
-        if let Some(v) = target_haiku {
-            env.insert(
-                "ANTHROPIC_DEFAULT_HAIKU_MODEL".to_string(),
-                Value::String(v),
-            );
-            changed = true;
-        }
-    }
-    if env.get("ANTHROPIC_DEFAULT_SONNET_MODEL").is_none() {
-        if let Some(v) = target_sonnet {
-            env.insert(
-                "ANTHROPIC_DEFAULT_SONNET_MODEL".to_string(),
-                Value::String(v),
-            );
-            changed = true;
-        }
-    }
-    if env.get("ANTHROPIC_DEFAULT_OPUS_MODEL").is_none() {
-        if let Some(v) = target_opus {
-            env.insert("ANTHROPIC_DEFAULT_OPUS_MODEL".to_string(), Value::String(v));
-            changed = true;
-        }
-    }
-
-    if env.remove("ANTHROPIC_SMALL_FAST_MODEL").is_some() {
-        changed = true;
-    }
-
-    changed
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct ProviderSortUpdate {
-    pub id: String,
-    #[serde(rename = "sortIndex")]
-    pub sort_index: usize,
-}
@@ -1,180 +0,0 @@
-//! Usage script execution
-//!
-//! Handles executing and formatting usage query results.
-
-use crate::app_config::AppType;
-use crate::error::AppError;
-use crate::provider::{UsageData, UsageResult, UsageScript};
-use crate::settings;
-use crate::store::AppState;
-use crate::usage_script;
-
-/// Execute usage script and format result (private helper method)
-pub(crate) async fn execute_and_format_usage_result(
-    script_code: &str,
-    api_key: &str,
-    base_url: &str,
-    timeout: u64,
-    access_token: Option<&str>,
-    user_id: Option<&str>,
-) -> Result<UsageResult, AppError> {
-    match usage_script::execute_usage_script(
-        script_code,
-        api_key,
-        base_url,
-        timeout,
-        access_token,
-        user_id,
-    )
-    .await
-    {
-        Ok(data) => {
-            let usage_list: Vec<UsageData> = if data.is_array() {
-                serde_json::from_value(data).map_err(|e| {
-                    AppError::localized(
-                        "usage_script.data_format_error",
-                        format!("数据格式错误: {e}"),
-                        format!("Data format error: {e}"),
-                    )
-                })?
-            } else {
-                let single: UsageData = serde_json::from_value(data).map_err(|e| {
-                    AppError::localized(
-                        "usage_script.data_format_error",
-                        format!("数据格式错误: {e}"),
-                        format!("Data format error: {e}"),
-                    )
-                })?;
-                vec![single]
-            };
-
-            Ok(UsageResult {
-                success: true,
-                data: Some(usage_list),
-                error: None,
-            })
-        }
-        Err(err) => {
-            let lang = settings::get_settings()
-                .language
-                .unwrap_or_else(|| "zh".to_string());
-
-            let msg = match err {
-                AppError::Localized { zh, en, .. } => {
-                    if lang == "en" {
-                        en
-                    } else {
-                        zh
-                    }
-                }
-                other => other.to_string(),
-            };
-
-            Ok(UsageResult {
-                success: false,
-                data: None,
-                error: Some(msg),
-            })
-        }
-    }
-}
-
-/// Query provider usage (using saved script configuration)
-pub async fn query_usage(
-    state: &AppState,
-    app_type: AppType,
-    provider_id: &str,
-) -> Result<UsageResult, AppError> {
-    let (script_code, timeout, api_key, base_url, access_token, user_id) = {
-        let providers = state.db.get_all_providers(app_type.as_str())?;
-        let provider = providers.get(provider_id).ok_or_else(|| {
-            AppError::localized(
-                "provider.not_found",
-                format!("供应商不存在: {provider_id}"),
-                format!("Provider not found: {provider_id}"),
-            )
-        })?;
-
-        let usage_script = provider
-            .meta
-            .as_ref()
-            .and_then(|m| m.usage_script.as_ref())
-            .ok_or_else(|| {
-                AppError::localized(
-                    "provider.usage.script.missing",
-                    "未配置用量查询脚本",
-                    "Usage script is not configured",
-                )
-            })?;
-        if !usage_script.enabled {
-            return Err(AppError::localized(
-                "provider.usage.disabled",
-                "用量查询未启用",
-                "Usage query is disabled",
-            ));
-        }
-
-        // Get credentials directly from UsageScript, no longer extract from provider config
-        (
-            usage_script.code.clone(),
-            usage_script.timeout.unwrap_or(10),
-            usage_script.api_key.clone().unwrap_or_default(),
-            usage_script.base_url.clone().unwrap_or_default(),
-            usage_script.access_token.clone(),
-            usage_script.user_id.clone(),
-        )
-    };
-
-    execute_and_format_usage_result(
-        &script_code,
-        &api_key,
-        &base_url,
-        timeout,
-        access_token.as_deref(),
-        user_id.as_deref(),
-    )
-    .await
-}
-
-/// Test usage script (using temporary script content, not saved)
-#[allow(clippy::too_many_arguments)]
-pub async fn test_usage_script(
-    _state: &AppState,
-    _app_type: AppType,
-    _provider_id: &str,
-    script_code: &str,
-    timeout: u64,
-    api_key: Option<&str>,
-    base_url: Option<&str>,
-    access_token: Option<&str>,
-    user_id: Option<&str>,
-) -> Result<UsageResult, AppError> {
-    // Use provided credential parameters directly for testing
-    execute_and_format_usage_result(
-        script_code,
-        api_key.unwrap_or(""),
-        base_url.unwrap_or(""),
-        timeout,
-        access_token,
-        user_id,
-    )
-    .await
-}
-
-/// Validate UsageScript configuration (boundary checks)
-pub(crate) fn validate_usage_script(script: &UsageScript) -> Result<(), AppError> {
-    // Validate auto query interval (0-1440 minutes, max 24 hours)
-    if let Some(interval) = script.auto_query_interval {
-        if interval > 1440 {
-            return Err(AppError::localized(
-                "usage_script.interval_too_large",
-                format!("自动查询间隔不能超过 1440 分钟（24小时），当前值: {interval}"),
-                format!(
-                    "Auto query interval cannot exceed 1440 minutes (24 hours), current: {interval}"
-                ),
-            ));
-        }
-    }
-
-    Ok(())
-}
@@ -34,6 +34,9 @@ pub struct Skill {
    /// 分支名称
    #[serde(rename = "repoBranch")]
    pub repo_branch: Option<String>,
+    /// 技能所在的子目录路径 (可选, 如 "skills")
+    #[serde(rename = "skillsPath")]
+    pub skills_path: Option<String>,
 }

 /// 仓库配置
@@ -47,6 +50,9 @@ pub struct SkillRepo {
    pub branch: String,
    /// 是否启用
    pub enabled: bool,
+    /// 技能所在的子目录路径 (可选, 如 "skills", "my-skills/subdir")
+    #[serde(rename = "skillsPath")]
+    pub skills_path: Option<String>,
 }

 /// 技能安装状态
@@ -78,18 +84,21 @@ impl Default for SkillStore {
                    name: "awesome-claude-skills".to_string(),
                    branch: "main".to_string(),
                    enabled: true,
+                    skills_path: None, // 扫描根目录
                },
                SkillRepo {
                    owner: "anthropics".to_string(),
                    name: "skills".to_string(),
                    branch: "main".to_string(),
                    enabled: true,
+                    skills_path: None, // 扫描根目录
                },
                SkillRepo {
                    owner: "cexll".to_string(),
                    name: "myclaude".to_string(),
                    branch: "master".to_string(),
                    enabled: true,
+                    skills_path: Some("skills".to_string()), // 扫描 skills 子目录
                },
            ],
        }
@@ -185,11 +194,71 @@ impl SkillService {
            })??;
        let mut skills = Vec::new();

-        // 扫描仓库根目录（支持全仓库递归扫描）
-        let scan_dir = temp_dir.clone();
+        // 确定要扫描的目录路径
+        let scan_dir = if let Some(ref skills_path) = repo.skills_path {
+            // 如果指定了 skillsPath，则扫描该子目录
+            let subdir = temp_dir.join(skills_path.trim_matches('/'));
+            if !subdir.exists() {
+                log::warn!(
+                    "仓库 {}/{} 中指定的技能路径 '{}' 不存在",
+                    repo.owner,
+                    repo.name,
+                    skills_path
+                );
+                let _ = fs::remove_dir_all(&temp_dir);
+                return Ok(skills);
+            }
+            subdir
+        } else {
+            // 否则扫描仓库根目录
+            temp_dir.clone()
+        };

-        // 递归扫描目录查找所有技能
-        self.scan_dir_recursive(&scan_dir, &scan_dir, repo, &mut skills)?;
+        // 遍历目标目录
+        for entry in fs::read_dir(&scan_dir)? {
+            let entry = entry?;
+            let path = entry.path();
+
+            if !path.is_dir() {
+                continue;
+            }
+
+            let skill_md = path.join("SKILL.md");
+            if !skill_md.exists() {
+                continue;
+            }
+
+            // 解析技能元数据
+            match self.parse_skill_metadata(&skill_md) {
+                Ok(meta) => {
+                    let directory = path.file_name().unwrap().to_string_lossy().to_string();
+
+                    // 构建 README URL（考虑 skillsPath）
+                    let readme_path = if let Some(ref skills_path) = repo.skills_path {
+                        format!("{}/{}", skills_path.trim_matches('/'), directory)
+                    } else {
+                        directory.clone()
+                    };
+
+                    skills.push(Skill {
+                        key: format!("{}/{}:{}", repo.owner, repo.name, directory),
+                        name: meta.name.unwrap_or_else(|| directory.clone()),
+                        description: meta.description.unwrap_or_default(),
+                        directory,
+                        readme_url: Some(format!(
+                            "https://github.com/{}/{}/tree/{}/{}",
+                            repo.owner, repo.name, repo.branch, readme_path
+                        )),
+                        installed: false,
+                        repo_owner: Some(repo.owner.clone()),
+                        repo_name: Some(repo.name.clone()),
+                        repo_branch: Some(repo.branch.clone()),
+                        skills_path: repo.skills_path.clone(),
+                    });
+                }
+                Err(e) => log::warn!("解析 {} 元数据失败: {}", skill_md.display(), e),
+            }
+        }

        // 清理临时目录
        let _ = fs::remove_dir_all(&temp_dir);
@@ -197,85 +266,6 @@ impl SkillService {
        Ok(skills)
    }

-    /// 递归扫描目录查找 SKILL.md
-    ///
-    /// 规则：
-    /// 1. 如果当前目录存在 SKILL.md，则识别为技能，停止扫描其子目录（子目录视为功能文件夹）
-    /// 2. 如果当前目录不存在 SKILL.md，则递归扫描所有子目录
-    fn scan_dir_recursive(
-        &self,
-        current_dir: &Path,
-        base_dir: &Path,
-        repo: &SkillRepo,
-        skills: &mut Vec<Skill>,
-    ) -> Result<()> {
-        // 检查当前目录是否包含 SKILL.md
-        let skill_md = current_dir.join("SKILL.md");
-
-        if skill_md.exists() {
-            // 发现技能！获取相对路径作为目录名
-            let directory = if current_dir == base_dir {
-                // 根目录的 SKILL.md，使用仓库名
-                repo.name.clone()
-            } else {
-                // 子目录的 SKILL.md，使用相对路径
-                current_dir
-                    .strip_prefix(base_dir)
-                    .unwrap_or(current_dir)
-                    .to_string_lossy()
-                    .to_string()
-            };
-
-            if let Ok(skill) = self.build_skill_from_metadata(&skill_md, &directory, repo) {
-                skills.push(skill);
-            }
-
-            // 停止扫描此目录的子目录（同级目录都是功能文件夹）
-            return Ok(());
-        }
-
-        // 未发现 SKILL.md，继续递归扫描所有子目录
-        for entry in fs::read_dir(current_dir)? {
-            let entry = entry?;
-            let path = entry.path();
-
-            // 只处理目录
-            if path.is_dir() {
-                self.scan_dir_recursive(&path, base_dir, repo, skills)?;
-            }
-        }
-
-        Ok(())
-    }
-
-    /// 从 SKILL.md 构建技能对象
-    fn build_skill_from_metadata(
-        &self,
-        skill_md: &Path,
-        directory: &str,
-        repo: &SkillRepo,
-    ) -> Result<Skill> {
-        let meta = self.parse_skill_metadata(skill_md)?;
-
-        // 构建 README URL
-        let readme_path = directory.to_string();
-
-        Ok(Skill {
-            key: format!("{}/{}:{}", repo.owner, repo.name, directory),
-            name: meta.name.unwrap_or_else(|| directory.to_string()),
-            description: meta.description.unwrap_or_default(),
-            directory: directory.to_string(),
-            readme_url: Some(format!(
-                "https://github.com/{}/{}/tree/{}/{}",
-                repo.owner, repo.name, repo.branch, readme_path
-            )),
-            installed: false,
-            repo_owner: Some(repo.owner.clone()),
-            repo_name: Some(repo.name.clone()),
-            repo_branch: Some(repo.branch.clone()),
-        })
-    }
-
    /// 解析技能元数据
    fn parse_skill_metadata(&self, path: &Path) -> Result<SkillMetadata> {
        let content = fs::read_to_string(path)?;
@@ -307,29 +297,20 @@ impl SkillService {
            return Ok(());
        }

-        // 收集所有本地技能
-        let mut local_skills = Vec::new();
-        self.scan_local_dir_recursive(&self.install_dir, &self.install_dir, &mut local_skills)?;
+        for entry in fs::read_dir(&self.install_dir)? {
+            let entry = entry?;
+            let path = entry.path();

-        // 处理找到的本地技能
-        for local_skill in local_skills {
-            let directory = &local_skill.directory;
+            if !path.is_dir() {
+                continue;
+            }

-            // 更新已安装状态（匹配远程技能）
-            // 使用目录最后一段进行比较，因为安装时只使用最后一段作为目录名
+            let directory = path.file_name().unwrap().to_string_lossy().to_string();
+
+            // 更新已安装状态
            let mut found = false;
-            let local_install_name = Path::new(directory)
-                .file_name()
-                .map(|s| s.to_string_lossy().to_string())
-                .unwrap_or_else(|| directory.clone());
-
            for skill in skills.iter_mut() {
-                let remote_install_name = Path::new(&skill.directory)
-                    .file_name()
-                    .map(|s| s.to_string_lossy().to_string())
-                    .unwrap_or_else(|| skill.directory.clone());
-
-                if remote_install_name.eq_ignore_ascii_case(&local_install_name) {
+                if skill.directory.eq_ignore_ascii_case(&directory) {
                    skill.installed = true;
                    found = true;
                    break;
@@ -338,68 +319,23 @@ impl SkillService {

            // 添加本地独有的技能（仅当在仓库中未找到时）
            if !found {
-                skills.push(local_skill);
-            }
-        }
-
-        Ok(())
-    }
-
-    /// 递归扫描本地目录查找 SKILL.md
-    fn scan_local_dir_recursive(
-        &self,
-        current_dir: &Path,
-        base_dir: &Path,
-        skills: &mut Vec<Skill>,
-    ) -> Result<()> {
-        // 检查当前目录是否包含 SKILL.md
-        let skill_md = current_dir.join("SKILL.md");
-
-        if skill_md.exists() {
-            // 发现技能！获取相对路径作为目录名
-            let directory = if current_dir == base_dir {
-                // 如果是 install_dir 本身，使用最后一段路径名
-                current_dir
-                    .file_name()
-                    .unwrap_or_default()
-                    .to_string_lossy()
-                    .to_string()
-            } else {
-                // 使用相对于 install_dir 的路径
-                current_dir
-                    .strip_prefix(base_dir)
-                    .unwrap_or(current_dir)
-                    .to_string_lossy()
-                    .to_string()
-            };
-
-            // 解析元数据并创建本地技能对象
-            if let Ok(meta) = self.parse_skill_metadata(&skill_md) {
-                skills.push(Skill {
-                    key: format!("local:{directory}"),
-                    name: meta.name.unwrap_or_else(|| directory.clone()),
-                    description: meta.description.unwrap_or_default(),
-                    directory: directory.clone(),
-                    readme_url: None,
-                    installed: true,
-                    repo_owner: None,
-                    repo_name: None,
-                    repo_branch: None,
-                });
-            }
-
-            // 停止扫描此目录的子目录（同级目录都是功能文件夹）
-            return Ok(());
-        }
-
-        // 未发现 SKILL.md，继续递归扫描所有子目录
-        for entry in fs::read_dir(current_dir)? {
-            let entry = entry?;
-            let path = entry.path();
-
-            // 只处理目录
-            if path.is_dir() {
-                self.scan_local_dir_recursive(&path, base_dir, skills)?;
+                let skill_md = path.join("SKILL.md");
+                if skill_md.exists() {
+                    if let Ok(meta) = self.parse_skill_metadata(&skill_md) {
+                        skills.push(Skill {
+                            key: format!("local:{directory}"),
+                            name: meta.name.unwrap_or_else(|| directory.clone()),
+                            description: meta.description.unwrap_or_default(),
+                            directory: directory.clone(),
+                            readme_url: None,
+                            installed: true,
+                            repo_owner: None,
+                            repo_name: None,
+                            repo_branch: None,
+                            skills_path: None,
+                        });
+                    }
+                }
            }
        }

@@ -407,13 +343,11 @@ impl SkillService {
    }

    /// 去重技能列表
-    /// 使用完整的 key (owner/name:directory) 来区分不同仓库的同名技能
    fn deduplicate_skills(skills: &mut Vec<Skill>) {
        let mut seen = HashMap::new();
        skills.retain(|skill| {
-            // 使用完整 key 而非仅 directory，允许不同仓库的同名技能共存
-            let unique_key = skill.key.to_lowercase();
-            if let std::collections::hash_map::Entry::Vacant(e) = seen.entry(unique_key) {
+            let key = skill.directory.to_lowercase();
+            if let std::collections::hash_map::Entry::Vacant(e) = seen.entry(key) {
                e.insert(true);
                true
            } else {
@@ -528,14 +462,7 @@ impl SkillService {

    /// 安装技能（仅负责下载和文件操作，状态更新由上层负责）
    pub async fn install_skill(&self, directory: String, repo: SkillRepo) -> Result<()> {
-        // 使用技能目录的最后一段作为安装目录名，避免嵌套路径问题
-        // 例如: "skills/codex" -> "codex"
-        let install_name = Path::new(&directory)
-            .file_name()
-            .map(|s| s.to_string_lossy().to_string())
-            .unwrap_or_else(|| directory.clone());
-
-        let dest = self.install_dir.join(&install_name);
+        let dest = self.install_dir.join(&directory);

        // 若目标目录已存在，则视为已安装，避免重复下载
        if dest.exists() {
@@ -560,8 +487,16 @@ impl SkillService {
            ))
        })??;

-        // 确定源目录路径（技能相对于仓库根目录的路径）
-        let source = temp_dir.join(&directory);
+        // 根据 skills_path 确定源目录路径
+        let source = if let Some(ref skills_path) = repo.skills_path {
+            // 如果指定了 skills_path，源路径为: temp_dir/skills_path/directory
+            temp_dir
+                .join(skills_path.trim_matches('/'))
+                .join(&directory)
+        } else {
+            // 否则源路径为: temp_dir/directory
+            temp_dir.join(&directory)
+        };

        if !source.exists() {
            let _ = fs::remove_dir_all(&temp_dir);
@@ -607,13 +542,7 @@ impl SkillService {

    /// 卸载技能（仅负责文件操作，状态更新由上层负责）
    pub fn uninstall_skill(&self, directory: String) -> Result<()> {
-        // 使用技能目录的最后一段作为安装目录名，与 install_skill 保持一致
-        let install_name = Path::new(&directory)
-            .file_name()
-            .map(|s| s.to_string_lossy().to_string())
-            .unwrap_or_else(|| directory.clone());
-
-        let dest = self.install_dir.join(&install_name);
+        let dest = self.install_dir.join(&directory);

        if dest.exists() {
            fs::remove_dir_all(&dest)?;
@@ -1,12 +1,12 @@
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 use std::fs;
 use std::path::PathBuf;
 use std::sync::{OnceLock, RwLock};

-use crate::app_config::AppType;
 use crate::error::AppError;

-/// 自定义端点配置（历史兼容，实际存储在 provider.meta.custom_endpoints）
+/// 自定义端点配置
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CustomEndpoint {
@@ -16,14 +16,24 @@ pub struct CustomEndpoint {
    pub last_used: Option<i64>,
 }

-/// 应用设置结构
-///
-/// 存储设备级别设置，保存在本地 `~/.cc-switch/settings.json`，不随数据库同步。
-/// 这确保了云同步场景下多设备可以独立运作。
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct SecurityAuthSettings {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub selected_type: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct SecuritySettings {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub auth: Option<SecurityAuthSettings>,
+}
+
+/// 应用设置结构，允许覆盖默认配置目录
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct AppSettings {
-    // ===== 设备级 UI 设置 =====
    #[serde(default = "default_show_in_tray")]
    pub show_in_tray: bool,
    #[serde(default = "default_minimize_to_tray_on_close")]
@@ -31,33 +41,25 @@ pub struct AppSettings {
    /// 是否启用 Claude 插件联动
    #[serde(default)]
    pub enable_claude_plugin_integration: bool,
-    /// 是否跳过 Claude Code 初次安装确认
-    #[serde(default = "default_true")]
-    pub skip_claude_onboarding: bool,
-    /// 是否开机自启
-    #[serde(default)]
-    pub launch_on_startup: bool,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub language: Option<String>,
-
-    // ===== 设备级目录覆盖 =====
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub claude_config_dir: Option<String>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub codex_config_dir: Option<String>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub gemini_config_dir: Option<String>,
-
-    // ===== 当前供应商 ID（设备级）=====
-    /// 当前 Claude 供应商 ID（本地存储，优先于数据库 is_current）
    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub current_provider_claude: Option<String>,
-    /// 当前 Codex 供应商 ID（本地存储，优先于数据库 is_current）
+    pub language: Option<String>,
+    /// 是否开机自启
+    #[serde(default)]
+    pub launch_on_startup: bool,
    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub current_provider_codex: Option<String>,
-    /// 当前 Gemini 供应商 ID（本地存储，优先于数据库 is_current）
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub current_provider_gemini: Option<String>,
+    pub security: Option<SecuritySettings>,
+    /// Claude 自定义端点列表
+    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
+    pub custom_endpoints_claude: HashMap<String, CustomEndpoint>,
+    /// Codex 自定义端点列表
+    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
+    pub custom_endpoints_codex: HashMap<String, CustomEndpoint>,
 }

 fn default_show_in_tray() -> bool {
@@ -68,32 +70,28 @@ fn default_minimize_to_tray_on_close() -> bool {
    true
 }

-fn default_true() -> bool {
-    true
-}
-
 impl Default for AppSettings {
    fn default() -> Self {
        Self {
            show_in_tray: true,
            minimize_to_tray_on_close: true,
            enable_claude_plugin_integration: false,
-            skip_claude_onboarding: true,
-            launch_on_startup: false,
-            language: None,
            claude_config_dir: None,
            codex_config_dir: None,
            gemini_config_dir: None,
-            current_provider_claude: None,
-            current_provider_codex: None,
-            current_provider_gemini: None,
+            language: None,
+            launch_on_startup: false,
+            security: None,
+            custom_endpoints_claude: HashMap::new(),
+            custom_endpoints_codex: HashMap::new(),
        }
    }
 }

 impl AppSettings {
    fn settings_path() -> PathBuf {
-        // settings.json 保留用于旧版本迁移和无数据库场景
+        // settings.json 必须使用固定路径，不能被 app_config_dir 覆盖
+        // 否则会造成循环依赖：读取 settings 需要知道路径，但路径在 settings 中
        dirs::home_dir()
            .expect("无法获取用户主目录")
            .join(".cc-switch")
@@ -126,11 +124,11 @@ impl AppSettings {
            .language
            .as_ref()
            .map(|s| s.trim())
-            .filter(|s| matches!(*s, "en" | "zh" | "ja"))
+            .filter(|s| matches!(*s, "en" | "zh"))
            .map(|s| s.to_string());
    }

-    fn load_from_file() -> Self {
+    pub fn load() -> Self {
        let path = Self::settings_path();
        if let Ok(content) = fs::read_to_string(&path) {
            match serde_json::from_str::<AppSettings>(&content) {
@@ -151,27 +149,26 @@ impl AppSettings {
            Self::default()
        }
    }
-}

-fn save_settings_file(settings: &AppSettings) -> Result<(), AppError> {
-    let mut normalized = settings.clone();
-    normalized.normalize_paths();
-    let path = AppSettings::settings_path();
+    pub fn save(&self) -> Result<(), AppError> {
+        let mut normalized = self.clone();
+        normalized.normalize_paths();
+        let path = Self::settings_path();

-    if let Some(parent) = path.parent() {
-        fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
+        if let Some(parent) = path.parent() {
+            fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
+        }
+
+        let json = serde_json::to_string_pretty(&normalized)
+            .map_err(|e| AppError::JsonSerialize { source: e })?;
+        fs::write(&path, json).map_err(|e| AppError::io(&path, e))?;
+        Ok(())
    }
-
-    let json = serde_json::to_string_pretty(&normalized)
-        .map_err(|e| AppError::JsonSerialize { source: e })?;
-    fs::write(&path, json).map_err(|e| AppError::io(&path, e))?;
-    Ok(())
 }

-static SETTINGS_STORE: OnceLock<RwLock<AppSettings>> = OnceLock::new();
-
 fn settings_store() -> &'static RwLock<AppSettings> {
-    SETTINGS_STORE.get_or_init(|| RwLock::new(AppSettings::load_from_file()))
+    static STORE: OnceLock<RwLock<AppSettings>> = OnceLock::new();
+    STORE.get_or_init(|| RwLock::new(AppSettings::load()))
 }

 fn resolve_override_path(raw: &str) -> PathBuf {
@@ -198,20 +195,32 @@ pub fn get_settings() -> AppSettings {

 pub fn update_settings(mut new_settings: AppSettings) -> Result<(), AppError> {
    new_settings.normalize_paths();
-    save_settings_file(&new_settings)?;
+    new_settings.save()?;

    let mut guard = settings_store().write().expect("写入设置锁失败");
    *guard = new_settings;
    Ok(())
 }

-/// 从文件重新加载设置到内存缓存
-/// 用于导入配置等场景，确保内存缓存与文件同步
-pub fn reload_settings() -> Result<(), AppError> {
-    let fresh_settings = AppSettings::load_from_file();
-    let mut guard = settings_store().write().expect("写入设置锁失败");
-    *guard = fresh_settings;
-    Ok(())
+pub fn ensure_security_auth_selected_type(selected_type: &str) -> Result<(), AppError> {
+    let mut settings = get_settings();
+    let current = settings
+        .security
+        .as_ref()
+        .and_then(|sec| sec.auth.as_ref())
+        .and_then(|auth| auth.selected_type.as_deref());
+
+    if current == Some(selected_type) {
+        return Ok(());
+    }
+
+    let mut security = settings.security.unwrap_or_default();
+    let mut auth = security.auth.unwrap_or_default();
+    auth.selected_type = Some(selected_type.to_string());
+    security.auth = Some(auth);
+    settings.security = Some(security);
+
+    update_settings(settings)
 }

 pub fn get_claude_override_dir() -> Option<PathBuf> {
@@ -237,69 +246,3 @@ pub fn get_gemini_override_dir() -> Option<PathBuf> {
        .as_ref()
        .map(|p| resolve_override_path(p))
 }
-
-// ===== 当前供应商管理函数 =====
-
-/// 获取指定应用类型的当前供应商 ID（从本地 settings 读取）
-///
-/// 这是设备级别的设置，不随数据库同步。
-/// 如果本地没有设置，调用者应该 fallback 到数据库的 `is_current` 字段。
-pub fn get_current_provider(app_type: &AppType) -> Option<String> {
-    let settings = settings_store().read().ok()?;
-    match app_type {
-        AppType::Claude => settings.current_provider_claude.clone(),
-        AppType::Codex => settings.current_provider_codex.clone(),
-        AppType::Gemini => settings.current_provider_gemini.clone(),
-    }
-}
-
-/// 设置指定应用类型的当前供应商 ID（保存到本地 settings）
-///
-/// 这是设备级别的设置，不随数据库同步。
-/// 传入 `None` 会清除当前供应商设置。
-pub fn set_current_provider(app_type: &AppType, id: Option<&str>) -> Result<(), AppError> {
-    let mut settings = get_settings();
-
-    match app_type {
-        AppType::Claude => settings.current_provider_claude = id.map(|s| s.to_string()),
-        AppType::Codex => settings.current_provider_codex = id.map(|s| s.to_string()),
-        AppType::Gemini => settings.current_provider_gemini = id.map(|s| s.to_string()),
-    }
-
-    update_settings(settings)
-}
-
-/// 获取有效的当前供应商 ID（验证存在性）
-///
-/// 逻辑：
-/// 1. 从本地 settings 读取当前供应商 ID
-/// 2. 验证该 ID 在数据库中存在
-/// 3. 如果不存在则清理本地 settings，fallback 到数据库的 is_current
-///
-/// 这确保了返回的 ID 一定是有效的（在数据库中存在）。
-/// 多设备云同步场景下，配置导入后本地 ID 可能失效，此函数会自动修复。
-pub fn get_effective_current_provider(
-    db: &crate::database::Database,
-    app_type: &AppType,
-) -> Result<Option<String>, AppError> {
-    // 1. 从本地 settings 读取
-    if let Some(local_id) = get_current_provider(app_type) {
-        // 2. 验证该 ID 在数据库中存在
-        let providers = db.get_all_providers(app_type.as_str())?;
-        if providers.contains_key(&local_id) {
-            // 存在，直接返回
-            return Ok(Some(local_id));
-        }
-
-        // 3. 不存在，清理本地 settings
-        log::warn!(
-            "本地 settings 中的供应商 {} ({}) 在数据库中不存在，将清理并 fallback 到数据库",
-            local_id,
-            app_type.as_str()
-        );
-        let _ = set_current_provider(app_type, None);
-    }
-
-    // Fallback 到数据库的 is_current
-    db.get_current_provider(app_type.as_str())
-}
@@ -1,14 +1,26 @@
-use crate::database::Database;
-use std::sync::Arc;
+use crate::app_config::MultiAppConfig;
+use crate::error::AppError;
+use std::sync::RwLock;

 /// 全局应用状态
 pub struct AppState {
-    pub db: Arc<Database>,
+    pub config: RwLock<MultiAppConfig>,
 }

 impl AppState {
    /// 创建新的应用状态
-    pub fn new(db: Arc<Database>) -> Self {
-        Self { db }
+    /// 注意：仅在配置成功加载时返回；不会在失败时回退默认值。
+    pub fn try_new() -> Result<Self, AppError> {
+        let config = MultiAppConfig::load()?;
+        Ok(Self {
+            config: RwLock::new(config),
+        })
+    }
+
+    /// 保存配置到文件
+    pub fn save(&self) -> Result<(), AppError> {
+        let config = self.config.read().map_err(AppError::from)?;
+
+        config.save()
    }
 }
@@ -1,300 +0,0 @@
-//! 托盘菜单管理模块
-//!
-//! 负责系统托盘图标和菜单的创建、更新和事件处理。
-
-use tauri::menu::{CheckMenuItem, Menu, MenuBuilder, MenuItem};
-use tauri::{Emitter, Manager};
-
-use crate::app_config::AppType;
-use crate::error::AppError;
-use crate::store::AppState;
-
-/// 托盘菜单文本（国际化）
-#[derive(Clone, Copy)]
-pub struct TrayTexts {
-    pub show_main: &'static str,
-    pub no_provider_hint: &'static str,
-    pub quit: &'static str,
-}
-
-impl TrayTexts {
-    pub fn from_language(language: &str) -> Self {
-        match language {
-            "en" => Self {
-                show_main: "Open main window",
-                no_provider_hint: "  (No providers yet, please add them from the main window)",
-                quit: "Quit",
-            },
-            "ja" => Self {
-                show_main: "メインウィンドウを開く",
-                no_provider_hint:
-                    "  (プロバイダーがまだありません。メイン画面から追加してください)",
-                quit: "終了",
-            },
-            _ => Self {
-                show_main: "打开主界面",
-                no_provider_hint: "  (无供应商，请在主界面添加)",
-                quit: "退出",
-            },
-        }
-    }
-}
-
-/// 托盘应用分区配置
-pub struct TrayAppSection {
-    pub app_type: AppType,
-    pub prefix: &'static str,
-    pub header_id: &'static str,
-    pub empty_id: &'static str,
-    pub header_label: &'static str,
-    pub log_name: &'static str,
-}
-
-pub const TRAY_SECTIONS: [TrayAppSection; 3] = [
-    TrayAppSection {
-        app_type: AppType::Claude,
-        prefix: "claude_",
-        header_id: "claude_header",
-        empty_id: "claude_empty",
-        header_label: "─── Claude ───",
-        log_name: "Claude",
-    },
-    TrayAppSection {
-        app_type: AppType::Codex,
-        prefix: "codex_",
-        header_id: "codex_header",
-        empty_id: "codex_empty",
-        header_label: "─── Codex ───",
-        log_name: "Codex",
-    },
-    TrayAppSection {
-        app_type: AppType::Gemini,
-        prefix: "gemini_",
-        header_id: "gemini_header",
-        empty_id: "gemini_empty",
-        header_label: "─── Gemini ───",
-        log_name: "Gemini",
-    },
-];
-
-/// 添加供应商分区到菜单
-fn append_provider_section<'a>(
-    app: &'a tauri::AppHandle,
-    mut menu_builder: MenuBuilder<'a, tauri::Wry, tauri::AppHandle<tauri::Wry>>,
-    manager: Option<&crate::provider::ProviderManager>,
-    section: &TrayAppSection,
-    tray_texts: &TrayTexts,
-) -> Result<MenuBuilder<'a, tauri::Wry, tauri::AppHandle<tauri::Wry>>, AppError> {
-    let Some(manager) = manager else {
-        return Ok(menu_builder);
-    };
-
-    let header = MenuItem::with_id(
-        app,
-        section.header_id,
-        section.header_label,
-        false,
-        None::<&str>,
-    )
-    .map_err(|e| AppError::Message(format!("创建{}标题失败: {e}", section.log_name)))?;
-    menu_builder = menu_builder.item(&header);
-
-    if manager.providers.is_empty() {
-        let empty_hint = MenuItem::with_id(
-            app,
-            section.empty_id,
-            tray_texts.no_provider_hint,
-            false,
-            None::<&str>,
-        )
-        .map_err(|e| AppError::Message(format!("创建{}空提示失败: {e}", section.log_name)))?;
-        return Ok(menu_builder.item(&empty_hint));
-    }
-
-    let mut sorted_providers: Vec<_> = manager.providers.iter().collect();
-    sorted_providers.sort_by(|(_, a), (_, b)| {
-        match (a.sort_index, b.sort_index) {
-            (Some(idx_a), Some(idx_b)) => return idx_a.cmp(&idx_b),
-            (Some(_), None) => return std::cmp::Ordering::Less,
-            (None, Some(_)) => return std::cmp::Ordering::Greater,
-            _ => {}
-        }
-
-        match (a.created_at, b.created_at) {
-            (Some(time_a), Some(time_b)) => return time_a.cmp(&time_b),
-            (Some(_), None) => return std::cmp::Ordering::Greater,
-            (None, Some(_)) => return std::cmp::Ordering::Less,
-            _ => {}
-        }
-
-        a.name.cmp(&b.name)
-    });
-
-    for (id, provider) in sorted_providers {
-        let is_current = manager.current == *id;
-        let item = CheckMenuItem::with_id(
-            app,
-            format!("{}{}", section.prefix, id),
-            &provider.name,
-            true,
-            is_current,
-            None::<&str>,
-        )
-        .map_err(|e| AppError::Message(format!("创建{}菜单项失败: {e}", section.log_name)))?;
-        menu_builder = menu_builder.item(&item);
-    }
-
-    Ok(menu_builder)
-}
-
-/// 处理供应商托盘事件
-pub fn handle_provider_tray_event(app: &tauri::AppHandle, event_id: &str) -> bool {
-    for section in TRAY_SECTIONS.iter() {
-        if let Some(provider_id) = event_id.strip_prefix(section.prefix) {
-            log::info!("切换到{}供应商: {provider_id}", section.log_name);
-            let app_handle = app.clone();
-            let provider_id = provider_id.to_string();
-            let app_type = section.app_type.clone();
-            tauri::async_runtime::spawn_blocking(move || {
-                if let Err(e) = switch_provider_internal(&app_handle, app_type, provider_id) {
-                    log::error!("切换{}供应商失败: {e}", section.log_name);
-                }
-            });
-            return true;
-        }
-    }
-    false
-}
-
-/// 创建动态托盘菜单
-pub fn create_tray_menu(
-    app: &tauri::AppHandle,
-    app_state: &AppState,
-) -> Result<Menu<tauri::Wry>, AppError> {
-    let app_settings = crate::settings::get_settings();
-    let tray_texts = TrayTexts::from_language(app_settings.language.as_deref().unwrap_or("zh"));
-
-    let mut menu_builder = MenuBuilder::new(app);
-
-    // 顶部：打开主界面
-    let show_main_item =
-        MenuItem::with_id(app, "show_main", tray_texts.show_main, true, None::<&str>)
-            .map_err(|e| AppError::Message(format!("创建打开主界面菜单失败: {e}")))?;
-    menu_builder = menu_builder.item(&show_main_item).separator();
-
-    // 直接添加所有供应商到主菜单（扁平化结构，更简单可靠）
-    for section in TRAY_SECTIONS.iter() {
-        let app_type_str = section.app_type.as_str();
-        let providers = app_state.db.get_all_providers(app_type_str)?;
-
-        // 使用有效的当前供应商 ID（验证存在性，自动清理失效 ID）
-        let current_id =
-            crate::settings::get_effective_current_provider(&app_state.db, &section.app_type)?
-                .unwrap_or_default();
-
-        let manager = crate::provider::ProviderManager {
-            providers,
-            current: current_id,
-        };
-
-        menu_builder =
-            append_provider_section(app, menu_builder, Some(&manager), section, &tray_texts)?;
-    }
-
-    // 分隔符和退出菜单
-    let quit_item = MenuItem::with_id(app, "quit", tray_texts.quit, true, None::<&str>)
-        .map_err(|e| AppError::Message(format!("创建退出菜单失败: {e}")))?;
-
-    menu_builder = menu_builder.separator().item(&quit_item);
-
-    menu_builder
-        .build()
-        .map_err(|e| AppError::Message(format!("构建菜单失败: {e}")))
-}
-
-#[cfg(target_os = "macos")]
-pub fn apply_tray_policy(app: &tauri::AppHandle, dock_visible: bool) {
-    use tauri::ActivationPolicy;
-
-    let desired_policy = if dock_visible {
-        ActivationPolicy::Regular
-    } else {
-        ActivationPolicy::Accessory
-    };
-
-    if let Err(err) = app.set_dock_visibility(dock_visible) {
-        log::warn!("设置 Dock 显示状态失败: {err}");
-    }
-
-    if let Err(err) = app.set_activation_policy(desired_policy) {
-        log::warn!("设置激活策略失败: {err}");
-    }
-}
-
-/// 处理托盘菜单事件
-pub fn handle_tray_menu_event(app: &tauri::AppHandle, event_id: &str) {
-    log::info!("处理托盘菜单事件: {event_id}");
-
-    match event_id {
-        "show_main" => {
-            if let Some(window) = app.get_webview_window("main") {
-                #[cfg(target_os = "windows")]
-                {
-                    let _ = window.set_skip_taskbar(false);
-                }
-                let _ = window.unminimize();
-                let _ = window.show();
-                let _ = window.set_focus();
-                #[cfg(target_os = "macos")]
-                {
-                    apply_tray_policy(app, true);
-                }
-            }
-        }
-        "quit" => {
-            log::info!("退出应用");
-            app.exit(0);
-        }
-        _ => {
-            if handle_provider_tray_event(app, event_id) {
-                return;
-            }
-            log::warn!("未处理的菜单事件: {event_id}");
-        }
-    }
-}
-
-/// 内部切换供应商函数
-pub fn switch_provider_internal(
-    app: &tauri::AppHandle,
-    app_type: AppType,
-    provider_id: String,
-) -> Result<(), AppError> {
-    if let Some(app_state) = app.try_state::<AppState>() {
-        // 在使用前先保存需要的值
-        let app_type_str = app_type.as_str().to_string();
-        let provider_id_clone = provider_id.clone();
-
-        crate::commands::switch_provider(app_state.clone(), app_type_str.clone(), provider_id)
-            .map_err(AppError::Message)?;
-
-        // 切换成功后重新创建托盘菜单
-        if let Ok(new_menu) = 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!("更新托盘菜单失败: {e}");
-                }
-            }
-        }
-
-        // 发射事件到前端，通知供应商已切换
-        let event_data = serde_json::json!({
-            "appType": app_type_str,
-            "providerId": provider_id_clone
-        });
-        if let Err(e) = app.emit("provider-switched", event_data) {
-            log::error!("发射供应商切换事件失败: {e}");
-        }
-    }
-    Ok(())
-}
@@ -1,7 +1,7 @@
 {
  "$schema": "https://schema.tauri.app/config/2",
  "productName": "CC Switch",
-  "version": "3.8.3",
+  "version": "3.7.1",
  "identifier": "com.ccswitch.desktop",
  "build": {
    "frontendDist": "../dist",
@@ -1,36 +1,46 @@
-use std::sync::Arc;
+use std::sync::RwLock;

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

 #[path = "support.rs"]
 mod support;
 use support::{ensure_test_home, reset_test_fs, test_mutex};

 #[test]
-fn deeplink_import_claude_provider_persists_to_db() {
+fn deeplink_import_claude_provider_persists_to_config() {
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();
-    let _home = ensure_test_home();
+    let home = ensure_test_home();

-    let url = "ccswitch://v1/import?resource=provider&app=claude&name=DeepLink%20Claude&homepage=https%3A%2F%2Fexample.com&endpoint=https%3A%2F%2Fapi.example.com%2Fv1&apiKey=sk-test-claude-key&model=claude-sonnet-4&icon=claude";
+    let url = "ccswitch://v1/import?resource=provider&app=claude&name=DeepLink%20Claude&homepage=https%3A%2F%2Fexample.com&endpoint=https%3A%2F%2Fapi.example.com%2Fv1&apiKey=sk-test-claude-key&model=claude-sonnet-4";
    let request = parse_deeplink_url(url).expect("parse deeplink url");

-    let db = Arc::new(Database::memory().expect("create memory db"));
+    let mut config = MultiAppConfig::default();
+    config.ensure_app(&AppType::Claude);

-    let state = AppState { db: db.clone() };
+    let state = AppState {
+        config: RwLock::new(config),
+    };

    let provider_id = import_provider_from_deeplink(&state, request.clone())
        .expect("import provider from deeplink");

-    // Verify DB state
-    let providers = db.get_all_providers("claude").expect("get providers");
-    let provider = providers
+    // 验证内存状态
+    let guard = state.config.read().expect("read config");
+    let manager = guard
+        .get_manager(&AppType::Claude)
+        .expect("claude manager should exist");
+    let provider = manager
+        .providers
        .get(&provider_id)
        .expect("provider created via deeplink");
-
-    assert_eq!(provider.name, request.name.clone().unwrap());
-    assert_eq!(provider.website_url.as_deref(), request.homepage.as_deref());
-    assert_eq!(provider.icon.as_deref(), Some("claude"));
+    assert_eq!(provider.name, request.name);
+    assert_eq!(
+        provider.website_url.as_deref(),
+        Some(request.homepage.as_str())
+    );
    let auth_token = provider
        .settings_config
        .pointer("/env/ANTHROPIC_AUTH_TOKEN")
@@ -39,34 +49,50 @@ fn deeplink_import_claude_provider_persists_to_db() {
        .settings_config
        .pointer("/env/ANTHROPIC_BASE_URL")
        .and_then(|v| v.as_str());
-    assert_eq!(auth_token, request.api_key.as_deref());
-    assert_eq!(base_url, request.endpoint.as_deref());
+    assert_eq!(auth_token, Some(request.api_key.as_str()));
+    assert_eq!(base_url, Some(request.endpoint.as_str()));
+    drop(guard);
+
+    // 验证配置已持久化
+    let config_path = home.join(".cc-switch").join("config.json");
+    assert!(
+        config_path.exists(),
+        "importing provider from deeplink should persist config.json"
+    );
 }

 #[test]
 fn deeplink_import_codex_provider_builds_auth_and_config() {
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();
-    let _home = ensure_test_home();
+    let home = ensure_test_home();

-    let url = "ccswitch://v1/import?resource=provider&app=codex&name=DeepLink%20Codex&homepage=https%3A%2F%2Fopenai.example&endpoint=https%3A%2F%2Fapi.openai.example%2Fv1&apiKey=sk-test-codex-key&model=gpt-4o&icon=openai";
+    let url = "ccswitch://v1/import?resource=provider&app=codex&name=DeepLink%20Codex&homepage=https%3A%2F%2Fopenai.example&endpoint=https%3A%2F%2Fapi.openai.example%2Fv1&apiKey=sk-test-codex-key&model=gpt-4o";
    let request = parse_deeplink_url(url).expect("parse deeplink url");

-    let db = Arc::new(Database::memory().expect("create memory db"));
+    let mut config = MultiAppConfig::default();
+    config.ensure_app(&AppType::Codex);

-    let state = AppState { db: db.clone() };
+    let state = AppState {
+        config: RwLock::new(config),
+    };

    let provider_id = import_provider_from_deeplink(&state, request.clone())
        .expect("import provider from deeplink");

-    let providers = db.get_all_providers("codex").expect("get providers");
-    let provider = providers
+    let guard = state.config.read().expect("read config");
+    let manager = guard
+        .get_manager(&AppType::Codex)
+        .expect("codex manager should exist");
+    let provider = manager
+        .providers
        .get(&provider_id)
        .expect("provider created via deeplink");
-
-    assert_eq!(provider.name, request.name.clone().unwrap());
-    assert_eq!(provider.website_url.as_deref(), request.homepage.as_deref());
-    assert_eq!(provider.icon.as_deref(), Some("openai"));
+    assert_eq!(provider.name, request.name);
+    assert_eq!(
+        provider.website_url.as_deref(),
+        Some(request.homepage.as_str())
+    );
    let auth_value = provider
        .settings_config
        .pointer("/auth/OPENAI_API_KEY")
@@ -76,13 +102,20 @@ fn deeplink_import_codex_provider_builds_auth_and_config() {
        .get("config")
        .and_then(|v| v.as_str())
        .unwrap_or_default();
-    assert_eq!(auth_value, request.api_key.as_deref());
+    assert_eq!(auth_value, Some(request.api_key.as_str()));
    assert!(
-        config_text.contains(request.endpoint.as_deref().unwrap()),
+        config_text.contains(request.endpoint.as_str()),
        "config.toml content should contain endpoint"
    );
    assert!(
        config_text.contains("model = \"gpt-4o\""),
        "config.toml content should contain model setting"
    );
+    drop(guard);
+
+    let config_path = home.join(".cc-switch").join("config.json");
+    assert!(
+        config_path.exists(),
+        "importing provider from deeplink should persist config.json"
+    );
 }
@@ -1,17 +1,15 @@
 use serde_json::json;
-use std::fs;
-use std::path::PathBuf;
+use std::{fs, path::Path, sync::RwLock};
+use tauri::async_runtime;

 use cc_switch_lib::{
-    get_claude_settings_path, read_json_file, AppError, AppType, ConfigService, MultiAppConfig,
-    Provider, ProviderMeta,
+    get_claude_settings_path, read_json_file, AppError, AppState, AppType, ConfigService,
+    MultiAppConfig, Provider, ProviderMeta,
 };

 #[path = "support.rs"]
 mod support;
-use support::{
-    create_test_state, create_test_state_with_config, ensure_test_home, reset_test_fs, test_mutex,
-};
+use support::{ensure_test_home, reset_test_fs, test_mutex};

 #[test]
 fn sync_claude_provider_writes_live_settings() {
@@ -154,12 +152,6 @@ fn sync_enabled_to_codex_writes_enabled_servers() {
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();

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

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

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

    config.mcp.claude.servers.insert(
@@ -824,6 +812,135 @@ fn create_backup_retains_only_latest_entries() {
    );
 }

+#[test]
+fn import_config_from_path_overwrites_state_and_creates_backup() {
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    let config_dir = home.join(".cc-switch");
+    fs::create_dir_all(&config_dir).expect("create config dir");
+    let config_path = config_dir.join("config.json");
+    fs::write(&config_path, r#"{"version":1}"#).expect("seed original config");
+
+    let import_payload = serde_json::json!({
+        "version": 2,
+        "claude": {
+            "providers": {
+                "p-new": {
+                    "id": "p-new",
+                    "name": "Test Claude",
+                    "settingsConfig": {
+                        "env": { "ANTHROPIC_API_KEY": "new-key" }
+                    }
+                }
+            },
+            "current": "p-new"
+        },
+        "codex": {
+            "providers": {},
+            "current": ""
+        },
+        "mcp": {
+            "claude": { "servers": {} },
+            "codex": { "servers": {} }
+        }
+    });
+
+    let import_path = config_dir.join("import.json");
+    fs::write(
+        &import_path,
+        serde_json::to_string_pretty(&import_payload).expect("serialize import payload"),
+    )
+    .expect("write import file");
+
+    let app_state = AppState {
+        config: RwLock::new(MultiAppConfig::default()),
+    };
+
+    let backup_id = ConfigService::import_config_from_path(&import_path, &app_state)
+        .expect("import should succeed");
+    assert!(
+        !backup_id.is_empty(),
+        "expected backup id when original config exists"
+    );
+
+    let backup_path = config_dir.join("backups").join(format!("{backup_id}.json"));
+    assert!(
+        backup_path.exists(),
+        "backup file should exist at {}",
+        backup_path.display()
+    );
+
+    let updated_content = fs::read_to_string(&config_path).expect("read updated config");
+    let parsed: serde_json::Value =
+        serde_json::from_str(&updated_content).expect("parse updated config");
+    assert_eq!(
+        parsed
+            .get("claude")
+            .and_then(|c| c.get("current"))
+            .and_then(|c| c.as_str()),
+        Some("p-new"),
+        "saved config should record new current provider"
+    );
+
+    let guard = app_state.config.read().expect("lock state after import");
+    let claude_manager = guard
+        .get_manager(&AppType::Claude)
+        .expect("claude manager in state");
+    assert_eq!(
+        claude_manager.current, "p-new",
+        "state should reflect new current provider"
+    );
+    assert!(
+        claude_manager.providers.contains_key("p-new"),
+        "new provider should exist in state"
+    );
+}
+
+#[test]
+fn import_config_from_path_invalid_json_returns_error() {
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    let config_dir = home.join(".cc-switch");
+    fs::create_dir_all(&config_dir).expect("create config dir");
+
+    let invalid_path = config_dir.join("broken.json");
+    fs::write(&invalid_path, "{ not-json ").expect("write invalid json");
+
+    let app_state = AppState {
+        config: RwLock::new(MultiAppConfig::default()),
+    };
+
+    let err = ConfigService::import_config_from_path(&invalid_path, &app_state)
+        .expect_err("import should fail");
+    match err {
+        AppError::Json { .. } => {}
+        other => panic!("expected json error, got {other:?}"),
+    }
+}
+
+#[test]
+fn import_config_from_path_missing_file_produces_io_error() {
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let _home = ensure_test_home();
+
+    let missing_path = Path::new("/nonexistent/import.json");
+    let app_state = AppState {
+        config: RwLock::new(MultiAppConfig::default()),
+    };
+
+    let err = ConfigService::import_config_from_path(missing_path, &app_state)
+        .expect_err("import should fail for missing file");
+    match err {
+        AppError::Io { .. } => {}
+        other => panic!("expected io error, got {other:?}"),
+    }
+}
+
 #[test]
 fn sync_gemini_packycode_sets_security_selected_type() {
    let _guard = test_mutex().lock().expect("acquire test mutex");
@@ -855,22 +972,21 @@ fn sync_gemini_packycode_sets_security_selected_type() {
    ConfigService::sync_current_providers_to_live(&mut config)
        .expect("syncing gemini live should succeed");

-    // security field is written to ~/.gemini/settings.json, not ~/.cc-switch/settings.json
-    let gemini_settings = home.join(".gemini").join("settings.json");
+    let settings_path = home.join(".cc-switch").join("settings.json");
    assert!(
-        gemini_settings.exists(),
-        "Gemini settings.json should exist at {}",
-        gemini_settings.display()
+        settings_path.exists(),
+        "settings.json should exist at {}",
+        settings_path.display()
    );

-    let raw = std::fs::read_to_string(&gemini_settings).expect("read gemini settings.json");
-    let value: serde_json::Value = serde_json::from_str(&raw).expect("parse gemini settings.json");
+    let raw = std::fs::read_to_string(&settings_path).expect("read settings.json");
+    let value: serde_json::Value = serde_json::from_str(&raw).expect("parse settings.json");
    assert_eq!(
        value
            .pointer("/security/auth/selectedType")
            .and_then(|v| v.as_str()),
        Some("gemini-api-key"),
-        "syncing PackyCode Gemini should enforce security.auth.selectedType in Gemini settings"
+        "syncing PackyCode Gemini should enforce security.auth.selectedType"
    );
 }

@@ -906,7 +1022,22 @@ fn sync_gemini_google_official_sets_oauth_security() {
    ConfigService::sync_current_providers_to_live(&mut config)
        .expect("syncing google official gemini should succeed");

-    // security field is written to ~/.gemini/settings.json, not ~/.cc-switch/settings.json
+    let cc_settings = home.join(".cc-switch").join("settings.json");
+    assert!(
+        cc_settings.exists(),
+        "app settings should exist at {}",
+        cc_settings.display()
+    );
+    let cc_raw = std::fs::read_to_string(&cc_settings).expect("read .cc-switch settings");
+    let cc_value: serde_json::Value = serde_json::from_str(&cc_raw).expect("parse app settings");
+    assert_eq!(
+        cc_value
+            .pointer("/security/auth/selectedType")
+            .and_then(|v| v.as_str()),
+        Some("oauth-personal"),
+        "syncing Google official should set oauth-personal in app settings"
+    );
+
    let gemini_settings = home.join(".gemini").join("settings.json");
    assert!(
        gemini_settings.exists(),
@@ -921,158 +1052,56 @@ fn sync_gemini_google_official_sets_oauth_security() {
            .pointer("/security/auth/selectedType")
            .and_then(|v| v.as_str()),
        Some("oauth-personal"),
-        "Gemini settings should record oauth-personal for Google Official"
+        "Gemini settings should also record oauth-personal"
    );
 }

 #[test]
-fn export_sql_writes_to_target_path() {
+fn export_config_to_file_writes_target_path() {
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();
    let home = ensure_test_home();

-    // Create test state with some data
-    let mut config = MultiAppConfig::default();
-    {
-        let manager = config
-            .get_manager_mut(&AppType::Claude)
-            .expect("claude manager");
-        manager.current = "test-provider".to_string();
-        manager.providers.insert(
-            "test-provider".to_string(),
-            Provider::with_id(
-                "test-provider".to_string(),
-                "Test Provider".to_string(),
-                json!({"env": {"ANTHROPIC_API_KEY": "test-key"}}),
-                None,
-            ),
-        );
+    let config_dir = home.join(".cc-switch");
+    fs::create_dir_all(&config_dir).expect("create config dir");
+    let config_path = config_dir.join("config.json");
+    fs::write(&config_path, r#"{"version":42,"flag":true}"#).expect("write config");
+
+    let export_path = home.join("exported-config.json");
+    if export_path.exists() {
+        fs::remove_file(&export_path).expect("cleanup export target");
    }

-    let state = create_test_state_with_config(&config).expect("create test state");
+    let result = async_runtime::block_on(cc_switch_lib::export_config_to_file(
+        export_path.to_string_lossy().to_string(),
+    ))
+    .expect("export should succeed");
+    assert_eq!(result.get("success").and_then(|v| v.as_bool()), Some(true));

-    // Export to SQL file
-    let export_path = home.join("test-export.sql");
-    state
-        .db
-        .export_sql(&export_path)
-        .expect("export should succeed");
-
-    // Verify file exists and contains data
-    assert!(export_path.exists(), "export file should exist");
-    let content = fs::read_to_string(&export_path).expect("read exported file");
+    let exported = fs::read_to_string(&export_path).expect("read exported file");
    assert!(
-        content.contains("INSERT INTO") && content.contains("providers"),
-        "exported SQL should contain INSERT statements for providers"
-    );
-    assert!(
-        content.contains("test-provider"),
-        "exported SQL should contain test data"
+        exported.contains(r#""version":42"#) && exported.contains(r#""flag":true"#),
+        "exported file should mirror source config content"
    );
 }

 #[test]
-fn export_sql_returns_error_for_invalid_path() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let _home = ensure_test_home();
-
-    let state = create_test_state().expect("create test state");
-
-    // Try to export to an invalid path (parent directory doesn't exist)
-    let invalid_path = PathBuf::from("/nonexistent/directory/export.sql");
-    let err = state
-        .db
-        .export_sql(&invalid_path)
-        .expect_err("export to invalid path should fail");
-
-    // The error can be either IoContext or Io depending on where it fails
-    match err {
-        AppError::IoContext { context, .. } => {
-            assert!(
-                context.contains("原子写入失败") || context.contains("写入失败"),
-                "expected IO error message about atomic write failure, got: {context}"
-            );
-        }
-        AppError::Io { path, .. } => {
-            assert!(
-                path.starts_with("/nonexistent"),
-                "expected error for /nonexistent path, got: {path:?}"
-            );
-        }
-        other => panic!("expected IoContext or Io error, got {other:?}"),
-    }
-}
-
-#[test]
-fn import_sql_rejects_non_cc_switch_backup() {
+fn export_config_to_file_returns_error_when_source_missing() {
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();
    let home = ensure_test_home();

-    let state = create_test_state().expect("create test state");
-
-    let import_path = home.join("not-cc-switch.sql");
-    fs::write(&import_path, "CREATE TABLE x (id INTEGER);").expect("write import sql");
-
-    let err = state
-        .db
-        .import_sql(&import_path)
-        .expect_err("non-cc-switch sql should be rejected");
-
-    match err {
-        AppError::Localized { key, .. } => {
-            assert_eq!(key, "backup.sql.invalid_format");
-        }
-        other => panic!("expected Localized error, got {other:?}"),
-    }
-}
-
-#[test]
-fn import_sql_accepts_cc_switch_exported_backup() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // Create a database with some data and export it.
-    let mut config = MultiAppConfig::default();
-    {
-        let manager = config
-            .get_manager_mut(&AppType::Claude)
-            .expect("claude manager");
-        manager.current = "test-provider".to_string();
-        manager.providers.insert(
-            "test-provider".to_string(),
-            Provider::with_id(
-                "test-provider".to_string(),
-                "Test Provider".to_string(),
-                json!({"env": {"ANTHROPIC_API_KEY": "test-key"}}),
-                None,
-            ),
-        );
+    let export_path = home.join("export-missing.json");
+    if export_path.exists() {
+        fs::remove_file(&export_path).expect("cleanup export target");
    }

-    let state = create_test_state_with_config(&config).expect("create test state");
-    let export_path = home.join("cc-switch-export.sql");
-    state
-        .db
-        .export_sql(&export_path)
-        .expect("export should succeed");
-
-    // Reset database, then import into a fresh one.
-    reset_test_fs();
-    let state = create_test_state().expect("create test state");
-    state
-        .db
-        .import_sql(&export_path)
-        .expect("import should succeed");
-
-    let providers = state
-        .db
-        .get_all_providers(AppType::Claude.as_str())
-        .expect("load providers");
+    let err = async_runtime::block_on(cc_switch_lib::export_config_to_file(
+        export_path.to_string_lossy().to_string(),
+    ))
+    .expect_err("export should fail when config.json missing");
    assert!(
-        providers.contains_key("test-provider"),
-        "imported providers should contain test-provider"
+        err.contains("IO 错误"),
+        "expected IO error message, got {err}"
    );
 }
@@ -1,16 +1,15 @@
-use std::collections::HashMap;
-use std::fs;
+use std::{collections::HashMap, fs, sync::RwLock};

 use serde_json::json;

 use cc_switch_lib::{
    get_claude_mcp_path, get_claude_settings_path, import_default_config_test_hook, AppError,
-    AppType, McpApps, McpServer, McpService, MultiAppConfig,
+    AppState, AppType, McpApps, McpServer, McpService, MultiAppConfig,
 };

 #[path = "support.rs"]
 mod support;
-use support::{create_test_state_with_config, ensure_test_home, reset_test_fs, test_mutex};
+use support::{ensure_test_home, reset_test_fs, test_mutex};

 #[test]
 fn import_default_config_claude_persists_provider() {
@@ -36,44 +35,43 @@ fn import_default_config_claude_persists_provider() {

    let mut config = MultiAppConfig::default();
    config.ensure_app(&AppType::Claude);
-    let state = create_test_state_with_config(&config).expect("create test state");
+    let state = AppState {
+        config: RwLock::new(config),
+    };

    import_default_config_test_hook(&state, AppType::Claude)
        .expect("import default config succeeds");

    // 验证内存状态
-    let providers = state
-        .db
-        .get_all_providers(AppType::Claude.as_str())
-        .expect("get all providers");
-    let current_id = state
-        .db
-        .get_current_provider(AppType::Claude.as_str())
-        .expect("get current provider");
-    assert_eq!(current_id.as_deref(), Some("default"));
-    let default_provider = providers.get("default").expect("default provider");
+    let guard = state.config.read().expect("lock config");
+    let manager = guard
+        .get_manager(&AppType::Claude)
+        .expect("claude manager present");
+    assert_eq!(manager.current, "default");
+    let default_provider = manager.providers.get("default").expect("default provider");
    assert_eq!(
        default_provider.settings_config, settings,
        "default provider should capture live settings"
    );
+    drop(guard);

-    // 验证数据已持久化到数据库（v3.7.0+ 使用 SQLite 而非 config.json）
-    let db_path = home.join(".cc-switch").join("cc-switch.db");
+    // 验证配置已持久化
+    let config_path = home.join(".cc-switch").join("config.json");
    assert!(
-        db_path.exists(),
-        "importing default config should persist to cc-switch.db"
+        config_path.exists(),
+        "importing default config should persist config.json"
    );
 }

 #[test]
 fn import_default_config_without_live_file_returns_error() {
-    use support::create_test_state;
-
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();
-    let _home = ensure_test_home();
+    let home = ensure_test_home();

-    let state = create_test_state().expect("create test state");
+    let state = AppState {
+        config: RwLock::new(MultiAppConfig::default()),
+    };

    let err = import_default_config_test_hook(&state, AppType::Claude)
        .expect_err("missing live file should error");
@@ -89,15 +87,10 @@ fn import_default_config_without_live_file_returns_error() {
        other => panic!("unexpected error variant: {other:?}"),
    }

-    // 使用数据库架构，不再检查 config.json
-    // 失败的导入不应该向数据库写入任何供应商
-    let providers = state
-        .db
-        .get_all_providers(AppType::Claude.as_str())
-        .expect("get all providers");
+    let config_path = home.join(".cc-switch").join("config.json");
    assert!(
-        providers.is_empty(),
-        "failed import should not create any providers in database"
+        !config_path.exists(),
+        "failed import should not create config.json"
    );
 }

@@ -122,8 +115,9 @@ fn import_mcp_from_claude_creates_config_and_enables_servers() {
    )
    .expect("seed ~/.claude.json");

-    let config = MultiAppConfig::default();
-    let state = create_test_state_with_config(&config).expect("create test state");
+    let state = AppState {
+        config: RwLock::new(MultiAppConfig::default()),
+    };

    let changed = McpService::import_from_claude(&state).expect("import mcp from claude succeeds");
    assert!(
@@ -131,7 +125,13 @@ fn import_mcp_from_claude_creates_config_and_enables_servers() {
        "import should report inserted or normalized entries"
    );

-    let servers = state.db.get_all_mcp_servers().expect("get all mcp servers");
+    let guard = state.config.read().expect("lock config");
+    // v3.7.0: 检查统一结构
+    let servers = guard
+        .mcp
+        .servers
+        .as_ref()
+        .expect("unified servers should exist");
    let entry = servers
        .get("echo")
        .expect("server imported into unified structure");
@@ -139,28 +139,28 @@ fn import_mcp_from_claude_creates_config_and_enables_servers() {
        entry.apps.claude,
        "imported server should have Claude app enabled"
    );
+    drop(guard);

-    // 验证数据已持久化到数据库
-    let db_path = home.join(".cc-switch").join("cc-switch.db");
+    let config_path = home.join(".cc-switch").join("config.json");
    assert!(
-        db_path.exists(),
-        "state.save should persist to cc-switch.db when changes detected"
+        config_path.exists(),
+        "state.save should persist config.json when changes detected"
    );
 }

 #[test]
 fn import_mcp_from_claude_invalid_json_preserves_state() {
-    use support::create_test_state;
-
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();
-    let _home = ensure_test_home();
+    let home = ensure_test_home();

    let mcp_path = get_claude_mcp_path();
    fs::write(&mcp_path, "{\"mcpServers\":") // 不完整 JSON
        .expect("seed invalid ~/.claude.json");

-    let state = create_test_state().expect("create test state");
+    let state = AppState {
+        config: RwLock::new(MultiAppConfig::default()),
+    };

    let err =
        McpService::import_from_claude(&state).expect_err("invalid json should bubble up error");
@@ -172,11 +172,10 @@ fn import_mcp_from_claude_invalid_json_preserves_state() {
        other => panic!("unexpected error variant: {other:?}"),
    }

-    // 使用数据库架构，检查 MCP 服务器未被写入
-    let servers = state.db.get_all_mcp_servers().expect("get all mcp servers");
+    let config_path = home.join(".cc-switch").join("config.json");
    assert!(
-        servers.is_empty(),
-        "failed import should not persist any MCP servers to database"
+        !config_path.exists(),
+        "failed import should not persist config.json"
    );
 }

@@ -222,18 +221,27 @@ fn set_mcp_enabled_for_codex_writes_live_config() {
        },
    );

-    let state = create_test_state_with_config(&config).expect("create test state");
+    let state = AppState {
+        config: RwLock::new(config),
+    };

    // v3.7.0: 使用 toggle_app 替代 set_enabled
    McpService::toggle_app(&state, "codex-server", AppType::Codex, true)
        .expect("toggle_app should succeed");

-    let servers = state.db.get_all_mcp_servers().expect("get all mcp servers");
-    let entry = servers.get("codex-server").expect("codex server exists");
+    let guard = state.config.read().expect("lock config");
+    let entry = guard
+        .mcp
+        .servers
+        .as_ref()
+        .unwrap()
+        .get("codex-server")
+        .expect("codex server exists");
    assert!(
        entry.apps.codex,
        "server should have Codex app enabled after toggle"
    );
+    drop(guard);

    let toml_path = cc_switch_lib::get_codex_config_path();
    assert!(
@@ -246,311 +254,3 @@ fn set_mcp_enabled_for_codex_writes_live_config() {
        "codex config should include the enabled server definition"
    );
 }
-
-#[test]
-fn enabling_codex_mcp_skips_when_codex_dir_missing() {
-    use support::create_test_state;
-
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 确认 Codex 配置目录不存在（模拟“未安装/未运行过 Codex CLI”）
-    assert!(
-        !home.join(".codex").exists(),
-        "~/.codex should not exist in fresh test environment"
-    );
-
-    let state = create_test_state().expect("create test state");
-
-    // 先插入一个未启用 Codex 的 MCP 服务器（避免 upsert 触发同步）
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "codex-server".to_string(),
-            name: "Codex Server".to_string(),
-            server: json!({
-                "type": "stdio",
-                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("insert server without syncing");
-
-    // 启用 Codex：目录缺失时应跳过写入（不创建 ~/.codex/config.toml）
-    McpService::toggle_app(&state, "codex-server", AppType::Codex, true)
-        .expect("toggle codex should succeed even when ~/.codex is missing");
-
-    assert!(
-        !home.join(".codex").exists(),
-        "~/.codex should still not exist after skipped sync"
-    );
-}
-
-#[test]
-fn upsert_mcp_server_disabling_app_removes_from_claude_live_config() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 模拟 Claude 已安装/已初始化：存在 ~/.claude 目录
-    fs::create_dir_all(home.join(".claude")).expect("create ~/.claude dir");
-
-    // 先创建一个启用 Claude 的 MCP 服务器
-    let state = support::create_test_state().expect("create test state");
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "echo".to_string(),
-            name: "echo".to_string(),
-            server: json!({
-                "type": "stdio",
-                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: true,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("upsert should sync to Claude live config");
-
-    // 确认已写入 ~/.claude.json
-    let mcp_path = get_claude_mcp_path();
-    let text = fs::read_to_string(&mcp_path).expect("read ~/.claude.json");
-    let v: serde_json::Value = serde_json::from_str(&text).expect("parse ~/.claude.json");
-    assert!(
-        v.pointer("/mcpServers/echo").is_some(),
-        "echo should exist in Claude live config after enabling"
-    );
-
-    // 再次 upsert：取消勾选 Claude（apps.claude=false），应从 Claude live 配置中移除
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "echo".to_string(),
-            name: "echo".to_string(),
-            server: json!({
-                "type": "stdio",
-                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("upsert disabling app should remove from Claude live config");
-
-    let text = fs::read_to_string(&mcp_path).expect("read ~/.claude.json after disable");
-    let v: serde_json::Value = serde_json::from_str(&text).expect("parse ~/.claude.json");
-    assert!(
-        v.pointer("/mcpServers/echo").is_none(),
-        "echo should be removed from Claude live config after disabling"
-    );
-}
-
-#[test]
-fn import_mcp_from_multiple_apps_merges_enabled_flags() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 1) Claude: ~/.claude.json
-    let mcp_path = get_claude_mcp_path();
-    let claude_json = json!({
-        "mcpServers": {
-            "shared": {
-                "type": "stdio",
-                "command": "echo"
-            }
-        }
-    });
-    fs::write(
-        &mcp_path,
-        serde_json::to_string_pretty(&claude_json).expect("serialize claude mcp"),
-    )
-    .expect("seed ~/.claude.json");
-
-    // 2) Codex: ~/.codex/config.toml
-    let codex_dir = home.join(".codex");
-    fs::create_dir_all(&codex_dir).expect("create codex dir");
-    fs::write(
-        codex_dir.join("config.toml"),
-        r#"[mcp_servers.shared]
-type = "stdio"
-command = "echo"
-"#,
-    )
-    .expect("seed ~/.codex/config.toml");
-
-    let state = support::create_test_state().expect("create test state");
-
-    McpService::import_from_claude(&state).expect("import from claude");
-    McpService::import_from_codex(&state).expect("import from codex");
-
-    let servers = state.db.get_all_mcp_servers().expect("get all mcp servers");
-    let entry = servers.get("shared").expect("shared server exists");
-    assert!(entry.apps.claude, "shared should enable Claude");
-    assert!(entry.apps.codex, "shared should enable Codex");
-}
-
-#[test]
-fn import_mcp_from_gemini_sse_url_only_is_valid() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // Gemini MCP 位于 ~/.gemini/settings.json
-    let gemini_dir = home.join(".gemini");
-    fs::create_dir_all(&gemini_dir).expect("create gemini dir");
-    let settings_path = gemini_dir.join("settings.json");
-
-    // Gemini SSE：只包含 url（Gemini 不使用 type 字段）
-    let gemini_settings = json!({
-        "mcpServers": {
-            "sse-server": {
-                "url": "https://example.com/sse"
-            }
-        }
-    });
-    fs::write(
-        &settings_path,
-        serde_json::to_string_pretty(&gemini_settings).expect("serialize gemini settings"),
-    )
-    .expect("seed ~/.gemini/settings.json");
-
-    let state = support::create_test_state().expect("create test state");
-    let changed = McpService::import_from_gemini(&state).expect("import from gemini");
-    assert!(changed > 0, "should import at least 1 server");
-
-    let servers = state.db.get_all_mcp_servers().expect("get all mcp servers");
-    let entry = servers.get("sse-server").expect("sse-server exists");
-    assert!(entry.apps.gemini, "imported server should enable Gemini");
-    assert_eq!(
-        entry.server.get("type").and_then(|v| v.as_str()),
-        Some("sse"),
-        "Gemini url-only server should be normalized to type=sse in unified structure"
-    );
-}
-
-#[test]
-fn enabling_gemini_mcp_skips_when_gemini_dir_missing() {
-    use support::create_test_state;
-
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 确认 Gemini 配置目录不存在（模拟“未安装/未运行过 Gemini CLI”）
-    assert!(
-        !home.join(".gemini").exists(),
-        "~/.gemini should not exist in fresh test environment"
-    );
-
-    let state = create_test_state().expect("create test state");
-
-    // 先插入一个未启用 Gemini 的 MCP 服务器（避免 upsert 触发同步）
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "gemini-server".to_string(),
-            name: "Gemini Server".to_string(),
-            server: json!({
-                "type": "sse",
-                "url": "https://example.com/sse"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("insert server without syncing");
-
-    // 启用 Gemini：目录缺失时应跳过写入（不创建 ~/.gemini/settings.json）
-    McpService::toggle_app(&state, "gemini-server", AppType::Gemini, true)
-        .expect("toggle gemini should succeed even when ~/.gemini is missing");
-
-    assert!(
-        !home.join(".gemini").exists(),
-        "~/.gemini should still not exist after skipped sync"
-    );
-}
-
-#[test]
-fn enabling_claude_mcp_skips_when_claude_config_absent() {
-    use support::create_test_state;
-
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let home = ensure_test_home();
-
-    // 确认 Claude 相关目录/文件都不存在（模拟“未安装/未运行过 Claude”）
-    assert!(
-        !home.join(".claude").exists(),
-        "~/.claude should not exist in fresh test environment"
-    );
-    assert!(
-        !home.join(".claude.json").exists(),
-        "~/.claude.json should not exist in fresh test environment"
-    );
-
-    let state = create_test_state().expect("create test state");
-
-    // 先插入一个未启用 Claude 的 MCP 服务器（避免 upsert 触发同步）
-    McpService::upsert_server(
-        &state,
-        McpServer {
-            id: "claude-server".to_string(),
-            name: "Claude Server".to_string(),
-            server: json!({
-                "type": "stdio",
-                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: false,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
-    )
-    .expect("insert server without syncing");
-
-    // 启用 Claude：配置缺失时应跳过写入（不创建 ~/.claude.json）
-    McpService::toggle_app(&state, "claude-server", AppType::Claude, true)
-        .expect("toggle claude should succeed even when ~/.claude is missing");
-
-    assert!(
-        !home.join(".claude.json").exists(),
-        "~/.claude.json should still not exist after skipped sync"
-    );
-}
@@ -1,14 +1,14 @@
 use serde_json::json;
+use std::sync::RwLock;

 use cc_switch_lib::{
    get_codex_auth_path, get_codex_config_path, read_json_file, switch_provider_test_hook,
-    write_codex_live_atomic, AppError, AppType, McpApps, McpServer, MultiAppConfig, Provider,
+    write_codex_live_atomic, AppError, AppState, AppType, MultiAppConfig, Provider,
 };

 #[path = "support.rs"]
 mod support;
-use std::collections::HashMap;
-use support::{create_test_state_with_config, ensure_test_home, reset_test_fs, test_mutex};
+use support::{ensure_test_home, reset_test_fs, test_mutex};

 #[test]
 fn switch_provider_updates_codex_live_and_state() {
@@ -59,30 +59,21 @@ command = "say"
        );
    }

-    // v3.7.0+: 使用统一的 MCP 结构
-    config.mcp.servers = Some(HashMap::new());
-    config.mcp.servers.as_mut().unwrap().insert(
+    config.mcp.codex.servers.insert(
        "echo-server".into(),
-        McpServer {
-            id: "echo-server".to_string(),
-            name: "Echo Server".to_string(),
-            server: json!({
+        json!({
+            "id": "echo-server",
+            "enabled": true,
+            "server": {
                "type": "stdio",
                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: true, // 启用 Codex
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
+            }
+        }),
    );

-    let app_state = create_test_state_with_config(&config).expect("create test state");
+    let app_state = AppState {
+        config: RwLock::new(config),
+    };

    switch_provider_test_hook(&app_state, AppType::Codex, "new-provider")
        .expect("switch provider should succeed");
@@ -104,39 +95,28 @@ command = "say"
        "config.toml should contain synced MCP servers"
    );

-    let current_id = app_state
-        .db
-        .get_current_provider(AppType::Codex.as_str())
-        .expect("get current provider");
-    assert_eq!(
-        current_id.as_deref(),
-        Some("new-provider"),
-        "current provider updated"
-    );
+    let locked = app_state.config.read().expect("lock config after switch");
+    let manager = locked
+        .get_manager(&AppType::Codex)
+        .expect("codex manager after switch");
+    assert_eq!(manager.current, "new-provider", "current provider updated");

-    let providers = app_state
-        .db
-        .get_all_providers(AppType::Codex.as_str())
-        .expect("get all providers");
-
-    let new_provider = providers.get("new-provider").expect("new provider exists");
+    let new_provider = manager
+        .providers
+        .get("new-provider")
+        .expect("new provider exists");
    let new_config_text = new_provider
        .settings_config
        .get("config")
        .and_then(|v| v.as_str())
        .unwrap_or_default();
-    // 供应商配置应该包含在 live 文件中
-    // 注意：live 文件还会包含 MCP 同步后的内容
-    assert!(
-        config_text.contains("mcp_servers.latest"),
-        "live file should contain provider's original config"
-    );
-    assert!(
-        new_config_text.contains("mcp_servers.latest"),
-        "provider snapshot should contain provider's original config"
+    assert_eq!(
+        new_config_text, config_text,
+        "provider config snapshot should match live file"
    );

-    let legacy = providers
+    let legacy = manager
+        .providers
        .get("old-provider")
        .expect("legacy provider still exists");
    let legacy_auth_value = legacy
@@ -145,8 +125,6 @@ command = "say"
        .and_then(|v| v.get("OPENAI_API_KEY"))
        .and_then(|v| v.as_str())
        .unwrap_or("");
-    // 回填机制：切换前会将 live 配置回填到当前供应商
-    // 这保护了用户在 live 文件中的手动修改
    assert_eq!(
        legacy_auth_value, "legacy-key",
        "previous provider should be backfilled with live auth"
@@ -164,17 +142,16 @@ fn switch_provider_missing_provider_returns_error() {
        .expect("claude manager")
        .current = "does-not-exist".to_string();

-    let app_state = create_test_state_with_config(&config).expect("create test state");
+    let app_state = AppState {
+        config: RwLock::new(config),
+    };

    let err = switch_provider_test_hook(&app_state, AppType::Claude, "missing-provider")
        .expect_err("switching to a missing provider should fail");

-    let err_str = err.to_string();
    assert!(
-        err_str.contains("供应商不存在")
-            || err_str.contains("Provider not found")
-            || err_str.contains("missing-provider"),
-        "error message should mention missing provider, got: {err_str}"
+        err.to_string().contains("供应商不存在"),
+        "error message should mention missing provider"
    );
 }

@@ -233,7 +210,9 @@ fn switch_provider_updates_claude_live_and_state() {
        );
    }

-    let app_state = create_test_state_with_config(&config).expect("create test state");
+    let app_state = AppState {
+        config: RwLock::new(config),
+    };

    switch_provider_test_hook(&app_state, AppType::Claude, "new-provider")
        .expect("switch provider should succeed");
@@ -249,32 +228,25 @@ fn switch_provider_updates_claude_live_and_state() {
        "live settings.json should reflect new provider auth"
    );

-    let current_id = app_state
-        .db
-        .get_current_provider(AppType::Claude.as_str())
-        .expect("get current provider");
-    assert_eq!(
-        current_id.as_deref(),
-        Some("new-provider"),
-        "current provider updated"
-    );
+    let locked = app_state.config.read().expect("lock config after switch");
+    let manager = locked
+        .get_manager(&AppType::Claude)
+        .expect("claude manager after switch");
+    assert_eq!(manager.current, "new-provider", "current provider updated");

-    let providers = app_state
-        .db
-        .get_all_providers(AppType::Claude.as_str())
-        .expect("get all providers");
-
-    let legacy_provider = providers
+    let legacy_provider = manager
+        .providers
        .get("old-provider")
        .expect("legacy provider still exists");
-    // 回填机制：切换前会将 live 配置回填到当前供应商
-    // 这保护了用户在 live 文件中的手动修改
    assert_eq!(
        legacy_provider.settings_config, legacy_live,
-        "previous provider should be backfilled with live config"
+        "previous provider should receive backfilled live config"
    );

-    let new_provider = providers.get("new-provider").expect("new provider exists");
+    let new_provider = manager
+        .providers
+        .get("new-provider")
+        .expect("new provider exists");
    assert_eq!(
        new_provider
            .settings_config
@@ -285,26 +257,26 @@ fn switch_provider_updates_claude_live_and_state() {
        "new provider snapshot should retain fresh auth"
    );

-    // v3.7.0+ 使用 SQLite 数据库而非 config.json
-    // 验证数据已持久化到数据库
-    let home_dir = std::env::var("HOME").expect("HOME should be set by ensure_test_home");
-    let db_path = std::path::Path::new(&home_dir)
-        .join(".cc-switch")
-        .join("cc-switch.db");
-    assert!(
-        db_path.exists(),
-        "switching provider should persist to cc-switch.db"
-    );
+    drop(locked);

-    // 验证当前供应商已更新
-    let current_id = app_state
-        .db
-        .get_current_provider(AppType::Claude.as_str())
-        .expect("get current provider");
+    let home_dir = std::env::var("HOME").expect("HOME should be set by ensure_test_home");
+    let config_path = std::path::Path::new(&home_dir)
+        .join(".cc-switch")
+        .join("config.json");
+    assert!(
+        config_path.exists(),
+        "switching provider should persist config.json"
+    );
+    let persisted: serde_json::Value =
+        serde_json::from_str(&std::fs::read_to_string(&config_path).expect("read saved config"))
+            .expect("parse saved config");
    assert_eq!(
-        current_id.as_deref(),
+        persisted
+            .get("claude")
+            .and_then(|claude| claude.get("current"))
+            .and_then(|current| current.as_str()),
        Some("new-provider"),
-        "database should record the new current provider"
+        "saved config.json should record the new current provider"
    );
 }

@@ -332,7 +304,9 @@ fn switch_provider_codex_missing_auth_returns_error_and_keeps_state() {
        );
    }

-    let app_state = create_test_state_with_config(&config).expect("create test state");
+    let app_state = AppState {
+        config: RwLock::new(config),
+    };

    let err = switch_provider_test_hook(&app_state, AppType::Codex, "invalid")
        .expect_err("switching should fail when auth missing");
@@ -344,15 +318,10 @@ fn switch_provider_codex_missing_auth_returns_error_and_keeps_state() {
        other => panic!("expected config error, got {other:?}"),
    }

-    let current_id = app_state
-        .db
-        .get_current_provider(AppType::Codex.as_str())
-        .expect("get current provider");
-    // 切换失败后，由于数据库操作是先设置再验证，current 可能已被设为 "invalid"
-    // 但由于 live 配置写入失败，状态应该回滚
-    // 注意：这个行为取决于 switch_provider 的具体实现
+    let locked = app_state.config.read().expect("lock config after failure");
+    let manager = locked.get_manager(&AppType::Codex).expect("codex manager");
    assert!(
-        current_id.is_none() || current_id.as_deref() == Some("invalid"),
-        "current provider should remain empty or be the attempted id on failure, got: {current_id:?}"
+        manager.current.is_empty(),
+        "current provider should remain empty on failure"
    );
 }
@@ -1,15 +1,14 @@
 use serde_json::json;
+use std::sync::RwLock;

 use cc_switch_lib::{
-    get_claude_settings_path, read_json_file, write_codex_live_atomic, AppError, AppType, McpApps,
-    McpServer, MultiAppConfig, Provider, ProviderMeta, ProviderService,
+    get_claude_settings_path, read_json_file, write_codex_live_atomic, AppError, AppState, AppType,
+    MultiAppConfig, Provider, ProviderMeta, ProviderService,
 };

 #[path = "support.rs"]
 mod support;
-use support::{
-    create_test_state, create_test_state_with_config, ensure_test_home, reset_test_fs, test_mutex,
-};
+use support::{ensure_test_home, reset_test_fs, test_mutex};

 fn sanitize_provider_name(name: &str) -> String {
    name.chars()
@@ -70,33 +69,21 @@ command = "say"
        );
    }

-    // 使用新的统一 MCP 结构（v3.7.0+）
-    let servers = initial_config
-        .mcp
-        .servers
-        .get_or_insert_with(Default::default);
-    servers.insert(
+    initial_config.mcp.codex.servers.insert(
        "echo-server".into(),
-        McpServer {
-            id: "echo-server".into(),
-            name: "Echo Server".into(),
-            server: json!({
+        json!({
+            "id": "echo-server",
+            "enabled": true,
+            "server": {
                "type": "stdio",
                "command": "echo"
-            }),
-            apps: McpApps {
-                claude: false,
-                codex: true,
-                gemini: false,
-            },
-            description: None,
-            homepage: None,
-            docs: None,
-            tags: Vec::new(),
-        },
+            }
+        }),
    );

-    let state = create_test_state_with_config(&initial_config).expect("create test state");
+    let state = AppState {
+        config: RwLock::new(initial_config),
+    };

    ProviderService::switch(&state, AppType::Codex, "new-provider")
        .expect("switch provider should succeed");
@@ -116,39 +103,28 @@ command = "say"
        "config.toml should contain synced MCP servers"
    );

-    let current_id = state
-        .db
-        .get_current_provider(AppType::Codex.as_str())
-        .expect("read current provider after switch");
-    assert_eq!(
-        current_id.as_deref(),
-        Some("new-provider"),
-        "current provider updated"
-    );
+    let guard = state.config.read().expect("read config after switch");
+    let manager = guard
+        .get_manager(&AppType::Codex)
+        .expect("codex manager after switch");
+    assert_eq!(manager.current, "new-provider", "current provider updated");

-    let providers = state
-        .db
-        .get_all_providers(AppType::Codex.as_str())
-        .expect("read providers after switch");
-
-    let new_provider = providers.get("new-provider").expect("new provider exists");
+    let new_provider = manager
+        .providers
+        .get("new-provider")
+        .expect("new provider exists");
    let new_config_text = new_provider
        .settings_config
        .get("config")
        .and_then(|v| v.as_str())
        .unwrap_or_default();
-    // provider 存储的是原始配置，不包含 MCP 同步后的内容
-    assert!(
-        new_config_text.contains("mcp_servers.latest"),
-        "provider config should contain original MCP servers"
-    );
-    // live 文件额外包含同步的 MCP 服务器
-    assert!(
-        config_text.contains("mcp_servers.echo-server"),
-        "live config should include synced MCP servers"
+    assert_eq!(
+        new_config_text, config_text,
+        "provider config snapshot should match live file"
    );

-    let legacy = providers
+    let legacy = manager
+        .providers
        .get("old-provider")
        .expect("legacy provider still exists");
    let legacy_auth_value = legacy
@@ -191,21 +167,22 @@ fn switch_packycode_gemini_updates_security_selected_type() {
        );
    }

-    let state = create_test_state_with_config(&config).expect("create test state");
+    let state = AppState {
+        config: RwLock::new(config),
+    };

    ProviderService::switch(&state, AppType::Gemini, "packy-gemini")
        .expect("switching to PackyCode Gemini should succeed");

-    // Gemini security settings are written to ~/.gemini/settings.json, not ~/.cc-switch/settings.json
-    let settings_path = home.join(".gemini").join("settings.json");
+    let settings_path = home.join(".cc-switch").join("settings.json");
    assert!(
        settings_path.exists(),
-        "Gemini settings.json should exist at {}",
+        "settings.json should exist at {}",
        settings_path.display()
    );
-    let raw = std::fs::read_to_string(&settings_path).expect("read gemini settings.json");
+    let raw = std::fs::read_to_string(&settings_path).expect("read settings.json");
    let value: serde_json::Value =
-        serde_json::from_str(&raw).expect("parse gemini settings.json after switch");
+        serde_json::from_str(&raw).expect("parse settings.json after switch");

    assert_eq!(
        value
@@ -246,21 +223,22 @@ fn packycode_partner_meta_triggers_security_flag_even_without_keywords() {
        manager.providers.insert("packy-meta".to_string(), provider);
    }

-    let state = create_test_state_with_config(&config).expect("create test state");
+    let state = AppState {
+        config: RwLock::new(config),
+    };

    ProviderService::switch(&state, AppType::Gemini, "packy-meta")
        .expect("switching to partner meta provider should succeed");

-    // Gemini security settings are written to ~/.gemini/settings.json, not ~/.cc-switch/settings.json
-    let settings_path = home.join(".gemini").join("settings.json");
+    let settings_path = home.join(".cc-switch").join("settings.json");
    assert!(
        settings_path.exists(),
-        "Gemini settings.json should exist at {}",
+        "settings.json should exist at {}",
        settings_path.display()
    );
-    let raw = std::fs::read_to_string(&settings_path).expect("read gemini settings.json");
+    let raw = std::fs::read_to_string(&settings_path).expect("read settings.json");
    let value: serde_json::Value =
-        serde_json::from_str(&raw).expect("parse gemini settings.json after switch");
+        serde_json::from_str(&raw).expect("parse settings.json after switch");

    assert_eq!(
        value
@@ -300,12 +278,30 @@ fn switch_google_official_gemini_sets_oauth_security() {
            .insert("google-official".to_string(), provider);
    }

-    let state = create_test_state_with_config(&config).expect("create test state");
+    let state = AppState {
+        config: RwLock::new(config),
+    };

    ProviderService::switch(&state, AppType::Gemini, "google-official")
        .expect("switching to Google official Gemini should succeed");

-    // Gemini security settings are written to ~/.gemini/settings.json, not ~/.cc-switch/settings.json
+    let settings_path = home.join(".cc-switch").join("settings.json");
+    assert!(
+        settings_path.exists(),
+        "settings.json should exist at {}",
+        settings_path.display()
+    );
+
+    let raw = std::fs::read_to_string(&settings_path).expect("read settings.json");
+    let value: serde_json::Value = serde_json::from_str(&raw).expect("parse settings.json");
+    assert_eq!(
+        value
+            .pointer("/security/auth/selectedType")
+            .and_then(|v| v.as_str()),
+        Some("oauth-personal"),
+        "Google official Gemini should set oauth-personal selectedType in app settings"
+    );
+
    let gemini_settings = home.join(".gemini").join("settings.json");
    assert!(
        gemini_settings.exists(),
@@ -321,7 +317,7 @@ fn switch_google_official_gemini_sets_oauth_security() {
            .pointer("/security/auth/selectedType")
            .and_then(|v| v.as_str()),
        Some("oauth-personal"),
-        "Gemini settings json should reflect oauth-personal for Google Official"
+        "Gemini settings json should also reflect oauth-personal"
    );
 }

@@ -380,7 +376,9 @@ fn provider_service_switch_claude_updates_live_and_state() {
        );
    }

-    let state = create_test_state_with_config(&config).expect("create test state");
+    let state = AppState {
+        config: RwLock::new(config),
+    };

    ProviderService::switch(&state, AppType::Claude, "new-provider")
        .expect("switch provider should succeed");
@@ -396,21 +394,17 @@ fn provider_service_switch_claude_updates_live_and_state() {
        "live settings.json should reflect new provider auth"
    );

-    let providers = state
-        .db
-        .get_all_providers(AppType::Claude.as_str())
-        .expect("get all providers");
-    let current_id = state
-        .db
-        .get_current_provider(AppType::Claude.as_str())
-        .expect("get current provider");
-    assert_eq!(
-        current_id.as_deref(),
-        Some("new-provider"),
-        "current provider updated"
-    );
+    let guard = state
+        .config
+        .read()
+        .expect("read claude config after switch");
+    let manager = guard
+        .get_manager(&AppType::Claude)
+        .expect("claude manager after switch");
+    assert_eq!(manager.current, "new-provider", "current provider updated");

-    let legacy_provider = providers
+    let legacy_provider = manager
+        .providers
        .get("old-provider")
        .expect("legacy provider still exists");
    assert_eq!(
@@ -421,31 +415,20 @@ fn provider_service_switch_claude_updates_live_and_state() {

 #[test]
 fn provider_service_switch_missing_provider_returns_error() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let _home = ensure_test_home();
-
-    let state = create_test_state().expect("create test state");
+    let state = AppState {
+        config: RwLock::new(MultiAppConfig::default()),
+    };

    let err = ProviderService::switch(&state, AppType::Claude, "missing")
        .expect_err("switching missing provider should fail");
    match err {
-        AppError::Message(msg) => {
-            assert!(
-                msg.contains("不存在") || msg.contains("not found"),
-                "expected provider not found message, got {msg}"
-            );
-        }
-        other => panic!("expected Message error for provider not found, got {other:?}"),
+        AppError::Localized { key, .. } => assert_eq!(key, "provider.not_found"),
+        other => panic!("expected Localized error for provider not found, got {other:?}"),
    }
 }

 #[test]
 fn provider_service_switch_codex_missing_auth_returns_error() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let _home = ensure_test_home();
-
    let mut config = MultiAppConfig::default();
    {
        let manager = config
@@ -464,7 +447,9 @@ fn provider_service_switch_codex_missing_auth_returns_error() {
        );
    }

-    let state = create_test_state_with_config(&config).expect("create test state");
+    let state = AppState {
+        config: RwLock::new(config),
+    };

    let err = ProviderService::switch(&state, AppType::Codex, "invalid")
        .expect_err("switching should fail without auth");
@@ -523,21 +508,23 @@ fn provider_service_delete_codex_removes_provider_and_files() {
    std::fs::write(&auth_path, "{}").expect("seed auth file");
    std::fs::write(&cfg_path, "base_url = \"https://example\"").expect("seed config file");

-    let app_state = create_test_state_with_config(&config).expect("create test state");
+    let app_state = AppState {
+        config: RwLock::new(config),
+    };

    ProviderService::delete(&app_state, AppType::Codex, "to-delete")
        .expect("delete provider should succeed");

-    let providers = app_state
-        .db
-        .get_all_providers(AppType::Codex.as_str())
-        .expect("get all providers");
+    let locked = app_state.config.read().expect("lock config after delete");
+    let manager = locked.get_manager(&AppType::Codex).expect("codex manager");
    assert!(
-        !providers.contains_key("to-delete"),
+        !manager.providers.contains_key("to-delete"),
        "provider entry should be removed"
    );
-    // v3.7.0+ 不再使用供应商特定文件（如 auth-*.json, config-*.toml）
-    // 删除供应商只影响数据库记录，不清理这些旧格式文件
+    assert!(
+        !auth_path.exists() && !cfg_path.exists(),
+        "provider-specific files should be deleted"
+    );
 }

 #[test]
@@ -584,28 +571,28 @@ fn provider_service_delete_claude_removes_provider_files() {
    std::fs::write(&by_name, "{}").expect("seed settings by name");
    std::fs::write(&by_id, "{}").expect("seed settings by id");

-    let app_state = create_test_state_with_config(&config).expect("create test state");
+    let app_state = AppState {
+        config: RwLock::new(config),
+    };

    ProviderService::delete(&app_state, AppType::Claude, "delete").expect("delete claude provider");

-    let providers = app_state
-        .db
-        .get_all_providers(AppType::Claude.as_str())
-        .expect("get all providers");
+    let locked = app_state.config.read().expect("lock config after delete");
+    let manager = locked
+        .get_manager(&AppType::Claude)
+        .expect("claude manager");
    assert!(
-        !providers.contains_key("delete"),
+        !manager.providers.contains_key("delete"),
        "claude provider should be removed"
    );
-    // v3.7.0+ 不再使用供应商特定文件（如 settings-*.json）
-    // 删除供应商只影响数据库记录，不清理这些旧格式文件
+    assert!(
+        !by_name.exists() && !by_id.exists(),
+        "provider config files should be deleted"
+    );
 }

 #[test]
 fn provider_service_delete_current_provider_returns_error() {
-    let _guard = test_mutex().lock().expect("acquire test mutex");
-    reset_test_fs();
-    let _home = ensure_test_home();
-
    let mut config = MultiAppConfig::default();
    {
        let manager = config
@@ -625,26 +612,21 @@ fn provider_service_delete_current_provider_returns_error() {
        );
    }

-    let app_state = create_test_state_with_config(&config).expect("create test state");
+    let app_state = AppState {
+        config: RwLock::new(config),
+    };

    let err = ProviderService::delete(&app_state, AppType::Claude, "keep")
        .expect_err("deleting current provider should fail");
    match err {
        AppError::Localized { zh, .. } => assert!(
-            zh.contains("不能删除当前正在使用的供应商")
-                || zh.contains("无法删除当前正在使用的供应商"),
+            zh.contains("不能删除当前正在使用的供应商"),
            "unexpected message: {zh}"
        ),
        AppError::Config(msg) => assert!(
-            msg.contains("不能删除当前正在使用的供应商")
-                || msg.contains("无法删除当前正在使用的供应商"),
+            msg.contains("不能删除当前正在使用的供应商"),
            "unexpected message: {msg}"
        ),
-        AppError::Message(msg) => assert!(
-            msg.contains("不能删除当前正在使用的供应商")
-                || msg.contains("无法删除当前正在使用的供应商"),
-            "unexpected message: {msg}"
-        ),
-        other => panic!("expected Config/Message error, got {other:?}"),
+        other => panic!("expected Config error, got {other:?}"),
    }
 }
@@ -1,7 +1,7 @@
 use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex, OnceLock};
+use std::sync::{Mutex, OnceLock};

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

 /// 为测试设置隔离的 HOME 目录，避免污染真实用户数据。
 pub fn ensure_test_home() -> &'static Path {
@@ -45,18 +45,3 @@ pub fn test_mutex() -> &'static Mutex<()> {
    static MUTEX: OnceLock<Mutex<()>> = OnceLock::new();
    MUTEX.get_or_init(|| Mutex::new(()))
 }
-
-/// 创建测试用的 AppState，包含一个空的数据库
-pub fn create_test_state() -> Result<AppState, Box<dyn std::error::Error>> {
-    let db = Database::init()?;
-    Ok(AppState { db: Arc::new(db) })
-}
-
-/// 创建测试用的 AppState，并从 MultiAppConfig 迁移数据
-pub fn create_test_state_with_config(
-    config: &MultiAppConfig,
-) -> Result<AppState, Box<dyn std::error::Error>> {
-    let db = Database::init()?;
-    db.migrate_from_json(config)?;
-    Ok(AppState { db: Arc::new(db) })
-}
@@ -1,13 +1,11 @@
 import { useEffect, useMemo, useState, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
-import { invoke } from "@tauri-apps/api/core";
-import { useQueryClient } from "@tanstack/react-query";
 import {
  Plus,
  Settings,
  ArrowLeft,
-  // Bot, // TODO: Agents 功能开发中，暂时不需要
+  Bot,
  Book,
  Wrench,
  Server,
@@ -25,7 +23,6 @@ import {
 import { checkAllEnvConflicts, checkEnvConflicts } from "@/lib/api/env";
 import { useProviderActions } from "@/hooks/useProviderActions";
 import { extractErrorMessage } from "@/utils/errorUtils";
-import { cn } from "@/lib/utils";
 import { AppSwitcher } from "@/components/AppSwitcher";
 import { ProviderList } from "@/components/providers/ProviderList";
 import { AddProviderDialog } from "@/components/providers/AddProviderDialog";
@@ -44,14 +41,8 @@ import { Button } from "@/components/ui/button";

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

-// 顶部拖拽区域和 header 的高度常量
-const DRAG_BAR_HEIGHT = 28; // px
-const HEADER_HEIGHT = 64; // px
-const CONTENT_TOP_OFFSET = DRAG_BAR_HEIGHT + HEADER_HEIGHT;
-
 function App() {
  const { t } = useTranslation();
-  const queryClient = useQueryClient();

  const [activeApp, setActiveApp] = useState<AppId>("claude");
  const [currentView, setCurrentView] = useState<View>("providers");
@@ -132,24 +123,6 @@ function App() {
    checkEnvOnStartup();
  }, []);

-  // 应用启动时检查是否刚完成了配置迁移
-  useEffect(() => {
-    const checkMigration = async () => {
-      try {
-        const migrated = await invoke<boolean>("get_migration_result");
-        if (migrated) {
-          toast.success(
-            t("migration.success", { defaultValue: "配置迁移成功" }),
-          );
-        }
-      } catch (error) {
-        console.error("[App] Failed to check migration result:", error);
-      }
-    };
-
-    checkMigration();
-  }, [t]);
-
  // 切换应用时检测当前应用的环境变量冲突
  useEffect(() => {
    const checkEnvOnSwitch = async () => {
@@ -225,8 +198,6 @@ function App() {
      meta: provider.meta
        ? JSON.parse(JSON.stringify(provider.meta))
        : undefined, // 深拷贝
-      icon: provider.icon,
-      iconColor: provider.iconColor,
    };

    // 2️⃣ 如果原供应商有 sortIndex，需要将后续所有供应商的 sortIndex +1
@@ -265,20 +236,7 @@ function App() {

  // 导入配置成功后刷新
  const handleImportSuccess = async () => {
-    try {
-      // 导入会影响所有应用的供应商数据：刷新所有 providers 缓存
-      await queryClient.invalidateQueries({
-        queryKey: ["providers"],
-        refetchType: "all",
-      });
-      await queryClient.refetchQueries({
-        queryKey: ["providers"],
-        type: "all",
-      });
-    } catch (error) {
-      console.error("[App] Failed to refresh providers after import", error);
-      await refetch();
-    }
+    await refetch();
    try {
      await providersApi.updateTrayMenu();
    } catch (error) {
@@ -323,25 +281,20 @@ function App() {
        return <AgentsPanel onOpenChange={() => setCurrentView("providers")} />;
      default:
        return (
-          <div className="mx-auto max-w-[56rem] px-5 flex flex-col h-[calc(100vh-8rem)] overflow-hidden">
-            {/* 独立滚动容器 - 解决 Linux/Ubuntu 下 DndContext 与滚轮事件冲突 */}
-            <div className="flex-1 overflow-y-auto overflow-x-hidden pb-12 px-1">
-              <div className="space-y-4">
-                <ProviderList
-                  providers={providers}
-                  currentProviderId={currentProviderId}
-                  appId={activeApp}
-                  isLoading={isLoading}
-                  onSwitch={switchProvider}
-                  onEdit={setEditingProvider}
-                  onDelete={setConfirmDelete}
-                  onDuplicate={handleDuplicateProvider}
-                  onConfigureUsage={setUsageProvider}
-                  onOpenWebsite={handleOpenWebsite}
-                  onCreate={() => setIsAddOpen(true)}
-                />
-              </div>
-            </div>
+          <div className="mx-auto max-w-[56rem] px-6 space-y-4">
+            <ProviderList
+              providers={providers}
+              currentProviderId={currentProviderId}
+              appId={activeApp}
+              isLoading={isLoading}
+              onSwitch={switchProvider}
+              onEdit={setEditingProvider}
+              onDelete={setConfirmDelete}
+              onDuplicate={handleDuplicateProvider}
+              onConfigureUsage={setUsageProvider}
+              onOpenWebsite={handleOpenWebsite}
+              onCreate={() => setIsAddOpen(true)}
+            />
          </div>
        );
    }
@@ -350,7 +303,7 @@ function App() {
  return (
    <div
      className="flex min-h-screen flex-col bg-background text-foreground selection:bg-primary/30"
-      style={{ overflowX: "hidden", paddingTop: CONTENT_TOP_OFFSET }}
+      style={{ overflowX: "hidden" }}
    >
      {/* 全局拖拽区域（顶部 4px），避免上边框无法拖动 */}
      <div
@@ -416,7 +369,7 @@ function App() {
                    t("prompts.title", { appName: t(`apps.${activeApp}`) })}
                  {currentView === "skills" && t("skills.title")}
                  {currentView === "mcp" && t("mcp.unifiedPanel.title")}
-                  {currentView === "agents" && t("agents.title")}
+                  {currentView === "agents" && "Agents"}
                </h1>
              </div>
            ) : (
@@ -430,6 +383,7 @@ function App() {
                  >
                    CC Switch
                  </a>
+                  <div className="h-5 w-[1px] bg-black/10 dark:bg-white/15" />
                  <Button
                    variant="ghost"
                    size="icon"
@@ -446,14 +400,14 @@ function App() {
          </div>

          <div
-            className="flex items-center gap-2 h-[32px]"
+            className="flex items-center gap-2"
            style={{ WebkitAppRegion: "no-drag" } as any}
          >
            {currentView === "prompts" && (
              <Button
                size="icon"
                onClick={() => promptPanelRef.current?.openAdd()}
-                className={`ml-auto ${addActionButtonClass}`}
+                className={addActionButtonClass}
                title={t("prompts.add")}
              >
                <Plus className="h-5 w-5" />
@@ -463,7 +417,7 @@ function App() {
              <Button
                size="icon"
                onClick={() => mcpPanelRef.current?.openAdd()}
-                className={`ml-auto ${addActionButtonClass}`}
+                className={addActionButtonClass}
                title={t("mcp.unifiedPanel.addServer")}
              >
                <Plus className="h-5 w-5" />
@@ -495,34 +449,9 @@ function App() {
              <>
                <AppSwitcher activeApp={activeApp} onSwitch={setActiveApp} />

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

                <Button
@@ -556,10 +507,13 @@ function App() {
        </div>
      </header>

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

      <AddProviderDialog
@@ -1,5 +1,5 @@
 import type { AppId } from "@/lib/api";
-import { ProviderIcon } from "@/components/ProviderIcon";
+import { ClaudeIcon, CodexIcon, GeminiIcon } from "./BrandIcons";

 interface AppSwitcherProps {
  activeApp: AppId;
@@ -11,17 +11,6 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
    if (app === activeApp) return;
    onSwitch(app);
  };
-  const iconSize = 20;
-  const appIconName: Record<AppId, string> = {
-    claude: "claude",
-    codex: "openai",
-    gemini: "gemini",
-  };
-  const appDisplayName: Record<AppId, string> = {
-    claude: "Claude",
-    codex: "Codex",
-    gemini: "Gemini",
-  };

  return (
    <div className="inline-flex bg-gray-100 dark:bg-gray-800 rounded-lg p-1 gap-1">
@@ -34,17 +23,15 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
            : "text-gray-500 hover:text-gray-900 hover:bg-white/50 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800/60"
        }`}
      >
-        <ProviderIcon
-          icon={appIconName.claude}
-          name={appDisplayName.claude}
-          size={iconSize}
+        <ClaudeIcon
+          size={16}
          className={
            activeApp === "claude"
              ? "text-foreground"
              : "text-gray-500 dark:text-gray-400 group-hover:text-foreground transition-colors"
          }
        />
-        <span>{appDisplayName.claude}</span>
+        <span>Claude</span>
      </button>

      <button
@@ -56,17 +43,15 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
            : "text-gray-500 hover:text-gray-900 hover:bg-white/50 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800/60"
        }`}
      >
-        <ProviderIcon
-          icon={appIconName.codex}
-          name={appDisplayName.codex}
-          size={iconSize}
+        <CodexIcon
+          size={16}
          className={
            activeApp === "codex"
              ? "text-foreground"
              : "text-gray-500 dark:text-gray-400 group-hover:text-foreground transition-colors"
          }
        />
-        <span>{appDisplayName.codex}</span>
+        <span>Codex</span>
      </button>

      <button
@@ -78,17 +63,15 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
            : "text-gray-500 hover:text-gray-900 hover:bg-white/50 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800/60"
        }`}
      >
-        <ProviderIcon
-          icon={appIconName.gemini}
-          name={appDisplayName.gemini}
-          size={iconSize}
+        <GeminiIcon
+          size={16}
          className={
            activeApp === "gemini"
              ? "text-foreground"
              : "text-gray-500 dark:text-gray-400 group-hover:text-foreground transition-colors"
          }
        />
-        <span>{appDisplayName.gemini}</span>
+        <span>Gemini</span>
      </button>
    </div>
  );
@@ -40,8 +40,8 @@ export function ConfirmDialog({
        }
      }}
    >
-      <DialogContent className="max-w-sm" zIndex="alert">
-        <DialogHeader className="space-y-3 border-b-0 bg-transparent pb-0">
+      <DialogContent className="max-w-sm">
+        <DialogHeader className="space-y-3">
          <DialogTitle className="flex items-center gap-2 text-lg font-semibold">
            <AlertTriangle className="h-5 w-5 text-destructive" />
            {title}
@@ -50,7 +50,7 @@ export function ConfirmDialog({
            {message}
          </DialogDescription>
        </DialogHeader>
-        <DialogFooter className="flex gap-2 border-t-0 bg-transparent pt-2 sm:justify-end">
+        <DialogFooter className="flex gap-2 sm:justify-end">
          <Button variant="outline" onClick={onCancel}>
            {cancelText || t("common.cancel")}
          </Button>
@@ -13,10 +13,6 @@ import { Button } from "@/components/ui/button";
 import { toast } from "sonner";
 import { useTranslation } from "react-i18next";
 import { useQueryClient } from "@tanstack/react-query";
-import { PromptConfirmation } from "./deeplink/PromptConfirmation";
-import { McpConfirmation } from "./deeplink/McpConfirmation";
-import { SkillConfirmation } from "./deeplink/SkillConfirmation";
-import { ProviderIcon } from "./ProviderIcon";

 interface DeeplinkError {
  url: string;
@@ -30,24 +26,6 @@ export function DeepLinkImportDialog() {
  const [isImporting, setIsImporting] = useState(false);
  const [isOpen, setIsOpen] = useState(false);

-  // 容错判断：MCP 导入结果可能缺少 type 字段
-  const isMcpImportResult = (
-    value: unknown,
-  ): value is {
-    importedCount: number;
-    importedIds: string[];
-    failed: Array<{ id: string; error: string }>;
-    type?: "mcp";
-  } => {
-    if (!value || typeof value !== "object") return false;
-    const v = value as Record<string, unknown>;
-    return (
-      typeof v.importedCount === "number" &&
-      Array.isArray(v.importedIds) &&
-      Array.isArray(v.failed)
-    );
-  };
-
  useEffect(() => {
    // Listen for deep link import events
    const unlistenImport = listen<DeepLinkImportRequest>(
@@ -100,98 +78,22 @@ export function DeepLinkImportDialog() {
    setIsImporting(true);

    try {
-      const result = await deeplinkApi.importFromDeeplink(request);
-      const refreshMcp = async (summary: {
-        importedCount: number;
-        importedIds: string[];
-        failed: Array<{ id: string; error: string }>;
-      }) => {
-        // 强制刷新 MCP 相关缓存，确保管理页重新从数据库加载
-        await queryClient.invalidateQueries({
-          queryKey: ["mcp", "all"],
-          refetchType: "all",
-        });
-        await queryClient.refetchQueries({
-          queryKey: ["mcp", "all"],
-          type: "all",
-        });
+      await deeplinkApi.importFromDeeplink(request);

-        if (summary.failed.length > 0) {
-          toast.warning(t("deeplink.mcpPartialSuccess"), {
-            description: t("deeplink.mcpPartialSuccessDescription", {
-              success: summary.importedCount,
-              failed: summary.failed.length,
-            }),
-          });
-        } else {
-          toast.success(t("deeplink.mcpImportSuccess"), {
-            description: t("deeplink.mcpImportSuccessDescription", {
-              count: summary.importedCount,
-            }),
-          });
-        }
-      };
+      // Invalidate provider queries to refresh the list
+      await queryClient.invalidateQueries({
+        queryKey: ["providers", request.app],
+      });

-      // Handle different result types
-      if ("type" in result) {
-        if (result.type === "provider") {
-          await queryClient.invalidateQueries({
-            queryKey: ["providers", request.app],
-          });
-          toast.success(t("deeplink.importSuccess"), {
-            description: t("deeplink.importSuccessDescription", {
-              name: request.name,
-            }),
-          });
-        } else if (result.type === "prompt") {
-          // Prompts don't use React Query, trigger a custom event for refresh
-          window.dispatchEvent(
-            new CustomEvent("prompt-imported", {
-              detail: { app: request.app },
-            }),
-          );
-          toast.success(t("deeplink.promptImportSuccess"), {
-            description: t("deeplink.promptImportSuccessDescription", {
-              name: request.name,
-            }),
-          });
-        } else if (result.type === "mcp") {
-          await refreshMcp(result);
-        } else if (result.type === "skill") {
-          // Refresh Skills with aggressive strategy
-          queryClient.invalidateQueries({
-            queryKey: ["skills"],
-            refetchType: "all",
-          });
-          await queryClient.refetchQueries({
-            queryKey: ["skills"],
-            type: "all",
-          });
-          toast.success(t("deeplink.skillImportSuccess"), {
-            description: t("deeplink.skillImportSuccessDescription", {
-              repo: request.repo,
-            }),
-          });
-        }
-      } else if (isMcpImportResult(result)) {
-        // 兜底处理：旧版本后端可能未返回 type 字段
-        await refreshMcp(result);
-      } else {
-        // Legacy return type (string ID) - assume provider
-        await queryClient.invalidateQueries({
-          queryKey: ["providers", request.app],
-        });
-        toast.success(t("deeplink.importSuccess"), {
-          description: t("deeplink.importSuccessDescription", {
-            name: request.name,
-          }),
-        });
-      }
+      toast.success(t("deeplink.importSuccess"), {
+        description: t("deeplink.importSuccessDescription", {
+          name: request.name,
+        }),
+      });

-      // Close dialog after all refreshes complete
      setIsOpen(false);
    } catch (error) {
-      console.error("Failed to import from deep link:", error);
+      console.error("Failed to import provider from deep link:", error);
      toast.error(t("deeplink.importError"), {
        description: error instanceof Error ? error.message : String(error),
      });
@@ -287,34 +189,6 @@ export function DeepLinkImportDialog() {
    return value;
  };

-  const getTitle = () => {
-    if (!request) return t("deeplink.confirmImport");
-    switch (request.resource) {
-      case "prompt":
-        return t("deeplink.importPrompt");
-      case "mcp":
-        return t("deeplink.importMcp");
-      case "skill":
-        return t("deeplink.importSkill");
-      default:
-        return t("deeplink.confirmImport");
-    }
-  };
-
-  const getDescription = () => {
-    if (!request) return t("deeplink.confirmImportDescription");
-    switch (request.resource) {
-      case "prompt":
-        return t("deeplink.importPromptDescription");
-      case "mcp":
-        return t("deeplink.importMcpDescription");
-      case "skill":
-        return t("deeplink.importSkillDescription");
-      default:
-        return t("deeplink.confirmImportDescription");
-    }
-  };
-
  return (
    <Dialog open={isOpen && !!request} onOpenChange={setIsOpen}>
      <DialogContent className="sm:max-w-[500px]" zIndex="top">
@@ -322,197 +196,151 @@ export function DeepLinkImportDialog() {
          <>
            {/* 标题显式左对齐，避免默认居中样式影响 */}
            <DialogHeader className="text-left sm:text-left">
-              <DialogTitle>{getTitle()}</DialogTitle>
-              <DialogDescription>{getDescription()}</DialogDescription>
+              <DialogTitle>{t("deeplink.confirmImport")}</DialogTitle>
+              <DialogDescription>
+                {t("deeplink.confirmImportDescription")}
+              </DialogDescription>
            </DialogHeader>

            {/* 主体内容整体右移，略大于标题内边距，让内容看起来不贴边 */}
            <div className="space-y-4 px-8 py-4 max-h-[60vh] overflow-y-auto [scrollbar-width:thin] [&::-webkit-scrollbar]:w-1.5 [&::-webkit-scrollbar]:block [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:bg-gray-200 dark:[&::-webkit-scrollbar-thumb]:bg-gray-700">
-              {request.resource === "prompt" && (
-                <PromptConfirmation request={request} />
-              )}
-              {request.resource === "mcp" && (
-                <McpConfirmation request={request} />
-              )}
-              {request.resource === "skill" && (
-                <SkillConfirmation request={request} />
+              {/* App Type */}
+              <div className="grid grid-cols-3 items-center gap-4">
+                <div className="font-medium text-sm text-muted-foreground">
+                  {t("deeplink.app")}
+                </div>
+                <div className="col-span-2 text-sm font-medium capitalize">
+                  {request.app}
+                </div>
+              </div>
+
+              {/* Provider Name */}
+              <div className="grid grid-cols-3 items-center gap-4">
+                <div className="font-medium text-sm text-muted-foreground">
+                  {t("deeplink.providerName")}
+                </div>
+                <div className="col-span-2 text-sm font-medium">
+                  {request.name}
+                </div>
+              </div>
+
+              {/* Homepage */}
+              <div className="grid grid-cols-3 items-center gap-4">
+                <div className="font-medium text-sm text-muted-foreground">
+                  {t("deeplink.homepage")}
+                </div>
+                <div className="col-span-2 text-sm break-all text-blue-600 dark:text-blue-400">
+                  {request.homepage}
+                </div>
+              </div>
+
+              {/* API Endpoint */}
+              <div className="grid grid-cols-3 items-center gap-4">
+                <div className="font-medium text-sm text-muted-foreground">
+                  {t("deeplink.endpoint")}
+                </div>
+                <div className="col-span-2 text-sm break-all">
+                  {request.endpoint}
+                </div>
+              </div>
+
+              {/* API Key (masked) */}
+              <div className="grid grid-cols-3 items-center gap-4">
+                <div className="font-medium text-sm text-muted-foreground">
+                  {t("deeplink.apiKey")}
+                </div>
+                <div className="col-span-2 text-sm font-mono text-muted-foreground">
+                  {maskedApiKey}
+                </div>
+              </div>
+
+              {/* Model (if present) */}
+              {request.model && (
+                <div className="grid grid-cols-3 items-center gap-4">
+                  <div className="font-medium text-sm text-muted-foreground">
+                    {t("deeplink.model")}
+                  </div>
+                  <div className="col-span-2 text-sm font-mono">
+                    {request.model}
+                  </div>
+                </div>
              )}

-              {/* Legacy Provider View */}
-              {(request.resource === "provider" || !request.resource) && (
-                <>
-                  {/* Provider Icon - enlarge and center near the top */}
-                  {request.icon && (
-                    <div className="flex justify-center pt-2 pb-1">
-                      <ProviderIcon
-                        icon={request.icon}
-                        name={request.name || request.icon}
-                        size={80}
-                        className="drop-shadow-sm"
-                      />
-                    </div>
-                  )}
+              {/* Notes (if present) */}
+              {request.notes && (
+                <div className="grid grid-cols-3 items-start gap-4">
+                  <div className="font-medium text-sm text-muted-foreground">
+                    {t("deeplink.notes")}
+                  </div>
+                  <div className="col-span-2 text-sm text-muted-foreground">
+                    {request.notes}
+                  </div>
+                </div>
+              )}

-                  {/* App Type */}
+              {/* Config File Details (v3.8+) */}
+              {hasConfigFile && (
+                <div className="space-y-3 pt-2 border-t border-border-default">
                  <div className="grid grid-cols-3 items-center gap-4">
                    <div className="font-medium text-sm text-muted-foreground">
-                      {t("deeplink.app")}
+                      {t("deeplink.configSource")}
                    </div>
-                    <div className="col-span-2 text-sm font-medium capitalize">
-                      {request.app}
+                    <div className="col-span-2 text-sm">
+                      <span className="inline-flex items-center px-2 py-0.5 rounded-md bg-blue-100 dark:bg-blue-900/30 text-blue-700 dark:text-blue-300 text-xs font-medium">
+                        {configSource === "base64"
+                          ? t("deeplink.configEmbedded")
+                          : t("deeplink.configRemote")}
+                      </span>
+                      {request.configFormat && (
+                        <span className="ml-2 text-xs text-muted-foreground uppercase">
+                          {request.configFormat}
+                        </span>
+                      )}
                    </div>
                  </div>

-                  {/* Provider Name */}
-                  <div className="grid grid-cols-3 items-center gap-4">
-                    <div className="font-medium text-sm text-muted-foreground">
-                      {t("deeplink.providerName")}
-                    </div>
-                    <div className="col-span-2 text-sm font-medium">
-                      {request.name}
-                    </div>
-                  </div>
-
-                  {/* Homepage */}
-                  <div className="grid grid-cols-3 items-center gap-4">
-                    <div className="font-medium text-sm text-muted-foreground">
-                      {t("deeplink.homepage")}
-                    </div>
-                    <div className="col-span-2 text-sm break-all text-blue-600 dark:text-blue-400">
-                      {request.homepage}
-                    </div>
-                  </div>
-
-                  {/* API Endpoint */}
-                  <div className="grid grid-cols-3 items-center gap-4">
-                    <div className="font-medium text-sm text-muted-foreground">
-                      {t("deeplink.endpoint")}
-                    </div>
-                    <div className="col-span-2 text-sm break-all">
-                      {request.endpoint}
-                    </div>
-                  </div>
-
-                  {/* API Key (masked) */}
-                  <div className="grid grid-cols-3 items-center gap-4">
-                    <div className="font-medium text-sm text-muted-foreground">
-                      {t("deeplink.apiKey")}
-                    </div>
-                    <div className="col-span-2 text-sm font-mono text-muted-foreground">
-                      {maskedApiKey}
-                    </div>
-                  </div>
-
-                  {/* Model Fields - 根据应用类型显示不同的模型字段 */}
-                  {request.app === "claude" ? (
-                    <>
-                      {/* Claude 四种模型字段 */}
-                      {request.haikuModel && (
-                        <div className="grid grid-cols-3 items-center gap-4">
-                          <div className="font-medium text-sm text-muted-foreground">
-                            {t("deeplink.haikuModel")}
-                          </div>
-                          <div className="col-span-2 text-sm font-mono">
-                            {request.haikuModel}
-                          </div>
-                        </div>
-                      )}
-                      {request.sonnetModel && (
-                        <div className="grid grid-cols-3 items-center gap-4">
-                          <div className="font-medium text-sm text-muted-foreground">
-                            {t("deeplink.sonnetModel")}
-                          </div>
-                          <div className="col-span-2 text-sm font-mono">
-                            {request.sonnetModel}
-                          </div>
-                        </div>
-                      )}
-                      {request.opusModel && (
-                        <div className="grid grid-cols-3 items-center gap-4">
-                          <div className="font-medium text-sm text-muted-foreground">
-                            {t("deeplink.opusModel")}
-                          </div>
-                          <div className="col-span-2 text-sm font-mono">
-                            {request.opusModel}
-                          </div>
-                        </div>
-                      )}
-                      {request.model && (
-                        <div className="grid grid-cols-3 items-center gap-4">
-                          <div className="font-medium text-sm text-muted-foreground">
-                            {t("deeplink.multiModel")}
-                          </div>
-                          <div className="col-span-2 text-sm font-mono">
-                            {request.model}
-                          </div>
-                        </div>
-                      )}
-                    </>
-                  ) : (
-                    <>
-                      {/* Codex 和 Gemini 使用通用 model 字段 */}
-                      {request.model && (
-                        <div className="grid grid-cols-3 items-center gap-4">
-                          <div className="font-medium text-sm text-muted-foreground">
-                            {t("deeplink.model")}
-                          </div>
-                          <div className="col-span-2 text-sm font-mono">
-                            {request.model}
-                          </div>
-                        </div>
-                      )}
-                    </>
-                  )}
-
-                  {/* Notes (if present) */}
-                  {request.notes && (
-                    <div className="grid grid-cols-3 items-start gap-4">
-                      <div className="font-medium text-sm text-muted-foreground">
-                        {t("deeplink.notes")}
+                  {/* Parsed Config Details */}
+                  {parsedConfig && (
+                    <div className="rounded-lg bg-muted/50 p-3 space-y-2">
+                      <div className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
+                        {t("deeplink.configDetails")}
                      </div>
-                      <div className="col-span-2 text-sm text-muted-foreground">
-                        {request.notes}
-                      </div>
-                    </div>
-                  )}

-                  {/* Config File Details (v3.8+) */}
-                  {hasConfigFile && (
-                    <div className="space-y-3 pt-2 border-t border-border-default">
-                      <div className="grid grid-cols-3 items-center gap-4">
-                        <div className="font-medium text-sm text-muted-foreground">
-                          {t("deeplink.configSource")}
-                        </div>
-                        <div className="col-span-2 text-sm">
-                          <span className="inline-flex items-center px-2 py-0.5 rounded-md bg-blue-100 dark:bg-blue-900/30 text-blue-700 dark:text-blue-300 text-xs font-medium">
-                            {configSource === "base64"
-                              ? t("deeplink.configEmbedded")
-                              : t("deeplink.configRemote")}
-                          </span>
-                          {request.configFormat && (
-                            <span className="ml-2 text-xs text-muted-foreground uppercase">
-                              {request.configFormat}
-                            </span>
+                      {/* Claude config */}
+                      {parsedConfig.type === "claude" && parsedConfig.env && (
+                        <div className="space-y-1.5">
+                          {Object.entries(parsedConfig.env).map(
+                            ([key, value]) => (
+                              <div
+                                key={key}
+                                className="grid grid-cols-2 gap-2 text-xs"
+                              >
+                                <span className="font-mono text-muted-foreground truncate">
+                                  {key}
+                                </span>
+                                <span className="font-mono truncate">
+                                  {maskValue(key, String(value))}
+                                </span>
+                              </div>
+                            ),
                          )}
                        </div>
-                      </div>
+                      )}

-                      {/* Parsed Config Details */}
-                      {parsedConfig && (
-                        <div className="rounded-lg bg-muted/50 p-3 space-y-2">
-                          <div className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
-                            {t("deeplink.configDetails")}
-                          </div>
-
-                          {/* Claude config */}
-                          {parsedConfig.type === "claude" &&
-                            parsedConfig.env && (
+                      {/* Codex config */}
+                      {parsedConfig.type === "codex" && (
+                        <div className="space-y-2">
+                          {parsedConfig.auth &&
+                            Object.keys(parsedConfig.auth).length > 0 && (
                              <div className="space-y-1.5">
-                                {Object.entries(parsedConfig.env).map(
+                                <div className="text-xs text-muted-foreground">
+                                  Auth:
+                                </div>
+                                {Object.entries(parsedConfig.auth).map(
                                  ([key, value]) => (
                                    <div
                                      key={key}
-                                      className="grid grid-cols-2 gap-2 text-xs"
+                                      className="grid grid-cols-2 gap-2 text-xs pl-2"
                                    >
                                      <span className="font-mono text-muted-foreground truncate">
                                        {key}
@@ -525,92 +353,61 @@ export function DeepLinkImportDialog() {
                                )}
                              </div>
                            )}
-
-                          {/* Codex config */}
-                          {parsedConfig.type === "codex" && (
-                            <div className="space-y-2">
-                              {parsedConfig.auth &&
-                                Object.keys(parsedConfig.auth).length > 0 && (
-                                  <div className="space-y-1.5">
-                                    <div className="text-xs text-muted-foreground">
-                                      Auth:
-                                    </div>
-                                    {Object.entries(parsedConfig.auth).map(
-                                      ([key, value]) => (
-                                        <div
-                                          key={key}
-                                          className="grid grid-cols-2 gap-2 text-xs pl-2"
-                                        >
-                                          <span className="font-mono text-muted-foreground truncate">
-                                            {key}
-                                          </span>
-                                          <span className="font-mono truncate">
-                                            {maskValue(key, String(value))}
-                                          </span>
-                                        </div>
-                                      ),
-                                    )}
-                                  </div>
-                                )}
-                              {parsedConfig.tomlConfig && (
-                                <div className="space-y-1">
-                                  <div className="text-xs text-muted-foreground">
-                                    TOML Config:
-                                  </div>
-                                  <pre className="text-xs font-mono bg-background p-2 rounded overflow-x-auto max-h-24 whitespace-pre-wrap">
-                                    {parsedConfig.tomlConfig.substring(0, 300)}
-                                    {parsedConfig.tomlConfig.length > 300 &&
-                                      "..."}
-                                  </pre>
-                                </div>
-                              )}
+                          {parsedConfig.tomlConfig && (
+                            <div className="space-y-1">
+                              <div className="text-xs text-muted-foreground">
+                                TOML Config:
+                              </div>
+                              <pre className="text-xs font-mono bg-background p-2 rounded overflow-x-auto max-h-24 whitespace-pre-wrap">
+                                {parsedConfig.tomlConfig.substring(0, 300)}
+                                {parsedConfig.tomlConfig.length > 300 && "..."}
+                              </pre>
                            </div>
                          )}
-
-                          {/* Gemini config */}
-                          {parsedConfig.type === "gemini" &&
-                            parsedConfig.env && (
-                              <div className="space-y-1.5">
-                                {Object.entries(parsedConfig.env).map(
-                                  ([key, value]) => (
-                                    <div
-                                      key={key}
-                                      className="grid grid-cols-2 gap-2 text-xs"
-                                    >
-                                      <span className="font-mono text-muted-foreground truncate">
-                                        {key}
-                                      </span>
-                                      <span className="font-mono truncate">
-                                        {maskValue(key, String(value))}
-                                      </span>
-                                    </div>
-                                  ),
-                                )}
-                              </div>
-                            )}
                        </div>
                      )}

-                      {/* Config URL (if remote) */}
-                      {request.configUrl && (
-                        <div className="grid grid-cols-3 items-center gap-4">
-                          <div className="font-medium text-sm text-muted-foreground">
-                            {t("deeplink.configUrl")}
-                          </div>
-                          <div className="col-span-2 text-sm font-mono text-muted-foreground break-all">
-                            {request.configUrl}
-                          </div>
+                      {/* Gemini config */}
+                      {parsedConfig.type === "gemini" && parsedConfig.env && (
+                        <div className="space-y-1.5">
+                          {Object.entries(parsedConfig.env).map(
+                            ([key, value]) => (
+                              <div
+                                key={key}
+                                className="grid grid-cols-2 gap-2 text-xs"
+                              >
+                                <span className="font-mono text-muted-foreground truncate">
+                                  {key}
+                                </span>
+                                <span className="font-mono truncate">
+                                  {maskValue(key, String(value))}
+                                </span>
+                              </div>
+                            ),
+                          )}
                        </div>
                      )}
                    </div>
                  )}

-                  {/* Warning */}
-                  <div className="rounded-lg bg-yellow-50 dark:bg-yellow-900/20 p-3 text-sm text-yellow-800 dark:text-yellow-200">
-                    {t("deeplink.warning")}
-                  </div>
-                </>
+                  {/* Config URL (if remote) */}
+                  {request.configUrl && (
+                    <div className="grid grid-cols-3 items-center gap-4">
+                      <div className="font-medium text-sm text-muted-foreground">
+                        {t("deeplink.configUrl")}
+                      </div>
+                      <div className="col-span-2 text-sm font-mono text-muted-foreground break-all">
+                        {request.configUrl}
+                      </div>
+                    </div>
+                  )}
+                </div>
              )}
+
+              {/* Warning */}
+              <div className="rounded-lg bg-yellow-50 dark:bg-yellow-900/20 p-3 text-sm text-yellow-800 dark:text-yellow-200">
+                {t("deeplink.warning")}
+              </div>
            </div>

            <DialogFooter>
@@ -32,9 +32,6 @@ export const ProviderIcon: React.FC<ProviderIconProps> = ({
    return {
      width: sizeValue,
      height: sizeValue,
-      // 内嵌 SVG 使用 1em 作为尺寸基准，这里同步 fontSize 让图标实际跟随 size 放大
-      fontSize: sizeValue,
-      lineHeight: 1,
    };
  }, [size]);

@@ -60,8 +57,6 @@ export const ProviderIcon: React.FC<ProviderIconProps> = ({
      .join("")
      .toUpperCase()
      .slice(0, 2);
-    const fallbackFontSize =
-      typeof size === "number" ? `${Math.max(size * 0.5, 12)}px` : "0.5em";
    return (
      <span
        className={cn(
@@ -73,7 +68,7 @@ export const ProviderIcon: React.FC<ProviderIconProps> = ({
      >
        <span
          style={{
-            fontSize: fallbackFontSize,
+            fontSize: `${typeof size === "number" ? size * 0.4 : 14}px`,
          }}
        >
          {initials}
@@ -56,7 +56,7 @@ export function UpdateBadge({ className = "", onClick }: UpdateBadgeProps) {
        "
        aria-label={t("common.close")}
      >
-        <X className="w-3 h-3 text-muted-foreground" />
+        <X className="w-3 h-3 text-gray-400 dark:text-gray-500" />
      </button>
    </div>
  );
@@ -114,7 +114,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
        {/* 第一行：更新时间和刷新按钮 */}
        <div className="flex items-center gap-2 justify-end">
          {/* 上次查询时间 */}
-          <span className="text-[10px] text-muted-foreground/70 flex items-center gap-1">
+          <span className="text-[10px] text-gray-400 dark:text-gray-500 flex items-center gap-1">
            <Clock size={10} />
            {lastQueriedAt
              ? formatRelativeTime(lastQueriedAt, now, t)
@@ -128,7 +128,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
              refetch();
            }}
            disabled={loading}
-            className="p-1 rounded hover:bg-muted transition-colors disabled:opacity-50 flex-shrink-0 text-muted-foreground"
+            className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors disabled:opacity-50 flex-shrink-0 text-gray-400 dark:text-gray-500"
            title={t("usage.refreshUsage")}
          >
            <RefreshCw size={12} className={loading ? "animate-spin" : ""} />
@@ -156,14 +156,13 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
                {t("usage.remaining")}
              </span>
              <span
-                className={`font-semibold tabular-nums ${
-                  isExpired
+                className={`font-semibold tabular-nums ${isExpired
                    ? "text-red-500 dark:text-red-400"
                    : firstUsage.remaining <
-                        (firstUsage.total || firstUsage.remaining) * 0.1
+                      (firstUsage.total || firstUsage.remaining) * 0.1
                      ? "text-orange-500 dark:text-orange-400"
                      : "text-green-600 dark:text-green-400"
-                }`}
+                  }`}
              >
                {firstUsage.remaining.toFixed(2)}
              </span>
@@ -191,7 +190,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
        <div className="flex items-center gap-2">
          {/* 自动查询时间提示 */}
          {lastQueriedAt && (
-            <span className="text-[10px] text-muted-foreground/70 flex items-center gap-1">
+            <span className="text-[10px] text-gray-400 dark:text-gray-500 flex items-center gap-1">
              <Clock size={10} />
              {formatRelativeTime(lastQueriedAt, now, t)}
            </span>
@@ -311,13 +310,12 @@ const UsagePlanItem: React.FC<{ data: UsageData }> = ({ data }) => {
              {t("usage.remaining")}
            </span>
            <span
-              className={`font-semibold tabular-nums ${
-                isExpired
-                  ? "text-red-500 dark:text-red-400"
-                  : remaining < (total || remaining) * 0.1
-                    ? "text-orange-500 dark:text-orange-400"
-                    : "text-green-600 dark:text-green-400"
-              }`}
+              className={`font-semibold tabular-nums ${isExpired
+                ? "text-red-500 dark:text-red-400"
+                : remaining < (total || remaining) * 0.1
+                  ? "text-orange-500 dark:text-orange-400"
+                  : "text-green-600 dark:text-green-400"
+                }`}
            >
              {remaining.toFixed(2)}
            </span>
@@ -176,16 +176,10 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
  const [selectedTemplate, setSelectedTemplate] = useState<string | null>(
    () => {
      const existingScript = provider.meta?.usage_script;
-      // 检测 NEW_API 模板（有 accessToken 或 userId）
      if (existingScript?.accessToken || existingScript?.userId) {
        return TEMPLATE_KEYS.NEW_API;
      }
-      // 检测 GENERAL 模板（有 apiKey 或 baseUrl）
-      if (existingScript?.apiKey || existingScript?.baseUrl) {
-        return TEMPLATE_KEYS.GENERAL;
-      }
-      // 新配置或无凭证：默认使用 GENERAL（与默认代码模板一致）
-      return TEMPLATE_KEYS.GENERAL;
+      return null;
    },
  );

@@ -355,9 +349,14 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
      footer={footer}
    >
      <div className="glass rounded-xl border border-white/10 px-6 py-4 flex items-center justify-between gap-4">
-        <p className="text-base font-medium leading-none text-foreground">
-          {t("usageScript.enableUsageQuery")}
-        </p>
+        <div className="space-y-1">
+          <p className="text-sm font-medium leading-none text-foreground">
+            {t("usageScript.enableUsageQuery")}
+          </p>
+          <p className="text-xs text-muted-foreground">
+            {t("usageScript.autoQueryIntervalHint")}
+          </p>
+        </div>
        <Switch
          checked={script.enabled}
          onCheckedChange={(checked) =>
@@ -371,9 +370,14 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
        <div className="space-y-6">
          {/* 预设模板选择 */}
          <div className="space-y-4 glass rounded-xl border border-white/10 p-6">
-            <Label className="text-base font-medium">
-              {t("usageScript.presetTemplate")}
-            </Label>
+            <div className="flex flex-wrap items-center justify-between gap-2">
+              <Label className="text-base font-medium">
+                {t("usageScript.presetTemplate")}
+              </Label>
+              <span className="text-xs text-muted-foreground">
+                {t("usageScript.variablesHint")}
+              </span>
+            </div>
            <div className="flex gap-2 flex-wrap">
              {Object.keys(PRESET_TEMPLATES).map((name) => {
                const isSelected = selectedTemplate === name;
@@ -443,9 +447,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
                      </div>

                      <div className="space-y-2">
-                        <Label htmlFor="usage-base-url">
-                          {t("usageScript.baseUrl")}
-                        </Label>
+                        <Label htmlFor="usage-base-url">Base URL</Label>
                        <Input
                          id="usage-base-url"
                          type="text"
@@ -464,9 +466,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
                  {selectedTemplate === TEMPLATE_KEYS.NEW_API && (
                    <>
                      <div className="space-y-2">
-                        <Label htmlFor="usage-newapi-base-url">
-                          {t("usageScript.baseUrl")}
-                        </Label>
+                        <Label htmlFor="usage-newapi-base-url">Base URL</Label>
                        <Input
                          id="usage-newapi-base-url"
                          type="text"
@@ -545,36 +545,141 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
                </div>
              </div>
            )}
+          </div>

-            {/* 通用配置（始终显示） */}
-            <div className="grid gap-4 md:grid-cols-2 pt-4 border-t border-white/10">
-              {/* 超时时间 */}
+          {/* 脚本配置 */}
+          <div className="space-y-4 glass rounded-xl border border-white/10 p-6">
+            <div className="flex items-center justify-between">
+              <h4 className="text-base font-medium text-foreground">
+                {t("usageScript.scriptConfig")}
+              </h4>
+              <p className="text-xs text-muted-foreground">
+                {t("usageScript.variablesHint")}
+              </p>
+            </div>
+
+            <div className="grid gap-4">
              <div className="space-y-2">
-                <Label htmlFor="usage-timeout">
-                  {t("usageScript.timeoutSeconds")}
+                <Label htmlFor="usage-request-url">
+                  {t("usageScript.requestUrl")}
                </Label>
                <Input
-                  id="usage-timeout"
-                  type="number"
-                  min={0}
-                  value={script.timeout ?? 10}
-                  onChange={(e) =>
+                  id="usage-request-url"
+                  type="text"
+                  value={script.request?.url || ""}
+                  onChange={(e) => {
                    setScript({
                      ...script,
-                      timeout: validateTimeout(e.target.value),
-                    })
-                  }
-                  onBlur={(e) =>
-                    setScript({
-                      ...script,
-                      timeout: validateTimeout(e.target.value),
-                    })
-                  }
+                      request: { ...script.request, url: e.target.value },
+                    });
+                  }}
+                  placeholder={t("usageScript.requestUrlPlaceholder")}
                  className="border-white/10"
                />
              </div>

-              {/* 自动查询间隔 */}
+              <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
+                <div className="space-y-2">
+                  <Label htmlFor="usage-method">
+                    {t("usageScript.method")}
+                  </Label>
+                  <Input
+                    id="usage-method"
+                    type="text"
+                    value={script.request?.method || "GET"}
+                    onChange={(e) => {
+                      setScript({
+                        ...script,
+                        request: {
+                          ...script.request,
+                          method: e.target.value.toUpperCase(),
+                        },
+                      });
+                    }}
+                    placeholder="GET / POST"
+                    className="border-white/10"
+                  />
+                </div>
+
+                <div className="space-y-2">
+                  <Label htmlFor="usage-timeout">
+                    {t("usageScript.timeoutSeconds")}
+                  </Label>
+                  <Input
+                    id="usage-timeout"
+                    type="number"
+                    min={0}
+                    value={script.timeout ?? 10}
+                    onChange={(e) =>
+                      setScript({
+                        ...script,
+                        timeout: validateTimeout(e.target.value),
+                      })
+                    }
+                    onBlur={(e) =>
+                      setScript({
+                        ...script,
+                        timeout: validateTimeout(e.target.value),
+                      })
+                    }
+                    className="border-white/10"
+                  />
+                </div>
+              </div>
+
+              <div className="space-y-2">
+                <Label htmlFor="usage-headers">
+                  {t("usageScript.headers")}
+                </Label>
+                <JsonEditor
+                  id="usage-headers"
+                  value={
+                    script.request?.headers
+                      ? JSON.stringify(script.request.headers, null, 2)
+                      : "{}"
+                  }
+                  onChange={(value) => {
+                    try {
+                      const parsed = JSON.parse(value || "{}");
+                      setScript({
+                        ...script,
+                        request: { ...script.request, headers: parsed },
+                      });
+                    } catch (error) {
+                      console.error("Invalid headers JSON", error);
+                    }
+                  }}
+                  height={180}
+                />
+              </div>
+
+              <div className="space-y-2">
+                <Label htmlFor="usage-body">{t("usageScript.body")}</Label>
+                <JsonEditor
+                  id="usage-body"
+                  value={
+                    script.request?.body
+                      ? JSON.stringify(script.request.body, null, 2)
+                      : "{}"
+                  }
+                  onChange={(value) => {
+                    try {
+                      const parsed =
+                        value?.trim() === "" ? undefined : JSON.parse(value);
+                      setScript({
+                        ...script,
+                        request: { ...script.request, body: parsed },
+                      });
+                    } catch (error) {
+                      toast.error(
+                        t("usageScript.invalidJson") || "Body 必须是合法 JSON",
+                      );
+                    }
+                  }}
+                  height={220}
+                />
+              </div>
+
              <div className="space-y-2">
                <Label htmlFor="usage-interval">
                  {t("usageScript.autoIntervalMinutes")}
@@ -603,6 +708,9 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
                  }
                  className="border-white/10"
                />
+                <p className="text-xs text-muted-foreground">
+                  {t("usageScript.autoQueryIntervalHint")}
+                </p>
              </div>
            </div>
          </div>
--- a/Show More
+++ b/Show More