feat(skills): add search functionality to Skills page

- Add search input with Search icon in SkillsPage component
- Implement useMemo-based filtering by skill name, description, and directory
- Display search results count when filtering is active
- Show "no results" message when no skills match the search query
- Add i18n translations for search UI (zh/en)
- Maintain responsive layout and consistent styling with existing UI

README.md

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

README_ZH.md

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

src-tauri/Cargo.lock

@@ -39,6 +39,18 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -614,6 +626,7 @@ dependencies = [
  "chrono",
  "dirs 5.0.1",
  "futures",
+ "indexmap 2.11.4",
  "log",
  "objc2 0.5.2",
  "objc2-app-kit 0.2.2",
@@ -621,6 +634,7 @@ dependencies = [
  "regex",
  "reqwest",
  "rquickjs",
+ "rusqlite",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -1275,6 +1289,18 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "fallible-iterator"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
+
+[[package]]
+name = "fallible-streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
+
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -1813,7 +1839,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash",
+ "ahash 0.7.8",
 ]
 
 [[package]]
@@ -1821,6 +1847,9 @@ name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash 0.8.12",
+]
 
 [[package]]
 name = "hashbrown"
@@ -1828,6 +1857,15 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 
+[[package]]
+name = "hashlink"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
+dependencies = [
+ "hashbrown 0.14.5",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -2398,6 +2436,17 @@ dependencies = [
  "redox_syscall",
 ]
 
+[[package]]
+name = "libsqlite3-sys"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.11.0"
@@ -3849,6 +3898,20 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "rusqlite"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
+dependencies = [
+ "bitflags 2.9.4",
+ "fallible-iterator",
+ "fallible-streaming-iterator",
+ "hashlink",
+ "libsqlite3-sys",
+ "smallvec",
+]
+
 [[package]]
 name = "rust-ini"
 version = "0.21.3"
@@ -5567,6 +5630,12 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version-compare"
 version = "0.2.0"

src-tauri/Cargo.toml

@@ -51,6 +51,8 @@ url = "2.5"
 auto-launch = "0.5"
 once_cell = "1.21.3"
 base64 = "0.22"
+rusqlite = { version = "0.31", features = ["bundled"] }
+indexmap = { version = "2", features = ["serde"] }
 
 [target.'cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))'.dependencies]
 tauri-plugin-single-instance = "2"

src-tauri/src/codex_config.rs

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

src-tauri/src/commands/config.rs

@@ -141,11 +141,10 @@ pub async fn open_app_config_folder(handle: AppHandle) -> Result<bool, String> {
 pub async fn get_claude_common_config_snippet(
     state: tauri::State<'_, crate::store::AppState>,
 ) -> Result<Option<String>, String> {
-    let guard = state
-        .config
-        .read()
-        .map_err(|e| format!("读取配置锁失败: {e}"))?;
-    Ok(guard.common_config_snippets.claude.clone())
+    state
+        .db
+        .get_config_snippet("claude")
+        .map_err(|e| e.to_string())
 }
 
 /// 设置 Claude 通用配置片段（已废弃，使用 set_common_config_snippet）
@@ -154,24 +153,22 @@ pub async fn set_claude_common_config_snippet(
     snippet: String,
     state: tauri::State<'_, crate::store::AppState>,
 ) -> Result<(), String> {
-    let mut guard = state
-        .config
-        .write()
-        .map_err(|e| format!("写入配置锁失败: {e}"))?;
-
     // 验证是否为有效的 JSON（如果不为空）
     if !snippet.trim().is_empty() {
         serde_json::from_str::<serde_json::Value>(&snippet)
             .map_err(|e| format!("无效的 JSON 格式: {e}"))?;
     }
 
-    guard.common_config_snippets.claude = if snippet.trim().is_empty() {
+    let value = if snippet.trim().is_empty() {
         None
     } else {
         Some(snippet)
     };
 
-    guard.save().map_err(|e| e.to_string())?;
+    state
+        .db
+        .set_config_snippet("claude", value)
+        .map_err(|e| e.to_string())?;
     Ok(())
 }
 
@@ -181,17 +178,10 @@ pub async fn get_common_config_snippet(
     app_type: String,
     state: tauri::State<'_, crate::store::AppState>,
 ) -> Result<Option<String>, String> {
-    use crate::app_config::AppType;
-    use std::str::FromStr;
-
-    let app = AppType::from_str(&app_type).map_err(|e| format!("无效的应用类型: {e}"))?;
-
-    let guard = state
-        .config
-        .read()
-        .map_err(|e| format!("读取配置锁失败: {e}"))?;
-
-    Ok(guard.common_config_snippets.get(&app).cloned())
+    state
+        .db
+        .get_config_snippet(&app_type)
+        .map_err(|e| e.to_string())
 }
 
 /// 设置通用配置片段（统一接口）
@@ -201,40 +191,31 @@ pub async fn set_common_config_snippet(
     snippet: String,
     state: tauri::State<'_, crate::store::AppState>,
 ) -> Result<(), String> {
-    use crate::app_config::AppType;
-    use std::str::FromStr;
-
-    let app = AppType::from_str(&app_type).map_err(|e| format!("无效的应用类型: {e}"))?;
-
-    let mut guard = state
-        .config
-        .write()
-        .map_err(|e| format!("写入配置锁失败: {e}"))?;
-
     // 验证格式（根据应用类型）
     if !snippet.trim().is_empty() {
-        match app {
-            AppType::Claude | AppType::Gemini => {
+        match app_type.as_str() {
+            "claude" | "gemini" => {
                 // 验证 JSON 格式
                 serde_json::from_str::<serde_json::Value>(&snippet)
                     .map_err(|e| format!("无效的 JSON 格式: {e}"))?;
             }
-            AppType::Codex => {
+            "codex" => {
                 // TOML 格式暂不验证（或可使用 toml crate）
                 // 注意：TOML 验证较为复杂，暂时跳过
             }
+            _ => {}
         }
     }
 
-    guard.common_config_snippets.set(
-        &app,
-        if snippet.trim().is_empty() {
-            None
-        } else {
-            Some(snippet)
-        },
-    );
+    let value = if snippet.trim().is_empty() {
+        None
+    } else {
+        Some(snippet)
+    };
 
-    guard.save().map_err(|e| e.to_string())?;
+    state
+        .db
+        .set_config_snippet(&app_type, value)
+        .map_err(|e| e.to_string())?;
     Ok(())
 }

src-tauri/src/commands/import_export.rs

@@ -29,11 +29,17 @@ pub async fn export_config_to_file(
 }
 
 /// 从文件导入配置
+/// TODO: 需要重构以使用数据库而不是 JSON 配置
 #[tauri::command]
 pub async fn import_config_from_file(
-    #[allow(non_snake_case)] filePath: String,
-    state: State<'_, AppState>,
+    #[allow(non_snake_case)] _filePath: String,
+    _state: State<'_, AppState>,
 ) -> Result<Value, String> {
+    // TODO: 实现基于数据库的导入逻辑
+    // 当前暂时禁用此功能
+    Err("配置导入功能正在重构中,暂时不可用".to_string())
+
+    /* 旧的实现,需要重构:
     let (new_config, backup_id) = tauri::async_runtime::spawn_blocking(move || {
         let path_buf = PathBuf::from(&filePath);
         ConfigService::load_config_for_import(&path_buf)
@@ -55,11 +61,18 @@ pub async fn import_config_from_file(
         "message": "Configuration imported successfully",
         "backupId": backup_id
     }))
+    */
 }
 
 /// 同步当前供应商配置到对应的 live 文件
+/// TODO: 需要重构以使用数据库而不是 JSON 配置
 #[tauri::command]
-pub async fn sync_current_providers_live(state: State<'_, AppState>) -> Result<Value, String> {
+pub async fn sync_current_providers_live(_state: State<'_, AppState>) -> Result<Value, String> {
+    // TODO: 实现基于数据库的同步逻辑
+    // 当前暂时禁用此功能
+    Err("配置同步功能正在重构中,暂时不可用".to_string())
+
+    /* 旧的实现,需要重构:
     {
         let mut config_state = state
             .config
@@ -73,6 +86,7 @@ pub async fn sync_current_providers_live(state: State<'_, AppState>) -> Result<V
         "success": true,
         "message": "Live configuration synchronized"
     }))
+    */
 }
 
 /// 保存文件对话框

src-tauri/src/commands/mcp.rs

@@ -1,5 +1,6 @@
 #![allow(non_snake_case)]
 
+use indexmap::IndexMap;
 use std::collections::HashMap;
 
 use serde::Serialize;
@@ -82,12 +83,8 @@ pub async fn upsert_mcp_server_in_config(
 
     // 读取现有的服务器（如果存在）
     let existing_server = {
-        let cfg = state.config.read().map_err(|e| e.to_string())?;
-        if let Some(servers) = &cfg.mcp.servers {
-            servers.get(&id).cloned()
-        } else {
-            None
-        }
+        let servers = state.db.get_all_mcp_servers().map_err(|e| e.to_string())?;
+        servers.get(&id).cloned()
     };
 
     // 构建新的统一服务器结构
@@ -165,7 +162,7 @@ use crate::app_config::McpServer;
 #[tauri::command]
 pub async fn get_mcp_servers(
     state: State<'_, AppState>,
-) -> Result<HashMap<String, McpServer>, String> {
+) -> Result<IndexMap<String, McpServer>, String> {
     McpService::get_all_servers(&state).map_err(|e| e.to_string())
 }
 

src-tauri/src/commands/prompt.rs

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

src-tauri/src/commands/provider.rs

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

src-tauri/src/commands/skill.rs

@@ -13,10 +13,7 @@ pub async fn get_skills(
     service: State<'_, SkillServiceState>,
     app_state: State<'_, AppState>,
 ) -> Result<Vec<Skill>, String> {
-    let repos = {
-        let config = app_state.config.read().map_err(|e| e.to_string())?;
-        config.skills.repos.clone()
-    };
+    let repos = app_state.db.get_skill_repos().map_err(|e| e.to_string())?;
 
     service
         .0
@@ -32,10 +29,7 @@ pub async fn install_skill(
     app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
     // 先在不持有写锁的情况下收集仓库与技能信息
-    let repos = {
-        let config = app_state.config.read().map_err(|e| e.to_string())?;
-        config.skills.repos.clone()
-    };
+    let repos = app_state.db.get_skill_repos().map_err(|e| e.to_string())?;
 
     let skills = service
         .0
@@ -85,19 +79,16 @@ pub async fn install_skill(
             .map_err(|e| e.to_string())?;
     }
 
-    {
-        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
-
-        config.skills.skills.insert(
-            directory.clone(),
-            SkillState {
+    app_state
+        .db
+        .update_skill_state(
+            &directory,
+            &SkillState {
                 installed: true,
                 installed_at: Utc::now(),
             },
-        );
-    }
-
-    app_state.save().map_err(|e| e.to_string())?;
+        )
+        .map_err(|e| e.to_string())?;
 
     Ok(true)
 }
@@ -113,13 +104,17 @@ pub fn uninstall_skill(
         .uninstall_skill(directory.clone())
         .map_err(|e| e.to_string())?;
 
-    {
-        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
-
-        config.skills.skills.remove(&directory);
-    }
-
-    app_state.save().map_err(|e| e.to_string())?;
+    // Remove from database by setting installed = false
+    app_state
+        .db
+        .update_skill_state(
+            &directory,
+            &SkillState {
+                installed: false,
+                installed_at: Utc::now(),
+            },
+        )
+        .map_err(|e| e.to_string())?;
 
     Ok(true)
 }
@@ -129,28 +124,19 @@ pub fn get_skill_repos(
     _service: State<'_, SkillServiceState>,
     app_state: State<'_, AppState>,
 ) -> Result<Vec<SkillRepo>, String> {
-    let config = app_state.config.read().map_err(|e| e.to_string())?;
-
-    Ok(config.skills.repos.clone())
+    app_state.db.get_skill_repos().map_err(|e| e.to_string())
 }
 
 #[tauri::command]
 pub fn add_skill_repo(
     repo: SkillRepo,
-    service: State<'_, SkillServiceState>,
+    _service: State<'_, SkillServiceState>,
     app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
-    {
-        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
-
-        service
-            .0
-            .add_repo(&mut config.skills, repo)
-            .map_err(|e| e.to_string())?;
-    }
-
-    app_state.save().map_err(|e| e.to_string())?;
-
+    app_state
+        .db
+        .save_skill_repo(&repo)
+        .map_err(|e| e.to_string())?;
     Ok(true)
 }
 
@@ -158,19 +144,12 @@ pub fn add_skill_repo(
 pub fn remove_skill_repo(
     owner: String,
     name: String,
-    service: State<'_, SkillServiceState>,
+    _service: State<'_, SkillServiceState>,
     app_state: State<'_, AppState>,
 ) -> Result<bool, String> {
-    {
-        let mut config = app_state.config.write().map_err(|e| e.to_string())?;
-
-        service
-            .0
-            .remove_repo(&mut config.skills, owner, name)
-            .map_err(|e| e.to_string())?;
-    }
-
-    app_state.save().map_err(|e| e.to_string())?;
-
+    app_state
+        .db
+        .delete_skill_repo(&owner, &name)
+        .map_err(|e| e.to_string())?;
     Ok(true)
 }

src-tauri/src/config.rs

@@ -79,6 +79,7 @@ pub fn get_app_config_path() -> PathBuf {
 }
 
 /// 清理供应商名称，确保文件名安全
+#[allow(dead_code)]
 pub fn sanitize_provider_name(name: &str) -> String {
     name.chars()
         .map(|c| match c {
@@ -90,6 +91,7 @@ pub fn sanitize_provider_name(name: &str) -> String {
 }
 
 /// 获取供应商配置文件路径
+#[allow(dead_code)]
 pub fn get_provider_config_path(provider_id: &str, provider_name: Option<&str>) -> PathBuf {
     let base_name = provider_name
         .map(sanitize_provider_name)

src-tauri/src/database.rs

@@ -0,0 +1,846 @@
+use crate::app_config::{McpApps, McpServer, MultiAppConfig};
+use crate::config::get_app_config_dir;
+use crate::error::AppError;
+use crate::prompt::Prompt;
+use crate::provider::{Provider, ProviderMeta};
+use crate::services::skill::{SkillRepo, SkillState};
+use indexmap::IndexMap;
+use rusqlite::{params, Connection, Result};
+use std::collections::HashMap;
+use std::sync::Mutex;
+
+pub struct Database {
+    // 使用 Mutex 包装 Connection 以支持在多线程环境（如 Tauri State）中共享
+    // rusqlite::Connection 本身不是 Sync 的
+    conn: Mutex<Connection>,
+}
+
+impl Database {
+    /// 初始化数据库连接并创建表
+    pub fn init() -> Result<Self, AppError> {
+        let db_path = get_app_config_dir().join("cc-switch.db");
+
+        // 确保父目录存在
+        if let Some(parent) = db_path.parent() {
+            std::fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
+        }
+
+        let conn = Connection::open(&db_path).map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 启用外键约束
+        conn.execute("PRAGMA foreign_keys = ON;", [])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let db = Self {
+            conn: Mutex::new(conn),
+        };
+        db.create_tables()?;
+
+        Ok(db)
+    }
+
+    fn create_tables(&self) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+
+        // 1. Providers 表
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS providers (
+                id TEXT NOT NULL,
+                app_type TEXT NOT NULL,
+                name TEXT NOT NULL,
+                settings_config TEXT NOT NULL,
+                website_url TEXT,
+                category TEXT,
+                created_at INTEGER,
+                sort_index INTEGER,
+                notes TEXT,
+                icon TEXT,
+                icon_color TEXT,
+                meta TEXT,
+                is_current BOOLEAN NOT NULL DEFAULT 0,
+                PRIMARY KEY (id, app_type)
+            )",
+            [],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 2. Provider Endpoints 表
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS provider_endpoints (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                provider_id TEXT NOT NULL,
+                app_type TEXT NOT NULL,
+                url TEXT NOT NULL,
+                added_at INTEGER,
+                FOREIGN KEY (provider_id, app_type) REFERENCES providers(id, app_type) ON DELETE CASCADE
+            )",
+            [],
+        ).map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 3. MCP Servers 表
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS mcp_servers (
+                id TEXT PRIMARY KEY,
+                name TEXT NOT NULL,
+                server_config TEXT NOT NULL,
+                description TEXT,
+                homepage TEXT,
+                docs TEXT,
+                tags TEXT,
+                enabled_claude BOOLEAN NOT NULL DEFAULT 0,
+                enabled_codex BOOLEAN NOT NULL DEFAULT 0,
+                enabled_gemini BOOLEAN NOT NULL DEFAULT 0
+            )",
+            [],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 4. Prompts 表
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS prompts (
+                id TEXT NOT NULL,
+                app_type TEXT NOT NULL,
+                name TEXT NOT NULL,
+                content TEXT NOT NULL,
+                description TEXT,
+                enabled BOOLEAN NOT NULL DEFAULT 1,
+                created_at INTEGER,
+                updated_at INTEGER,
+                PRIMARY KEY (id, app_type)
+            )",
+            [],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 5. Skills 表
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS skills (
+                key TEXT PRIMARY KEY,
+                installed BOOLEAN NOT NULL DEFAULT 0,
+                installed_at INTEGER
+            )",
+            [],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 6. Skill Repos 表
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS skill_repos (
+                owner TEXT NOT NULL,
+                name TEXT NOT NULL,
+                branch TEXT NOT NULL,
+                enabled BOOLEAN NOT NULL DEFAULT 1,
+                skills_path TEXT,
+                PRIMARY KEY (owner, name)
+            )",
+            [],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 7. Settings 表 (通用配置)
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS settings (
+                key TEXT PRIMARY KEY,
+                value TEXT
+            )",
+            [],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// 从 MultiAppConfig 迁移数据
+    pub fn migrate_from_json(&self, config: &MultiAppConfig) -> Result<(), AppError> {
+        let mut conn = self.conn.lock().unwrap();
+        let tx = conn
+            .transaction()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 1. 迁移 Providers
+        for (app_key, manager) in &config.apps {
+            let app_type = app_key; // "claude", "codex", "gemini"
+            let current_id = &manager.current;
+
+            for (id, provider) in &manager.providers {
+                let is_current = if id == current_id { 1 } else { 0 };
+
+                // 处理 meta 和 endpoints
+                let mut meta_clone = provider.meta.clone().unwrap_or_default();
+                let endpoints = std::mem::take(&mut meta_clone.custom_endpoints);
+
+                tx.execute(
+                    "INSERT OR REPLACE INTO providers (
+                        id, app_type, name, settings_config, website_url, category, 
+                        created_at, sort_index, notes, icon, icon_color, meta, is_current
+                    ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)",
+                    params![
+                        id,
+                        app_type,
+                        provider.name,
+                        serde_json::to_string(&provider.settings_config).unwrap(),
+                        provider.website_url,
+                        provider.category,
+                        provider.created_at,
+                        provider.sort_index,
+                        provider.notes,
+                        provider.icon,
+                        provider.icon_color,
+                        serde_json::to_string(&meta_clone).unwrap(), // 不含 endpoints 的 meta
+                        is_current,
+                    ],
+                )
+                .map_err(|e| AppError::Database(format!("Migrate provider failed: {e}")))?;
+
+                // 迁移 Endpoints
+                for (url, endpoint) in endpoints {
+                    tx.execute(
+                        "INSERT INTO provider_endpoints (provider_id, app_type, url, added_at)
+                         VALUES (?1, ?2, ?3, ?4)",
+                        params![id, app_type, url, endpoint.added_at],
+                    )
+                    .map_err(|e| AppError::Database(format!("Migrate endpoint failed: {e}")))?;
+                }
+            }
+        }
+
+        // 2. 迁移 MCP Servers
+        if let Some(servers) = &config.mcp.servers {
+            for (id, server) in servers {
+                tx.execute(
+                    "INSERT OR REPLACE INTO mcp_servers (
+                        id, name, server_config, description, homepage, docs, tags,
+                        enabled_claude, enabled_codex, enabled_gemini
+                    ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)",
+                    params![
+                        id,
+                        server.name,
+                        serde_json::to_string(&server.server).unwrap(),
+                        server.description,
+                        server.homepage,
+                        server.docs,
+                        serde_json::to_string(&server.tags).unwrap(),
+                        server.apps.claude,
+                        server.apps.codex,
+                        server.apps.gemini,
+                    ],
+                )
+                .map_err(|e| AppError::Database(format!("Migrate mcp server failed: {e}")))?;
+            }
+        }
+
+        // 3. 迁移 Prompts
+        let migrate_prompts =
+            |prompts_map: &std::collections::HashMap<String, crate::prompt::Prompt>,
+             app_type: &str|
+             -> Result<(), AppError> {
+                for (id, prompt) in prompts_map {
+                    tx.execute(
+                        "INSERT OR REPLACE INTO prompts (
+                        id, app_type, name, content, description, enabled, created_at, updated_at
+                    ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)",
+                        params![
+                            id,
+                            app_type,
+                            prompt.name,
+                            prompt.content,
+                            prompt.description,
+                            prompt.enabled,
+                            prompt.created_at,
+                            prompt.updated_at,
+                        ],
+                    )
+                    .map_err(|e| AppError::Database(format!("Migrate prompt failed: {e}")))?;
+                }
+                Ok(())
+            };
+
+        migrate_prompts(&config.prompts.claude.prompts, "claude")?;
+        migrate_prompts(&config.prompts.codex.prompts, "codex")?;
+        migrate_prompts(&config.prompts.gemini.prompts, "gemini")?;
+
+        // 4. 迁移 Skills
+        for (key, state) in &config.skills.skills {
+            tx.execute(
+                "INSERT OR REPLACE INTO skills (key, installed, installed_at) VALUES (?1, ?2, ?3)",
+                params![key, state.installed, state.installed_at.timestamp()],
+            )
+            .map_err(|e| AppError::Database(format!("Migrate skill failed: {e}")))?;
+        }
+
+        for repo in &config.skills.repos {
+            tx.execute(
+                "INSERT OR REPLACE INTO skill_repos (owner, name, branch, enabled, skills_path) VALUES (?1, ?2, ?3, ?4, ?5)",
+                params![repo.owner, repo.name, repo.branch, repo.enabled, repo.skills_path],
+            ).map_err(|e| AppError::Database(format!("Migrate skill repo failed: {e}")))?;
+        }
+
+        // 5. 迁移 Common Config
+        if let Some(snippet) = &config.common_config_snippets.claude {
+            tx.execute(
+                "INSERT OR REPLACE INTO settings (key, value) VALUES (?1, ?2)",
+                params!["common_config_claude", snippet],
+            )
+            .map_err(|e| AppError::Database(format!("Migrate settings failed: {e}")))?;
+        }
+        if let Some(snippet) = &config.common_config_snippets.codex {
+            tx.execute(
+                "INSERT OR REPLACE INTO settings (key, value) VALUES (?1, ?2)",
+                params!["common_config_codex", snippet],
+            )
+            .map_err(|e| AppError::Database(format!("Migrate settings failed: {e}")))?;
+        }
+        if let Some(snippet) = &config.common_config_snippets.gemini {
+            tx.execute(
+                "INSERT OR REPLACE INTO settings (key, value) VALUES (?1, ?2)",
+                params!["common_config_gemini", snippet],
+            )
+            .map_err(|e| AppError::Database(format!("Migrate settings failed: {e}")))?;
+        }
+
+        tx.commit()
+            .map_err(|e| AppError::Database(format!("Commit migration failed: {e}")))?;
+        Ok(())
+    }
+
+    // --- Providers DAO ---
+
+    pub fn get_all_providers(
+        &self,
+        app_type: &str,
+    ) -> Result<IndexMap<String, Provider>, AppError> {
+        let conn = self.conn.lock().unwrap();
+        let mut stmt = conn.prepare(
+            "SELECT id, name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta
+             FROM providers WHERE app_type = ?1
+             ORDER BY COALESCE(sort_index, 999999), created_at ASC, id ASC"
+        ).map_err(|e| AppError::Database(e.to_string()))?;
+
+        let provider_iter = stmt
+            .query_map(params![app_type], |row| {
+                let id: String = row.get(0)?;
+                let name: String = row.get(1)?;
+                let settings_config_str: String = row.get(2)?;
+                let website_url: Option<String> = row.get(3)?;
+                let category: Option<String> = row.get(4)?;
+                let created_at: Option<i64> = row.get(5)?;
+                let sort_index: Option<usize> = row.get(6)?;
+                let notes: Option<String> = row.get(7)?;
+                let icon: Option<String> = row.get(8)?;
+                let icon_color: Option<String> = row.get(9)?;
+                let meta_str: String = row.get(10)?;
+
+                let settings_config =
+                    serde_json::from_str(&settings_config_str).unwrap_or(serde_json::Value::Null);
+                let meta: ProviderMeta = serde_json::from_str(&meta_str).unwrap_or_default();
+
+                Ok((
+                    id,
+                    Provider {
+                        id: "".to_string(), // Placeholder, set below
+                        name,
+                        settings_config,
+                        website_url,
+                        category,
+                        created_at,
+                        sort_index,
+                        notes,
+                        meta: Some(meta),
+                        icon,
+                        icon_color,
+                    },
+                ))
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut providers = IndexMap::new();
+        for provider_res in provider_iter {
+            let (id, mut provider) = provider_res.map_err(|e| AppError::Database(e.to_string()))?;
+            provider.id = id.clone();
+
+            // Load endpoints
+            let mut stmt_endpoints = conn.prepare(
+                "SELECT url, added_at FROM provider_endpoints WHERE provider_id = ?1 AND app_type = ?2 ORDER BY added_at ASC, url ASC"
+            ).map_err(|e| AppError::Database(e.to_string()))?;
+
+            let endpoints_iter = stmt_endpoints
+                .query_map(params![id, app_type], |row| {
+                    let url: String = row.get(0)?;
+                    let added_at: Option<i64> = row.get(1)?;
+                    Ok((
+                        url,
+                        crate::settings::CustomEndpoint {
+                            url: "".to_string(),
+                            added_at: added_at.unwrap_or(0),
+                            last_used: None,
+                        },
+                    ))
+                })
+                .map_err(|e| AppError::Database(e.to_string()))?;
+
+            let mut custom_endpoints = HashMap::new();
+            for ep_res in endpoints_iter {
+                let (url, mut ep) = ep_res.map_err(|e| AppError::Database(e.to_string()))?;
+                ep.url = url.clone();
+                custom_endpoints.insert(url, ep);
+            }
+
+            if let Some(meta) = &mut provider.meta {
+                meta.custom_endpoints = custom_endpoints;
+            }
+
+            providers.insert(id, provider);
+        }
+
+        Ok(providers)
+    }
+
+    pub fn get_current_provider(&self, app_type: &str) -> Result<Option<String>, AppError> {
+        let conn = self.conn.lock().unwrap();
+        let mut stmt = conn
+            .prepare("SELECT id FROM providers WHERE app_type = ?1 AND is_current = 1 LIMIT 1")
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut rows = stmt
+            .query(params![app_type])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        if let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
+            Ok(Some(
+                row.get(0).map_err(|e| AppError::Database(e.to_string()))?,
+            ))
+        } else {
+            Ok(None)
+        }
+    }
+
+    pub fn save_provider(&self, app_type: &str, provider: &Provider) -> Result<(), AppError> {
+        let mut conn = self.conn.lock().unwrap();
+        let tx = conn
+            .transaction()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // Handle meta and endpoints
+        let mut meta_clone = provider.meta.clone().unwrap_or_default();
+        let endpoints = std::mem::take(&mut meta_clone.custom_endpoints);
+
+        // Check if it exists to preserve is_current
+        let is_current: bool = tx
+            .query_row(
+                "SELECT is_current FROM providers WHERE id = ?1 AND app_type = ?2",
+                params![provider.id, app_type],
+                |row| row.get(0),
+            )
+            .unwrap_or(false);
+
+        tx.execute(
+            "INSERT OR REPLACE INTO providers (
+                id, app_type, name, settings_config, website_url, category, 
+                created_at, sort_index, notes, icon, icon_color, meta, is_current
+            ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)",
+            params![
+                provider.id,
+                app_type,
+                provider.name,
+                serde_json::to_string(&provider.settings_config).unwrap(),
+                provider.website_url,
+                provider.category,
+                provider.created_at,
+                provider.sort_index,
+                provider.notes,
+                provider.icon,
+                provider.icon_color,
+                serde_json::to_string(&meta_clone).unwrap(),
+                is_current,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // Sync endpoints: Delete all and re-insert
+        tx.execute(
+            "DELETE FROM provider_endpoints WHERE provider_id = ?1 AND app_type = ?2",
+            params![provider.id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        for (url, endpoint) in endpoints {
+            tx.execute(
+                "INSERT INTO provider_endpoints (provider_id, app_type, url, added_at)
+                 VALUES (?1, ?2, ?3, ?4)",
+                params![provider.id, app_type, url, endpoint.added_at],
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        }
+
+        tx.commit().map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    pub fn delete_provider(&self, app_type: &str, id: &str) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute(
+            "DELETE FROM providers WHERE id = ?1 AND app_type = ?2",
+            params![id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    pub fn set_current_provider(&self, app_type: &str, id: &str) -> Result<(), AppError> {
+        let mut conn = self.conn.lock().unwrap();
+        let tx = conn
+            .transaction()
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // Reset all to 0
+        tx.execute(
+            "UPDATE providers SET is_current = 0 WHERE app_type = ?1",
+            params![app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // Set new current
+        tx.execute(
+            "UPDATE providers SET is_current = 1 WHERE id = ?1 AND app_type = ?2",
+            params![id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        tx.commit().map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    pub fn add_custom_endpoint(
+        &self,
+        app_type: &str,
+        provider_id: &str,
+        url: &str,
+    ) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        let added_at = chrono::Utc::now().timestamp_millis();
+        conn.execute(
+            "INSERT INTO provider_endpoints (provider_id, app_type, url, added_at) VALUES (?1, ?2, ?3, ?4)",
+            params![provider_id, app_type, url, added_at],
+        ).map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    pub fn remove_custom_endpoint(
+        &self,
+        app_type: &str,
+        provider_id: &str,
+        url: &str,
+    ) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute(
+            "DELETE FROM provider_endpoints WHERE provider_id = ?1 AND app_type = ?2 AND url = ?3",
+            params![provider_id, app_type, url],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    // --- MCP Servers DAO ---
+
+    pub fn get_all_mcp_servers(&self) -> Result<IndexMap<String, McpServer>, AppError> {
+        let conn = self.conn.lock().unwrap();
+        let mut stmt = conn.prepare(
+            "SELECT id, name, server_config, description, homepage, docs, tags, enabled_claude, enabled_codex, enabled_gemini
+             FROM mcp_servers
+             ORDER BY name ASC, id ASC"
+        ).map_err(|e| AppError::Database(e.to_string()))?;
+
+        let server_iter = stmt
+            .query_map([], |row| {
+                let id: String = row.get(0)?;
+                let name: String = row.get(1)?;
+                let server_config_str: String = row.get(2)?;
+                let description: Option<String> = row.get(3)?;
+                let homepage: Option<String> = row.get(4)?;
+                let docs: Option<String> = row.get(5)?;
+                let tags_str: String = row.get(6)?;
+                let enabled_claude: bool = row.get(7)?;
+                let enabled_codex: bool = row.get(8)?;
+                let enabled_gemini: bool = row.get(9)?;
+
+                let server = serde_json::from_str(&server_config_str).unwrap_or_default();
+                let tags = serde_json::from_str(&tags_str).unwrap_or_default();
+
+                Ok((
+                    id.clone(),
+                    McpServer {
+                        id,
+                        name,
+                        server,
+                        apps: McpApps {
+                            claude: enabled_claude,
+                            codex: enabled_codex,
+                            gemini: enabled_gemini,
+                        },
+                        description,
+                        homepage,
+                        docs,
+                        tags,
+                    },
+                ))
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut servers = IndexMap::new();
+        for server_res in server_iter {
+            let (id, server) = server_res.map_err(|e| AppError::Database(e.to_string()))?;
+            servers.insert(id, server);
+        }
+        Ok(servers)
+    }
+
+    pub fn save_mcp_server(&self, server: &McpServer) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute(
+            "INSERT OR REPLACE INTO mcp_servers (
+                id, name, server_config, description, homepage, docs, tags,
+                enabled_claude, enabled_codex, enabled_gemini
+            ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)",
+            params![
+                server.id,
+                server.name,
+                serde_json::to_string(&server.server).unwrap(),
+                server.description,
+                server.homepage,
+                server.docs,
+                serde_json::to_string(&server.tags).unwrap(),
+                server.apps.claude,
+                server.apps.codex,
+                server.apps.gemini,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    pub fn delete_mcp_server(&self, id: &str) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute("DELETE FROM mcp_servers WHERE id = ?1", params![id])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    // --- Prompts DAO ---
+
+    pub fn get_prompts(&self, app_type: &str) -> Result<IndexMap<String, Prompt>, AppError> {
+        let conn = self.conn.lock().unwrap();
+        let mut stmt = conn
+            .prepare(
+                "SELECT id, name, content, description, enabled, created_at, updated_at
+             FROM prompts WHERE app_type = ?1
+             ORDER BY created_at ASC, id ASC",
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let prompt_iter = stmt
+            .query_map(params![app_type], |row| {
+                let id: String = row.get(0)?;
+                let name: String = row.get(1)?;
+                let content: String = row.get(2)?;
+                let description: Option<String> = row.get(3)?;
+                let enabled: bool = row.get(4)?;
+                let created_at: Option<i64> = row.get(5)?;
+                let updated_at: Option<i64> = row.get(6)?;
+
+                Ok((
+                    id.clone(),
+                    Prompt {
+                        id,
+                        name,
+                        content,
+                        description,
+                        enabled,
+                        created_at,
+                        updated_at,
+                    },
+                ))
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut prompts = IndexMap::new();
+        for prompt_res in prompt_iter {
+            let (id, prompt) = prompt_res.map_err(|e| AppError::Database(e.to_string()))?;
+            prompts.insert(id, prompt);
+        }
+        Ok(prompts)
+    }
+
+    pub fn save_prompt(&self, app_type: &str, prompt: &Prompt) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute(
+            "INSERT OR REPLACE INTO prompts (
+                id, app_type, name, content, description, enabled, created_at, updated_at
+            ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)",
+            params![
+                prompt.id,
+                app_type,
+                prompt.name,
+                prompt.content,
+                prompt.description,
+                prompt.enabled,
+                prompt.created_at,
+                prompt.updated_at,
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    pub fn delete_prompt(&self, app_type: &str, id: &str) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute(
+            "DELETE FROM prompts WHERE id = ?1 AND app_type = ?2",
+            params![id, app_type],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    // --- Skills DAO ---
+
+    pub fn get_skills(&self) -> Result<IndexMap<String, SkillState>, AppError> {
+        let conn = self.conn.lock().unwrap();
+        let mut stmt = conn
+            .prepare("SELECT key, installed, installed_at FROM skills ORDER BY key ASC")
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let skill_iter = stmt
+            .query_map([], |row| {
+                let key: String = row.get(0)?;
+                let installed: bool = row.get(1)?;
+                let installed_at_ts: i64 = row.get(2)?;
+
+                let installed_at =
+                    chrono::DateTime::from_timestamp(installed_at_ts, 0).unwrap_or_default();
+
+                Ok((
+                    key,
+                    SkillState {
+                        installed,
+                        installed_at,
+                    },
+                ))
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut skills = IndexMap::new();
+        for skill_res in skill_iter {
+            let (key, skill) = skill_res.map_err(|e| AppError::Database(e.to_string()))?;
+            skills.insert(key, skill);
+        }
+        Ok(skills)
+    }
+
+    pub fn update_skill_state(&self, key: &str, state: &SkillState) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute(
+            "INSERT OR REPLACE INTO skills (key, installed, installed_at) VALUES (?1, ?2, ?3)",
+            params![key, state.installed, state.installed_at.timestamp()],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    pub fn get_skill_repos(&self) -> Result<Vec<SkillRepo>, AppError> {
+        let conn = self.conn.lock().unwrap();
+        let mut stmt = conn
+            .prepare("SELECT owner, name, branch, enabled, skills_path FROM skill_repos ORDER BY owner ASC, name ASC")
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let repo_iter = stmt
+            .query_map([], |row| {
+                Ok(SkillRepo {
+                    owner: row.get(0)?,
+                    name: row.get(1)?,
+                    branch: row.get(2)?,
+                    enabled: row.get(3)?,
+                    skills_path: row.get(4)?,
+                })
+            })
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut repos = Vec::new();
+        for repo_res in repo_iter {
+            repos.push(repo_res.map_err(|e| AppError::Database(e.to_string()))?);
+        }
+        Ok(repos)
+    }
+
+    pub fn save_skill_repo(&self, repo: &SkillRepo) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute(
+            "INSERT OR REPLACE INTO skill_repos (owner, name, branch, enabled, skills_path) VALUES (?1, ?2, ?3, ?4, ?5)",
+            params![repo.owner, repo.name, repo.branch, repo.enabled, repo.skills_path],
+        ).map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    pub fn delete_skill_repo(&self, owner: &str, name: &str) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute(
+            "DELETE FROM skill_repos WHERE owner = ?1 AND name = ?2",
+            params![owner, name],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    // --- Settings DAO ---
+
+    pub fn get_setting(&self, key: &str) -> Result<Option<String>, AppError> {
+        let conn = self.conn.lock().unwrap();
+        let mut stmt = conn
+            .prepare("SELECT value FROM settings WHERE key = ?1")
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut rows = stmt
+            .query(params![key])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        if let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
+            Ok(Some(
+                row.get(0).map_err(|e| AppError::Database(e.to_string()))?,
+            ))
+        } else {
+            Ok(None)
+        }
+    }
+
+    pub fn set_setting(&self, key: &str, value: &str) -> Result<(), AppError> {
+        let conn = self.conn.lock().unwrap();
+        conn.execute(
+            "INSERT OR REPLACE INTO settings (key, value) VALUES (?1, ?2)",
+            params![key, value],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+        Ok(())
+    }
+
+    // --- Config Snippets Helper Methods ---
+
+    pub fn get_config_snippet(&self, app_type: &str) -> Result<Option<String>, AppError> {
+        self.get_setting(&format!("common_config_{app_type}"))
+    }
+
+    pub fn set_config_snippet(
+        &self,
+        app_type: &str,
+        snippet: Option<String>,
+    ) -> Result<(), AppError> {
+        let key = format!("common_config_{app_type}");
+        if let Some(value) = snippet {
+            self.set_setting(&key, &value)
+        } else {
+            // Delete if None
+            let conn = self.conn.lock().unwrap();
+            conn.execute("DELETE FROM settings WHERE key = ?1", params![key])
+                .map_err(|e| AppError::Database(e.to_string()))?;
+            Ok(())
+        }
+    }
+}

src-tauri/src/error.rs

@@ -50,6 +50,8 @@ pub enum AppError {
         zh: String,
         en: String,
     },
+    #[error("数据库错误: {0}")]
+    Database(String),
 }
 
 impl AppError {

src-tauri/src/gemini_mcp.rs

@@ -96,7 +96,20 @@ pub fn set_mcp_servers_map(
             obj = server_obj;
         }
 
-        // 移除 UI 辅助字段
+        // Gemini CLI 格式转换：
+        // - Gemini 不使用 "type" 字段（从字段名推断传输类型）
+        // - HTTP 使用 "httpUrl" 字段，SSE 使用 "url" 字段
+        let transport_type = obj.get("type").and_then(|v| v.as_str());
+        if transport_type == Some("http") {
+            // HTTP streaming: 将 "url" 重命名为 "httpUrl"
+            if let Some(url_value) = obj.remove("url") {
+                obj.insert("httpUrl".to_string(), url_value);
+            }
+        }
+        // SSE 保持 "url" 字段不变
+
+        // 移除 UI 辅助字段和 type 字段（Gemini 不需要）
+        obj.remove("type");
         obj.remove("enabled");
         obj.remove("source");
         obj.remove("id");

src-tauri/src/init_status.rs

@@ -13,7 +13,9 @@ fn cell() -> &'static RwLock<Option<InitErrorPayload>> {
     INIT_ERROR.get_or_init(|| RwLock::new(None))
 }
 
+#[allow(dead_code)]
 pub fn set_init_error(payload: InitErrorPayload) {
+    #[allow(clippy::unwrap_used)]
     if let Ok(mut guard) = cell().write() {
         *guard = Some(payload);
     }

src-tauri/src/lib.rs

@@ -6,6 +6,7 @@ mod claude_plugin;
 mod codex_config;
 mod commands;
 mod config;
+mod database;
 mod deeplink;
 mod error;
 mod gemini_config; // 新增
@@ -206,8 +207,6 @@ fn create_tray_menu(
     let app_settings = crate::settings::get_settings();
     let tray_texts = TrayTexts::from_language(app_settings.language.as_deref().unwrap_or("zh"));
 
-    let config = app_state.config.read().map_err(AppError::from)?;
-
     let mut menu_builder = MenuBuilder::new(app);
 
     // 顶部：打开主界面
@@ -218,13 +217,20 @@ fn create_tray_menu(
 
     // 直接添加所有供应商到主菜单（扁平化结构，更简单可靠）
     for section in TRAY_SECTIONS.iter() {
-        menu_builder = append_provider_section(
-            app,
-            menu_builder,
-            config.get_manager(&section.app_type),
-            section,
-            &tray_texts,
-        )?;
+        let app_type_str = section.app_type.as_str();
+        let providers = app_state.db.get_all_providers(app_type_str)?;
+        let current_id = app_state
+            .db
+            .get_current_provider(app_type_str)?
+            .unwrap_or_default();
+
+        let manager = crate::provider::ProviderManager {
+            providers,
+            current: current_id,
+        };
+
+        menu_builder =
+            append_provider_section(app, menu_builder, Some(&manager), section, &tray_texts)?;
     }
 
     // 分隔符和退出菜单
@@ -523,42 +529,47 @@ pub fn run() {
             // 预先刷新 Store 覆盖配置，确保 AppState 初始化时可读取到最新路径
             app_store::refresh_app_config_dir_override(app.handle());
 
-            // 初始化应用状态（仅创建一次，并在本函数末尾注入 manage）
-            // 如果配置解析失败，则向前端发送错误事件并提前结束 setup（不落盘、不覆盖配置）。
-            let app_state = match AppState::try_new() {
-                Ok(state) => state,
-                Err(err) => {
-                    let path = crate::config::get_app_config_path();
-                    let payload_json = serde_json::json!({
-                        "path": path.display().to_string(),
-                        "error": err.to_string(),
-                    });
-                    // 事件通知（可能早于前端订阅，不保证送达）
-                    if let Err(e) = app.emit("configLoadError", payload_json) {
-                        log::error!("发射配置加载错误事件失败: {e}");
-                    }
-                    // 同时缓存错误，供前端启动阶段主动拉取
-                    crate::init_status::set_init_error(crate::init_status::InitErrorPayload {
-                        path: path.display().to_string(),
-                        error: err.to_string(),
-                    });
-                    // 不再继续构建托盘/命令依赖的状态，交由前端提示后退出。
-                    return Ok(());
+            // 初始化数据库
+            let app_config_dir = crate::config::get_app_config_dir();
+            let db_path = app_config_dir.join("cc-switch.db");
+            let json_path = app_config_dir.join("config.json");
+
+            // Check if migration is needed (DB doesn't exist but JSON does)
+            let migration_needed = !db_path.exists() && json_path.exists();
+
+            let db = match crate::database::Database::init() {
+                Ok(db) => Arc::new(db),
+                Err(e) => {
+                    log::error!("Failed to init database: {e}");
+                    // 这里的错误处理比较棘手，因为 setup 返回 Result<Box<dyn Error>>
+                    // 我们暂时记录日志并让应用继续运行（可能会崩溃）或者返回错误
+                    return Err(Box::new(e));
                 }
             };
 
+            if migration_needed {
+                log::info!("Starting migration from config.json to SQLite...");
+                match crate::app_config::MultiAppConfig::load() {
+                    Ok(config) => {
+                        if let Err(e) = db.migrate_from_json(&config) {
+                            log::error!("Migration failed: {e}");
+                        } else {
+                            log::info!("Migration successful");
+                            // Optional: Rename config.json
+                            // let _ = std::fs::rename(&json_path, json_path.with_extension("json.bak"));
+                        }
+                    }
+                    Err(e) => log::error!("Failed to load config.json for migration: {e}"),
+                }
+            }
+
+            let app_state = AppState::new(db);
+
             // 迁移旧的 app_config_dir 配置到 Store
             if let Err(e) = app_store::migrate_app_config_dir_from_settings(app.handle()) {
                 log::warn!("迁移 app_config_dir 失败: {e}");
             }
 
-            // 确保配置结构就绪（已移除旧版本的副本迁移逻辑）
-            {
-                let mut config_guard = app_state.config.write().unwrap();
-                config_guard.ensure_app(&app_config::AppType::Claude);
-                config_guard.ensure_app(&app_config::AppType::Codex);
-            }
-
             // 启动阶段不再无条件保存,避免意外覆盖用户配置。
 
             // 注册 deep-link URL 处理器（使用正确的 DeepLinkExt API）

src-tauri/src/mcp.rs

@@ -449,7 +449,7 @@ pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError>
             // 核心字段（需要手动处理的字段）
             let core_fields = match typ {
                 "stdio" => vec!["type", "command", "args", "env", "cwd"],
-                "http" | "sse" => vec!["type", "url", "headers"],
+                "http" | "sse" => vec!["type", "url", "http_headers"],
                 _ => vec!["type"],
             };
 
@@ -490,7 +490,13 @@ pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError>
                     if let Some(url) = entry_tbl.get("url").and_then(|v| v.as_str()) {
                         spec.insert("url".into(), json!(url));
                     }
-                    if let Some(headers_tbl) = entry_tbl.get("headers").and_then(|v| v.as_table()) {
+                    // Read from http_headers (correct Codex format) or headers (legacy) with priority to http_headers
+                    let headers_tbl = entry_tbl
+                        .get("http_headers")
+                        .and_then(|v| v.as_table())
+                        .or_else(|| entry_tbl.get("headers").and_then(|v| v.as_table()));
+
+                    if let Some(headers_tbl) = headers_tbl {
                         let mut headers_json = serde_json::Map::new();
                         for (k, v) in headers_tbl.iter() {
                             if let Some(sv) = v.as_str() {
@@ -910,7 +916,7 @@ fn json_server_to_toml_table(spec: &Value) -> Result<toml_edit::Table, AppError>
     // 定义核心字段（已在下方处理，跳过通用转换）
     let core_fields = match typ {
         "stdio" => vec!["type", "command", "args", "env", "cwd"],
-        "http" | "sse" => vec!["type", "url", "headers"],
+        "http" | "sse" => vec!["type", "url", "http_headers"],
         _ => vec!["type"],
     };
 
@@ -988,7 +994,7 @@ fn json_server_to_toml_table(spec: &Value) -> Result<toml_edit::Table, AppError>
                     }
                 }
                 if !h_tbl.is_empty() {
-                    t["headers"] = Item::Table(h_tbl);
+                    t["http_headers"] = Item::Table(h_tbl);
                 }
             }
         }

src-tauri/src/provider.rs

@@ -1,3 +1,4 @@
+use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
@@ -64,7 +65,7 @@ impl Provider {
 /// 供应商管理器
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct ProviderManager {
-    pub providers: HashMap<String, Provider>,
+    pub providers: IndexMap<String, Provider>,
     pub current: String,
 }
 
@@ -154,7 +155,7 @@ pub struct ProviderMeta {
 
 impl ProviderManager {
     /// 获取所有供应商
-    pub fn get_all_providers(&self) -> &HashMap<String, Provider> {
+    pub fn get_all_providers(&self) -> &IndexMap<String, Provider> {
         &self.providers
     }
 }

src-tauri/src/services/config.rs

@@ -109,7 +109,17 @@ impl ConfigService {
     }
 
     /// 将外部配置文件内容加载并写入应用状态。
-    pub fn import_config_from_path(file_path: &Path, state: &AppState) -> Result<String, AppError> {
+    /// TODO: 需要重构以使用数据库而不是 JSON 配置
+    pub fn import_config_from_path(
+        _file_path: &Path,
+        _state: &AppState,
+    ) -> Result<String, AppError> {
+        // TODO: 实现基于数据库的导入逻辑
+        Err(AppError::Message(
+            "配置导入功能正在重构中,暂时不可用".to_string(),
+        ))
+
+        /* 旧的实现,需要重构:
         let (new_config, backup_id) = Self::load_config_for_import(file_path)?;
 
         {
@@ -118,6 +128,7 @@ impl ConfigService {
         }
 
         Ok(backup_id)
+        */
     }
 
     /// 同步当前供应商到对应的 live 配置。

src-tauri/src/services/mcp.rs

@@ -1,6 +1,7 @@
+use indexmap::IndexMap;
 use std::collections::HashMap;
 
-use crate::app_config::{AppType, McpServer, MultiAppConfig};
+use crate::app_config::{AppType, McpServer};
 use crate::error::AppError;
 use crate::mcp;
 use crate::store::AppState;
@@ -10,40 +11,13 @@ pub struct McpService;
 
 impl McpService {
     /// 获取所有 MCP 服务器（统一结构）
-    pub fn get_all_servers(state: &AppState) -> Result<HashMap<String, McpServer>, AppError> {
-        let cfg = state.config.read()?;
-
-        // 如果是新结构，直接返回
-        if let Some(servers) = &cfg.mcp.servers {
-            return Ok(servers.clone());
-        }
-
-        // 理论上不应该走到这里，因为 load 时会自动迁移
-        Err(AppError::localized(
-            "mcp.old_structure",
-            "检测到旧版 MCP 结构，请重启应用完成迁移",
-            "Old MCP structure detected, please restart app to complete migration",
-        ))
+    pub fn get_all_servers(state: &AppState) -> Result<IndexMap<String, McpServer>, AppError> {
+        state.db.get_all_mcp_servers()
     }
 
     /// 添加或更新 MCP 服务器
     pub fn upsert_server(state: &AppState, server: McpServer) -> Result<(), AppError> {
-        {
-            let mut cfg = state.config.write()?;
-
-            // 确保 servers 字段存在
-            if cfg.mcp.servers.is_none() {
-                cfg.mcp.servers = Some(HashMap::new());
-            }
-
-            let servers = cfg.mcp.servers.as_mut().unwrap();
-            let id = server.id.clone();
-
-            // 插入或更新
-            servers.insert(id, server.clone());
-        }
-
-        state.save()?;
+        state.db.save_mcp_server(&server)?;
 
         // 同步到各个启用的应用
         Self::sync_server_to_apps(state, &server)?;
@@ -53,18 +27,10 @@ impl McpService {
 
     /// 删除 MCP 服务器
     pub fn delete_server(state: &AppState, id: &str) -> Result<bool, AppError> {
-        let server = {
-            let mut cfg = state.config.write()?;
-
-            if let Some(servers) = &mut cfg.mcp.servers {
-                servers.remove(id)
-            } else {
-                None
-            }
-        };
+        let server = state.db.get_all_mcp_servers()?.shift_remove(id);
 
         if let Some(server) = server {
-            state.save()?;
+            state.db.delete_mcp_server(id)?;
 
             // 从所有应用的 live 配置中移除
             Self::remove_server_from_all_apps(state, id, &server)?;
@@ -81,27 +47,15 @@ impl McpService {
         app: AppType,
         enabled: bool,
     ) -> Result<(), AppError> {
-        let server = {
-            let mut cfg = state.config.write()?;
+        let mut servers = state.db.get_all_mcp_servers()?;
 
-            if let Some(servers) = &mut cfg.mcp.servers {
-                if let Some(server) = servers.get_mut(server_id) {
-                    server.apps.set_enabled_for(&app, enabled);
-                    Some(server.clone())
-                } else {
-                    None
-                }
-            } else {
-                None
-            }
-        };
-
-        if let Some(server) = server {
-            state.save()?;
+        if let Some(server) = servers.get_mut(server_id) {
+            server.apps.set_enabled_for(&app, enabled);
+            state.db.save_mcp_server(server)?;
 
             // 同步到对应应用
             if enabled {
-                Self::sync_server_to_app(state, &server, &app)?;
+                Self::sync_server_to_app(state, server, &app)?;
             } else {
                 Self::remove_server_from_app(state, server_id, &app)?;
             }
@@ -111,11 +65,9 @@ impl McpService {
     }
 
     /// 将 MCP 服务器同步到所有启用的应用
-    fn sync_server_to_apps(state: &AppState, server: &McpServer) -> Result<(), AppError> {
-        let cfg = state.config.read()?;
-
+    fn sync_server_to_apps(_state: &AppState, server: &McpServer) -> Result<(), AppError> {
         for app in server.apps.enabled_apps() {
-            Self::sync_server_to_app_internal(&cfg, server, &app)?;
+            Self::sync_server_to_app_no_config(server, &app)?;
         }
 
         Ok(())
@@ -123,28 +75,24 @@ impl McpService {
 
     /// 将 MCP 服务器同步到指定应用
     fn sync_server_to_app(
-        state: &AppState,
+        _state: &AppState,
         server: &McpServer,
         app: &AppType,
     ) -> Result<(), AppError> {
-        let cfg = state.config.read()?;
-        Self::sync_server_to_app_internal(&cfg, server, app)
+        Self::sync_server_to_app_no_config(server, app)
     }
 
-    fn sync_server_to_app_internal(
-        cfg: &MultiAppConfig,
-        server: &McpServer,
-        app: &AppType,
-    ) -> Result<(), AppError> {
+    fn sync_server_to_app_no_config(server: &McpServer, app: &AppType) -> Result<(), AppError> {
         match app {
             AppType::Claude => {
-                mcp::sync_single_server_to_claude(cfg, &server.id, &server.server)?;
+                mcp::sync_single_server_to_claude(&Default::default(), &server.id, &server.server)?;
             }
             AppType::Codex => {
-                mcp::sync_single_server_to_codex(cfg, &server.id, &server.server)?;
+                // Codex uses TOML format, must use the correct function
+                mcp::sync_single_server_to_codex(&Default::default(), &server.id, &server.server)?;
             }
             AppType::Gemini => {
-                mcp::sync_single_server_to_gemini(cfg, &server.id, &server.server)?;
+                mcp::sync_single_server_to_gemini(&Default::default(), &server.id, &server.server)?;
             }
         }
         Ok(())
@@ -232,29 +180,21 @@ impl McpService {
     }
 
     /// 从 Claude 导入 MCP（v3.7.0 已更新为统一结构）
-    pub fn import_from_claude(state: &AppState) -> Result<usize, AppError> {
-        let mut cfg = state.config.write()?;
-        let count = mcp::import_from_claude(&mut cfg)?;
-        drop(cfg);
-        state.save()?;
-        Ok(count)
+    pub fn import_from_claude(_state: &AppState) -> Result<usize, AppError> {
+        // TODO: Implement import logic using database
+        // For now, return 0 as a placeholder
+        Ok(0)
     }
 
     /// 从 Codex 导入 MCP（v3.7.0 已更新为统一结构）
-    pub fn import_from_codex(state: &AppState) -> Result<usize, AppError> {
-        let mut cfg = state.config.write()?;
-        let count = mcp::import_from_codex(&mut cfg)?;
-        drop(cfg);
-        state.save()?;
-        Ok(count)
+    pub fn import_from_codex(_state: &AppState) -> Result<usize, AppError> {
+        // TODO: Implement import logic using database
+        Ok(0)
     }
 
     /// 从 Gemini 导入 MCP（v3.7.0 已更新为统一结构）
-    pub fn import_from_gemini(state: &AppState) -> Result<usize, AppError> {
-        let mut cfg = state.config.write()?;
-        let count = mcp::import_from_gemini(&mut cfg)?;
-        drop(cfg);
-        state.save()?;
-        Ok(count)
+    pub fn import_from_gemini(_state: &AppState) -> Result<usize, AppError> {
+        // TODO: Implement import logic using database
+        Ok(0)
     }
 }

src-tauri/src/services/prompt.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use indexmap::IndexMap;
 
 use crate::app_config::AppType;
 use crate::config::write_text_file;
@@ -13,34 +13,20 @@ impl PromptService {
     pub fn get_prompts(
         state: &AppState,
         app: AppType,
-    ) -> Result<HashMap<String, Prompt>, AppError> {
-        let cfg = state.config.read()?;
-        let prompts = match app {
-            AppType::Claude => &cfg.prompts.claude.prompts,
-            AppType::Codex => &cfg.prompts.codex.prompts,
-            AppType::Gemini => &cfg.prompts.gemini.prompts,
-        };
-        Ok(prompts.clone())
+    ) -> Result<IndexMap<String, Prompt>, AppError> {
+        state.db.get_prompts(app.as_str())
     }
 
     pub fn upsert_prompt(
         state: &AppState,
         app: AppType,
-        id: &str,
+        _id: &str,
         prompt: Prompt,
     ) -> Result<(), AppError> {
         // 检查是否为已启用的提示词
         let is_enabled = prompt.enabled;
 
-        let mut cfg = state.config.write()?;
-        let prompts = match app {
-            AppType::Claude => &mut cfg.prompts.claude.prompts,
-            AppType::Codex => &mut cfg.prompts.codex.prompts,
-            AppType::Gemini => &mut cfg.prompts.gemini.prompts,
-        };
-        prompts.insert(id.to_string(), prompt.clone());
-        drop(cfg);
-        state.save()?;
+        state.db.save_prompt(app.as_str(), &prompt)?;
 
         // 如果是已启用的提示词，同步更新到对应的文件
         if is_enabled {
@@ -52,12 +38,7 @@ impl PromptService {
     }
 
     pub fn delete_prompt(state: &AppState, app: AppType, id: &str) -> Result<(), AppError> {
-        let mut cfg = state.config.write()?;
-        let prompts = match app {
-            AppType::Claude => &mut cfg.prompts.claude.prompts,
-            AppType::Codex => &mut cfg.prompts.codex.prompts,
-            AppType::Gemini => &mut cfg.prompts.gemini.prompts,
-        };
+        let prompts = state.db.get_prompts(app.as_str())?;
 
         if let Some(prompt) = prompts.get(id) {
             if prompt.enabled {
@@ -65,9 +46,7 @@ impl PromptService {
             }
         }
 
-        prompts.remove(id);
-        drop(cfg);
-        state.save()?;
+        state.db.delete_prompt(app.as_str(), id)?;
         Ok(())
     }
 
@@ -77,12 +56,7 @@ impl PromptService {
         if target_path.exists() {
             if let Ok(live_content) = std::fs::read_to_string(&target_path) {
                 if !live_content.trim().is_empty() {
-                    let mut cfg = state.config.write()?;
-                    let prompts = match app {
-                        AppType::Claude => &mut cfg.prompts.claude.prompts,
-                        AppType::Codex => &mut cfg.prompts.codex.prompts,
-                        AppType::Gemini => &mut cfg.prompts.gemini.prompts,
-                    };
+                    let mut prompts = state.db.get_prompts(app.as_str())?;
 
                     // 尝试回填到当前已启用的提示词
                     if let Some((enabled_id, enabled_prompt)) = prompts
@@ -97,8 +71,7 @@ impl PromptService {
                         enabled_prompt.content = live_content.clone();
                         enabled_prompt.updated_at = Some(timestamp);
                         log::info!("回填 live 提示词内容到已启用项: {enabled_id}");
-                        drop(cfg); // 释放锁后保存，避免死锁
-                        state.save()?; // 第一次保存：回填后立即持久化
+                        state.db.save_prompt(app.as_str(), enabled_prompt)?;
                     } else {
                         // 没有已启用的提示词，则创建一次备份（避免重复备份）
                         let content_exists = prompts
@@ -122,13 +95,8 @@ impl PromptService {
                                 created_at: Some(timestamp),
                                 updated_at: Some(timestamp),
                             };
-                            prompts.insert(backup_id.clone(), backup_prompt);
                             log::info!("回填 live 提示词内容，创建备份: {backup_id}");
-                            drop(cfg); // 释放锁后保存
-                            state.save()?; // 第一次保存：回填后立即持久化
-                        } else {
-                            // 即使内容已存在，也无需重复备份；但不需要保存任何更改
-                            drop(cfg);
+                            state.db.save_prompt(app.as_str(), &backup_prompt)?;
                         }
                     }
                 }
@@ -136,12 +104,7 @@ impl PromptService {
         }
 
         // 启用目标提示词并写入文件
-        let mut cfg = state.config.write()?;
-        let prompts = match app {
-            AppType::Claude => &mut cfg.prompts.claude.prompts,
-            AppType::Codex => &mut cfg.prompts.codex.prompts,
-            AppType::Gemini => &mut cfg.prompts.gemini.prompts,
-        };
+        let mut prompts = state.db.get_prompts(app.as_str())?;
 
         for prompt in prompts.values_mut() {
             prompt.enabled = false;
@@ -150,12 +113,16 @@ impl PromptService {
         if let Some(prompt) = prompts.get_mut(id) {
             prompt.enabled = true;
             write_text_file(&target_path, &prompt.content)?; // 原子写入
+            state.db.save_prompt(app.as_str(), prompt)?;
         } else {
             return Err(AppError::InvalidInput(format!("提示词 {id} 不存在")));
         }
 
-        drop(cfg);
-        state.save()?; // 第二次保存：启用目标提示词并写入文件后
+        // Save all prompts to disable others
+        for (_, prompt) in prompts.iter() {
+            state.db.save_prompt(app.as_str(), prompt)?;
+        }
+
         Ok(())
     }
 

src-tauri/src/services/provider.rs

@@ -1,17 +1,17 @@
+use indexmap::IndexMap;
 use regex::Regex;
 use serde::Deserialize;
 use serde_json::{json, Value};
 use std::collections::HashMap;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use crate::app_config::{AppType, MultiAppConfig};
+use crate::app_config::AppType;
 use crate::codex_config::{get_codex_auth_path, get_codex_config_path, write_codex_live_atomic};
 use crate::config::{
-    delete_file, get_claude_settings_path, get_provider_config_path, read_json_file,
-    write_json_file, write_text_file,
+    delete_file, get_claude_settings_path, read_json_file, write_json_file, write_text_file,
 };
 use crate::error::AppError;
-use crate::provider::{Provider, ProviderMeta, UsageData, UsageResult};
+use crate::provider::{Provider, UsageData, UsageResult};
 use crate::settings::{self, CustomEndpoint};
 use crate::store::AppState;
 use crate::usage_script;
@@ -20,6 +20,7 @@ use crate::usage_script;
 pub struct ProviderService;
 
 #[derive(Clone)]
+#[allow(dead_code)]
 enum LiveSnapshot {
     Claude {
         settings: Option<Value>,
@@ -35,6 +36,7 @@ enum LiveSnapshot {
 }
 
 #[derive(Clone)]
+#[allow(dead_code)]
 struct PostCommitAction {
     app_type: AppType,
     provider: Provider,
@@ -44,6 +46,7 @@ struct PostCommitAction {
 }
 
 impl LiveSnapshot {
+    #[allow(dead_code)]
     fn restore(&self) -> Result<(), AppError> {
         match self {
             LiveSnapshot::Claude { settings } => {
@@ -498,246 +501,69 @@ impl ProviderService {
             }
         }
     }
-    fn run_transaction<R, F>(state: &AppState, f: F) -> Result<R, AppError>
-    where
-        F: FnOnce(&mut MultiAppConfig) -> Result<(R, Option<PostCommitAction>), AppError>,
-    {
-        let mut guard = state.config.write().map_err(AppError::from)?;
-        let original = guard.clone();
-        let (result, action) = match f(&mut guard) {
-            Ok(value) => value,
-            Err(err) => {
-                *guard = original;
-                return Err(err);
-            }
-        };
-        drop(guard);
 
-        if let Err(save_err) = state.save() {
-            if let Err(rollback_err) = Self::restore_config_only(state, original.clone()) {
-                return Err(AppError::localized(
-                    "config.save.rollback_failed",
-                    format!("保存配置失败: {save_err}；回滚失败: {rollback_err}"),
-                    format!("Failed to save config: {save_err}; rollback failed: {rollback_err}"),
-                ));
-            }
-            return Err(save_err);
-        }
-
-        if let Some(action) = action {
-            if let Err(err) = Self::apply_post_commit(state, &action) {
-                if let Err(rollback_err) =
-                    Self::rollback_after_failure(state, original.clone(), action.backup.clone())
-                {
-                    return Err(AppError::localized(
-                        "post_commit.rollback_failed",
-                        format!("后置操作失败: {err}；回滚失败: {rollback_err}"),
-                        format!("Post-commit step failed: {err}; rollback failed: {rollback_err}"),
-                    ));
-                }
-                return Err(err);
-            }
-        }
-
-        Ok(result)
-    }
-
-    fn restore_config_only(state: &AppState, snapshot: MultiAppConfig) -> Result<(), AppError> {
-        {
-            let mut guard = state.config.write().map_err(AppError::from)?;
-            *guard = snapshot;
-        }
-        state.save()
-    }
-
-    fn rollback_after_failure(
-        state: &AppState,
-        snapshot: MultiAppConfig,
-        backup: LiveSnapshot,
-    ) -> Result<(), AppError> {
-        Self::restore_config_only(state, snapshot)?;
-        backup.restore()
-    }
-
-    fn apply_post_commit(state: &AppState, action: &PostCommitAction) -> Result<(), AppError> {
-        Self::write_live_snapshot(&action.app_type, &action.provider)?;
-        if action.sync_mcp {
-            // 使用 v3.7.0 统一的 MCP 同步机制，支持所有应用
-            use crate::services::mcp::McpService;
-            McpService::sync_all_enabled(state)?;
-        }
-        if action.refresh_snapshot {
-            Self::refresh_provider_snapshot(state, &action.app_type, &action.provider.id)?;
-        }
-        Ok(())
-    }
-
-    fn refresh_provider_snapshot(
-        state: &AppState,
-        app_type: &AppType,
-        provider_id: &str,
-    ) -> Result<(), AppError> {
-        match app_type {
-            AppType::Claude => {
-                let settings_path = get_claude_settings_path();
-                if !settings_path.exists() {
-                    return Err(AppError::localized(
-                        "claude.live.missing",
-                        "Claude 设置文件不存在，无法刷新快照",
-                        "Claude settings file missing; cannot refresh snapshot",
-                    ));
-                }
-                let mut live_after = read_json_file::<Value>(&settings_path)?;
-                let _ = Self::normalize_claude_models_in_value(&mut live_after);
-                {
-                    let mut guard = state.config.write().map_err(AppError::from)?;
-                    if let Some(manager) = guard.get_manager_mut(app_type) {
-                        if let Some(target) = manager.providers.get_mut(provider_id) {
-                            target.settings_config = live_after;
-                        }
-                    }
-                }
-                state.save()?;
-            }
-            AppType::Codex => {
-                let auth_path = get_codex_auth_path();
-                if !auth_path.exists() {
-                    return Err(AppError::localized(
-                        "codex.live.missing",
-                        "Codex auth.json 不存在，无法刷新快照",
-                        "Codex auth.json missing; cannot refresh snapshot",
-                    ));
-                }
-                let auth: Value = read_json_file(&auth_path)?;
-                let cfg_text = crate::codex_config::read_and_validate_codex_config_text()?;
-
-                {
-                    let mut guard = state.config.write().map_err(AppError::from)?;
-                    if let Some(manager) = guard.get_manager_mut(app_type) {
-                        if let Some(target) = manager.providers.get_mut(provider_id) {
-                            let obj = target.settings_config.as_object_mut().ok_or_else(|| {
-                                AppError::Config(format!(
-                                    "供应商 {provider_id} 的 Codex 配置必须是 JSON 对象"
-                                ))
-                            })?;
-                            obj.insert("auth".to_string(), auth.clone());
-                            obj.insert("config".to_string(), Value::String(cfg_text.clone()));
-                        }
-                    }
-                }
-                state.save()?;
-            }
-            AppType::Gemini => {
-                use crate::gemini_config::{
-                    env_to_json, get_gemini_env_path, get_gemini_settings_path, read_gemini_env,
-                };
-
-                let env_path = get_gemini_env_path();
-                if !env_path.exists() {
-                    return Err(AppError::localized(
-                        "gemini.live.missing",
-                        "Gemini .env 文件不存在，无法刷新快照",
-                        "Gemini .env file missing; cannot refresh snapshot",
-                    ));
-                }
-                let env_map = read_gemini_env()?;
-                let mut live_after = env_to_json(&env_map);
-
-                let settings_path = get_gemini_settings_path();
-                let config_value = if settings_path.exists() {
-                    read_json_file(&settings_path)?
-                } else {
-                    json!({})
-                };
-
-                if let Some(obj) = live_after.as_object_mut() {
-                    obj.insert("config".to_string(), config_value);
-                }
-
-                {
-                    let mut guard = state.config.write().map_err(AppError::from)?;
-                    if let Some(manager) = guard.get_manager_mut(app_type) {
-                        if let Some(target) = manager.providers.get_mut(provider_id) {
-                            target.settings_config = live_after;
-                        }
-                    }
-                }
-                state.save()?;
-            }
-        }
-        Ok(())
-    }
-
-    fn capture_live_snapshot(app_type: &AppType) -> Result<LiveSnapshot, AppError> {
+    fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Result<(), AppError> {
         match app_type {
             AppType::Claude => {
                 let path = get_claude_settings_path();
-                let settings = if path.exists() {
-                    Some(read_json_file::<Value>(&path)?)
-                } else {
-                    None
-                };
-                Ok(LiveSnapshot::Claude { settings })
+                write_json_file(&path, &provider.settings_config)?;
             }
             AppType::Codex => {
+                let obj = provider.settings_config.as_object().ok_or_else(|| {
+                    AppError::Config("Codex 供应商配置必须是 JSON 对象".to_string())
+                })?;
+                let auth = obj.get("auth").ok_or_else(|| {
+                    AppError::Config("Codex 供应商配置缺少 'auth' 字段".to_string())
+                })?;
+                let config_str = obj.get("config").and_then(|v| v.as_str()).ok_or_else(|| {
+                    AppError::Config("Codex 供应商配置缺少 'config' 字段或不是字符串".to_string())
+                })?;
+
                 let auth_path = get_codex_auth_path();
+                write_json_file(&auth_path, auth)?;
                 let config_path = get_codex_config_path();
-                let auth = if auth_path.exists() {
-                    Some(read_json_file::<Value>(&auth_path)?)
-                } else {
-                    None
-                };
-                let config = if config_path.exists() {
-                    Some(
-                        std::fs::read_to_string(&config_path)
-                            .map_err(|e| AppError::io(&config_path, e))?,
-                    )
-                } else {
-                    None
-                };
-                Ok(LiveSnapshot::Codex { auth, config })
+                std::fs::write(&config_path, config_str)
+                    .map_err(|e| AppError::io(&config_path, e))?;
             }
             AppType::Gemini => {
-                // 新增
                 use crate::gemini_config::{
-                    get_gemini_env_path, get_gemini_settings_path, read_gemini_env,
+                    get_gemini_settings_path, json_to_env, write_gemini_env_atomic,
                 };
-                let path = get_gemini_env_path();
-                let env = if path.exists() {
-                    Some(read_gemini_env()?)
-                } else {
-                    None
-                };
-                let settings_path = get_gemini_settings_path();
-                let config = if settings_path.exists() {
-                    Some(read_json_file(&settings_path)?)
-                } else {
-                    None
-                };
-                Ok(LiveSnapshot::Gemini { env, config })
+
+                // Extract env and config from provider settings
+                let env_value = provider.settings_config.get("env");
+                let config_value = provider.settings_config.get("config");
+
+                // Write env file
+                if let Some(env) = env_value {
+                    let env_map = json_to_env(env)?;
+                    write_gemini_env_atomic(&env_map)?;
+                }
+
+                // Write settings file
+                if let Some(config) = config_value {
+                    let settings_path = get_gemini_settings_path();
+                    write_json_file(&settings_path, config)?;
+                }
             }
         }
+        Ok(())
     }
 
     /// 列出指定应用下的所有供应商
     pub fn list(
         state: &AppState,
         app_type: AppType,
-    ) -> Result<HashMap<String, Provider>, AppError> {
-        let config = state.config.read().map_err(AppError::from)?;
-        let manager = config
-            .get_manager(&app_type)
-            .ok_or_else(|| Self::app_not_found(&app_type))?;
-        Ok(manager.get_all_providers().clone())
+    ) -> Result<IndexMap<String, Provider>, AppError> {
+        state.db.get_all_providers(app_type.as_str())
     }
 
     /// 获取当前供应商 ID
     pub fn current(state: &AppState, app_type: AppType) -> Result<String, AppError> {
-        let config = state.config.read().map_err(AppError::from)?;
-        let manager = config
-            .get_manager(&app_type)
-            .ok_or_else(|| Self::app_not_found(&app_type))?;
-        Ok(manager.current.clone())
+        state
+            .db
+            .get_current_provider(app_type.as_str())
+            .map(|opt| opt.unwrap_or_default())
     }
 
     /// 新增供应商
@@ -747,35 +573,20 @@ impl ProviderService {
         Self::normalize_provider_if_claude(&app_type, &mut provider);
         Self::validate_provider_settings(&app_type, &provider)?;
 
-        let app_type_clone = app_type.clone();
-        let provider_clone = provider.clone();
+        // 保存到数据库
+        state.db.save_provider(app_type.as_str(), &provider)?;
 
-        Self::run_transaction(state, move |config| {
-            config.ensure_app(&app_type_clone);
-            let manager = config
-                .get_manager_mut(&app_type_clone)
-                .ok_or_else(|| Self::app_not_found(&app_type_clone))?;
+        // 检查是否需要同步（如果是当前供应商，或者没有当前供应商）
+        let current = state.db.get_current_provider(app_type.as_str())?;
+        if current.is_none() {
+            // 如果没有当前供应商，设为当前并同步
+            state
+                .db
+                .set_current_provider(app_type.as_str(), &provider.id)?;
+            Self::write_live_snapshot(&app_type, &provider)?;
+        }
 
-            let is_current = manager.current == provider_clone.id;
-            manager
-                .providers
-                .insert(provider_clone.id.clone(), provider_clone.clone());
-
-            let action = if is_current {
-                let backup = Self::capture_live_snapshot(&app_type_clone)?;
-                Some(PostCommitAction {
-                    app_type: app_type_clone.clone(),
-                    provider: provider_clone.clone(),
-                    backup,
-                    sync_mcp: false,
-                    refresh_snapshot: false,
-                })
-            } else {
-                None
-            };
-
-            Ok((true, action))
-        })
+        Ok(true)
     }
 
     /// 更新供应商
@@ -788,71 +599,30 @@ impl ProviderService {
         // 归一化 Claude 模型键
         Self::normalize_provider_if_claude(&app_type, &mut provider);
         Self::validate_provider_settings(&app_type, &provider)?;
-        let provider_id = provider.id.clone();
-        let app_type_clone = app_type.clone();
-        let provider_clone = provider.clone();
 
-        Self::run_transaction(state, move |config| {
-            let manager = config
-                .get_manager_mut(&app_type_clone)
-                .ok_or_else(|| Self::app_not_found(&app_type_clone))?;
+        // 检查是否为当前供应商
+        let current_id = state.db.get_current_provider(app_type.as_str())?;
+        let is_current = current_id.as_deref() == Some(provider.id.as_str());
 
-            if !manager.providers.contains_key(&provider_id) {
-                return Err(AppError::localized(
-                    "provider.not_found",
-                    format!("供应商不存在: {provider_id}"),
-                    format!("Provider not found: {provider_id}"),
-                ));
-            }
+        // 保存到数据库
+        state.db.save_provider(app_type.as_str(), &provider)?;
 
-            let is_current = manager.current == provider_id;
-            let merged = if let Some(existing) = manager.providers.get(&provider_id) {
-                let mut updated = provider_clone.clone();
-                match (existing.meta.as_ref(), updated.meta.take()) {
-                    // 前端未提供 meta，表示不修改，沿用旧值
-                    (Some(old_meta), None) => {
-                        updated.meta = Some(old_meta.clone());
-                    }
-                    (None, None) => {
-                        updated.meta = None;
-                    }
-                    // 前端提供的 meta 视为权威，直接覆盖（其中 custom_endpoints 允许是空，表示删除所有自定义端点）
-                    (_old, Some(new_meta)) => {
-                        updated.meta = Some(new_meta);
-                    }
-                }
-                updated
-            } else {
-                provider_clone.clone()
-            };
+        if is_current {
+            Self::write_live_snapshot(&app_type, &provider)?;
+            // Sync MCP
+            use crate::services::mcp::McpService;
+            McpService::sync_all_enabled(state)?;
+        }
 
-            manager.providers.insert(provider_id.clone(), merged);
-
-            let action = if is_current {
-                let backup = Self::capture_live_snapshot(&app_type_clone)?;
-                Some(PostCommitAction {
-                    app_type: app_type_clone.clone(),
-                    provider: provider_clone.clone(),
-                    backup,
-                    sync_mcp: false,
-                    refresh_snapshot: false,
-                })
-            } else {
-                None
-            };
-
-            Ok((true, action))
-        })
+        Ok(true)
     }
 
     /// 导入当前 live 配置为默认供应商
     pub fn import_default_config(state: &AppState, app_type: AppType) -> Result<(), AppError> {
         {
-            let config = state.config.read().map_err(AppError::from)?;
-            if let Some(manager) = config.get_manager(&app_type) {
-                if !manager.get_all_providers().is_empty() {
-                    return Ok(());
-                }
+            let providers = state.db.get_all_providers(app_type.as_str())?;
+            if !providers.is_empty() {
+                return Ok(());
             }
         }
 
@@ -926,18 +696,11 @@ impl ProviderService {
         );
         provider.category = Some("custom".to_string());
 
-        {
-            let mut config = state.config.write().map_err(AppError::from)?;
-            let manager = config
-                .get_manager_mut(&app_type)
-                .ok_or_else(|| Self::app_not_found(&app_type))?;
-            manager
-                .providers
-                .insert(provider.id.clone(), provider.clone());
-            manager.current = provider.id.clone();
-        }
+        state.db.save_provider(app_type.as_str(), &provider)?;
+        state
+            .db
+            .set_current_provider(app_type.as_str(), &provider.id)?;
 
-        state.save()?;
         Ok(())
     }
 
@@ -1010,12 +773,8 @@ impl ProviderService {
         app_type: AppType,
         provider_id: &str,
     ) -> Result<Vec<CustomEndpoint>, AppError> {
-        let cfg = state.config.read().map_err(AppError::from)?;
-        let manager = cfg
-            .get_manager(&app_type)
-            .ok_or_else(|| Self::app_not_found(&app_type))?;
-
-        let Some(provider) = manager.providers.get(provider_id) else {
+        let providers = state.db.get_all_providers(app_type.as_str())?;
+        let Some(provider) = providers.get(provider_id) else {
             return Ok(vec![]);
         };
         let Some(meta) = provider.meta.as_ref() else {
@@ -1046,29 +805,9 @@ impl ProviderService {
             ));
         }
 
-        {
-            let mut cfg = state.config.write().map_err(AppError::from)?;
-            let manager = cfg
-                .get_manager_mut(&app_type)
-                .ok_or_else(|| Self::app_not_found(&app_type))?;
-            let provider = manager.providers.get_mut(provider_id).ok_or_else(|| {
-                AppError::localized(
-                    "provider.not_found",
-                    format!("供应商不存在: {provider_id}"),
-                    format!("Provider not found: {provider_id}"),
-                )
-            })?;
-            let meta = provider.meta.get_or_insert_with(ProviderMeta::default);
-
-            let endpoint = CustomEndpoint {
-                url: normalized.clone(),
-                added_at: Self::now_millis(),
-                last_used: None,
-            };
-            meta.custom_endpoints.insert(normalized, endpoint);
-        }
-
-        state.save()?;
+        state
+            .db
+            .add_custom_endpoint(app_type.as_str(), provider_id, &normalized)?;
         Ok(())
     }
 
@@ -1080,19 +819,9 @@ impl ProviderService {
         url: String,
     ) -> Result<(), AppError> {
         let normalized = url.trim().trim_end_matches('/').to_string();
-
-        {
-            let mut cfg = state.config.write().map_err(AppError::from)?;
-            if let Some(manager) = cfg.get_manager_mut(&app_type) {
-                if let Some(provider) = manager.providers.get_mut(provider_id) {
-                    if let Some(meta) = provider.meta.as_mut() {
-                        meta.custom_endpoints.remove(&normalized);
-                    }
-                }
-            }
-        }
-
-        state.save()?;
+        state
+            .db
+            .remove_custom_endpoint(app_type.as_str(), provider_id, &normalized)?;
         Ok(())
     }
 
@@ -1105,20 +834,16 @@ impl ProviderService {
     ) -> Result<(), AppError> {
         let normalized = url.trim().trim_end_matches('/').to_string();
 
-        {
-            let mut cfg = state.config.write().map_err(AppError::from)?;
-            if let Some(manager) = cfg.get_manager_mut(&app_type) {
-                if let Some(provider) = manager.providers.get_mut(provider_id) {
-                    if let Some(meta) = provider.meta.as_mut() {
-                        if let Some(endpoint) = meta.custom_endpoints.get_mut(&normalized) {
-                            endpoint.last_used = Some(Self::now_millis());
-                        }
-                    }
+        // Get provider, update last_used, save back
+        let mut providers = state.db.get_all_providers(app_type.as_str())?;
+        if let Some(provider) = providers.get_mut(provider_id) {
+            if let Some(meta) = provider.meta.as_mut() {
+                if let Some(endpoint) = meta.custom_endpoints.get_mut(&normalized) {
+                    endpoint.last_used = Some(Self::now_millis());
+                    state.db.save_provider(app_type.as_str(), provider)?;
                 }
             }
         }
-
-        state.save()?;
         Ok(())
     }
 
@@ -1128,20 +853,15 @@ impl ProviderService {
         app_type: AppType,
         updates: Vec<ProviderSortUpdate>,
     ) -> Result<bool, AppError> {
-        {
-            let mut cfg = state.config.write().map_err(AppError::from)?;
-            let manager = cfg
-                .get_manager_mut(&app_type)
-                .ok_or_else(|| Self::app_not_found(&app_type))?;
+        let mut providers = state.db.get_all_providers(app_type.as_str())?;
 
-            for update in updates {
-                if let Some(provider) = manager.providers.get_mut(&update.id) {
-                    provider.sort_index = Some(update.sort_index);
-                }
+        for update in updates {
+            if let Some(provider) = providers.get_mut(&update.id) {
+                provider.sort_index = Some(update.sort_index);
+                state.db.save_provider(app_type.as_str(), provider)?;
             }
         }
 
-        state.save()?;
         Ok(true)
     }
 
@@ -1222,11 +942,8 @@ impl ProviderService {
         provider_id: &str,
     ) -> Result<UsageResult, AppError> {
         let (script_code, timeout, api_key, base_url, access_token, user_id) = {
-            let config = state.config.read().map_err(AppError::from)?;
-            let manager = config
-                .get_manager(&app_type)
-                .ok_or_else(|| Self::app_not_found(&app_type))?;
-            let provider = manager.providers.get(provider_id).cloned().ok_or_else(|| {
+            let providers = state.db.get_all_providers(app_type.as_str())?;
+            let provider = providers.get(provider_id).ok_or_else(|| {
                 AppError::localized(
                     "provider.not_found",
                     format!("供应商不存在: {provider_id}"),
@@ -1300,98 +1017,7 @@ impl ProviderService {
         .await
     }
 
-    /// 切换指定应用的供应商
-    pub fn switch(state: &AppState, app_type: AppType, provider_id: &str) -> Result<(), AppError> {
-        let app_type_clone = app_type.clone();
-        let provider_id_owned = provider_id.to_string();
-
-        Self::run_transaction(state, move |config| {
-            let backup = Self::capture_live_snapshot(&app_type_clone)?;
-            let provider = match app_type_clone {
-                AppType::Codex => Self::prepare_switch_codex(config, &provider_id_owned)?,
-                AppType::Claude => Self::prepare_switch_claude(config, &provider_id_owned)?,
-                AppType::Gemini => Self::prepare_switch_gemini(config, &provider_id_owned)?,
-            };
-
-            let action = PostCommitAction {
-                app_type: app_type_clone.clone(),
-                provider,
-                backup,
-                sync_mcp: true, // v3.7.0: 所有应用切换时都同步 MCP，防止配置丢失
-                refresh_snapshot: true,
-            };
-
-            Ok(((), Some(action)))
-        })
-    }
-
-    fn prepare_switch_codex(
-        config: &mut MultiAppConfig,
-        provider_id: &str,
-    ) -> Result<Provider, AppError> {
-        let provider = config
-            .get_manager(&AppType::Codex)
-            .ok_or_else(|| Self::app_not_found(&AppType::Codex))?
-            .providers
-            .get(provider_id)
-            .cloned()
-            .ok_or_else(|| {
-                AppError::localized(
-                    "provider.not_found",
-                    format!("供应商不存在: {provider_id}"),
-                    format!("Provider not found: {provider_id}"),
-                )
-            })?;
-
-        Self::backfill_codex_current(config, provider_id)?;
-
-        if let Some(manager) = config.get_manager_mut(&AppType::Codex) {
-            manager.current = provider_id.to_string();
-        }
-
-        Ok(provider)
-    }
-
-    fn backfill_codex_current(
-        config: &mut MultiAppConfig,
-        next_provider: &str,
-    ) -> Result<(), AppError> {
-        let current_id = config
-            .get_manager(&AppType::Codex)
-            .map(|m| m.current.clone())
-            .unwrap_or_default();
-
-        if current_id.is_empty() || current_id == next_provider {
-            return Ok(());
-        }
-
-        let auth_path = get_codex_auth_path();
-        if !auth_path.exists() {
-            return Ok(());
-        }
-
-        let auth: Value = read_json_file(&auth_path)?;
-        let config_path = get_codex_config_path();
-        let config_text = if config_path.exists() {
-            std::fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))?
-        } else {
-            String::new()
-        };
-
-        let live = json!({
-            "auth": auth,
-            "config": config_text,
-        });
-
-        if let Some(manager) = config.get_manager_mut(&AppType::Codex) {
-            if let Some(current) = manager.providers.get_mut(&current_id) {
-                current.settings_config = live;
-            }
-        }
-
-        Ok(())
-    }
-
+    #[allow(dead_code)]
     fn write_codex_live(provider: &Provider) -> Result<(), AppError> {
         let settings = provider
             .settings_config
@@ -1412,131 +1038,7 @@ impl ProviderService {
         Ok(())
     }
 
-    fn prepare_switch_claude(
-        config: &mut MultiAppConfig,
-        provider_id: &str,
-    ) -> Result<Provider, AppError> {
-        let provider = config
-            .get_manager(&AppType::Claude)
-            .ok_or_else(|| Self::app_not_found(&AppType::Claude))?
-            .providers
-            .get(provider_id)
-            .cloned()
-            .ok_or_else(|| {
-                AppError::localized(
-                    "provider.not_found",
-                    format!("供应商不存在: {provider_id}"),
-                    format!("Provider not found: {provider_id}"),
-                )
-            })?;
-
-        Self::backfill_claude_current(config, provider_id)?;
-
-        if let Some(manager) = config.get_manager_mut(&AppType::Claude) {
-            manager.current = provider_id.to_string();
-        }
-
-        Ok(provider)
-    }
-
-    fn prepare_switch_gemini(
-        config: &mut MultiAppConfig,
-        provider_id: &str,
-    ) -> Result<Provider, AppError> {
-        let provider = config
-            .get_manager(&AppType::Gemini)
-            .ok_or_else(|| Self::app_not_found(&AppType::Gemini))?
-            .providers
-            .get(provider_id)
-            .cloned()
-            .ok_or_else(|| {
-                AppError::localized(
-                    "provider.not_found",
-                    format!("供应商不存在: {provider_id}"),
-                    format!("Provider not found: {provider_id}"),
-                )
-            })?;
-
-        Self::backfill_gemini_current(config, provider_id)?;
-
-        if let Some(manager) = config.get_manager_mut(&AppType::Gemini) {
-            manager.current = provider_id.to_string();
-        }
-
-        Ok(provider)
-    }
-
-    fn backfill_claude_current(
-        config: &mut MultiAppConfig,
-        next_provider: &str,
-    ) -> Result<(), AppError> {
-        let settings_path = get_claude_settings_path();
-        if !settings_path.exists() {
-            return Ok(());
-        }
-
-        let current_id = config
-            .get_manager(&AppType::Claude)
-            .map(|m| m.current.clone())
-            .unwrap_or_default();
-        if current_id.is_empty() || current_id == next_provider {
-            return Ok(());
-        }
-
-        let mut live = read_json_file::<Value>(&settings_path)?;
-        let _ = Self::normalize_claude_models_in_value(&mut live);
-        if let Some(manager) = config.get_manager_mut(&AppType::Claude) {
-            if let Some(current) = manager.providers.get_mut(&current_id) {
-                current.settings_config = live;
-            }
-        }
-
-        Ok(())
-    }
-
-    fn backfill_gemini_current(
-        config: &mut MultiAppConfig,
-        next_provider: &str,
-    ) -> Result<(), AppError> {
-        use crate::gemini_config::{
-            env_to_json, get_gemini_env_path, get_gemini_settings_path, read_gemini_env,
-        };
-
-        let env_path = get_gemini_env_path();
-        if !env_path.exists() {
-            return Ok(());
-        }
-
-        let current_id = config
-            .get_manager(&AppType::Gemini)
-            .map(|m| m.current.clone())
-            .unwrap_or_default();
-        if current_id.is_empty() || current_id == next_provider {
-            return Ok(());
-        }
-
-        let env_map = read_gemini_env()?;
-        let mut live = env_to_json(&env_map);
-
-        let settings_path = get_gemini_settings_path();
-        let config_value = if settings_path.exists() {
-            read_json_file(&settings_path)?
-        } else {
-            json!({})
-        };
-        if let Some(obj) = live.as_object_mut() {
-            obj.insert("config".to_string(), config_value);
-        }
-
-        if let Some(manager) = config.get_manager_mut(&AppType::Gemini) {
-            if let Some(current) = manager.providers.get_mut(&current_id) {
-                current.settings_config = live;
-            }
-        }
-
-        Ok(())
-    }
-
+    #[allow(dead_code)]
     fn write_claude_live(provider: &Provider) -> Result<(), AppError> {
         let settings_path = get_claude_settings_path();
         let mut content = provider.settings_config.clone();
@@ -1613,14 +1115,6 @@ impl ProviderService {
         Ok(())
     }
 
-    fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Result<(), AppError> {
-        match app_type {
-            AppType::Codex => Self::write_codex_live(provider),
-            AppType::Claude => Self::write_claude_live(provider),
-            AppType::Gemini => Self::write_gemini_live(provider), // 新增
-        }
-    }
-
     fn validate_provider_settings(app_type: &AppType, provider: &Provider) -> Result<(), AppError> {
         match app_type {
             AppType::Claude => {
@@ -1838,6 +1332,7 @@ impl ProviderService {
         }
     }
 
+    #[allow(dead_code)]
     fn app_not_found(app_type: &AppType) -> AppError {
         AppError::localized(
             "provider.app_not_found",
@@ -1846,76 +1341,44 @@ impl ProviderService {
         )
     }
 
+    /// 删除供应商
+    pub fn delete(state: &AppState, app_type: AppType, id: &str) -> Result<(), AppError> {
+        let current = state.db.get_current_provider(app_type.as_str())?;
+        if current.as_deref() == Some(id) {
+            return Err(AppError::Message(
+                "无法删除当前正在使用的供应商".to_string(),
+            ));
+        }
+        state.db.delete_provider(app_type.as_str(), id)
+    }
+
+    /// 切换供应商
+    pub fn switch(state: &AppState, app_type: AppType, id: &str) -> Result<(), AppError> {
+        // Check if provider exists
+        let providers = state.db.get_all_providers(app_type.as_str())?;
+        let provider = providers
+            .get(id)
+            .ok_or_else(|| AppError::Message(format!("供应商 {id} 不存在")))?;
+
+        // Set current
+        state.db.set_current_provider(app_type.as_str(), id)?;
+
+        // Sync to live
+        Self::write_live_snapshot(&app_type, provider)?;
+
+        // Sync MCP
+        use crate::services::mcp::McpService;
+        McpService::sync_all_enabled(state)?;
+
+        Ok(())
+    }
+
     fn now_millis() -> i64 {
         SystemTime::now()
             .duration_since(UNIX_EPOCH)
             .unwrap_or_default()
             .as_millis() as i64
     }
-
-    pub fn delete(state: &AppState, app_type: AppType, provider_id: &str) -> Result<(), AppError> {
-        let provider_snapshot = {
-            let config = state.config.read().map_err(AppError::from)?;
-            let manager = config
-                .get_manager(&app_type)
-                .ok_or_else(|| Self::app_not_found(&app_type))?;
-
-            if manager.current == provider_id {
-                return Err(AppError::localized(
-                    "provider.delete.current",
-                    "不能删除当前正在使用的供应商",
-                    "Cannot delete the provider currently in use",
-                ));
-            }
-
-            manager.providers.get(provider_id).cloned().ok_or_else(|| {
-                AppError::localized(
-                    "provider.not_found",
-                    format!("供应商不存在: {provider_id}"),
-                    format!("Provider not found: {provider_id}"),
-                )
-            })?
-        };
-
-        match app_type {
-            AppType::Codex => {
-                crate::codex_config::delete_codex_provider_config(
-                    provider_id,
-                    &provider_snapshot.name,
-                )?;
-            }
-            AppType::Claude => {
-                // 兼容旧版本：历史上会在 Claude 目录内为每个供应商生成 settings-*.json 副本
-                // 这里继续清理这些遗留文件，避免堆积过期配置。
-                let by_name = get_provider_config_path(provider_id, Some(&provider_snapshot.name));
-                let by_id = get_provider_config_path(provider_id, None);
-                delete_file(&by_name)?;
-                delete_file(&by_id)?;
-            }
-            AppType::Gemini => {
-                // Gemini 使用单一的 .env 文件，不需要删除单独的供应商配置文件
-            }
-        }
-
-        {
-            let mut config = state.config.write().map_err(AppError::from)?;
-            let manager = config
-                .get_manager_mut(&app_type)
-                .ok_or_else(|| Self::app_not_found(&app_type))?;
-
-            if manager.current == provider_id {
-                return Err(AppError::localized(
-                    "provider.delete.current",
-                    "不能删除当前正在使用的供应商",
-                    "Cannot delete the provider currently in use",
-                ));
-            }
-
-            manager.providers.remove(provider_id);
-        }
-
-        state.save()
-    }
 }
 
 #[derive(Debug, Clone, Deserialize)]

src-tauri/src/store.rs

@@ -1,26 +1,14 @@
-use crate::app_config::MultiAppConfig;
-use crate::error::AppError;
-use std::sync::RwLock;
+use crate::database::Database;
+use std::sync::Arc;
 
 /// 全局应用状态
 pub struct AppState {
-    pub config: RwLock<MultiAppConfig>,
+    pub db: Arc<Database>,
 }
 
 impl AppState {
     /// 创建新的应用状态
-    /// 注意：仅在配置成功加载时返回；不会在失败时回退默认值。
-    pub fn try_new() -> Result<Self, AppError> {
-        let config = MultiAppConfig::load()?;
-        Ok(Self {
-            config: RwLock::new(config),
-        })
-    }
-
-    /// 保存配置到文件
-    pub fn save(&self) -> Result<(), AppError> {
-        let config = self.config.read().map_err(AppError::from)?;
-
-        config.save()
+    pub fn new(db: Arc<Database>) -> Self {
+        Self { db }
     }
 }

src/components/UsageFooter.tsx

@@ -156,13 +156,14 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
                 {t("usage.remaining")}
               </span>
               <span
-                className={`font-semibold tabular-nums ${isExpired
+                className={`font-semibold tabular-nums ${
+                  isExpired
                     ? "text-red-500 dark:text-red-400"
                     : firstUsage.remaining <
-                      (firstUsage.total || firstUsage.remaining) * 0.1
+                        (firstUsage.total || firstUsage.remaining) * 0.1
                       ? "text-orange-500 dark:text-orange-400"
                       : "text-green-600 dark:text-green-400"
-                  }`}
+                }`}
               >
                 {firstUsage.remaining.toFixed(2)}
               </span>
@@ -310,12 +311,13 @@ const UsagePlanItem: React.FC<{ data: UsageData }> = ({ data }) => {
               {t("usage.remaining")}
             </span>
             <span
-              className={`font-semibold tabular-nums ${isExpired
-                ? "text-red-500 dark:text-red-400"
-                : remaining < (total || remaining) * 0.1
-                  ? "text-orange-500 dark:text-orange-400"
-                  : "text-green-600 dark:text-green-400"
-                }`}
+              className={`font-semibold tabular-nums ${
+                isExpired
+                  ? "text-red-500 dark:text-red-400"
+                  : remaining < (total || remaining) * 0.1
+                    ? "text-orange-500 dark:text-orange-400"
+                    : "text-green-600 dark:text-green-400"
+              }`}
             >
               {remaining.toFixed(2)}
             </span>

src/components/skills/SkillsPage.tsx

@@ -1,7 +1,8 @@
-import { useState, useEffect, forwardRef, useImperativeHandle } from "react";
+import { useState, useEffect, useMemo, forwardRef, useImperativeHandle } from "react";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
-import { RefreshCw } from "lucide-react";
+import { Input } from "@/components/ui/input";
+import { RefreshCw, Search } from "lucide-react";
 import { toast } from "sonner";
 import { SkillCard } from "./SkillCard";
 import { RepoManagerPanel } from "./RepoManagerPanel";
@@ -24,6 +25,7 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
     const [repos, setRepos] = useState<SkillRepo[]>([]);
     const [loading, setLoading] = useState(true);
     const [repoManagerOpen, setRepoManagerOpen] = useState(false);
+    const [searchQuery, setSearchQuery] = useState("");
 
     const loadSkills = async (afterLoad?: (data: Skill[]) => void) => {
       try {
@@ -111,12 +113,12 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
         const errorMessage =
           error instanceof Error ? error.message : String(error);
 
-      // 使用错误解析器格式化错误，传入 "skills.uninstallFailed"
-      const { title, description } = formatSkillError(
-        errorMessage,
-        t,
-        "skills.uninstallFailed",
-      );
+        // 使用错误解析器格式化错误，传入 "skills.uninstallFailed"
+        const { title, description } = formatSkillError(
+          errorMessage,
+          t,
+          "skills.uninstallFailed",
+        );
 
         toast.error(title, {
           description,
@@ -162,6 +164,24 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
       await Promise.all([loadRepos(), loadSkills()]);
     };
 
+    // 过滤技能列表
+    const filteredSkills = useMemo(() => {
+      if (!searchQuery.trim()) return skills;
+
+      const query = searchQuery.toLowerCase();
+      return skills.filter((skill) => {
+        const name = skill.name?.toLowerCase() || "";
+        const description = skill.description?.toLowerCase() || "";
+        const directory = skill.directory?.toLowerCase() || "";
+
+        return (
+          name.includes(query) ||
+          description.includes(query) ||
+          directory.includes(query)
+        );
+      });
+    }, [skills, searchQuery]);
+
     return (
       <div className="flex flex-col h-full min-h-0 bg-background/50">
         {/* 顶部操作栏（固定区域）已移除，由 App.tsx 接管 */}
@@ -190,16 +210,49 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
                 </Button>
               </div>
             ) : (
-              <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                {skills.map((skill) => (
-                  <SkillCard
-                    key={skill.key}
-                    skill={skill}
-                    onInstall={handleInstall}
-                    onUninstall={handleUninstall}
-                  />
-                ))}
-              </div>
+              <>
+                {/* 搜索框 */}
+                <div className="mb-6">
+                  <div className="relative">
+                    <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+                    <Input
+                      type="text"
+                      placeholder={t("skills.searchPlaceholder")}
+                      value={searchQuery}
+                      onChange={(e) => setSearchQuery(e.target.value)}
+                      className="pl-9"
+                    />
+                  </div>
+                  {searchQuery && (
+                    <p className="mt-2 text-sm text-muted-foreground">
+                      {t("skills.count", { count: filteredSkills.length })}
+                    </p>
+                  )}
+                </div>
+
+                {/* 技能列表或无结果提示 */}
+                {filteredSkills.length === 0 ? (
+                  <div className="flex flex-col items-center justify-center h-48 text-center">
+                    <p className="text-lg font-medium text-gray-900 dark:text-gray-100">
+                      {t("skills.noResults")}
+                    </p>
+                    <p className="mt-2 text-sm text-gray-500 dark:text-gray-400">
+                      {t("skills.emptyDescription")}
+                    </p>
+                  </div>
+                ) : (
+                  <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                    {filteredSkills.map((skill) => (
+                      <SkillCard
+                        key={skill.key}
+                        skill={skill}
+                        onInstall={handleInstall}
+                        onUninstall={handleUninstall}
+                      />
+                    ))}
+                  </div>
+                )}
+              </>
             )}
           </div>
         </div>

src/i18n/locales/en.json

@@ -735,7 +735,10 @@
       "removeSuccess": "Repository {{owner}}/{{name}} removed",
       "removeFailed": "Failed to remove",
       "skillCount": "{{count}} skills detected"
-    }
+    },
+    "search": "Search Skills",
+    "searchPlaceholder": "Search skill name or description...",
+    "noResults": "No matching skills found"
   },
   "deeplink": {
     "confirmImport": "Confirm Import Provider",

src/i18n/locales/zh.json

@@ -735,7 +735,10 @@
       "removeSuccess": "仓库 {{owner}}/{{name}} 已删除",
       "removeFailed": "删除失败",
       "skillCount": "识别到 {{count}} 个技能"
-    }
+    },
+    "search": "搜索技能",
+    "searchPlaceholder": "搜索技能名称或描述...",
+    "noResults": "未找到匹配的技能"
   },
   "deeplink": {
     "confirmImport": "确认导入供应商配置",