chore: bump version to 3.8.2

fix(config): update DeepSeek default model from Exp to stable version
fix(ui): prevent provider card hover scale from being clipped
2026-07-25 13:45:03 +08:00 · 2025-12-01 22:41:43 +08:00 · 2025-12-01 22:37:01 +08:00 · 2025-12-01 16:03:20 +08:00 · 2025-12-01 11:28:01 +08:00 · 2025-12-01 11:08:53 +08:00
41 changed files with 896 additions and 1113 deletions
@@ -2,7 +2,7 @@

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

-[![Version](https://img.shields.io/badge/version-3.8.0-blue.svg)](https://github.com/farion1231/cc-switch/releases)
+[![Version](https://img.shields.io/badge/version-3.8.2-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/)
@@ -51,7 +51,7 @@ Get 10% OFF the GLM CODING PLAN with [this link](https://z.ai/subscribe?ic=8JVLJ

 ## Features

-### Current Version: v3.8.0 | [Full Changelog](CHANGELOG.md) | [Release Notes](docs/release-note-v3.8.0-en.md)
+### Current Version: v3.8.2 | [Full Changelog](CHANGELOG.md) | [Release Notes](docs/release-note-v3.8.0-en.md)

 **v3.8.0 Major Update (2025-11-28)**

@@ -2,7 +2,7 @@

 # Claude Code / Codex / Gemini CLI オールインワン・アシスタント

-[![Version](https://img.shields.io/badge/version-3.8.0-blue.svg)](https://github.com/farion1231/cc-switch/releases)
+[![Version](https://img.shields.io/badge/version-3.8.2-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/)
@@ -46,12 +46,12 @@ GLM CODING PLAN は AI コーディング向けのサブスクリプションで
 ## スクリーンショット

 |                  メイン画面                   |                  プロバイダ追加                  |
-| :-------------------------------------------: | :---------------------------------------------: |
-| ![メイン画面](assets/screenshots/main-en.png) | ![プロバイダ追加](assets/screenshots/add-en.png) |
+| :-------------------------------------------: | :----------------------------------------------: |
+| ![メイン画面](assets/screenshots/main-ja.png) | ![プロバイダ追加](assets/screenshots/add-ja.png) |

 ## 特長

-### 現在のバージョン：v3.8.0 | [完全な更新履歴](CHANGELOG.md) | [リリースノート](docs/release-note-v3.8.0-en.md)
+### 現在のバージョン：v3.8.2 | [完全な更新履歴](CHANGELOG.md) | [リリースノート](docs/release-note-v3.8.0-en.md)

 **v3.8.0 メジャーアップデート (2025-11-28)**

@@ -2,7 +2,7 @@

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

-[![Version](https://img.shields.io/badge/version-3.8.0-blue.svg)](https://github.com/farion1231/cc-switch/releases)
+[![Version](https://img.shields.io/badge/version-3.8.2-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/)
@@ -51,7 +51,7 @@ CC Switch 已经预设了智谱GLM，只需要填写 key 即可一键导入编

 ## 功能特性

-### 当前版本：v3.8.0 | [完整更新日志](CHANGELOG.md)
+### 当前版本：v3.8.2 | [完整更新日志](CHANGELOG.md)

 **v3.8.0 重大更新（2025-11-28）**

@@ -1,77 +0,0 @@
-# CC Switch 国际化功能说明
-
-## 已完成的工作
-
-1. **安装依赖**：添加了 `react-i18next` 和 `i18next` 包
-2. **配置国际化**：在 `src/i18n/` 目录下创建了配置文件
-3. **翻译文件**：创建了英文、中文、日文翻译文件
-4. **组件更新**：替换了主要组件中的硬编码文案
-5. **语言切换器**：添加了语言切换按钮
-
-## 文件结构
-
-```
-src/
-├── i18n/
-│   ├── index.ts          # 国际化配置文件
-│   └── locales/
-│       ├── en.json       # 英文翻译
-│       ├── ja.json       # 日文翻译
-│       └── zh.json       # 中文翻译
-├── components/
-│   └── LanguageSwitcher.tsx  # 语言切换组件
-└── main.tsx              # 导入国际化配置
-```
-
-## 默认语言设置
-
- **默认语言**：中文 (zh)（无首选时根据浏览器/系统语言选择 zh/en/ja）
- **回退语言**：英文 (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,6 +1,6 @@
 {
  "name": "cc-switch",
-  "version": "3.8.0",
+  "version": "3.8.2",
  "description": "All-in-One Assistant for Claude Code, Codex & Gemini CLI",
  "scripts": {
    "dev": "pnpm tauri dev",
@@ -618,7 +618,7 @@ dependencies = [

 [[package]]
 name = "cc-switch"
-version = "3.8.0"
+version = "3.8.2"
 dependencies = [
 "anyhow",
 "auto-launch",
@@ -1,6 +1,6 @@
 [package]
 name = "cc-switch"
-version = "3.8.0"
+version = "3.8.2"
 description = "All-in-One Assistant for Claude Code, Codex & Gemini CLI"
 authors = ["Jason Young"]
 license = "MIT"
@@ -38,16 +38,6 @@ 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 结构的兼容性：
@@ -9,7 +9,7 @@ mod config;
 mod database;
 mod deeplink;
 mod error;
-mod gemini_config; // 新增
+mod gemini_config;
 mod gemini_mcp;
 mod init_status;
 mod mcp;
@@ -20,6 +20,7 @@ mod provider_defaults;
 mod services;
 mod settings;
 mod store;
+mod tray;
 mod usage_script;

 pub use app_config::{AppType, McpApps, McpServer, MultiAppConfig};
@@ -46,263 +47,11 @@ 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},
-};
+use tauri::tray::{TrayIconBuilder, TrayIconEvent};
 #[cfg(target_os = "macos")]
-use tauri::{ActivationPolicy, RunEvent};
+use tauri::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",
-            },
-            "ja" => Self {
-                show_main: "メインウィンドウを開く",
-                no_provider_hint:
-                    "  (プロバイダーがまだありません。メイン画面から追加してください)",
-                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 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")]
-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
@@ -362,50 +111,13 @@ 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 create_tray_menu(&app, state.inner()) {
+    match tray::create_tray_menu(&app, state.inner()) {
        Ok(new_menu) => {
            if let Some(tray) = app.tray_by_id("main") {
                tray.set_menu(Some(new_menu))
@@ -473,7 +185,7 @@ pub fn run() {
                    }
                    #[cfg(target_os = "macos")]
                    {
-                        apply_tray_policy(window.app_handle(), false);
+                        tray::apply_tray_policy(window.app_handle(), false);
                    }
                } else {
                    window.app_handle().exit(0);
@@ -773,7 +485,7 @@ pub fn run() {
            log::info!("✓ Deep-link URL handler registered");

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

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

@@ -927,7 +639,7 @@ pub fn run() {
                        let _ = window.unminimize();
                        let _ = window.show();
                        let _ = window.set_focus();
-                        apply_tray_policy(app_handle, true);
+                        tray::apply_tray_policy(app_handle, true);
                    }
                }
                // 处理通过自定义 URL 协议触发的打开事件（例如 ccswitch://...）
@@ -0,0 +1,131 @@
+//! 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};
+
+/// 返回已启用的 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> {
+    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> {
+    // 读取现有的 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> {
+    // 读取现有的 MCP 配置
+    let mut current = crate::claude_mcp::read_mcp_servers_map()?;
+
+    // 移除指定服务器
+    current.remove(id);
+
+    // 写回
+    crate::claude_mcp::set_mcp_servers_map(&current)
+}
@@ -1,201 +1,17 @@
+//! Codex MCP 同步和导入模块
+//!
+//! 包含 Codex 的 MCP 配置管理：
+//! - 从 ~/.codex/config.toml 导入
+//! - 同步到 ~/.codex/config.toml
+//! - JSON 到 TOML 的转换逻辑
+
 use serde_json::{json, Value};
 use std::collections::HashMap;

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

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

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

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

-/// 将 config.json 中 enabled==true 的项投影写入 ~/.gemini/settings.json
-pub fn sync_enabled_to_gemini(config: &MultiAppConfig) -> Result<(), AppError> {
-    let enabled = collect_enabled_servers(&config.mcp.gemini);
-    crate::gemini_mcp::set_mcp_servers_map(&enabled)
-}
-
-/// 从 ~/.gemini/settings.json 导入 mcpServers 到统一结构（v3.7.0+）
-/// 已存在的服务器将启用 Gemini 应用，不覆盖其他字段和应用状态
-pub fn import_from_gemini(config: &mut MultiAppConfig) -> Result<usize, AppError> {
-    use crate::app_config::{McpApps, McpServer};
-
-    let text_opt = crate::gemini_mcp::read_mcp_json()?;
-    let Some(text) = text_opt else { return Ok(0) };
-
-    let v: Value = serde_json::from_str(&text)
-        .map_err(|e| AppError::McpValidation(format!("解析 ~/.gemini/settings.json 失败: {e}")))?;
-    let Some(map) = v.get("mcpServers").and_then(|x| x.as_object()) else {
-        return Ok(0);
-    };
-
-    // 确保新结构存在
-    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)
-}
-
-// ============================================================================
-// v3.7.0 新增：单个服务器同步和删除函数
-// ============================================================================
-
-/// 将单个 MCP 服务器同步到 Claude live 配置
-pub fn sync_single_server_to_claude(
+/// 将单个 MCP 服务器同步到 Codex live 配置
+/// 始终使用 Codex 官方格式 [mcp_servers]，并清理可能存在的错误格式 [mcp.servers]
+pub fn sync_single_server_to_codex(
    _config: &MultiAppConfig,
    id: &str,
    server_spec: &Value,
 ) -> Result<(), AppError> {
-    // 读取现有的 MCP 配置
-    let current = crate::claude_mcp::read_mcp_servers_map()?;
+    use toml_edit::Item;

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

-    // 写回
-    crate::claude_mcp::set_mcp_servers_map(&updated)
+    let mut doc = if config_path.exists() {
+        let content =
+            std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
+        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(())
 }

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

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

-    // 写回
-    crate::claude_mcp::set_mcp_servers_map(&current)
+    let content =
+        std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
+
+    let mut doc = 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(())
 }

+// ============================================================================
+// TOML 转换辅助函数
+// ============================================================================
+
 /// 通用 JSON 值到 TOML 值转换器（支持简单类型和浅层嵌套）
 ///
 /// 支持的类型转换：
@@ -1030,117 +649,3 @@ fn json_server_to_toml_table(spec: &Value) -> Result<toml_edit::Table, AppError>

    Ok(t)
 }
-
-/// 将单个 MCP 服务器同步到 Codex live 配置
-/// 始终使用 Codex 官方格式 [mcp_servers]，并清理可能存在的错误格式 [mcp.servers]
-pub fn sync_single_server_to_codex(
-    _config: &MultiAppConfig,
-    id: &str,
-    server_spec: &Value,
-) -> Result<(), AppError> {
-    use toml_edit::Item;
-
-    // 读取现有的 config.toml
-    let config_path = crate::codex_config::get_codex_config_path();
-
-    let mut doc = if config_path.exists() {
-        let content =
-            std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
-        content
-            .parse::<toml_edit::DocumentMut>()
-            .map_err(|e| AppError::McpValidation(format!("解析 Codex config.toml 失败: {e}")))?
-    } else {
-        toml_edit::DocumentMut::new()
-    };
-
-    // 清理可能存在的错误格式 [mcp.servers]
-    if let Some(mcp_item) = doc.get_mut("mcp") {
-        if let Some(tbl) = mcp_item.as_table_like_mut() {
-            if tbl.contains_key("servers") {
-                log::warn!("检测到错误的 MCP 格式 [mcp.servers]，正在清理并迁移到 [mcp_servers]");
-                tbl.remove("servers");
-            }
-        }
-    }
-
-    // 确保 [mcp_servers] 表存在
-    if !doc.contains_key("mcp_servers") {
-        doc["mcp_servers"] = toml_edit::table();
-    }
-
-    // 将 JSON 服务器规范转换为 TOML 表
-    let toml_table = json_server_to_toml_table(server_spec)?;
-
-    // 使用唯一正确的格式：[mcp_servers]
-    doc["mcp_servers"][id] = Item::Table(toml_table);
-
-    // 写回文件
-    std::fs::write(&config_path, doc.to_string()).map_err(|e| AppError::io(&config_path, e))?;
-
-    Ok(())
-}
-
-/// 从 Codex live 配置中移除单个 MCP 服务器
-/// 从正确的 [mcp_servers] 表中删除，同时清理可能存在于错误位置 [mcp.servers] 的数据
-pub fn remove_server_from_codex(id: &str) -> Result<(), AppError> {
-    let config_path = crate::codex_config::get_codex_config_path();
-
-    if !config_path.exists() {
-        return Ok(()); // 文件不存在，无需删除
-    }
-
-    let content =
-        std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
-
-    let mut doc = content
-        .parse::<toml_edit::DocumentMut>()
-        .map_err(|e| AppError::McpValidation(format!("解析 Codex config.toml 失败: {e}")))?;
-
-    // 从正确的位置删除：[mcp_servers]
-    if let Some(mcp_servers) = doc.get_mut("mcp_servers").and_then(|s| s.as_table_mut()) {
-        mcp_servers.remove(id);
-    }
-
-    // 同时清理可能存在于错误位置的数据：[mcp.servers]（如果存在）
-    if let Some(mcp_table) = doc.get_mut("mcp").and_then(|t| t.as_table_mut()) {
-        if let Some(servers) = mcp_table.get_mut("servers").and_then(|s| s.as_table_mut()) {
-            if servers.remove(id).is_some() {
-                log::warn!("从错误的 MCP 格式 [mcp.servers] 中清理了服务器 '{id}'");
-            }
-        }
-    }
-
-    // 写回文件
-    std::fs::write(&config_path, doc.to_string()).map_err(|e| AppError::io(&config_path, e))?;
-
-    Ok(())
-}
-
-/// 将单个 MCP 服务器同步到 Gemini live 配置
-pub fn sync_single_server_to_gemini(
-    _config: &MultiAppConfig,
-    id: &str,
-    server_spec: &Value,
-) -> Result<(), AppError> {
-    // 读取现有的 MCP 配置
-    let current = crate::gemini_mcp::read_mcp_servers_map()?;
-
-    // 创建新的 HashMap，包含现有的所有服务器 + 当前要同步的服务器
-    let mut updated = current;
-    updated.insert(id.to_string(), server_spec.clone());
-
-    // 写回
-    crate::gemini_mcp::set_mcp_servers_map(&updated)
-}
-
-/// 从 Gemini live 配置中移除单个 MCP 服务器
-pub fn remove_server_from_gemini(id: &str) -> Result<(), AppError> {
-    // 读取现有的 MCP 配置
-    let mut current = crate::gemini_mcp::read_mcp_servers_map()?;
-
-    // 移除指定服务器
-    current.remove(id);
-
-    // 写回
-    crate::gemini_mcp::set_mcp_servers_map(&current)
-}
@@ -0,0 +1,126 @@
+//! 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};
+
+/// 返回已启用的 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> {
+    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> {
+    // 读取现有的 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> {
+    // 读取现有的 MCP 配置
+    let mut current = crate::gemini_mcp::read_mcp_servers_map()?;
+
+    // 移除指定服务器
+    current.remove(id);
+
+    // 写回
+    crate::gemini_mcp::set_mcp_servers_map(&current)
+}
@@ -0,0 +1,28 @@
+//! MCP (Model Context Protocol) 服务器管理模块
+//!
+//! 本模块负责 MCP 服务器配置的验证、同步和导入导出。
+//!
+//! ## 模块结构
+//!
+//! - `validation` - 服务器配置验证
+//! - `claude` - Claude MCP 同步和导入
+//! - `codex` - Codex MCP 同步和导入（含 TOML 转换）
+//! - `gemini` - Gemini MCP 同步和导入
+
+mod claude;
+mod codex;
+mod gemini;
+mod validation;
+
+// 重新导出公共 API
+pub use claude::{
+    import_from_claude, remove_server_from_claude, sync_enabled_to_claude,
+    sync_single_server_to_claude,
+};
+pub use codex::{
+    import_from_codex, remove_server_from_codex, sync_enabled_to_codex, sync_single_server_to_codex,
+};
+pub use gemini::{
+    import_from_gemini, remove_server_from_gemini, sync_enabled_to_gemini,
+    sync_single_server_to_gemini,
+};
@@ -0,0 +1,69 @@
+//! MCP 服务器配置验证模块
+
+use serde_json::Value;
+
+use crate::error::AppError;
+
+/// 基础校验：允许 stdio/http/sse；或省略 type（视为 stdio）。对应必填字段存在
+pub fn validate_server_spec(spec: &Value) -> Result<(), AppError> {
+    if !spec.is_object() {
+        return Err(AppError::McpValidation(
+            "MCP 服务器连接定义必须为 JSON 对象".into(),
+        ));
+    }
+    let t_opt = spec.get("type").and_then(|x| x.as_str());
+    // 支持三种：stdio/http/sse；若缺省 type 则按 stdio 处理（与社区常见 .mcp.json 一致）
+    let is_stdio = t_opt.map(|t| t == "stdio").unwrap_or(true);
+    let is_http = t_opt.map(|t| t == "http").unwrap_or(false);
+    let is_sse = t_opt.map(|t| t == "sse").unwrap_or(false);
+
+    if !(is_stdio || is_http || is_sse) {
+        return Err(AppError::McpValidation(
+            "MCP 服务器 type 必须是 'stdio'、'http' 或 'sse'（或省略表示 stdio）".into(),
+        ));
+    }
+
+    if is_stdio {
+        let cmd = spec.get("command").and_then(|x| x.as_str()).unwrap_or("");
+        if cmd.trim().is_empty() {
+            return Err(AppError::McpValidation(
+                "stdio 类型的 MCP 服务器缺少 command 字段".into(),
+            ));
+        }
+    }
+    if is_http {
+        let url = spec.get("url").and_then(|x| x.as_str()).unwrap_or("");
+        if url.trim().is_empty() {
+            return Err(AppError::McpValidation(
+                "http 类型的 MCP 服务器缺少 url 字段".into(),
+            ));
+        }
+    }
+    if is_sse {
+        let url = spec.get("url").and_then(|x| x.as_str()).unwrap_or("");
+        if url.trim().is_empty() {
+            return Err(AppError::McpValidation(
+                "sse 类型的 MCP 服务器缺少 url 字段".into(),
+            ));
+        }
+    }
+    Ok(())
+}
+
+/// 从 MCP 条目中提取服务器规范
+pub fn extract_server_spec(entry: &Value) -> Result<Value, AppError> {
+    let obj = entry
+        .as_object()
+        .ok_or_else(|| AppError::McpValidation("MCP 服务器条目必须为 JSON 对象".into()))?;
+    let server = obj
+        .get("server")
+        .ok_or_else(|| AppError::McpValidation("MCP 服务器条目缺少 server 字段".into()))?;
+
+    if !server.is_object() {
+        return Err(AppError::McpValidation(
+            "MCP 服务器 server 字段必须为 JSON 对象".into(),
+        ));
+    }
+
+    Ok(server.clone())
+}
@@ -13,8 +13,6 @@ use serde::Deserialize;
 use serde_json::Value;

 use crate::app_config::AppType;
-use crate::codex_config::write_codex_live_atomic;
-use crate::config::{get_claude_settings_path, write_json_file};
 use crate::error::AppError;
 use crate::provider::{Provider, UsageResult};
 use crate::services::mcp::McpService;
@@ -329,36 +327,6 @@ impl ProviderService {
        .await
    }

-    #[allow(dead_code)]
-    fn write_codex_live(provider: &Provider) -> Result<(), AppError> {
-        let settings = provider
-            .settings_config
-            .as_object()
-            .ok_or_else(|| AppError::Config("Codex 配置必须是 JSON 对象".into()))?;
-        let auth = settings
-            .get("auth")
-            .ok_or_else(|| AppError::Config(format!("供应商 {} 缺少 auth 配置", provider.id)))?;
-        if !auth.is_object() {
-            return Err(AppError::Config(format!(
-                "供应商 {} 的 auth 必须是对象",
-                provider.id
-            )));
-        }
-        let cfg_text = settings.get("config").and_then(Value::as_str);
-
-        write_codex_live_atomic(auth, cfg_text)?;
-        Ok(())
-    }
-
-    #[allow(dead_code)]
-    fn write_claude_live(provider: &Provider) -> Result<(), AppError> {
-        let settings_path = get_claude_settings_path();
-        let mut content = provider.settings_config.clone();
-        let _ = normalize_claude_models_in_value(&mut content);
-        write_json_file(&settings_path, &content)?;
-        Ok(())
-    }
-
    pub(crate) fn write_gemini_live(provider: &Provider) -> Result<(), AppError> {
        write_gemini_live(provider)
    }
@@ -557,15 +525,6 @@ impl ProviderService {
            }
        }
    }
-
-    #[allow(dead_code)]
-    fn app_not_found(app_type: &AppType) -> AppError {
-        AppError::localized(
-            "provider.app_not_found",
-            format!("应用类型不存在: {app_type:?}"),
-            format!("App type not found: {app_type:?}"),
-        )
-    }
 }

 /// Normalize Claude model keys in a JSON value
@@ -0,0 +1,300 @@
+//! 托盘菜单管理模块
+//!
+//! 负责系统托盘图标和菜单的创建、更新和事件处理。
+
+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.0",
+  "version": "3.8.2",
  "identifier": "com.ccswitch.desktop",
  "build": {
    "frontendDist": "../dist",
@@ -303,20 +303,25 @@ function App() {
        return <AgentsPanel onOpenChange={() => setCurrentView("providers")} />;
      default:
        return (
-          <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 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>
        );
    }
@@ -40,11 +40,7 @@ export function ConfirmDialog({
        }
      }}
    >
-      <DialogContent
-        className="max-w-sm"
-        zIndex="alert"
-        overlayClassName="bg-background/80"
-      >
+      <DialogContent className="max-w-sm" zIndex="alert">
        <DialogHeader className="space-y-3 border-b-0 bg-transparent pb-0">
          <DialogTitle className="flex items-center gap-2 text-lg font-semibold">
            <AlertTriangle className="h-5 w-5 text-destructive" />
@@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import { Save } from "lucide-react";
 import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
 import {
  Dialog,
  DialogContent,
@@ -224,16 +225,21 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({

  return (
    <Dialog open={isOpen} onOpenChange={(open) => !open && handleClose()}>
-      <DialogContent className="max-w-2xl max-h-[90vh] flex flex-col">
-        <DialogHeader>
-          <DialogTitle>{t("mcp.wizard.title")}</DialogTitle>
+      <DialogContent
+        className="max-w-2xl max-h-[90vh] flex flex-col"
+        zIndex="alert"
+      >
+        <DialogHeader className="space-y-3 border-b-0 bg-transparent pb-0">
+          <DialogTitle className="text-lg font-semibold">
+            {t("mcp.wizard.title")}
+          </DialogTitle>
        </DialogHeader>

        {/* Content */}
        <div className="flex-1 overflow-y-auto px-6 py-4 space-y-4">
          {/* Hint */}
-          <div className="rounded-lg border border-border-active bg-blue-50 p-3  dark:bg-blue-900/20">
-            <p className="text-sm text-blue-800 dark:text-blue-200">
+          <div className="rounded-lg border border-border-default bg-gray-100/50 dark:bg-gray-800/50 p-3">
+            <p className="text-sm text-gray-500 dark:text-gray-400">
              {t("mcp.wizard.hint")}
            </p>
          </div>
@@ -254,7 +260,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                    onChange={(e) =>
                      setWizardType(e.target.value as "stdio" | "http" | "sse")
                    }
-                    className="w-4 h-4 text-emerald-500 bg-white dark:bg-gray-800 border-border-default  focus:ring-emerald-500 dark:focus:ring-emerald-400 focus:ring-2"
+                    className="w-4 h-4 accent-blue-500"
                  />
                  <span className="text-sm text-gray-900 dark:text-gray-100">
                    {t("mcp.wizard.typeStdio")}
@@ -268,7 +274,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                    onChange={(e) =>
                      setWizardType(e.target.value as "stdio" | "http" | "sse")
                    }
-                    className="w-4 h-4 text-emerald-500 bg-white dark:bg-gray-800 border-border-default  focus:ring-emerald-500 dark:focus:ring-emerald-400 focus:ring-2"
+                    className="w-4 h-4 accent-blue-500"
                  />
                  <span className="text-sm text-gray-900 dark:text-gray-100">
                    {t("mcp.wizard.typeHttp")}
@@ -282,7 +288,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                    onChange={(e) =>
                      setWizardType(e.target.value as "stdio" | "http" | "sse")
                    }
-                    className="w-4 h-4 text-emerald-500 bg-white dark:bg-gray-800 border-border-default  focus:ring-emerald-500 dark:focus:ring-emerald-400 focus:ring-2"
+                    className="w-4 h-4 accent-blue-500"
                  />
                  <span className="text-sm text-gray-900 dark:text-gray-100">
                    {t("mcp.wizard.typeSse")}
@@ -296,13 +302,13 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
              <label className="mb-1 block text-sm font-medium text-gray-900 dark:text-gray-100">
                {t("mcp.form.title")} <span className="text-red-500">*</span>
              </label>
-              <input
+              <Input
                type="text"
                value={wizardTitle}
                onChange={(e) => setWizardTitle(e.target.value)}
                onKeyDown={handleKeyDown}
                placeholder={t("mcp.form.titlePlaceholder")}
-                className="w-full rounded-lg border border-border-default px-3 py-2 text-sm font-mono focus:outline-none focus:ring-2 focus:ring-emerald-500/20  dark:bg-gray-800 dark:text-gray-100"
+                className="font-mono"
              />
            </div>

@@ -315,13 +321,13 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                    {t("mcp.wizard.command")}{" "}
                    <span className="text-red-500">*</span>
                  </label>
-                  <input
+                  <Input
                    type="text"
                    value={wizardCommand}
                    onChange={(e) => setWizardCommand(e.target.value)}
                    onKeyDown={handleKeyDown}
                    placeholder={t("mcp.wizard.commandPlaceholder")}
-                    className="w-full rounded-lg border border-border-default px-3 py-2 text-sm font-mono focus:outline-none focus:ring-2 focus:ring-emerald-500/20  dark:bg-gray-800 dark:text-gray-100"
+                    className="font-mono"
                  />
                </div>

@@ -335,7 +341,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                    onChange={(e) => setWizardArgs(e.target.value)}
                    placeholder={t("mcp.wizard.argsPlaceholder")}
                    rows={3}
-                    className="w-full rounded-lg border border-border-default px-3 py-2 text-sm font-mono focus:outline-none focus:ring-2 focus:ring-emerald-500/20  dark:bg-gray-800 dark:text-gray-100 resize-y"
+                    className="w-full rounded-md border border-border-default bg-white dark:bg-gray-800 px-3 py-2 text-sm font-mono text-gray-900 dark:text-gray-100 placeholder:text-gray-400 dark:placeholder:text-gray-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 resize-y"
                  />
                </div>

@@ -349,7 +355,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                    onChange={(e) => setWizardEnv(e.target.value)}
                    placeholder={t("mcp.wizard.envPlaceholder")}
                    rows={3}
-                    className="w-full rounded-lg border border-border-default px-3 py-2 text-sm font-mono focus:outline-none focus:ring-2 focus:ring-emerald-500/20  dark:bg-gray-800 dark:text-gray-100 resize-y"
+                    className="w-full rounded-md border border-border-default bg-white dark:bg-gray-800 px-3 py-2 text-sm font-mono text-gray-900 dark:text-gray-100 placeholder:text-gray-400 dark:placeholder:text-gray-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 resize-y"
                  />
                </div>
              </>
@@ -364,13 +370,13 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                    {t("mcp.wizard.url")}{" "}
                    <span className="text-red-500">*</span>
                  </label>
-                  <input
+                  <Input
                    type="text"
                    value={wizardUrl}
                    onChange={(e) => setWizardUrl(e.target.value)}
                    onKeyDown={handleKeyDown}
                    placeholder={t("mcp.wizard.urlPlaceholder")}
-                    className="w-full rounded-lg border border-border-default px-3 py-2 text-sm font-mono focus:outline-none focus:ring-2 focus:ring-emerald-500/20  dark:bg-gray-800 dark:text-gray-100"
+                    className="font-mono"
                  />
                </div>

@@ -384,7 +390,7 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
                    onChange={(e) => setWizardHeaders(e.target.value)}
                    placeholder={t("mcp.wizard.headersPlaceholder")}
                    rows={3}
-                    className="w-full rounded-lg border border-border-default px-3 py-2 text-sm font-mono focus:outline-none focus:ring-2 focus:ring-emerald-500/20  dark:bg-gray-800 dark:text-gray-100 resize-y"
+                    className="w-full rounded-md border border-border-default bg-white dark:bg-gray-800 px-3 py-2 text-sm font-mono text-gray-900 dark:text-gray-100 placeholder:text-gray-400 dark:placeholder:text-gray-500 focus:outline-none focus:ring-2 focus:ring-blue-500/20 resize-y"
                  />
                </div>
              </>
@@ -397,11 +403,11 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
            wizardEnv ||
            wizardUrl ||
            wizardHeaders) && (
-            <div className="space-y-2 border-t border-border-default pt-4 ">
+            <div className="space-y-2 border-t border-border-default pt-4">
              <h3 className="text-sm font-medium text-gray-900 dark:text-gray-100">
                {t("mcp.wizard.preview")}
              </h3>
-              <pre className="overflow-x-auto rounded-lg bg-gray-50 p-3 text-xs font-mono text-gray-700 dark:bg-gray-800 dark:text-gray-300">
+              <pre className="overflow-x-auto rounded-lg bg-gray-100 dark:bg-gray-800 p-3 text-xs font-mono text-gray-700 dark:text-gray-300">
                {preview}
              </pre>
            </div>
@@ -409,11 +415,11 @@ const McpWizardModal: React.FC<McpWizardModalProps> = ({
        </div>

        {/* Footer */}
-        <DialogFooter className="gap-3 pt-4">
-          <Button type="button" variant="ghost" onClick={handleClose}>
+        <DialogFooter className="flex gap-2 border-t-0 bg-transparent pt-2 sm:justify-end">
+          <Button variant="outline" onClick={handleClose}>
            {t("common.cancel")}
          </Button>
-          <Button type="button" variant="mcp" onClick={handleApply}>
+          <Button variant="mcp" onClick={handleApply}>
            <Save className="h-4 w-4" />
            {t("mcp.wizard.apply")}
          </Button>
@@ -116,9 +116,7 @@ export function ProviderCard({
      className={cn(
        "glass-card relative overflow-hidden rounded-xl p-4 transition-all duration-300",
        "group hover:bg-black/[0.02] dark:hover:bg-white/[0.02] hover:border-primary/50",
-        isCurrent
-          ? "border-primary/50 bg-primary/5 shadow-[0_0_20px_rgba(59,130,246,0.15)]"
-          : "hover:scale-[1.01]",
+        isCurrent ? "glass-card-active" : "hover:scale-[1.01]",
        dragHandleProps?.isDragging &&
          "cursor-grabbing border-primary shadow-lg scale-105 z-10",
      )}
@@ -41,7 +41,7 @@ export function useBaseUrlState({
    try {
      const config = JSON.parse(settingsConfig || "{}");
      const envUrl: unknown = config?.env?.ANTHROPIC_BASE_URL;
-      if (typeof envUrl === "string" && envUrl && envUrl !== baseUrl) {
+      if (typeof envUrl === "string" && envUrl && envUrl.trim() !== baseUrl) {
        setBaseUrl(envUrl.trim());
      }
    } catch {
@@ -73,8 +73,7 @@ export function useBaseUrlState({
    try {
      const config = JSON.parse(settingsConfig || "{}");
      const envUrl: unknown = config?.env?.GOOGLE_GEMINI_BASE_URL;
-      const nextUrl =
-        typeof envUrl === "string" ? envUrl.trim().replace(/\/+$/, "") : "";
+      const nextUrl = typeof envUrl === "string" ? envUrl.trim() : "";
      if (nextUrl !== geminiBaseUrl) {
        setGeminiBaseUrl(nextUrl);
        setBaseUrl(nextUrl); // 也更新 baseUrl 用于 UI
@@ -87,7 +86,7 @@ export function useBaseUrlState({
  // 处理 Claude Base URL 变化
  const handleClaudeBaseUrlChange = useCallback(
    (url: string) => {
-      const sanitized = url.trim().replace(/\/+$/, "");
+      const sanitized = url.trim();
      setBaseUrl(sanitized);
      isUpdatingRef.current = true;

@@ -112,7 +111,7 @@ export function useBaseUrlState({
  // 处理 Codex Base URL 变化
  const handleCodexBaseUrlChange = useCallback(
    (url: string) => {
-      const sanitized = url.trim().replace(/\/+$/, "");
+      const sanitized = url.trim();
      setCodexBaseUrl(sanitized);

      if (!sanitized || !onCodexConfigChange) {
@@ -136,7 +135,7 @@ export function useBaseUrlState({
  // 处理 Gemini Base URL 变化
  const handleGeminiBaseUrlChange = useCallback(
    (url: string) => {
-      const sanitized = url.trim().replace(/\/+$/, "");
+      const sanitized = url.trim();
      setGeminiBaseUrl(sanitized);
      setBaseUrl(sanitized); // 也更新 baseUrl 用于 UI
      isUpdatingRef.current = true;
@@ -162,7 +162,7 @@ export function useCodexConfigState({ initialData }: UseCodexConfigStateProps) {
  // 处理 Codex Base URL 变化
  const handleCodexBaseUrlChange = useCallback(
    (url: string) => {
-      const sanitized = url.trim().replace(/\/+$/, "");
+      const sanitized = url.trim();
      setCodexBaseUrl(sanitized);

      if (!sanitized) {
@@ -151,7 +151,7 @@ export function SettingsPage({
  const isBusy = useMemo(() => isLoading && !settings, [isLoading, settings]);

  return (
-    <div className="mx-auto max-w-[56rem] flex flex-col h-[calc(100vh-8rem)] px-6">
+    <div className="mx-auto max-w-[56rem] flex flex-col h-[calc(100vh-8rem)] overflow-hidden px-6">
      {isBusy ? (
        <div className="flex flex-1 items-center justify-center">
          <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
@@ -172,7 +172,7 @@ export function SettingsPage({
            <TabsTrigger value="about">{t("common.about")}</TabsTrigger>
          </TabsList>

-          <div className="flex-1 overflow-y-auto pr-2">
+          <div className="flex-1 overflow-y-auto overflow-x-hidden pr-2">
            <TabsContent value="general" className="space-y-6 mt-0">
              {settings ? (
                <>
@@ -90,7 +90,7 @@ export function RepoManagerPanel({
      onClose={onClose}
    >
      {/* 添加仓库表单 */}
-      <div className="space-y-4 glass rounded-xl p-6 border border-white/10">
+      <div className="space-y-4 glass-card rounded-xl p-6">
        <h3 className="text-base font-semibold text-foreground">
          添加技能仓库
        </h3>
@@ -139,7 +139,7 @@ export function RepoManagerPanel({
          {t("skills.repo.list")}
        </h3>
        {repos.length === 0 ? (
-          <div className="text-center py-12 glass rounded-xl border border-white/10">
+          <div className="text-center py-12 glass-card rounded-xl">
            <p className="text-sm text-muted-foreground">
              {t("skills.repo.empty")}
            </p>
@@ -149,7 +149,7 @@ export function RepoManagerPanel({
            {repos.map((repo) => (
              <div
                key={`${repo.owner}/${repo.name}`}
-                className="flex items-center justify-between rounded-xl border border-white/10 bg-gray-900/40 px-4 py-3"
+                className="flex items-center justify-between glass-card rounded-xl px-4 py-3"
              >
                <div>
                  <div className="text-sm font-medium text-foreground">
@@ -57,7 +57,7 @@ export function SkillCard({ skill, onInstall, onUninstall }: SkillCardProps) {
    skill.directory.trim().toLowerCase() !== skill.name.trim().toLowerCase();

  return (
-    <Card className="glass flex flex-col h-full border border-white/10 bg-gray-900/40 transition-all duration-300 hover:bg-gray-900/60 hover:border-white/20 hover:shadow-lg group relative overflow-hidden">
+    <Card className="glass-card flex flex-col h-full transition-all duration-300 hover:scale-[1.01] hover:shadow-lg group relative overflow-hidden">
      <div className="absolute inset-0 bg-gradient-to-br from-primary/5 to-transparent opacity-0 group-hover:opacity-100 transition-opacity duration-500 pointer-events-none" />
      <CardHeader className="pb-3">
        <div className="flex items-start justify-between gap-2">
@@ -96,7 +96,7 @@ export function SkillCard({ skill, onInstall, onUninstall }: SkillCardProps) {
          {skill.description || t("skills.noDescription")}
        </p>
      </CardContent>
-      <CardFooter className="flex gap-2 pt-3 border-t border-white/5 relative z-10">
+      <CardFooter className="flex gap-2 pt-3 border-t border-border/50 relative z-10">
        {skill.readmeUrl && (
          <Button
            variant="ghost"
@@ -205,12 +205,10 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
    }, [skills, searchQuery, filterStatus]);

    return (
-      <div className="flex flex-col h-full min-h-0 bg-background/50">
-        {/* 顶部操作栏（固定区域）已移除，由 App.tsx 接管 */}
-
+      <div className="mx-auto max-w-[56rem] px-6 flex flex-col h-[calc(100vh-8rem)] overflow-hidden bg-background/50">
        {/* 技能网格（可滚动详情区域） */}
-        <div className="flex-1 min-h-0 overflow-y-auto animate-fade-in">
-          <div className="mx-auto max-w-[56rem] px-6 py-4">
+        <div className="flex-1 overflow-y-auto overflow-x-hidden animate-fade-in">
+          <div className="py-4">
            {loading ? (
              <div className="flex items-center justify-center h-64">
                <RefreshCw className="h-8 w-8 animate-spin text-muted-foreground" />
@@ -263,19 +261,19 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
                      <SelectContent className="bg-card text-foreground shadow-lg">
                        <SelectItem
                          value="all"
-                          className="text-left pr-3 [&[data-state=checked]>span]:hidden"
+                          className="text-left pr-3 [&[data-state=checked]>span:first-child]:hidden"
                        >
                          {t("skills.filter.all")}
                        </SelectItem>
                        <SelectItem
                          value="installed"
-                          className="text-left pr-3 [&[data-state=checked]>span]:hidden"
+                          className="text-left pr-3 [&[data-state=checked]>span:first-child]:hidden"
                        >
                          {t("skills.filter.installed")}
                        </SelectItem>
                        <SelectItem
                          value="uninstalled"
-                          className="text-left pr-3 [&[data-state=checked]>span]:hidden"
+                          className="text-left pr-3 [&[data-state=checked]>span:first-child]:hidden"
                        >
                          {t("skills.filter.uninstalled")}
                        </SelectItem>
@@ -69,10 +69,10 @@ export const providerPresets: ProviderPreset[] = [
      env: {
        ANTHROPIC_BASE_URL: "https://api.deepseek.com/anthropic",
        ANTHROPIC_AUTH_TOKEN: "",
-        ANTHROPIC_MODEL: "DeepSeek-V3.2-Exp",
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: "DeepSeek-V3.2-Exp",
-        ANTHROPIC_DEFAULT_SONNET_MODEL: "DeepSeek-V3.2-Exp",
-        ANTHROPIC_DEFAULT_OPUS_MODEL: "DeepSeek-V3.2-Exp",
+        ANTHROPIC_MODEL: "DeepSeek-V3.2",
+        ANTHROPIC_DEFAULT_HAIKU_MODEL: "DeepSeek-V3.2",
+        ANTHROPIC_DEFAULT_SONNET_MODEL: "DeepSeek-V3.2",
+        ANTHROPIC_DEFAULT_OPUS_MODEL: "DeepSeek-V3.2",
      },
    },
    category: "cn_official",
@@ -184,7 +184,7 @@ export const providerPresets: ProviderPreset[] = [
        ANTHROPIC_DEFAULT_OPUS_MODEL: "ZhipuAI/GLM-4.6",
      },
    },
-    category: "aggregator"
+    category: "aggregator",
  },
  {
    name: "KAT-Coder",
@@ -232,7 +232,7 @@ export const providerPresets: ProviderPreset[] = [
  {
    name: "MiniMax",
    websiteUrl: "https://platform.minimaxi.com",
-    apiKeyUrl: "https://platform.minimax.io/subscribe/coding-plan",
+    apiKeyUrl: "https://platform.minimaxi.com/subscribe/coding-plan",
    settingsConfig: {
      env: {
        ANTHROPIC_BASE_URL: "https://api.minimaxi.com/anthropic",
@@ -257,11 +257,11 @@ export const providerPresets: ProviderPreset[] = [
  },
  {
    name: "MiniMax en",
-    websiteUrl: "https://platform.minimaxi.io",
+    websiteUrl: "https://platform.minimax.io",
    apiKeyUrl: "https://platform.minimax.io/subscribe/coding-plan",
    settingsConfig: {
      env: {
-        ANTHROPIC_BASE_URL: "https://api.minimaxi.io/anthropic",
+        ANTHROPIC_BASE_URL: "https://api.minimax.io/anthropic",
        ANTHROPIC_AUTH_TOKEN: "",
        API_TIMEOUT_MS: "3000000",
        CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: 1,
@@ -313,7 +313,7 @@ export const providerPresets: ProviderPreset[] = [
        ANTHROPIC_DEFAULT_OPUS_MODEL: "Ling-1T",
      },
    },
-    category: "cn_official"
+    category: "cn_official",
  },
  {
    name: "AiHubMix",
@@ -40,7 +40,7 @@ export function generateThirdPartyAuth(apiKey: string): Record<string, any> {
 export function generateThirdPartyConfig(
  providerName: string,
  baseUrl: string,
-  modelName = "gpt-5-codex",
+  modelName = "gpt-5.1-codex",
 ): string {
  // 清理供应商名称，确保符合TOML键名规范
  const cleanProviderName =
@@ -85,7 +85,7 @@ export const codexProviderPresets: CodexProviderPreset[] = [
    isOfficial: true,
    auth: generateThirdPartyAuth(""),
    config: `model_provider = "azure"
-model = "gpt-5-codex"
+model = "gpt-5.1-codex"
 model_reasoning_effort = "high"
 disable_response_storage = true

@@ -113,7 +113,7 @@ requires_openai_auth = true`,
    config: generateThirdPartyConfig(
      "aihubmix",
      "https://aihubmix.com/v1",
-      "gpt-5-codex",
+      "gpt-5.1-codex",
    ),
    endpointCandidates: [
      "https://aihubmix.com/v1",
@@ -128,7 +128,7 @@ requires_openai_auth = true`,
    config: generateThirdPartyConfig(
      "dmxapi",
      "https://www.dmxapi.cn/v1",
-      "gpt-5-codex",
+      "gpt-5.1-codex",
    ),
    endpointCandidates: ["https://www.dmxapi.cn/v1"],
  },
@@ -141,7 +141,7 @@ requires_openai_auth = true`,
    config: generateThirdPartyConfig(
      "packycode",
      "https://www.packyapi.com/v1",
-      "gpt-5-codex",
+      "gpt-5.1-codex",
    ),
    endpointCandidates: [
      "https://www.packyapi.com/v1",
@@ -272,7 +272,7 @@
    "fastModel": "Fast Model (optional)",
    "fastModelPlaceholder": "e.g., GLM-4.5-Air",
    "modelHint": "💡 Leave blank to use provider's default model",
-    "apiHint": "💡 Fill in Claude API compatible service endpoint",
+    "apiHint": "💡 Fill in Claude API compatible service endpoint, avoid trailing slash",
    "codexApiHint": "💡 Fill in service endpoint compatible with OpenAI Response format",
    "fillSupplierName": "Please fill in provider name",
    "fillConfigContent": "Please fill in configuration content",
@@ -272,7 +272,7 @@
    "fastModel": "高速モデル（任意）",
    "fastModelPlaceholder": "例: GLM-4.5-Air",
    "modelHint": "💡 空欄ならプロバイダーのデフォルトモデルを使用します",
-    "apiHint": "💡 Claude API 互換サービスのエンドポイントを入力してください",
+    "apiHint": "💡 Claude API 互換サービスのエンドポイントを入力してください。末尾にスラッシュを付けないでください",
    "codexApiHint": "💡 OpenAI Response 互換のサービスエンドポイントを入力してください",
    "fillSupplierName": "プロバイダー名を入力してください",
    "fillConfigContent": "設定内容を入力してください",
@@ -272,7 +272,7 @@
    "fastModel": "快速模型 (可选)",
    "fastModelPlaceholder": "例如: GLM-4.5-Air",
    "modelHint": "💡 留空将使用供应商的默认模型",
-    "apiHint": "💡 填写兼容 Claude API 的服务端点地址",
+    "apiHint": "💡 填写兼容 Claude API 的服务端点地址，不要以斜杠结尾",
    "codexApiHint": "💡 填写兼容 OpenAI Response 格式的服务端点地址",
    "fillSupplierName": "请填写供应商名称",
    "fillConfigContent": "请填写配置内容",
@@ -70,7 +70,6 @@
  }
 }

-/* Glassmorphism Utilities */
 /* Glassmorphism Utilities */
 .glass {
  background: rgba(255, 255, 255, 0.7);
@@ -104,6 +103,19 @@
  box-shadow: 0 8px 32px 0 rgba(0, 0, 0, 0.37);
 }

+/* 供应商卡片选中状态 */
+.glass-card-active {
+  background: rgba(59, 130, 246, 0.08);
+  border: 1px solid rgba(59, 130, 246, 0.4);
+  box-shadow: 0 0 20px rgba(59, 130, 246, 0.15);
+}
+
+.dark .glass-card-active {
+  background: rgba(59, 130, 246, 0.12);
+  border: 1px solid rgba(59, 130, 246, 0.3);
+  box-shadow: 0 0 24px rgba(59, 130, 246, 0.2);
+}
+
 .glass-header {
  background: hsl(var(--background));
  backdrop-filter: none;
@@ -131,6 +143,8 @@
 /* 全局基础样式 */
 * {
  box-sizing: border-box;
+  scrollbar-width: none; /* Firefox */
+  -ms-overflow-style: none; /* IE 10+ */
 }

 html {
@@ -158,16 +172,6 @@ html.dark {
  display: none;
 }

-/* Firefox */
-* {
-  scrollbar-width: none;
-}
-
-/* IE 10+ */
-* {
-  -ms-overflow-style: none;
-}
-
 /* 焦点样式 */
 *:focus-visible {
  @apply outline-2 outline-blue-500 outline-offset-2;
@@ -453,7 +453,7 @@ export const setCodexBaseUrl = (
  // 归一化原文本中的引号（既能匹配，也能输出稳定格式）
  const normalizedText = normalizeQuotes(configText);

-  const normalizedUrl = trimmed.replace(/\s+/g, "").replace(/\/+$/, "");
+  const normalizedUrl = trimmed.replace(/\s+/g, "");
  const replacementLine = `base_url = "${normalizedUrl}"`;
  const pattern = /base_url\s*=\s*(["'])([^"']+)\1/;

@@ -8,6 +8,40 @@ export default {
  theme: {
    extend: {
      colors: {
+        // shadcn/ui CSS 变量映射
+        background: "hsl(var(--background))",
+        foreground: "hsl(var(--foreground))",
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
+        },
+        popover: {
+          DEFAULT: "hsl(var(--popover))",
+          foreground: "hsl(var(--popover-foreground))",
+        },
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
+        },
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
+        },
+        muted: {
+          DEFAULT: "hsl(var(--muted))",
+          foreground: "hsl(var(--muted-foreground))",
+        },
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
+        },
+        destructive: {
+          DEFAULT: "hsl(var(--destructive))",
+          foreground: "hsl(var(--destructive-foreground))",
+        },
+        border: "hsl(var(--border))",
+        input: "hsl(var(--input))",
+        ring: "hsl(var(--ring))",
        // macOS 风格系统蓝
        blue: {
          400: '#409CFF',
Author	SHA1	Message	Date
Jason	3230b0e094	chore: bump version to 3.8.2	2025-12-01 22:41:43 +08:00
Jason	2347ac0ee0	fix(config): update DeepSeek default model from Exp to stable version	2025-12-01 22:37:01 +08:00
Jason	58c5468bf6	fix(ui): prevent provider card hover scale from being clipped Move 1px of horizontal padding from outer container to inner scroll container, providing buffer space for the hover scale-[1.01] effect without being cut off by overflow-hidden.	2025-12-01 16:03:20 +08:00
Jason	98084d61aa	fix(ui): add independent scroll containers to fix scroll wheel on Linux Providers page was using DndContext which may interfere with scroll wheel events on Linux/Ubuntu WebKitGTK. Added independent scroll containers with `overflow-y-auto` to all main pages, matching the pattern already used by the MCP panel which works correctly. Changes: - App.tsx: Wrap ProviderList in independent scroll container - SkillsPage: Use consistent h-[calc(100vh-8rem)] layout - SettingsPage: Add overflow-hidden and overflow-x-hidden for consistency	2025-12-01 11:28:01 +08:00
Jason	a627e1bb50	fix(config): update Codex default model and correct MiniMax URL - Update Codex preset model from gpt-5-codex to gpt-5.1-codex - Fix MiniMax English preset URL from minimaxi.io to minimax.io	2025-12-01 11:08:53 +08:00
Jason	04a588694b	chore: bump version to 3.8.1	2025-11-30 23:39:05 +08:00
Jason	f5f7dfed8c	style: apply code formatting fixes - Fix Prettier formatting in claudeProviderPresets.ts - Fix cargo fmt trailing blank line in provider/mod.rs	2025-11-30 23:30:27 +08:00
Jason	5888c56f2a	fix(config): correct MiniMax apiKeyUrl to minimaxi.com Update apiKeyUrl domain to match official website URL. Also update screenshots for all locales (en, ja, zh).	2025-11-30 23:03:09 +08:00
Jason	c5cadb73bc	fix(config): correct MiniMax apiKeyUrl domain from minimax.io to minimax.com	2025-11-29 23:03:19 +08:00
Jason	17948ee031	docs: update screenshots and add Japanese locale images - Update README_JA.md to reference Japanese screenshots - Add Japanese screenshots (main-ja.png, add-ja.png) - Update English and Chinese screenshots with latest UI - Remove outdated README_i18n.md documentation	2025-11-29 22:14:11 +08:00
Jason	2643595012	fix(skills): target first span only when hiding select checkmark indicator	2025-11-29 21:36:16 +08:00
Jason	6ac4d1652c	fix(skills): use theme-aware glass-card class for light mode compatibility Replace hardcoded dark mode styles (bg-gray-900/40, border-white/10) with the unified glass-card class that adapts to both light and dark themes.	2025-11-29 21:18:51 +08:00
Jason	3bf37cf0ff	refactor(url): remove automatic trailing slash stripping from base URL inputs - Remove `.replace(/\/+$/, "")` from all base URL handlers in useBaseUrlState.ts - Remove trailing slash stripping in useCodexConfigState.ts - Remove trailing slash normalization in providerConfigUtils.ts setCodexBaseUrl() - Update i18n hints (en/ja/zh) to instruct users to avoid trailing slashes This gives users explicit control over URL format rather than silently modifying input.	2025-11-29 20:52:29 +08:00
Jason	526c7406fa	fix(ui): persist active provider card highlight when not hovered The selected provider's visual highlight (background, border, glow) was being overridden by .glass-card base styles due to CSS specificity. Add dedicated .glass-card-active class to ensure active state persists.	2025-11-29 20:19:17 +08:00
Jason	9db85dd4dc	style(css): consolidate global selector rules and remove duplicates - Merge three separate `*` selector blocks into one for better maintainability - Remove duplicate "Glassmorphism Utilities" comment	2025-11-29 20:03:19 +08:00
Jason	0f333d9e5b	fix(tailwind): add missing shadcn/ui color mappings for opaque dialog backgrounds The dialog backgrounds were transparent because Tailwind 3 requires explicit color mappings in the config to use CSS variables. Added standard shadcn/ui color mappings (background, foreground, card, primary, etc.) and removed unnecessary overlayClassName overrides from dialog components.	2025-11-29 19:49:55 +08:00
Jason	ba875552a6	style(mcp): align wizard modal with confirm dialog styling - Use zIndex="alert" and semi-transparent overlay for consistency - Apply border-b-0/border-t-0 bg-transparent to header/footer - Replace emerald accent with blue to match app theme - Use Input component instead of raw input elements - Simplify button variants (outline for cancel)	2025-11-29 17:41:12 +08:00
Jason	75e7f9d731	chore: remove dead code from MCP and provider modules - Remove unused `read_mcp_json` from gemini_mcp.rs - Remove unused `normalize_server_keys` from mcp/claude.rs - Remove unused `validate_mcp_entry` from mcp/validation.rs - Remove unused `write_codex_live`, `write_claude_live`, `app_not_found` from services/provider/mod.rs - Clean up unused imports	2025-11-29 16:24:22 +08:00
Jason	7e6074a9a9	refactor(mcp): modularize MCP and tray menu logic Split mcp.rs (1135 lines) into focused modules: - validation.rs: server config validation - claude.rs: Claude MCP sync/import - codex.rs: Codex MCP sync (TOML handling) - gemini.rs: Gemini MCP sync/import Extract tray menu logic from lib.rs to tray.rs for better separation of concerns.	2025-11-29 10:29:10 +08:00