feat: add auto-updater support with GitHub releases

- Configure Tauri updater plugin with Ed25519 signing - Add GitHub Actions support for signed builds - Set up GitHub releases as update endpoint - Enable update checking in Settings modal
fix(updater): 避免因 Updater 配置不完整导致应用启动中止\n\n- Updater 插件注册改为容错（失败仅告警，不影响应用启动）
2025-09-09 15:13:06 +08:00 · 2025-09-09 10:28:34 +08:00 · 2025-09-08 16:58:41 +08:00 · 2025-09-08 16:48:24 +08:00 · 2025-09-08 15:57:29 +08:00 · 2025-09-08 15:38:06 +08:00
54 changed files with 5096 additions and 1370 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,38 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.rs text eol=lf
+*.toml text eol=lf
+*.json text eol=lf
+*.md text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.txt text eol=lf
+
+# TypeScript/JavaScript files
+*.ts text eol=lf
+*.tsx text eol=lf
+*.js text eol=lf
+*.jsx text eol=lf
+
+# HTML/CSS files
+*.html text eol=lf
+*.css text eol=lf
+*.scss text eol=lf
+
+# Shell scripts
+*.sh text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.woff binary
+*.woff2 binary
+*.ttf binary
+*.exe binary
+*.dll binary
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -85,14 +85,20 @@ jobs:

      - name: Build Tauri App (macOS)
        if: runner.os == 'macOS'
+        env:
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
        run: pnpm tauri build --target universal-apple-darwin

      - name: Build Tauri App (Windows)
        if: runner.os == 'Windows'
+        env:
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
        run: pnpm tauri build

      - name: Build Tauri App (Linux)
        if: runner.os == 'Linux'
+        env:
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
        run: pnpm tauri build

      - name: Prepare macOS Assets
@@ -180,6 +186,16 @@ jobs:
        run: |
          ls -la release-assets || true

