docs(changelog): add macOS tray template icon entry

feat(tray): use macOS tray template icon
Cherry-picked from main (f047960)
2026-07-26 06:24:32 +08:00 · 2025-12-24 15:16:48 +08:00 · 2025-12-24 14:41:28 +08:00 · 2025-12-24 11:33:05 +08:00 · 2025-12-24 11:06:48 +08:00 · 2025-12-23 23:25:55 +08:00
80 changed files with 2027 additions and 1287 deletions
@@ -5,6 +5,34 @@ All notable changes to CC Switch will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

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

 ### Major Updates
@@ -2,8 +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)
-[![Trending](https://img.shields.io/badge/🔥_TypeScript_Trending-Daily%20%7C%20Weekly%20%7C%20Monthly-ff6b6b.svg)](https://github.com/trending/typescript)
+[![Version](https://img.shields.io/badge/version-3.8.2-blue.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Built with Tauri](https://img.shields.io/badge/built%20with-Tauri%202-orange.svg)](https://tauri.app/)
 [![Downloads](https://img.shields.io/endpoint?url=https://api.pinstudios.net/api/badges/downloads/farion1231/cc-switch/total)](https://github.com/farion1231/cc-switch/releases/latest)
@@ -12,21 +11,13 @@

 English | [中文](README_ZH.md) | [日本語](README_JA.md) | [Changelog](CHANGELOG.md)

-**From Provider Switcher to All-in-One AI CLI Management Platform**
-
-Unified management for Claude Code, Codex & Gemini CLI provider configurations, MCP servers, Skills extensions, and system prompts.
-
 </div>

 ## ❤️Sponsor

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

-This project is sponsored by Z.ai, supporting us with their GLM CODING PLAN.
-
-GLM CODING PLAN is a subscription service designed for AI coding, starting at just $3/month. It provides access to their flagship GLM-4.6 model across 10+ popular AI coding tools (Claude Code, Cline, Roo Code, etc.), offering developers top-tier, fast, and stable coding experiences.
-
-Get 10% OFF the GLM CODING PLAN with [this link](https://z.ai/subscribe?ic=8JVLJQFSKB)!
+This project is sponsored by Z.ai, supporting us with their GLM CODING PLAN.GLM CODING PLAN is a subscription service designed for AI coding, starting at just $3/month. It provides access to their flagship GLM-4.6 model across 10+ popular AI coding tools (Claude Code, Cline, Roo Code, etc.), offering developers top-tier, fast, and stable coding experiences.Get 10% OFF the GLM CODING PLAN with [this link](https://z.ai/subscribe?ic=8JVLJQFSKB)!

 ---

@@ -41,6 +32,12 @@ Get 10% OFF the GLM CODING PLAN with [this link](https://z.ai/subscribe?ic=8JVLJ
 <td>Thanks to ShanDianShuo for sponsoring this project! ShanDianShuo is a local-first AI voice input: Millisecond latency, data stays on device, 4x faster than typing, AI-powered correction, Privacy-first, completely free. Doubles your coding efficiency with Claude Code! <a href="https://www.shandianshuo.cn">Free download</a> for Mac/Win</td>
 </tr>

+<tr>
+<td width="180"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></td>
+<td>Thanks to AIGoCode for sponsoring this project! AIGoCode is an all-in-one platform that integrates Claude Code, Codex, and the latest Gemini models, providing you with stable, efficient, and highly cost-effective AI coding services. The platform offers flexible subscription plans, zero risk of account suspension, direct access with no VPN required, and lightning-fast responses.AIGoCode has prepared a special benefit for CC Switch users: if you register via <a href="https://aigocode.com/invite/CC-SWITCH">this link</a>, you’ll receive an extra 10% bonus credit on your first top-up!
+</td>
+</tr>
+
 </table>

 ## Screenshots
@@ -51,7 +48,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,8 +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)
-[![Trending](https://img.shields.io/badge/🔥_TypeScript_Trending-Daily%20%7C%20Weekly%20%7C%20Monthly-ff6b6b.svg)](https://github.com/trending/typescript)
+[![Version](https://img.shields.io/badge/version-3.8.2-blue.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Built with Tauri](https://img.shields.io/badge/built%20with-Tauri%202-orange.svg)](https://tauri.app/)
 [![Downloads](https://img.shields.io/endpoint?url=https://api.pinstudios.net/api/badges/downloads/farion1231/cc-switch/total)](https://github.com/farion1231/cc-switch/releases/latest)
@@ -12,21 +11,13 @@

 [English](README.md) | [中文](README_ZH.md) | 日本語 | [Changelog](CHANGELOG.md) | [v3.8.0 リリースノート](docs/release-note-v3.8.0-en.md)

-**プロバイダスイッチャーから AI CLI 一体型管理プラットフォームへ**
-
-Claude Code・Codex・Gemini CLI のプロバイダ設定、MCP サーバー、Skills 拡張、システムプロンプトを統合管理。
-
 </div>

 ## ❤️スポンサー

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

-本プロジェクトは Z.ai の GLM CODING PLAN による支援を受けています。
-
-GLM CODING PLAN は AI コーディング向けのサブスクリプションで、月額わずか 3 ドルから。Claude Code、Cline、Roo Code など 10 以上の人気 AI コーディングツールでフラッグシップモデル GLM-4.6 を利用でき、速く安定した開発体験を提供します。
-
-[このリンク](https://z.ai/subscribe?ic=8JVLJQFSKB) から申し込むと 10% オフになります！
+本プロジェクトは Z.ai の GLM CODING PLAN による支援を受けています。GLM CODING PLAN は AI コーディング向けのサブスクリプションで、月額わずか 3 ドルから。Claude Code、Cline、Roo Code など 10 以上の人気 AI コーディングツールでフラッグシップモデル GLM-4.6 を利用でき、速く安定した開発体験を提供します。[このリンク](https://z.ai/subscribe?ic=8JVLJQFSKB) から申し込むと 10% オフになります！

 ---

@@ -41,17 +32,24 @@ GLM CODING PLAN は AI コーディング向けのサブスクリプションで
 <td>ShanDianShuo のご支援に感謝します！ShanDianShuo はローカルファーストの音声入力ツールで、ミリ秒遅延・データは端末から外に出ず・キーボード入力の 4 倍の速度・AI 自動補正・プライバシー優先で完全無料。Claude Code と組み合わせればコーディング効率が倍増します。<a href="https://www.shandianshuo.cn">Mac/Win 版を無料ダウンロード</a></td>
 </tr>

+<tr>
+<td width="180"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></td>
+<td>本プロジェクトは AIGoCode のスポンサー提供でお届けしています。AIGoCode は、Claude Code・Codex・最新の Gemini モデルを統合したオールインワンのAIコーディングプラットフォームで、安定性・高速性・コストパフォーマンスに優れた開発サービスを提供します。柔軟なサブスクリプションプランを備え、レスポンスも非常に高速です。さらに、CC Switch ユーザー向けの特典として、<a href="https://aigocode.com/invite/CC-SWITCH">このリンク</a>から登録すると、初回チャージ時に10％分のボーナスクレジットが付与されます！
+
+</td>
+</tr>
+
 </table>

 ## スクリーンショット

 |                  メイン画面                   |                  プロバイダ追加                  |
-| :-------------------------------------------: | :---------------------------------------------: |
-| ![メイン画面](assets/screenshots/main-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,8 +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)
-[![Trending](https://img.shields.io/badge/🔥_TypeScript_Trending-Daily%20%7C%20Weekly%20%7C%20Monthly-ff6b6b.svg)](https://github.com/trending/typescript)
+[![Version](https://img.shields.io/badge/version-3.8.2-blue.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/farion1231/cc-switch/releases)
 [![Built with Tauri](https://img.shields.io/badge/built%20with-Tauri%202-orange.svg)](https://tauri.app/)
 [![Downloads](https://img.shields.io/endpoint?url=https://api.pinstudios.net/api/badges/downloads/farion1231/cc-switch/total)](https://github.com/farion1231/cc-switch/releases/latest)
@@ -12,21 +11,13 @@

 [English](README.md) | 中文 | [日本語](README_JA.md) | [更新日志](CHANGELOG.md) | [v3.8.0 发布说明](docs/release-note-v3.8.0-zh.md)

-**从供应商切换器到 AI CLI 一体化管理平台**
-
-统一管理 Claude Code、Codex 与 Gemini CLI 的供应商配置、MCP 服务器、Skills 扩展和系统提示词。
-
 </div>

 ## ❤️赞助商

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

-感谢智谱AI的 GLM CODING PLAN 赞助了本项目！
-
-GLM CODING PLAN 是专为AI编码打造的订阅套餐,每月最低仅需20元，即可在十余款主流AI编码工具如 Claude Code、Cline 中畅享智谱旗舰模型 GLM-4.6，为开发者提供顶尖、高速、稳定的编码体验。
-
-CC Switch 已经预设了智谱GLM，只需要填写 key 即可一键导入编程工具。智谱AI为本软件的用户提供了特别优惠，使用[此链接](https://www.bigmodel.cn/claude-code?ic=RRVJPB5SII)购买可以享受九折优惠。
+感谢智谱AI的 GLM CODING PLAN 赞助了本项目！GLM CODING PLAN 是专为AI编码打造的订阅套餐,每月最低仅需20元，即可在十余款主流AI编码工具如 Claude Code、Cline 中畅享智谱旗舰模型 GLM-4.6，为开发者提供顶尖、高速、稳定的编码体验。CC Switch 已经预设了智谱GLM，只需要填写 key 即可一键导入编程工具。智谱AI为本软件的用户提供了特别优惠，使用[此链接](https://www.bigmodel.cn/claude-code?ic=RRVJPB5SII)购买可以享受九折优惠。

 ---

@@ -41,6 +32,11 @@ CC Switch 已经预设了智谱GLM，只需要填写 key 即可一键导入编
 <td>感谢闪电说赞助了本项目！闪电说是本地优先的 AI 语音输入法：毫秒级响应，数据不离设备；打字速度提升 4 倍，AI 智能纠错；绝对隐私安全，完全免费，配合 Claude Code 写代码效率翻倍！支持 Mac/Win 双平台，<a href="https://www.shandianshuo.cn">免费下载</a></td>
 </tr>

+<tr>
+<td width="180"><img src="assets/partners/logos/aigocode.png" alt="AIGoCode" width="150"></td>
+<td>感谢 AIGoCode 赞助了本项目！AIGoCode 是一个集成了 Claude Code、Codex 以及 Gemini 最新模型的一站式平台，为你提供稳定、高效且高性价比的AI编程服务。本站提供灵活的订阅计划，零封号风险，国内直连，无需魔法，极速响应。AIGoCode 为 CC Switch 的用户提供了特别福利，通过<a href="https://aigocode.com/invite/CC-SWITCH">此链接</a>注册的用户首次充值可以获得额外10%奖励额度！</td>
+</tr>
+
 </table>

 ## 界面预览
@@ -51,7 +47,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.3",
  "description": "All-in-One Assistant for Claude Code, Codex & Gemini CLI",
  "scripts": {
    "dev": "pnpm tauri dev",
@@ -509,6 +509,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

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

 [[package]]
 name = "cc-switch"
-version = "3.8.0"
+version = "3.8.3"
 dependencies = [
 "anyhow",
 "auto-launch",
@@ -2050,7 +2056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98"
 dependencies = [
 "byteorder",
- "png",
+ "png 0.17.16",
 ]

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

+[[package]]
+name = "image"
+version = "0.25.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+ "png 0.18.0",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -2589,6 +2608,16 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

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

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

+[[package]]
+name = "pxfm"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3cbdf373972bf78df4d3b518d07003938e2c7d1fb5891e55f9cb6df57009d84"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "quick-xml"
 version = "0.37.5"
@@ -4686,6 +4737,7 @@ dependencies = [
 "heck 0.5.0",
 "http",
 "http-range",
+ "image",
 "jni",
 "libc",
 "log",
@@ -4754,7 +4806,7 @@ dependencies = [
 "ico",
 "json-patch",
 "plist",
- "png",
+ "png 0.17.16",
 "proc-macro2",
 "quote",
 "semver",
@@ -5470,7 +5522,7 @@ dependencies = [
 "objc2-core-graphics",
 "objc2-foundation 0.3.1",
 "once_cell",
- "png",
+ "png 0.17.16",
 "serde",
 "thiserror 2.0.17",
 "windows-sys 0.59.0",
@@ -1,6 +1,6 @@
 [package]
 name = "cc-switch"
-version = "3.8.0"
+version = "3.8.3"
 description = "All-in-One Assistant for Claude Code, Codex & Gemini CLI"
 authors = ["Jason Young"]
 license = "MIT"
@@ -26,7 +26,7 @@ serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
 chrono = { version = "0.4", features = ["serde"] }
-tauri = { version = "2.8.2", features = ["tray-icon", "protocol-asset"] }
+tauri = { version = "2.8.2", features = ["tray-icon", "protocol-asset", "image-png"] }
 tauri-plugin-log = "2"
 tauri-plugin-opener = "2"
 tauri-plugin-process = "2"
@@ -105,6 +105,55 @@ pub fn read_mcp_json() -> Result<Option<String>, AppError> {
    Ok(Some(content))
 }

+/// 在 ~/.claude.json 根对象写入 hasCompletedOnboarding=true（用于跳过 Claude Code 初次安装确认）
+/// 仅增量写入该字段，其他字段保持不变
+pub fn set_has_completed_onboarding() -> Result<bool, AppError> {
+    let path = user_config_path();
+    let mut root = if path.exists() {
+        read_json_value(&path)?
+    } else {
+        serde_json::json!({})
+    };
+
+    let obj = root
+        .as_object_mut()
+        .ok_or_else(|| AppError::Config("~/.claude.json 根必须是对象".into()))?;
+
+    let already = obj
+        .get("hasCompletedOnboarding")
+        .and_then(|v| v.as_bool())
+        .unwrap_or(false);
+    if already {
+        return Ok(false);
+    }
+
+    obj.insert("hasCompletedOnboarding".into(), Value::Bool(true));
+    write_json_value(&path, &root)?;
+    Ok(true)
+}
+
+/// 删除 ~/.claude.json 根对象的 hasCompletedOnboarding 字段（恢复 Claude Code 初次安装确认）
+/// 仅增量删除该字段，其他字段保持不变
+pub fn clear_has_completed_onboarding() -> Result<bool, AppError> {
+    let path = user_config_path();
+    if !path.exists() {
+        return Ok(false);
+    }
+
+    let mut root = read_json_value(&path)?;
+    let obj = root
+        .as_object_mut()
+        .ok_or_else(|| AppError::Config("~/.claude.json 根必须是对象".into()))?;
+
+    let existed = obj.remove("hasCompletedOnboarding").is_some();
+    if !existed {
+        return Ok(false);
+    }
+
+    write_json_value(&path, &root)?;
+    Ok(true)
+}
+
 pub fn upsert_mcp_server(id: &str, spec: Value) -> Result<bool, AppError> {
    if id.trim().is_empty() {
        return Err(AppError::InvalidInput("MCP 服务器 ID 不能为空".into()));
@@ -34,3 +34,15 @@ pub async fn apply_claude_plugin_config(official: bool) -> Result<bool, String>
 pub async fn is_claude_plugin_applied() -> Result<bool, String> {
    crate::claude_plugin::is_claude_config_applied().map_err(|e| e.to_string())
 }
+
+/// Claude Code：跳过初次安装确认（写入 ~/.claude.json 的 hasCompletedOnboarding=true）
+#[tauri::command]
+pub async fn apply_claude_onboarding_skip() -> Result<bool, String> {
+    crate::claude_mcp::set_has_completed_onboarding().map_err(|e| e.to_string())
+}
+
+/// Claude Code：恢复初次安装确认（删除 ~/.claude.json 的 hasCompletedOnboarding 字段）
+#[tauri::command]
+pub async fn clear_claude_onboarding_skip() -> Result<bool, String> {
+    crate::claude_mcp::clear_has_completed_onboarding().map_err(|e| e.to_string())
+}
@@ -13,6 +13,8 @@ use std::fs;
 use std::path::{Path, PathBuf};
 use tempfile::NamedTempFile;

+const CC_SWITCH_SQL_EXPORT_HEADER: &str = "-- CC Switch SQLite 导出";
+
 impl Database {
    /// 导出为 SQLite 兼容的 SQL 文本
    pub fn export_sql(&self, target_path: &Path) -> Result<(), AppError> {
@@ -36,7 +38,8 @@ impl Database {
        }

        let sql_raw = fs::read_to_string(source_path).map_err(|e| AppError::io(source_path, e))?;
-        let sql_content = Self::sanitize_import_sql(&sql_raw);
+        let sql_content = sql_raw.trim_start_matches('\u{feff}');
+        Self::validate_cc_switch_sql_export(sql_content)?;

        // 导入前备份现有数据库
        let backup_path = self.backup_database_file()?;
@@ -51,7 +54,7 @@ impl Database {
            Connection::open(&temp_path).map_err(|e| AppError::Database(e.to_string()))?;

        temp_conn
-            .execute_batch(&sql_content)
+            .execute_batch(sql_content)
            .map_err(|e| AppError::Database(format!("执行 SQL 导入失败: {e}")))?;

        // 补齐缺失表/索引并进行基础校验
@@ -93,26 +96,17 @@ impl Database {
        Ok(snapshot)
    }

-    /// 移除 SQLite 保留对象相关语句（如 sqlite_sequence），避免导入报错
-    fn sanitize_import_sql(sql: &str) -> String {
-        let mut cleaned = String::new();
-        let lower_keyword = "sqlite_sequence";
-
-        for stmt in sql.split(';') {
-            let trimmed = stmt.trim();
-            if trimmed.is_empty() {
-                continue;
-            }
-
-            if trimmed.to_ascii_lowercase().contains(lower_keyword) {
-                continue;
-            }
-
-            cleaned.push_str(trimmed);
-            cleaned.push_str(";\n");
+    fn validate_cc_switch_sql_export(sql: &str) -> Result<(), AppError> {
+        let trimmed = sql.trim_start();
+        if trimmed.starts_with(CC_SWITCH_SQL_EXPORT_HEADER) {
+            return Ok(());
        }

-        cleaned
+        Err(AppError::localized(
+            "backup.sql.invalid_format",
+            "仅支持导入由 CC Switch 导出的 SQL 备份文件。",
+            "Only SQL backups exported by CC Switch are supported.",
+        ))
    }

    /// 生成一致性快照备份，返回备份文件路径（不存在主库时返回 None）
@@ -129,8 +123,15 @@ impl Database {

        fs::create_dir_all(&backup_dir).map_err(|e| AppError::io(&backup_dir, e))?;

-        let backup_id = format!("db_backup_{}", Utc::now().format("%Y%m%d_%H%M%S"));
-        let backup_path = backup_dir.join(format!("{backup_id}.db"));
+        let base_id = format!("db_backup_{}", Utc::now().format("%Y%m%d_%H%M%S"));
+        let mut backup_id = base_id.clone();
+        let mut backup_path = backup_dir.join(format!("{backup_id}.db"));
+        let mut counter = 1;
+        while backup_path.exists() {
+            backup_id = format!("{base_id}_{counter}");
+            backup_path = backup_dir.join(format!("{backup_id}.db"));
+            counter += 1;
+        }

        {
            let conn = lock_conn!(self.conn);
@@ -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,13 @@ use tauri_plugin_deep_link::DeepLinkExt;
 use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogKind};

 use std::sync::Arc;
-use tauri::{
-    menu::{CheckMenuItem, Menu, MenuBuilder, MenuItem},
-    tray::{TrayIconBuilder, TrayIconEvent},
-};
 #[cfg(target_os = "macos")]
-use tauri::{ActivationPolicy, RunEvent};
+use tauri::image::Image;
+use tauri::tray::{TrayIconBuilder, TrayIconEvent};
+#[cfg(target_os = "macos")]
+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 +113,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))
@@ -421,6 +135,19 @@ async fn update_tray_menu(
    }
 }

+#[cfg(target_os = "macos")]
+fn macos_tray_icon() -> Option<Image<'static>> {
+    const ICON_BYTES: &[u8] = include_bytes!("../icons/tray/macos/statusbar_template_3x.png");
+
+    match Image::from_bytes(ICON_BYTES) {
+        Ok(icon) => Some(icon),
+        Err(err) => {
+            log::warn!("Failed to load macOS tray icon: {err}");
+            None
+        }
+    }
+}
+
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
    let mut builder = tauri::Builder::default();
@@ -473,7 +200,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 +500,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,15 +511,30 @@ 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);

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

            let _tray = tray_builder.build(app)?;
@@ -844,6 +586,8 @@ pub fn run() {
            commands::read_claude_plugin_config,
            commands::apply_claude_plugin_config,
            commands::is_claude_plugin_applied,
+            commands::apply_claude_onboarding_skip,
+            commands::clear_claude_onboarding_skip,
            // Claude MCP management
            commands::get_claude_mcp_status,
            commands::read_claude_mcp_config,
@@ -927,7 +671,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,146 @@
+//! Claude MCP 同步和导入模块
+
+use serde_json::Value;
+use std::collections::HashMap;
+
+use crate::app_config::{McpApps, McpConfig, McpServer, MultiAppConfig};
+use crate::error::AppError;
+
+use super::validation::{extract_server_spec, validate_server_spec};
+
+fn should_sync_claude_mcp() -> bool {
+    // Claude 未安装/未初始化时：通常 ~/.claude 目录与 ~/.claude.json 都不存在。
+    // 按用户偏好：此时跳过写入/删除，不创建任何文件或目录。
+    crate::config::get_claude_config_dir().exists() || crate::config::get_claude_mcp_path().exists()
+}
+
+/// 返回已启用的 MCP 服务器（过滤 enabled==true）
+fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {
+    let mut out = HashMap::new();
+    for (id, entry) in cfg.servers.iter() {
+        let enabled = entry
+            .get("enabled")
+            .and_then(|v| v.as_bool())
+            .unwrap_or(false);
+        if !enabled {
+            continue;
+        }
+        match extract_server_spec(entry) {
+            Ok(spec) => {
+                out.insert(id.clone(), spec);
+            }
+            Err(err) => {
+                log::warn!("跳过无效的 MCP 条目 '{id}': {err}");
+            }
+        }
+    }
+    out
+}
+
+/// 将 config.json 中 enabled==true 的项投影写入 ~/.claude.json
+pub fn sync_enabled_to_claude(config: &MultiAppConfig) -> Result<(), AppError> {
+    if !should_sync_claude_mcp() {
+        return Ok(());
+    }
+    let enabled = collect_enabled_servers(&config.mcp.claude);
+    crate::claude_mcp::set_mcp_servers_map(&enabled)
+}
+
+/// 从 ~/.claude.json 导入 mcpServers 到统一结构（v3.7.0+）
+/// 已存在的服务器将启用 Claude 应用，不覆盖其他字段和应用状态
+pub fn import_from_claude(config: &mut MultiAppConfig) -> Result<usize, AppError> {
+    let text_opt = crate::claude_mcp::read_mcp_json()?;
+    let Some(text) = text_opt else { return Ok(0) };
+
+    let v: Value = serde_json::from_str(&text)
+        .map_err(|e| AppError::McpValidation(format!("解析 ~/.claude.json 失败: {e}")))?;
+    let Some(map) = v.get("mcpServers").and_then(|x| x.as_object()) else {
+        return Ok(0);
+    };
+
+    // 确保新结构存在
+    let servers = config.mcp.servers.get_or_insert_with(HashMap::new);
+
+    let mut changed = 0;
+    let mut errors = Vec::new();
+
+    for (id, spec) in map.iter() {
+        // 校验：单项失败不中止，收集错误继续处理
+        if let Err(e) = validate_server_spec(spec) {
+            log::warn!("跳过无效 MCP 服务器 '{id}': {e}");
+            errors.push(format!("{id}: {e}"));
+            continue;
+        }
+
+        if let Some(existing) = servers.get_mut(id) {
+            // 已存在：仅启用 Claude 应用
+            if !existing.apps.claude {
+                existing.apps.claude = true;
+                changed += 1;
+                log::info!("MCP 服务器 '{id}' 已启用 Claude 应用");
+            }
+        } else {
+            // 新建服务器：默认仅启用 Claude
+            servers.insert(
+                id.clone(),
+                McpServer {
+                    id: id.clone(),
+                    name: id.clone(),
+                    server: spec.clone(),
+                    apps: McpApps {
+                        claude: true,
+                        codex: false,
+                        gemini: false,
+                    },
+                    description: None,
+                    homepage: None,
+                    docs: None,
+                    tags: Vec::new(),
+                },
+            );
+            changed += 1;
+            log::info!("导入新 MCP 服务器 '{id}'");
+        }
+    }
+
+    if !errors.is_empty() {
+        log::warn!("导入完成，但有 {} 项失败: {:?}", errors.len(), errors);
+    }
+
+    Ok(changed)
+}
+
+/// 将单个 MCP 服务器同步到 Claude live 配置
+pub fn sync_single_server_to_claude(
+    _config: &MultiAppConfig,
+    id: &str,
+    server_spec: &Value,
+) -> Result<(), AppError> {
+    if !should_sync_claude_mcp() {
+        return Ok(());
+    }
+    // 读取现有的 MCP 配置
+    let current = crate::claude_mcp::read_mcp_servers_map()?;
+
+    // 创建新的 HashMap，包含现有的所有服务器 + 当前要同步的服务器
+    let mut updated = current;
+    updated.insert(id.to_string(), server_spec.clone());
+
+    // 写回
+    crate::claude_mcp::set_mcp_servers_map(&updated)
+}
+
+/// 从 Claude live 配置中移除单个 MCP 服务器
+pub fn remove_server_from_claude(id: &str) -> Result<(), AppError> {
+    if !should_sync_claude_mcp() {
+        return Ok(());
+    }
+    // 读取现有的 MCP 配置
+    let mut current = crate::claude_mcp::read_mcp_servers_map()?;
+
+    // 移除指定服务器
+    current.remove(id);
+
+    // 写回
+    crate::claude_mcp::set_mcp_servers_map(&current)
+}
@@ -1,200 +1,22 @@
+//! Codex MCP 同步和导入模块
+//!
+//! 包含 Codex 的 MCP 配置管理：
+//! - 从 ~/.codex/config.toml 导入
+//! - 同步到 ~/.codex/config.toml
+//! - JSON 到 TOML 的转换逻辑
+
 use serde_json::{json, Value};
 use std::collections::HashMap;

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

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

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

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

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

    // 1) 收集启用项（Codex 维度）
@@ -697,111 +341,101 @@ 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()?;
+    if !should_sync_codex_mcp() {
+        return Ok(());
+    }
+    use toml_edit::Item;

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

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

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

-    // 写回
-    crate::claude_mcp::set_mcp_servers_map(&current)
+    let content =
+        std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?;
+
+    let mut doc = 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 +664,3 @@ fn json_server_to_toml_table(spec: &Value) -> Result<toml_edit::Table, AppError>

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

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

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

        // 若目标目录已存在，则视为已安装，避免重复下载
        if dest.exists() {
@@ -589,7 +607,13 @@ impl SkillService {

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

        if dest.exists() {
            fs::remove_dir_all(&dest)?;
@@ -31,6 +31,9 @@ pub struct AppSettings {
    /// 是否启用 Claude 插件联动
    #[serde(default)]
    pub enable_claude_plugin_integration: bool,
+    /// 是否跳过 Claude Code 初次安装确认
+    #[serde(default = "default_true")]
+    pub skip_claude_onboarding: bool,
    /// 是否开机自启
    #[serde(default)]
    pub launch_on_startup: bool,
@@ -65,12 +68,17 @@ fn default_minimize_to_tray_on_close() -> bool {
    true
 }

+fn default_true() -> bool {
+    true
+}
+
 impl Default for AppSettings {
    fn default() -> Self {
        Self {
            show_in_tray: true,
            minimize_to_tray_on_close: true,
            enable_claude_plugin_integration: false,
+            skip_claude_onboarding: true,
            launch_on_startup: false,
            language: None,
            claude_config_dir: None,
@@ -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.3",
  "identifier": "com.ccswitch.desktop",
  "build": {
    "frontendDist": "../dist",
@@ -154,6 +154,12 @@ fn sync_enabled_to_codex_writes_enabled_servers() {
    let _guard = test_mutex().lock().expect("acquire test mutex");
    reset_test_fs();

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

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

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

    config.mcp.claude.servers.insert(
@@ -993,3 +1003,76 @@ fn export_sql_returns_error_for_invalid_path() {
        other => panic!("expected IoContext or Io error, got {other:?}"),
    }
 }
+
+#[test]
+fn import_sql_rejects_non_cc_switch_backup() {
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    let state = create_test_state().expect("create test state");
+
+    let import_path = home.join("not-cc-switch.sql");
+    fs::write(&import_path, "CREATE TABLE x (id INTEGER);").expect("write import sql");
+
+    let err = state
+        .db
+        .import_sql(&import_path)
+        .expect_err("non-cc-switch sql should be rejected");
+
+    match err {
+        AppError::Localized { key, .. } => {
+            assert_eq!(key, "backup.sql.invalid_format");
+        }
+        other => panic!("expected Localized error, got {other:?}"),
+    }
+}
+
+#[test]
+fn import_sql_accepts_cc_switch_exported_backup() {
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    // Create a database with some data and export it.
+    let mut config = MultiAppConfig::default();
+    {
+        let manager = config
+            .get_manager_mut(&AppType::Claude)
+            .expect("claude manager");
+        manager.current = "test-provider".to_string();
+        manager.providers.insert(
+            "test-provider".to_string(),
+            Provider::with_id(
+                "test-provider".to_string(),
+                "Test Provider".to_string(),
+                json!({"env": {"ANTHROPIC_API_KEY": "test-key"}}),
+                None,
+            ),
+        );
+    }
+
+    let state = create_test_state_with_config(&config).expect("create test state");
+    let export_path = home.join("cc-switch-export.sql");
+    state
+        .db
+        .export_sql(&export_path)
+        .expect("export should succeed");
+
+    // Reset database, then import into a fresh one.
+    reset_test_fs();
+    let state = create_test_state().expect("create test state");
+    state
+        .db
+        .import_sql(&export_path)
+        .expect("import should succeed");
+
+    let providers = state
+        .db
+        .get_all_providers(AppType::Claude.as_str())
+        .expect("load providers");
+    assert!(
+        providers.contains_key("test-provider"),
+        "imported providers should contain test-provider"
+    );
+}
@@ -246,3 +246,311 @@ fn set_mcp_enabled_for_codex_writes_live_config() {
        "codex config should include the enabled server definition"
    );
 }
+
+#[test]
+fn enabling_codex_mcp_skips_when_codex_dir_missing() {
+    use support::create_test_state;
+
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    // 确认 Codex 配置目录不存在（模拟“未安装/未运行过 Codex CLI”）
+    assert!(
+        !home.join(".codex").exists(),
+        "~/.codex should not exist in fresh test environment"
+    );
+
+    let state = create_test_state().expect("create test state");
+
+    // 先插入一个未启用 Codex 的 MCP 服务器（避免 upsert 触发同步）
+    McpService::upsert_server(
+        &state,
+        McpServer {
+            id: "codex-server".to_string(),
+            name: "Codex Server".to_string(),
+            server: json!({
+                "type": "stdio",
+                "command": "echo"
+            }),
+            apps: McpApps {
+                claude: false,
+                codex: false,
+                gemini: false,
+            },
+            description: None,
+            homepage: None,
+            docs: None,
+            tags: Vec::new(),
+        },
+    )
+    .expect("insert server without syncing");
+
+    // 启用 Codex：目录缺失时应跳过写入（不创建 ~/.codex/config.toml）
+    McpService::toggle_app(&state, "codex-server", AppType::Codex, true)
+        .expect("toggle codex should succeed even when ~/.codex is missing");
+
+    assert!(
+        !home.join(".codex").exists(),
+        "~/.codex should still not exist after skipped sync"
+    );
+}
+
+#[test]
+fn upsert_mcp_server_disabling_app_removes_from_claude_live_config() {
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    // 模拟 Claude 已安装/已初始化：存在 ~/.claude 目录
+    fs::create_dir_all(home.join(".claude")).expect("create ~/.claude dir");
+
+    // 先创建一个启用 Claude 的 MCP 服务器
+    let state = support::create_test_state().expect("create test state");
+    McpService::upsert_server(
+        &state,
+        McpServer {
+            id: "echo".to_string(),
+            name: "echo".to_string(),
+            server: json!({
+                "type": "stdio",
+                "command": "echo"
+            }),
+            apps: McpApps {
+                claude: true,
+                codex: false,
+                gemini: false,
+            },
+            description: None,
+            homepage: None,
+            docs: None,
+            tags: Vec::new(),
+        },
+    )
+    .expect("upsert should sync to Claude live config");
+
+    // 确认已写入 ~/.claude.json
+    let mcp_path = get_claude_mcp_path();
+    let text = fs::read_to_string(&mcp_path).expect("read ~/.claude.json");
+    let v: serde_json::Value = serde_json::from_str(&text).expect("parse ~/.claude.json");
+    assert!(
+        v.pointer("/mcpServers/echo").is_some(),
+        "echo should exist in Claude live config after enabling"
+    );
+
+    // 再次 upsert：取消勾选 Claude（apps.claude=false），应从 Claude live 配置中移除
+    McpService::upsert_server(
+        &state,
+        McpServer {
+            id: "echo".to_string(),
+            name: "echo".to_string(),
+            server: json!({
+                "type": "stdio",
+                "command": "echo"
+            }),
+            apps: McpApps {
+                claude: false,
+                codex: false,
+                gemini: false,
+            },
+            description: None,
+            homepage: None,
+            docs: None,
+            tags: Vec::new(),
+        },
+    )
+    .expect("upsert disabling app should remove from Claude live config");
+
+    let text = fs::read_to_string(&mcp_path).expect("read ~/.claude.json after disable");
+    let v: serde_json::Value = serde_json::from_str(&text).expect("parse ~/.claude.json");
+    assert!(
+        v.pointer("/mcpServers/echo").is_none(),
+        "echo should be removed from Claude live config after disabling"
+    );
+}
+
+#[test]
+fn import_mcp_from_multiple_apps_merges_enabled_flags() {
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    // 1) Claude: ~/.claude.json
+    let mcp_path = get_claude_mcp_path();
+    let claude_json = json!({
+        "mcpServers": {
+            "shared": {
+                "type": "stdio",
+                "command": "echo"
+            }
+        }
+    });
+    fs::write(
+        &mcp_path,
+        serde_json::to_string_pretty(&claude_json).expect("serialize claude mcp"),
+    )
+    .expect("seed ~/.claude.json");
+
+    // 2) Codex: ~/.codex/config.toml
+    let codex_dir = home.join(".codex");
+    fs::create_dir_all(&codex_dir).expect("create codex dir");
+    fs::write(
+        codex_dir.join("config.toml"),
+        r#"[mcp_servers.shared]
+type = "stdio"
+command = "echo"
+"#,
+    )
+    .expect("seed ~/.codex/config.toml");
+
+    let state = support::create_test_state().expect("create test state");
+
+    McpService::import_from_claude(&state).expect("import from claude");
+    McpService::import_from_codex(&state).expect("import from codex");
+
+    let servers = state.db.get_all_mcp_servers().expect("get all mcp servers");
+    let entry = servers.get("shared").expect("shared server exists");
+    assert!(entry.apps.claude, "shared should enable Claude");
+    assert!(entry.apps.codex, "shared should enable Codex");
+}
+
+#[test]
+fn import_mcp_from_gemini_sse_url_only_is_valid() {
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    // Gemini MCP 位于 ~/.gemini/settings.json
+    let gemini_dir = home.join(".gemini");
+    fs::create_dir_all(&gemini_dir).expect("create gemini dir");
+    let settings_path = gemini_dir.join("settings.json");
+
+    // Gemini SSE：只包含 url（Gemini 不使用 type 字段）
+    let gemini_settings = json!({
+        "mcpServers": {
+            "sse-server": {
+                "url": "https://example.com/sse"
+            }
+        }
+    });
+    fs::write(
+        &settings_path,
+        serde_json::to_string_pretty(&gemini_settings).expect("serialize gemini settings"),
+    )
+    .expect("seed ~/.gemini/settings.json");
+
+    let state = support::create_test_state().expect("create test state");
+    let changed = McpService::import_from_gemini(&state).expect("import from gemini");
+    assert!(changed > 0, "should import at least 1 server");
+
+    let servers = state.db.get_all_mcp_servers().expect("get all mcp servers");
+    let entry = servers.get("sse-server").expect("sse-server exists");
+    assert!(entry.apps.gemini, "imported server should enable Gemini");
+    assert_eq!(
+        entry.server.get("type").and_then(|v| v.as_str()),
+        Some("sse"),
+        "Gemini url-only server should be normalized to type=sse in unified structure"
+    );
+}
+
+#[test]
+fn enabling_gemini_mcp_skips_when_gemini_dir_missing() {
+    use support::create_test_state;
+
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    // 确认 Gemini 配置目录不存在（模拟“未安装/未运行过 Gemini CLI”）
+    assert!(
+        !home.join(".gemini").exists(),
+        "~/.gemini should not exist in fresh test environment"
+    );
+
+    let state = create_test_state().expect("create test state");
+
+    // 先插入一个未启用 Gemini 的 MCP 服务器（避免 upsert 触发同步）
+    McpService::upsert_server(
+        &state,
+        McpServer {
+            id: "gemini-server".to_string(),
+            name: "Gemini Server".to_string(),
+            server: json!({
+                "type": "sse",
+                "url": "https://example.com/sse"
+            }),
+            apps: McpApps {
+                claude: false,
+                codex: false,
+                gemini: false,
+            },
+            description: None,
+            homepage: None,
+            docs: None,
+            tags: Vec::new(),
+        },
+    )
+    .expect("insert server without syncing");
+
+    // 启用 Gemini：目录缺失时应跳过写入（不创建 ~/.gemini/settings.json）
+    McpService::toggle_app(&state, "gemini-server", AppType::Gemini, true)
+        .expect("toggle gemini should succeed even when ~/.gemini is missing");
+
+    assert!(
+        !home.join(".gemini").exists(),
+        "~/.gemini should still not exist after skipped sync"
+    );
+}
+
+#[test]
+fn enabling_claude_mcp_skips_when_claude_config_absent() {
+    use support::create_test_state;
+
+    let _guard = test_mutex().lock().expect("acquire test mutex");
+    reset_test_fs();
+    let home = ensure_test_home();
+
+    // 确认 Claude 相关目录/文件都不存在（模拟“未安装/未运行过 Claude”）
+    assert!(
+        !home.join(".claude").exists(),
+        "~/.claude should not exist in fresh test environment"
+    );
+    assert!(
+        !home.join(".claude.json").exists(),
+        "~/.claude.json should not exist in fresh test environment"
+    );
+
+    let state = create_test_state().expect("create test state");
+
+    // 先插入一个未启用 Claude 的 MCP 服务器（避免 upsert 触发同步）
+    McpService::upsert_server(
+        &state,
+        McpServer {
+            id: "claude-server".to_string(),
+            name: "Claude Server".to_string(),
+            server: json!({
+                "type": "stdio",
+                "command": "echo"
+            }),
+            apps: McpApps {
+                claude: false,
+                codex: false,
+                gemini: false,
+            },
+            description: None,
+            homepage: None,
+            docs: None,
+            tags: Vec::new(),
+        },
+    )
+    .expect("insert server without syncing");
+
+    // 启用 Claude：配置缺失时应跳过写入（不创建 ~/.claude.json）
+    McpService::toggle_app(&state, "claude-server", AppType::Claude, true)
+        .expect("toggle claude should succeed even when ~/.claude is missing");
+
+    assert!(
+        !home.join(".claude.json").exists(),
+        "~/.claude.json should still not exist after skipped sync"
+    );
+}
@@ -2,6 +2,7 @@ import { useEffect, useMemo, useState, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import { invoke } from "@tauri-apps/api/core";
+import { useQueryClient } from "@tanstack/react-query";
 import {
  Plus,
  Settings,
@@ -43,8 +44,14 @@ import { Button } from "@/components/ui/button";

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

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

  const [activeApp, setActiveApp] = useState<AppId>("claude");
  const [currentView, setCurrentView] = useState<View>("providers");
@@ -258,7 +265,20 @@ function App() {

  // 导入配置成功后刷新
  const handleImportSuccess = async () => {
-    await refetch();
+    try {
+      // 导入会影响所有应用的供应商数据：刷新所有 providers 缓存
+      await queryClient.invalidateQueries({
+        queryKey: ["providers"],
+        refetchType: "all",
+      });
+      await queryClient.refetchQueries({
+        queryKey: ["providers"],
+        type: "all",
+      });
+    } catch (error) {
+      console.error("[App] Failed to refresh providers after import", error);
+      await refetch();
+    }
    try {
      await providersApi.updateTrayMenu();
    } catch (error) {
@@ -303,20 +323,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>
        );
    }
@@ -325,7 +350,7 @@ function App() {
  return (
    <div
      className="flex min-h-screen flex-col bg-background text-foreground selection:bg-primary/30"
-      style={{ overflowX: "hidden" }}
+      style={{ overflowX: "hidden", paddingTop: CONTENT_TOP_OFFSET }}
    >
      {/* 全局拖拽区域（顶部 4px），避免上边框无法拖动 */}
      <div
@@ -421,14 +446,14 @@ function App() {
          </div>

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

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

      <AddProviderDialog
@@ -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" />
@@ -56,7 +56,7 @@ export function UpdateBadge({ className = "", onClick }: UpdateBadgeProps) {
        "
        aria-label={t("common.close")}
      >
-        <X className="w-3 h-3 text-gray-400 dark:text-gray-500" />
+        <X className="w-3 h-3 text-muted-foreground" />
      </button>
    </div>
  );
@@ -114,7 +114,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
        {/* 第一行：更新时间和刷新按钮 */}
        <div className="flex items-center gap-2 justify-end">
          {/* 上次查询时间 */}
-          <span className="text-[10px] text-gray-400 dark:text-gray-500 flex items-center gap-1">
+          <span className="text-[10px] text-muted-foreground/70 flex items-center gap-1">
            <Clock size={10} />
            {lastQueriedAt
              ? formatRelativeTime(lastQueriedAt, now, t)
@@ -128,7 +128,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
              refetch();
            }}
            disabled={loading}
-            className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors disabled:opacity-50 flex-shrink-0 text-gray-400 dark:text-gray-500"
+            className="p-1 rounded hover:bg-muted transition-colors disabled:opacity-50 flex-shrink-0 text-muted-foreground"
            title={t("usage.refreshUsage")}
          >
            <RefreshCw size={12} className={loading ? "animate-spin" : ""} />
@@ -191,7 +191,7 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
        <div className="flex items-center gap-2">
          {/* 自动查询时间提示 */}
          {lastQueriedAt && (
-            <span className="text-[10px] text-gray-400 dark:text-gray-500 flex items-center gap-1">
+            <span className="text-[10px] text-muted-foreground/70 flex items-center gap-1">
              <Clock size={10} />
              {formatRelativeTime(lastQueriedAt, now, t)}
            </span>
@@ -197,7 +197,7 @@ export function EnvWarningBanner({
                            <p className="text-xs text-gray-600 dark:text-gray-400 mt-1 break-all">
                              {t("env.field.value")}: {conflict.varValue}
                            </p>
-                            <p className="text-xs text-gray-500 dark:text-gray-500 mt-1">
+                            <p className="text-xs text-muted-foreground mt-1">
                              {t("env.field.source")}:{" "}
                              {getSourceDescription(conflict)}
                            </p>
@@ -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>
@@ -129,18 +129,18 @@ const UnifiedMcpPanel = React.forwardRef<
      {/* Content - Scrollable */}
      <div className="flex-1 overflow-y-auto overflow-x-hidden pb-24">
        {isLoading ? (
-          <div className="text-center py-12 text-gray-500 dark:text-gray-400">
+          <div className="text-center py-12 text-muted-foreground">
            {t("mcp.loading")}
          </div>
        ) : serverEntries.length === 0 ? (
          <div className="text-center py-12">
-            <div className="w-16 h-16 mx-auto mb-4 bg-gray-100 dark:bg-gray-800 rounded-full flex items-center justify-center">
-              <Server size={24} className="text-gray-400 dark:text-gray-500" />
+            <div className="w-16 h-16 mx-auto mb-4 bg-muted rounded-full flex items-center justify-center">
+              <Server size={24} className="text-muted-foreground" />
            </div>
-            <h3 className="text-lg font-medium text-gray-900 dark:text-gray-100 mb-2">
+            <h3 className="text-lg font-medium text-foreground mb-2">
              {t("mcp.unifiedPanel.noServers")}
            </h3>
-            <p className="text-gray-500 dark:text-gray-400 text-sm">
+            <p className="text-muted-foreground text-sm">
              {t("mcp.emptyDescription")}
            </p>
          </div>
@@ -237,7 +237,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
      {/* 左侧：服务器信息 */}
      <div className="flex-1 min-w-0">
        <div className="flex items-center gap-2 mb-1">
-          <h3 className="font-medium text-gray-900 dark:text-gray-100">
+          <h3 className="font-medium text-foreground">
            {name}
          </h3>
          {docsUrl && (
@@ -253,12 +253,12 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
          )}
        </div>
        {description && (
-          <p className="text-sm text-gray-500 dark:text-gray-400 line-clamp-2">
+          <p className="text-sm text-muted-foreground line-clamp-2">
            {description}
          </p>
        )}
        {!description && tags && tags.length > 0 && (
-          <p className="text-xs text-gray-400 dark:text-gray-500 truncate">
+          <p className="text-xs text-muted-foreground/70 truncate">
            {tags.join(", ")}
          </p>
        )}
@@ -269,7 +269,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
        <div className="flex items-center justify-between gap-3">
          <label
            htmlFor={`${id}-claude`}
-            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
+            className="text-sm text-foreground/80 cursor-pointer"
          >
            {t("mcp.unifiedPanel.apps.claude")}
          </label>
@@ -285,7 +285,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
        <div className="flex items-center justify-between gap-3">
          <label
            htmlFor={`${id}-codex`}
-            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
+            className="text-sm text-foreground/80 cursor-pointer"
          >
            {t("mcp.unifiedPanel.apps.codex")}
          </label>
@@ -301,7 +301,7 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
        <div className="flex items-center justify-between gap-3">
          <label
            htmlFor={`${id}-gemini`}
-            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
+            className="text-sm text-foreground/80 cursor-pointer"
          >
            {t("mcp.unifiedPanel.apps.gemini")}
          </label>
@@ -36,11 +36,11 @@ const PromptListItem: React.FC<PromptListItemProps> = ({
        </div>

        <div className="flex-1 min-w-0">
-          <h3 className="font-medium text-gray-900 dark:text-gray-100 mb-1">
+          <h3 className="font-medium text-foreground mb-1">
            {prompt.name}
          </h3>
          {prompt.description && (
-            <p className="text-sm text-gray-500 dark:text-gray-400 truncate">
+            <p className="text-sm text-muted-foreground truncate">
              {prompt.description}
            </p>
          )}
@@ -108,21 +108,21 @@ const PromptPanel = React.forwardRef<PromptPanelHandle, PromptPanelProps>(

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

  const inputClass = `w-full px-3 py-2 pr-10 border rounded-lg text-sm transition-colors ${
    disabled
-      ? "bg-gray-100 dark:bg-gray-800 border-border-default text-gray-400 dark:text-gray-500 cursor-not-allowed"
+      ? "bg-muted border-border-default text-muted-foreground cursor-not-allowed"
      : "border-border-default dark:bg-gray-800 dark:text-gray-100 focus:outline-none focus:ring-2 focus:ring-blue-500/20 dark:focus:ring-blue-400/20"
  }`;

@@ -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 ? (
                <>
@@ -41,6 +41,13 @@ export function WindowSettings({ settings, onChange }: WindowSettingsProps) {
          onChange({ enableClaudePluginIntegration: value })
        }
      />
+
+      <ToggleRow
+        title={t("settings.skipClaudeOnboarding")}
+        description={t("settings.skipClaudeOnboardingDescription")}
+        checked={!!settings.skipClaudeOnboarding}
+        onCheckedChange={(value) => onChange({ skipClaudeOnboarding: value })}
+      />
    </section>
  );
 }
@@ -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",
@@ -87,10 +87,10 @@ export const providerPresets: ProviderPreset[] = [
      env: {
        ANTHROPIC_BASE_URL: "https://open.bigmodel.cn/api/anthropic",
        ANTHROPIC_AUTH_TOKEN: "",
-        ANTHROPIC_MODEL: "glm-4.6",
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: "glm-4.5-air",
-        ANTHROPIC_DEFAULT_SONNET_MODEL: "glm-4.6",
-        ANTHROPIC_DEFAULT_OPUS_MODEL: "glm-4.6",
+        ANTHROPIC_MODEL: "glm-4.7",
+        ANTHROPIC_DEFAULT_HAIKU_MODEL: "glm-4.7",
+        ANTHROPIC_DEFAULT_SONNET_MODEL: "glm-4.7",
+        ANTHROPIC_DEFAULT_OPUS_MODEL: "glm-4.7",
      },
    },
    category: "cn_official",
@@ -107,10 +107,10 @@ export const providerPresets: ProviderPreset[] = [
      env: {
        ANTHROPIC_BASE_URL: "https://api.z.ai/api/anthropic",
        ANTHROPIC_AUTH_TOKEN: "",
-        ANTHROPIC_MODEL: "glm-4.6",
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: "glm-4.5-air",
-        ANTHROPIC_DEFAULT_SONNET_MODEL: "glm-4.6",
-        ANTHROPIC_DEFAULT_OPUS_MODEL: "glm-4.6",
+        ANTHROPIC_MODEL: "glm-4.7",
+        ANTHROPIC_DEFAULT_HAIKU_MODEL: "glm-4.7",
+        ANTHROPIC_DEFAULT_SONNET_MODEL: "glm-4.7",
+        ANTHROPIC_DEFAULT_OPUS_MODEL: "glm-4.7",
      },
    },
    category: "cn_official",
@@ -178,13 +178,15 @@ export const providerPresets: ProviderPreset[] = [
      env: {
        ANTHROPIC_BASE_URL: "https://api-inference.modelscope.cn",
        ANTHROPIC_AUTH_TOKEN: "",
-        ANTHROPIC_MODEL: "ZhipuAI/GLM-4.6",
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: "ZhipuAI/GLM-4.6",
-        ANTHROPIC_DEFAULT_SONNET_MODEL: "ZhipuAI/GLM-4.6",
-        ANTHROPIC_DEFAULT_OPUS_MODEL: "ZhipuAI/GLM-4.6",
+        ANTHROPIC_MODEL: "ZhipuAI/GLM-4.7",
+        ANTHROPIC_DEFAULT_HAIKU_MODEL: "ZhipuAI/GLM-4.7",
+        ANTHROPIC_DEFAULT_SONNET_MODEL: "ZhipuAI/GLM-4.7",
+        ANTHROPIC_DEFAULT_OPUS_MODEL: "ZhipuAI/GLM-4.7",
      },
    },
-    category: "aggregator"
+    category: "aggregator",
+    icon: "modelscope",
+    iconColor: "#624AFF",
  },
  {
    name: "KAT-Coder",
@@ -228,21 +230,23 @@ export const providerPresets: ProviderPreset[] = [
      },
    },
    category: "cn_official",
+    icon: "longcat",
+    iconColor: "#29E154",
  },
  {
    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",
        ANTHROPIC_AUTH_TOKEN: "",
        API_TIMEOUT_MS: "3000000",
        CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: 1,
-        ANTHROPIC_MODEL: "MiniMax-M2",
-        ANTHROPIC_DEFAULT_SONNET_MODEL: "MiniMax-M2",
-        ANTHROPIC_DEFAULT_OPUS_MODEL: "MiniMax-M2",
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: "MiniMax-M2",
+        ANTHROPIC_MODEL: "MiniMax-M2.1",
+        ANTHROPIC_DEFAULT_SONNET_MODEL: "MiniMax-M2.1",
+        ANTHROPIC_DEFAULT_OPUS_MODEL: "MiniMax-M2.1",
+        ANTHROPIC_DEFAULT_HAIKU_MODEL: "MiniMax-M2.1",
      },
    },
    category: "cn_official",
@@ -257,18 +261,18 @@ 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,
-        ANTHROPIC_MODEL: "MiniMax-M2",
-        ANTHROPIC_DEFAULT_SONNET_MODEL: "MiniMax-M2",
-        ANTHROPIC_DEFAULT_OPUS_MODEL: "MiniMax-M2",
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: "MiniMax-M2",
+        ANTHROPIC_MODEL: "MiniMax-M2.1",
+        ANTHROPIC_DEFAULT_SONNET_MODEL: "MiniMax-M2.1",
+        ANTHROPIC_DEFAULT_OPUS_MODEL: "MiniMax-M2.1",
+        ANTHROPIC_DEFAULT_HAIKU_MODEL: "MiniMax-M2.1",
      },
    },
    category: "cn_official",
@@ -313,7 +317,7 @@ export const providerPresets: ProviderPreset[] = [
        ANTHROPIC_DEFAULT_OPUS_MODEL: "Ling-1T",
      },
    },
-    category: "cn_official"
+    category: "cn_official",
  },
  {
    name: "AiHubMix",
@@ -330,6 +334,8 @@ export const providerPresets: ProviderPreset[] = [
    // 请求地址候选（用于地址管理/测速），用户可自行选择/覆盖
    endpointCandidates: ["https://aihubmix.com", "https://api.aihubmix.com"],
    category: "aggregator",
+    icon: "aihubmix",
+    iconColor: "#006FFB",
  },
  {
    name: "DMXAPI",
@@ -344,6 +350,8 @@ export const providerPresets: ProviderPreset[] = [
    // 请求地址候选（用于地址管理/测速），用户可自行选择/覆盖
    endpointCandidates: ["https://www.dmxapi.cn", "https://api.dmxapi.cn"],
    category: "aggregator",
+    isPartner: true, // 合作伙伴
+    partnerPromotionKey: "dmxapi", // 促销信息 i18n key
  },
  {
    name: "PackyCode",
@@ -365,4 +373,42 @@ export const providerPresets: ProviderPreset[] = [
    partnerPromotionKey: "packycode", // 促销信息 i18n key
    icon: "packycode",
  },
+  {
+    name: "AiGoCode",
+    websiteUrl: "https://aigocode.com",
+    apiKeyUrl: "https://aigocode.com/invite/CC-SWITCH",
+    settingsConfig: {
+      env: {
+        ANTHROPIC_BASE_URL: "https://api.aigocode.com/api",
+        ANTHROPIC_AUTH_TOKEN: "",
+      },
+    },
+    // 请求地址候选（用于地址管理/测速）
+    endpointCandidates: [
+      "https://api.aigocode.com",
+    ],
+    category: "third_party",
+    isPartner: true, // 合作伙伴
+    partnerPromotionKey: "aigocode", // 促销信息 i18n key
+    icon: "aigocode",
+    iconColor: "#5B7FFF",
+  },
+  {
+    name: "OpenRouter",
+    websiteUrl: "https://openrouter.ai",
+    apiKeyUrl: "https://openrouter.ai/keys",
+    settingsConfig: {
+      env: {
+        ANTHROPIC_BASE_URL: "https://openrouter.ai/api",
+        ANTHROPIC_AUTH_TOKEN: "",
+        ANTHROPIC_MODEL: "anthropic/claude-sonnet-4.5",
+        ANTHROPIC_DEFAULT_HAIKU_MODEL: "anthropic/claude-haiku-4.5",
+        ANTHROPIC_DEFAULT_SONNET_MODEL: "anthropic/claude-sonnet-4.5",
+        ANTHROPIC_DEFAULT_OPUS_MODEL: "anthropic/claude-opus-4.5",
+      },
+    },
+    category: "aggregator",
+    icon: "openrouter",
+    iconColor: "#6566F1",
+  },
 ];
@@ -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 =
@@ -80,12 +80,12 @@ export const codexProviderPresets: CodexProviderPreset[] = [
  {
    name: "Azure OpenAI",
    websiteUrl:
-      "https://learn.microsoft.com/azure/ai-services/openai/how-to/overview",
+      "https://learn.microsoft.com/en-us/azure/ai-foundry/openai/how-to/codex",
    category: "third_party",
    isOfficial: true,
    auth: generateThirdPartyAuth(""),
    config: `model_provider = "azure"
-model = "gpt-5-codex"
+model = "gpt-5.2"
 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.2"
    ),
    endpointCandidates: [
      "https://aihubmix.com/v1",
@@ -128,9 +128,11 @@ requires_openai_auth = true`,
    config: generateThirdPartyConfig(
      "dmxapi",
      "https://www.dmxapi.cn/v1",
-      "gpt-5-codex",
+      "gpt-5.2"
    ),
    endpointCandidates: ["https://www.dmxapi.cn/v1"],
+    isPartner: true, // 合作伙伴
+    partnerPromotionKey: "dmxapi", // 促销信息 i18n key
  },
  {
    name: "PackyCode",
@@ -141,7 +143,7 @@ requires_openai_auth = true`,
    config: generateThirdPartyConfig(
      "packycode",
      "https://www.packyapi.com/v1",
-      "gpt-5-codex",
+      "gpt-5.2"
    ),
    endpointCandidates: [
      "https://www.packyapi.com/v1",
@@ -151,4 +153,17 @@ requires_openai_auth = true`,
    partnerPromotionKey: "packycode", // 促销信息 i18n key
    icon: "packycode",
  },
+  {
+    name: "AiGoCode",
+    websiteUrl: "https://aigocode.com",
+    apiKeyUrl: "https://aigocode.com/invite/CC-SWITCH",
+    category: "third_party",
+    auth: generateThirdPartyAuth(""),
+    config: generateThirdPartyConfig("aigocode", "https://api.aigocode.com/openai", "gpt-5.2"),
+    endpointCandidates: ["https://api.aigocode.com"],
+    isPartner: true, // 合作伙伴
+    partnerPromotionKey: "aigocode", // 促销信息 i18n key
+    icon: "aigocode",
+    iconColor: "#5B7FFF",
+  },
 ];
@@ -14,7 +14,7 @@ export interface CodexTemplate {
 */
 export function getCodexCustomTemplate(): CodexTemplate {
  const config = `model_provider = "custom"
-model = "gpt-5-codex"
+model = "gpt-5.2"
 model_reasoning_effort = "high"
 disable_response_storage = true

@@ -56,11 +56,11 @@ export const geminiProviderPresets: GeminiProviderPreset[] = [
    settingsConfig: {
      env: {
        GOOGLE_GEMINI_BASE_URL: "https://www.packyapi.com",
-        GEMINI_MODEL: "gemini-3-pro-preview",
+        GEMINI_MODEL: "gemini-3-pro",
      },
    },
    baseURL: "https://www.packyapi.com",
-    model: "gemini-3-pro-preview",
+    model: "gemini-3-pro",
    description: "PackyCode",
    category: "third_party",
    isPartner: true,
@@ -70,19 +70,26 @@ export const geminiProviderPresets: GeminiProviderPreset[] = [
      "https://www.packyapi.com",
    ],
    icon: "packycode",
-  },
+  },  
  {
-    name: "自定义",
-    websiteUrl: "",
+    name: "AiGoCode",
+    websiteUrl: "https://aigocode.com",
+    apiKeyUrl: "https://aigocode.com/invite/CC-SWITCH",
    settingsConfig: {
      env: {
-        GOOGLE_GEMINI_BASE_URL: "",
-        GEMINI_MODEL: "gemini-3-pro-preview",
+        GOOGLE_GEMINI_BASE_URL: "https://api.aigocode.com/gemini",
+        GEMINI_MODEL: "gemini-3-pro",
      },
    },
-    model: "gemini-3-pro-preview",
-    description: "自定义 Gemini API 端点",
-    category: "custom",
+    baseURL: "https://api.aigocode.com/gemini",
+    model: "gemini-3-pro",
+    description: "AiGoCode",
+    category: "third_party",
+    isPartner: true,
+    partnerPromotionKey: "aigocode",
+    endpointCandidates: ["https://api.aigocode.com/gemini"],
+    icon: "aigocode",
+    iconColor: "#5B7FFF",
  },
 ];

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import { settingsApi } from "@/lib/api";
@@ -39,15 +39,6 @@ export function useImportExport(
  const [errorMessage, setErrorMessage] = useState<string | null>(null);
  const [backupId, setBackupId] = useState<string | null>(null);
  const [isImporting, setIsImporting] = useState(false);
-  const successTimerRef = useRef<number | null>(null);
-
-  useEffect(() => {
-    return () => {
-      if (successTimerRef.current) {
-        window.clearTimeout(successTimerRef.current);
-      }
-    };
-  }, []);

  const clearSelection = useCallback(() => {
    setSelectedFile("");
@@ -105,6 +96,10 @@ export function useImportExport(
      }

      setBackupId(result.backupId ?? null);
+      // 导入成功后立即触发外部刷新（与 live 同步结果解耦）
+      // - 避免 sync 失败时 UI 不刷新
+      // - 避免依赖 setTimeout（组件卸载会取消）
+      void onImportSuccess?.();

      const syncResult = await syncCurrentProvidersLiveSafe();
      if (syncResult.ok) {
@@ -114,10 +109,6 @@ export function useImportExport(
            defaultValue: "配置导入成功",
          }),
        );
-
-        successTimerRef.current = window.setTimeout(() => {
-          void onImportSuccess?.();
-        }, 1500);
      } else {
        console.error(
          "[useImportExport] Failed to sync live config",
@@ -160,6 +160,36 @@ export function useSettings(): UseSettingsResult {
          }
        }

+        // Claude Code 初次安装确认：开=写入 hasCompletedOnboarding=true；关=删除该字段
+        // 仅在本次更新包含 skipClaudeOnboarding 时触发，避免其它自动保存误触发
+        const nextSkipClaudeOnboarding = updates.skipClaudeOnboarding;
+        if (
+          nextSkipClaudeOnboarding !== undefined &&
+          nextSkipClaudeOnboarding !== (data?.skipClaudeOnboarding ?? false)
+        ) {
+          try {
+            if (nextSkipClaudeOnboarding) {
+              await settingsApi.applyClaudeOnboardingSkip();
+            } else {
+              await settingsApi.clearClaudeOnboardingSkip();
+            }
+          } catch (error) {
+            console.warn(
+              "[useSettings] Failed to sync Claude onboarding skip",
+              error,
+            );
+            toast.error(
+              nextSkipClaudeOnboarding
+                ? t("notifications.skipClaudeOnboardingFailed", {
+                    defaultValue: "跳过 Claude Code 初次安装确认失败",
+                  })
+                : t("notifications.clearClaudeOnboardingSkipFailed", {
+                    defaultValue: "恢复 Claude Code 初次安装确认失败",
+                  }),
+            );
+          }
+        }
+
        // 持久化语言偏好
        try {
          if (typeof window !== "undefined" && updates.language) {
@@ -242,6 +272,33 @@ export function useSettings(): UseSettingsResult {
          }
        }

+        // Claude Code 初次安装确认：开=写入 hasCompletedOnboarding=true；关=删除该字段
+        const prevSkipClaudeOnboarding = data?.skipClaudeOnboarding ?? false;
+        const nextSkipClaudeOnboarding = payload.skipClaudeOnboarding ?? false;
+        if (nextSkipClaudeOnboarding !== prevSkipClaudeOnboarding) {
+          try {
+            if (nextSkipClaudeOnboarding) {
+              await settingsApi.applyClaudeOnboardingSkip();
+            } else {
+              await settingsApi.clearClaudeOnboardingSkip();
+            }
+          } catch (error) {
+            console.warn(
+              "[useSettings] Failed to sync Claude onboarding skip",
+              error,
+            );
+            toast.error(
+              nextSkipClaudeOnboarding
+                ? t("notifications.skipClaudeOnboardingFailed", {
+                    defaultValue: "跳过 Claude Code 初次安装确认失败",
+                  })
+                : t("notifications.clearClaudeOnboardingSkipFailed", {
+                    defaultValue: "恢复 Claude Code 初次安装确认失败",
+                  }),
+            );
+          }
+        }
+
        // 只在 Claude 插件集成状态真正改变时调用系统 API
        if (
          payload.enableClaudePluginIntegration !== undefined &&
@@ -83,6 +83,7 @@ export function useSettingsForm(): UseSettingsFormResult {
      minimizeToTrayOnClose: data.minimizeToTrayOnClose ?? true,
      enableClaudePluginIntegration:
        data.enableClaudePluginIntegration ?? false,
+      skipClaudeOnboarding: data.skipClaudeOnboarding ?? true,
      claudeConfigDir: sanitizeDir(data.claudeConfigDir),
      codexConfigDir: sanitizeDir(data.codexConfigDir),
      language: normalizedLanguage,
@@ -102,6 +103,7 @@ export function useSettingsForm(): UseSettingsFormResult {
            showInTray: true,
            minimizeToTrayOnClose: true,
            enableClaudePluginIntegration: false,
+            skipClaudeOnboarding: true,
            language: readPersistedLanguage(),
          } as SettingsFormState);

@@ -136,6 +138,7 @@ export function useSettingsForm(): UseSettingsFormResult {
        minimizeToTrayOnClose: serverData.minimizeToTrayOnClose ?? true,
        enableClaudePluginIntegration:
          serverData.enableClaudePluginIntegration ?? false,
+        skipClaudeOnboarding: serverData.skipClaudeOnboarding ?? true,
        claudeConfigDir: sanitizeDir(serverData.claudeConfigDir),
        codexConfigDir: sanitizeDir(serverData.codexConfigDir),
        language: normalizedLanguage,
@@ -112,7 +112,7 @@
    "providerAdded": "Provider added",
    "providerSaved": "Provider configuration saved",
    "providerDeleted": "Provider deleted successfully",
-    "switchSuccess": "Switch successful! Please restart {{appName}} terminal to take effect",
+    "switchSuccess": "Switch successful!",
    "switchFailedTitle": "Switch failed",
    "switchFailed": "Switch failed: {{error}}",
    "autoImported": "Default provider created from existing configuration",
@@ -122,6 +122,8 @@
    "appliedToClaudePlugin": "Applied to Claude plugin",
    "removedFromClaudePlugin": "Removed from Claude plugin",
    "syncClaudePluginFailed": "Sync Claude plugin failed",
+    "skipClaudeOnboardingFailed": "Failed to skip Claude Code first-run confirmation",
+    "clearClaudeOnboardingSkipFailed": "Failed to restore Claude Code first-run confirmation",
    "updateSuccess": "Provider updated successfully",
    "updateFailed": "Failed to update provider: {{error}}",
    "deleteSuccess": "Provider deleted",
@@ -146,7 +148,7 @@
    "themeDark": "Dark",
    "themeSystem": "System",
    "importExport": "SQL Import/Export",
-    "importExportHint": "Import or export database SQL backups for migration or restore.",
+    "importExportHint": "Import or export database SQL backups for migration or restore (import supports only backups exported by CC Switch).",
    "exportConfig": "Export SQL Backup",
    "selectConfigFile": "Select SQL File",
    "noFileSelected": "No configuration file selected.",
@@ -162,7 +164,7 @@
    "selectFileFailed": "Please choose a valid SQL backup file",
    "configCorrupted": "SQL file may be corrupted or invalid",
    "backupId": "Backup ID",
-    "autoReload": "Data will refresh automatically in 2 seconds...",
+    "autoReload": "Data refreshed",
    "languageOptionChinese": "中文",
    "languageOptionEnglish": "English",
    "languageOptionJapanese": "日本語",
@@ -175,6 +177,8 @@
    "minimizeToTrayDescription": "When checked, clicking the close button will hide to system tray, otherwise the app will exit directly.",
    "enableClaudePluginIntegration": "Apply to Claude Code extension",
    "enableClaudePluginIntegrationDescription": "When enabled, the VS Code Claude Code extension provider will switch with this app",
+    "skipClaudeOnboarding": "Skip Claude Code first-run confirmation",
+    "skipClaudeOnboardingDescription": "When enabled, Claude Code will skip the first-run confirmation",
    "configDirectoryOverride": "Configuration Directory Override (Advanced)",
    "configDirectoryDescription": "When using Claude Code or Codex in environments like WSL, you can manually specify the configuration directory to the one in WSL to keep provider data consistent with the main environment.",
    "appConfigDir": "CC Switch Configuration Directory",
@@ -264,7 +268,9 @@
      "zhipu": "Zhipu GLM is an official partner of CC Switch. Use this link to top up and get a 10% discount",
      "packycode": "PackyCode is an official partner of CC Switch. Register using this link and enter \"cc-switch\" promo code during recharge to get 10% off",
      "minimax_cn": "MiniMax Coding Plan Special Offer, Starter from ¥9.9",
-      "minimax_en": "MiniMax Coding Plan Black Friday, Starter is now $2/mo (80% OFF!)"
+      "minimax_en": "MiniMax Coding Plan Black Friday, Starter is now $2/mo (80% OFF!)",
+      "dmxapi": "Claude Code exclusive model 66% OFF now!",
+      "aigocode": "AiGoCode is an official partner of CC Switch. Register using this link and get 10% bonus credit on your first top-up!"
    },
    "parameterConfig": "Parameter Config - {{name}} *",
    "mainModel": "Main Model (optional)",
@@ -272,7 +278,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",
@@ -534,9 +540,6 @@
    "env": "Environment (one per line, KEY=VALUE)",
    "envPlaceholder": "FOO=bar\nHELLO=world",
    "reset": "Reset",
-    "notice": {
-      "restartClaude": "Written. Restart Claude to take effect."
-    },
    "msg": {
      "saved": "Saved",
      "deleted": "Deleted",
@@ -112,7 +112,7 @@
    "providerAdded": "プロバイダーを追加しました",
    "providerSaved": "プロバイダー設定を保存しました",
    "providerDeleted": "プロバイダーを削除しました",
-    "switchSuccess": "切り替え成功！ {{appName}} ターミナルを再起動すると反映されます",
+    "switchSuccess": "切り替え成功！",
    "switchFailedTitle": "切り替えに失敗しました",
    "switchFailed": "切り替えに失敗しました: {{error}}",
    "autoImported": "既存設定からデフォルトプロバイダーを自動作成しました",
@@ -122,6 +122,8 @@
    "appliedToClaudePlugin": "Claude プラグインに適用しました",
    "removedFromClaudePlugin": "Claude プラグインから削除しました",
    "syncClaudePluginFailed": "Claude プラグインとの同期に失敗しました",
+    "skipClaudeOnboardingFailed": "Claude Code の初回確認スキップに失敗しました",
+    "clearClaudeOnboardingSkipFailed": "Claude Code の初回確認の復元に失敗しました",
    "updateSuccess": "プロバイダーを更新しました",
    "updateFailed": "プロバイダーの更新に失敗しました: {{error}}",
    "deleteSuccess": "プロバイダーを削除しました",
@@ -146,7 +148,7 @@
    "themeDark": "ダーク",
    "themeSystem": "システム",
    "importExport": "SQL インポート/エクスポート",
-    "importExportHint": "移行や復元用にデータベースの SQL バックアップをインポート/エクスポートします。",
+    "importExportHint": "移行や復元用にデータベースの SQL バックアップをインポート/エクスポートします（インポートは CC Switch がエクスポートしたバックアップのみ対応）。",
    "exportConfig": "SQL バックアップをエクスポート",
    "selectConfigFile": "SQL ファイルを選択",
    "noFileSelected": "ファイルが選択されていません。",
@@ -162,7 +164,7 @@
    "selectFileFailed": "有効な SQL バックアップファイルを選択してください",
    "configCorrupted": "SQL ファイルが壊れているか形式が無効な可能性があります",
    "backupId": "バックアップ ID",
-    "autoReload": "2 秒後に自動で再読み込みします...",
+    "autoReload": "データを更新しました",
    "languageOptionChinese": "中文",
    "languageOptionEnglish": "English",
    "languageOptionJapanese": "日本語",
@@ -175,6 +177,8 @@
    "minimizeToTrayDescription": "チェックすると閉じるボタンでトレイに隠し、オフならアプリを終了します。",
    "enableClaudePluginIntegration": "Claude Code 拡張に適用",
    "enableClaudePluginIntegrationDescription": "オンにすると VS Code の Claude Code 拡張のプロバイダーも同期します",
+    "skipClaudeOnboarding": "Claude Code の初回確認をスキップ",
+    "skipClaudeOnboardingDescription": "オンにすると Claude Code の初回インストール確認をスキップします",
    "configDirectoryOverride": "設定ディレクトリの上書き（詳細）",
    "configDirectoryDescription": "WSL などで Claude Code や Codex を使う場合、ここで設定ディレクトリを WSL 側に合わせるとデータを揃えられます。",
    "appConfigDir": "CC Switch 設定ディレクトリ",
@@ -264,7 +268,9 @@
      "zhipu": "Zhipu GLM は CC Switch の公式パートナーです。リンク経由でチャージすると 10% 割引",
      "packycode": "PackyCode は CC Switch の公式パートナーです。登録後チャージ時に \"cc-switch\" を入力すると 10% オフ",
      "minimax_cn": "MiniMax Coding Plan 特別価格、Starter ¥9.9 から",
-      "minimax_en": "MiniMax Coding Plan Black Friday、Starter が月額 $2（80% OFF）"
+      "minimax_en": "MiniMax Coding Plan Black Friday、Starter が月額 $2（80% OFF）",
+      "dmxapi": "Claude Code 専用モデル 66% OFF 実施中！",
+      "aigocode": "AiGoCode は CC Switch の公式パートナーです。このリンクから登録すると、初回チャージ時に 10% のボーナスクレジットがもらえます！"
    },
    "parameterConfig": "パラメーター設定 - {{name}} *",
    "mainModel": "メインモデル（任意）",
@@ -272,7 +278,7 @@
    "fastModel": "高速モデル（任意）",
    "fastModelPlaceholder": "例: GLM-4.5-Air",
    "modelHint": "💡 空欄ならプロバイダーのデフォルトモデルを使用します",
-    "apiHint": "💡 Claude API 互換サービスのエンドポイントを入力してください",
+    "apiHint": "💡 Claude API 互換サービスのエンドポイントを入力してください。末尾にスラッシュを付けないでください",
    "codexApiHint": "💡 OpenAI Response 互換のサービスエンドポイントを入力してください",
    "fillSupplierName": "プロバイダー名を入力してください",
    "fillConfigContent": "設定内容を入力してください",
@@ -534,9 +540,6 @@
    "env": "環境変数（1 行に 1 件、KEY=VALUE）",
    "envPlaceholder": "FOO=bar\nHELLO=world",
    "reset": "リセット",
-    "notice": {
-      "restartClaude": "書き込みました。Claude を再起動すると反映されます。"
-    },
    "msg": {
      "saved": "保存しました",
      "deleted": "削除しました",
@@ -112,7 +112,7 @@
    "providerAdded": "供应商已添加",
    "providerSaved": "供应商配置已保存",
    "providerDeleted": "供应商删除成功",
-    "switchSuccess": "切换成功！请重启 {{appName}} 终端以生效",
+    "switchSuccess": "切换成功！",
    "switchFailedTitle": "切换失败",
    "switchFailed": "切换失败：{{error}}",
    "autoImported": "已从现有配置创建默认供应商",
@@ -122,6 +122,8 @@
    "appliedToClaudePlugin": "已应用到 Claude 插件",
    "removedFromClaudePlugin": "已从 Claude 插件移除",
    "syncClaudePluginFailed": "同步 Claude 插件失败",
+    "skipClaudeOnboardingFailed": "跳过 Claude Code 初次安装确认失败",
+    "clearClaudeOnboardingSkipFailed": "恢复 Claude Code 初次安装确认失败",
    "updateSuccess": "供应商更新成功",
    "updateFailed": "更新供应商失败：{{error}}",
    "deleteSuccess": "供应商已删除",
@@ -146,7 +148,7 @@
    "themeDark": "深色",
    "themeSystem": "跟随系统",
    "importExport": "SQL 导入导出",
-    "importExportHint": "导入/导出数据库 SQL 备份，便于备份或迁移。",
+    "importExportHint": "导入/导出数据库 SQL 备份（仅支持导入由 CC Switch 导出的备份），便于备份或迁移。",
    "exportConfig": "导出 SQL 备份",
    "selectConfigFile": "选择 SQL 文件",
    "noFileSelected": "尚未选择配置文件。",
@@ -162,7 +164,7 @@
    "selectFileFailed": "请选择有效的 SQL 备份文件",
    "configCorrupted": "SQL 文件可能已损坏或格式不正确",
    "backupId": "备份ID",
-    "autoReload": "数据将在2秒后自动刷新...",
+    "autoReload": "数据已刷新",
    "languageOptionChinese": "中文",
    "languageOptionEnglish": "English",
    "languageOptionJapanese": "日本語",
@@ -175,6 +177,8 @@
    "minimizeToTrayDescription": "勾选后点击关闭按钮会隐藏到系统托盘，取消则直接退出应用。",
    "enableClaudePluginIntegration": "应用到 Claude Code 插件",
    "enableClaudePluginIntegrationDescription": "开启后 Vscode Claude Code 插件的供应商将随本软件切换",
+    "skipClaudeOnboarding": "跳过 Claude Code 初次安装确认",
+    "skipClaudeOnboardingDescription": "开启后跳过 Claude Code 初次安装确认",
    "configDirectoryOverride": "配置目录覆盖（高级）",
    "configDirectoryDescription": "在 WSL 等环境使用 Claude Code 或 Codex 的时候，可手动指定为 WSL 里的配置目录，供应商数据与主环境保持一致。",
    "appConfigDir": "CC Switch 配置目录",
@@ -264,7 +268,9 @@
      "zhipu": "智谱 GLM 是 CC Switch 的官方合作伙伴，使用此链接充值可以获得9折优惠",
      "packycode": "PackyCode 是 CC Switch 的官方合作伙伴，使用此链接注册并在充值时填写 \"cc-switch\" 优惠码，可以享受9折优惠",
      "minimax_cn": "MiniMax Coding Plan 特惠，Starter 套餐 9.9 元起",
-      "minimax_en": "MiniMax Coding Plan 黑五特惠，Starter 套餐现仅 $2/月（2折优惠！）"
+      "minimax_en": "MiniMax Coding Plan 黑五特惠，Starter 套餐现仅 $2/月（2折优惠！）",
+      "dmxapi": "Claude Code 专属模型 3.4 折优惠进行中！",
+      "aigocode": "AiGoCode 是 CC Switch 的官方合作伙伴，使用此链接注册首次充值时可以获得10%额度奖励！"
    },
    "parameterConfig": "参数配置 - {{name}} *",
    "mainModel": "主模型 (可选)",
@@ -272,7 +278,7 @@
    "fastModel": "快速模型 (可选)",
    "fastModelPlaceholder": "例如: GLM-4.5-Air",
    "modelHint": "💡 留空将使用供应商的默认模型",
-    "apiHint": "💡 填写兼容 Claude API 的服务端点地址",
+    "apiHint": "💡 填写兼容 Claude API 的服务端点地址，不要以斜杠结尾",
    "codexApiHint": "💡 填写兼容 OpenAI Response 格式的服务端点地址",
    "fillSupplierName": "请填写供应商名称",
    "fillConfigContent": "请填写配置内容",
@@ -534,9 +540,6 @@
    "env": "环境变量 (一行一个，KEY=VALUE)",
    "envPlaceholder": "FOO=bar\nHELLO=world",
    "reset": "重置",
-    "notice": {
-      "restartClaude": "已写入配置，重启 Claude 生效"
-    },
    "msg": {
      "saved": "已保存",
      "deleted": "已删除",
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>AiHubMix</title><path d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12z" fill="#006FFB"></path><path clip-rule="evenodd" d="M11.24 8.393c.095-.644.302-1.47.624-2.48L12 5.496l.136.417c.322 1.01.53 1.836.624 2.48.071.472.071 1.072 0 1.8-.072.731-.072 1.336 0 1.814.106.7.426 1.281.96 1.744a2.795 2.795 0 001.89.708 2.78 2.78 0 002.034-.84c.56-.559.842-1.234.848-2.024.003-.7.075-1.472.216-2.316.069-.422.14-.775.21-1.06l.095-.384.168.356a7.862 7.862 0 01.76 3.244v.16a7.84 7.84 0 01-.624 3.089 7.952 7.952 0 01-4.228 4.228 7.841 7.841 0 01-3.089.623 7.84 7.84 0 01-3.089-.623 7.952 7.952 0 01-4.228-4.228 7.84 7.84 0 01-.623-3.09v-.159a7.862 7.862 0 01.759-3.244l.169-.356.093.385c.072.284.143.637.211 1.059.141.844.213 1.616.216 2.316.006.79.29 1.465.848 2.024.563.56 1.241.84 2.035.84.715 0 1.345-.236 1.889-.708a2.79 2.79 0 00.96-1.744c.073-.478.073-1.083 0-1.814-.071-.728-.071-1.328 0-1.8zm.76 9.694c1.097 0 2.125-.26 3.085-.778a6.379 6.379 0 001.77-1.399c.063-.07-.01-.178-.101-.153-.37.1-.75.15-1.144.15a4.236 4.236 0 01-2.18-.59 4.253 4.253 0 01-1.35-1.233.099.099 0 00-.16 0 4.253 4.253 0 01-1.35 1.232 4.236 4.236 0 01-2.18.591c-.393 0-.774-.05-1.143-.15-.091-.025-.165.083-.102.153a6.38 6.38 0 001.77 1.399c.96.518 1.988.778 3.085.778z" fill="#fff" fill-rule="evenodd"></path></svg>
@@ -0,0 +1,51 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="648.000000pt" height="564.000000pt" viewBox="0 0 648.000000 564.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,564.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M5392 5379 c-26 -10 -36 -28 -56 -108 -24 -94 -47 -140 -101 -199
+-56 -62 -117 -96 -219 -121 -101 -25 -116 -35 -116 -75 0 -45 21 -60 123 -89
+190 -53 271 -147 336 -384 13 -46 38 -61 85 -49 25 6 36 28 56 111 7 28 23 72
+36 99 13 28 21 54 18 58 -3 5 -2 7 3 6 4 -2 29 18 55 44 41 41 145 110 173
+114 56 8 126 27 131 36 4 6 7 30 8 54 1 49 -5 54 -104 74 -164 33 -280 148
+-320 320 -23 101 -52 129 -108 109z"/>
+<path d="M1770 4814 c-138 -25 -301 -93 -425 -177 -80 -55 -227 -197 -280
+-272 -98 -138 -161 -279 -201 -447 -16 -66 -18 -164 -21 -1098 -4 -1130 -4
+-1144 57 -1331 80 -242 222 -434 444 -598 l56 -42 0 -337 c0 -309 2 -340 19
+-379 31 -66 87 -93 158 -74 22 6 202 117 404 249 200 131 398 259 439 285 144
+89 48 81 1095 88 912 5 932 6 1012 27 243 64 441 178 599 344 166 176 274 408
+304 648 13 110 13 2016 0 2120 -25 190 -83 347 -183 498 -160 240 -384 400
+-677 484 l-75 22 -1325 2 c-1086 2 -1339 0 -1400 -12z m1068 -1455 l-3 -751
+-71 -18 c-71 -18 -154 -55 -205 -91 -14 -10 -29 -16 -33 -12 -3 3 -6 91 -6
+195 l0 188 -306 0 -305 0 -21 -47 c-11 -27 -33 -75 -48 -108 -16 -33 -44 -96
+-62 -140 l-34 -80 -172 -3 c-101 -1 -172 1 -172 7 0 5 14 40 31 78 31 68 101
+227 254 578 335 769 358 814 434 874 94 74 122 79 449 80 l272 1 -2 -751z
+m794 717 c41 -13 103 -42 139 -62 67 -40 202 -168 232 -221 l17 -31 -77 -65
+c-43 -35 -101 -80 -129 -101 l-52 -36 -39 57 c-79 116 -204 177 -313 154 -66
+-14 -105 -42 -130 -91 -19 -37 -20 -60 -20 -400 0 -339 1 -363 20 -399 26 -51
+61 -78 128 -97 143 -42 327 52 366 186 l13 45 -163 3 -163 2 -3 157 c-2 111 0
+157 9 160 6 2 263 3 570 1 487 -3 562 -5 593 -19 98 -45 125 -159 58 -244 -39
+-50 -66 -55 -322 -55 l-236 0 -6 -27 c-18 -83 -29 -115 -62 -183 -69 -143
+-230 -269 -402 -316 -81 -22 -271 -25 -350 -5 -173 43 -289 145 -341 298 -19
+57 -20 81 -17 534 l3 474 33 67 c55 112 168 199 307 235 79 20 246 10 337 -21z
+m828 -1515 c67 -71 67 -73 -62 -396 -45 -110 -102 -254 -128 -320 -254 -639
+-272 -681 -298 -702 -74 -62 -192 -15 -192 77 0 12 39 116 86 233 48 117 97
+239 110 272 119 311 336 833 354 852 36 37 85 32 130 -16z m-1574 -205 c16
+-13 19 -29 22 -128 l3 -113 -195 -155 c-108 -85 -196 -158 -196 -161 0 -4 17
+-19 38 -35 128 -96 327 -272 339 -301 16 -39 17 -143 2 -177 -15 -33 -34 -39
+-67 -22 -48 26 -566 446 -584 474 -23 35 -23 89 1 128 16 27 150 143 376 326
+39 31 79 65 90 75 44 41 128 103 139 103 7 0 21 -6 32 -14z m713 -25 c52 -37
+53 -33 -92 -551 -36 -129 -80 -289 -98 -355 -39 -143 -62 -175 -129 -175 -47
+0 -92 20 -114 52 -24 34 -19 90 18 217 19 64 78 271 131 461 53 190 98 353
+101 364 6 16 14 18 79 14 54 -4 81 -11 104 -27z m1116 -351 c55 -45 117 -98
+138 -120 61 -64 48 -115 -50 -192 -32 -25 -118 -94 -191 -152 -136 -108 -163
+-120 -217 -100 -26 10 -47 62 -39 97 10 46 22 62 94 119 36 29 93 77 128 106
+l62 55 -65 59 c-71 65 -77 84 -49 141 24 47 44 67 68 67 12 0 66 -36 121 -80z"/>
+<path d="M2328 3755 c-37 -20 -54 -53 -153 -280 -48 -110 -96 -219 -106 -242
+l-18 -43 234 0 235 0 0 290 0 290 -82 0 c-53 -1 -93 -6 -110 -15z"/>
+</g>
+</svg>
@@ -2,6 +2,7 @@
 // Do not edit manually

 export const icons: Record<string, string> = {
+  aigocode: `<svg height="1em" width="1em" style="flex:none;line-height:1" viewBox="0 0 648 564" xmlns="http://www.w3.org/2000/svg"><title>AiGoCode</title><g transform="translate(0,564) scale(0.1,-0.1)"><path fill="#7C6AEF" d="M5392 5379 c-26 -10 -36 -28 -56 -108 -24 -94 -47 -140 -101 -199 -56 -62 -117 -96 -219 -121 -101 -25 -116 -35 -116 -75 0 -45 21 -60 123 -89 190 -53 271 -147 336 -384 13 -46 38 -61 85 -49 25 6 36 28 56 111 7 28 23 72 36 99 13 28 21 54 18 58 -3 5 -2 7 3 6 4 -2 29 18 55 44 41 41 145 110 173 114 56 8 126 27 131 36 4 6 7 30 8 54 1 49 -5 54 -104 74 -164 33 -280 148 -320 320 -23 101 -52 129 -108 109z"/><path fill="#5B7FFF" d="M1770 4814 c-138 -25 -301 -93 -425 -177 -80 -55 -227 -197 -280 -272 -98 -138 -161 -279 -201 -447 -16 -66 -18 -164 -21 -1098 -4 -1130 -4 -1144 57 -1331 80 -242 222 -434 444 -598 l56 -42 0 -337 c0 -309 2 -340 19 -379 31 -66 87 -93 158 -74 22 6 202 117 404 249 200 131 398 259 439 285 144 89 48 81 1095 88 912 5 932 6 1012 27 243 64 441 178 599 344 166 176 274 408 304 648 13 110 13 2016 0 2120 -25 190 -83 347 -183 498 -160 240 -384 400 -677 484 l-75 22 -1325 2 c-1086 2 -1339 0 -1400 -12z m1068 -1455 l-3 -751 -71 -18 c-71 -18 -154 -55 -205 -91 -14 -10 -29 -16 -33 -12 -3 3 -6 91 -6 195 l0 188 -306 0 -305 0 -21 -47 c-11 -27 -33 -75 -48 -108 -16 -33 -44 -96 -62 -140 l-34 -80 -172 -3 c-101 -1 -172 1 -172 7 0 5 14 40 31 78 31 68 101 227 254 578 335 769 358 814 434 874 94 74 122 79 449 80 l272 1 -2 -751z m794 717 c41 -13 103 -42 139 -62 67 -40 202 -168 232 -221 l17 -31 -77 -65 c-43 -35 -101 -80 -129 -101 l-52 -36 -39 57 c-79 116 -204 177 -313 154 -66 -14 -105 -42 -130 -91 -19 -37 -20 -60 -20 -400 0 -339 1 -363 20 -399 26 -51 61 -78 128 -97 143 -42 327 52 366 186 l13 45 -163 3 -163 2 -3 157 c-2 111 0 157 9 160 6 2 263 3 570 1 487 -3 562 -5 593 -19 98 -45 125 -159 58 -244 -39 -50 -66 -55 -322 -55 l-236 0 -6 -27 c-18 -83 -29 -115 -62 -183 -69 -143 -230 -269 -402 -316 -81 -22 -271 -25 -350 -5 -173 43 -289 145 -341 298 -19 57 -20 81 -17 534 l3 474 33 67 c55 112 168 199 307 235 79 20 246 10 337 -21z m828 -1515 c67 -71 67 -73 -62 -396 -45 -110 -102 -254 -128 -320 -254 -639 -272 -681 -298 -702 -74 -62 -192 -15 -192 77 0 12 39 116 86 233 48 117 97 239 110 272 119 311 336 833 354 852 36 37 85 32 130 -16z m-1574 -205 c16 -13 19 -29 22 -128 l3 -113 -195 -155 c-108 -85 -196 -158 -196 -161 0 -4 17 -19 38 -35 128 -96 327 -272 339 -301 16 -39 17 -143 2 -177 -15 -33 -34 -39 -67 -22 -48 26 -566 446 -584 474 -23 35 -23 89 1 128 16 27 150 143 376 326 39 31 79 65 90 75 44 41 128 103 139 103 7 0 21 -6 32 -14z m713 -25 c52 -37 53 -33 -92 -551 -36 -129 -80 -289 -98 -355 -39 -143 -62 -175 -129 -175 -47 0 -92 20 -114 52 -24 34 -19 90 18 217 19 64 78 271 131 461 53 190 98 353 101 364 6 16 14 18 79 14 54 -4 81 -11 104 -27z m1116 -351 c55 -45 117 -98 138 -120 61 -64 48 -115 -50 -192 -32 -25 -118 -94 -191 -152 -136 -108 -163 -120 -217 -100 -26 10 -47 62 -39 97 10 46 22 62 94 119 36 29 93 77 128 106 l62 55 -65 59 c-71 65 -77 84 -49 141 24 47 44 67 68 67 12 0 66 -36 121 -80z"/><path fill="#5B7FFF" d="M2328 3755 c-37 -20 -54 -53 -153 -280 -48 -110 -96 -219 -106 -242 l-18 -43 234 0 235 0 0 290 0 290 -82 0 c-53 -1 -93 -6 -110 -15z"/></g></svg>`,
  alibaba: `<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Alibaba</title><path d="M24 14.014c-2.8 1.512-5.62 2.896-8.759 3.524-.7.139-1.476.139-2.187.043-.678-.085-1.017-.682-.776-1.31.23-.585.536-1.181.93-1.671.852-1.065 1.814-2.034 2.678-3.088a15.75 15.75 0 001.422-2.054c.306-.511.164-1.129-.372-1.384-.897-.437-1.859-.745-2.81-1.075-.11-.043-.274.074-.492.149.273.244.47.425.743.67-2.821.48-5.49 1.16-8.08 2.098-.012.053-.033.095-.023.117.383.585.208 1.032-.35 1.394a2.365 2.365 0 00-.568.522c1.706.5 3.226.213 4.68-.735-.087-.127-.175-.244-.262-.372.546.096.874.394.918.862.011.107-.054.213-.087.32-.077-.086-.175-.17-.24-.267-.045-.064-.056-.138-.088-.245-1.728 1.15-3.587 1.438-5.632.842 0 .404-.022.745.011 1.075.022.287-.098.415-.36.564-.591.362-1.204.735-1.696 1.214-.59.585-.371 1.299.427 1.597.907.34 1.859.35 2.81.234 1.126-.139 2.23-.32 3.456-.49-1.433.67-2.844 1.14-4.33 1.33-1.04.14-2.078.214-3.106-.084-1.476-.415-2.133-1.501-1.75-2.96.361-1.363 1.236-2.449 2.176-3.45 3.139-3.332 7.108-5.024 11.7-5.365 1.072-.074 2.155.064 3.16.511 1.411.639 2.002 1.99 1.313 3.354-.448.905-1.072 1.735-1.695 2.555-.612.809-1.301 1.554-1.946 2.331-.186.234-.361.48-.503.745-.274.5-.088.83.492.778 1.213-.118 2.45-.213 3.62-.511 1.716-.437 3.389-1.054 5.084-1.597.175-.043.339-.107.492-.17z" fill="#FF6003" fill-rule="evenodd"></path></svg>`,
  anthropic: `<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Anthropic</title><path d="M13.827 3.52h3.603L24 20h-3.603l-6.57-16.48zm-7.258 0h3.767L16.906 20h-3.674l-1.343-3.461H5.017l-1.344 3.46H0L6.57 3.522zm4.132 9.959L8.453 7.687 6.205 13.48H10.7z"></path></svg>`,
  aws: `<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>AWS</title><path d="M6.763 11.212c0 .296.032.535.088.71.064.176.144.368.256.576.04.063.056.127.056.183 0 .08-.048.16-.152.24l-.503.335a.383.383 0 01-.208.072c-.08 0-.16-.04-.239-.112a2.47 2.47 0 01-.287-.375 6.18 6.18 0 01-.248-.471c-.622.734-1.405 1.101-2.347 1.101-.67 0-1.205-.191-1.596-.574-.39-.384-.59-.894-.59-1.533 0-.678.24-1.23.726-1.644.487-.415 1.133-.623 1.955-.623.272 0 .551.024.846.064.296.04.6.104.918.176v-.583c0-.607-.127-1.03-.375-1.277-.255-.248-.686-.367-1.3-.367-.28 0-.568.031-.863.103-.295.072-.583.16-.862.272a2.4 2.4 0 01-.28.104.488.488 0 01-.127.023c-.112 0-.168-.08-.168-.247v-.391c0-.128.016-.224.056-.28a.597.597 0 01.224-.167 4.577 4.577 0 011.005-.36 4.84 4.84 0 011.246-.151c.95 0 1.644.216 2.091.647.44.43.662 1.085.662 1.963v2.586h.016zm-3.24 1.214c.263 0 .534-.048.822-.144a1.78 1.78 0 00.758-.51 1.27 1.27 0 00.272-.512c.047-.191.08-.423.08-.694v-.335a6.66 6.66 0 00-.735-.136 6.02 6.02 0 00-.75-.048c-.535 0-.926.104-1.19.32-.263.215-.39.518-.39.917 0 .375.095.655.295.846.191.2.47.296.838.296zm6.41.862c-.144 0-.24-.024-.304-.08-.064-.048-.12-.16-.168-.311L7.586 6.726a1.398 1.398 0 01-.072-.32c0-.128.064-.2.191-.2h.783c.151 0 .255.025.31.08.065.048.113.16.16.312l1.342 5.284 1.245-5.284c.04-.16.088-.264.151-.312a.549.549 0 01.32-.08h.638c.152 0 .256.025.32.08.063.048.12.16.151.312l1.261 5.348 1.381-5.348c.048-.16.104-.264.16-.312a.52.52 0 01.311-.08h.743c.127 0 .2.065.2.2 0 .04-.009.08-.017.128a1.137 1.137 0 01-.056.2l-1.923 6.17c-.048.16-.104.263-.168.311a.51.51 0 01-.303.08h-.687c-.15 0-.255-.024-.32-.08-.063-.056-.119-.16-.15-.32L12.32 7.747l-1.23 5.14c-.04.16-.087.264-.15.32-.065.056-.177.08-.32.08l-.686.001zm10.256.215c-.415 0-.83-.048-1.229-.143-.399-.096-.71-.2-.918-.32-.128-.071-.215-.151-.247-.223a.563.563 0 01-.048-.224v-.407c0-.167.064-.247.183-.247.048 0 .096.008.144.024.048.016.12.048.2.08.271.12.566.215.878.279.32.064.63.096.95.096.502 0 .894-.088 1.165-.264a.86.86 0 00.415-.758.777.777 0 00-.215-.559c-.144-.151-.416-.287-.807-.415l-1.157-.36c-.583-.183-1.014-.454-1.277-.813a1.902 1.902 0 01-.4-1.158c0-.335.073-.63.216-.886.144-.255.335-.479.575-.654.24-.184.51-.32.83-.415.32-.096.655-.136 1.006-.136.175 0 .36.008.535.032.183.024.35.056.518.088.16.04.312.08.455.127.144.048.256.096.336.144a.69.69 0 01.24.2.43.43 0 01.071.263v.375c0 .168-.064.256-.184.256a.83.83 0 01-.303-.096 3.652 3.652 0 00-1.532-.311c-.455 0-.815.071-1.062.223-.248.152-.375.383-.375.71 0 .224.08.416.24.567.16.152.454.304.877.44l1.134.358c.574.184.99.44 1.237.767.247.327.367.702.367 1.117 0 .343-.072.655-.207.926a2.157 2.157 0 01-.583.703c-.248.2-.543.343-.886.447-.36.111-.734.167-1.142.167z"></path><path d="M.378 15.475c3.384 1.963 7.56 3.153 11.877 3.153 2.914 0 6.114-.607 9.06-1.852.44-.2.814.287.383.607-2.626 1.94-6.442 2.969-9.722 2.969-4.598 0-8.74-1.7-11.87-4.526-.247-.223-.024-.527.272-.351zm23.531-.2c.287.36-.08 2.826-1.485 4.007-.215.184-.423.088-.327-.151l.175-.439c.343-.88.802-2.198.52-2.555-.336-.43-2.22-.207-3.074-.103-.255.032-.295-.192-.063-.36 1.5-1.053 3.967-.75 4.254-.399z" fill="#F90"></path></svg>`,
@@ -45,6 +46,10 @@ export const icons: Record<string, string> = {
  yi: `<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Yi</title><path d="M18.62 13.927c.611 0 1.107.505 1.107 1.128v5.817c0 .623-.496 1.128-1.108 1.128a1.118 1.118 0 01-1.108-1.128v-5.817c0-.623.496-1.128 1.108-1.128zM16.59 3.052a1.094 1.094 0 011.562-.129c.466.404.522 1.116.126 1.59l-5.938 7.111v9.147c0 .624-.496 1.129-1.108 1.129a1.118 1.118 0 01-1.108-1.129v-9.477l.003-.088.01-.087c.015-.232.102-.462.261-.654l6.192-7.413zM2.906 2.256a1.094 1.094 0 011.559.157l4.387 5.45a1.142 1.142 0 01-.155 1.587 1.094 1.094 0 01-1.559-.157l-4.387-5.45a1.144 1.144 0 01.06-1.498l.095-.09z"></path><ellipse cx="20.146" cy="10.692" fill="#00FF25" rx="1.354" ry="1.379"></ellipse></svg>`,
  zeroone: `<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>01.AI</title><path d="M5.246 12c0 .837-.086 1.554-.257 2.151-.172.598-.45 1.055-.837 1.373-.386.317-.898.476-1.534.476-.901 0-1.563-.353-1.985-1.059C.211 14.235 0 13.255 0 12c0-.837.086-1.554.257-2.151.172-.598.45-1.055.832-1.373C1.472 8.16 1.981 8 2.618 8c.894 0 1.555.351 1.985 1.053.429.702.643 1.685.643 2.947zm-3.883 0c0 .956.09 1.668.273 2.134.183.467.51.7.982.7.465 0 .792-.23.981-.694.19-.463.285-1.176.285-2.14 0-.956-.095-1.668-.285-2.134-.19-.467-.516-.7-.981-.7-.472 0-.8.233-.982.7-.182.466-.273 1.178-.273 2.134zm8.52 3.771H8.517l.011-6.295-1.823.324V8.571l2.04-.457h1.136v7.657zm2.497-1.6h.543c.3 0 .543.256.543.572v.571a.558.558 0 01-.543.572h-.543a.558.558 0 01-.543-.572v-.571c0-.316.243-.572.543-.572zm10.317-6.057H24v7.772h-1.303V8.114zm-3.692 0l2.606 7.772h-1.303l-.69-2.058h-3.073l-.69 2.058h-1.303l2.606-7.772h1.847zm.191 4.457l-1.115-3.323-1.114 3.323h2.23z"></path></svg>`,
  zhipu: `<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Zhipu</title><path d="M11.991 23.503a.24.24 0 00-.244.248.24.24 0 00.244.249.24.24 0 00.245-.249.24.24 0 00-.22-.247l-.025-.001zM9.671 5.365a1.697 1.697 0 011.099 2.132l-.071.172-.016.04-.018.054c-.07.16-.104.32-.104.498-.035.71.47 1.279 1.186 1.314h.366c1.309.053 2.338 1.173 2.286 2.523-.052 1.332-1.152 2.38-2.478 2.327h-.174c-.715.018-1.274.64-1.239 1.368 0 .124.018.23.053.337.209.373.54.658.96.8.75.23 1.517-.125 1.9-.782l.018-.035c.402-.64 1.17-.96 1.92-.711.854.284 1.378 1.226 1.099 2.167a1.661 1.661 0 01-2.077 1.102 1.711 1.711 0 01-.907-.711l-.017-.035c-.2-.323-.463-.58-.851-.711l-.056-.018a1.646 1.646 0 00-1.954.746 1.66 1.66 0 01-1.065.764 1.677 1.677 0 01-1.989-1.279c-.209-.906.332-1.83 1.257-2.043a1.51 1.51 0 01.296-.035h.018c.68-.071 1.151-.622 1.116-1.333a1.307 1.307 0 00-.227-.693 2.515 2.515 0 01-.366-1.403 2.39 2.39 0 01.366-1.208c.14-.195.21-.444.227-.693.018-.71-.506-1.261-1.186-1.332l-.07-.018a1.43 1.43 0 01-.299-.07l-.05-.019a1.7 1.7 0 01-1.047-2.114 1.68 1.68 0 012.094-1.101zm-5.575 10.11c.26-.264.639-.367.994-.27.355.096.633.379.728.74.095.362-.007.748-.267 1.013-.402.41-1.053.41-1.455 0a1.062 1.062 0 010-1.482zm14.845-.294c.359-.09.738.024.992.297.254.274.344.665.237 1.025-.107.36-.396.634-.756.718-.551.128-1.1-.22-1.23-.781a1.05 1.05 0 01.757-1.26zm-.064-4.39c.314.32.49.753.49 1.206 0 .452-.176.886-.49 1.206-.315.32-.74.5-1.185.5-.444 0-.87-.18-1.184-.5a1.727 1.727 0 010-2.412 1.654 1.654 0 012.369 0zm-11.243.163c.364.484.447 1.128.218 1.691a1.665 1.665 0 01-2.188.923c-.855-.36-1.26-1.358-.907-2.228a1.68 1.68 0 011.33-1.038c.593-.08 1.183.169 1.547.652zm11.545-4.221c.368 0 .708.2.892.524.184.324.184.724 0 1.048a1.026 1.026 0 01-.892.524c-.568 0-1.03-.47-1.03-1.048 0-.579.462-1.048 1.03-1.048zm-14.358 0c.368 0 .707.2.891.524.184.324.184.724 0 1.048a1.026 1.026 0 01-.891.524c-.569 0-1.03-.47-1.03-1.048 0-.579.461-1.048 1.03-1.048zm10.031-1.475c.925 0 1.675.764 1.675 1.706s-.75 1.705-1.675 1.705-1.674-.763-1.674-1.705c0-.942.75-1.706 1.674-1.706zm-2.626-.684c.362-.082.653-.356.761-.718a1.062 1.062 0 00-.238-1.028 1.017 1.017 0 00-.996-.294c-.547.14-.881.7-.752 1.257.13.558.675.907 1.225.783zm0 16.876c.359-.087.644-.36.75-.72a1.062 1.062 0 00-.237-1.019 1.018 1.018 0 00-.985-.301 1.037 1.037 0 00-.762.717c-.108.361-.017.754.239 1.028.245.263.606.377.953.305l.043-.01zM17.19 3.5a.631.631 0 00.628-.64c0-.355-.279-.64-.628-.64a.631.631 0 00-.628.64c0 .355.28.64.628.64zm-10.38 0a.631.631 0 00.628-.64c0-.355-.28-.64-.628-.64a.631.631 0 00-.628.64c0 .355.279.64.628.64zm-5.182 7.852a.631.631 0 00-.628.64c0 .354.28.639.628.639a.63.63 0 00.627-.606l.001-.034a.62.62 0 00-.628-.64zm5.182 9.13a.631.631 0 00-.628.64c0 .355.279.64.628.64a.631.631 0 00.628-.64c0-.355-.28-.64-.628-.64zm10.38.018a.631.631 0 00-.628.64c0 .355.28.64.628.64a.631.631 0 00.628-.64c0-.355-.279-.64-.628-.64zm5.182-9.148a.631.631 0 00-.628.64c0 .354.279.639.628.639a.631.631 0 00.628-.64c0-.355-.28-.64-.628-.64zm-.384-4.992a.24.24 0 00.244-.249.24.24 0 00-.244-.249.24.24 0 00-.244.249c0 .142.122.249.244.249zM11.991.497a.24.24 0 00.245-.248A.24.24 0 0011.99 0a.24.24 0 00-.244.249c0 .133.108.236.223.247l.021.001zM2.011 6.36a.24.24 0 00.245-.249.24.24 0 00-.244-.249.24.24 0 00-.244.249.24.24 0 00.244.249zm0 11.263a.24.24 0 00-.243.248.24.24 0 00.244.249.24.24 0 00.244-.249.252.252 0 00-.244-.248zm19.995-.018a.24.24 0 00-.245.248.24.24 0 00.245.25.24.24 0 00.244-.25.252.252 0 00-.244-.248z" fill="#3859FF" fill-rule="nonzero"></path></svg>`,
+  openrouter: `<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>OpenRouter</title><path d="M16.804 1.957l7.22 4.105v.087L16.73 10.21l.017-2.117-.821-.03c-1.059-.028-1.611.002-2.268.11-1.064.175-2.038.577-3.147 1.352L8.345 11.03c-.284.195-.495.336-.68.455l-.515.322-.397.234.385.23.53.338c.476.314 1.17.796 2.701 1.866 1.11.775 2.083 1.177 3.147 1.352l.3.045c.694.091 1.375.094 2.825.033l.022-2.159 7.22 4.105v.087L16.589 22l.014-1.862-.635.022c-1.386.042-2.137.002-3.138-.162-1.694-.28-3.26-.926-4.881-2.059l-2.158-1.5a21.997 21.997 0 00-.755-.498l-.467-.28a55.927 55.927 0 00-.76-.43C2.908 14.73.563 14.116 0 14.116V9.888l.14.004c.564-.007 2.91-.622 3.809-1.124l1.016-.58.438-.274c.428-.28 1.072-.726 2.686-1.853 1.621-1.133 3.186-1.78 4.881-2.059 1.152-.19 1.974-.213 3.814-.138l.02-1.907z"></path></svg>`,
+  longcat: `<svg fill="currentColor" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>LongCat</title><path clip-rule="evenodd" d="M.507 19.883a.507.507 0 01-.489-.642L4.29 3.745a1.013 1.013 0 011.533-.578l5.622 3.687a1.013 1.013 0 001.11 0L18.2 3.165a1.013 1.013 0 011.532.58l4.25 15.497a.506.506 0 01-.49.64H18.07a6.297 6.297 0 001.53-4.115v-.177a6.09 6.09 0 00-1.513-4.017l-.697-3.495a.438.438 0 00-.694-.266L14.07 9.781a.748.748 0 01-.654.121 5.156 5.156 0 00-2.833 0 .746.746 0 01-.653-.121L7.302 7.81a.435.435 0 00-.688.269l-.675 3.652a5.36 5.36 0 00-1.539 3.76v.333c0 1.474.527 2.9 1.488 4.02l.032.038H.507z" fill="#29E154" fill-rule="evenodd"></path><path d="M9.213 16.843h1.52v-3.546h-1.29l-.23 3.546zm5.573 0h-1.52v-3.546h1.29l.23 3.546z"></path></svg>`,
+  modelscope: `<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>ModelScope</title><path d="M0 7.967h2.667v2.667H0zM8 10.633h2.667V13.3H8z" fill="#36CED0"></path><path d="M0 10.633h2.667V13.3H0zM2.667 13.3h2.666v2.667H8v2.666H2.667V13.3zM2.667 5.3H8v2.667H5.333v2.666H2.667V5.3zM10.667 13.3h2.667v2.667h-2.667z" fill="#624AFF"></path><path d="M24 7.967h-2.667v2.667H24zM16 10.633h-2.667V13.3H16z" fill="#36CED0"></path><path d="M24 10.633h-2.667V13.3H24zM21.333 13.3h-2.666v2.667H16v2.666h5.333V13.3zM21.333 5.3H16v2.667h2.667v2.666h2.666V5.3z" fill="#624AFF"></path></svg>`,
+  aihubmix: `<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>AiHubMix</title><path d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12z" fill="#006FFB"></path><path clip-rule="evenodd" d="M11.24 8.393c.095-.644.302-1.47.624-2.48L12 5.496l.136.417c.322 1.01.53 1.836.624 2.48.071.472.071 1.072 0 1.8-.072.731-.072 1.336 0 1.814.106.7.426 1.281.96 1.744a2.795 2.795 0 001.89.708 2.78 2.78 0 002.034-.84c.56-.559.842-1.234.848-2.024.003-.7.075-1.472.216-2.316.069-.422.14-.775.21-1.06l.095-.384.168.356a7.862 7.862 0 01.76 3.244v.16a7.84 7.84 0 01-.624 3.089 7.952 7.952 0 01-4.228 4.228 7.841 7.841 0 01-3.089.623 7.84 7.84 0 01-3.089-.623 7.952 7.952 0 01-4.228-4.228 7.84 7.84 0 01-.623-3.09v-.159a7.862 7.862 0 01.759-3.244l.169-.356.093.385c.072.284.143.637.211 1.059.141.844.213 1.616.216 2.316.006.79.29 1.465.848 2.024.563.56 1.241.84 2.035.84.715 0 1.345-.236 1.889-.708a2.79 2.79 0 00.96-1.744c.073-.478.073-1.083 0-1.814-.071-.728-.071-1.328 0-1.8zm.76 9.694c1.097 0 2.125-.26 3.085-.778a6.379 6.379 0 001.77-1.399c.063-.07-.01-.178-.101-.153-.37.1-.75.15-1.144.15a4.236 4.236 0 01-2.18-.59 4.253 4.253 0 01-1.35-1.233.099.099 0 00-.16 0 4.253 4.253 0 01-1.35 1.232 4.236 4.236 0 01-2.18.591c-.393 0-.774-.05-1.143-.15-.091-.025-.165.083-.102.153a6.38 6.38 0 001.77 1.399c.96.518 1.988.778 3.085.778z" fill="#fff" fill-rule="evenodd"></path></svg>`,
 };

 export const iconList = Object.keys(icons);
@@ -0,0 +1 @@
+<svg fill="currentColor" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>LongCat</title><path clip-rule="evenodd" d="M.507 19.883a.507.507 0 01-.489-.642L4.29 3.745a1.013 1.013 0 011.533-.578l5.622 3.687a1.013 1.013 0 001.11 0L18.2 3.165a1.013 1.013 0 011.532.58l4.25 15.497a.506.506 0 01-.49.64H18.07a6.297 6.297 0 001.53-4.115v-.177a6.09 6.09 0 00-1.513-4.017l-.697-3.495a.438.438 0 00-.694-.266L14.07 9.781a.748.748 0 01-.654.121 5.156 5.156 0 00-2.833 0 .746.746 0 01-.653-.121L7.302 7.81a.435.435 0 00-.688.269l-.675 3.652a5.36 5.36 0 00-1.539 3.76v.333c0 1.474.527 2.9 1.488 4.02l.032.038H.507z" fill="#29E154" fill-rule="evenodd"></path><path d="M9.213 16.843h1.52v-3.546h-1.29l-.23 3.546zm5.573 0h-1.52v-3.546h1.29l.23 3.546z"></path></svg>
@@ -2,6 +2,13 @@
 import { IconMetadata } from "@/types/icon";

 export const iconMetadata: Record<string, IconMetadata> = {
+  aigocode: {
+    name: "aigocode",
+    displayName: "AiGoCode",
+    category: "ai-provider",
+    keywords: ["aigocode", "aigo", "code", "third-party"],
+    defaultColor: "#5B7FFF",
+  },
  alibaba: {
    name: "alibaba",
    displayName: "Alibaba",
@@ -303,6 +310,34 @@ export const iconMetadata: Record<string, IconMetadata> = {
    keywords: ["chatglm", "glm"],
    defaultColor: "#0F62FE",
  },
+  openrouter: {
+    name: "openrouter",
+    displayName: "OpenRouter",
+    category: "ai-provider",
+    keywords: ["openrouter", "router", "aggregator"],
+    defaultColor: "#6566F1",
+  },
+  longcat: {
+    name: "longcat",
+    displayName: "LongCat",
+    category: "ai-provider",
+    keywords: ["longcat", "long", "cat"],
+    defaultColor: "#29E154",
+  },
+  modelscope: {
+    name: "modelscope",
+    displayName: "ModelScope",
+    category: "ai-provider",
+    keywords: ["modelscope", "alibaba", "scope"],
+    defaultColor: "#624AFF",
+  },
+  aihubmix: {
+    name: "aihubmix",
+    displayName: "AiHubMix",
+    category: "ai-provider",
+    keywords: ["aihubmix", "hub", "mix", "aggregator"],
+    defaultColor: "#006FFB",
+  },
 };

 export function getIconMetadata(name: string): IconMetadata | undefined {
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>ModelScope</title><path d="M0 7.967h2.667v2.667H0zM8 10.633h2.667V13.3H8z" fill="#36CED0"></path><path d="M0 10.633h2.667V13.3H0zM2.667 13.3h2.666v2.667H8v2.666H2.667V13.3zM2.667 5.3H8v2.667H5.333v2.666H2.667V5.3zM10.667 13.3h2.667v2.667h-2.667z" fill="#624AFF"></path><path d="M24 7.967h-2.667v2.667H24zM16 10.633h-2.667V13.3H16z" fill="#36CED0"></path><path d="M24 10.633h-2.667V13.3H24zM21.333 13.3h-2.666v2.667H16v2.666h5.333V13.3zM21.333 5.3H16v2.667h2.667v2.666h2.666V5.3z" fill="#624AFF"></path></svg>
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>OpenRouter</title><path d="M16.804 1.957l7.22 4.105v.087L16.73 10.21l.017-2.117-.821-.03c-1.059-.028-1.611.002-2.268.11-1.064.175-2.038.577-3.147 1.352L8.345 11.03c-.284.195-.495.336-.68.455l-.515.322-.397.234.385.23.53.338c.476.314 1.17.796 2.701 1.866 1.11.775 2.083 1.177 3.147 1.352l.3.045c.694.091 1.375.094 2.825.033l.022-2.159 7.22 4.105v.087L16.589 22l.014-1.862-.635.022c-1.386.042-2.137.002-3.138-.162-1.694-.28-3.26-.926-4.881-2.059l-2.158-1.5a21.997 21.997 0 00-.755-.498l-.467-.28a55.927 55.927 0 00-.76-.43C2.908 14.73.563 14.116 0 14.116V9.888l.14.004c.564-.007 2.91-.622 3.809-1.124l1.016-.58.438-.274c.428-.28 1.072-.726 2.686-1.853 1.621-1.133 3.186-1.78 4.881-2.059 1.152-.19 1.974-.213 3.814-.138l.02-1.907z"></path></svg>
@@ -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;
@@ -69,6 +69,14 @@ export const settingsApi = {
    return await invoke("apply_claude_plugin_config", { official });
  },

+  async applyClaudeOnboardingSkip(): Promise<boolean> {
+    return await invoke("apply_claude_onboarding_skip");
+  },
+
+  async clearClaudeOnboardingSkip(): Promise<boolean> {
+    return await invoke("clear_claude_onboarding_skip");
+  },
+
  async saveFileDialog(defaultName: string): Promise<string | null> {
    return await invoke("save_file_dialog", { defaultName });
  },
@@ -12,6 +12,7 @@ export const settingsSchema = z.object({
  showInTray: z.boolean(),
  minimizeToTrayOnClose: z.boolean(),
  enableClaudePluginIntegration: z.boolean().optional(),
+  skipClaudeOnboarding: z.boolean().optional(),
  launchOnStartup: z.boolean().optional(),
  language: z.enum(["en", "zh", "ja"]).optional(),

@@ -106,6 +106,8 @@ export interface Settings {
  minimizeToTrayOnClose: boolean;
  // 启用 Claude 插件联动（写入 ~/.claude/config.json 的 primaryApiKey）
  enableClaudePluginIntegration?: boolean;
+  // 跳过 Claude Code 初次安装确认（写入 ~/.claude.json 的 hasCompletedOnboarding）
+  skipClaudeOnboarding?: boolean;
  // 是否开机自启
  launchOnStartup?: boolean;
  // 首选语言（可选，默认中文）
@@ -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',
@@ -63,7 +63,7 @@ describe("ImportExportSection Component", () => {
    fireEvent.click(importButton);
    expect(baseProps.onImport).toHaveBeenCalledTimes(1);

-    fireEvent.click(screen.getByRole("button", { name: "Clear selection" }));
+    fireEvent.click(screen.getByRole("button", { name: "common.clear" }));
    expect(baseProps.onClear).toHaveBeenCalledTimes(1);
  });

@@ -110,12 +110,6 @@ describe("useImportExport Hook", () => {
    expect(result.current.status).toBe("success");
    expect(result.current.backupId).toBe("backup-123");
    expect(toastSuccessMock).toHaveBeenCalledTimes(1);
-
-    // Skip delay to execute callback
-    await act(async () => {
-      vi.runOnlyPendingTimers();
-    });
-
    expect(onImportSuccess).toHaveBeenCalledTimes(1);
  });

@@ -7,6 +7,8 @@ const mutateAsyncMock = vi.fn();
 const useSettingsQueryMock = vi.fn();
 const setAppConfigDirOverrideMock = vi.fn();
 const applyClaudePluginConfigMock = vi.fn();
+const applyClaudeOnboardingSkipMock = vi.fn();
+const clearClaudeOnboardingSkipMock = vi.fn();
 const syncCurrentProvidersLiveMock = vi.fn();
 const updateTrayMenuMock = vi.fn();
 const toastErrorMock = vi.fn();
@@ -50,6 +52,10 @@ vi.mock("@/lib/api", () => ({
      setAppConfigDirOverrideMock(...args),
    applyClaudePluginConfig: (...args: unknown[]) =>
      applyClaudePluginConfigMock(...args),
+    applyClaudeOnboardingSkip: (...args: unknown[]) =>
+      applyClaudeOnboardingSkipMock(...args),
+    clearClaudeOnboardingSkip: (...args: unknown[]) =>
+      clearClaudeOnboardingSkipMock(...args),
    syncCurrentProvidersLive: (...args: unknown[]) =>
      syncCurrentProvidersLiveMock(...args),
  },
@@ -63,6 +69,7 @@ const createSettingsFormMock = (overrides: Record<string, unknown> = {}) => ({
    showInTray: true,
    minimizeToTrayOnClose: true,
    enableClaudePluginIntegration: false,
+    skipClaudeOnboarding: true,
    claudeConfigDir: "/claude",
    codexConfigDir: "/codex",
    language: "zh",
@@ -111,6 +118,8 @@ describe("useSettings hook", () => {
    useSettingsQueryMock.mockReset();
    setAppConfigDirOverrideMock.mockReset();
    applyClaudePluginConfigMock.mockReset();
+    applyClaudeOnboardingSkipMock.mockReset();
+    clearClaudeOnboardingSkipMock.mockReset();
    syncCurrentProvidersLiveMock.mockReset();
    toastErrorMock.mockReset();
    toastSuccessMock.mockReset();
@@ -120,6 +129,7 @@ describe("useSettings hook", () => {
      showInTray: true,
      minimizeToTrayOnClose: true,
      enableClaudePluginIntegration: false,
+      skipClaudeOnboarding: true,
      claudeConfigDir: "/server/claude",
      codexConfigDir: "/server/codex",
      language: "zh",
@@ -142,6 +152,64 @@ describe("useSettings hook", () => {
    mutateAsyncMock.mockResolvedValue(true);
    setAppConfigDirOverrideMock.mockResolvedValue(true);
    applyClaudePluginConfigMock.mockResolvedValue(true);
+    applyClaudeOnboardingSkipMock.mockResolvedValue(true);
+    clearClaudeOnboardingSkipMock.mockResolvedValue(true);
+  });
+
+  it("auto-saves and applies Claude onboarding skip when toggled on", async () => {
+    serverSettings = {
+      ...serverSettings,
+      skipClaudeOnboarding: false,
+    };
+    useSettingsQueryMock.mockReturnValue({
+      data: serverSettings,
+      isLoading: false,
+    });
+
+    settingsFormMock = createSettingsFormMock({
+      settings: {
+        ...serverSettings,
+        language: "zh",
+        skipClaudeOnboarding: false,
+      },
+    });
+
+    const { result } = renderHook(() => useSettings());
+
+    await act(async () => {
+      await result.current.autoSaveSettings({ skipClaudeOnboarding: true });
+    });
+
+    expect(applyClaudeOnboardingSkipMock).toHaveBeenCalledTimes(1);
+    expect(toastErrorMock).not.toHaveBeenCalled();
+  });
+
+  it("auto-saves and clears Claude onboarding skip when toggled off", async () => {
+    serverSettings = {
+      ...serverSettings,
+      skipClaudeOnboarding: true,
+    };
+    useSettingsQueryMock.mockReturnValue({
+      data: serverSettings,
+      isLoading: false,
+    });
+
+    settingsFormMock = createSettingsFormMock({
+      settings: {
+        ...serverSettings,
+        language: "zh",
+        skipClaudeOnboarding: true,
+      },
+    });
+
+    const { result } = renderHook(() => useSettings());
+
+    await act(async () => {
+      await result.current.autoSaveSettings({ skipClaudeOnboarding: false });
+    });
+
+    expect(clearClaudeOnboardingSkipMock).toHaveBeenCalledTimes(1);
+    expect(toastErrorMock).not.toHaveBeenCalled();
  });

  it("saves settings and flags restart when app config directory changes", async () => {
@@ -176,6 +176,10 @@ export const handlers = [
    },
  ),

+  http.post(`${TAURI_ENDPOINT}/apply_claude_onboarding_skip`, () => success(true)),
+
+  http.post(`${TAURI_ENDPOINT}/clear_claude_onboarding_skip`, () => success(true)),
+
  http.post(`${TAURI_ENDPOINT}/get_config_dir`, async ({ request }) => {
    const { app } = await withJson<{ app: AppId }>(request);
    return success(app === "claude" ? "/default/claude" : "/default/codex");
Author	SHA1	Message	Date
Jason	c06dd53dca	docs(changelog): add macOS tray template icon entry	2025-12-24 15:16:48 +08:00
Jason	caade44cf9	feat(tray): use macOS tray template icon Cherry-picked from main (`f047960`)	2025-12-24 14:41:28 +08:00
Jason	c5f8ca1df9	chore(release): prepare v3.8.3 - Bump version to 3.8.3 in package.json, Cargo.toml, tauri.conf.json - Add CHANGELOG entry for v3.8.3 with new features, fixes and changes	2025-12-24 11:33:05 +08:00
Jason	4cdaed56e6	feat(presets): add AiGoCode icon and partner promotion - Add AiGoCode colored icon (blue body #5B7FFF, purple star #7C6AEF) - Add original SVG source file for reference - Add icon metadata with keywords and default color - Add iconColor to AiGoCode presets for Claude, Codex, and Gemini - Add partner promotion messages in zh/en/ja locales	2025-12-24 11:06:48 +08:00
Jason	0de1c1356b	chore: update GLM partner banner images	2025-12-23 23:25:55 +08:00
Jason	4afa9b07e8	chore(presets): update model versions for provider presets Claude presets: - Zhipu GLM: glm-4.6 → glm-4.7 - Z.ai GLM: glm-4.6 → glm-4.7 - ModelScope: GLM-4.6 → GLM-4.7 - MiniMax: MiniMax-M2 → MiniMax-M2.1 Codex presets: - Azure, AiHubMix, DMXAPI, PackyCode: gpt-5.1-codex → gpt-5.2 - Custom template: gpt-5-codex → gpt-5.2	2025-12-23 22:48:38 +08:00
Jason	21ceb819b9	feat(settings): add option to skip Claude Code first-run confirmation Add a new setting to automatically skip Claude Code's onboarding screen by writing hasCompletedOnboarding=true to ~/.claude.json. The setting defaults to enabled for better user experience. Cherry-picked from main (`ddbff07`) with conflict resolution.	2025-12-23 22:39:57 +08:00
Jason	9ea7952246	fix(ui): add padding-top to prevent content being covered by fixed header Add CONTENT_TOP_OFFSET constant (92px = 28px drag bar + 64px header) and apply it as paddingTop to the root container, ensuring provider cards and other content are not obscured by the fixed-position header and env warning banner.	2025-12-23 22:36:36 +08:00
Jason	77cce44490	chore: update aigocode partner logo	2025-12-23 19:27:28 +08:00
Jason	7846e4b1e4	update readme	2025-12-23 19:27:22 +08:00
Jason	ac20a7b13c	fix(mcp): skip sync when target CLI app is not installed Add guard functions to check if Claude/Codex/Gemini CLI has been initialized before attempting to sync MCP configurations. This prevents creating unwanted config files in directories that don't exist. - Claude: check ~/.claude dir OR ~/.claude.json file exists - Codex: check ~/.codex dir exists - Gemini: check ~/.gemini dir exists When the target app is not installed, sync operations now silently succeed without writing any files, allowing users to manage MCP servers for apps they actually use without side effects on others.	2025-12-23 19:18:57 +08:00
TinsFox	3330ef5132	fix: azure website link (#407 )	2025-12-23 19:18:15 +08:00
Jason	04a43fba7d	chore(i18n): remove restart prompt from provider switch notification Claude Code now supports hot reload, so users no longer need to restart the terminal after switching providers. Also removes unused `restartClaude` i18n string.	2025-12-23 19:18:09 +08:00
Jason	f2e6ffd2d6	feat(providers): add DMXAPI as official partner Mark DMXAPI as partner in both Claude and Codex presets with promotion message for their Claude Code exclusive model 66% OFF offer.	2025-12-23 19:13:44 +08:00
Jason	84a4cd8358	feat(icons): add provider icons for OpenRouter, LongCat, ModelScope, AiHubMix - Add SVG icons for OpenRouter, LongCat, ModelScope, and AiHubMix - Register icons in index.ts and metadata.ts with search keywords - Link icons to corresponding provider presets in claudeProviderPresets.ts	2025-12-23 19:13:37 +08:00
Jason	0ac66e8e37	fix(ui): reduce header spacing and fix layout shift on view switch - Change right-side button container from min-h-[40px] to h-[32px] for more compact header layout - Remove conditional padding (pt-6/pt-4) from main content area to eliminate layout jump during view transitions	2025-12-23 19:06:32 +08:00
Jason	bd488f8f26	fix(ui): prevent header layout shift when switching views Add min-height to right-side button container and ml-auto to add buttons in MCP/Prompts views to maintain consistent header height and button position across all views.	2025-12-23 19:05:50 +08:00
Jason	81423001be	fix(ui): improve text visibility in dark mode Replace hardcoded gray color classes with semantic color classes to fix poor text contrast in dark mode: - MCP panel: server names, descriptions, tags, app labels - Prompt panel: prompt names, descriptions, empty states - Usage footer: timestamps, refresh buttons - Update badge: close button icon - API key input: disabled state text - Env warning banner: source info text Changes: - `text-gray-400 dark:text-gray-500` → `text-muted-foreground` (fixes reversed dark mode logic) - `text-gray-500 dark:text-gray-400` → `text-muted-foreground` - `bg-gray-100 dark:bg-gray-800` → `bg-muted`	2025-12-23 19:05:42 +08:00
Jason	dffaf4071d	fix(import): refresh all providers immediately after SQL import - Remove setTimeout delay that could be cancelled on component unmount - Invalidate all providers cache (not just current app) since import affects all apps - Call onImportSuccess before sync to ensure UI refresh even if sync fails - Update i18n: "Data refreshed" (past tense, reflecting immediate action)	2025-12-23 19:05:01 +08:00
Jason	8ce6edfe94	fix(backup): restrict SQL import to CC Switch exported backups only - Add validation to reject SQL files without CC Switch export header - Remove redundant sanitize_import_sql (sqlite_* objects already excluded at export time) - Fix backup filename collision by appending counter suffix - Update i18n hints to clarify import restriction	2025-12-23 19:04:56 +08:00
YoVinchen	de168b860e	fix(skill): use directory basename for skill installation path (#358 ) Extract last segment from skill directory path to prevent nested directory issues during install/uninstall operations. For example, "skills/codex" now correctly installs to "codex" instead of creating nested "skills/codex" path.	2025-12-23 18:48:36 +08:00
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
				`@@ -0,0 +1 @@`
				<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>AiHubMix</title><path d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12z" fill="#006FFB"></path><path clip-rule="evenodd" d="M11.24 8.393c.095-.644.302-1.47.624-2.48L12 5.496l.136.417c.322 1.01.53 1.836.624 2.48.071.472.071 1.072 0 1.8-.072.731-.072 1.336 0 1.814.106.7.426 1.281.96 1.744a2.795 2.795 0 001.89.708 2.78 2.78 0 002.034-.84c.56-.559.842-1.234.848-2.024.003-.7.075-1.472.216-2.316.069-.422.14-.775.21-1.06l.095-.384.168.356a7.862 7.862 0 01.76 3.244v.16a7.84 7.84 0 01-.624 3.089 7.952 7.952 0 01-4.228 4.228 7.841 7.841 0 01-3.089.623 7.84 7.84 0 01-3.089-.623 7.952 7.952 0 01-4.228-4.228 7.84 7.84 0 01-.623-3.09v-.159a7.862 7.862 0 01.759-3.244l.169-.356.093.385c.072.284.143.637.211 1.059.141.844.213 1.616.216 2.316.006.79.29 1.465.848 2.024.563.56 1.241.84 2.035.84.715 0 1.345-.236 1.889-.708a2.79 2.79 0 00.96-1.744c.073-.478.073-1.083 0-1.814-.071-.728-.071-1.328 0-1.8zm.76 9.694c1.097 0 2.125-.26 3.085-.778a6.379 6.379 0 001.77-1.399c.063-.07-.01-.178-.101-.153-.37.1-.75.15-1.144.15a4.236 4.236 0 01-2.18-.59 4.253 4.253 0 01-1.35-1.233.099.099 0 00-.16 0 4.253 4.253 0 01-1.35 1.232 4.236 4.236 0 01-2.18.591c-.393 0-.774-.05-1.143-.15-.091-.025-.165.083-.102.153a6.38 6.38 0 001.77 1.399c.96.518 1.988.778 3.085.778z" fill="#fff" fill-rule="evenodd"></path></svg>
				`@@ -0,0 +1 @@`
				<svg fill="currentColor" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>LongCat</title><path clip-rule="evenodd" d="M.507 19.883a.507.507 0 01-.489-.642L4.29 3.745a1.013 1.013 0 011.533-.578l5.622 3.687a1.013 1.013 0 001.11 0L18.2 3.165a1.013 1.013 0 011.532.58l4.25 15.497a.506.506 0 01-.49.64H18.07a6.297 6.297 0 001.53-4.115v-.177a6.09 6.09 0 00-1.513-4.017l-.697-3.495a.438.438 0 00-.694-.266L14.07 9.781a.748.748 0 01-.654.121 5.156 5.156 0 00-2.833 0 .746.746 0 01-.653-.121L7.302 7.81a.435.435 0 00-.688.269l-.675 3.652a5.36 5.36 0 00-1.539 3.76v.333c0 1.474.527 2.9 1.488 4.02l.032.038H.507z" fill="#29E154" fill-rule="evenodd"></path><path d="M9.213 16.843h1.52v-3.546h-1.29l-.23 3.546zm5.573 0h-1.52v-3.546h1.29l.23 3.546z"></path></svg>
				`@@ -0,0 +1 @@`
				<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>OpenRouter</title><path d="M16.804 1.957l7.22 4.105v.087L16.73 10.21l.017-2.117-.821-.03c-1.059-.028-1.611.002-2.268.11-1.064.175-2.038.577-3.147 1.352L8.345 11.03c-.284.195-.495.336-.68.455l-.515.322-.397.234.385.23.53.338c.476.314 1.17.796 2.701 1.866 1.11.775 2.083 1.177 3.147 1.352l.3.045c.694.091 1.375.094 2.825.033l.022-2.159 7.22 4.105v.087L16.589 22l.014-1.862-.635.022c-1.386.042-2.137.002-3.138-.162-1.694-.28-3.26-.926-4.881-2.059l-2.158-1.5a21.997 21.997 0 00-.755-.498l-.467-.28a55.927 55.927 0 00-.76-.43C2.908 14.73.563 14.116 0 14.116V9.888l.14.004c.564-.007 2.91-.622 3.809-1.124l1.016-.58.438-.274c.428-.28 1.072-.726 2.686-1.853 1.621-1.133 3.186-1.78 4.881-2.059 1.152-.19 1.974-.213 3.814-.138l.02-1.907z"></path></svg>