+      - name: Collect Signatures
+        shell: bash
+        run: |
+          # 查找并复制签名文件到 release-assets
+          find src-tauri/target -name "*.sig" -type f 2>/dev/null | while read sig; do
+            cp "$sig" release-assets/ || true
+          done
+          echo "Collected signatures:"
+          ls -la release-assets/*.sig || echo "No signatures found"
+
      - name: Upload Release Assets
        uses: softprops/action-gh-release@v1
        with:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,44 @@ 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.1.1] - 2025-09-03
+
+### 🐛 Bug Fixes
+- Fixed the default codex config.toml to match the latest modifications
+- Improved provider configuration UX with custom option
+
+### 📝 Documentation
+- Updated README with latest information
+
+## [3.1.0] - 2025-09-01
+
+### ✨ New Features
+- **Added Codex application support** - Now supports both Claude Code and Codex configuration management
+  - Manage auth.json and config.toml for Codex
+  - Support for backup and restore operations
+  - Preset providers for Codex (Official, PackyCode)
+  - API Key auto-write to auth.json when using presets
+- **New UI components**
+  - App switcher with segmented control design
+  - Dual editor form for Codex configuration
+  - Pills-style app switcher with consistent button widths
+- **Enhanced configuration management**
+  - Multi-app config v2 structure (claude/codex)
+  - Automatic v1→v2 migration with backup
+  - OPENAI_API_KEY validation for non-official presets
+  - TOML syntax validation for config.toml
+
+### 🔧 Technical Improvements
+- Unified Tauri command API with app_type parameter
+- Backward compatibility for app/appType parameters
+- Added get_config_status/open_config_folder/open_external commands
+- Improved error handling for empty config.toml
+
+### 🐛 Bug Fixes
+- Fixed config path reporting and folder opening for Codex
+- Corrected default import behavior when main config is missing
+- Fixed non_snake_case warnings in commands.rs
+
 ## [3.0.0] - 2025-08-27

 ### 🚀 Major Changes
@@ -44,6 +82,11 @@ For users upgrading from v2.x (Electron version):
 - The app will automatically migrate your existing provider configurations
 - Window position and size preferences have been reset to defaults

+#### Backup on v1→v2 Migration (cc-switch internal config)
+- When the app detects an old v1 config structure at `~/.cc-switch/config.json`, it now creates a timestamped backup before writing the new v2 structure.
+- Backup location: `~/.cc-switch/config.v1.backup.<timestamp>.json`
+- This only concerns cc-switch's own metadata file; your actual provider files under `~/.claude/` and `~/.codex/` are untouched.
+
 ### 🛠️ Development
 - Added `pnpm typecheck` command for TypeScript validation
 - Added `pnpm format` and `pnpm format:check` for code formatting
@@ -64,4 +107,4 @@ For users upgrading from v2.x (Electron version):
 ### Features
 - Basic provider management
 - Claude Code integration
- Configuration file handling
+- Configuration file handling
--- a/README.md
+++ b/README.md
@@ -1,19 +1,23 @@
-# Claude Code 供应商切换器
+# Claude Code & Codex 供应商切换器

 [![Version](https://img.shields.io/badge/version-3.0.0-blue.svg)](https://github.com/jasonyoung/cc-switch/releases)
 [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/jasonyoung/cc-switch/releases)
 [![Built with Tauri](https://img.shields.io/badge/built%20with-Tauri%202.0-orange.svg)](https://tauri.app/)

-一个用于管理和切换 Claude Code 不同供应商配置的桌面应用。
+一个用于管理和切换 Claude Code 与 Codex 不同供应商配置的桌面应用。

-> **v3.0.0 重大更新**：从 Electron 完全迁移到 Tauri 2.0，应用体积减少 85%（从 ~80MB 降至 ~12MB），启动速度提升 10 倍！
+> v3.1.0 ：新增 Codex 供应商管理与一键切换，支持导入当前 Codex 配置为默认供应商，并在内部配置从 v1 → v2 迁移前自动备份（详见下文““迁移与备份”）。
+
+> v3.0.0 重大更新：从 Electron 完全迁移到 Tauri 2.0，应用体积减少 85%（从 ~80MB 降至 ~12MB），启动速度提升 10 倍！

 ## 功能特性

 - **极速启动** - 基于 Tauri 2.0，原生性能，秒开应用
 - 一键切换不同供应商
+- 同时支持 Claude Code 与 Codex 的供应商切换与导入
 - Qwen coder、kimi k2、智谱 GLM、DeepSeek v3.1、packycode 等预设供应商只需要填写 key 即可一键配置
 - 支持添加自定义供应商
+- 随时切换官方登录
 - 简洁美观的图形界面
 - 信息存储在本地 ~/.cc-switch/config.json，无隐私风险
 - 超小体积 - 仅 ~5MB 安装包
@@ -38,30 +42,50 @@

 ### Windows 用户

-从 [Releases](../../releases) 页面下载最新版本的 `CC-Switch_3.0.0_x64.msi` 或 `.exe` 安装包。
+从 [Releases](../../releases) 页面下载最新版本的 `CC-Switch-Setup.msi` 安装包或者 `CC-Switch-Windows-Portable.zip` 绿色版。

 ### macOS 用户

-从 [Releases](../../releases) 页面下载最新版本：
+从 [Releases](../../releases) 页面下载 `CC-Switch-macOS.zip` 解压使用。

- **推荐**: `CC-Switch.zip` - 解压即用，无需安装
- `CC-Switch_3.0.0_aarch64.dmg` (Apple Silicon) - 需要安装
-
-> **注意**：由于应用未签名，macOS 可能提示"已损坏"。解决方法：
-> 1. **推荐**：下载 zip 版本，解压后直接使用
-> 2. 或在终端运行：`xattr -cr "/Applications/CC Switch.app"`
-> 3. 或在"系统设置 > 隐私与安全"中选择"仍要打开"
+> **注意**：由于作者没有苹果开发者账号，首次打开可能出现"未知开发者"警告，请先关闭，然后前往"系统设置" → "隐私与安全性" → 点击"仍要打开"，之后便可以正常打开

 ### Linux 用户

-从 [Releases](../../releases) 页面下载最新版本的 `.AppImage` 或 `.deb` 包。
+从 [Releases](../../releases) 页面下载最新版本的 `.deb` 包。

 ## 使用说明

 1. 点击"添加供应商"添加你的 API 配置
 2. 选择要使用的供应商，点击单选按钮切换
-3. 配置会自动保存到 Claude Code 的配置文件中
+3. 配置会自动保存到对应应用的配置文件中
 4. 重启或者新打开终端以生效
+5. 如果需要切回 Claude 官方登录，可以添加预设供应商里的“Claude 官方登录”并切换，重启终端后即可进行正常的 /login 登录
+
+### Codex 说明
+
+- 配置目录：`~/.codex/`
+  - 主配置文件：`auth.json`（必需）、`config.toml`（可为空）
+  - 供应商副本：`auth-<name>.json`、`config-<name>.toml`
+- API Key 字段：`auth.json` 中使用 `OPENAI_API_KEY`
+- 切换策略：将选中供应商的副本覆盖到主配置（`auth.json`、`config.toml`）。若供应商没有 `config-*.toml`，会创建空的 `config.toml`。
+- 导入默认：仅当该应用无任何供应商时，从现有主配置创建一条默认项并设为当前；`config.toml` 不存在时按空处理。
+- 官方登录：可切换到预设“Codex 官方登录”，重启终端后可选择使用 ChatGPT 账号完成登录。
+
+### Claude Code 说明
+
+- 配置目录：`~/.claude/`
+  - 主配置文件：`settings.json`（推荐）或 `claude.json`（旧版兼容，若存在则继续使用）
+  - 供应商副本：`settings-<name>.json`
+- API Key 字段：`env.ANTHROPIC_AUTH_TOKEN`
+- 切换策略：将选中供应商的副本覆盖到主配置（`settings.json`/`claude.json`）。如当前有配置且存在“当前供应商”，会先将主配置备份回该供应商的副本文件。
+- 导入默认：仅当该应用无任何供应商时，从现有主配置创建一条默认项并设为当前。
+- 官方登录：可切换到预设“Claude 官方登录”，重启终端后可使用 `/login` 完成登录。
+
+### 迁移与备份
+
+- cc-switch 自身配置从 v1 → v2 迁移时，将在 `~/.cc-switch/` 目录自动创建时间戳备份：`config.v1.backup.<timestamp>.json`。
+- 实际生效的应用配置文件（如 `~/.claude/settings.json`、`~/.codex/auth.json`/`config.toml`）不会被修改，切换仅在用户点击“切换”时按副本覆盖到主配置。

 ## 开发

@@ -143,6 +167,12 @@ cargo test

 查看 [CHANGELOG.md](CHANGELOG.md) 了解版本更新详情。

+## Electron 旧版
+
+[Releases](../../releases) 里保留 v2.0.3 Electron 旧版
+
+如果需要旧版 Electron 代码，可以拉取 electron-legacy 分支
+
 ## 贡献

 欢迎提交 Issue 和 Pull Request！
--- a/docs/encrypted-config-plan.md
+++ b/docs/encrypted-config-plan.md
@@ -0,0 +1,193 @@
+# CC Switch 加密配置与切换重构方案（V1）
+
+## 1. 目标与范围
+
+- 目标：将 `~/.cc-switch/config.json` 作为单一真实来源（SSOT），改为“加密落盘”；切换时从解密后的内存配置写入目标应用主配置（Claude/Codex）。
+- 范围：
+  - 后端（Rust/Tauri）新增加密模块与读写改造。
+  - 调整切换逻辑为“内存 → 主配置”，切换前回填 live 配置到当前供应商，避免用户外部手改丢失。
+  - 新增“旧文件清理与归档”能力：默认仅归档不删除，并在迁移成功后提醒用户执行；可在设置页手动触发。
+  - 兼容旧明文配置（v1/v2），首次保存迁移为加密文件。
+
+## 2. 背景现状（简述）
+
+- 当前：
+  - 全局配置：`~/.cc-switch/config.json`（v2：`MultiAppConfig`，含多个 `ProviderManager`）。
+  - 切换：依赖“供应商副本文件”（Claude：`~/.claude/settings-<name>.json`；Codex：`~/.codex/auth-<name>.json`、`config-<name>.toml`）→ 恢复到主配置。
+  - 启动：若对应 App 的供应商列表为空，可从现有主配置自动创建一条“默认项”并设为当前。
+- 问题：存在“副本 ↔ 总配置”双来源，可能不一致；明文落盘有泄露风险。
+
+## 3. 总体方案
+
+- 以加密文件 `~/.cc-switch/config.enc.json` 替代明文存储；进程启动时解密一次加载到内存，后续以内存为准；保存时加密写盘。
+- 切换时：直接从内存 `Provider.settings_config` 写入目标应用主配置；切换前回填当前 live 配置到当前选中供应商（由 `manager.current` 指向），保留外部修改。
+- 明文兼容：若无加密文件，读取旧 `config.json`（含 v1→v2 迁移），首次保存写加密文件，并备份旧明文。
+- 旧文件清理：提供“可回滚归档”而非删除。扫描 `~/.cc-switch/config.json`（v1/v2）与 Claude/Codex 的历史副本文件，用户确认后移动到 `~/.cc-switch/archive/<ts>/`，生成 `manifest.json` 以便恢复；默认不做静默清理。
+
+## 4. 密钥管理
+
+- 存储：系统级凭据管家（keyring crate）。
+  - Service：`cc-switch`；Account：`config-key-v1`；内容：Base64 编码的 32 字节随机密钥（AES-256）。
+- 首次运行：生成随机密钥，写入 Keychain。
+- 进程内缓存：启动加载后缓存密钥，避免重复 IO。
+- 轮换（后续）：支持命令触发“旧密钥解密 → 新密钥加密”的原子迁移。
+- 回退策略：Keychain 不可用时进入“只读模式”并提示用户（不建议将密钥落盘）。
+
+## 5. 加密封装格式
+
+- 文件：`~/.cc-switch/config.enc.json`
+- 结构（JSON 封装，便于演进）：
+  ```json
+  {
+    "v": 1,
+    "alg": "AES-256-GCM",
+    "nonce": "<base64-nonce>",
+    "ct": "<base64-ciphertext>"
+  }
+  ```
+- 明文：`serde_json::to_vec(MultiAppConfig)`；加密：AES-GCM（12 字节随机 nonce）；每次保存生成新 nonce。
+
+## 6. 模块与改造点
+
+- 新增 `src-tauri/src/secure_store.rs`：
+  - `get_or_create_key() -> Result<[u8;32], String>`：从 Keychain 获取/生成密钥。
+  - `encrypt_bytes(key, plaintext) -> (nonce, ciphertext)`；`decrypt_bytes(key, nonce, ciphertext)`。
+  - `read_encrypted_config() -> Result<MultiAppConfig, String>`：读取 `config.enc.json`、解析封装、解密、反序列化。
+  - `write_encrypted_config(cfg: &MultiAppConfig) -> Result<(), String>`：序列化→加密→原子写入。
+- 新增 `src-tauri/src/legacy_cleanup.rs`（旧文件清理/归档）：
+  - `scan_legacy_files() -> LegacyScanReport`：扫描旧 `config.json`（v1/v2）与 Claude/Codex 副本文件（`settings-*.json`、`auth-*.json`、`config-*.toml`），返回分组清单、大小、mtime；永不将 live 文件（`settings.json`、`auth.json`、`config.toml`、`config.enc.json`）列为可归档。
+  - `archive_legacy_files(selection) -> ArchiveResult`：将选中文件移动到 `~/.cc-switch/archive/<ts>/` 下对应子目录（`cc-switch/`、`claude/`、`codex/`），生成 `manifest.json`（记录原路径、归档路径、大小、mtime、sha256、类别）；同分区 `rename`，跨分区“copy + fsync + remove”。
+  - `restore_from_archive(manifest_path, items?) -> RestoreResult`：从归档恢复选中文件；若原路径已有同名文件则中止并提示冲突。
+  - 可选：`purge_archived(before_days)` 仅删除 `archive/` 内的过期归档；默认关闭。
+  - 安全护栏：操作前后做 mtime/hash 复核（CAS）；发生变化中止并提示“外部已修改”。
+- 调整 `src-tauri/src/app_config.rs`：
+  - `MultiAppConfig::load()`：优先 `read_encrypted_config()`；若无则读旧明文：
+    - 若检测到 v1（`ProviderManager`）→ 迁移到 v2（原有逻辑保留）。
+  - `MultiAppConfig::save()`：统一调用 `write_encrypted_config()`；若检测到旧 `config.json`，首次保存时备份为 `config.v1.backup.<ts>.json`（或保留为只读，视实现选择）。
+- 调整 `src-tauri/src/commands.rs::switch_provider`：
+  - Claude：
+    1. 回填：若 `~/.claude/settings.json` 存在且存在当前指针 → 读取 JSON，写回 `manager.providers[manager.current].settings_config`。
+    2. 切换：从目标 `provider.settings_config` 直接写 `~/.claude/settings.json`（确保父目录存在）。
+  - Codex：
+    1. 回填：读取 `~/.codex/auth.json`（JSON）与 `~/.codex/config.toml`（字符串；非空做 TOML 校验）→ 合成为 `{auth, config}` → 写回 `manager.providers[manager.current].settings_config`。
+    2. 切换：从目标 `provider.settings_config` 中取 `auth`（必需）与 `config`（可空）写入对应主配置（非空 `config` 校验 TOML）。
+  - 更新 `manager.current = id`，`state.save()` → 触发加密保存。
+- 保留/清理：
+  - 阶段一保留 `codex_config.rs` 与 `config.rs` 的副本读写函数（减少改动面），但切换不再依赖“副本恢复”。
+  - 阶段二可移除 add/update 时的“副本写入”，转为仅更新内存并保存加密配置。
+
+## 7. 数据流与时序
+
+- 启动：`AppState::new()` → `MultiAppConfig::load()`（优先加密）→ 进程内持有解密后的配置。
+- 添加/编辑/删除：更新内存中的 `ProviderManager` → `state.save()`（加密写盘）。
+- 切换：回填 live → 以目标供应商内存配置写入主配置 → 更新当前指针（`manager.current`）→ `state.save()`。
+- 迁移后提醒：若首次从旧明文迁移成功，弹出“发现旧配置，可归档”提示；用户可进入“存储与清理”页面查看并执行归档。
+
+## 8. 迁移策略
+
+- 读取顺序：`config.enc.json`（新）→ `config.json`（旧）。
+- 旧版支持：
+  - v1 明文（单 `ProviderManager`）→ 自动迁移为 v2（已有逻辑）。
+  - v2 明文 → 直接加载。
+- 首次保存：写 `config.enc.json`；若存在旧 `config.json`，备份为 `config.v1.backup.<ts>.json`（或保留为只读）。
+- 失败处理：解密失败/破损 → 明确提示并拒绝覆盖；允许用户手动回滚备份。
+- 旧文件处理：默认不自动删除。提供“扫描→归档”的可选流程，将旧 `config.json` 与历史副本文件移动到 `~/.cc-switch/archive/<ts>/`，保留 `manifest.json` 以支持恢复。
+
+## 9. 回滚策略
+
+- 加密回滚：保留 `config.v1.backup.<ts>.json` 作为明文快照；必要时让 `load()` 回退到该备份（手动步骤）。
+- 切换回退：临时切换回“副本恢复”路径（现有代码仍在，快速恢复可用）。
+
+## 10. 安全与性能
+
+- 算法：AES-256-GCM（AEAD）；随机 12 字节 nonce；每次保存新 nonce。
+- 性能：对几十 KB 级别文件，加解密开销远低于磁盘 IO 和 JSON 处理；冷启动 Keychain 取密钥 1–20ms，可缓存。
+- 可靠性：原子写入（临时文件 + rename）；写入失败不破坏现有文件。
+- 可选增强：`zeroize` 清理密钥与明文；Claude 配置 JSON Schema 校验。
+- 清理安全：归档而非删除；不触及 live 文件；归档/恢复采用 CAS 校验与错误回滚；归档路径冲突加后缀去重（如 `-2`、`-3`）。
+
+## 11. API 与 UX 影响
+
+- 前端 API：现有行为不变；新增清理相关命令（Tauri）供 UI 调用：`scan_legacy_files`、`archive_legacy_files`、`restore_from_archive`（`purge_archived` 可选）。
+- UI 提示：在“配置文件位置”旁提示“已加密存储”。
+- 清理入口：设置页新增“存储与清理”面板，展示扫描结果、支持归档与从归档恢复；首次迁移成功后弹出提醒（可稍后再说）。
+- 文案约定：明确“仅归档、不删除；删除需二次确认且默认关闭自动删除”。
+
+## 12. 开发任务拆解（阶段一为本次交付）
+
+- 阶段一（核心改造 + 清理能力最小闭环）
+  - 新增模块 `secure_store.rs`：Keychain 与加解密工具函数。
+  - 改造 `app_config.rs`：`load()/save()` 支持加密文件与旧明文迁移、原子写入、备份。
+  - 改造 `commands.rs::switch_provider`：
+    - 回填 live 配置 → 写入目标主配置（Claude/Codex）。
+    - 去除对“副本恢复”的依赖（保留函数以便回退）。
+  - 旧文件清理：新增 `legacy_cleanup.rs` 与对应 Tauri 命令，完成“扫描→归档→恢复”；首次迁移成功后在 UI 弹提醒，指向“设置 > 存储与清理”。
+  - 保持 `import_default_config`、`get_config_status` 行为不变。
+- 阶段二（清理与增强）
+  - 移除 add/update 对“副本文件”的写入，完全以内存+加密文件为中心。
+  - Claude settings 的 JSON Schema 校验；导出明文快照；只读模式显式开关。
+- 阶段三（安全升级）
+  - 密钥轮换；可选 passphrase（KDF: Argon2id + salt）。
+
+## 14. 验收标准
+
+- 功能：
+  - 无加密明文文件也能启动并正确读写；
+  - 切换成功将内存配置写入主配置；
+  - 外部手改在下一次切换前被回填保存；
+  - 旧配置自动迁移并生成加密文件；
+  - Keychain/解密异常时不损坏已有文件，给出可理解错误。
+  - 清理：扫描能准确识别旧明文与副本文件；执行归档后原路径不再存在文件、归档目录生成 `manifest.json`；从归档恢复可还原到原路径（不覆盖已存在文件）。
+- 质量：
+  - 关键路径加错误处理与日志；
+  - 写入采用原子替换；
+  - 代码变更集中、最小侵入，与现有风格一致。
+  - 清理操作具备 CAS 校验、错误回滚、绝不触及 live 文件与 `config.enc.json`。
+
+## 15. 风险与对策
+
+- Keychain 不可用或权限受限：
+  - 对策：只读模式 + 明确提示；不覆盖落盘；允许手动恢复明文备份。
+- 加密文件损坏：
+  - 对策：严格校验与错误分支；保留旧文件；不做“盲目重置”。
+- 与“副本文件”并存导致混淆：
+  - 对策：阶段一保留但不依赖；阶段二移除写入，文档化行为变更。
+- 清理误删或不可逆：
+  - 对策：默认仅归档不删除；删除需二次确认且仅作用于 `archive/`；提供 `manifest.json` 恢复；归档/恢复全程 CAS 校验与回滚。
+
+## 16. 发布与回退
+
+- 发布：随 Tauri 应用正常发布，无需前端变更。
+- 回退：保留旧明文备份；将切换逻辑临时改回“副本恢复”路径可快速回退。
+
+## 17. 旧文件清理与归档（新增）
+
+- 归档对象：
+  - `~/.cc-switch/config.json`（v1/v2，迁移成功后）
+  - `~/.claude/settings-*.json`（保留 `settings.json`）
+  - `~/.codex/auth-*.json`、`~/.codex/config-*.toml`（保留 `auth.json`、`config.toml`）
+- 归档位置与结构：`~/.cc-switch/archive/<timestamp>/{cc-switch,claude,codex}/...`
+- `manifest.json`：记录原路径、归档路径、大小、mtime、sha256、类别（v1/v2/claude/codex）；用于恢复与可视化。
+- 提醒策略：首次迁移成功后弹窗提醒；设置页“存储与清理”提供扫描、归档、恢复操作；默认不自动删除，可选“删除归档 >N 天”开关（默认关闭）。
+- 护栏：永不移动/删除 live 文件与 `config.enc.json`；执行前后 CAS 校验；跨分区采用“copy+fsync+remove”；失败即时回滚并提示。
+
+## 18. 变更点清单（代码）
+
+- 新增：`src-tauri/src/secure_store.rs`
+- 修改：
+  - `src-tauri/src/app_config.rs`（load/save 加密化、迁移与原子写入）
+  - `src-tauri/src/commands.rs`（switch_provider 改为内存 → 主配置，并回填 live）
+  - `src-tauri/src/legacy_cleanup.rs`（扫描/归档/恢复旧文件）
+- 保持：
+  - `src-tauri/src/config.rs`、`src-tauri/src/codex_config.rs`（读写工具与校验，阶段一不大动）
+  - 前端 `src/lib/tauri-api.ts` 与 UI 逻辑
+
+## 19. 开放问题（待确认）
+
+- Keychain 失败时是否提供“本地明文密钥文件（600 权限）”的应急模式（当前建议：不提供，保持只读）。
+- 加密文件名固定为 `config.enc.json` 是否满足预期，或需隐藏（如 `.config.enc`）。
+- 是否需要提供“自动删除归档 >N 天”的开关（默认关闭，建议 N=30）。
+
+---
+
+以上方案为“阶段一”可落地版本，能在保持前端无感的前提下完成“加密存储 + 内存驱动切换”的核心目标。如需，我可以继续补充任务看板（Issue 列表）与实施顺序的 PR 规划。
--- a/docs/updater-plan.md
+++ b/docs/updater-plan.md
@@ -0,0 +1,91 @@
+# 更新功能开发计划（Tauri v2 Updater）
+
+> 目标：基于 Tauri v2 官方 Updater，完成“检查更新 → 下载 → 安装 → 重启”的完整闭环；提供清晰的前后端接口、配置与测试/发布流程。
+
+## 范围与目标
+- 能力：静态 JSON 与动态接口两种更新源；可选稳定/测试通道；进度反馈与错误处理。
+- 平台：macOS `.app` 优先；Windows 使用安装器（NSIS/MSI）。
+- 安全：启用 Ed25519 更新签名校验；上线前建议平台代码签名与公证。
+
+## 架构与依赖
+- 插件：`tauri-plugin-updater`（更新）、`@tauri-apps/plugin-updater`（JS）；`tauri-plugin-process` 与 `@tauri-apps/plugin-process`（重启）。
+- 签名与构建：`tauri signer generate` 生成密钥；CI/本机注入 `TAURI_SIGNING_PRIVATE_KEY`；`bundle.createUpdaterArtifacts: true` 生成签名制品。
+- 权限：在 `src-tauri/capabilities/default.json` 启用 `updater:default` 与 `process:allow-restart`。
+- 配置（`src-tauri/tauri.conf.json`）：
+  - `plugins.updater.pubkey: "<PUBLICKEY.PEM>"`
+  - `plugins.updater.endpoints: ["<更新源 URL 列表>"]`
+  - Windows（可选）：`plugins.updater.windows.installMode: "passive|basicUi|quiet"`
+
+## 前端接口设计（TypeScript）
+- 类型
+  - `type UpdateChannel = 'stable' | 'beta'`
+  - `type UpdaterPhase = 'idle' | 'checking' | 'available' | 'downloading' | 'installing' | 'restarting' | 'upToDate' | 'error'`
+  - `type UpdateInfo = { currentVersion: string; availableVersion: string; notes?: string; pubDate?: string }`
+  - `type UpdateProgressEvent = { event: 'Started' | 'Progress' | 'Finished'; total?: number; downloaded?: number }`
+  - `type UpdateError = { code: string; message: string; cause?: unknown }`
+  - `type CheckOptions = { timeout?: number; channel?: UpdateChannel }`
+- API（`src/lib/updater.ts`）
+  - `getCurrentVersion(): Promise<string>` 读取当前版本。
+  - `checkForUpdate(opts?: CheckOptions)` → `up-to-date` 或 `{ status: 'available', info, update }`。
+  - `downloadAndInstall(update, onProgress?)` 下载并安装，进度回调映射 Started/Progress/Finished。
+  - `relaunchApp()` 调用 `@tauri-apps/plugin-process.relaunch()`。
+  - `runUpdateFlow(opts?)` 编排：检查 → 下载安装 → 重启；错误统一抛出 `UpdateError`。
+  - `setUpdateChannel(channel)` 前端记录偏好；实际端点切换见“端点动态化”。
+- Hook（可选 `useUpdater()`）
+  - 返回 `{ phase, info?, progress?, error?, actions: { check, startUpdate, relaunch } }`。
+- UI（组件建议）
+  - `UpdateBanner`：发现新版本时展示；`UpdaterDialog`：显示说明、进度与错误/重试。
+
+## Rust 集成与权限
+- 插件注册（`src-tauri/src/main.rs`）：
+  - `app.handle().plugin(tauri_plugin_updater::Builder::new().build())?;`
+  - `.plugin(tauri_plugin_process::init())` 用于重启。
+- Windows 清理钩子（可选）：`UpdaterExt::on_before_exit(app.cleanup_before_exit)`，避免安装器启动前文件占用。
+- 端点动态化（可选）：在 `setup` 根据配置/环境切换 `endpoints`、超时、代理或 headers。
+
+## 更新源与格式
+- 静态 JSON（latest.json）：字段 `version`、`platforms[target].url`、`platforms[target].signature`（`.sig` 内容）；可选 `notes`、`pub_date`。
+- 动态接口：
+  - 无更新：HTTP 204
+  - 有更新：HTTP 200 → `{ version, url, signature, notes?, pub_date? }`
+- 通道组织：`/stable/latest.json`、`/beta/latest.json`；CDN 缓存需可控，回滚可强制刷新。
+
+## 用户流程与 UX
+- 流程：检查 → 展示版本/日志 → 下载进度（累计/百分比）→ 安装 → 提示并重启。
+- 错误：网络异常（超时/断网/证书）、签名不匹配、权限/文件占用（Win）。提供“重试/稍后更新”。
+- 平台提示：
+  - macOS：建议安装在 `~/Applications`，避免 `/Applications` 提权导致失败。
+  - Windows：优先安装器分发，并选择合适 `installMode`。
+
+## 测试计划
+- 功能：有更新/无更新（204）/下载中断/重试/安装后重启成功与版本号提升。
+- 安全：签名不匹配必须拒绝更新；端点不可用/被劫持有清晰提示。
+- 网络：超时/断网/代理场景提示与恢复。
+- 平台：
+  - macOS：`/Applications` 与 `~/Applications` 的权限差异。
+  - Windows：`passive|basicUi|quiet` 行为差异与成功率。
+- 本地自测：以 v1.0.0 运行，构建 v1.0.1 制品+`.sig`，本地 HTTP 托管 `latest.json`，验证全链路。
+
+## 发布与回滚
+- 发布（CI 推荐）：注入 `TAURI_SIGNING_PRIVATE_KEY` → 构建生成各平台制品+签名 → 上传产物与 `latest.json` 至 Releases/CDN。
+- 回滚：撤下问题版本或将 `latest.json` 指回上一个稳定版本；如需降级，Rust 侧可定制版本比较策略（可选）。
+
+## 里程碑与验收
+- D1：密钥与基础集成（插件/配置/权限）。
+- D2：前端入口与进度 UI，静态 JSON 自测通过。
+- D3：Releases/CDN 端到端验证，平台专项测试。
+- D4：文档完善、回滚与异常流程演练。
+- 验收：两平台完成“发现→下载→安装→重启→版本提升”；签名校验生效；异常有明确提示与可行恢复。
+
+## 待确认
+- 更新源托管（GitHub Releases 还是自有 CDN）。
+- 是否需要 beta 通道与运行时切换。
+- Windows 是否仅支持安装器分发；便携版兼容策略是否需要明确说明。
+- UI 文案与样式偏好。
+
+## 落地步骤（实施顺序）
+1) 生成 Ed25519 密钥，将公钥写入 `plugins.updater.pubkey`，在构建环境配置 `TAURI_SIGNING_PRIVATE_KEY`。
+2) `src-tauri` 注册 `tauri-plugin-updater` 与 `tauri-plugin-process`，补齐 `capabilities/default.json` 与 `tauri.conf.json`。
+3) 前端新增 `src/lib/updater.ts` 封装与 `UpdateBanner`/`UpdaterDialog` 组件，接入入口按钮。
+4) 本地静态 `latest.json` 自测全链路；完善错误与进度提示。
+5) 配置 CI 发布产物与 `latest.json`；编写发布/回滚操作手册。
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "cc-switch",
-  "version": "3.0.0",
-  "description": "Claude Code 供应商切换工具",
+  "version": "3.1.1",
+  "description": "Claude Code & Codex 供应商切换工具",
  "scripts": {
    "dev": "pnpm tauri dev",
    "build": "pnpm tauri build",
@@ -26,8 +26,18 @@
    "vite": "^5.0.0"
  },
  "dependencies": {
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/theme-one-dark": "^6.1.3",
+    "@codemirror/view": "^6.38.2",
+    "@tailwindcss/vite": "^4.1.13",
    "@tauri-apps/api": "^2.8.0",
+    "@tauri-apps/plugin-process": "^2.0.0",
+    "@tauri-apps/plugin-updater": "^2.0.0",
+    "codemirror": "^6.0.2",
+    "lucide-react": "^0.542.0",
    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "tailwindcss": "^4.1.13"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,15 +8,45 @@ importers:

  .:
    dependencies:
+      '@codemirror/lang-json':
+        specifier: ^6.0.2
+        version: 6.0.2
+      '@codemirror/state':
+        specifier: ^6.5.2
+        version: 6.5.2
+      '@codemirror/theme-one-dark':
+        specifier: ^6.1.3
+        version: 6.1.3
+      '@codemirror/view':
+        specifier: ^6.38.2
+        version: 6.38.2
+      '@tailwindcss/vite':
+        specifier: ^4.1.13
+        version: 4.1.13(vite@5.4.19(@types/node@20.19.9)(lightningcss@1.30.1))
      '@tauri-apps/api':
        specifier: ^2.8.0
        version: 2.8.0
+      '@tauri-apps/plugin-process':
+        specifier: ^2.0.0
+        version: 2.3.0
+      '@tauri-apps/plugin-updater':
+        specifier: ^2.0.0
+        version: 2.9.0
+      codemirror:
+        specifier: ^6.0.2
+        version: 6.0.2
+      lucide-react:
+        specifier: ^0.542.0
+        version: 0.542.0(react@18.3.1)
      react:
        specifier: ^18.2.0
        version: 18.3.1
      react-dom:
        specifier: ^18.2.0
        version: 18.3.1(react@18.3.1)
+      tailwindcss:
+        specifier: ^4.1.13
+        version: 4.1.13
    devDependencies:
      '@tauri-apps/cli':
        specifier: ^2.8.0
@@ -32,7 +62,7 @@ importers:
        version: 18.3.7(@types/react@18.3.23)
      '@vitejs/plugin-react':
        specifier: ^4.2.0
-        version: 4.7.0(vite@5.4.19(@types/node@20.19.9))
+        version: 4.7.0(vite@5.4.19(@types/node@20.19.9)(lightningcss@1.30.1))
      prettier:
        specifier: ^3.6.2
        version: 3.6.2
@@ -41,7 +71,7 @@ importers:
        version: 5.9.2
      vite:
        specifier: ^5.0.0
-        version: 5.4.19(@types/node@20.19.9)
+        version: 5.4.19(@types/node@20.19.9)(lightningcss@1.30.1)

 packages:

@@ -132,6 +162,33 @@ packages:
    resolution: {integrity: sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==}
    engines: {node: '>=6.9.0'}

+  '@codemirror/autocomplete@6.18.7':
+    resolution: {integrity: sha512-8EzdeIoWPJDsMBwz3zdzwXnUpCzMiCyz5/A3FIPpriaclFCGDkAzK13sMcnsu5rowqiyeQN2Vs2TsOcoDPZirQ==}
+
+  '@codemirror/commands@6.8.1':
+    resolution: {integrity: sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==}
+
+  '@codemirror/lang-json@6.0.2':
+    resolution: {integrity: sha512-x2OtO+AvwEHrEwR0FyyPtfDUiloG3rnVTSZV1W8UteaLL8/MajQd8DpvUb2YVzC+/T18aSDv0H9mu+xw0EStoQ==}
+
+  '@codemirror/language@6.11.3':
+    resolution: {integrity: sha512-9HBM2XnwDj7fnu0551HkGdrUrrqmYq/WC5iv6nbY2WdicXdGbhR/gfbZOH73Aqj4351alY1+aoG9rCNfiwS1RA==}
+
+  '@codemirror/lint@6.8.5':
+    resolution: {integrity: sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==}
+
+  '@codemirror/search@6.5.11':
+    resolution: {integrity: sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA==}
+
+  '@codemirror/state@6.5.2':
+    resolution: {integrity: sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==}
+
+  '@codemirror/theme-one-dark@6.1.3':
+    resolution: {integrity: sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA==}
+
+  '@codemirror/view@6.38.2':
+    resolution: {integrity: sha512-bTWAJxL6EOFLPzTx+O5P5xAO3gTqpatQ2b/ARQ8itfU/v2LlpS3pH2fkL0A3E/Fx8Y2St2KES7ZEV0sHTsSW/A==}
+
  '@esbuild/aix-ppc64@0.21.5':
    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
    engines: {node: '>=12'}
@@ -270,9 +327,16 @@ packages:
    cpu: [x64]
    os: [win32]

+  '@isaacs/fs-minipass@4.0.1':
+    resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
+    engines: {node: '>=18.0.0'}
+
  '@jridgewell/gen-mapping@0.3.12':
    resolution: {integrity: sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==}

+  '@jridgewell/remapping@2.3.5':
+    resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
+
  '@jridgewell/resolve-uri@3.1.2':
    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
    engines: {node: '>=6.0.0'}
@@ -280,9 +344,27 @@ packages:
  '@jridgewell/sourcemap-codec@1.5.4':
    resolution: {integrity: sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==}

+  '@jridgewell/sourcemap-codec@1.5.5':
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
+
  '@jridgewell/trace-mapping@0.3.29':
    resolution: {integrity: sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==}

+  '@lezer/common@1.2.3':
+    resolution: {integrity: sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==}
+
+  '@lezer/highlight@1.2.1':
+    resolution: {integrity: sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==}
+
+  '@lezer/json@1.0.3':
+    resolution: {integrity: sha512-BP9KzdF9Y35PDpv04r0VeSTKDeox5vVr3efE7eBbx3r4s3oNLfunchejZhjArmeieBH+nVOpgIiBJpEAv8ilqQ==}
+
+  '@lezer/lr@1.4.2':
+    resolution: {integrity: sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==}
+
+  '@marijn/find-cluster-break@1.0.2':
+    resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==}
+
  '@rolldown/pluginutils@1.0.0-beta.27':
    resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==}

@@ -386,6 +468,96 @@ packages:
    cpu: [x64]
    os: [win32]

+  '@tailwindcss/node@4.1.13':
+    resolution: {integrity: sha512-eq3ouolC1oEFOAvOMOBAmfCIqZBJuvWvvYWh5h5iOYfe1HFC6+GZ6EIL0JdM3/niGRJmnrOc+8gl9/HGUaaptw==}
+
+  '@tailwindcss/oxide-android-arm64@4.1.13':
+    resolution: {integrity: sha512-BrpTrVYyejbgGo57yc8ieE+D6VT9GOgnNdmh5Sac6+t0m+v+sKQevpFVpwX3pBrM2qKrQwJ0c5eDbtjouY/+ew==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [android]
+
+  '@tailwindcss/oxide-darwin-arm64@4.1.13':
+    resolution: {integrity: sha512-YP+Jksc4U0KHcu76UhRDHq9bx4qtBftp9ShK/7UGfq0wpaP96YVnnjFnj3ZFrUAjc5iECzODl/Ts0AN7ZPOANQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-darwin-x64@4.1.13':
+    resolution: {integrity: sha512-aAJ3bbwrn/PQHDxCto9sxwQfT30PzyYJFG0u/BWZGeVXi5Hx6uuUOQEI2Fa43qvmUjTRQNZnGqe9t0Zntexeuw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-freebsd-x64@4.1.13':
+    resolution: {integrity: sha512-Wt8KvASHwSXhKE/dJLCCWcTSVmBj3xhVhp/aF3RpAhGeZ3sVo7+NTfgiN8Vey/Fi8prRClDs6/f0KXPDTZE6nQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.13':
+    resolution: {integrity: sha512-mbVbcAsW3Gkm2MGwA93eLtWrwajz91aXZCNSkGTx/R5eb6KpKD5q8Ueckkh9YNboU8RH7jiv+ol/I7ZyQ9H7Bw==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.1.13':
+    resolution: {integrity: sha512-wdtfkmpXiwej/yoAkrCP2DNzRXCALq9NVLgLELgLim1QpSfhQM5+ZxQQF8fkOiEpuNoKLp4nKZ6RC4kmeFH0HQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.1.13':
+    resolution: {integrity: sha512-hZQrmtLdhyqzXHB7mkXfq0IYbxegaqTmfa1p9MBj72WPoDD3oNOh1Lnxf6xZLY9C3OV6qiCYkO1i/LrzEdW2mg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.1.13':
+    resolution: {integrity: sha512-uaZTYWxSXyMWDJZNY1Ul7XkJTCBRFZ5Fo6wtjrgBKzZLoJNrG+WderJwAjPzuNZOnmdrVg260DKwXCFtJ/hWRQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-x64-musl@4.1.13':
+    resolution: {integrity: sha512-oXiPj5mi4Hdn50v5RdnuuIms0PVPI/EG4fxAfFiIKQh5TgQgX7oSuDWntHW7WNIi/yVLAiS+CRGW4RkoGSSgVQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@tailwindcss/oxide-wasm32-wasi@4.1.13':
+    resolution: {integrity: sha512-+LC2nNtPovtrDwBc/nqnIKYh/W2+R69FA0hgoeOn64BdCX522u19ryLh3Vf3F8W49XBcMIxSe665kwy21FkhvA==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+    bundledDependencies:
+      - '@napi-rs/wasm-runtime'
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+      - '@tybys/wasm-util'
+      - '@emnapi/wasi-threads'
+      - tslib
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.1.13':
+    resolution: {integrity: sha512-dziTNeQXtoQ2KBXmrjCxsuPk3F3CQ/yb7ZNZNA+UkNTeiTGgfeh+gH5Pi7mRncVgcPD2xgHvkFCh/MhZWSgyQg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.1.13':
+    resolution: {integrity: sha512-3+LKesjXydTkHk5zXX01b5KMzLV1xl2mcktBJkje7rhFUpUlYJy7IMOLqjIRQncLTa1WZZiFY/foAeB5nmaiTw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@tailwindcss/oxide@4.1.13':
+    resolution: {integrity: sha512-CPgsM1IpGRa880sMbYmG1s4xhAy3xEt1QULgTJGQmZUeNgXFR7s1YxYygmJyBGtou4SyEosGAGEeYqY7R53bIA==}
+    engines: {node: '>= 10'}
+
+  '@tailwindcss/vite@4.1.13':
+    resolution: {integrity: sha512-0PmqLQ010N58SbMTJ7BVJ4I2xopiQn/5i6nlb4JmxzQf8zcS5+m2Cv6tqh+sfDwtIdjoEnOvwsGQ1hkUi8QEHQ==}
+    peerDependencies:
+      vite: ^5.2.0 || ^6 || ^7
+
  '@tauri-apps/api@2.8.0':
    resolution: {integrity: sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw==}

@@ -460,6 +632,12 @@ packages:
    engines: {node: '>= 10'}
    hasBin: true

+  '@tauri-apps/plugin-process@2.3.0':
+    resolution: {integrity: sha512-0DNj6u+9csODiV4seSxxRbnLpeGYdojlcctCuLOCgpH9X3+ckVZIEj6H7tRQ7zqWr7kSTEWnrxtAdBb0FbtrmQ==}
+
+  '@tauri-apps/plugin-updater@2.9.0':
+    resolution: {integrity: sha512-j++sgY8XpeDvzImTrzWA08OqqGqgkNyxczLD7FjNJJx/uXxMZFz5nDcfkyoI/rCjYuj2101Tci/r/HFmOmoxCg==}
+
  '@types/babel__core@7.20.5':
    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}

@@ -503,9 +681,19 @@ packages:
  caniuse-lite@1.0.30001731:
    resolution: {integrity: sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==}

+  chownr@3.0.0:
+    resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
+    engines: {node: '>=18'}
+
+  codemirror@6.0.2:
+    resolution: {integrity: sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==}
+
  convert-source-map@2.0.0:
    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}

+  crelt@1.0.6:
+    resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==}
+
  csstype@3.1.3:
    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}

@@ -518,9 +706,17 @@ packages:
      supports-color:
        optional: true

+  detect-libc@2.0.4:
+    resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==}
+    engines: {node: '>=8'}
+
  electron-to-chromium@1.5.197:
    resolution: {integrity: sha512-m1xWB3g7vJ6asIFz+2pBUbq3uGmfmln1M9SSvBe4QIFWYrRHylP73zL/3nMjDmwz8V+1xAXQDfBd6+HPW0WvDQ==}

+  enhanced-resolve@5.18.3:
+    resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
+    engines: {node: '>=10.13.0'}
+
  esbuild@0.21.5:
    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
    engines: {node: '>=12'}
@@ -539,6 +735,13 @@ packages:
    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
    engines: {node: '>=6.9.0'}

+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  jiti@2.5.1:
+    resolution: {integrity: sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==}
+    hasBin: true
+
  js-tokens@4.0.0:
    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}

@@ -552,6 +755,70 @@ packages:
    engines: {node: '>=6'}
    hasBin: true

+  lightningcss-darwin-arm64@1.30.1:
+    resolution: {integrity: sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  lightningcss-darwin-x64@1.30.1:
+    resolution: {integrity: sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  lightningcss-freebsd-x64@1.30.1:
+    resolution: {integrity: sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  lightningcss-linux-arm-gnueabihf@1.30.1:
+    resolution: {integrity: sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  lightningcss-linux-arm64-gnu@1.30.1:
+    resolution: {integrity: sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  lightningcss-linux-arm64-musl@1.30.1:
+    resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  lightningcss-linux-x64-gnu@1.30.1:
+    resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  lightningcss-linux-x64-musl@1.30.1:
+    resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  lightningcss-win32-arm64-msvc@1.30.1:
+    resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  lightningcss-win32-x64-msvc@1.30.1:
+    resolution: {integrity: sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  lightningcss@1.30.1:
+    resolution: {integrity: sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==}
+    engines: {node: '>= 12.0.0'}
+
  loose-envify@1.4.0:
    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
    hasBin: true
@@ -559,6 +826,27 @@ packages:
  lru-cache@5.1.1:
    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}

+  lucide-react@0.542.0:
+    resolution: {integrity: sha512-w3hD8/SQB7+lzU2r4VdFyzzOzKnUjTZIF/MQJGSSvni7Llewni4vuViRppfRAa2guOsY5k4jZyxw/i9DQHv+dw==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  magic-string@0.30.18:
+    resolution: {integrity: sha512-yi8swmWbO17qHhwIBNeeZxTceJMeBvWJaId6dyvTSOwTipqeHhMhOrz6513r1sOKnpvQ7zkhlG8tPrpilwTxHQ==}
+
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minizlib@3.0.2:
+    resolution: {integrity: sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==}
+    engines: {node: '>= 18'}
+
+  mkdirp@3.0.1:
+    resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}
+    engines: {node: '>=10'}
+    hasBin: true
+
  ms@2.1.3:
    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}

@@ -611,6 +899,20 @@ packages:
    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
    engines: {node: '>=0.10.0'}

+  style-mod@4.1.2:
+    resolution: {integrity: sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==}
+
+  tailwindcss@4.1.13:
+    resolution: {integrity: sha512-i+zidfmTqtwquj4hMEwdjshYYgMbOrPzb9a0M3ZgNa0JMoZeFC6bxZvO8yr8ozS6ix2SDz0+mvryPeBs2TFE+w==}
+
+  tapable@2.2.3:
+    resolution: {integrity: sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==}
+    engines: {node: '>=6'}
+
+  tar@7.4.3:
+    resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}
+    engines: {node: '>=18'}
+
  typescript@5.9.2:
    resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==}
    engines: {node: '>=14.17'}
@@ -656,9 +958,16 @@ packages:
      terser:
        optional: true

+  w3c-keyname@2.2.8:
+    resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
+
  yallist@3.1.1:
    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}

+  yallist@5.0.0:
+    resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==}
+    engines: {node: '>=18'}
+
 snapshots:

  '@ampproject/remapping@2.3.0':
@@ -778,6 +1087,64 @@ snapshots:
      '@babel/helper-string-parser': 7.27.1
      '@babel/helper-validator-identifier': 7.27.1

+  '@codemirror/autocomplete@6.18.7':
+    dependencies:
+      '@codemirror/language': 6.11.3
+      '@codemirror/state': 6.5.2
+      '@codemirror/view': 6.38.2
+      '@lezer/common': 1.2.3
+
+  '@codemirror/commands@6.8.1':
+    dependencies:
+      '@codemirror/language': 6.11.3
+      '@codemirror/state': 6.5.2
+      '@codemirror/view': 6.38.2
+      '@lezer/common': 1.2.3
+
+  '@codemirror/lang-json@6.0.2':
+    dependencies:
+      '@codemirror/language': 6.11.3
+      '@lezer/json': 1.0.3
+
+  '@codemirror/language@6.11.3':
+    dependencies:
+      '@codemirror/state': 6.5.2
+      '@codemirror/view': 6.38.2
+      '@lezer/common': 1.2.3
+      '@lezer/highlight': 1.2.1
+      '@lezer/lr': 1.4.2
+      style-mod: 4.1.2
+
+  '@codemirror/lint@6.8.5':
+    dependencies:
+      '@codemirror/state': 6.5.2
+      '@codemirror/view': 6.38.2
+      crelt: 1.0.6
+
+  '@codemirror/search@6.5.11':
+    dependencies:
+      '@codemirror/state': 6.5.2
+      '@codemirror/view': 6.38.2
+      crelt: 1.0.6
+
+  '@codemirror/state@6.5.2':
+    dependencies:
+      '@marijn/find-cluster-break': 1.0.2
+
+  '@codemirror/theme-one-dark@6.1.3':
+    dependencies:
+      '@codemirror/language': 6.11.3
+      '@codemirror/state': 6.5.2
+      '@codemirror/view': 6.38.2
+      '@lezer/highlight': 1.2.1
+
+  '@codemirror/view@6.38.2':
+    dependencies:
+      '@codemirror/state': 6.5.2
+      crelt: 1.0.6
+      style-mod: 4.1.2
+      w3c-keyname: 2.2.8
+
  '@esbuild/aix-ppc64@0.21.5':
    optional: true

@@ -847,20 +1214,49 @@ snapshots:
  '@esbuild/win32-x64@0.21.5':
    optional: true

+  '@isaacs/fs-minipass@4.0.1':
+    dependencies:
+      minipass: 7.1.2
+
  '@jridgewell/gen-mapping@0.3.12':
    dependencies:
      '@jridgewell/sourcemap-codec': 1.5.4
      '@jridgewell/trace-mapping': 0.3.29

+  '@jridgewell/remapping@2.3.5':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.12
+      '@jridgewell/trace-mapping': 0.3.29
+
  '@jridgewell/resolve-uri@3.1.2': {}

  '@jridgewell/sourcemap-codec@1.5.4': {}

+  '@jridgewell/sourcemap-codec@1.5.5': {}
+
  '@jridgewell/trace-mapping@0.3.29':
    dependencies:
      '@jridgewell/resolve-uri': 3.1.2
      '@jridgewell/sourcemap-codec': 1.5.4

+  '@lezer/common@1.2.3': {}
+
+  '@lezer/highlight@1.2.1':
+    dependencies:
+      '@lezer/common': 1.2.3
+
+  '@lezer/json@1.0.3':
+    dependencies:
+      '@lezer/common': 1.2.3
+      '@lezer/highlight': 1.2.1
+      '@lezer/lr': 1.4.2
+
+  '@lezer/lr@1.4.2':
+    dependencies:
+      '@lezer/common': 1.2.3
+
+  '@marijn/find-cluster-break@1.0.2': {}
+
  '@rolldown/pluginutils@1.0.0-beta.27': {}

  '@rollup/rollup-android-arm-eabi@4.46.2':
@@ -923,6 +1319,77 @@ snapshots:
  '@rollup/rollup-win32-x64-msvc@4.46.2':
    optional: true

+  '@tailwindcss/node@4.1.13':
+    dependencies:
+      '@jridgewell/remapping': 2.3.5
+      enhanced-resolve: 5.18.3
+      jiti: 2.5.1
+      lightningcss: 1.30.1
+      magic-string: 0.30.18
+      source-map-js: 1.2.1
+      tailwindcss: 4.1.13
+
+  '@tailwindcss/oxide-android-arm64@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-arm64@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-x64@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-freebsd-x64@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-musl@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-wasm32-wasi@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.1.13':
+    optional: true
+
+  '@tailwindcss/oxide@4.1.13':
+    dependencies:
+      detect-libc: 2.0.4
+      tar: 7.4.3
+    optionalDependencies:
+      '@tailwindcss/oxide-android-arm64': 4.1.13
+      '@tailwindcss/oxide-darwin-arm64': 4.1.13
+      '@tailwindcss/oxide-darwin-x64': 4.1.13
+      '@tailwindcss/oxide-freebsd-x64': 4.1.13
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.13
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.1.13
+      '@tailwindcss/oxide-linux-arm64-musl': 4.1.13
+      '@tailwindcss/oxide-linux-x64-gnu': 4.1.13
+      '@tailwindcss/oxide-linux-x64-musl': 4.1.13
+      '@tailwindcss/oxide-wasm32-wasi': 4.1.13
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.1.13
+      '@tailwindcss/oxide-win32-x64-msvc': 4.1.13
+
+  '@tailwindcss/vite@4.1.13(vite@5.4.19(@types/node@20.19.9)(lightningcss@1.30.1))':
+    dependencies:
+      '@tailwindcss/node': 4.1.13
+      '@tailwindcss/oxide': 4.1.13
+      tailwindcss: 4.1.13
+      vite: 5.4.19(@types/node@20.19.9)(lightningcss@1.30.1)
+
  '@tauri-apps/api@2.8.0': {}

  '@tauri-apps/cli-darwin-arm64@2.8.1':
@@ -972,6 +1439,14 @@ snapshots:
      '@tauri-apps/cli-win32-ia32-msvc': 2.8.1
      '@tauri-apps/cli-win32-x64-msvc': 2.8.1

+  '@tauri-apps/plugin-process@2.3.0':
+    dependencies:
+      '@tauri-apps/api': 2.8.0
+
+  '@tauri-apps/plugin-updater@2.9.0':
+    dependencies:
+      '@tauri-apps/api': 2.8.0
+
  '@types/babel__core@7.20.5':
    dependencies:
      '@babel/parser': 7.28.0
@@ -1010,7 +1485,7 @@ snapshots:
      '@types/prop-types': 15.7.15
      csstype: 3.1.3

-  '@vitejs/plugin-react@4.7.0(vite@5.4.19(@types/node@20.19.9))':
+  '@vitejs/plugin-react@4.7.0(vite@5.4.19(@types/node@20.19.9)(lightningcss@1.30.1))':
    dependencies:
      '@babel/core': 7.28.0
      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.0)
@@ -1018,7 +1493,7 @@ snapshots:
      '@rolldown/pluginutils': 1.0.0-beta.27
      '@types/babel__core': 7.20.5
      react-refresh: 0.17.0
-      vite: 5.4.19(@types/node@20.19.9)
+      vite: 5.4.19(@types/node@20.19.9)(lightningcss@1.30.1)
    transitivePeerDependencies:
      - supports-color

@@ -1031,16 +1506,37 @@ snapshots:

  caniuse-lite@1.0.30001731: {}

+  chownr@3.0.0: {}
+
+  codemirror@6.0.2:
+    dependencies:
+      '@codemirror/autocomplete': 6.18.7
+      '@codemirror/commands': 6.8.1
+      '@codemirror/language': 6.11.3
+      '@codemirror/lint': 6.8.5
+      '@codemirror/search': 6.5.11
+      '@codemirror/state': 6.5.2
+      '@codemirror/view': 6.38.2
+
  convert-source-map@2.0.0: {}

+  crelt@1.0.6: {}
+
  csstype@3.1.3: {}

  debug@4.4.1:
    dependencies:
      ms: 2.1.3

+  detect-libc@2.0.4: {}
+
  electron-to-chromium@1.5.197: {}

+  enhanced-resolve@5.18.3:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.2.3
+
  esbuild@0.21.5:
    optionalDependencies:
      '@esbuild/aix-ppc64': 0.21.5
@@ -1074,12 +1570,61 @@ snapshots:

  gensync@1.0.0-beta.2: {}

+  graceful-fs@4.2.11: {}
+
+  jiti@2.5.1: {}
+
  js-tokens@4.0.0: {}

  jsesc@3.1.0: {}

  json5@2.2.3: {}

+  lightningcss-darwin-arm64@1.30.1:
+    optional: true
+
+  lightningcss-darwin-x64@1.30.1:
+    optional: true
+
+  lightningcss-freebsd-x64@1.30.1:
+    optional: true
+
+  lightningcss-linux-arm-gnueabihf@1.30.1:
+    optional: true
+
+  lightningcss-linux-arm64-gnu@1.30.1:
+    optional: true
+
+  lightningcss-linux-arm64-musl@1.30.1:
+    optional: true
+
+  lightningcss-linux-x64-gnu@1.30.1:
+    optional: true
+
+  lightningcss-linux-x64-musl@1.30.1:
+    optional: true
+
+  lightningcss-win32-arm64-msvc@1.30.1:
+    optional: true
+
+  lightningcss-win32-x64-msvc@1.30.1:
+    optional: true
+
+  lightningcss@1.30.1:
+    dependencies:
+      detect-libc: 2.0.4
+    optionalDependencies:
+      lightningcss-darwin-arm64: 1.30.1
+      lightningcss-darwin-x64: 1.30.1
+      lightningcss-freebsd-x64: 1.30.1
+      lightningcss-linux-arm-gnueabihf: 1.30.1
+      lightningcss-linux-arm64-gnu: 1.30.1
+      lightningcss-linux-arm64-musl: 1.30.1
+      lightningcss-linux-x64-gnu: 1.30.1
+      lightningcss-linux-x64-musl: 1.30.1
+      lightningcss-win32-arm64-msvc: 1.30.1
+      lightningcss-win32-x64-msvc: 1.30.1
+
  loose-envify@1.4.0:
    dependencies:
      js-tokens: 4.0.0
@@ -1088,6 +1633,22 @@ snapshots:
    dependencies:
      yallist: 3.1.1

+  lucide-react@0.542.0(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+
+  magic-string@0.30.18:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  minipass@7.1.2: {}
+
+  minizlib@3.0.2:
+    dependencies:
+      minipass: 7.1.2
+
+  mkdirp@3.0.1: {}
+
  ms@2.1.3: {}

  nanoid@3.3.11: {}
@@ -1150,6 +1711,21 @@ snapshots:

  source-map-js@1.2.1: {}

+  style-mod@4.1.2: {}
+
+  tailwindcss@4.1.13: {}
+
+  tapable@2.2.3: {}
+
+  tar@7.4.3:
+    dependencies:
+      '@isaacs/fs-minipass': 4.0.1
+      chownr: 3.0.0
+      minipass: 7.1.2
+      minizlib: 3.0.2
+      mkdirp: 3.0.1
+      yallist: 5.0.0
+
  typescript@5.9.2: {}

  undici-types@6.21.0: {}
@@ -1160,7 +1736,7 @@ snapshots:
      escalade: 3.2.0
      picocolors: 1.1.1

-  vite@5.4.19(@types/node@20.19.9):
+  vite@5.4.19(@types/node@20.19.9)(lightningcss@1.30.1):
    dependencies:
      esbuild: 0.21.5
      postcss: 8.5.6
@@ -1168,5 +1744,10 @@ snapshots:
    optionalDependencies:
      '@types/node': 20.19.9
      fsevents: 2.3.3
+      lightningcss: 1.30.1
+
+  w3c-keyname@2.2.8: {}

  yallist@3.1.1: {}
+
+  yallist@5.0.0: {}
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+onlyBuiltDependencies:
+  - '@tailwindcss/oxide'
--- a/screenshots/main.png
+++ b/screenshots/main.png
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -90,6 +90,15 @@ version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"

+[[package]]
+name = "arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -550,7 +559,7 @@ dependencies = [

 [[package]]
 name = "cc-switch"
-version = "3.0.0"
+version = "3.1.1"
 dependencies = [
 "dirs 5.0.1",
 "log",
@@ -562,6 +571,9 @@ dependencies = [
 "tauri-build",
 "tauri-plugin-log",
 "tauri-plugin-opener",
+ "tauri-plugin-process",
+ "tauri-plugin-updater",
+ "toml 0.8.2",
 ]

 [[package]]
@@ -833,6 +845,17 @@ dependencies = [
 "syn 1.0.109",
 ]

+[[package]]
+name = "derive_arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.20"
@@ -1122,6 +1145,18 @@ dependencies = [
 "rustc_version",
 ]

+[[package]]
+name = "filetime"
+version = "0.2.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "flate2"
 version = "1.1.2"
@@ -1411,8 +1446,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
 "cfg-if",
+ "js-sys",
 "libc",
 "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]

 [[package]]
@@ -1422,9 +1459,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
 "cfg-if",
+ "js-sys",
 "libc",
 "r-efi",
 "wasi 0.14.2+wasi-0.2.4",
+ "wasm-bindgen",
 ]

 [[package]]
@@ -1693,6 +1732,23 @@ dependencies = [
 "want",
 ]

+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+ "webpki-roots",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.16"
@@ -2101,6 +2157,7 @@ checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
 dependencies = [
 "bitflags 2.9.3",
 "libc",
+ "redox_syscall",
 ]

 [[package]]
@@ -2134,6 +2191,12 @@ dependencies = [
 "value-bag",
 ]

+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
 [[package]]
 name = "mac"
 version = "0.1.1"
@@ -2192,6 +2255,12 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"

+[[package]]
+name = "minisign-verify"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e856fdd13623a2f5f2f54676a4ee49502a96a80ef4a62bcedd23d52427c44d43"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -2548,6 +2617,18 @@ dependencies = [
 "objc2-foundation 0.2.2",
 ]

+[[package]]
+name = "objc2-osa-kit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26bb88504b5a050dbba515d2414607bf5e57dd56b107bc5f0351197a3e7bdc5d"
+dependencies = [
+ "bitflags 2.9.3",
+ "objc2 0.6.2",
+ "objc2-app-kit 0.3.1",
+ "objc2-foundation 0.3.1",
+]
+
 [[package]]
 name = "objc2-quartz-core"
 version = "0.2.2"
@@ -2654,6 +2735,20 @@ dependencies = [
 "pin-project-lite",
 ]

+[[package]]
+name = "osakit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "732c71caeaa72c065bb69d7ea08717bd3f4863a4f451402fc9513e29dbd5261b"
+dependencies = [
+ "objc2 0.6.2",
+ "objc2-foundation 0.3.1",
+ "objc2-osa-kit",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.16",
+]
+
 [[package]]
 name = "pango"
 version = "0.18.3"
@@ -3041,6 +3136,61 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases 0.2.1",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2",
+ "thiserror 2.0.16",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+dependencies = [
+ "bytes",
+ "getrandom 0.3.3",
+ "lru-slab",
+ "rand 0.9.2",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.16",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases 0.2.1",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.40"
@@ -3087,6 +3237,16 @@ dependencies = [
 "rand_core 0.6.4",
 ]

+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -3107,6 +3267,16 @@ dependencies = [
 "rand_core 0.6.4",
 ]

+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -3125,6 +3295,15 @@ dependencies = [
 "getrandom 0.2.16",
 ]

+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.3",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -3252,16 +3431,21 @@ dependencies = [
 "http-body",
 "http-body-util",
 "hyper",
+ "hyper-rustls",
 "hyper-util",
 "js-sys",
 "log",
 "percent-encoding",
 "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pki-types",
 "serde",
 "serde_json",
 "serde_urlencoded",
 "sync_wrapper",
 "tokio",
+ "tokio-rustls",
 "tokio-util",
 "tower",
 "tower-http",
@@ -3271,6 +3455,21 @@ dependencies = [
 "wasm-bindgen-futures",
 "wasm-streams",
 "web-sys",
+ "webpki-roots",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -3324,6 +3523,12 @@ version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"

+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
@@ -3346,6 +3551,41 @@ dependencies = [
 "windows-sys 0.60.2",
 ]

+[[package]]
+name = "rustls"
+version = "0.23.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+dependencies = [
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "web-time",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -3790,6 +4030,12 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"

+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "swift-rs"
 version = "1.0.7"
@@ -3925,6 +4171,17 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"

+[[package]]
+name = "tar"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
 [[package]]
 name = "target-lexicon"
 version = "0.12.16"
@@ -4107,6 +4364,48 @@ dependencies = [
 "zbus",
 ]

+[[package]]
+name = "tauri-plugin-process"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7461c622a5ea00eb9cd9f7a08dbd3bf79484499fd5c21aa2964677f64ca651ab"
+dependencies = [
+ "tauri",
+ "tauri-plugin",
+]
+
+[[package]]
+name = "tauri-plugin-updater"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27cbc31740f4d507712550694749572ec0e43bdd66992db7599b89fbfd6b167b"
+dependencies = [
+ "base64 0.22.1",
+ "dirs 6.0.0",
+ "flate2",
+ "futures-util",
+ "http",
+ "infer",
+ "log",
+ "minisign-verify",
+ "osakit",
+ "percent-encoding",
+ "reqwest",
+ "semver",
+ "serde",
+ "serde_json",
+ "tar",
+ "tauri",
+ "tauri-plugin",
+ "tempfile",
+ "thiserror 2.0.16",
+ "time",
+ "tokio",
+ "url",
+ "windows-sys 0.60.2",
+ "zip",
+]
+
 [[package]]
 name = "tauri-runtime"
 version = "2.8.0"
@@ -4346,6 +4645,16 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

+[[package]]
+name = "tokio-rustls"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.16"
@@ -4623,6 +4932,12 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"

+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "url"
 version = "2.5.7"
@@ -4849,6 +5164,16 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webkit2gtk"
 version = "2.0.1"
@@ -4893,6 +5218,15 @@ dependencies = [
 "system-deps",
 ]

+[[package]]
+name = "webpki-roots"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "webview2-com"
 version = "0.38.0"
@@ -5562,6 +5896,16 @@ dependencies = [
 "pkg-config",
 ]

+[[package]]
+name = "xattr"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
+dependencies = [
+ "libc",
+ "rustix",
+]
+
 [[package]]
 name = "xdg-home"
 version = "1.3.0"
@@ -5701,6 +6045,12 @@ dependencies = [
 "synstructure",
 ]

+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
 [[package]]
 name = "zerotrie"
 version = "0.2.2"
@@ -5734,6 +6084,18 @@ dependencies = [
 "syn 2.0.106",
 ]

+[[package]]
+name = "zip"
+version = "4.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1"
+dependencies = [
+ "arbitrary",
+ "crc32fast",
+ "indexmap 2.11.0",
+ "memchr",
+]
+
 [[package]]
 name = "zvariant"
 version = "4.0.0"
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "cc-switch"
-version = "3.0.0"
-description = "Claude Code MCP 服务器配置管理工具"
+version = "3.1.1"
+description = "Claude Code & Codex 供应商配置管理工具"
 authors = ["Jason Young"]
 license = "MIT"
 repository = "https://github.com/jasonyoung/cc-switch"
-edition = "2024"
+edition = "2021"
 rust-version = "1.85.0"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -21,10 +21,13 @@ tauri-build = { version = "2.4.0", features = [] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.8.2", features = [] }
+tauri = { version = "2.8.2", features = ["tray-icon"] }
 tauri-plugin-log = "2"
 tauri-plugin-opener = "2"
+tauri-plugin-process = "2"
+tauri-plugin-updater = "2"
 dirs = "5.0"
+toml = "0.8"

 [target.'cfg(target_os = "macos")'.dependencies]
 objc2 = "0.5"
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -7,6 +7,8 @@
  ],
  "permissions": [
    "core:default",
-    "opener:default"
+    "opener:default",
+    "updater:default",
+    "process:allow-restart"
  ]
 }
--- a/src-tauri/src/app_config.rs
+++ b/src-tauri/src/app_config.rs
@@ -0,0 +1,139 @@
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+use crate::config::{copy_file, get_app_config_dir, get_app_config_path, write_json_file};
+use crate::provider::ProviderManager;
+
+/// 应用类型
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum AppType {
+    Claude,
+    Codex,
+}
+
+impl AppType {
+    pub fn as_str(&self) -> &str {
+        match self {
+            AppType::Claude => "claude",
+            AppType::Codex => "codex",
+        }
+    }
+}
+
+impl From<&str> for AppType {
+    fn from(s: &str) -> Self {
+        match s.to_lowercase().as_str() {
+            "codex" => AppType::Codex,
+            _ => AppType::Claude, // 默认为 Claude
+        }
+    }
+}
+
+/// 多应用配置结构（向后兼容）
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct MultiAppConfig {
+    #[serde(default = "default_version")]
+    pub version: u32,
+    #[serde(flatten)]
+    pub apps: HashMap<String, ProviderManager>,
+}
+
+fn default_version() -> u32 {
+    2
+}
+
+impl Default for MultiAppConfig {
+    fn default() -> Self {
+        let mut apps = HashMap::new();
+        apps.insert("claude".to_string(), ProviderManager::default());
+        apps.insert("codex".to_string(), ProviderManager::default());
+
+        Self { version: 2, apps }
+    }
+}
+
+impl MultiAppConfig {
+    /// 从文件加载配置（处理v1到v2的迁移）
+    pub fn load() -> Result<Self, String> {
+        let config_path = get_app_config_path();
+
+        if !config_path.exists() {
+            log::info!("配置文件不存在，创建新的多应用配置");
+            return Ok(Self::default());
+        }
+
+        // 尝试读取文件
+        let content = std::fs::read_to_string(&config_path)
+            .map_err(|e| format!("读取配置文件失败: {}", e))?;
+
+        // 检查是否是旧版本格式（v1）
+        if let Ok(v1_config) = serde_json::from_str::<ProviderManager>(&content) {
+            log::info!("检测到v1配置，自动迁移到v2");
+
+            // 迁移到新格式
+            let mut apps = HashMap::new();
+            apps.insert("claude".to_string(), v1_config);
+            apps.insert("codex".to_string(), ProviderManager::default());
+
+            let config = Self { version: 2, apps };
+
+            // 迁移前备份旧版(v1)配置文件
+            let backup_dir = get_app_config_dir();
+            let ts = std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_secs();
+            let backup_path = backup_dir.join(format!("config.v1.backup.{}.json", ts));
+
+            match copy_file(&config_path, &backup_path) {
+                Ok(()) => log::info!(
+                    "已备份旧版配置文件: {} -> {}",
+                    config_path.display(),
+                    backup_path.display()
+                ),
+                Err(e) => log::warn!("备份旧版配置文件失败: {}", e),
+            }
+
+            // 保存迁移后的配置
+            config.save()?;
+            return Ok(config);
+        }
+
+        // 尝试读取v2格式
+        serde_json::from_str::<Self>(&content).map_err(|e| format!("解析配置文件失败: {}", e))
+    }
+
+    /// 保存配置到文件
+    pub fn save(&self) -> Result<(), String> {
+        let config_path = get_app_config_path();
+        // 先备份旧版（若存在）到 ~/.cc-switch/config.json.bak，再写入新内容
+        if config_path.exists() {
+            let backup_path = get_app_config_dir().join("config.json.bak");
+            if let Err(e) = copy_file(&config_path, &backup_path) {
+                log::warn!("备份 config.json 到 .bak 失败: {}", e);
+            }
+        }
+
+        write_json_file(&config_path, self)?;
+        Ok(())
+    }
+
+    /// 获取指定应用的管理器
+    pub fn get_manager(&self, app: &AppType) -> Option<&ProviderManager> {
+        self.apps.get(app.as_str())
+    }
+
+    /// 获取指定应用的管理器（可变引用）
+    pub fn get_manager_mut(&mut self, app: &AppType) -> Option<&mut ProviderManager> {
+        self.apps.get_mut(app.as_str())
+    }
+
+    /// 确保应用存在
+    pub fn ensure_app(&mut self, app: &AppType) {
+        if !self.apps.contains_key(app.as_str()) {
+            self.apps
+                .insert(app.as_str().to_string(), ProviderManager::default());
+        }
+    }
+}
--- a/src-tauri/src/codex_config.rs
+++ b/src-tauri/src/codex_config.rs
@@ -0,0 +1,142 @@
+// unused imports removed
+use std::path::PathBuf;
+
+use crate::config::{
+    atomic_write, delete_file, sanitize_provider_name, write_json_file, write_text_file,
+};
+use serde_json::Value;
+use std::fs;
+use std::path::Path;
+
+/// 获取 Codex 配置目录路径
+pub fn get_codex_config_dir() -> PathBuf {
+    dirs::home_dir().expect("无法获取用户主目录").join(".codex")
+}
+
+/// 获取 Codex auth.json 路径
+pub fn get_codex_auth_path() -> PathBuf {
+    get_codex_config_dir().join("auth.json")
+}
+
+/// 获取 Codex config.toml 路径
+pub fn get_codex_config_path() -> PathBuf {
+    get_codex_config_dir().join("config.toml")
+}
+
+/// 获取 Codex 供应商配置文件路径
+pub fn get_codex_provider_paths(
+    provider_id: &str,
+    provider_name: Option<&str>,
+) -> (PathBuf, PathBuf) {
+    let base_name = provider_name
+        .map(|name| sanitize_provider_name(name))
+        .unwrap_or_else(|| sanitize_provider_name(provider_id));
+
+    let auth_path = get_codex_config_dir().join(format!("auth-{}.json", base_name));
+    let config_path = get_codex_config_dir().join(format!("config-{}.toml", base_name));
+
+    (auth_path, config_path)
+}
+
+/// 删除 Codex 供应商配置文件
+pub fn delete_codex_provider_config(provider_id: &str, provider_name: &str) -> Result<(), String> {
+    let (auth_path, config_path) = get_codex_provider_paths(provider_id, Some(provider_name));
+
+    delete_file(&auth_path).ok();
+    delete_file(&config_path).ok();
+
+    Ok(())
+}
+
+//（移除未使用的备份/保存/恢复/导入函数，避免 dead_code 告警）
+
+/// 原子写 Codex 的 `auth.json` 与 `config.toml`，在第二步失败时回滚第一步
+pub fn write_codex_live_atomic(auth: &Value, config_text_opt: Option<&str>) -> Result<(), String> {
+    let auth_path = get_codex_auth_path();
+    let config_path = get_codex_config_path();
+
+    if let Some(parent) = auth_path.parent() {
+        std::fs::create_dir_all(parent).map_err(|e| format!("创建 Codex 目录失败: {}", e))?;
+    }
+
+    // 读取旧内容用于回滚
+    let old_auth = if auth_path.exists() {
+        Some(fs::read(&auth_path).map_err(|e| format!("读取旧 auth.json 失败: {}", e))?)
+    } else {
+        None
+    };
+    let _old_config = if config_path.exists() {
+        Some(fs::read(&config_path).map_err(|e| format!("读取旧 config.toml 失败: {}", e))?)
+    } else {
+        None
+    };
+
+    // 准备写入内容
+    let cfg_text = match config_text_opt {
+        Some(s) => s.to_string(),
+        None => String::new(),
+    };
+    if !cfg_text.trim().is_empty() {
+        toml::from_str::<toml::Table>(&cfg_text)
+            .map_err(|e| format!("config.toml 格式错误: {}", e))?;
+    }
+
+    // 第一步：写 auth.json
+    write_json_file(&auth_path, auth)?;
+
+    // 第二步：写 config.toml（失败则回滚 auth.json）
+    if let Err(e) = write_text_file(&config_path, &cfg_text) {
+        // 回滚 auth.json
+        if let Some(bytes) = old_auth {
+            let _ = atomic_write(&auth_path, &bytes);
+        } else {
+            let _ = delete_file(&auth_path);
+        }
+        return Err(e);
+    }
+
+    Ok(())
+}
+
+/// 读取 `~/.codex/config.toml`，若不存在返回空字符串
+pub fn read_codex_config_text() -> Result<String, String> {
+    let path = get_codex_config_path();
+    if path.exists() {
+        std::fs::read_to_string(&path).map_err(|e| format!("读取 config.toml 失败: {}", e))
+    } else {
+        Ok(String::new())
+    }
+}
+
+/// 从给定路径读取 config.toml 文本（路径存在时）；路径不存在则返回空字符串
+pub fn read_config_text_from_path(path: &Path) -> Result<String, String> {
+    if path.exists() {
+        std::fs::read_to_string(path).map_err(|e| format!("读取 {} 失败: {}", path.display(), e))
+    } else {
+        Ok(String::new())
+    }
+}
+
+/// 对非空的 TOML 文本进行语法校验
+pub fn validate_config_toml(text: &str) -> Result<(), String> {
+    if text.trim().is_empty() {
+        return Ok(());
+    }
+    toml::from_str::<toml::Table>(text)
+        .map(|_| ())
+        .map_err(|e| format!("config.toml 语法错误: {}", e))
+}
+
+/// 读取并校验 `~/.codex/config.toml`，返回文本（可能为空）
+pub fn read_and_validate_codex_config_text() -> Result<String, String> {
+    let s = read_codex_config_text()?;
+    validate_config_toml(&s)?;
+    Ok(s)
+}
+
+/// 从指定路径读取并校验 config.toml，返回文本（可能为空）
+pub fn read_and_validate_config_from_path(path: &Path) -> Result<String, String> {
+    let s = read_config_text_from_path(path)?;
+    validate_config_toml(&s)?;
+    Ok(s)
+}
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -1,8 +1,12 @@
+#![allow(non_snake_case)]
+
 use std::collections::HashMap;
 use tauri::State;
 use tauri_plugin_opener::OpenerExt;

-use crate::config::{ConfigStatus, get_claude_settings_path, import_current_config_as_default};
+use crate::app_config::AppType;
+use crate::codex_config;
+use crate::config::{get_claude_settings_path, ConfigStatus};
 use crate::provider::Provider;
 use crate::store::AppState;

@@ -10,38 +14,112 @@ use crate::store::AppState;
 #[tauri::command]
 pub async fn get_providers(
    state: State<'_, AppState>,
+    app_type: Option<AppType>,
+    app: Option<String>,
+    appType: Option<String>,
 ) -> Result<HashMap<String, Provider>, String> {
-    let manager = state
-        .provider_manager
+    let app_type = app_type
+        .or_else(|| app.as_deref().map(|s| s.into()))
+        .or_else(|| appType.as_deref().map(|s| s.into()))
+        .unwrap_or(AppType::Claude);
+
+    let config = state
+        .config
        .lock()
        .map_err(|e| format!("获取锁失败: {}", e))?;

+    let manager = config
+        .get_manager(&app_type)
+        .ok_or_else(|| format!("应用类型不存在: {:?}", app_type))?;
+
    Ok(manager.get_all_providers().clone())
 }

 /// 获取当前供应商ID
 #[tauri::command]
-pub async fn get_current_provider(state: State<'_, AppState>) -> Result<String, String> {
-    let manager = state
-        .provider_manager
+pub async fn get_current_provider(
+    state: State<'_, AppState>,
+    app_type: Option<AppType>,
+    app: Option<String>,
+    appType: Option<String>,
+) -> Result<String, String> {
+    let app_type = app_type
+        .or_else(|| app.as_deref().map(|s| s.into()))
+        .or_else(|| appType.as_deref().map(|s| s.into()))
+        .unwrap_or(AppType::Claude);
+
+    let config = state
+        .config
        .lock()
        .map_err(|e| format!("获取锁失败: {}", e))?;

+    let manager = config
+        .get_manager(&app_type)
+        .ok_or_else(|| format!("应用类型不存在: {:?}", app_type))?;
+
    Ok(manager.current.clone())
 }

 /// 添加供应商
 #[tauri::command]
-pub async fn add_provider(state: State<'_, AppState>, provider: Provider) -> Result<bool, String> {
-    let mut manager = state
-        .provider_manager
-        .lock()
-        .map_err(|e| format!("获取锁失败: {}", e))?;
+pub async fn add_provider(
+    state: State<'_, AppState>,
+    app_type: Option<AppType>,
+    app: Option<String>,
+    appType: Option<String>,
+    provider: Provider,
+) -> Result<bool, String> {
+    let app_type = app_type
+        .or_else(|| app.as_deref().map(|s| s.into()))
+        .or_else(|| appType.as_deref().map(|s| s.into()))
+        .unwrap_or(AppType::Claude);

-    manager.add_provider(provider)?;
+    // 读取当前是否是激活供应商（短锁）
+    let is_current = {
+        let config = state
+            .config
+            .lock()
+            .map_err(|e| format!("获取锁失败: {}", e))?;
+        let manager = config
+            .get_manager(&app_type)
+            .ok_or_else(|| format!("应用类型不存在: {:?}", app_type))?;
+        manager.current == provider.id
+    };

-    // 保存配置
-    drop(manager); // 释放锁
+    // 若目标为当前供应商，则先写 live，成功后再落盘配置
+    if is_current {
+        match app_type {
+            AppType::Claude => {
+                let settings_path = crate::config::get_claude_settings_path();
+                crate::config::write_json_file(&settings_path, &provider.settings_config)?;
+            }
+            AppType::Codex => {
+                let auth = provider
+                    .settings_config
+                    .get("auth")
+                    .ok_or_else(|| "目标供应商缺少 auth 配置".to_string())?;
+                let cfg_text = provider
+                    .settings_config
+                    .get("config")
+                    .and_then(|v| v.as_str());
+                crate::codex_config::write_codex_live_atomic(auth, cfg_text)?;
+            }
+        }
+    }
+
+    // 更新内存并保存配置
+    {
+        let mut config = state
+            .config
+            .lock()
+            .map_err(|e| format!("获取锁失败: {}", e))?;
+        let manager = config
+            .get_manager_mut(&app_type)
+            .ok_or_else(|| format!("应用类型不存在: {:?}", app_type))?;
+        manager
+            .providers
+            .insert(provider.id.clone(), provider.clone());
+    }
    state.save()?;

    Ok(true)
@@ -51,17 +129,68 @@ pub async fn add_provider(state: State<'_, AppState>, provider: Provider) -> Res
 #[tauri::command]
 pub async fn update_provider(
    state: State<'_, AppState>,
+    app_type: Option<AppType>,
+    app: Option<String>,
+    appType: Option<String>,
    provider: Provider,
 ) -> Result<bool, String> {
-    let mut manager = state
-        .provider_manager
-        .lock()
-        .map_err(|e| format!("获取锁失败: {}", e))?;
+    let app_type = app_type
+        .or_else(|| app.as_deref().map(|s| s.into()))
+        .or_else(|| appType.as_deref().map(|s| s.into()))
+        .unwrap_or(AppType::Claude);

-    manager.update_provider(provider)?;
+    // 读取校验 & 是否当前（短锁）
+    let (exists, is_current) = {
+        let config = state
+            .config
+            .lock()
+            .map_err(|e| format!("获取锁失败: {}", e))?;
+        let manager = config
+            .get_manager(&app_type)
+            .ok_or_else(|| format!("应用类型不存在: {:?}", app_type))?;
+        (
+            manager.providers.contains_key(&provider.id),
+            manager.current == provider.id,
+        )
+    };
+    if !exists {
+        return Err(format!("供应商不存在: {}", provider.id));
+    }

-    // 保存配置
-    drop(manager); // 释放锁
+    // 若更新的是当前供应商，先写 live 成功再保存
+    if is_current {
+        match app_type {
+            AppType::Claude => {
+                let settings_path = crate::config::get_claude_settings_path();
+                crate::config::write_json_file(&settings_path, &provider.settings_config)?;
+            }
+            AppType::Codex => {
+                let auth = provider
+                    .settings_config
+                    .get("auth")
+                    .ok_or_else(|| "目标供应商缺少 auth 配置".to_string())?;
+                let cfg_text = provider
+                    .settings_config
+                    .get("config")
+                    .and_then(|v| v.as_str());
+                crate::codex_config::write_codex_live_atomic(auth, cfg_text)?;
+            }
+        }
+    }
+
+    // 更新内存并保存
+    {
+        let mut config = state
+            .config
+            .lock()
+            .map_err(|e| format!("获取锁失败: {}", e))?;
+        let manager = config
+            .get_manager_mut(&app_type)
+            .ok_or_else(|| format!("应用类型不存在: {:?}", app_type))?;
+        manager
+            .providers
+            .insert(provider.id.clone(), provider.clone());
+    }
    state.save()?;

    Ok(true)
@@ -69,16 +198,59 @@ pub async fn update_provider(

 /// 删除供应商
 #[tauri::command]
-pub async fn delete_provider(state: State<'_, AppState>, id: String) -> Result<bool, String> {
-    let mut manager = state
-        .provider_manager
+pub async fn delete_provider(
+    state: State<'_, AppState>,
+    app_type: Option<AppType>,
+    app: Option<String>,
+    appType: Option<String>,
+    id: String,
+) -> Result<bool, String> {
+    let app_type = app_type
+        .or_else(|| app.as_deref().map(|s| s.into()))
+        .or_else(|| appType.as_deref().map(|s| s.into()))
+        .unwrap_or(AppType::Claude);
+
+    let mut config = state
+        .config
        .lock()
        .map_err(|e| format!("获取锁失败: {}", e))?;

-    manager.delete_provider(&id)?;
+    let manager = config
+        .get_manager_mut(&app_type)
+        .ok_or_else(|| format!("应用类型不存在: {:?}", app_type))?;
+
+    // 检查是否为当前供应商
+    if manager.current == id {
+        return Err("不能删除当前正在使用的供应商".to_string());
+    }
+
+    // 获取供应商信息
+    let provider = manager
+        .providers
+        .get(&id)
+        .ok_or_else(|| format!("供应商不存在: {}", id))?
+        .clone();
+
+    // 删除配置文件
+    match app_type {
+        AppType::Codex => {
+            codex_config::delete_codex_provider_config(&id, &provider.name)?;
+        }
+        AppType::Claude => {
+            use crate::config::{delete_file, get_provider_config_path};
+            // 兼容历史两种命名：settings-{name}.json 与 settings-{id}.json
+            let by_name = get_provider_config_path(&id, Some(&provider.name));
+            let by_id = get_provider_config_path(&id, None);
+            delete_file(&by_name)?;
+            delete_file(&by_id)?;
+        }
+    }
+
+    // 从管理器删除
+    manager.providers.remove(&id);

    // 保存配置
-    drop(manager); // 释放锁
+    drop(config); // 释放锁
    state.save()?;

    Ok(true)
@@ -86,16 +258,105 @@ pub async fn delete_provider(state: State<'_, AppState>, id: String) -> Result<b

 /// 切换供应商
 #[tauri::command]
-pub async fn switch_provider(state: State<'_, AppState>, id: String) -> Result<bool, String> {
-    let mut manager = state
-        .provider_manager
+pub async fn switch_provider(
+    state: State<'_, AppState>,
+    app_type: Option<AppType>,
+    app: Option<String>,
+    appType: Option<String>,
+    id: String,
+) -> Result<bool, String> {
+    let app_type = app_type
+        .or_else(|| app.as_deref().map(|s| s.into()))
+        .or_else(|| appType.as_deref().map(|s| s.into()))
+        .unwrap_or(AppType::Claude);
+
+    let mut config = state
+        .config
        .lock()
        .map_err(|e| format!("获取锁失败: {}", e))?;

-    manager.switch_provider(&id)?;
+    let manager = config
+        .get_manager_mut(&app_type)
+        .ok_or_else(|| format!("应用类型不存在: {:?}", app_type))?;
+
+    // 检查供应商是否存在
+    let provider = manager
+        .providers
+        .get(&id)
+        .ok_or_else(|| format!("供应商不存在: {}", id))?
+        .clone();
+
+    // SSOT 切换：先回填 live 配置到当前供应商，然后从内存写入目标主配置
+    match app_type {
+        AppType::Codex => {
+            use serde_json::Value;
+
+            // 回填：读取 live（auth.json + config.toml）写回当前供应商 settings_config
+            if !manager.current.is_empty() {
+                let auth_path = codex_config::get_codex_auth_path();
+                let config_path = codex_config::get_codex_config_path();
+                if auth_path.exists() {
+                    let auth: Value = crate::config::read_json_file(&auth_path)?;
+                    let config_str = if config_path.exists() {
+                        std::fs::read_to_string(&config_path)
+                            .map_err(|e| format!("读取 config.toml 失败: {}", e))?
+                    } else {
+                        String::new()
+                    };
+
+                    let live = serde_json::json!({
+                        "auth": auth,
+                        "config": config_str,
+                    });
+
+                    if let Some(cur) = manager.providers.get_mut(&manager.current) {
+                        cur.settings_config = live;
+                    }
+                }
+            }
+
+            // 切换：从目标供应商 settings_config 写入主配置（Codex 双文件原子+回滚）
+            let auth = provider
+                .settings_config
+                .get("auth")
+                .ok_or_else(|| "目标供应商缺少 auth 配置".to_string())?;
+            let cfg_text = provider
+                .settings_config
+                .get("config")
+                .and_then(|v| v.as_str());
+            crate::codex_config::write_codex_live_atomic(auth, cfg_text)?;
+        }
+        AppType::Claude => {
+            use crate::config::{read_json_file, write_json_file};
+
+            let settings_path = get_claude_settings_path();
+
+            // 回填：读取 live settings.json 写回当前供应商 settings_config
+            if settings_path.exists() && !manager.current.is_empty() {
+                if let Ok(live) = read_json_file::<serde_json::Value>(&settings_path) {
+                    if let Some(cur) = manager.providers.get_mut(&manager.current) {
+                        cur.settings_config = live;
+                    }
+                }
+            }
+
+            // 切换：从目标供应商 settings_config 写入主配置
+            if let Some(parent) = settings_path.parent() {
+                std::fs::create_dir_all(parent).map_err(|e| format!("创建目录失败: {}", e))?;
+            }
+
+            // 不做归档，直接写入
+            write_json_file(&settings_path, &provider.settings_config)?;
+        }
+    }
+
+    // 更新当前供应商
+    manager.current = id;
+
+    log::info!("成功切换到供应商: {}", provider.name);

    // 保存配置
-    drop(manager); // 释放锁
+    drop(config); // 释放锁
    state.save()?;

    Ok(true)
@@ -103,22 +364,57 @@ pub async fn switch_provider(state: State<'_, AppState>, id: String) -> Result<b

 /// 导入当前配置为默认供应商
 #[tauri::command]
-pub async fn import_default_config(state: State<'_, AppState>) -> Result<bool, String> {
-    // 若已存在 default 供应商，则直接返回，避免重复导入
+pub async fn import_default_config(
+    state: State<'_, AppState>,
+    app_type: Option<AppType>,
+    app: Option<String>,
+    appType: Option<String>,
+) -> Result<bool, String> {
+    let app_type = app_type
+        .or_else(|| app.as_deref().map(|s| s.into()))
+        .or_else(|| appType.as_deref().map(|s| s.into()))
+        .unwrap_or(AppType::Claude);
+
+    // 仅当 providers 为空时才从 live 导入一条默认项
    {
-        let manager = state
-            .provider_manager
+        let config = state
+            .config
            .lock()
            .map_err(|e| format!("获取锁失败: {}", e))?;
-        if manager.get_all_providers().contains_key("default") {
-            return Ok(true);
+
+        if let Some(manager) = config.get_manager(&app_type) {
+            if !manager.get_all_providers().is_empty() {
+                return Ok(true);
+            }
        }
    }

-    // 导入配置
-    let settings_config = import_current_config_as_default()?;
+    // 根据应用类型导入配置
+    // 读取当前主配置为默认供应商（不再写入副本文件）
+    let settings_config = match app_type {
+        AppType::Codex => {
+            let auth_path = codex_config::get_codex_auth_path();
+            if !auth_path.exists() {
+                return Err("Codex 配置文件不存在".to_string());
+            }
+            let auth: serde_json::Value =
+                crate::config::read_json_file::<serde_json::Value>(&auth_path)?;
+            let config_str = match crate::codex_config::read_and_validate_codex_config_text() {
+                Ok(s) => s,
+                Err(e) => return Err(e),
+            };
+            serde_json::json!({ "auth": auth, "config": config_str })
+        }
+        AppType::Claude => {
+            let settings_path = get_claude_settings_path();
+            if !settings_path.exists() {
+                return Err("Claude Code 配置文件不存在".to_string());
+            }
+            crate::config::read_json_file::<serde_json::Value>(&settings_path)?
+        }
+    };

-    // 创建默认供应商
+    // 创建默认供应商（仅首次初始化）
    let provider = Provider::with_id(
        "default".to_string(),
        "default".to_string(),
@@ -127,20 +423,21 @@ pub async fn import_default_config(state: State<'_, AppState>) -> Result<bool, S
    );

    // 添加到管理器
-    let mut manager = state
-        .provider_manager
+    let mut config = state
+        .config
        .lock()
        .map_err(|e| format!("获取锁失败: {}", e))?;

-    manager.add_provider(provider)?;
+    let manager = config
+        .get_manager_mut(&app_type)
+        .ok_or_else(|| format!("应用类型不存在: {:?}", app_type))?;

-    // 如果没有当前供应商，设置为 default
-    if manager.current.is_empty() {
-        manager.current = "default".to_string();
-    }
+    manager.providers.insert(provider.id.clone(), provider);
+    // 设置当前供应商为默认项
+    manager.current = "default".to_string();

    // 保存配置
-    drop(manager); // 释放锁
+    drop(config); // 释放锁
    state.save()?;

    Ok(true)
@@ -152,6 +449,34 @@ pub async fn get_claude_config_status() -> Result<ConfigStatus, String> {
    Ok(crate::config::get_claude_config_status())
 }

+/// 获取应用配置状态（通用）
+/// 兼容两种参数：`app_type`（推荐）或 `app`（字符串）
+#[tauri::command]
+pub async fn get_config_status(
+    app_type: Option<AppType>,
+    app: Option<String>,
+    appType: Option<String>,
+) -> Result<ConfigStatus, String> {
+    let app = app_type
+        .or_else(|| app.as_deref().map(|s| s.into()))
+        .or_else(|| appType.as_deref().map(|s| s.into()))
+        .unwrap_or(AppType::Claude);
+
+    match app {
+        AppType::Claude => Ok(crate::config::get_claude_config_status()),
+        AppType::Codex => {
+            use crate::codex_config::{get_codex_auth_path, get_codex_config_dir};
+            let auth_path = get_codex_auth_path();
+
+            // 放宽：只要 auth.json 存在即可认为已配置；config.toml 允许为空
+            let exists = auth_path.exists();
+            let path = get_codex_config_dir().to_string_lossy().to_string();
+
+            Ok(ConfigStatus { exists, path })
+        }
+    }
+}
+
 /// 获取 Claude Code 配置文件路径
 #[tauri::command]
 pub async fn get_claude_code_config_path() -> Result<String, String> {
@@ -159,9 +484,23 @@ pub async fn get_claude_code_config_path() -> Result<String, String> {
 }

 /// 打开配置文件夹
+/// 兼容两种参数：`app_type`（推荐）或 `app`（字符串）
 #[tauri::command]
-pub async fn open_config_folder(app: tauri::AppHandle) -> Result<bool, String> {
-    let config_dir = crate::config::get_claude_config_dir();
+pub async fn open_config_folder(
+    handle: tauri::AppHandle,
+    app_type: Option<AppType>,
+    app: Option<String>,
+    appType: Option<String>,
+) -> Result<bool, String> {
+    let app_type = app_type
+        .or_else(|| app.as_deref().map(|s| s.into()))
+        .or_else(|| appType.as_deref().map(|s| s.into()))
+        .unwrap_or(AppType::Claude);
+
+    let config_dir = match app_type {
+        AppType::Claude => crate::config::get_claude_config_dir(),
+        AppType::Codex => crate::codex_config::get_codex_config_dir(),
+    };

    // 确保目录存在
    if !config_dir.exists() {
@@ -169,7 +508,8 @@ pub async fn open_config_folder(app: tauri::AppHandle) -> Result<bool, String> {
    }

    // 使用 opener 插件打开文件夹
-    app.opener()
+    handle
+        .opener()
        .open_path(config_dir.to_string_lossy().to_string(), None::<String>)
        .map_err(|e| format!("打开文件夹失败: {}", e))?;

@@ -193,3 +533,68 @@ pub async fn open_external(app: tauri::AppHandle, url: String) -> Result<bool, S

    Ok(true)
 }
+
+/// 获取应用配置文件路径
+#[tauri::command]
+pub async fn get_app_config_path() -> Result<String, String> {
+    use crate::config::get_app_config_path;
+
+    let config_path = get_app_config_path();
+    Ok(config_path.to_string_lossy().to_string())
+}
+
+/// 打开应用配置文件夹
+#[tauri::command]
+pub async fn open_app_config_folder(handle: tauri::AppHandle) -> Result<bool, String> {
+    use crate::config::get_app_config_dir;
+
+    let config_dir = get_app_config_dir();
+
+    // 确保目录存在
+    if !config_dir.exists() {
+        std::fs::create_dir_all(&config_dir).map_err(|e| format!("创建目录失败: {}", e))?;
+    }
+
+    // 使用 opener 插件打开文件夹
+    handle
+        .opener()
+        .open_path(config_dir.to_string_lossy().to_string(), None::<String>)
+        .map_err(|e| format!("打开文件夹失败: {}", e))?;
+
+    Ok(true)
+}
+
+/// 获取设置
+#[tauri::command]
+pub async fn get_settings(_state: State<'_, AppState>) -> Result<serde_json::Value, String> {
+    // 暂时返回默认设置
+    Ok(serde_json::json!({
+        "showInDock": true
+    }))
+}
+
+/// 保存设置
+#[tauri::command]
+pub async fn save_settings(
+    _state: State<'_, AppState>,
+    settings: serde_json::Value,
+) -> Result<bool, String> {
+    // TODO: 实现设置保存逻辑
+    log::info!("保存设置: {:?}", settings);
+    Ok(true)
+}
+
+/// 检查更新
+#[tauri::command]
+pub async fn check_for_updates(handle: tauri::AppHandle) -> Result<bool, String> {
+    // 打开 GitHub releases 页面
+    handle
+        .opener()
+        .open_url(
+            "https://github.com/farion1231/cc-switch/releases",
+            None::<String>,
+        )
+        .map_err(|e| format!("打开更新页面失败: {}", e))?;
+
+    Ok(true)
+}
--- a/src-tauri/src/config.rs
+++ b/src-tauri/src/config.rs
@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
+// unused import removed
 use std::fs;
+use std::io::Write;
 use std::path::{Path, PathBuf};

 /// 获取 Claude Code 配置目录路径
@@ -38,6 +39,55 @@ pub fn get_app_config_path() -> PathBuf {
    get_app_config_dir().join("config.json")
 }

+/// 归档根目录 ~/.cc-switch/archive
+pub fn get_archive_root() -> PathBuf {
+    get_app_config_dir().join("archive")
+}
+
+fn ensure_unique_path(dest: PathBuf) -> PathBuf {
+    if !dest.exists() {
+        return dest;
+    }
+    let file_name = dest
+        .file_stem()
+        .map(|s| s.to_string_lossy().to_string())
+        .unwrap_or_else(|| "file".into());
+    let ext = dest
+        .extension()
+        .map(|s| format!(".{}", s.to_string_lossy()))
+        .unwrap_or_default();
+    let parent = dest.parent().map(|p| p.to_path_buf()).unwrap_or_default();
+    for i in 2..1000 {
+        let mut candidate = parent.clone();
+        candidate.push(format!("{}-{}{}", file_name, i, ext));
+        if !candidate.exists() {
+            return candidate;
+        }
+    }
+    dest
+}
+
+/// 将现有文件归档到 `~/.cc-switch/archive/<ts>/<category>/` 下，返回归档路径
+pub fn archive_file(ts: u64, category: &str, src: &Path) -> Result<Option<PathBuf>, String> {
+    if !src.exists() {
+        return Ok(None);
+    }
+    let mut dest_dir = get_archive_root();
+    dest_dir.push(ts.to_string());
+    dest_dir.push(category);
+    fs::create_dir_all(&dest_dir).map_err(|e| format!("创建归档目录失败: {}", e))?;
+
+    let file_name = src
+        .file_name()
+        .map(|s| s.to_string_lossy().to_string())
+        .unwrap_or_else(|| "file".into());
+    let mut dest = dest_dir.join(file_name);
+    dest = ensure_unique_path(dest);
+
+    copy_file(src, &dest)?;
+    Ok(Some(dest))
+}
+
 /// 清理供应商名称，确保文件名安全
 pub fn sanitize_provider_name(name: &str) -> String {
    name.chars()
@@ -79,7 +129,54 @@ pub fn write_json_file<T: Serialize>(path: &Path, data: &T) -> Result<(), String
    let json =
        serde_json::to_string_pretty(data).map_err(|e| format!("序列化 JSON 失败: {}", e))?;

-    fs::write(path, json).map_err(|e| format!("写入文件失败: {}", e))
+    atomic_write(path, json.as_bytes())
+}
+
+/// 原子写入文本文件（用于 TOML/纯文本）
+pub fn write_text_file(path: &Path, data: &str) -> Result<(), String> {
+    if let Some(parent) = path.parent() {
+        fs::create_dir_all(parent).map_err(|e| format!("创建目录失败: {}", e))?;
+    }
+    atomic_write(path, data.as_bytes())
+}
+
+/// 原子写入：写入临时文件后 rename 替换，避免半写状态
+pub fn atomic_write(path: &Path, data: &[u8]) -> Result<(), String> {
+    if let Some(parent) = path.parent() {
+        fs::create_dir_all(parent).map_err(|e| format!("创建目录失败: {}", e))?;
+    }
+
+    let parent = path.parent().ok_or_else(|| "无效的路径".to_string())?;
+    let mut tmp = parent.to_path_buf();
+    let file_name = path
+        .file_name()
+        .ok_or_else(|| "无效的文件名".to_string())?
+        .to_string_lossy()
+        .to_string();
+    let ts = std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_nanos();
+    tmp.push(format!("{}.tmp.{}", file_name, ts));
+
+    {
+        let mut f = fs::File::create(&tmp).map_err(|e| format!("创建临时文件失败: {}", e))?;
+        f.write_all(data)
+            .map_err(|e| format!("写入临时文件失败: {}", e))?;
+        f.flush().map_err(|e| format!("刷新临时文件失败: {}", e))?;
+    }
+
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        if let Ok(meta) = fs::metadata(path) {
+            let perm = meta.permissions().mode();
+            let _ = fs::set_permissions(&tmp, fs::Permissions::from_mode(perm));
+        }
+    }
+
+    fs::rename(&tmp, path).map_err(|e| format!("原子替换失败: {}", e))?;
+    Ok(())
 }

 /// 复制文件
@@ -112,30 +209,4 @@ pub fn get_claude_config_status() -> ConfigStatus {
    }
 }

-/// 备份配置文件
-pub fn backup_config(from: &Path, to: &Path) -> Result<(), String> {
-    if from.exists() {
-        copy_file(from, to)?;
-        log::info!("已备份配置文件: {} -> {}", from.display(), to.display());
-    }
-    Ok(())
-}
-
-/// 导入当前 Claude Code 配置为默认供应商
-pub fn import_current_config_as_default() -> Result<Value, String> {
-    let settings_path = get_claude_settings_path();
-
-    if !settings_path.exists() {
-        return Err("Claude Code 配置文件不存在".to_string());
-    }
-
-    // 读取当前配置
-    let settings_config: Value = read_json_file(&settings_path)?;
-
-    // 保存为 default 供应商
-    let default_provider_path = get_provider_config_path("default", Some("default"));
-    write_json_file(&default_provider_path, &settings_config)?;
-
-    log::info!("已导入当前配置为默认供应商");
-    Ok(settings_config)
-}
+//（移除未使用的备份/导入函数，避免 dead_code 告警）
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,16 +1,239 @@
+mod app_config;
+mod codex_config;
 mod commands;
 mod config;
+mod migration;
 mod provider;
 mod store;

 use store::AppState;
-use tauri::Manager;
+use tauri::{
+    menu::{CheckMenuItem, Menu, MenuBuilder, MenuItem},
+    tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
+};
+use tauri::{Emitter, Manager};
+
+/// 创建动态托盘菜单
+fn create_tray_menu(
+    app: &tauri::AppHandle,
+    app_state: &AppState,
+) -> Result<Menu<tauri::Wry>, String> {
+    let config = app_state
+        .config
+        .lock()
+        .map_err(|e| format!("获取锁失败: {}", e))?;
+
+    let mut menu_builder = MenuBuilder::new(app);
+
+    // 直接添加所有供应商到主菜单（扁平化结构，更简单可靠）
+    if let Some(claude_manager) = config.get_manager(&crate::app_config::AppType::Claude) {
+        // 添加Claude标题（禁用状态，仅作为分组标识）
+        let claude_header =
+            MenuItem::with_id(app, "claude_header", "─── Claude ───", false, None::<&str>)
+                .map_err(|e| format!("创建Claude标题失败: {}", e))?;
+        menu_builder = menu_builder.item(&claude_header);
+
+        if !claude_manager.providers.is_empty() {
+            for (id, provider) in &claude_manager.providers {
+                let is_current = claude_manager.current == *id;
+                let item = CheckMenuItem::with_id(
+                    app,
+                    format!("claude_{}", id),
+                    &provider.name,
+                    true,
+                    is_current,
+                    None::<&str>,
+                )
+                .map_err(|e| format!("创建菜单项失败: {}", e))?;
+                menu_builder = menu_builder.item(&item);
+            }
+        } else {
+            // 没有供应商时显示提示
+            let empty_hint = MenuItem::with_id(
+                app,
+                "claude_empty",
+                "  (无供应商，请在主界面添加)",
+                false,
+                None::<&str>,
+            )
+            .map_err(|e| format!("创建Claude空提示失败: {}", e))?;
+            menu_builder = menu_builder.item(&empty_hint);
+        }
+    }
+
+    if let Some(codex_manager) = config.get_manager(&crate::app_config::AppType::Codex) {
+        // 添加Codex标题（禁用状态，仅作为分组标识）
+        let codex_header =
+            MenuItem::with_id(app, "codex_header", "─── Codex ───", false, None::<&str>)
+                .map_err(|e| format!("创建Codex标题失败: {}", e))?;
+        menu_builder = menu_builder.item(&codex_header);
+
+        if !codex_manager.providers.is_empty() {
+            for (id, provider) in &codex_manager.providers {
+                let is_current = codex_manager.current == *id;
+                let item = CheckMenuItem::with_id(
+                    app,
+                    format!("codex_{}", id),
+                    &provider.name,
+                    true,
+                    is_current,
+                    None::<&str>,
+                )
+                .map_err(|e| format!("创建菜单项失败: {}", e))?;
+                menu_builder = menu_builder.item(&item);
+            }
+        } else {
+            // 没有供应商时显示提示
+            let empty_hint = MenuItem::with_id(
+                app,
+                "codex_empty",
+                "  (无供应商，请在主界面添加)",
+                false,
+                None::<&str>,
+            )
+            .map_err(|e| format!("创建Codex空提示失败: {}", e))?;
+            menu_builder = menu_builder.item(&empty_hint);
+        }
+    }
+
+    // 分隔符和退出菜单
+    let quit_item = MenuItem::with_id(app, "quit", "退出", true, None::<&str>)
+        .map_err(|e| format!("创建退出菜单失败: {}", e))?;
+
+    menu_builder = menu_builder.separator().item(&quit_item);
+
+    menu_builder
+        .build()
+        .map_err(|e| format!("构建菜单失败: {}", e))
+}
+
+/// 处理托盘菜单事件
+fn handle_tray_menu_event(app: &tauri::AppHandle, event_id: &str) {
+    println!("处理托盘菜单事件: {}", event_id);
+
+    match event_id {
+        "quit" => {
+            println!("退出应用");
+            app.exit(0);
+        }
+        id if id.starts_with("claude_") => {
+            let provider_id = id.strip_prefix("claude_").unwrap();
+            println!("切换到Claude供应商: {}", provider_id);
+
+            // 执行切换
+            let app_handle = app.clone();
+            let provider_id = provider_id.to_string();
+            tauri::async_runtime::spawn(async move {
+                if let Err(e) = switch_provider_internal(
+                    &app_handle,
+                    crate::app_config::AppType::Claude,
+                    provider_id,
+                )
+                .await
+                {
+                    eprintln!("切换Claude供应商失败: {}", e);
+                }
+            });
+        }
+        id if id.starts_with("codex_") => {
+            let provider_id = id.strip_prefix("codex_").unwrap();
+            println!("切换到Codex供应商: {}", provider_id);
+
+            // 执行切换
+            let app_handle = app.clone();
+            let provider_id = provider_id.to_string();
+            tauri::async_runtime::spawn(async move {
+                if let Err(e) = switch_provider_internal(
+                    &app_handle,
+                    crate::app_config::AppType::Codex,
+                    provider_id,
+                )
+                .await
+                {
+                    eprintln!("切换Codex供应商失败: {}", e);
+                }
+            });
+        }
+        _ => {
+            println!("未处理的菜单事件: {}", event_id);
+        }
+    }
+}
+
+/// 内部切换供应商函数
+async fn switch_provider_internal(
+    app: &tauri::AppHandle,
+    app_type: crate::app_config::AppType,
+    provider_id: String,
+) -> Result<(), String> {
+    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().into(),
+            Some(app_type),
+            None,
+            None,
+            provider_id,
+        )
+        .await?;
+
+        // 切换成功后重新创建托盘菜单
+        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)) {
+                    eprintln!("更新托盘菜单失败: {}", 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) {
+            eprintln!("发射供应商切换事件失败: {}", e);
+        }
+    }
+    Ok(())
+}
+
+/// 更新托盘菜单的Tauri命令
+#[tauri::command]
+async fn update_tray_menu(
+    app: tauri::AppHandle,
+    state: tauri::State<'_, AppState>,
+) -> Result<bool, String> {
+    if let Ok(new_menu) = create_tray_menu(&app, state.inner()) {
+        if let Some(tray) = app.tray_by_id("main") {
+            tray.set_menu(Some(new_menu))
+                .map_err(|e| format!("更新托盘菜单失败: {}", e))?;
+            return Ok(true);
+        }
+    }
+    Ok(false)
+}

 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
    tauri::Builder::default()
+        .plugin(tauri_plugin_process::init())
        .plugin(tauri_plugin_opener::init())
        .setup(|app| {
+            // 注册 Updater 插件（桌面端）
+            #[cfg(desktop)]
+            {
+                if let Err(e) = app
+                    .handle()
+                    .plugin(tauri_plugin_updater::Builder::new().build())
+                {
+                    // 若配置不完整（如缺少 pubkey），跳过 Updater 而不中断应用
+                    log::warn!("初始化 Updater 插件失败，已跳过：{}", e);
+                }
+            }
            #[cfg(target_os = "macos")]
            {
                // 设置 macOS 标题栏背景色为主界面蓝色
@@ -53,36 +276,51 @@ pub fn run() {
            // 初始化应用状态（仅创建一次，并在本函数末尾注入 manage）
            let app_state = AppState::new();

-            // 如果没有供应商且存在 Claude Code 配置，自动导入
+            // 首次启动迁移：扫描副本文件，合并到 config.json，并归档副本；旧 config.json 先归档
            {
-                let manager = app_state.provider_manager.lock().unwrap();
-                if manager.providers.is_empty() {
-                    drop(manager); // 释放锁
-
-                    let settings_path = config::get_claude_settings_path();
-                    if settings_path.exists() {
-                        log::info!("检测到 Claude Code 配置，自动导入为默认供应商");
-
-                        if let Ok(settings_config) = config::import_current_config_as_default() {
-                            let mut manager = app_state.provider_manager.lock().unwrap();
-                            let provider = provider::Provider::with_id(
-                                "default".to_string(),
-                                "default".to_string(),
-                                settings_config,
-                                None,
-                            );
-
-                            if manager.add_provider(provider).is_ok() {
-                                manager.current = "default".to_string();
-                                drop(manager);
-                                let _ = app_state.save();
-                                log::info!("成功导入默认供应商");
-                            }
-                        }
-                    }
+                let mut config_guard = app_state.config.lock().unwrap();
+                let migrated = migration::migrate_copies_into_config(&mut *config_guard)?;
+                if migrated {
+                    log::info!("已将副本文件导入到 config.json，并完成归档");
                }
+                // 确保两个 App 条目存在
+                config_guard.ensure_app(&app_config::AppType::Claude);
+                config_guard.ensure_app(&app_config::AppType::Codex);
            }

+            // 保存配置
+            let _ = app_state.save();
+
+            // 创建动态托盘菜单
+            let menu = create_tray_menu(&app.handle(), &app_state)?;
+
+            let _tray = TrayIconBuilder::with_id("main")
+                .on_tray_icon_event(|tray, event| match event {
+                    TrayIconEvent::Click {
+                        button: MouseButton::Left,
+                        button_state: MouseButtonState::Up,
+                        ..
+                    } => {
+                        println!("left click pressed and released");
+                        // 在这个例子中，当点击托盘图标时，将展示并聚焦于主窗口
+                        let app = tray.app_handle();
+                        if let Some(window) = app.get_webview_window("main") {
+                            let _ = window.unminimize();
+                            let _ = window.show();
+                            let _ = window.set_focus();
+                        }
+                    }
+                    _ => {
+                        println!("unhandled event {event:?}");
+                    }
+                })
+                .menu(&menu)
+                .on_menu_event(|app, event| {
+                    handle_tray_menu_event(app, &event.id.0);
+                })
+                .icon(app.default_window_icon().unwrap().clone())
+                .show_menu_on_left_click(true)
+                .build(app)?;
            // 将同一个实例注入到全局状态，避免重复创建导致的不一致
            app.manage(app_state);
            Ok(())
@@ -96,9 +334,16 @@ pub fn run() {
            commands::switch_provider,
            commands::import_default_config,
            commands::get_claude_config_status,
+            commands::get_config_status,
            commands::get_claude_code_config_path,
            commands::open_config_folder,
            commands::open_external,
+            commands::get_app_config_path,
+            commands::open_app_config_folder,
+            commands::get_settings,
+            commands::save_settings,
+            commands::check_for_updates,
+            update_tray_menu,
        ])
        .run(tauri::generate_context!())
        .expect("error while running tauri application");
--- a/src-tauri/src/migration.rs
+++ b/src-tauri/src/migration.rs
@@ -0,0 +1,434 @@
+use crate::app_config::{AppType, MultiAppConfig};
+use crate::config::{
+    archive_file, delete_file, get_app_config_dir, get_app_config_path, get_claude_config_dir,
+};
+use serde_json::Value;
+use std::collections::{HashMap, HashSet};
+use std::fs;
+use std::path::PathBuf;
+
+fn now_ts() -> u64 {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_secs()
+}
+
+fn get_marker_path() -> PathBuf {
+    get_app_config_dir().join("migrated.copies.v1")
+}
+
+fn sanitized_id(base: &str) -> String {
+    crate::config::sanitize_provider_name(base)
+}
+
+fn next_unique_id(existing: &HashSet<String>, base: &str) -> String {
+    let base = sanitized_id(base);
+    if !existing.contains(&base) {
+        return base;
+    }
+    for i in 2..1000 {
+        let candidate = format!("{}-{}", base, i);
+        if !existing.contains(&candidate) {
+            return candidate;
+        }
+    }
+    format!("{}-dup", base)
+}
+
+fn extract_claude_api_key(value: &Value) -> Option<String> {
+    value
+        .get("env")
+        .and_then(|env| env.get("ANTHROPIC_AUTH_TOKEN"))
+        .and_then(|v| v.as_str())
+        .map(|s| s.to_string())
+}
+
+fn extract_codex_api_key(value: &Value) -> Option<String> {
+    value
+        .get("auth")
+        .and_then(|auth| {
+            auth.get("OPENAI_API_KEY")
+                .or_else(|| auth.get("openai_api_key"))
+        })
+        .and_then(|v| v.as_str())
+        .map(|s| s.to_string())
+}
+
+fn norm_name(s: &str) -> String {
+    s.trim().to_lowercase()
+}
+
+// 去重策略：name + 原始 key 直接比较（不做哈希）
+
+fn scan_claude_copies() -> Vec<(String, PathBuf, Value)> {
+    let mut items = Vec::new();
+    let dir = get_claude_config_dir();
+    if !dir.exists() {
+        return items;
+    }
+    if let Ok(rd) = fs::read_dir(&dir) {
+        for e in rd.flatten() {
+            let p = e.path();
+            let fname = match p.file_name().and_then(|s| s.to_str()) {
+                Some(s) => s,
+                None => continue,
+            };
+            if fname == "settings.json" || fname == "claude.json" {
+                continue;
+            }
+            if !fname.starts_with("settings-") || !fname.ends_with(".json") {
+                continue;
+            }
+            let name = fname
+                .trim_start_matches("settings-")
+                .trim_end_matches(".json");
+            if let Ok(val) = crate::config::read_json_file::<Value>(&p) {
+                items.push((name.to_string(), p, val));
+            }
+        }
+    }
+    items
+}
+
+fn scan_codex_copies() -> Vec<(String, Option<PathBuf>, Option<PathBuf>, Value)> {
+    let mut by_name: HashMap<String, (Option<PathBuf>, Option<PathBuf>)> = HashMap::new();
+    let dir = crate::codex_config::get_codex_config_dir();
+    if !dir.exists() {
+        return Vec::new();
+    }
+    if let Ok(rd) = fs::read_dir(&dir) {
+        for e in rd.flatten() {
+            let p = e.path();
+            let fname = match p.file_name().and_then(|s| s.to_str()) {
+                Some(s) => s,
+                None => continue,
+            };
+            if fname.starts_with("auth-") && fname.ends_with(".json") {
+                let name = fname.trim_start_matches("auth-").trim_end_matches(".json");
+                let entry = by_name.entry(name.to_string()).or_default();
+                entry.0 = Some(p);
+            } else if fname.starts_with("config-") && fname.ends_with(".toml") {
+                let name = fname
+                    .trim_start_matches("config-")
+                    .trim_end_matches(".toml");
+                let entry = by_name.entry(name.to_string()).or_default();
+                entry.1 = Some(p);
+            }
+        }
+    }
+
+    let mut items = Vec::new();
+    for (name, (auth_path, config_path)) in by_name {
+        if let Some(authp) = auth_path {
+            if let Ok(auth) = crate::config::read_json_file::<Value>(&authp) {
+                let config_str = if let Some(cfgp) = &config_path {
+                    match crate::codex_config::read_and_validate_config_from_path(cfgp) {
+                        Ok(s) => s,
+                        Err(e) => {
+                            log::warn!("跳过无效 Codex config-{}.toml: {}", name, e);
+                            String::new()
+                        }
+                    }
+                } else {
+                    String::new()
+                };
+                let settings = serde_json::json!({
+                    "auth": auth,
+                    "config": config_str,
+                });
+                items.push((name, Some(authp), config_path, settings));
+            }
+        }
+    }
+    items
+}
+
+pub fn migrate_copies_into_config(config: &mut MultiAppConfig) -> Result<bool, String> {
+    // 如果已迁移过则跳过
+    let marker = get_marker_path();
+    if marker.exists() {
+        return Ok(false);
+    }
+
+    let claude_items = scan_claude_copies();
+    let codex_items = scan_codex_copies();
+    if claude_items.is_empty() && codex_items.is_empty() {
+        // 即便没有可迁移项，也写入标记避免每次扫描
+        fs::write(&marker, b"no-copies").map_err(|e| format!("写入迁移标记失败: {}", e))?;
+        return Ok(false);
+    }
+
+    // 备份旧的 config.json
+    let ts = now_ts();
+    let app_cfg_path = get_app_config_path();
+    if app_cfg_path.exists() {
+        let _ = archive_file(ts, "cc-switch", &app_cfg_path);
+    }
+
+    // 读取 live：Claude（settings.json / claude.json）
+    let live_claude: Option<(String, Value)> = {
+        let settings_path = crate::config::get_claude_settings_path();
+        if settings_path.exists() {
+            match crate::config::read_json_file::<Value>(&settings_path) {
+                Ok(val) => Some(("default".to_string(), val)),
+                Err(e) => {
+                    log::warn!("读取 Claude live 配置失败: {}", e);
+                    None
+                }
+            }
+        } else {
+            None
+        }
+    };
+
+    // 合并：Claude（优先 live，然后副本） - 去重键: name + apiKey（直接比较）
+    config.ensure_app(&AppType::Claude);
+    let manager = config.get_manager_mut(&AppType::Claude).unwrap();
+    let mut ids: HashSet<String> = manager.providers.keys().cloned().collect();
+    let mut live_claude_id: Option<String> = None;
+
+    if let Some((name, value)) = &live_claude {
+        let cand_key = extract_claude_api_key(value);
+        let exist_id = manager.providers.iter().find_map(|(id, p)| {
+            let pk = extract_claude_api_key(&p.settings_config);
+            if norm_name(&p.name) == norm_name(name) && pk == cand_key {
+                Some(id.clone())
+            } else {
+                None
+            }
+        });
+        if let Some(exist_id) = exist_id {
+            if let Some(prov) = manager.providers.get_mut(&exist_id) {
+                log::info!("合并到已存在 Claude 供应商 '{}' (by name+key)", name);
+                prov.settings_config = value.clone();
+                live_claude_id = Some(exist_id);
+            }
+        } else {
+            let id = next_unique_id(&ids, name);
+            ids.insert(id.clone());
+            let provider =
+                crate::provider::Provider::with_id(id.clone(), name.clone(), value.clone(), None);
+            manager.providers.insert(provider.id.clone(), provider);
+            live_claude_id = Some(id);
+        }
+    }
+    for (name, path, value) in claude_items.iter() {
+        let cand_key = extract_claude_api_key(value);
+        let exist_id = manager.providers.iter().find_map(|(id, p)| {
+            let pk = extract_claude_api_key(&p.settings_config);
+            if norm_name(&p.name) == norm_name(name) && pk == cand_key {
+                Some(id.clone())
+            } else {
+                None
+            }
+        });
+        if let Some(exist_id) = exist_id {
+            if let Some(prov) = manager.providers.get_mut(&exist_id) {
+                log::info!(
+                    "覆盖 Claude 供应商 '{}' 来自 {} (by name+key)",
+                    name,
+                    path.display()
+                );
+                prov.settings_config = value.clone();
+            }
+        } else {
+            let id = next_unique_id(&ids, name);
+            ids.insert(id.clone());
+            let provider =
+                crate::provider::Provider::with_id(id.clone(), name.clone(), value.clone(), None);
+            manager.providers.insert(provider.id.clone(), provider);
+        }
+    }
+
+    // 读取 live：Codex（auth.json 必需，config.toml 可空）
+    let live_codex: Option<(String, Value)> = {
+        let auth_path = crate::codex_config::get_codex_auth_path();
+        if auth_path.exists() {
+            match crate::config::read_json_file::<Value>(&auth_path) {
+                Ok(auth) => {
+                    let cfg = match crate::codex_config::read_and_validate_codex_config_text() {
+                        Ok(s) => s,
+                        Err(e) => {
+                            log::warn!("读取/校验 Codex live config.toml 失败: {}", e);
+                            String::new()
+                        }
+                    };
+                    Some((
+                        "default".to_string(),
+                        serde_json::json!({"auth": auth, "config": cfg}),
+                    ))
+                }
+                Err(e) => {
+                    log::warn!("读取 Codex live auth.json 失败: {}", e);
+                    None
+                }
+            }
+        } else {
+            None
+        }
+    };
+
+    // 合并：Codex（优先 live，然后副本） - 去重键: name + OPENAI_API_KEY（直接比较）
+    config.ensure_app(&AppType::Codex);
+    let manager = config.get_manager_mut(&AppType::Codex).unwrap();
+    let mut ids: HashSet<String> = manager.providers.keys().cloned().collect();
+    let mut live_codex_id: Option<String> = None;
+
+    if let Some((name, value)) = &live_codex {
+        let cand_key = extract_codex_api_key(value);
+        let exist_id = manager.providers.iter().find_map(|(id, p)| {
+            let pk = extract_codex_api_key(&p.settings_config);
+            if norm_name(&p.name) == norm_name(name) && pk == cand_key {
+                Some(id.clone())
+            } else {
+                None
+            }
+        });
+        if let Some(exist_id) = exist_id {
+            if let Some(prov) = manager.providers.get_mut(&exist_id) {
+                log::info!("合并到已存在 Codex 供应商 '{}' (by name+key)", name);
+                prov.settings_config = value.clone();
+                live_codex_id = Some(exist_id);
+            }
+        } else {
+            let id = next_unique_id(&ids, name);
+            ids.insert(id.clone());
+            let provider =
+                crate::provider::Provider::with_id(id.clone(), name.clone(), value.clone(), None);
+            manager.providers.insert(provider.id.clone(), provider);
+            live_codex_id = Some(id);
+        }
+    }
+    for (name, authp, cfgp, value) in codex_items.iter() {
+        let cand_key = extract_codex_api_key(value);
+        let exist_id = manager.providers.iter().find_map(|(id, p)| {
+            let pk = extract_codex_api_key(&p.settings_config);
+            if norm_name(&p.name) == norm_name(name) && pk == cand_key {
+                Some(id.clone())
+            } else {
+                None
+            }
+        });
+        if let Some(exist_id) = exist_id {
+            if let Some(prov) = manager.providers.get_mut(&exist_id) {
+                log::info!(
+                    "覆盖 Codex 供应商 '{}' 来自 {:?}/{:?} (by name+key)",
+                    name,
+                    authp,
+                    cfgp
+                );
+                prov.settings_config = value.clone();
+            }
+        } else {
+            let id = next_unique_id(&ids, name);
+            ids.insert(id.clone());
+            let provider =
+                crate::provider::Provider::with_id(id.clone(), name.clone(), value.clone(), None);
+            manager.providers.insert(provider.id.clone(), provider);
+        }
+    }
+
+    // 若当前为空，将 live 导入项设为当前
+    {
+        let manager = config.get_manager_mut(&AppType::Claude).unwrap();
+        if manager.current.is_empty() {
+            if let Some(id) = live_claude_id {
+                manager.current = id;
+            }
+        }
+    }
+    {
+        let manager = config.get_manager_mut(&AppType::Codex).unwrap();
+        if manager.current.is_empty() {
+            if let Some(id) = live_codex_id {
+                manager.current = id;
+            }
+        }
+    }
+
+    // 归档副本文件
+    for (_, p, _) in claude_items.into_iter() {
+        match archive_file(ts, "claude", &p) {
+            Ok(Some(_)) => {
+                let _ = delete_file(&p);
+            }
+            _ => {
+                // 归档失败则不要删除原文件，保守处理
+            }
+        }
+    }
+    for (_, ap, cp, _) in codex_items.into_iter() {
+        if let Some(ap) = ap {
+            match archive_file(ts, "codex", &ap) {
+                Ok(Some(_)) => {
+                    let _ = delete_file(&ap);
+                }
+                _ => {}
+            }
+        }
+        if let Some(cp) = cp {
+            match archive_file(ts, "codex", &cp) {
+                Ok(Some(_)) => {
+                    let _ = delete_file(&cp);
+                }
+                _ => {}
+            }
+        }
+    }
+
+    // 标记完成
+    // 仅在迁移阶段执行一次全量去重（忽略大小写的名称 + API Key）
+    let removed = dedupe_config(config);
+    if removed > 0 {
+        log::info!("迁移阶段已去重重复供应商 {} 个", removed);
+    }
+
+    fs::write(&marker, b"done").map_err(|e| format!("写入迁移标记失败: {}", e))?;
+    Ok(true)
+}
+
+/// 启动时对现有配置做一次去重：按名称(忽略大小写)+API Key
+pub fn dedupe_config(config: &mut MultiAppConfig) -> usize {
+    use std::collections::HashMap as Map;
+
+    fn dedupe_one(
+        mgr: &mut crate::provider::ProviderManager,
+        extract_key: &dyn Fn(&Value) -> Option<String>,
+    ) -> usize {
+        let mut keep: Map<String, String> = Map::new(); // key -> id 保留
+        let mut remove: Vec<String> = Vec::new();
+        for (id, p) in mgr.providers.iter() {
+            let k = format!(
+                "{}|{}",
+                norm_name(&p.name),
+                extract_key(&p.settings_config).unwrap_or_default()
+            );
+            if let Some(exist_id) = keep.get(&k) {
+                // 若当前是正在使用的，则用当前替换之前的，反之丢弃当前
+                if *id == mgr.current {
+                    // 替换：把原先的标记为删除，改保留为当前
+                    remove.push(exist_id.clone());
+                    keep.insert(k, id.clone());
+                } else {
+                    remove.push(id.clone());
+                }
+            } else {
+                keep.insert(k, id.clone());
+            }
+        }
+        for id in remove.iter() {
+            mgr.providers.remove(id);
+        }
+        remove.len()
+    }
+
+    let mut removed = 0;
+    if let Some(mgr) = config.get_manager_mut(&crate::app_config::AppType::Claude) {
+        removed += dedupe_one(mgr, &extract_claude_api_key);
+    }
+    if let Some(mgr) = config.get_manager_mut(&crate::app_config::AppType::Codex) {
+        removed += dedupe_one(mgr, &extract_codex_api_key);
+    }
+    removed
+}
--- a/src-tauri/src/provider.rs
+++ b/src-tauri/src/provider.rs
@@ -1,12 +1,8 @@
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
-use std::path::Path;

-use crate::config::{
-    backup_config, copy_file, delete_file, get_claude_settings_path, get_provider_config_path,
-    read_json_file, write_json_file,
-};
+// SSOT 模式：不再写供应商副本文件

 /// 供应商结构体
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -54,124 +50,6 @@ impl Default for ProviderManager {
 }

 impl ProviderManager {
-    /// 加载供应商列表
-    pub fn load_from_file(path: &Path) -> Result<Self, String> {
-        if !path.exists() {
-            log::info!("配置文件不存在，创建新的供应商管理器");
-            return Ok(Self::default());
-        }
-
-        read_json_file(path)
-    }
-
-    /// 保存供应商列表
-    pub fn save_to_file(&self, path: &Path) -> Result<(), String> {
-        write_json_file(path, self)
-    }
-
-    /// 添加供应商
-    pub fn add_provider(&mut self, provider: Provider) -> Result<(), String> {
-        // 保存供应商配置到独立文件
-        let config_path = get_provider_config_path(&provider.id, Some(&provider.name));
-        write_json_file(&config_path, &provider.settings_config)?;
-
-        // 添加到管理器
-        self.providers.insert(provider.id.clone(), provider);
-        Ok(())
-    }
-
-    /// 更新供应商
-    pub fn update_provider(&mut self, provider: Provider) -> Result<(), String> {
-        // 检查供应商是否存在
-        if !self.providers.contains_key(&provider.id) {
-            return Err(format!("供应商不存在: {}", provider.id));
-        }
-
-        // 如果名称改变了，需要处理配置文件
-        if let Some(old_provider) = self.providers.get(&provider.id) {
-            if old_provider.name != provider.name {
-                // 删除旧配置文件
-                let old_config_path =
-                    get_provider_config_path(&provider.id, Some(&old_provider.name));
-                delete_file(&old_config_path).ok(); // 忽略删除错误
-            }
-        }
-
-        // 保存新配置文件
-        let config_path = get_provider_config_path(&provider.id, Some(&provider.name));
-        write_json_file(&config_path, &provider.settings_config)?;
-
-        // 更新管理器
-        self.providers.insert(provider.id.clone(), provider);
-        Ok(())
-    }
-
-    /// 删除供应商
-    pub fn delete_provider(&mut self, provider_id: &str) -> Result<(), String> {
-        // 检查是否为当前供应商
-        if self.current == provider_id {
-            return Err("不能删除当前正在使用的供应商".to_string());
-        }
-
-        // 获取供应商信息
-        let provider = self
-            .providers
-            .get(provider_id)
-            .ok_or_else(|| format!("供应商不存在: {}", provider_id))?;
-
-        // 删除配置文件
-        let config_path = get_provider_config_path(provider_id, Some(&provider.name));
-        delete_file(&config_path)?;
-
-        // 从管理器删除
-        self.providers.remove(provider_id);
-        Ok(())
-    }
-
-    /// 切换供应商
-    pub fn switch_provider(&mut self, provider_id: &str) -> Result<(), String> {
-        // 检查供应商是否存在
-        let provider = self
-            .providers
-            .get(provider_id)
-            .ok_or_else(|| format!("供应商不存在: {}", provider_id))?;
-
-        let settings_path = get_claude_settings_path();
-        let provider_config_path = get_provider_config_path(provider_id, Some(&provider.name));
-
-        // 检查供应商配置文件是否存在
-        if !provider_config_path.exists() {
-            return Err(format!(
-                "供应商配置文件不存在: {}",
-                provider_config_path.display()
-            ));
-        }
-
-        // 如果当前有配置，先备份到当前供应商
-        if settings_path.exists() && !self.current.is_empty() {
-            if let Some(current_provider) = self.providers.get(&self.current) {
-                let current_provider_path =
-                    get_provider_config_path(&self.current, Some(&current_provider.name));
-                backup_config(&settings_path, &current_provider_path)?;
-                log::info!("已备份当前供应商配置: {}", current_provider.name);
-            }
-        }
-
-        // 确保主配置父目录存在
-        if let Some(parent) = settings_path.parent() {
-            std::fs::create_dir_all(parent).map_err(|e| format!("创建目录失败: {}", e))?;
-        }
-
-        // 复制新供应商配置到主配置
-        copy_file(&provider_config_path, &settings_path)?;
-
-        // 更新当前供应商
-        self.current = provider_id.to_string();
-
-        log::info!("成功切换到供应商: {}", provider.name);
-        Ok(())
-    }
-
    /// 获取所有供应商
    pub fn get_all_providers(&self) -> &HashMap<String, Provider> {
        &self.providers
--- a/src-tauri/src/store.rs
+++ b/src-tauri/src/store.rs
@@ -1,36 +1,31 @@
-use crate::config::get_app_config_path;
-use crate::provider::ProviderManager;
+use crate::app_config::MultiAppConfig;
 use std::sync::Mutex;

 /// 全局应用状态
 pub struct AppState {
-    pub provider_manager: Mutex<ProviderManager>,
+    pub config: Mutex<MultiAppConfig>,
 }

 impl AppState {
    /// 创建新的应用状态
    pub fn new() -> Self {
-        let config_path = get_app_config_path();
-        let provider_manager = ProviderManager::load_from_file(&config_path).unwrap_or_else(|e| {
+        let config = MultiAppConfig::load().unwrap_or_else(|e| {
            log::warn!("加载配置失败: {}, 使用默认配置", e);
-            ProviderManager::default()
+            MultiAppConfig::default()
        });

        Self {
-            provider_manager: Mutex::new(provider_manager),
+            config: Mutex::new(config),
        }
    }

    /// 保存配置到文件
    pub fn save(&self) -> Result<(), String> {
-        let config_path = get_app_config_path();
-        let manager = self
-            .provider_manager
+        let config = self
+            .config
            .lock()
            .map_err(|e| format!("获取锁失败: {}", e))?;

-        manager.save_to_file(&config_path)
+        config.save()
    }
-
-    // 保留按需扩展：若未来需要热加载，可在此实现
 }
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
  "$schema": "https://schema.tauri.app/config/2",
  "productName": "CC Switch",
-  "version": "3.0.0",
+  "version": "3.1.1",
  "identifier": "com.ccswitch.desktop",
  "build": {
    "frontendDist": "../dist",
@@ -12,6 +12,7 @@
  "app": {
    "windows": [
      {
+        "label": "main",
        "title": "",
        "width": 900,
        "height": 650,
@@ -23,12 +24,13 @@
      }
    ],
    "security": {
-      "csp": "default-src 'self'; img-src 'self' data:; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https: http:"
+      "csp": "default-src 'self'; img-src 'self' data:; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' ipc: http://ipc.localhost https: http:"
    }
  },
  "bundle": {
    "active": true,
    "targets": "all",
+    "createUpdaterArtifacts": true,
    "icon": [
      "icons/32x32.png",
      "icons/128x128.png",
@@ -37,4 +39,13 @@
      "icons/icon.ico"
    ]
  }
+  ,
+  "plugins": {
+    "updater": {
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDRERTRCNEUxQUE3MDA4QTYKUldTbUNIQ3E0YlRrVFF2cnFVVE1jczlNZFlmemxXd0h6cTdibXRJWjBDSytQODdZOTYvR3d3d2oK",
+      "endpoints": [
+        "https://github.com/jasonyoung/cc-switch/releases/latest/download/latest.json"
+      ]
+    }
+  }
 }
--- a/src/App.css
+++ b/src/App.css
@@ -1,173 +0,0 @@
-.app {
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
-}
-
-.app-header {
-  background: #3498db;
-  color: white;
-  padding: 0.75rem 2rem;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  user-select: none;
-  min-height: 3rem;
-}
-
-.app-header h1 {
-  font-size: 1.5rem;
-  font-weight: 500;
-}
-
-.header-actions {
-  display: flex;
-  gap: 1rem;
-}
-
-.refresh-btn,
-.add-btn {
-  padding: 0.5rem 1rem;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 0.9rem;
-  transition: all 0.2s;
-}
-
-.refresh-btn {
-  background: #3498db;
-  color: white;
-}
-
-.refresh-btn:hover:not(:disabled) {
-  background: #2980b9;
-}
-
-.refresh-btn:disabled {
-  opacity: 0.6;
-  cursor: not-allowed;
-}
-
-.import-btn {
-  background: rgba(255, 255, 255, 0.2);
-  color: white;
-  border: 1px solid rgba(255, 255, 255, 0.3);
-}
-
-.import-btn:hover {
-  background: rgba(255, 255, 255, 0.3);
-}
-
-.import-btn:focus {
-  outline: none;
-}
-
-.add-btn {
-  background: #27ae60;
-  color: white;
-  border: none;
-}
-
-.add-btn:hover {
-  background: #229954;
-}
-
-.add-btn:focus {
-  outline: none;
-}
-
-.app-main {
-  flex: 1;
-  padding: 2rem;
-  overflow-y: auto;
-}
-
-.config-path {
-  margin-top: 2rem;
-  padding: 1rem;
-  background: #ecf0f1;
-  border-radius: 4px;
-  font-size: 0.9rem;
-  color: #7f8c8d;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.browse-btn {
-  padding: 0.5rem 1rem;
-  border: none;
-  border-radius: 4px;
-  background: #3498db;
-  color: white;
-  cursor: pointer;
-  font-size: 0.9rem;
-  transition: all 0.2s;
-  margin-left: 1rem;
-}
-
-.browse-btn:hover {
-  background: #2980b9;
-}
-
-/* 供应商列表区域 - 相对定位容器 */
-.provider-section {
-  position: relative;
-}
-
-/* 浮动通知 - 绝对定位，不占据空间 */
-.notification-floating {
-  position: absolute;
-  top: -10px;
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: 100;
-
-  padding: 0.75rem 1.25rem;
-  border-radius: 6px;
-  font-size: 0.9rem;
-  font-weight: 500;
-
-  width: fit-content;
-  white-space: nowrap;
-}
-
-.fade-in {
-  animation: fadeIn 0.3s ease-out;
-}
-
-.fade-out {
-  animation: fadeOut 0.3s ease-out;
-}
-
-.notification-success {
-  background: linear-gradient(135deg, #27ae60 0%, #2ecc71 100%);
-  color: white;
-  box-shadow: 0 4px 12px rgba(39, 174, 96, 0.3);
-}
-
-.notification-error {
-  background: linear-gradient(135deg, #e74c3c 0%, #ec7063 100%);
-  color: white;
-  box-shadow: 0 4px 12px rgba(231, 76, 60, 0.3);
-}
-
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-@keyframes fadeOut {
-  from {
-    opacity: 1;
-  }
-  to {
-    opacity: 0;
-  }
-}
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,19 +1,22 @@
 import { useState, useEffect, useRef } from "react";
 import { Provider } from "./types";
+import { AppType } from "./lib/tauri-api";
 import ProviderList from "./components/ProviderList";
 import AddProviderModal from "./components/AddProviderModal";
 import EditProviderModal from "./components/EditProviderModal";
 import { ConfirmDialog } from "./components/ConfirmDialog";
-import "./App.css";
+import { AppSwitcher } from "./components/AppSwitcher";
+import SettingsModal from "./components/SettingsModal";
+import { Plus, Settings, Moon, Sun } from "lucide-react";
+import { buttonStyles } from "./lib/styles";
+import { useDarkMode } from "./hooks/useDarkMode";

 function App() {
+  const { isDarkMode, toggleDarkMode } = useDarkMode();
+  const [activeApp, setActiveApp] = useState<AppType>("claude");
  const [providers, setProviders] = useState<Record<string, Provider>>({});
  const [currentProviderId, setCurrentProviderId] = useState<string>("");
  const [isAddModalOpen, setIsAddModalOpen] = useState(false);
-  const [configStatus, setConfigStatus] = useState<{
-    exists: boolean;
-    path: string;
-  } | null>(null);
  const [editingProviderId, setEditingProviderId] = useState<string | null>(
    null,
  );
@@ -28,6 +31,7 @@ function App() {
    message: string;
    onConfirm: () => void;
  } | null>(null);
+  const [isSettingsOpen, setIsSettingsOpen] = useState(false);
  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);

  // 设置通知的辅助函数
@@ -59,8 +63,7 @@ function App() {
  // 加载供应商列表
  useEffect(() => {
    loadProviders();
-    loadConfigStatus();
-  }, []);
+  }, [activeApp]); // 当切换应用时重新加载

  // 清理定时器
  useEffect(() => {
@@ -71,25 +74,47 @@ function App() {
    };
  }, []);

+  // 监听托盘切换事件
+  useEffect(() => {
+    let unlisten: (() => void) | null = null;
+
+    const setupListener = async () => {
+      try {
+        unlisten = await window.api.onProviderSwitched(async (data) => {
+          console.log("收到供应商切换事件:", data);
+
+          // 如果当前应用类型匹配，则重新加载数据
+          if (data.appType === activeApp) {
+            await loadProviders();
+          }
+        });
+      } catch (error) {
+        console.error("设置供应商切换监听器失败:", error);
+      }
+    };
+
+    setupListener();
+
+    // 清理监听器
+    return () => {
+      if (unlisten) {
+        unlisten();
+      }
+    };
+  }, [activeApp]); // 依赖activeApp，切换应用时重新设置监听器
+
  const loadProviders = async () => {
-    const loadedProviders = await window.api.getProviders();
-    const currentId = await window.api.getCurrentProvider();
+    const loadedProviders = await window.api.getProviders(activeApp);
+    const currentId = await window.api.getCurrentProvider(activeApp);
    setProviders(loadedProviders);
    setCurrentProviderId(currentId);

-    // 如果供应商列表为空，尝试自动导入现有配置为"default"供应商
+    // 如果供应商列表为空，尝试自动从 live 导入一条默认供应商
    if (Object.keys(loadedProviders).length === 0) {
      await handleAutoImportDefault();
    }
  };

-  const loadConfigStatus = async () => {
-    const status = await window.api.getClaudeConfigStatus();
-    setConfigStatus({
-      exists: Boolean(status?.exists),
-      path: String(status?.path || ""),
-    });
-  };

  // 生成唯一ID
  const generateId = () => {
@@ -100,19 +125,24 @@ function App() {
    const newProvider: Provider = {
      ...provider,
      id: generateId(),
+      createdAt: Date.now(), // 添加创建时间戳
    };
-    await window.api.addProvider(newProvider);
+    await window.api.addProvider(newProvider, activeApp);
    await loadProviders();
    setIsAddModalOpen(false);
+    // 更新托盘菜单
+    await window.api.updateTrayMenu();
  };

  const handleEditProvider = async (provider: Provider) => {
    try {
-      await window.api.updateProvider(provider);
+      await window.api.updateProvider(provider, activeApp);
      await loadProviders();
      setEditingProviderId(null);
      // 显示编辑成功提示
      showNotification("供应商配置已保存", "success", 2000);
+      // 更新托盘菜单
+      await window.api.updateTrayMenu();
    } catch (error) {
      console.error("更新供应商失败:", error);
      setEditingProviderId(null);
@@ -127,41 +157,44 @@ function App() {
      title: "删除供应商",
      message: `确定要删除供应商 "${provider?.name}" 吗？此操作无法撤销。`,
      onConfirm: async () => {
-        await window.api.deleteProvider(id);
+        await window.api.deleteProvider(id, activeApp);
        await loadProviders();
        setConfirmDialog(null);
        showNotification("供应商删除成功", "success");
+        // 更新托盘菜单
+        await window.api.updateTrayMenu();
      },
    });
  };

  const handleSwitchProvider = async (id: string) => {
-    const success = await window.api.switchProvider(id);
+    const success = await window.api.switchProvider(id, activeApp);
    if (success) {
      setCurrentProviderId(id);
      // 显示重启提示
+      const appName = activeApp === "claude" ? "Claude Code" : "Codex";
      showNotification(
-        "切换成功！请重启 Claude Code 终端以生效",
+        `切换成功！请重启 ${appName} 终端以生效`,
        "success",
        2000,
      );
+      // 更新托盘菜单
+      await window.api.updateTrayMenu();
    } else {
      showNotification("切换失败，请检查配置", "error");
    }
  };

-  // 自动导入现有配置为"default"供应商
+  // 自动从 live 导入一条默认供应商（仅首次初始化时）
  const handleAutoImportDefault = async () => {
    try {
-      const result = await window.api.importCurrentConfigAsDefault();
+      const result = await window.api.importCurrentConfigAsDefault(activeApp);

      if (result.success) {
        await loadProviders();
-        showNotification(
-          "已自动导入现有配置为 default 供应商",
-          "success",
-          3000,
-        );
+        showNotification("已从现有配置创建默认供应商", "success", 3000);
+        // 更新托盘菜单
+        await window.api.updateTrayMenu();
      }
      // 如果导入失败（比如没有现有配置），静默处理，不显示错误
    } catch (error) {
@@ -170,31 +203,57 @@ function App() {
    }
  };

-  const handleOpenConfigFolder = async () => {
-    await window.api.openConfigFolder();
-  };

  return (
-    <div className="app">
-      <header className="app-header">
-        <h1>Claude Code 供应商切换器</h1>
-        <div className="header-actions">
-          <button className="add-btn" onClick={() => setIsAddModalOpen(true)}>
-            添加供应商
-          </button>
+    <div className="min-h-screen flex flex-col bg-gray-50 dark:bg-gray-950">
+      {/* Linear 风格的顶部导航 */}
+      <header className="bg-white border-b border-gray-200 dark:bg-gray-900 dark:border-gray-800 px-6 py-4">
+        <div className="flex items-center justify-between">
+          <div className="flex items-center gap-2">
+            <h1 className="text-xl font-semibold text-blue-500 dark:text-blue-400">
+              CC Switch
+            </h1>
+            <button
+              onClick={toggleDarkMode}
+              className={buttonStyles.icon}
+              title={isDarkMode ? "切换到亮色模式" : "切换到暗色模式"}
+            >
+              {isDarkMode ? <Sun size={18} /> : <Moon size={18} />}
+            </button>
+            <button
+              onClick={() => setIsSettingsOpen(true)}
+              className={buttonStyles.icon}
+              title="设置"
+            >
+              <Settings size={18} />
+            </button>
+          </div>
+
+          <div className="flex items-center gap-4">
+            <AppSwitcher activeApp={activeApp} onSwitch={setActiveApp} />
+
+            <button
+              onClick={() => setIsAddModalOpen(true)}
+              className={`inline-flex items-center gap-2 ${buttonStyles.primary}`}
+            >
+              <Plus size={16} />
+              添加供应商
+            </button>
+          </div>
        </div>
      </header>

-      <main className="app-main">
-        <div className="provider-section">
-          {/* 浮动通知组件 */}
+      {/* 主内容区域 */}
+      <main className="flex-1 p-6">
+        <div className="max-w-4xl mx-auto">
+          {/* 通知组件 */}
          {notification && (
            <div
-              className={`notification-floating ${
+              className={`fixed top-6 left-1/2 transform -translate-x-1/2 z-50 px-4 py-3 rounded-lg shadow-lg transition-all duration-300 ${
                notification.type === "error"
-                  ? "notification-error"
-                  : "notification-success"
-              } ${isNotificationVisible ? "fade-in" : "fade-out"}`}
+                  ? "bg-red-500 text-white"
+                  : "bg-green-500 text-white"
+              } ${isNotificationVisible ? "opacity-100 translate-y-0" : "opacity-0 -translate-y-2"}`}
            >
              {notification.message}
            </div>
@@ -207,27 +266,13 @@ function App() {
            onDelete={handleDeleteProvider}
            onEdit={setEditingProviderId}
          />
-        </div>

-        {configStatus && (
-          <div className="config-path">
-            <span>
-              配置文件位置: {configStatus.path}
-              {!configStatus.exists ? "（未创建，切换或保存时会自动创建）" : ""}
-            </span>
-            <button
-              className="browse-btn"
-              onClick={handleOpenConfigFolder}
-              title="打开配置文件夹"
-            >
-              打开
-            </button>
-          </div>
-        )}
+        </div>
      </main>

      {isAddModalOpen && (
        <AddProviderModal
+          appType={activeApp}
          onAdd={handleAddProvider}
          onClose={() => setIsAddModalOpen(false)}
        />
@@ -235,6 +280,7 @@ function App() {

      {editingProviderId && providers[editingProviderId] && (
        <EditProviderModal
+          appType={activeApp}
          provider={providers[editingProviderId]}
          onSave={handleEditProvider}
          onClose={() => setEditingProviderId(null)}
@@ -250,6 +296,10 @@ function App() {
          onCancel={() => setConfirmDialog(null)}
        />
      )}
+
+      {isSettingsOpen && (
+        <SettingsModal onClose={() => setIsSettingsOpen(false)} />
+      )}
    </div>
  );
 }
--- a/src/components/AddProviderModal.css
+++ b/src/components/AddProviderModal.css
@@ -1,268 +0,0 @@
-.modal-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.5);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 1000;
-}
-
-.modal-content {
-  background: white;
-  border-radius: 10px;
-  padding: 0;
-  width: 90%;
-  max-width: 640px;
-  max-height: 90vh;
-  overflow: hidden; /* 由 body 滚动，标题栏固定 */
-  box-shadow: 0 16px 40px rgba(0, 0, 0, 0.2);
-  position: relative;
-  z-index: 1001;
-  display: flex; /* 纵向布局，便于底栏固定 */
-  flex-direction: column;
-}
-
-/* 模拟窗口标题栏 */
-.modal-titlebar {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 3rem; /* 与主窗口标题栏一致 */
-  padding: 0 12px; /* 接近主头部的水平留白 */
-  background: #3498db; /* 与 .app-header 相同 */
-  color: #fff;
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-}
-
-/* 左侧占位以保证标题居中（与右侧关闭按钮宽度相当） */
-.modal-spacer {
-  width: 32px;
-  flex: 0 0 32px;
-}
-
-.modal-title {
-  flex: 1;
-  text-align: center;
-  color: #fff;
-  font-weight: 600;
-  font-size: 1rem;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.modal-close-btn {
-  background: transparent;
-  border: none;
-  color: #fff;
-  font-size: 20px;
-  line-height: 1;
-  padding: 2px 6px;
-  border-radius: 6px;
-  cursor: pointer;
-}
-
-.modal-close-btn:hover {
-  background: rgba(255, 255, 255, 0.18);
-  color: #fff;
-}
-
-.modal-form {
-  /* 表单外层包裹 body + footer */
-  display: flex;
-  flex-direction: column;
-  flex: 1 1 auto;
-  min-height: 0; /* 允许子元素正确计算高度 */
-}
-
-.modal-body {
-  padding: 1.25rem 1.5rem 1.5rem;
-  overflow: auto; /* 仅内容区滚动 */
-  flex: 1 1 auto;
-  min-height: 0;
-}
-
-.error-message {
-  background: #fee;
-  color: #c33;
-  padding: 0.75rem;
-  border-radius: 4px;
-  margin-bottom: 1rem;
-  border: 1px solid #fcc;
-  font-size: 0.9rem;
-}
-
-.presets {
-  margin-bottom: 1.5rem;
-  padding-bottom: 1.5rem;
-  border-bottom: 1px solid #ecf0f1;
-}
-
-.presets label {
-  display: block;
-  margin-bottom: 0.5rem;
-  color: #555;
-  font-size: 0.9rem;
-}
-
-.preset-buttons {
-  display: flex;
-  gap: 0.5rem;
-  flex-wrap: wrap;
-}
-
-.preset-btn {
-  padding: 0.375rem 0.75rem;
-  border: 1px solid #3498db;
-  background: white;
-  color: #3498db;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 0.85rem;
-  transition: all 0.2s;
-}
-
-.preset-btn:hover,
-.preset-btn.selected {
-  background: #3498db;
-  color: white;
-}
-
-/* 官方按钮橙色主题（Anthropic 风格） */
-.preset-btn.official {
-  border: 1px solid #d97706;
-  color: #d97706;
-}
-
-.preset-btn.official:hover,
-.preset-btn.official.selected {
-  background: #d97706;
-  color: white;
-}
-
-.form-group {
-  margin-bottom: 1.25rem;
-}
-
-.form-group label {
-  display: block;
-  margin-bottom: 0.5rem;
-  color: #555;
-  font-weight: 500;
-}
-
-/* API Key 输入框容器 - 预留空间避免抖动 */
-.form-group.api-key-group {
-  min-height: 88px; /* 固定高度：label + input + 间距 */
-  transition: opacity 0.2s ease;
-}
-
-.form-group.api-key-group.hidden {
-  opacity: 0;
-  visibility: hidden;
-  pointer-events: none;
-}
-
-.form-group input,
-.form-group textarea {
-  width: 100%;
-  padding: 0.625rem;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  font-size: 0.95rem;
-  transition: border-color 0.2s;
-  background: white;
-  box-sizing: border-box;
-}
-
-.form-group textarea {
-  resize: vertical;
-  min-height: 200px;
-}
-
-.form-group input:focus,
-.form-group textarea:focus {
-  outline: none;
-  border-color: #3498db;
-}
-
-.modal-footer {
-  /* 固定在弹窗底部（非滚动区） */
-  display: flex;
-  gap: 1rem;
-  justify-content: flex-end;
-  padding: 0.75rem 1.5rem;
-  border-top: 1px solid #ecf0f1;
-  background: #fff;
-}
-
-.cancel-btn,
-.submit-btn {
-  padding: 0.625rem 1.25rem;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 0.95rem;
-  transition: all 0.2s;
-}
-
-.cancel-btn {
-  background: #ecf0f1;
-  color: #555;
-}
-
-.cancel-btn:hover {
-  background: #bdc3c7;
-}
-
-.submit-btn {
-  background: #27ae60;
-  color: white;
-}
-
-.submit-btn:hover {
-  background: #229954;
-}
-
-.field-hint {
-  display: block;
-  margin-top: 0.25rem;
-  color: #7f8c8d;
-  font-size: 0.8rem;
-  line-height: 1.3;
-}
-
-/* 添加标签和选择框的样式 */
-.label-with-checkbox {
-  display: flex;
-  justify-content: space-between;
-  align-items: baseline;
-  margin-bottom: 0.5rem;
-}
-
-.label-with-checkbox label:first-child {
-  margin-bottom: 0;
-}
-
-.checkbox-label {
-  display: flex;
-  align-items: center;
-  gap: 0.3rem;
-  font-size: 0.85rem;
-  color: #666;
-  font-weight: normal;
-  margin-bottom: 0;
-  cursor: pointer;
-}
-
-.checkbox-label input[type="checkbox"] {
-  width: auto;
-  margin: 2px;
-  cursor: pointer;
-  transform: translateY(2px);
-}
--- a/src/components/AddProviderModal.tsx
+++ b/src/components/AddProviderModal.tsx
@@ -1,18 +1,22 @@
 import React from "react";
 import { Provider } from "../types";
+import { AppType } from "../lib/tauri-api";
 import ProviderForm from "./ProviderForm";

 interface AddProviderModalProps {
+  appType: AppType;
  onAdd: (provider: Omit<Provider, "id">) => void;
  onClose: () => void;
 }

 const AddProviderModal: React.FC<AddProviderModalProps> = ({
+  appType,
  onAdd,
  onClose,
 }) => {
  return (
    <ProviderForm
+      appType={appType}
      title="添加新供应商"
      submitText="添加"
      showPresets={true}
--- a/src/components/AppSwitcher.tsx
+++ b/src/components/AppSwitcher.tsx
@@ -0,0 +1,44 @@
+import { AppType } from "../lib/tauri-api";
+import { Terminal, Code2 } from "lucide-react";
+
+interface AppSwitcherProps {
+  activeApp: AppType;
+  onSwitch: (app: AppType) => void;
+}
+
+export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
+  const handleSwitch = (app: AppType) => {
+    if (app === activeApp) return;
+    onSwitch(app);
+  };
+
+  return (
+    <div className="inline-flex bg-gray-100 dark:bg-gray-800 rounded-lg p-1 gap-1 border border-transparent dark:border-gray-700">
+      <button
+        type="button"
+        onClick={() => handleSwitch("claude")}
+        className={`inline-flex items-center gap-2 px-3 py-2 rounded-md text-sm font-medium transition-all duration-200 ${
+          activeApp === "claude"
+            ? "bg-white text-gray-900 shadow-sm dark:bg-gray-900 dark:text-gray-100 dark:shadow-none"
+            : "text-gray-500 hover:text-gray-900 hover:bg-white/50 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800/60"
+        }`}
+      >
+        <Code2 size={16} />
+        <span>Claude Code</span>
+      </button>
+
+      <button
+        type="button"
+        onClick={() => handleSwitch("codex")}
+        className={`inline-flex items-center gap-2 px-3 py-2 rounded-md text-sm font-medium transition-all duration-200 ${
+          activeApp === "codex"
+            ? "bg-white text-gray-900 shadow-sm dark:bg-gray-900 dark:text-gray-100 dark:shadow-none"
+            : "text-gray-500 hover:text-gray-900 hover:bg-white/50 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800/60"
+        }`}
+      >
+        <Terminal size={16} />
+        <span>Codex</span>
+      </button>
+    </div>
+  );
+}
--- a/src/components/ConfirmDialog.css
+++ b/src/components/ConfirmDialog.css
@@ -1,107 +0,0 @@
-.confirm-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.5);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 1000;
-  backdrop-filter: blur(2px);
-}
-
-.confirm-dialog {
-  background: white;
-  border-radius: 8px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
-  min-width: 300px;
-  max-width: 400px;
-  animation: confirmSlideIn 0.2s ease-out;
-}
-
-@keyframes confirmSlideIn {
-  from {
-    opacity: 0;
-    transform: scale(0.9) translateY(-20px);
-  }
-  to {
-    opacity: 1;
-    transform: scale(1) translateY(0);
-  }
-}
-
-.confirm-header {
-  padding: 1.5rem 1.5rem 1rem;
-  border-bottom: 1px solid #eee;
-}
-
-.confirm-header h3 {
-  margin: 0;
-  font-size: 1.1rem;
-  color: #333;
-  font-weight: 600;
-}
-
-.confirm-content {
-  padding: 1rem 1.5rem;
-}
-
-.confirm-content p {
-  margin: 0;
-  color: #666;
-  line-height: 1.5;
-}
-
-.confirm-actions {
-  display: flex;
-  gap: 0.75rem;
-  padding: 1rem 1.5rem 1.5rem;
-  justify-content: flex-end;
-}
-
-.confirm-btn {
-  padding: 0.5rem 1rem;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 0.9rem;
-  font-weight: 500;
-  transition:
-    background-color 0.2s,
-    transform 0.1s;
-  min-width: 70px;
-}
-
-.confirm-btn:hover {
-  transform: translateY(-1px);
-}
-
-.confirm-btn:active {
-  transform: translateY(0);
-}
-
-.cancel-btn {
-  background: #f8f9fa;
-  color: #6c757d;
-  border: 1px solid #dee2e6;
-}
-
-.cancel-btn:hover {
-  background: #e9ecef;
-}
-
-.confirm-btn-primary {
-  background: #dc3545;
-  color: white;
-}
-
-.confirm-btn-primary:hover {
-  background: #c82333;
-}
-
-.confirm-btn:focus {
-  outline: 2px solid #007bff;
-  outline-offset: 2px;
-}
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import "./ConfirmDialog.css";
+import { AlertTriangle, X } from "lucide-react";

 interface ConfirmDialogProps {
  isOpen: boolean;
@@ -23,25 +23,52 @@ export const ConfirmDialog: React.FC<ConfirmDialogProps> = ({
  if (!isOpen) return null;

  return (
-    <div className="confirm-overlay">
-      <div className="confirm-dialog">
-        <div className="confirm-header">
-          <h3>{title}</h3>
-        </div>
-        <div className="confirm-content">
-          <p>{message}</p>
-        </div>
-        <div className="confirm-actions">
+    <div className="fixed inset-0 z-50 flex items-center justify-center">
+      {/* Backdrop */}
+      <div
+        className="absolute inset-0 bg-black/50 backdrop-blur-sm"
+        onClick={onCancel}
+      />
+
+      {/* Dialog */}
+      <div className="relative bg-white dark:bg-gray-900 rounded-xl shadow-lg max-w-md w-full mx-4 overflow-hidden">
+        {/* Header */}
+        <div className="flex items-center justify-between p-6 border-b border-gray-200 dark:border-gray-800">
+          <div className="flex items-center gap-3">
+            <div className="w-10 h-10 bg-red-100 dark:bg-red-500/10 rounded-full flex items-center justify-center">
+              <AlertTriangle size={20} className="text-red-500" />
+            </div>
+            <h3 className="text-lg font-semibold text-gray-900 dark:text-gray-100">
+              {title}
+            </h3>
+          </div>
          <button
-            className="confirm-btn cancel-btn"
            onClick={onCancel}
+            className="p-1 text-gray-500 hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800 rounded-md transition-colors"
+          >
+            <X size={18} />
+          </button>
+        </div>
+
+        {/* Content */}
+        <div className="p-6">
+          <p className="text-gray-500 dark:text-gray-400 leading-relaxed">
+            {message}
+          </p>
+        </div>
+
+        {/* Actions */}
+        <div className="flex items-center justify-end gap-3 p-6 border-t border-gray-200 dark:border-gray-800 bg-gray-100 dark:bg-gray-900">
+          <button
+            onClick={onCancel}
+            className="px-4 py-2 text-sm font-medium text-gray-500 hover:text-gray-900 hover:bg-white dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800 rounded-md transition-colors"
            autoFocus
          >
            {cancelText}
          </button>
          <button
-            className="confirm-btn confirm-btn-primary"
            onClick={onConfirm}
+            className="px-4 py-2 text-sm font-medium bg-red-500 text-white hover:bg-red-500/90 rounded-md transition-colors"
          >
            {confirmText}
          </button>
--- a/src/components/EditProviderModal.tsx
+++ b/src/components/EditProviderModal.tsx
@@ -1,14 +1,17 @@
 import React from "react";
 import { Provider } from "../types";
+import { AppType } from "../lib/tauri-api";
 import ProviderForm from "./ProviderForm";

 interface EditProviderModalProps {
+  appType: AppType;
  provider: Provider;
  onSave: (provider: Provider) => void;
  onClose: () => void;
 }

 const EditProviderModal: React.FC<EditProviderModalProps> = ({
+  appType,
  provider,
  onSave,
  onClose,
@@ -22,6 +25,7 @@ const EditProviderModal: React.FC<EditProviderModalProps> = ({

  return (
    <ProviderForm
+      appType={appType}
      title="编辑供应商"
      submitText="保存"
      initialData={provider}
--- a/src/components/JsonEditor.tsx
+++ b/src/components/JsonEditor.tsx
@@ -0,0 +1,97 @@
+import React, { useRef, useEffect } from "react";
+import { EditorView, basicSetup } from "codemirror";
+import { json } from "@codemirror/lang-json";
+import { oneDark } from "@codemirror/theme-one-dark";
+import { EditorState } from "@codemirror/state";
+import { placeholder } from "@codemirror/view";
+
+interface JsonEditorProps {
+  value: string;
+  onChange: (value: string) => void;
+  placeholder?: string;
+  darkMode?: boolean;
+  rows?: number;
+}
+
+const JsonEditor: React.FC<JsonEditorProps> = ({
+  value,
+  onChange,
+  placeholder: placeholderText = "",
+  darkMode = false,
+  rows = 12,
+}) => {
+  const editorRef = useRef<HTMLDivElement>(null);
+  const viewRef = useRef<EditorView | null>(null);
+
+  useEffect(() => {
+    if (!editorRef.current) return;
+
+    // 创建编辑器扩展
+    const minHeightPx = Math.max(1, rows) * 18; // 降低最小高度以减少抖动
+    const sizingTheme = EditorView.theme({
+      "&": { minHeight: `${minHeightPx}px` },
+      ".cm-scroller": { overflow: "auto" },
+      ".cm-content": {
+        fontFamily:
+          "ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace",
+        fontSize: "14px",
+      },
+    });
+
+    const extensions = [
+      basicSetup,
+      json(),
+      placeholder(placeholderText || ""),
+      sizingTheme,
+      EditorView.updateListener.of((update) => {
+        if (update.docChanged) {
+          const newValue = update.state.doc.toString();
+          onChange(newValue);
+        }
+      }),
+    ];
+
+    // 如果启用深色模式，添加深色主题
+    if (darkMode) {
+      extensions.push(oneDark);
+    }
+
+    // 创建初始状态
+    const state = EditorState.create({
+      doc: value,
+      extensions,
+    });
+
+    // 创建编辑器视图
+    const view = new EditorView({
+      state,
+      parent: editorRef.current,
+    });
+
+    viewRef.current = view;
+
+    // 清理函数
+    return () => {
+      view.destroy();
+      viewRef.current = null;
+    };
+  }, [darkMode, rows]); // 依赖项中不包含 onChange 和 placeholder，避免不必要的重建
+
+  // 当 value 从外部改变时更新编辑器内容
+  useEffect(() => {
+    if (viewRef.current && viewRef.current.state.doc.toString() !== value) {
+      const transaction = viewRef.current.state.update({
+        changes: {
+          from: 0,
+          to: viewRef.current.state.doc.length,
+          insert: value,
+        },
+      });
+      viewRef.current.dispatch(transaction);
+    }
+  }, [value]);
+
+  return <div ref={editorRef} style={{ width: "100%" }} />;
+};
+
+export default JsonEditor;
--- a/src/components/ProviderForm.tsx
+++ b/src/components/ProviderForm.tsx
@@ -1,17 +1,24 @@
 import React, { useState, useEffect } from "react";
 import { Provider } from "../types";
+import { AppType } from "../lib/tauri-api";
 import {
  updateCoAuthoredSetting,
  checkCoAuthoredSetting,
-  extractWebsiteUrl,
  getApiKeyFromConfig,
  hasApiKeyField,
  setApiKeyInConfig,
 } from "../utils/providerConfigUtils";
 import { providerPresets } from "../config/providerPresets";
-import "./AddProviderModal.css";
+import { codexProviderPresets } from "../config/codexProviderPresets";
+import PresetSelector from "./ProviderForm/PresetSelector";
+import ApiKeyInput from "./ProviderForm/ApiKeyInput";
+import ClaudeConfigEditor from "./ProviderForm/ClaudeConfigEditor";
+import CodexConfigEditor from "./ProviderForm/CodexConfigEditor";
+import KimiModelSelector from "./ProviderForm/KimiModelSelector";
+import { X, AlertCircle, Save } from "lucide-react";

 interface ProviderFormProps {
+  appType?: AppType;
  title: string;
  submitText: string;
  initialData?: Provider;
@@ -21,6 +28,7 @@ interface ProviderFormProps {
 }

 const ProviderForm: React.FC<ProviderFormProps> = ({
+  appType = "claude",
  title,
  submitText,
  initialData,
@@ -28,6 +36,9 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
  onSubmit,
  onClose,
 }) => {
+  // 对于 Codex，需要分离 auth 和 config
+  const isCodex = appType === "codex";
+
  const [formData, setFormData] = useState({
    name: initialData?.name || "",
    websiteUrl: initialData?.websiteUrl || "",
@@ -35,17 +46,70 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
      ? JSON.stringify(initialData.settingsConfig, null, 2)
      : "",
  });
+
+  // Codex 特有的状态
+  const [codexAuth, setCodexAuth] = useState("");
+  const [codexConfig, setCodexConfig] = useState("");
+  const [codexApiKey, setCodexApiKey] = useState("");
+  // -1 表示自定义，null 表示未选择，>= 0 表示预设索引
+  const [selectedCodexPreset, setSelectedCodexPreset] = useState<number | null>(
+    showPresets && isCodex ? -1 : null,
+  );
+
+  // 初始化 Codex 配置
+  useEffect(() => {
+    if (isCodex && initialData) {
+      const config = initialData.settingsConfig;
+      if (typeof config === "object" && config !== null) {
+        setCodexAuth(JSON.stringify(config.auth || {}, null, 2));
+        setCodexConfig(config.config || "");
+        try {
+          const auth = config.auth || {};
+          if (auth && typeof auth.OPENAI_API_KEY === "string") {
+            setCodexApiKey(auth.OPENAI_API_KEY);
+          }
+        } catch {
+          // ignore
+        }
+      }
+    }
+  }, [isCodex, initialData]);
+
  const [error, setError] = useState("");
  const [disableCoAuthored, setDisableCoAuthored] = useState(false);
-  const [selectedPreset, setSelectedPreset] = useState<number | null>(null);
+  // -1 表示自定义，null 表示未选择，>= 0 表示预设索引
+  const [selectedPreset, setSelectedPreset] = useState<number | null>(
+    showPresets ? -1 : null,
+  );
  const [apiKey, setApiKey] = useState("");

+  // Kimi 模型选择状态
+  const [kimiAnthropicModel, setKimiAnthropicModel] = useState("");
+  const [kimiAnthropicSmallFastModel, setKimiAnthropicSmallFastModel] =
+    useState("");
+
  // 初始化时检查禁用签名状态
  useEffect(() => {
    if (initialData) {
      const configString = JSON.stringify(initialData.settingsConfig, null, 2);
      const hasCoAuthoredDisabled = checkCoAuthoredSetting(configString);
      setDisableCoAuthored(hasCoAuthoredDisabled);
+
+      // 初始化 Kimi 模型选择（编辑模式）
+      if (
+        initialData.settingsConfig &&
+        typeof initialData.settingsConfig === "object"
+      ) {
+        const config = initialData.settingsConfig as {
+          env?: Record<string, any>;
+        };
+        if (config.env) {
+          setKimiAnthropicModel(config.env.ANTHROPIC_MODEL || "");
+          setKimiAnthropicSmallFastModel(
+            config.env.ANTHROPIC_SMALL_FAST_MODEL || "",
+          );
+        }
+      }
    }
  }, [initialData]);

@@ -58,18 +122,55 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
      return;
    }

-    if (!formData.settingsConfig.trim()) {
-      setError("请填写配置内容");
-      return;
-    }
-
    let settingsConfig: Record<string, any>;

-    try {
-      settingsConfig = JSON.parse(formData.settingsConfig);
-    } catch (err) {
-      setError("配置JSON格式错误，请检查语法");
-      return;
+    if (isCodex) {
+      // Codex: 仅要求 auth.json 必填；config.toml 可为空
+      if (!codexAuth.trim()) {
+        setError("请填写 auth.json 配置");
+        return;
+      }
+
+      try {
+        const authJson = JSON.parse(codexAuth);
+
+        // 非官方预设强制要求 OPENAI_API_KEY
+        if (selectedCodexPreset !== null) {
+          const preset = codexProviderPresets[selectedCodexPreset];
+          const isOfficial = Boolean(preset?.isOfficial);
+          if (!isOfficial) {
+            const key =
+              typeof authJson.OPENAI_API_KEY === "string"
+                ? authJson.OPENAI_API_KEY.trim()
+                : "";
+            if (!key) {
+              setError("请填写 OPENAI_API_KEY");
+              return;
+            }
+          }
+        }
+
+        settingsConfig = {
+          auth: authJson,
+          config: codexConfig ?? "",
+        };
+      } catch (err) {
+        setError("auth.json 格式错误，请检查JSON语法");
+        return;
+      }
+    } else {
+      // Claude: 原有逻辑
+      if (!formData.settingsConfig.trim()) {
+        setError("请填写配置内容");
+        return;
+      }
+
+      try {
+        settingsConfig = JSON.parse(formData.settingsConfig);
+      } catch (err) {
+        setError("配置JSON格式错误，请检查语法");
+        return;
+      }
    }

    onSubmit({
@@ -85,9 +186,6 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
    const { name, value } = e.target;

    if (name === "settingsConfig") {
-      // 当用户修改配置时，尝试自动提取官网地址
-      const extractedWebsiteUrl = extractWebsiteUrl(value);
-
      // 同时检查并同步选择框状态
      const hasCoAuthoredDisabled = checkCoAuthoredSetting(value);
      setDisableCoAuthored(hasCoAuthoredDisabled);
@@ -96,12 +194,11 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
      const parsedKey = getApiKeyFromConfig(value);
      setApiKey(parsedKey);

-      setFormData({
-        ...formData,
+      // 不再从 JSON 自动提取或覆盖官网地址，只更新配置内容
+      setFormData((prev) => ({
+        ...prev,
        [name]: value,
-        // 只有在官网地址为空时才自动填入
-        websiteUrl: formData.websiteUrl || extractedWebsiteUrl,
-      });
+      }));
    } else {
      setFormData({
        ...formData,
@@ -143,6 +240,72 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
    // 同步选择框状态
    const hasCoAuthoredDisabled = checkCoAuthoredSetting(configString);
    setDisableCoAuthored(hasCoAuthoredDisabled);
+
+    // 如果是 Kimi 预设，初始化模型选择
+    if (
+      preset.name?.includes("Kimi") &&
+      preset.settingsConfig &&
+      typeof preset.settingsConfig === "object"
+    ) {
+      const config = preset.settingsConfig as { env?: Record<string, any> };
+      if (config.env) {
+        setKimiAnthropicModel(config.env.ANTHROPIC_MODEL || "");
+        setKimiAnthropicSmallFastModel(
+          config.env.ANTHROPIC_SMALL_FAST_MODEL || "",
+        );
+      }
+    } else {
+      setKimiAnthropicModel("");
+      setKimiAnthropicSmallFastModel("");
+    }
+  };
+
+  // 处理点击自定义按钮
+  const handleCustomClick = () => {
+    setSelectedPreset(-1);
+    setFormData({
+      name: "",
+      websiteUrl: "",
+      settingsConfig: "",
+    });
+    setApiKey("");
+    setDisableCoAuthored(false);
+    setKimiAnthropicModel("");
+    setKimiAnthropicSmallFastModel("");
+  };
+
+  // Codex: 应用预设
+  const applyCodexPreset = (
+    preset: (typeof codexProviderPresets)[0],
+    index: number,
+  ) => {
+    const authString = JSON.stringify(preset.auth || {}, null, 2);
+    setCodexAuth(authString);
+    setCodexConfig(preset.config || "");
+
+    setFormData((prev) => ({
+      ...prev,
+      name: preset.name,
+      websiteUrl: preset.websiteUrl,
+    }));
+
+    setSelectedCodexPreset(index);
+
+    // 清空 API Key，让用户重新输入
+    setCodexApiKey("");
+  };
+
+  // Codex: 处理点击自定义按钮
+  const handleCodexCustomClick = () => {
+    setSelectedCodexPreset(-1);
+    setFormData({
+      name: "",
+      websiteUrl: "",
+      settingsConfig: "",
+    });
+    setCodexAuth("");
+    setCodexConfig("");
+    setCodexApiKey("");
  };

  // 处理 API Key 输入并自动更新配置
@@ -152,7 +315,7 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
    const configString = setApiKeyInConfig(
      formData.settingsConfig,
      key.trim(),
-      { createIfMissing: selectedPreset !== null },
+      { createIfMissing: selectedPreset !== null && selectedPreset !== -1 },
    );

    // 更新表单配置
@@ -166,15 +329,94 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
    setDisableCoAuthored(hasCoAuthoredDisabled);
  };

+  // Codex: 处理 API Key 输入并写回 auth.json
+  const handleCodexApiKeyChange = (key: string) => {
+    setCodexApiKey(key);
+    try {
+      const auth = JSON.parse(codexAuth || "{}");
+      auth.OPENAI_API_KEY = key.trim();
+      setCodexAuth(JSON.stringify(auth, null, 2));
+    } catch {
+      // ignore
+    }
+  };
+
  // 根据当前配置决定是否展示 API Key 输入框
+  // 自定义模式(-1)不显示独立的 API Key 输入框
  const showApiKey =
-    selectedPreset !== null || hasApiKeyField(formData.settingsConfig);
+    (selectedPreset !== null && selectedPreset !== -1) ||
+    (!showPresets && hasApiKeyField(formData.settingsConfig));

  // 判断当前选中的预设是否是官方
  const isOfficialPreset =
    selectedPreset !== null &&
+    selectedPreset >= 0 &&
    providerPresets[selectedPreset]?.isOfficial === true;

+  // 判断当前选中的预设是否是 Kimi
+  const isKimiPreset =
+    selectedPreset !== null &&
+    selectedPreset >= 0 &&
+    providerPresets[selectedPreset]?.name?.includes("Kimi");
+
+  // 判断当前编辑的是否是 Kimi 提供商（通过名称或配置判断）
+  const isEditingKimi =
+    initialData &&
+    (formData.name.includes("Kimi") ||
+      formData.name.includes("kimi") ||
+      (formData.settingsConfig.includes("api.moonshot.cn") &&
+        formData.settingsConfig.includes("ANTHROPIC_MODEL")));
+
+  // 综合判断是否应该显示 Kimi 模型选择器
+  const shouldShowKimiSelector = isKimiPreset || isEditingKimi;
+
+  // Codex: 控制显示 API Key 与官方标记
+  const getCodexAuthApiKey = (authString: string): string => {
+    try {
+      const auth = JSON.parse(authString || "{}");
+      return typeof auth.OPENAI_API_KEY === "string" ? auth.OPENAI_API_KEY : "";
+    } catch {
+      return "";
+    }
+  };
+
+  // 自定义模式(-1)不显示独立的 API Key 输入框
+  const showCodexApiKey =
+    (selectedCodexPreset !== null && selectedCodexPreset !== -1) ||
+    (!showPresets && getCodexAuthApiKey(codexAuth) !== "");
+
+  const isCodexOfficialPreset =
+    selectedCodexPreset !== null &&
+    selectedCodexPreset >= 0 &&
+    codexProviderPresets[selectedCodexPreset]?.isOfficial === true;
+
+  // Kimi 模型选择处理函数
+  const handleKimiModelChange = (
+    field: "ANTHROPIC_MODEL" | "ANTHROPIC_SMALL_FAST_MODEL",
+    value: string,
+  ) => {
+    if (field === "ANTHROPIC_MODEL") {
+      setKimiAnthropicModel(value);
+    } else {
+      setKimiAnthropicSmallFastModel(value);
+    }
+
+    // 更新配置 JSON
+    try {
+      const currentConfig = JSON.parse(formData.settingsConfig || "{}");
+      if (!currentConfig.env) currentConfig.env = {};
+      currentConfig.env[field] = value;
+
+      const updatedConfigString = JSON.stringify(currentConfig, null, 2);
+      setFormData((prev) => ({
+        ...prev,
+        settingsConfig: updatedConfigString,
+      }));
+    } catch (err) {
+      console.error("更新 Kimi 模型配置失败:", err);
+    }
+  };
+
  // 初始时从配置中同步 API Key（编辑模式）
  useEffect(() => {
    if (initialData) {
@@ -200,56 +442,74 @@ const ProviderForm: React.FC<ProviderFormProps> = ({

  return (
    <div
-      className="modal-overlay"
+      className="fixed inset-0 z-50 flex items-center justify-center"
      onMouseDown={(e) => {
        if (e.target === e.currentTarget) onClose();
      }}
    >
-      <div className="modal-content">
-        <div className="modal-titlebar">
-          <div className="modal-spacer" />
-          <div className="modal-title" title={title}>
+      {/* Backdrop */}
+      <div className="absolute inset-0 bg-black/50 backdrop-blur-sm" />
+
+      {/* Modal */}
+      <div className="relative bg-white rounded-xl shadow-lg max-w-3xl w-full mx-4 max-h-[90vh] overflow-hidden flex flex-col">
+        {/* Header */}
+        <div className="flex items-center justify-between p-6 border-b border-gray-200">
+          <h2 className="text-xl font-semibold text-gray-900">
            {title}
-          </div>
+          </h2>
          <button
            type="button"
-            className="modal-close-btn"
-            aria-label="关闭"
            onClick={onClose}
-            title="关闭"
+            className="p-1 text-gray-500 hover:text-gray-900 hover:bg-gray-100 rounded-md transition-colors"
+            aria-label="关闭"
          >
-            ×
+            <X size={18} />
          </button>
        </div>

-        <form onSubmit={handleSubmit} className="modal-form">
-          <div className="modal-body">
-            {error && <div className="error-message">{error}</div>}
-
-            {showPresets && (
-              <div className="presets">
-                <label>一键导入（只需要填写 key）</label>
-                <div className="preset-buttons">
-                  {providerPresets.map((preset, index) => {
-                    return (
-                      <button
-                        key={index}
-                        type="button"
-                        className={`preset-btn ${
-                          selectedPreset === index ? "selected" : ""
-                        } ${preset.isOfficial ? "official" : ""}`}
-                        onClick={() => applyPreset(preset, index)}
-                      >
-                        {preset.name}
-                      </button>
-                    );
-                  })}
-                </div>
+        <form onSubmit={handleSubmit} className="flex flex-col flex-1 min-h-0">
+          <div className="flex-1 overflow-auto p-6 space-y-6">
+            {error && (
+              <div className="flex items-center gap-3 p-4 bg-red-100 border border-red-500/20 rounded-lg">
+                <AlertCircle
+                  size={20}
+                  className="text-red-500 flex-shrink-0"
+                />
+                <p className="text-red-500 text-sm font-medium">
+                  {error}
+                </p>
              </div>
            )}

-            <div className="form-group">
-              <label htmlFor="name">供应商名称 *</label>
+            {showPresets && !isCodex && (
+              <PresetSelector
+                presets={providerPresets}
+                selectedIndex={selectedPreset}
+                onSelectPreset={(index) =>
+                  applyPreset(providerPresets[index], index)
+                }
+                onCustomClick={handleCustomClick}
+              />
+            )}
+
+            {showPresets && isCodex && (
+              <PresetSelector
+                presets={codexProviderPresets}
+                selectedIndex={selectedCodexPreset}
+                onSelectPreset={(index) =>
+                  applyCodexPreset(codexProviderPresets[index], index)
+                }
+                onCustomClick={handleCodexCustomClick}
+              />
+            )}
+
+            <div className="space-y-2">
+              <label
+                htmlFor="name"
+                className="block text-sm font-medium text-gray-900"
+              >
+                供应商名称 *
+              </label>
              <input
                type="text"
                id="name"
@@ -259,39 +519,62 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
                placeholder="例如：Anthropic 官方"
                required
                autoComplete="off"
+                className="w-full px-3 py-2 border border-gray-200 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-500 transition-colors"
              />
            </div>

-            <div
-              className={`form-group api-key-group ${!showApiKey ? "hidden" : ""}`}
-            >
-              <label htmlFor="apiKey">API Key *</label>
-              <input
-                type="text"
-                id="apiKey"
+            {!isCodex && showApiKey && (
+              <ApiKeyInput
                value={apiKey}
-                onChange={(e) => handleApiKeyChange(e.target.value)}
+                onChange={handleApiKeyChange}
                placeholder={
                  isOfficialPreset
                    ? "官方登录无需填写 API Key，直接保存即可"
-                    : "只需要填这里，下方配置会自动填充"
+                    : shouldShowKimiSelector
+                      ? "sk-xxx-api-key-here (填写后可获取模型列表)"
+                      : "只需要填这里，下方配置会自动填充"
                }
                disabled={isOfficialPreset}
-                autoComplete="off"
-                style={
-                  isOfficialPreset
-                    ? {
-                        backgroundColor: "#f5f5f5",
-                        cursor: "not-allowed",
-                        color: "#999",
-                      }
-                    : {}
+              />
+            )}
+
+            {!isCodex && shouldShowKimiSelector && apiKey.trim() && (
+              <KimiModelSelector
+                apiKey={apiKey}
+                anthropicModel={kimiAnthropicModel}
+                anthropicSmallFastModel={kimiAnthropicSmallFastModel}
+                onModelChange={handleKimiModelChange}
+                disabled={isOfficialPreset}
+              />
+            )}
+
+            {isCodex && showCodexApiKey && (
+              <ApiKeyInput
+                id="codexApiKey"
+                label="API Key"
+                value={codexApiKey}
+                onChange={handleCodexApiKeyChange}
+                placeholder={
+                  isCodexOfficialPreset
+                    ? "官方无需填写 API Key，直接保存即可"
+                    : "只需要填这里，下方 auth.json 会自动填充"
+                }
+                disabled={isCodexOfficialPreset}
+                required={
+                  selectedCodexPreset !== null &&
+                  selectedCodexPreset >= 0 &&
+                  !isCodexOfficialPreset
                }
              />
-            </div>
+            )}

-            <div className="form-group">
-              <label htmlFor="websiteUrl">官网地址</label>
+            <div className="space-y-2">
+              <label
+                htmlFor="websiteUrl"
+                className="block text-sm font-medium text-gray-900"
+              >
+                官网地址
+              </label>
              <input
                type="url"
                id="websiteUrl"
@@ -300,49 +583,58 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
                onChange={handleChange}
                placeholder="https://example.com（可选）"
                autoComplete="off"
+                className="w-full px-3 py-2 border border-gray-200 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-500 transition-colors"
              />
            </div>

-            <div className="form-group">
-              <div className="label-with-checkbox">
-                <label htmlFor="settingsConfig">
-                  Claude Code 配置 (JSON) *
-                </label>
-                <label className="checkbox-label">
-                  <input
-                    type="checkbox"
-                    checked={disableCoAuthored}
-                    onChange={(e) => handleCoAuthoredToggle(e.target.checked)}
-                  />
-                  禁止 Claude Code 签名
-                </label>
-              </div>
-              <textarea
-                id="settingsConfig"
-                name="settingsConfig"
-                value={formData.settingsConfig}
-                onChange={handleChange}
-                placeholder={`{
-  "env": {
-    "ANTHROPIC_BASE_URL": "https://api.anthropic.com",
-    "ANTHROPIC_AUTH_TOKEN": "sk-your-api-key-here"
-  }
-}`}
-                rows={12}
-                style={{ fontFamily: "monospace", fontSize: "14px" }}
-                required
+            {/* Claude 或 Codex 的配置部分 */}
+            {isCodex ? (
+              <CodexConfigEditor
+                authValue={codexAuth}
+                configValue={codexConfig}
+                onAuthChange={setCodexAuth}
+                onConfigChange={setCodexConfig}
+                onAuthBlur={() => {
+                  try {
+                    const auth = JSON.parse(codexAuth || "{}");
+                    const key =
+                      typeof auth.OPENAI_API_KEY === "string"
+                        ? auth.OPENAI_API_KEY
+                        : "";
+                    setCodexApiKey(key);
+                  } catch {
+                    // ignore
+                  }
+                }}
              />
-              <small className="field-hint">
-                完整的 Claude Code settings.json 配置内容
-              </small>
-            </div>
+            ) : (
+              <ClaudeConfigEditor
+                value={formData.settingsConfig}
+                onChange={(value) =>
+                  handleChange({
+                    target: { name: "settingsConfig", value },
+                  } as React.ChangeEvent<HTMLTextAreaElement>)
+                }
+                disableCoAuthored={disableCoAuthored}
+                onCoAuthoredToggle={handleCoAuthoredToggle}
+              />
+            )}
          </div>

-          <div className="modal-footer">
-            <button type="button" className="cancel-btn" onClick={onClose}>
+          {/* Footer */}
+          <div className="flex items-center justify-end gap-3 p-6 border-t border-gray-200 bg-gray-100">
+            <button
+              type="button"
+              onClick={onClose}
+              className="px-4 py-2 text-sm font-medium text-gray-500 hover:text-gray-900 hover:bg-white rounded-lg transition-colors"
+            >
              取消
            </button>
-            <button type="submit" className="submit-btn">
+            <button
+              type="submit"
+              className="inline-flex items-center gap-2 px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600 transition-colors text-sm font-medium"
+            >
+              <Save size={16} />
              {submitText}
            </button>
          </div>
--- a/src/components/ProviderForm/ApiKeyInput.tsx
+++ b/src/components/ProviderForm/ApiKeyInput.tsx
@@ -0,0 +1,70 @@
+import React, { useState } from "react";
+import { Eye, EyeOff } from "lucide-react";
+
+interface ApiKeyInputProps {
+  value: string;
+  onChange: (value: string) => void;
+  placeholder?: string;
+  disabled?: boolean;
+  required?: boolean;
+  label?: string;
+  id?: string;
+}
+
+const ApiKeyInput: React.FC<ApiKeyInputProps> = ({
+  value,
+  onChange,
+  placeholder = "请输入API Key",
+  disabled = false,
+  required = false,
+  label = "API Key",
+  id = "apiKey",
+}) => {
+  const [showKey, setShowKey] = useState(false);
+
+  const toggleShowKey = () => {
+    setShowKey(!showKey);
+  };
+
+  const inputClass = `w-full px-3 py-2 pr-10 border rounded-lg text-sm transition-colors ${
+    disabled
+      ? "bg-gray-100 border-gray-200 text-gray-400 cursor-not-allowed"
+      : "border-gray-200 focus:outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-500"
+  }`;
+
+  return (
+    <div className="space-y-2">
+      <label
+        htmlFor={id}
+        className="block text-sm font-medium text-gray-900"
+      >
+        {label} {required && "*"}
+      </label>
+      <div className="relative">
+        <input
+          type={showKey ? "text" : "password"}
+          id={id}
+          value={value}
+          onChange={(e) => onChange(e.target.value)}
+          placeholder={placeholder}
+          disabled={disabled}
+          required={required}
+          autoComplete="off"
+          className={inputClass}
+        />
+        {!disabled && value && (
+          <button
+            type="button"
+            onClick={toggleShowKey}
+            className="absolute inset-y-0 right-0 flex items-center pr-3 text-gray-500 hover:text-gray-900 transition-colors"
+            aria-label={showKey ? "隐藏API Key" : "显示API Key"}
+          >
+            {showKey ? <EyeOff size={16} /> : <Eye size={16} />}
+          </button>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default ApiKeyInput;
--- a/src/components/ProviderForm/ClaudeConfigEditor.tsx
+++ b/src/components/ProviderForm/ClaudeConfigEditor.tsx
@@ -0,0 +1,54 @@
+import React from "react";
+import JsonEditor from "../JsonEditor";
+
+interface ClaudeConfigEditorProps {
+  value: string;
+  onChange: (value: string) => void;
+  disableCoAuthored: boolean;
+  onCoAuthoredToggle: (checked: boolean) => void;
+}
+
+const ClaudeConfigEditor: React.FC<ClaudeConfigEditorProps> = ({
+  value,
+  onChange,
+  disableCoAuthored,
+  onCoAuthoredToggle,
+}) => {
+  return (
+    <div className="space-y-2">
+      <div className="flex items-center justify-between">
+        <label
+          htmlFor="settingsConfig"
+          className="block text-sm font-medium text-gray-900"
+        >
+          Claude Code 配置 (JSON) *
+        </label>
+        <label className="inline-flex items-center gap-2 text-sm text-gray-500 cursor-pointer">
+          <input
+            type="checkbox"
+            checked={disableCoAuthored}
+            onChange={(e) => onCoAuthoredToggle(e.target.checked)}
+            className="w-4 h-4 text-blue-500 bg-white border-gray-200 rounded focus:ring-blue-500 focus:ring-2"
+          />
+          禁止 Claude Code 签名
+        </label>
+      </div>
+      <JsonEditor
+        value={value}
+        onChange={onChange}
+        placeholder={`{
+  "env": {
+    "ANTHROPIC_BASE_URL": "https://api.anthropic.com",
+    "ANTHROPIC_AUTH_TOKEN": "sk-your-api-key-here"
+  }
+}`}
+        rows={12}
+      />
+      <p className="text-xs text-gray-500">
+        完整的 Claude Code settings.json 配置内容
+      </p>
+    </div>
+  );
+};
+
+export default ClaudeConfigEditor;
--- a/src/components/ProviderForm/CodexConfigEditor.tsx
+++ b/src/components/ProviderForm/CodexConfigEditor.tsx
@@ -0,0 +1,67 @@
+import React from "react";
+
+interface CodexConfigEditorProps {
+  authValue: string;
+  configValue: string;
+  onAuthChange: (value: string) => void;
+  onConfigChange: (value: string) => void;
+  onAuthBlur?: () => void;
+}
+
+const CodexConfigEditor: React.FC<CodexConfigEditorProps> = ({
+  authValue,
+  configValue,
+  onAuthChange,
+  onConfigChange,
+  onAuthBlur,
+}) => {
+  return (
+    <div className="space-y-6">
+      <div className="space-y-2">
+        <label
+          htmlFor="codexAuth"
+          className="block text-sm font-medium text-gray-900"
+        >
+          auth.json (JSON) *
+        </label>
+        <textarea
+          id="codexAuth"
+          value={authValue}
+          onChange={(e) => onAuthChange(e.target.value)}
+          onBlur={onAuthBlur}
+          placeholder={`{
+  "OPENAI_API_KEY": "sk-your-api-key-here"
+}`}
+          rows={6}
+          required
+          className="w-full px-3 py-2 border border-gray-200 rounded-lg text-sm font-mono focus:outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-500 transition-colors resize-y min-h-[8rem]"
+        />
+        <p className="text-xs text-gray-500">
+          Codex auth.json 配置内容
+        </p>
+      </div>
+
+      <div className="space-y-2">
+        <label
+          htmlFor="codexConfig"
+          className="block text-sm font-medium text-gray-900"
+        >
+          config.toml (TOML)
+        </label>
+        <textarea
+          id="codexConfig"
+          value={configValue}
+          onChange={(e) => onConfigChange(e.target.value)}
+          placeholder=""
+          rows={8}
+          className="w-full px-3 py-2 border border-gray-200 rounded-lg text-sm font-mono focus:outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-500 transition-colors resize-y min-h-[10rem]"
+        />
+        <p className="text-xs text-gray-500">
+          Codex config.toml 配置内容
+        </p>
+      </div>
+    </div>
+  );
+};
+
+export default CodexConfigEditor;
--- a/src/components/ProviderForm/KimiModelSelector.tsx
+++ b/src/components/ProviderForm/KimiModelSelector.tsx
@@ -0,0 +1,185 @@
+import React, { useState, useEffect } from "react";
+import { ChevronDown, RefreshCw, AlertCircle } from "lucide-react";
+
+interface KimiModel {
+  id: string;
+  object: string;
+  created: number;
+  owned_by: string;
+}
+
+interface KimiModelSelectorProps {
+  apiKey: string;
+  anthropicModel: string;
+  anthropicSmallFastModel: string;
+  onModelChange: (
+    field: "ANTHROPIC_MODEL" | "ANTHROPIC_SMALL_FAST_MODEL",
+    value: string,
+  ) => void;
+  disabled?: boolean;
+}
+
+const KimiModelSelector: React.FC<KimiModelSelectorProps> = ({
+  apiKey,
+  anthropicModel,
+  anthropicSmallFastModel,
+  onModelChange,
+  disabled = false,
+}) => {
+  const [models, setModels] = useState<KimiModel[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState("");
+  const [debouncedKey, setDebouncedKey] = useState("");
+
+  // 获取模型列表
+  const fetchModelsWithKey = async (key: string) => {
+    if (!key) {
+      setError("请先填写 API Key");
+      return;
+    }
+
+    setLoading(true);
+    setError("");
+
+    try {
+      const response = await fetch("https://api.moonshot.cn/v1/models", {
+        headers: {
+          Authorization: `Bearer ${key}`,
+          "Content-Type": "application/json",
+        },
+      });
+
+      if (!response.ok) {
+        throw new Error(`请求失败: ${response.status} ${response.statusText}`);
+      }
+
+      const data = await response.json();
+
+      if (data.data && Array.isArray(data.data)) {
+        setModels(data.data);
+      } else {
+        throw new Error("返回数据格式错误");
+      }
+    } catch (err) {
+      console.error("获取模型列表失败:", err);
+      setError(err instanceof Error ? err.message : "获取模型列表失败");
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // 500ms 防抖 API Key
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setDebouncedKey(apiKey.trim());
+    }, 500);
+    return () => clearTimeout(timer);
+  }, [apiKey]);
+
+  // 当防抖后的 Key 改变时自动获取模型列表
+  useEffect(() => {
+    if (debouncedKey) {
+      fetchModelsWithKey(debouncedKey);
+    } else {
+      setModels([]);
+      setError("");
+    }
+  }, [debouncedKey]);
+
+  const selectClass = `w-full px-3 py-2 border rounded-lg text-sm transition-colors appearance-none bg-white ${
+    disabled
+      ? "bg-gray-100 border-gray-200 text-gray-400 cursor-not-allowed"
+      : "border-gray-200 focus:outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-500"
+  }`;
+
+  const ModelSelect: React.FC<{
+    label: string;
+    value: string;
+    onChange: (value: string) => void;
+  }> = ({ label, value, onChange }) => (
+    <div className="space-y-2">
+      <label className="block text-sm font-medium text-gray-900">
+        {label}
+      </label>
+      <div className="relative">
+        <select
+          value={value}
+          onChange={(e) => onChange(e.target.value)}
+          disabled={disabled || loading || models.length === 0}
+          className={selectClass}
+        >
+          <option value="">
+            {loading
+              ? "加载中..."
+              : models.length === 0
+                ? "暂无模型"
+                : "请选择模型"}
+          </option>
+          {models.map((model) => (
+            <option key={model.id} value={model.id}>
+              {model.id}
+            </option>
+          ))}
+        </select>
+        <ChevronDown
+          size={16}
+          className="absolute right-3 top-1/2 transform -translate-y-1/2 text-gray-500 pointer-events-none"
+        />
+      </div>
+    </div>
+  );
+
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center justify-between">
+        <h3 className="text-sm font-medium text-gray-900">
+          模型配置
+        </h3>
+        <button
+          type="button"
+          onClick={() => debouncedKey && fetchModelsWithKey(debouncedKey)}
+          disabled={disabled || loading || !debouncedKey}
+          className="inline-flex items-center gap-1 px-2 py-1 text-xs text-gray-500 hover:text-blue-500 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
+        >
+          <RefreshCw size={12} className={loading ? "animate-spin" : ""} />
+          刷新模型列表
+        </button>
+      </div>
+
+      {error && (
+        <div className="flex items-center gap-2 p-3 bg-red-100 border border-red-500/20 rounded-lg">
+          <AlertCircle
+            size={16}
+            className="text-red-500 flex-shrink-0"
+          />
+          <p className="text-red-500 text-xs">{error}</p>
+        </div>
+      )}
+
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+        <ModelSelect
+          label="主模型 (ANTHROPIC_MODEL)"
+          value={anthropicModel}
+          onChange={(value) => onModelChange("ANTHROPIC_MODEL", value)}
+        />
+        <ModelSelect
+          label="快速模型 (ANTHROPIC_SMALL_FAST_MODEL)"
+          value={anthropicSmallFastModel}
+          onChange={(value) =>
+            onModelChange("ANTHROPIC_SMALL_FAST_MODEL", value)
+          }
+        />
+      </div>
+
+      {!apiKey.trim() && (
+        <div className="p-3 bg-gray-100 border border-gray-200 rounded-lg">
+          <p className="text-xs text-gray-500">
+            📝 请先填写 API Key（格式：sk-xxx-api-key-here）以获取可用模型列表
+          </p>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default KimiModelSelector;
--- a/src/components/ProviderForm/PresetSelector.tsx
+++ b/src/components/ProviderForm/PresetSelector.tsx
@@ -0,0 +1,91 @@
+import React from "react";
+import { Zap } from "lucide-react";
+
+interface Preset {
+  name: string;
+  isOfficial?: boolean;
+}
+
+interface PresetSelectorProps {
+  title?: string;
+  presets: Preset[];
+  selectedIndex: number | null;
+  onSelectPreset: (index: number) => void;
+  onCustomClick: () => void;
+  customLabel?: string;
+}
+
+const PresetSelector: React.FC<PresetSelectorProps> = ({
+  title = "选择配置类型",
+  presets,
+  selectedIndex,
+  onSelectPreset,
+  onCustomClick,
+  customLabel = "自定义",
+}) => {
+  const getButtonClass = (index: number, isOfficial?: boolean) => {
+    const isSelected = selectedIndex === index;
+    const baseClass =
+      "inline-flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors";
+
+    if (isSelected) {
+      return isOfficial
+        ? `${baseClass} bg-amber-500 text-white`
+        : `${baseClass} bg-blue-500 text-white`;
+    }
+
+    return `${baseClass} bg-gray-100 text-gray-500 hover:bg-gray-200`;
+  };
+
+  const getDescription = () => {
+    if (selectedIndex === -1) {
+      return "手动配置供应商，需要填写完整的配置信息";
+    }
+
+    if (selectedIndex !== null && selectedIndex >= 0) {
+      const preset = presets[selectedIndex];
+      return preset?.isOfficial
+        ? "Claude 官方登录，不需要填写 API Key"
+        : "使用预设配置，只需填写 API Key";
+    }
+
+    return null;
+  };
+
+  return (
+    <div className="space-y-4">
+      <div>
+        <label className="block text-sm font-medium text-gray-900 mb-3">
+          {title}
+        </label>
+        <div className="flex flex-wrap gap-2">
+          <button
+            type="button"
+            className={`${getButtonClass(-1)} ${selectedIndex === -1 ? '' : ''}`}
+            onClick={onCustomClick}
+          >
+            {customLabel}
+          </button>
+          {presets.map((preset, index) => (
+            <button
+              key={index}
+              type="button"
+              className={getButtonClass(index, preset.isOfficial)}
+              onClick={() => onSelectPreset(index)}
+            >
+              {preset.isOfficial && <Zap size={14} />}
+              {preset.name}
+            </button>
+          ))}
+        </div>
+      </div>
+      {getDescription() && (
+        <p className="text-sm text-gray-500">
+          {getDescription()}
+        </p>
+      )}
+    </div>
+  );
+};
+
+export default PresetSelector;
--- a/src/components/ProviderList.css
+++ b/src/components/ProviderList.css
@@ -1,206 +0,0 @@
-.provider-list {
-  background: white;
-  border-radius: 8px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-  padding: 1.5rem;
-}
-
-.empty-state {
-  text-align: center;
-  padding: 3rem 1rem;
-  color: #7f8c8d;
-}
-
-.empty-state p:first-child {
-  font-size: 1.1rem;
-  margin-bottom: 0.5rem;
-}
-
-.provider-items {
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-}
-
-.provider-item {
-  display: flex;
-  align-items: center;
-  padding: 1rem;
-  border: 2px solid #ecf0f1;
-  border-radius: 6px;
-  transition: all 0.2s;
-}
-
-.provider-item:hover {
-  border-color: #3498db;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.provider-item.current {
-  border-color: #27ae60;
-  background: #f0fdf4;
-}
-
-.provider-info {
-  flex: 1;
-  min-width: 0;
-}
-
-.provider-name {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  font-weight: 500;
-  margin-bottom: 0.25rem;
-}
-
-.provider-name input[type="radio"] {
-  cursor: pointer;
-}
-
-.provider-name input[type="radio"]:disabled {
-  cursor: not-allowed;
-}
-
-.current-badge {
-  background: #27ae60;
-  color: white;
-  padding: 0.125rem 0.5rem;
-  border-radius: 3px;
-  font-size: 0.75rem;
-}
-
-.provider-url {
-  color: #7f8c8d;
-  font-size: 0.9rem;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.url-link {
-  color: #3498db;
-  text-decoration: none;
-  cursor: pointer;
-  transition: color 0.2s;
-}
-
-.url-link:hover {
-  color: #2980b9;
-  text-decoration: underline;
-}
-
-.api-url {
-  color: #7f8c8d;
-}
-
-.provider-status {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  margin-right: 2rem;
-}
-
-.status-icon {
-  font-size: 1.1rem;
-}
-
-.status-text {
-  color: #555;
-  font-size: 0.9rem;
-}
-
-.response-time {
-  color: #3498db;
-  font-size: 0.85rem;
-  font-family: monospace;
-}
-
-.provider-actions {
-  display: flex;
-  gap: 0.5rem;
-}
-
-.check-btn {
-  padding: 0.375rem 0.75rem;
-  border: 1px solid #f39c12;
-  background: white;
-  color: #f39c12;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 0.85rem;
-  transition: all 0.2s;
-}
-
-.check-btn:hover:not(:disabled) {
-  background: #f39c12;
-  color: white;
-}
-
-.check-btn:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
-.enable-btn {
-  padding: 0.375rem 0.75rem;
-  border: 1px solid #27ae60;
-  background: white;
-  color: #27ae60;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 0.85rem;
-  transition: all 0.2s;
-}
-
-.enable-btn:hover:not(:disabled) {
-  background: #27ae60;
-  color: white;
-}
-
-.enable-btn:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
-.edit-btn {
-  padding: 0.375rem 0.75rem;
-  border: 1px solid #3498db;
-  background: white;
-  color: #3498db;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 0.85rem;
-  transition: all 0.2s;
-}
-
-.edit-btn:hover:not(:disabled) {
-  background: #3498db;
-  color: white;
-}
-
-.edit-btn:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
-.delete-btn {
-  padding: 0.375rem 0.75rem;
-  border: 1px solid #e74c3c;
-  background: white;
-  color: #e74c3c;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 0.85rem;
-  transition: all 0.2s;
-}
-
-.delete-btn:hover:not(:disabled) {
-  background: #e74c3c;
-  color: white;
-}
-
-.delete-btn:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
--- a/src/components/ProviderList.tsx
+++ b/src/components/ProviderList.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { Provider } from "../types";
-import "./ProviderList.css";
+import { Play, Edit3, Trash2, CheckCircle2, Users } from "lucide-react";
+import { buttonStyles, cardStyles, badgeStyles, cn } from "../lib/styles";

 interface ProviderListProps {
  providers: Record<string, Provider>;
@@ -17,14 +18,20 @@ const ProviderList: React.FC<ProviderListProps> = ({
  onDelete,
  onEdit,
 }) => {
-  // 提取API地址
+  // 提取API地址（兼容不同供应商配置：Claude env / Codex TOML）
  const getApiUrl = (provider: Provider): string => {
    try {
-      const config = provider.settingsConfig;
-      if (config?.env?.ANTHROPIC_BASE_URL) {
-        return config.env.ANTHROPIC_BASE_URL;
+      const cfg = provider.settingsConfig;
+      // Claude/Anthropic: 从 env 中读取
+      if (cfg?.env?.ANTHROPIC_BASE_URL) {
+        return cfg.env.ANTHROPIC_BASE_URL;
      }
-      return "未设置";
+      // Codex: 从 TOML 配置中解析 base_url
+      if (typeof cfg?.config === "string" && cfg.config.includes("base_url")) {
+        const match = cfg.config.match(/base_url\s*=\s*"([^"]+)"/);
+        if (match && match[1]) return match[1];
+      }
+      return "未配置官网地址";
    } catch {
      return "配置错误";
    }
@@ -38,73 +45,128 @@ const ProviderList: React.FC<ProviderListProps> = ({
    }
  };

+  // 对供应商列表进行排序
+  const sortedProviders = Object.values(providers).sort((a, b) => {
+    // 按添加时间排序
+    // 没有时间戳的视为最早添加的（排在最前面）
+    // 有时间戳的按时间升序排列
+    const timeA = a.createdAt || 0;
+    const timeB = b.createdAt || 0;
+    
+    // 如果都没有时间戳，按名称排序
+    if (timeA === 0 && timeB === 0) {
+      return a.name.localeCompare(b.name, 'zh-CN');
+    }
+    
+    // 如果只有一个没有时间戳，没有时间戳的排在前面
+    if (timeA === 0) return -1;
+    if (timeB === 0) return 1;
+    
+    // 都有时间戳，按时间升序
+    return timeA - timeB;
+  });
+
  return (
-    <div className="provider-list">
-      {Object.values(providers).length === 0 ? (
-        <div className="empty-state">
-          <p>还没有添加任何供应商</p>
-          <p>点击右上角的"添加供应商"按钮开始</p>
+    <div className="space-y-4">
+      {sortedProviders.length === 0 ? (
+        <div className="text-center py-12">
+          <div className="w-16 h-16 mx-auto mb-4 bg-gray-100 rounded-full flex items-center justify-center">
+            <Users size={24} className="text-gray-400" />
+          </div>
+          <h3 className="text-lg font-medium text-gray-900 dark:text-gray-100 mb-2">
+            还没有添加任何供应商
+          </h3>
+          <p className="text-gray-500 dark:text-gray-400 text-sm">
+            点击右上角的"添加供应商"按钮开始配置您的第一个API供应商
+          </p>
        </div>
      ) : (
-        <div className="provider-items">
-          {Object.values(providers).map((provider) => {
+        <div className="space-y-3">
+          {sortedProviders.map((provider) => {
            const isCurrent = provider.id === currentProviderId;
+            const apiUrl = getApiUrl(provider);

            return (
              <div
                key={provider.id}
-                className={`provider-item ${isCurrent ? "current" : ""}`}
+                className={cn(
+                  isCurrent ? cardStyles.selected : cardStyles.interactive
+                )}
              >
-                <div className="provider-info">
-                  <div className="provider-name">
-                    <span>{provider.name}</span>
-                    {isCurrent && (
-                      <span className="current-badge">当前使用</span>
-                    )}
-                  </div>
-                  <div className="provider-url">
-                    {provider.websiteUrl ? (
-                      <a
-                        href="#"
-                        onClick={(e) => {
-                          e.preventDefault();
-                          handleUrlClick(provider.websiteUrl!);
-                        }}
-                        className="url-link"
-                        title={`访问 ${provider.websiteUrl}`}
-                      >
-                        {provider.websiteUrl}
-                      </a>
-                    ) : (
-                      <span className="api-url" title={getApiUrl(provider)}>
-                        {getApiUrl(provider)}
-                      </span>
-                    )}
-                  </div>
-                </div>
+                <div className="flex items-start justify-between">
+                  <div className="flex-1">
+                    <div className="flex items-center gap-3 mb-2">
+                      <h3 className="font-medium text-gray-900 dark:text-gray-100">
+                        {provider.name}
+                      </h3>
+                      {isCurrent && (
+                        <div className={badgeStyles.success}>
+                          <CheckCircle2 size={12} />
+                          当前使用
+                        </div>
+                      )}
+                    </div>

-                <div className="provider-actions">
-                  <button
-                    className="enable-btn"
-                    onClick={() => onSwitch(provider.id)}
-                    disabled={isCurrent}
-                  >
-                    启用
-                  </button>
-                  <button
-                    className="edit-btn"
-                    onClick={() => onEdit(provider.id)}
-                    disabled={isCurrent}
-                  >
-                    编辑
-                  </button>
-                  <button
-                    className="delete-btn"
-                    onClick={() => onDelete(provider.id)}
-                    disabled={isCurrent}
-                  >
-                    删除
-                  </button>
+                    <div className="flex items-center gap-2 text-sm">
+                      {provider.websiteUrl ? (
+                        <button
+                          onClick={(e) => {
+                            e.preventDefault();
+                            handleUrlClick(provider.websiteUrl!);
+                          }}
+                          className="inline-flex items-center gap-1 text-blue-500 dark:text-blue-400 hover:opacity-90 transition-colors"
+                          title={`访问 ${provider.websiteUrl}`}
+                        >
+                          {provider.websiteUrl}
+                        </button>
+                      ) : (
+                        <span
+                          className="text-gray-500 dark:text-gray-400"
+                          title={apiUrl}
+                        >
+                          {apiUrl}
+                        </span>
+                      )}
+                    </div>
+                  </div>
+
+                  <div className="flex items-center gap-2 ml-4">
+                    <button
+                      onClick={() => onSwitch(provider.id)}
+                      disabled={isCurrent}
+                      className={cn(
+                        "inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium rounded-md transition-colors",
+                        isCurrent
+                          ? "bg-gray-100 text-gray-400 dark:bg-gray-800 dark:text-gray-500 cursor-not-allowed"
+                          : "bg-blue-500 text-white hover:bg-blue-600 dark:bg-blue-600 dark:hover:bg-blue-700"
+                      )}
+                    >
+                      <Play size={14} />
+                      {isCurrent ? "使用中" : "启用"}
+                    </button>
+
+                    <button
+                      onClick={() => onEdit(provider.id)}
+                      className={buttonStyles.icon}
+                      title="编辑供应商"
+                    >
+                      <Edit3 size={16} />
+                    </button>
+
+                    <button
+                      onClick={() => onDelete(provider.id)}
+                      disabled={isCurrent}
+                      className={cn(
+                        buttonStyles.icon,
+                        isCurrent
+                          ? "text-gray-400 cursor-not-allowed"
+                          : "text-gray-500 hover:text-red-500 hover:bg-red-100 dark:text-gray-400 dark:hover:text-red-400 dark:hover:bg-red-500/10"
+                      )}
+                      title="删除供应商"
+                    >
+                      <Trash2 size={16} />
+                    </button>
+                  </div>
                </div>
              </div>
            );
--- a/src/components/SettingsModal.tsx
+++ b/src/components/SettingsModal.tsx
@@ -0,0 +1,212 @@
+import { useState, useEffect } from "react";
+import { X, Info, RefreshCw, FolderOpen } from "lucide-react";
+import { getVersion } from "@tauri-apps/api/app";
+import "../lib/tauri-api";
+import { runUpdateFlow } from "../lib/updater";
+import type { Settings } from "../types";
+
+interface SettingsModalProps {
+  onClose: () => void;
+}
+
+export default function SettingsModal({ onClose }: SettingsModalProps) {
+  const [settings, setSettings] = useState<Settings>({
+    showInDock: true,
+  });
+  const [configPath, setConfigPath] = useState<string>("");
+  const [version, setVersion] = useState<string>("");
+  const [isCheckingUpdate, setIsCheckingUpdate] = useState(false);
+
+  useEffect(() => {
+    loadSettings();
+    loadConfigPath();
+    loadVersion();
+  }, []);
+
+  const loadVersion = async () => {
+    try {
+      const appVersion = await getVersion();
+      setVersion(appVersion);
+    } catch (error) {
+      console.error("获取版本信息失败:", error);
+      setVersion("3.1.1"); // 降级使用默认版本
+    }
+  };
+
+  const loadSettings = async () => {
+    try {
+      const loadedSettings = await window.api.getSettings();
+      if (loadedSettings?.showInDock !== undefined) {
+        setSettings({ showInDock: loadedSettings.showInDock });
+      }
+    } catch (error) {
+      console.error("加载设置失败:", error);
+    }
+  };
+
+  const loadConfigPath = async () => {
+    try {
+      const path = await window.api.getAppConfigPath();
+      if (path) {
+        setConfigPath(path);
+      }
+    } catch (error) {
+      console.error("获取配置路径失败:", error);
+    }
+  };
+
+  const saveSettings = async () => {
+    try {
+      await window.api.saveSettings(settings);
+      onClose();
+    } catch (error) {
+      console.error("保存设置失败:", error);
+    }
+  };
+
+  const handleCheckUpdate = async () => {
+    setIsCheckingUpdate(true);
+    try {
+      // 优先使用 Tauri Updater 流程；失败时回退到打开 Releases 页面
+      await runUpdateFlow({ timeout: 30000 });
+    } catch (error) {
+      console.error("检查更新失败，回退到 Releases 页面:", error);
+      await window.api.checkForUpdates();
+    } finally {
+      setIsCheckingUpdate(false);
+    }
+  };
+
+  const handleOpenConfigFolder = async () => {
+    try {
+      await window.api.openAppConfigFolder();
+    } catch (error) {
+      console.error("打开配置文件夹失败:", error);
+    }
+  };
+
+  return (
+    <div className="fixed inset-0 bg-black/50 dark:bg-black/70 flex items-center justify-center z-50">
+      <div className="bg-white dark:bg-gray-900 rounded-xl shadow-2xl w-[500px] overflow-hidden">
+        {/* 标题栏 */}
+        <div className="flex items-center justify-between px-6 py-4 border-b border-gray-200 dark:border-gray-800">
+          <h2 className="text-lg font-semibold text-blue-500 dark:text-blue-400">
+            设置
+          </h2>
+          <button
+            onClick={onClose}
+            className="p-1.5 hover:bg-gray-100 dark:hover:bg-gray-800 rounded-md transition-colors"
+          >
+            <X size={20} className="text-gray-500 dark:text-gray-400" />
+          </button>
+        </div>
+
+        {/* 设置内容 */}
+        <div className="px-6 py-4 space-y-6">
+          {/* 显示设置 - 功能还未实现 */}
+          {/* <div>
+            <h3 className="text-sm font-medium text-gray-900 dark:text-gray-100 mb-3">
+              显示设置
+            </h3>
+            <label className="flex items-center justify-between">
+              <span className="text-sm text-gray-500">
+                在 Dock 中显示（macOS）
+              </span>
+              <input
+                type="checkbox"
+                checked={settings.showInDock}
+                onChange={(e) =>
+                  setSettings({ ...settings, showInDock: e.target.checked })
+                }
+                className="w-4 h-4 text-blue-500 rounded focus:ring-blue-500/20"
+              />
+            </label>
+          </div> */}
+
+          {/* 配置文件位置 */}
+          <div>
+            <h3 className="text-sm font-medium text-gray-900 dark:text-gray-100 mb-3">
+              配置文件位置
+            </h3>
+            <div className="flex items-center gap-2">
+              <div className="flex-1 px-3 py-2 bg-gray-100 dark:bg-gray-800 rounded-lg">
+                <span className="text-xs font-mono text-gray-500 dark:text-gray-400">
+                  {configPath || "加载中..."}
+                </span>
+              </div>
+              <button
+                onClick={handleOpenConfigFolder}
+                className="p-2 hover:bg-gray-100 dark:hover:bg-gray-800 rounded-lg transition-colors"
+                title="打开文件夹"
+              >
+                <FolderOpen
+                  size={18}
+                  className="text-gray-500 dark:text-gray-400"
+                />
+              </button>
+            </div>
+          </div>
+
+          {/* 关于 */}
+          <div>
+            <h3 className="text-sm font-medium text-gray-900 dark:text-gray-100 mb-3">
+              关于
+            </h3>
+            <div className="p-4 bg-gray-100 dark:bg-gray-800 rounded-lg">
+              <div className="flex items-start justify-between">
+                <div className="flex items-start gap-3">
+                  <Info
+                    size={18}
+                    className="text-gray-500 mt-0.5"
+                  />
+                  <div className="text-sm">
+                    <p className="font-medium text-gray-900 dark:text-gray-100">
+                      CC Switch
+                    </p>
+                    <p className="mt-1 text-gray-500 dark:text-gray-400">
+                      版本 {version}
+                    </p>
+                  </div>
+                </div>
+                <button
+                  onClick={handleCheckUpdate}
+                  disabled={isCheckingUpdate}
+                  className={`px-3 py-1.5 text-xs font-medium rounded-lg transition-all ${
+                    isCheckingUpdate
+                      ? "bg-white dark:bg-gray-700 text-gray-400 dark:text-gray-500"
+                      : "bg-white dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 text-blue-500 dark:text-blue-400"
+                  }`}
+                >
+                  {isCheckingUpdate ? (
+                    <span className="flex items-center gap-1">
+                      <RefreshCw size={12} className="animate-spin" />
+                      检查中...
+                    </span>
+                  ) : (
+                    "检查更新"
+                  )}
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        {/* 底部按钮 */}
+        <div className="flex justify-end gap-3 px-6 py-4 border-t border-gray-200 dark:border-gray-800">
+          <button
+            onClick={onClose}
+            className="px-4 py-2 text-sm font-medium text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-800 rounded-lg transition-colors"
+          >
+            取消
+          </button>
+          <button
+            onClick={saveSettings}
+            className="px-4 py-2 text-sm font-medium text-white bg-blue-500 hover:bg-blue-600 dark:bg-blue-600 dark:hover:bg-blue-700 rounded-lg transition-colors"
+          >
+            保存
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}
--- a/src/config/codexProviderPresets.ts
+++ b/src/config/codexProviderPresets.ts
@@ -0,0 +1,41 @@
+/**
+ * Codex 预设供应商配置模板
+ */
+export interface CodexProviderPreset {
+  name: string;
+  websiteUrl: string;
+  auth: Record<string, any>; // 将写入 ~/.codex/auth.json
+  config: string; // 将写入 ~/.codex/config.toml（TOML 字符串）
+  isOfficial?: boolean; // 标识是否为官方预设
+}
+
+export const codexProviderPresets: CodexProviderPreset[] = [
+  {
+    name: "Codex官方",
+    websiteUrl: "https://chatgpt.com/codex",
+    isOfficial: true,
+    // 官方的 key 为null
+    auth: {
+      OPENAI_API_KEY: null,
+    },
+    config: ``,
+  },
+  {
+    name: "PackyCode",
+    websiteUrl: "https://codex.packycode.com/",
+    // PackyCode 一般通过 API Key；请将占位符替换为你的实际 key
+    auth: {
+      OPENAI_API_KEY: "sk-your-api-key-here",
+    },
+    config: `model_provider = "packycode"
+model = "gpt-5"
+model_reasoning_effort = "high"
+disable_response_storage = true
+
+[model_providers.packycode]
+name = "packycode"
+base_url = "https://codex-api.packycode.com/v1"
+wire_api = "responses"
+env_key = "packycode"`,
+  },
+];
--- a/src/config/providerPresets.ts
+++ b/src/config/providerPresets.ts
@@ -23,7 +23,7 @@ export const providerPresets: ProviderPreset[] = [
    settingsConfig: {
      env: {
        ANTHROPIC_BASE_URL: "https://api.deepseek.com/anthropic",
-        ANTHROPIC_AUTH_TOKEN: "sk-your-api-key-here",
+        ANTHROPIC_AUTH_TOKEN: "",
        ANTHROPIC_MODEL: "deepseek-chat",
        ANTHROPIC_SMALL_FAST_MODEL: "deepseek-chat",
      },
@@ -35,7 +35,7 @@ export const providerPresets: ProviderPreset[] = [
    settingsConfig: {
      env: {
        ANTHROPIC_BASE_URL: "https://open.bigmodel.cn/api/anthropic",
-        ANTHROPIC_AUTH_TOKEN: "sk-your-api-key-here",
+        ANTHROPIC_AUTH_TOKEN: "",
      },
    },
  },
@@ -46,7 +46,7 @@ export const providerPresets: ProviderPreset[] = [
      env: {
        ANTHROPIC_BASE_URL:
          "https://dashscope.aliyuncs.com/api/v2/apps/claude-code-proxy",
-        ANTHROPIC_AUTH_TOKEN: "sk-your-api-key-here",
+        ANTHROPIC_AUTH_TOKEN: "",
      },
    },
  },
@@ -56,19 +56,31 @@ export const providerPresets: ProviderPreset[] = [
    settingsConfig: {
      env: {
        ANTHROPIC_BASE_URL: "https://api.moonshot.cn/anthropic",
-        ANTHROPIC_AUTH_TOKEN: "sk-your-api-key-here",
+        ANTHROPIC_AUTH_TOKEN: "",
        ANTHROPIC_MODEL: "kimi-k2-turbo-preview",
        ANTHROPIC_SMALL_FAST_MODEL: "kimi-k2-turbo-preview",
      },
    },
  },
+  {
+    name: "魔搭",
+    websiteUrl: "https://modelscope.cn",
+    settingsConfig: {
+      env: {
+        ANTHROPIC_AUTH_TOKEN: "ms-your-api-key",
+        ANTHROPIC_BASE_URL: "https://api-inference.modelscope.cn",
+        ANTHROPIC_MODEL: "ZhipuAI/GLM-4.5",
+        ANTHROPIC_SMALL_FAST_MODEL: "ZhipuAI/GLM-4.5",
+      },
+    },
+  },
  {
    name: "PackyCode",
    websiteUrl: "https://www.packycode.com",
    settingsConfig: {
      env: {
        ANTHROPIC_BASE_URL: "https://api.packycode.com",
-        ANTHROPIC_AUTH_TOKEN: "sk-your-api-key-here",
+        ANTHROPIC_AUTH_TOKEN: "",
      },
    },
  },
--- a/src/hooks/useDarkMode.ts
+++ b/src/hooks/useDarkMode.ts
@@ -0,0 +1,80 @@
+import { useState, useEffect } from 'react';
+
+export function useDarkMode() {
+  // 初始设为 false，挂载后在 useEffect 中加载真实值
+  const [isDarkMode, setIsDarkMode] = useState<boolean>(false);
+  const [isInitialized, setIsInitialized] = useState(false);
+
+  // 组件挂载后加载初始值（兼容 Tauri 环境）
+  useEffect(() => {
+    if (typeof window === 'undefined') return;
+    
+    try {
+      // 尝试读取已保存的偏好
+      const saved = localStorage.getItem('darkMode');
+      if (saved !== null) {
+        const savedBool = saved === 'true';
+        setIsDarkMode(savedBool);
+        console.log('[DarkMode] Loaded from localStorage:', savedBool);
+      } else {
+        // 回退到系统偏好
+        const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+        setIsDarkMode(prefersDark);
+        console.log('[DarkMode] Using system preference:', prefersDark);
+      }
+    } catch (error) {
+      console.error('[DarkMode] Error loading preference:', error);
+      setIsDarkMode(false);
+    }
+    
+    setIsInitialized(true);
+  }, []); // 仅在首次挂载时运行
+
+  // 将 dark 类应用到文档根节点
+  useEffect(() => {
+    if (!isInitialized) return;
+    
+    // 添加短暂延迟以确保 Tauri 中 DOM 已就绪
+    const timer = setTimeout(() => {
+      try {
+        if (isDarkMode) {
+          document.documentElement.classList.add('dark');
+          console.log('[DarkMode] Added dark class to document');
+        } else {
+          document.documentElement.classList.remove('dark');
+          console.log('[DarkMode] Removed dark class from document');
+        }
+        
+        // 检查类名是否已成功应用
+        const hasClass = document.documentElement.classList.contains('dark');
+        console.log('[DarkMode] Document has dark class:', hasClass);
+      } catch (error) {
+        console.error('[DarkMode] Error applying dark class:', error);
+      }
+    }, 0);
+
+    return () => clearTimeout(timer);
+  }, [isDarkMode, isInitialized]);
+
+  // 将偏好保存到 localStorage
+  useEffect(() => {
+    if (!isInitialized) return;
+    
+    try {
+      localStorage.setItem('darkMode', isDarkMode.toString());
+      console.log('[DarkMode] Saved to localStorage:', isDarkMode);
+    } catch (error) {
+      console.error('[DarkMode] Error saving preference:', error);
+    }
+  }, [isDarkMode, isInitialized]);
+
+  const toggleDarkMode = () => {
+    setIsDarkMode(prev => {
+      const newValue = !prev;
+      console.log('[DarkMode] Toggling from', prev, 'to', newValue);
+      return newValue;
+    });
+  };
+
+  return { isDarkMode, toggleDarkMode };
+}
--- a/src/index.css
+++ b/src/index.css
@@ -1,30 +1,46 @@
+/* 引入 Tailwind v4 内建样式与工具 */
+@import "tailwindcss";
+
+/* 覆盖 Tailwind v4 默认的 dark 变体为“类选择器”模式 */
+@custom-variant dark (&:where(.dark, .dark *));
+
+/* 全局基础样式 */
 * {
-  margin: 0;
-  padding: 0;
  box-sizing: border-box;
 }

+html {
+  @apply font-sans antialiased;
+  line-height: 1.5;
+  /* 让原生控件与滚动条随主题切换配色 */
+  color-scheme: light;
+}
+
 body {
-  font-family:
-    -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
-    "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  background-color: #f5f5f5;
-  color: #333;
+  @apply m-0 p-0 bg-gray-50 text-gray-900 text-sm dark:bg-gray-950 dark:text-gray-100;
 }

-#root {
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
+/* 暗色模式下启用暗色原生控件/滚动条配色 */
+html.dark { color-scheme: dark; }
+
+/* 滚动条样式 */
+::-webkit-scrollbar {
+  @apply w-1.5 h-1.5;
 }

-/* 仅在 macOS 下为顶部预留交通灯空间 */
-/* 保持 mac 下与内容区域左对齐（不额外偏移） */
-
-/* 在 macOS 下稍微增加 banner 高度，拉开与交通灯的垂直距离 */
-body.is-mac .app-header {
-  padding-top: 1.4rem;
-  padding-bottom: 1.4rem;
+::-webkit-scrollbar-track {
+  @apply bg-gray-100 dark:bg-gray-800;
+}
+
+::-webkit-scrollbar-thumb {
+  @apply bg-gray-300 rounded dark:bg-gray-600;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  @apply bg-gray-400 dark:bg-gray-500;
+}
+
+/* 焦点样式 */
+*:focus-visible {
+  @apply outline-2 outline-blue-500 outline-offset-2;
 }
--- a/src/lib/styles.ts
+++ b/src/lib/styles.ts
@@ -0,0 +1,68 @@
+/**
+ * 复用的 Tailwind 样式组合，覆盖常见 UI 模式
+ */
+
+// 按钮样式
+export const buttonStyles = {
+  // 主按钮：蓝底白字
+  primary: "px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600 dark:bg-blue-600 dark:hover:bg-blue-700 transition-colors text-sm font-medium",
+  
+  // 次按钮：灰背景，深色文本
+  secondary: "px-4 py-2 text-gray-500 hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-gray-800 dark:hover:text-gray-200 rounded-lg transition-colors text-sm font-medium",
+  
+  // 危险按钮：用于不可撤销/破坏性操作
+  danger: "px-4 py-2 bg-red-500 text-white rounded-lg hover:bg-red-600 dark:bg-red-600 dark:hover:bg-red-700 transition-colors text-sm font-medium",
+  
+  // 幽灵按钮：无背景，仅悬浮反馈
+  ghost: "px-4 py-2 text-gray-500 hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800 rounded-lg transition-colors text-sm font-medium",
+  
+  // 图标按钮：小尺寸，仅图标
+  icon: "p-1.5 text-gray-500 hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800 rounded-md transition-colors",
+  
+  // 禁用态：可与其他样式组合
+  disabled: "opacity-50 cursor-not-allowed pointer-events-none",
+} as const;
+
+// 卡片样式
+export const cardStyles = {
+  // 基础卡片容器
+  base: "bg-white rounded-lg border border-gray-200 p-4 dark:bg-gray-900 dark:border-gray-700",
+  
+  // 带悬浮效果的卡片
+  interactive: "bg-white rounded-lg border border-gray-200 p-4 hover:border-gray-300 hover:shadow-sm dark:bg-gray-900 dark:border-gray-700 dark:hover:border-gray-600 transition-all duration-200",
+  
+  // 选中/激活态卡片
+  selected: "bg-white rounded-lg border border-blue-500 ring-1 ring-blue-500/20 bg-blue-500/5 p-4 dark:bg-gray-900 dark:border-blue-400 dark:ring-blue-400/20 dark:bg-blue-400/10",
+} as const;
+
+// 输入控件样式
+export const inputStyles = {
+  // 文本输入框
+  text: "w-full px-3 py-2 border border-gray-200 rounded-lg focus:border-blue-500 focus:ring-1 focus:ring-blue-500/20 outline-none dark:bg-gray-900 dark:border-gray-700 dark:text-gray-100 dark:focus:border-blue-400 dark:focus:ring-blue-400/20 transition-colors",
+  
+  // 下拉选择框
+  select: "w-full px-3 py-2 border border-gray-200 rounded-lg focus:border-blue-500 focus:ring-1 focus:ring-blue-500/20 outline-none bg-white dark:bg-gray-900 dark:border-gray-700 dark:text-gray-100 dark:focus:border-blue-400 dark:focus:ring-blue-400/20 transition-colors",
+  
+  // 复选框
+  checkbox: "w-4 h-4 text-blue-500 rounded focus:ring-blue-500/20 border-gray-300 dark:border-gray-600 dark:bg-gray-800",
+} as const;
+
+// 徽标（Badge）样式
+export const badgeStyles = {
+  // 成功徽标
+  success: "inline-flex items-center gap-1 px-2 py-1 bg-green-500/10 text-green-500 rounded-md text-xs font-medium",
+  
+  // 信息徽标
+  info: "inline-flex items-center gap-1 px-2 py-1 bg-blue-500/10 text-blue-500 rounded-md text-xs font-medium",
+  
+  // 警告徽标
+  warning: "inline-flex items-center gap-1 px-2 py-1 bg-amber-500/10 text-amber-500 rounded-md text-xs font-medium",
+  
+  // 错误徽标
+  error: "inline-flex items-center gap-1 px-2 py-1 bg-red-500/10 text-red-500 rounded-md text-xs font-medium",
+} as const;
+
+// 组合类名的工具函数
+export function cn(...classes: (string | undefined | false)[]) {
+  return classes.filter(Boolean).join(' ');
+}
--- a/src/lib/tauri-api.ts
+++ b/src/lib/tauri-api.ts
@@ -1,5 +1,9 @@
 import { invoke } from "@tauri-apps/api/core";
-import { Provider } from "../types";
+import { listen, UnlistenFn } from "@tauri-apps/api/event";
+import { Provider, Settings } from "../types";
+
+// 应用类型
+export type AppType = "claude" | "codex";

 // 定义配置状态类型
 interface ConfigStatus {
@@ -17,9 +21,9 @@ interface ImportResult {
 // Tauri API 封装，提供统一的全局 API 接口
 export const tauriAPI = {
  // 获取所有供应商
-  getProviders: async (): Promise<Record<string, Provider>> => {
+  getProviders: async (app?: AppType): Promise<Record<string, Provider>> => {
    try {
-      return await invoke("get_providers");
+      return await invoke("get_providers", { app_type: app, app });
    } catch (error) {
      console.error("获取供应商列表失败:", error);
      return {};
@@ -27,9 +31,9 @@ export const tauriAPI = {
  },

  // 获取当前供应商ID
-  getCurrentProvider: async (): Promise<string> => {
+  getCurrentProvider: async (app?: AppType): Promise<string> => {
    try {
-      return await invoke("get_current_provider");
+      return await invoke("get_current_provider", { app_type: app, app });
    } catch (error) {
      console.error("获取当前供应商失败:", error);
      return "";
@@ -37,9 +41,9 @@ export const tauriAPI = {
  },

  // 添加供应商
-  addProvider: async (provider: Provider): Promise<boolean> => {
+  addProvider: async (provider: Provider, app?: AppType): Promise<boolean> => {
    try {
-      return await invoke("add_provider", { provider });
+      return await invoke("add_provider", { provider, app_type: app, app });
    } catch (error) {
      console.error("添加供应商失败:", error);
      throw error;
@@ -47,9 +51,12 @@ export const tauriAPI = {
  },

  // 更新供应商
-  updateProvider: async (provider: Provider): Promise<boolean> => {
+  updateProvider: async (
+    provider: Provider,
+    app?: AppType,
+  ): Promise<boolean> => {
    try {
-      return await invoke("update_provider", { provider });
+      return await invoke("update_provider", { provider, app_type: app, app });
    } catch (error) {
      console.error("更新供应商失败:", error);
      throw error;
@@ -57,9 +64,9 @@ export const tauriAPI = {
  },

  // 删除供应商
-  deleteProvider: async (id: string): Promise<boolean> => {
+  deleteProvider: async (id: string, app?: AppType): Promise<boolean> => {
    try {
-      return await invoke("delete_provider", { id });
+      return await invoke("delete_provider", { id, app_type: app, app });
    } catch (error) {
      console.error("删除供应商失败:", error);
      throw error;
@@ -67,9 +74,16 @@ export const tauriAPI = {
  },

  // 切换供应商
-  switchProvider: async (providerId: string): Promise<boolean> => {
+  switchProvider: async (
+    providerId: string,
+    app?: AppType,
+  ): Promise<boolean> => {
    try {
-      return await invoke("switch_provider", { id: providerId });
+      return await invoke("switch_provider", {
+        id: providerId,
+        app_type: app,
+        app,
+      });
    } catch (error) {
      console.error("切换供应商失败:", error);
      return false;
@@ -77,9 +91,14 @@ export const tauriAPI = {
  },

  // 导入当前配置为默认供应商
-  importCurrentConfigAsDefault: async (): Promise<ImportResult> => {
+  importCurrentConfigAsDefault: async (
+    app?: AppType,
+  ): Promise<ImportResult> => {
    try {
-      const success = await invoke<boolean>("import_default_config");
+      const success = await invoke<boolean>("import_default_config", {
+        app_type: app,
+        app,
+      });
      return {
        success,
        message: success ? "成功导入默认配置" : "导入失败",
@@ -117,10 +136,24 @@ export const tauriAPI = {
    }
  },

-  // 打开配置文件夹
-  openConfigFolder: async (): Promise<void> => {
+  // 获取应用配置状态（通用）
+  getConfigStatus: async (app?: AppType): Promise<ConfigStatus> => {
    try {
-      await invoke("open_config_folder");
+      return await invoke("get_config_status", { app_type: app, app });
+    } catch (error) {
+      console.error("获取配置状态失败:", error);
+      return {
+        exists: false,
+        path: "",
+        error: String(error),
+      };
+    }
+  },
+
+  // 打开配置文件夹
+  openConfigFolder: async (app?: AppType): Promise<void> => {
+    try {
+      await invoke("open_config_folder", { app_type: app, app });
    } catch (error) {
      console.error("打开配置文件夹失败:", error);
    }
@@ -135,11 +168,80 @@ export const tauriAPI = {
    }
  },

+  // 更新托盘菜单
+  updateTrayMenu: async (): Promise<boolean> => {
+    try {
+      return await invoke("update_tray_menu");
+    } catch (error) {
+      console.error("更新托盘菜单失败:", error);
+      return false;
+    }
+  },
+
+  // 监听供应商切换事件
+  onProviderSwitched: async (
+    callback: (data: { appType: string; providerId: string }) => void,
+  ): Promise<UnlistenFn> => {
+    return await listen("provider-switched", (event) => {
+      callback(event.payload as { appType: string; providerId: string });
+    });
+  },
+
+  // （保留空位，取消迁移提示）
+
  // 选择配置文件（Tauri 暂不实现，保留接口兼容性）
  selectConfigFile: async (): Promise<string | null> => {
    console.warn("selectConfigFile 在 Tauri 版本中暂不支持");
    return null;
  },
+
+  // 获取设置
+  getSettings: async (): Promise<Settings> => {
+    try {
+      return await invoke("get_settings");
+    } catch (error) {
+      console.error("获取设置失败:", error);
+      return { showInDock: true };
+    }
+  },
+
+  // 保存设置
+  saveSettings: async (settings: Settings): Promise<boolean> => {
+    try {
+      return await invoke("save_settings", { settings });
+    } catch (error) {
+      console.error("保存设置失败:", error);
+      return false;
+    }
+  },
+
+  // 检查更新
+  checkForUpdates: async (): Promise<void> => {
+    try {
+      await invoke("check_for_updates");
+    } catch (error) {
+      console.error("检查更新失败:", error);
+    }
+  },
+
+  // 获取应用配置文件路径
+  getAppConfigPath: async (): Promise<string> => {
+    try {
+      return await invoke("get_app_config_path");
+    } catch (error) {
+      console.error("获取应用配置路径失败:", error);
+      return "";
+    }
+  },
+
+  // 打开应用配置文件夹
+  openAppConfigFolder: async (): Promise<void> => {
+    try {
+      await invoke("open_app_config_folder");
+    } catch (error) {
+      console.error("打开应用配置文件夹失败:", error);
+    }
+  },
 };

 // 创建全局 API 对象，兼容现有代码
--- a/src/lib/updater.ts
+++ b/src/lib/updater.ts
@@ -0,0 +1,146 @@
+import { getVersion } from "@tauri-apps/api/app";
+
+// 可选导入：在未注册插件或非 Tauri 环境下，调用时会抛错，外层需做兜底
+// 我们按需加载并在运行时捕获错误，避免构建期类型问题
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+import type { Update } from "@tauri-apps/plugin-updater";
+
+export type UpdateChannel = "stable" | "beta";
+
+export type UpdaterPhase =
+  | "idle"
+  | "checking"
+  | "available"
+  | "downloading"
+  | "installing"
+  | "restarting"
+  | "upToDate"
+  | "error";
+
+export interface UpdateInfo {
+  currentVersion: string;
+  availableVersion: string;
+  notes?: string;
+  pubDate?: string;
+}
+
+export interface UpdateProgressEvent {
+  event: "Started" | "Progress" | "Finished";
+  total?: number;
+  downloaded?: number;
+}
+
+export interface UpdateHandle {
+  version: string;
+  notes?: string;
+  date?: string;
+  downloadAndInstall: (
+    onProgress?: (e: UpdateProgressEvent) => void,
+  ) => Promise<void>;
+  download?: () => Promise<void>;
+  install?: () => Promise<void>;
+}
+
+export interface CheckOptions {
+  timeout?: number;
+  channel?: UpdateChannel;
+}
+
+function mapUpdateHandle(raw: Update): UpdateHandle {
+  return {
+    version: (raw as any).version ?? "",
+    notes: (raw as any).notes,
+    date: (raw as any).date,
+    async downloadAndInstall(onProgress?: (e: UpdateProgressEvent) => void) {
+      await (raw as any).downloadAndInstall((evt: any) => {
+        if (!onProgress) return;
+        const mapped: UpdateProgressEvent = {
+          event: evt?.event,
+        };
+        if (evt?.event === "Started") {
+          mapped.total = evt?.data?.contentLength ?? 0;
+          mapped.downloaded = 0;
+        } else if (evt?.event === "Progress") {
+          mapped.downloaded = evt?.data?.chunkLength ?? 0; // 累积由调用方完成
+        }
+        onProgress(mapped);
+      });
+    },
+    // 透传可选 API（若插件版本支持）
+    download: (raw as any).download
+      ? async () => {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+          await (raw as any).download();
+        }
+      : undefined,
+    install: (raw as any).install
+      ? async () => {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+          await (raw as any).install();
+        }
+      : undefined,
+  };
+}
+
+export async function getCurrentVersion(): Promise<string> {
+  try {
+    return await getVersion();
+  } catch {
+    return "";
+  }
+}
+
+export async function checkForUpdate(
+  opts: CheckOptions = {},
+): Promise<
+  | { status: "up-to-date" }
+  | { status: "available"; info: UpdateInfo; update: UpdateHandle }
+> {
+  // 动态引入，避免在未安装插件时导致打包期问题
+  const { check } = await import("@tauri-apps/plugin-updater");
+
+  const currentVersion = await getCurrentVersion();
+  const update = await check({ timeout: opts.timeout ?? 30000 } as any);
+
+  if (!update) {
+    return { status: "up-to-date" };
+  }
+
+  const mapped = mapUpdateHandle(update);
+  const info: UpdateInfo = {
+    currentVersion,
+    availableVersion: mapped.version,
+    notes: mapped.notes,
+    pubDate: mapped.date,
+  };
+
+  return { status: "available", info, update: mapped };
+}
+
+export async function relaunchApp(): Promise<void> {
+  const { relaunch } = await import("@tauri-apps/plugin-process");
+  await relaunch();
+}
+
+export async function runUpdateFlow(
+  opts: CheckOptions = {},
+): Promise<{ status: "up-to-date" | "done" }> {
+  const result = await checkForUpdate(opts);
+  if (result.status === "up-to-date") return result;
+
+  let downloaded = 0;
+  let total = 0;
+  await result.update.downloadAndInstall((e) => {
+    if (e.event === "Started") {
+      total = e.total ?? 0;
+      downloaded = 0;
+    } else if (e.event === "Progress") {
+      downloaded += e.downloaded ?? 0;
+      // 调用方可监听此处并更新 UI（目前设置页仅显示加载态）
+      console.debug("update progress", { downloaded, total });
+    }
+  });
+
+  await relaunchApp();
+  return { status: "done" };
+}
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,11 +1,17 @@
 export interface Provider {
  id: string;
  name: string;
-  settingsConfig: Record<string, any>; // 完整的 Claude Code settings.json 配置
+  settingsConfig: Record<string, any>; // 应用配置对象：Claude 为 settings.json；Codex 为 { auth, config }
  websiteUrl?: string;
+  createdAt?: number; // 添加时间戳（毫秒）
 }

 export interface AppConfig {
  providers: Record<string, Provider>;
  current: string;
 }
+
+// 应用设置类型（用于 SettingsModal 与 Tauri API）
+export interface Settings {
+  showInDock: boolean;
+}
--- a/src/utils/providerConfigUtils.ts
+++ b/src/utils/providerConfigUtils.ts
@@ -33,22 +33,6 @@ export const checkCoAuthoredSetting = (jsonString: string): boolean => {
  }
 };

-// 从JSON配置中提取并处理官网地址
-export const extractWebsiteUrl = (jsonString: string): string => {
-  try {
-    const config = JSON.parse(jsonString);
-    const baseUrl = config?.env?.ANTHROPIC_BASE_URL;
-
-    if (baseUrl && typeof baseUrl === "string") {
-      // 去掉 "api." 前缀
-      return baseUrl.replace(/^https?:\/\/api\./, "https://");
-    }
-  } catch (err) {
-    // 忽略JSON解析错误
-  }
-  return "";
-};
-
 // 读取配置中的 API Key（env.ANTHROPIC_AUTH_TOKEN）
 export const getApiKeyFromConfig = (jsonString: string): string => {
  try {
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -1,6 +1,8 @@
 /// <reference types="vite/client" />

-import { Provider } from "./types";
+import { Provider, Settings } from "./types";
+import { AppType } from "./lib/tauri-api";
+import type { UnlistenFn } from "@tauri-apps/api/event";

 interface ImportResult {
  success: boolean;
@@ -16,18 +18,28 @@ interface ConfigStatus {
 declare global {
  interface Window {
    api: {
-      getProviders: () => Promise<Record<string, Provider>>;
-      getCurrentProvider: () => Promise<string>;
-      addProvider: (provider: Provider) => Promise<boolean>;
-      deleteProvider: (id: string) => Promise<boolean>;
-      updateProvider: (provider: Provider) => Promise<boolean>;
-      switchProvider: (providerId: string) => Promise<boolean>;
-      importCurrentConfigAsDefault: () => Promise<ImportResult>;
+      getProviders: (app?: AppType) => Promise<Record<string, Provider>>;
+      getCurrentProvider: (app?: AppType) => Promise<string>;
+      addProvider: (provider: Provider, app?: AppType) => Promise<boolean>;
+      deleteProvider: (id: string, app?: AppType) => Promise<boolean>;
+      updateProvider: (provider: Provider, app?: AppType) => Promise<boolean>;
+      switchProvider: (providerId: string, app?: AppType) => Promise<boolean>;
+      importCurrentConfigAsDefault: (app?: AppType) => Promise<ImportResult>;
      getClaudeCodeConfigPath: () => Promise<string>;
      getClaudeConfigStatus: () => Promise<ConfigStatus>;
+      getConfigStatus: (app?: AppType) => Promise<ConfigStatus>;
      selectConfigFile: () => Promise<string | null>;
-      openConfigFolder: () => Promise<void>;
+      openConfigFolder: (app?: AppType) => Promise<void>;
      openExternal: (url: string) => Promise<void>;
+      updateTrayMenu: () => Promise<boolean>;
+      onProviderSwitched: (
+        callback: (data: { appType: string; providerId: string }) => void,
+      ) => Promise<UnlistenFn>;
+      getSettings: () => Promise<Settings>;
+      saveSettings: (settings: Settings) => Promise<boolean>;
+      checkForUpdates: () => Promise<void>;
+      getAppConfigPath: () => Promise<string>;
+      openAppConfigFolder: () => Promise<void>;
    };
    platform: {
      isMac: boolean;
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -0,0 +1,62 @@
+/** @type {import('tailwindcss').Config} */
+export default {
+  content: [
+    "./src/index.html",
+    "./src/**/*.{js,ts,jsx,tsx}",
+  ],
+  theme: {
+    extend: {
+      colors: {
+        // 扩展蓝色系列以匹配 Linear 风格
+        blue: {
+          500: '#3498db',
+          600: '#2980b9',
+          400: '#5dade2',
+        },
+        // 自定义灰色系列
+        gray: {
+          50: '#fafafa',   // bg-primary
+          100: '#f4f4f5',  // bg-tertiary
+          200: '#e4e4e7',  // border
+          300: '#d4d4d8',  // border-hover
+          400: '#a1a1aa',  // text-tertiary
+          500: '#71717a',  // text-secondary
+          600: '#52525b',  // text-secondary-dark
+          700: '#3f3f46',  // bg-tertiary-dark
+          800: '#27272a',  // bg-secondary-dark
+          900: '#18181b',  // text-primary
+          950: '#0a0a0b',  // bg-primary-dark
+        },
+        // 状态颜色
+        green: {
+          500: '#10b981',
+          100: '#d1fae5',
+        },
+        red: {
+          500: '#ef4444',
+          100: '#fee2e2',
+        },
+        amber: {
+          500: '#f59e0b',
+          100: '#fef3c7',
+        },
+      },
+      boxShadow: {
+        'sm': '0 1px 2px 0 rgb(0 0 0 / 0.05)',
+        'md': '0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)',
+        'lg': '0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1)',
+      },
+      borderRadius: {
+        'sm': '0.375rem',
+        'md': '0.5rem',
+        'lg': '0.75rem',
+        'xl': '0.875rem',
+      },
+      fontFamily: {
+        sans: ['-apple-system', 'BlinkMacSystemFont', '"Segoe UI"', 'Roboto', '"Helvetica Neue"', 'Arial', 'sans-serif'],
+        mono: ['ui-monospace', 'SFMono-Regular', '"SF Mono"', 'Consolas', '"Liberation Mono"', 'Menlo', 'monospace'],
+      },
+    },
+  },
+  plugins: [],
+}
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -2,8 +2,8 @@
  "compilerOptions": {
    "composite": true,
    "skipLibCheck": true,
-    "module": "CommonJS",
-    "moduleResolution": "node",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
    "allowSyntheticDefaultImports": true,
    "resolveJsonModule": true,
    "esModuleInterop": true,
@@ -11,5 +11,5 @@
    "strict": true,
    "types": ["node"]
  },
-  "include": ["vite.config.ts"]
-}
+  "include": ["vite.config.mts"]
+}
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -0,0 +1,19 @@
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+import tailwindcss from "@tailwindcss/vite";
+
+export default defineConfig({
+  root: "src",
+  plugins: [react(), tailwindcss()],
+  base: "./",
+  build: {
+    outDir: "../dist",
+    emptyOutDir: true,
+  },
+  server: {
+    port: 3000,
+    strictPort: true,
+  },
+  clearScreen: false,
+  envPrefix: ["VITE_", "TAURI_"],
+});
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,18 +0,0 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
-
-export default defineConfig({
-  root: 'src',
-  plugins: [react()],
-  base: './',
-  build: {
-    outDir: '../dist',
-    emptyOutDir: true
-  },
-  server: {
-    port: 3000,
-    strictPort: true
-  },
-  clearScreen: false,
-  envPrefix: ['VITE_', 'TAURI_']
-})